[WINHLP32][WORDPAD] Sync with Wine Staging 1.7.37. CORE-9246

svn path=/trunk/; revision=67253

diff --git a/reactos/base/applications/winhlp32/winhelp.c b/reactos/base/applications/winhlp32/winhelp.c
index 86e181d..a472f38 100644 (file)
--- a/reactos/base/applications/winhlp32/winhelp.c
+++ b/reactos/base/applications/winhlp32/winhelp.c
@@ -290,7 +290,7 @@ static HLPFILE_WINDOWINFO*     WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile,
     /* Calculate horizontal size and position of a popup window */
     GetWindowRect(parent->hMainWnd, &parent_rect);
     wi.size.cx = (parent_rect.right  - parent_rect.left) / 2;
-    wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */
+    wi.size.cy = 10; /* need a non null value, so that borders are taken into account while computing */
 
     wi.origin.x = (short)LOWORD(mouse);
     wi.origin.y = (short)HIWORD(mouse);

diff --git a/reactos/base/applications/wordpad/registry.c b/reactos/base/applications/wordpad/registry.c
index 46bece7..11c6f4f 100644 (file)
--- a/reactos/base/applications/wordpad/registry.c
+++ b/reactos/base/applications/wordpad/registry.c
@@ -295,7 +295,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
 
         if(lstrcmpiW(newFile, pFiles[0]))
         {
-            for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++)
+            for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++)
             {
                 if(!lstrcmpiW(pFiles[i], newFile))
                 {
@@ -320,7 +320,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
                 pFiles[0] = newFile;
             }
 
-            for(i = 0; pFiles[i] && i < FILELIST_ENTRIES; i++)
+            for(i = 0; i < FILELIST_ENTRIES && pFiles[i]; i++)
             {
                 wsprintfW(buffer, var_file, i+1);
                 RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const BYTE*)pFiles[i],

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 0c878c6..6ef13a9 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -202,7 +202,6 @@ reactos/dll/win32/vbscript            # Synced to Wine-1.7.27
 reactos/dll/win32/version             # Synced to Wine-1.7.27
 reactos/dll/win32/wbemdisp            # Synced to Wine-1.7.27
 reactos/dll/win32/wbemprox            # Synced to WineStaging-1.7.37
-reactos/dll/win32/wer                 # Autosync
 reactos/dll/win32/windowscodecs       # Synced to Wine-1.7.27
 reactos/dll/win32/windowscodecsext    # Synced to Wine-1.7.27
 reactos/dll/win32/winemp3.acm         # Synced to Wine-1.7.27
@@ -241,8 +240,8 @@ reactos/base/applications/extrac32          # Synced to Wine-1.7.27
 reactos/base/applications/iexplore          # Synced to Wine-1.7.27
 reactos/base/applications/notepad           # Forked at Wine-20041201
 reactos/base/applications/regedit           # Out of sync
-reactos/base/applications/winhlp32          # Synced to Wine-1.7.27
-reactos/base/applications/wordpad           # Synced to Wine-1.7.27
+reactos/base/applications/winhlp32          # Synced to WineStaging-1.7.37
+reactos/base/applications/wordpad           # Synced to WineStaging-1.7.37
 reactos/base/services/rpcss                 # Synced to Wine-1.7.27
 reactos/base/system/expand                  # Synced to Wine-1.7.27
 reactos/base/system/msiexec                 # Synced to WineStaging-1.7.37