Alexandre Julliard : comctl32: propsheet: Fixed buffer sizes for LoadStringW.

Alexandre Julliard julliard at wine.codeweavers.com
Tue May 30 13:07:33 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 1d40bf0141b7f67b1188555962698f5dab631bc3
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1d40bf0141b7f67b1188555962698f5dab631bc3

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue May 30 20:01:19 2006 +0200

comctl32: propsheet: Fixed buffer sizes for LoadStringW.

---

 dlls/comctl32/propsheet.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 2dad74f..ba20116 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -2908,8 +2908,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len );
         }
     }
@@ -2926,8 +2926,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszHeaderTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszHeaderTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len );
         }
     }
@@ -2941,8 +2941,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszHeaderSubTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszHeaderSubTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len );
         }
     }
@@ -2996,8 +2996,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len );
         }
     }
@@ -3018,8 +3018,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszHeaderTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszHeaderTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len );
         }
     }
@@ -3037,8 +3037,8 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee
         else
         {
             UINT id = LOWORD(ppsp->pszHeaderSubTitle);
-            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + sizeof(WCHAR);
-            ppsp->pszHeaderSubTitle = Alloc( len );
+            int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1;
+            ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) );
             LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len );
         }
     }




More information about the wine-cvs mailing list