[ros-diffs] [akhaldi] 72443: [WINHLP32] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Tue Aug 23 19:31:44 2016
New Revision: 72443

URL: http://svn.reactos.org/svn/reactos?rev=72443&view=rev
Log:
[WINHLP32] Sync with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/reactos/base/applications/winhlp32/macro.c
    trunk/reactos/base/applications/winhlp32/winhelp.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/applications/winhlp32/macro.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/macro.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/macro.c	[iso-8859-1] Tue Aug 23 19:31:44
2016
@@ -598,7 +598,7 @@
     LPSTR       ptr;
 
     WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow),
debugstr_a(topic_id));
-    if ((ptr = strchr(lpszPathWindow, '>')) != NULL)
+    if (lpszPathWindow && (ptr = strchr(lpszPathWindow, '>')) !=
NULL)
     {
         LPSTR   tmp;
         size_t  sz;

Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32…
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c	[iso-8859-1] Tue Aug 23 19:31:44
2016
@@ -501,7 +501,7 @@
 
 /***********************************************************************
  *
- *           WINHELP_RelaseWindow
+ *           WINHELP_ReleaseWindow
  */
 BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win)
 {
@@ -968,6 +968,7 @@
         popup = Globals.active_popup;
         Globals.active_popup = NULL;
         WINHELP_ReleaseWindow(popup);
+        if (lret) *lret = 1;
         return TRUE;
     }
     return FALSE;

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Aug 23 19:31:44 2016
@@ -240,7 +240,7 @@
 reactos/base/applications/iexplore          # Synced to WineStaging-1.9.11
 reactos/base/applications/notepad           # Forked at Wine-20041201
 reactos/base/applications/regedit           # Out of sync
-reactos/base/applications/winhlp32          # Synced to WineStaging-1.9.11
+reactos/base/applications/winhlp32          # Synced to WineStaging-1.9.16
 reactos/base/applications/wordpad           # Synced to WineStaging-1.9.11
 reactos/base/services/rpcss                 # Synced to WineStaging-1.9.11
 reactos/base/system/expand                  # Synced to WineStaging-1.9.11