Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINHLP32] Sync with Wine Staging 1.9.16. CORE-11866

Browse source 
svn path=/trunk/; revision=72443
This commit is contained in:
Amine Khaldi 2016-08-23 19:31:44 +00:00
parent 444f693e31
commit 5e7598a6d2
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/winhlp32/macro.c
View file

@ -598,7 +598,7 @@ static void CALLBACK MACRO_JumpID(LPCSTR lpszPathWindow, LPCSTR topic_id)
LPSTR ptr; LPSTR ptr;
WINE_TRACE("(%s, %s)\n", debugstr_a(lpszPathWindow), debugstr_a(topic_id)); 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; LPSTR tmp;
size_t sz; size_t sz;

3
reactos/base/applications/winhlp32/winhelp.c
View file

@ -501,7 +501,7 @@ WINHELP_WINDOW* WINHELP_GrabWindow(WINHELP_WINDOW* win)
/*********************************************************************** /***********************************************************************
* *
* WINHELP_RelaseWindow * WINHELP_ReleaseWindow
*/ */
BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win) BOOL WINHELP_ReleaseWindow(WINHELP_WINDOW* win)
{ {
@ -968,6 +968,7 @@ static BOOL WINHELP_CheckPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam
popup = Globals.active_popup; popup = Globals.active_popup;
Globals.active_popup = NULL; Globals.active_popup = NULL;
WINHELP_ReleaseWindow(popup); WINHELP_ReleaseWindow(popup);
if (lret) *lret = 1;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;

2
reactos/media/doc/README.WINE
View file

@ -240,7 +240,7 @@ reactos/base/applications/extrac32 # Synced to WineStaging-1.9.11
reactos/base/applications/iexplore # Synced to WineStaging-1.9.11 reactos/base/applications/iexplore # Synced to WineStaging-1.9.11
reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/notepad # Forked at Wine-20041201
reactos/base/applications/regedit # Out of sync 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/applications/wordpad # Synced to WineStaging-1.9.11
reactos/base/services/rpcss # 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 reactos/base/system/expand # Synced to WineStaging-1.9.11