Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-30 19:14:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEDLG] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-11-23 12:06:18 +01:00
parent 79bacc9aca
commit a9efcbe85d
5 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dll/win32/oledlg/insobjdlg.c
View file

@ -29,7 +29,6 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
#include "oledlg.h" #include "oledlg.h"
#include "resource.h" #include "resource.h"

1
dll/win32/oledlg/oledlg_main.c
View file

@ -33,7 +33,6 @@
#include "resource.h" #include "resource.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);

9
dll/win32/oledlg/pastespl.c
View file

@ -35,7 +35,6 @@
#include "resource.h" #include "resource.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct)
} }
LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt));
if((ptr = strstrW(resource_txt, percent_s))) if((ptr = wcsstr(resource_txt, percent_s)))
{ {
/* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */
size_t result_txt_len = strlenW(pent->lpstrResultText); size_t result_txt_len = lstrlenW(pent->lpstrResultText);
ptrdiff_t offs = (char*)ptr - (char*)resource_txt; ptrdiff_t offs = (char*)ptr - (char*)resource_txt;
result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR)); result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR));
memcpy(result_txt, resource_txt, offs); memcpy(result_txt, resource_txt, offs);
memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR)); memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR));
memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR)); memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR));
} }
else else
result_txt = resource_txt; result_txt = resource_txt;

2
dll/win32/oledlg/precomp.h
View file

@ -16,10 +16,10 @@
#include <winbase.h> #include <winbase.h>
#include <wingdi.h> #include <wingdi.h>
#include <winuser.h> #include <winuser.h>
#include <winnls.h>
#include <oledlg.h> #include <oledlg.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h>
#include "oledlg_private.h" #include "oledlg_private.h"
#include "resource.h" #include "resource.h"

2
media/doc/README.WINE
View file

@ -144,7 +144,7 @@ dll/win32/ole32 # Synced to WineStaging-4.18
dll/win32/oleacc # Synced to WineStaging-4.18 dll/win32/oleacc # Synced to WineStaging-4.18
dll/win32/oleaut32 # Synced to WineStaging-4.18 dll/win32/oleaut32 # Synced to WineStaging-4.18
dll/win32/olecli32 # Synced to WineStaging-4.18 dll/win32/olecli32 # Synced to WineStaging-4.18
dll/win32/oledlg # Synced to WineStaging-4.0 dll/win32/oledlg # Synced to WineStaging-4.18
dll/win32/olepro32 # Synced to WineStaging-3.3 dll/win32/olepro32 # Synced to WineStaging-3.3
dll/win32/olesvr32 # Synced to WineStaging-3.3 dll/win32/olesvr32 # Synced to WineStaging-3.3
dll/win32/olethk32 # Synced to WineStaging-3.3 dll/win32/olethk32 # Synced to WineStaging-3.3