[OLEDLG] Sync with Wine Staging 4.18. CORE-16441
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 23 Nov 2019 11:06:18 +0000 (12:06 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 23 Nov 2019 11:06:18 +0000 (12:06 +0100)
dll/win32/oledlg/insobjdlg.c
dll/win32/oledlg/oledlg_main.c
dll/win32/oledlg/pastespl.c
dll/win32/oledlg/precomp.h
media/doc/README.WINE

index f32f381..cf20150 100644 (file)
@@ -29,7 +29,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 #include "oledlg.h"
 #include "resource.h"
index ba5b7c8..df53ad7 100644 (file)
@@ -33,7 +33,6 @@
 #include "resource.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
index 0b8c8c9..2593fd5 100644 (file)
@@ -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;
index 4b6d825..ca6d648 100644 (file)
 #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"
index 7d5b3b9..879faca 100644 (file)
@@ -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