Changeset 211 for trunk/mediafolder/c/cddb/pmcddb.cpp

Timestamp:

Feb 14, 2025, 11:21:23 PM (6 months ago)

Author:

gyoung

Message:

Get cddb working again

File:

• trunk/mediafolder/c/cddb/pmcddb.cpp (modified) (7 diffs)

trunk/mediafolder/c/cddb/pmcddb.cpp

@@ -145 +145 @@
   startData.FgBg=SSF_FGBG_BACK;
   startData.TraceOpt=SSF_TRACEOPT_NONE;
-  startData.PgmTitle=(char*)pszTitle;
+  startData.PgmTitle=(PSZ)pszTitle;
   
-  startData.PgmName=(char*)"cmd.exe";
+  startData.PgmName=(PSZ)"cmd.exe";
   startData.InheritOpt=SSF_INHERTOPT_SHELL;
   startData.SessionType=SSF_TYPE_WINDOWABLEVIO;
@@ -155 +155 @@
   startData.InitXSize=500;
   startData.InitYSize=400;
-  startData.ObjectBuffer=(char*)chrLoadError;
+  startData.ObjectBuffer=(PSZ)chrLoadError;
   startData.ObjectBuffLen=(ULONG)sizeof(chrLoadError);
 
   sprintf(startParams," /C \" \"%s\" %s \"", rexxFile, parameters);
-  startData.PgmInputs=(CHAR*)startParams;
+  startData.PgmInputs=(PSZ)startParams;
 
   writeLog("Trying to start ");
@@ -191 +191 @@
   sprintf(profileName,"%s\\cddb.ini", chrInstallDir);       
   /* Open ini-file */
-  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(char *)profileName);
+  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(PCSZ)profileName);
   do{
     if(!hini) {
@@ -204 +204 @@
     }/* end of if(!hini) */
 
-    NUMSERVERS=PrfQueryProfileInt(hini,(char*)"cddb",(char*)"numservers",0);
-    PrfQueryProfileString(hini,(char*)"cddb",(char*)"cddbuser",(char*) "guest",username,sizeof(username));
-    PrfQueryProfileString(hini,(char*)"cddb",(char*)"cddbuserhost",(char*) "",hostname,sizeof(hostname));
+    NUMSERVERS=PrfQueryProfileInt(hini,(PCSZ)"cddb",(PCSZ)"numservers",0);
+    PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuser",(PCSZ) "guest",username,sizeof(username));
+    PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuserhost",(PCSZ) "",hostname,sizeof(hostname));
 
     strncpy(version,QUERYCDDB_VERSION,sizeof(version));
@@ -220 +220 @@
       for(a=0;a<NUMSERVERS;a++) {
         sprintf(text,"cddbserver%d",a+1);
-        PrfQueryProfileString(hini,(CHAR*)"cddb",(CHAR*)text,(CHAR*)"",cddbServer[a],sizeof(cddbServer[0]));
+        PrfQueryProfileString(hini,(PCSZ)"cddb",(PCSZ)text,(PCSZ)"",cddbServer[a],sizeof(cddbServer[0]));
       }
     }
@@ -557 +557 @@
   sprintf(profileName,"%s\\cddb.ini", chrInstallDir);       
   /* Open ini-file */
-  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(char *)profileName);
+  hini=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),(PCSZ)profileName);
   if(hini) {
     writeLog("INI file opened.\n");
-    PrfWriteProfileString(hini,(CHAR*)"cddb",(CHAR*)"cddbuserhost", (CHAR*)hostname);
-    PrfWriteProfileString(hini,(CHAR*)"cddb",(CHAR*)"cddbuser",(CHAR*) username);
+    PrfWriteProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuserhost", (PCSZ)hostname);
+    PrfWriteProfileString(hini,(PCSZ)"cddb",(PCSZ)"cddbuser",(PCSZ) username);
     PrfCloseProfile(hini);
   }/* end of if(hini) */
@@ -682 +682 @@
           writeLog("\n\n");
           /* Object window creation */
-          hwndClient=WinCreateWindow(HWND_OBJECT,WC_STATIC,(CHAR*)"cddbObject",0,0,0,0,0,NULL,HWND_BOTTOM,12343,NULL,NULL);
+          hwndClient=WinCreateWindow(HWND_OBJECT,WC_STATIC,(PCSZ)"cddbObject",0,0,0,0,0,NULL,HWND_BOTTOM,12343,NULL,NULL);
           if(hwndClient) {
             WinSubclassWindow(hwndClient,&cddbObjectProc);