Changeset 133 for trunk/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp

Timestamp:

Nov 29, 2023, 5:59:34 PM (21 months ago)

Author:

gyoung

Message:

Merge Lar's 2.9 branch into the trunk

File:

• trunk/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp (modified) (12 diffs)

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 1999-2003
- * 
+ *
  * It's part of the Audio/Data-CD-Creator distribution
  */
@@ -132 +132 @@
 
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -352 +352 @@
           if(DosQueryModuleHandle(pathname,&hmod)) {
             pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-              ->wpModuleForClass("CWAudioShadow");           
+              ->wpModuleForClass("CWAudioShadow");
             if(DosQueryModuleHandle(pathname,&hmod)) {
               pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                ->wpModuleForClass("M_CWCDFolder");           
+                ->wpModuleForClass("M_CWCDFolder");
               if(DosQueryModuleHandle(pathname,&hmod)) {
                 pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                  ->wpModuleForClass("CWCDFolder");           
+                  ->wpModuleForClass("CWCDFolder");
                 if(DosQueryModuleHandle(pathname,&hmod)) {
                   hmod=0;
@@ -378 +378 @@
         if((found=strrchr(chrInstallDir,'\\'))!=NULLHANDLE)
           *found=0;
-        
+
         /* Save the dir for config files. */
         //strcpy( chrConfigDir, chrInstallDir);
@@ -393 +393 @@
 
   if(!hmod) {
-    char path[CCHMAXPATH];  
+    char path[CCHMAXPATH];
     char buf[CCHMAXPATH];
     char* found;
     APIRET rc;
-    
-    /* Get the language code of our system and load the  
+
+    /* Get the language code of our system and load the
        resource DLL with the right language */
     do {
@@ -404 +404 @@
       PCSZ pszLang=chrLang;
       char *chrPtr;
-      
+
       /* Get Language var */
       if(NO_ERROR!=DosScanEnv("LANG", &pszLang))
@@ -419 +419 @@
       while(*chrPtr==' ')
         chrPtr++;
-      
+
       /* Check if value seems to be valid. The var must be something like xx_XX thus length is 5 */
       if(strlen(chrPtr)<5)
         break;
-      
+
       if(DosQueryModuleName(queryModuleHandle("M_CWMediaFolder"),sizeof(path),path)!=NO_ERROR)
         break;
-      
+
       found=strrchr(path,'\\');
       if(!found)
         break;
       *found=0;
-      
-      /* Extract the first two chars */                
+
+      /* Extract the first two chars */
       sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]);
       strcat(path,buf);
@@ -438 +438 @@
       if(DosLoadModule(buf,sizeof(buf),path, &hmod)==NO_ERROR)
         break;
-      
+
       /* NLS DLL not found. Try to load default */
       found=strrchr(path,'\\');
       if(!found)
         break;
-      
+
       *found=0;
       sprintf(buf, DEFRESDLLNAME);
@@ -534 +534 @@
   ULONG ulInfoLen=0;
   APIRET rc;
-  char path[CCHMAXPATH];  
+  char path[CCHMAXPATH];
   char* found;
   char buf[CCHMAXPATH];
@@ -574 +574 @@
   /* We don't want an automatic template because we create it during
      installation because we need one with an ID so we can create a shadow
-     without problems. So we return CLSSTYLE_DONTTEMPLATE. 
+     without problems. So we return CLSSTYLE_DONTTEMPLATE.
      Another way would be an override of wpclsCreateDefaultTemplate()
      but this works, too, and we have to override this method anyway. We must
@@ -591 +591 @@
   if(PrfQueryProfileInt(HINI_USERPROFILE, APPKEY_CWMM, MFLDR_NO_TEMPLATE_SHADOW, 0))
     return;
- 
+
   if(!WinQueryObject(ID_MEDIALDRTMPL_SHADOW))
     {
@@ -778 +778 @@
 
     return rc;
-#endif    
-
-}
-
-
-
-
-
-
-
-
-
-
+#endif
+
+}
+
+
+
+
+
+
+
+
+
+