Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:22:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=67253
This commit is contained in:
Amine Khaldi 2015-04-18 13:06:39 +00:00
parent ebc4c80fdc
commit 0278094b01
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -290,7 +290,7 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile,
/* Calculate horizontal size and position of a popup window */ /* Calculate horizontal size and position of a popup window */
GetWindowRect(parent->hMainWnd, &parent_rect); GetWindowRect(parent->hMainWnd, &parent_rect);
wi.size.cx = (parent_rect.right - parent_rect.left) / 2; 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.x = (short)LOWORD(mouse);
wi.origin.y = (short)HIWORD(mouse); wi.origin.y = (short)HIWORD(mouse);

4
reactos/base/applications/wordpad/registry.c
View file

@ -295,7 +295,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
if(lstrcmpiW(newFile, pFiles[0])) 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)) if(!lstrcmpiW(pFiles[i], newFile))
{ {
@ -320,7 +320,7 @@ void registry_set_filelist(LPCWSTR newFile, HWND hMainWnd)
pFiles[0] = newFile; 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); wsprintfW(buffer, var_file, i+1);
RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const BYTE*)pFiles[i], RegSetValueExW(hKey, (LPWSTR)&buffer, 0, REG_SZ, (const BYTE*)pFiles[i],

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

@ -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/version # Synced to Wine-1.7.27
reactos/dll/win32/wbemdisp # 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/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/windowscodecs # Synced to Wine-1.7.27
reactos/dll/win32/windowscodecsext # 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 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/iexplore # Synced to Wine-1.7.27
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 Wine-1.7.27 reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.37
reactos/base/applications/wordpad # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to WineStaging-1.7.37
reactos/base/services/rpcss # Synced to Wine-1.7.27 reactos/base/services/rpcss # Synced to Wine-1.7.27
reactos/base/system/expand # 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 reactos/base/system/msiexec # Synced to WineStaging-1.7.37