Changeset 1333 for trunk/dll/mainwnd.c

Timestamp:

Dec 12, 2008, 10:56:35 PM (17 years ago)

Author:

Gregg Young

Message:

Added back the sizeofs for each PrfQueryProfileData call. Change the PrfQueryProfileData calls to PrfQueryProfileString for strings since MaxComLineStrg is set at run time not compile time and to eliminate the need for 2 PrfQueryProfileSize calls in RestoreDirCnrState.

File:

• trunk/dll/mainwnd.c (modified) (13 diffs)

trunk/dll/mainwnd.c

@@ -3174 +3174 @@
   fDeleteState = strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
 
-  size = (ULONG)0;
+  //size = (ULONG)0;
   sprintf(szKey, "%sToolbar", szPrefix);
-  if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+  //if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
   {
     if (fToolsChanged)
       save_tools(NULL);
-    PrfQueryProfileData(fmprof, FM3Str, szKey, lasttoolbar, &size);
+    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, lasttoolbar, sizeof(lasttoolbar));
     PrfWriteProfileString(fmprof, FM3Str, "LastToolbar", lasttoolbar);
     load_tools(NULL);
     PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
   }
-  size = (ULONG)0;
+  //size = (ULONG)0;
   sprintf(szKey, "%sTargetDir", szPrefix);
-  if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+  //if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
   {
-    PrfQueryProfileData(fmprof, FM3Str, szKey, targetdir, &size);
+    PrfQueryProfileString(fmprof, FM3Str, szKey, NULL, targetdir, sizeof(targetdir));
     PrfWriteProfileString(fmprof, FM3Str, "TargetDir", targetdir);
     SetTargetDir(NULL, TRUE);
@@ -3281 +3281 @@
           localdcd.ds.detailssubject = dsDirCnrDefault.detailssubject;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3292 +3293 @@
           localdcd.ds.detailsea = dsDirCnrDefault.detailsea;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3303 +3305 @@
           localdcd.ds.detailssize = dsDirCnrDefault.detailssize;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3314 +3317 @@
           localdcd.ds.detailsicon = dsDirCnrDefault.detailsicon;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3325 +3329 @@
           localdcd.ds.detailsattr = dsDirCnrDefault.detailsattr;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3336 +3341 @@
           localdcd.ds.detailscrdate = dsDirCnrDefault.detailscrdate;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3347 +3353 @@
           localdcd.ds.detailscrtime = dsDirCnrDefault.detailscrtime;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3358 +3365 @@
           localdcd.ds.detailslwdate = dsDirCnrDefault.detailslwdate;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3369 +3377 @@
           localdcd.ds.detailslwtime = dsDirCnrDefault.detailslwtime;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3380 +3389 @@
           localdcd.ds.detailsladate = dsDirCnrDefault.detailsladate;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3391 +3401 @@
           localdcd.ds.detailslatime = dsDirCnrDefault.detailslatime;  // Set default
           sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, x);
+          size = sizeof(BOOL);
           if (PrfQueryProfileData(fmprof,
                                   FM3Str,
@@ -3412 +3423 @@
                                              NULL,
                                              CCS_AUTOPOSITION | CCS_MINIICONS |
-                                             CCS_MINIRECORDCORE | ulCnrType, //| WS_VISIBLE,
+                                             CCS_MINIRECORDCORE | ulCnrType,
                                              0,
                                              0,