https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9efcbe85d1e391bff6bb68d0eb3621620a87cbb
commit a9efcbe85d1e391bff6bb68d0eb3621620a87cbb Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 23 12:06:18 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 23 12:06:18 2019 +0100 [OLEDLG] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/oledlg/insobjdlg.c | 1 - dll/win32/oledlg/oledlg_main.c | 1 - dll/win32/oledlg/pastespl.c | 9 ++++----- dll/win32/oledlg/precomp.h | 2 +- media/doc/README.WINE | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dll/win32/oledlg/insobjdlg.c b/dll/win32/oledlg/insobjdlg.c index f32f3814e5b..cf20150af89 100644 --- a/dll/win32/oledlg/insobjdlg.c +++ b/dll/win32/oledlg/insobjdlg.c @@ -29,7 +29,6 @@ #include "wingdi.h" #include "winuser.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "oledlg.h" #include "resource.h" diff --git a/dll/win32/oledlg/oledlg_main.c b/dll/win32/oledlg/oledlg_main.c index ba5b7c80812..df53ad709ad 100644 --- a/dll/win32/oledlg/oledlg_main.c +++ b/dll/win32/oledlg/oledlg_main.c @@ -33,7 +33,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dll/win32/oledlg/pastespl.c b/dll/win32/oledlg/pastespl.c index 0b8c8c95a15..2593fd559d2 100644 --- a/dll/win32/oledlg/pastespl.c +++ b/dll/win32/oledlg/pastespl.c @@ -35,7 +35,6 @@ #include "resource.h" #include "wine/debug.h" -#include "wine/unicode.h" 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)); - 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 */ - size_t result_txt_len = strlenW(pent->lpstrResultText); + size_t result_txt_len = lstrlenW(pent->lpstrResultText); 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((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 result_txt = resource_txt; diff --git a/dll/win32/oledlg/precomp.h b/dll/win32/oledlg/precomp.h index 4b6d825d236..ca6d648c0ce 100644 --- a/dll/win32/oledlg/precomp.h +++ b/dll/win32/oledlg/precomp.h @@ -16,10 +16,10 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <winnls.h> #include <oledlg.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "oledlg_private.h" #include "resource.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 7d5b3b9db3e..879facad438 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -144,7 +144,7 @@ dll/win32/ole32 # Synced to WineStaging-4.18 dll/win32/oleacc # Synced to WineStaging-4.18 dll/win32/oleaut32 # 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/olesvr32 # Synced to WineStaging-3.3 dll/win32/olethk32 # Synced to WineStaging-3.3
