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

diff --git a/dll/win32/printui/printui.c b/dll/win32/printui/printui.c
index 32e7b52..f35107f 100644 (file)
--- a/dll/win32/printui/printui.c
+++ b/dll/win32/printui/printui.c
@@ -31,7 +31,6 @@
 #include "winnls.h"
 #include "shellapi.h"
 
 #include "winnls.h"
 #include "shellapi.h"
 

-#include "wine/unicode.h"

 #include "wine/debug.h"
 #include "printui_private.h"
 
 #include "wine/debug.h"
 #include "printui_private.h"
 


@@ -151,7 +150,7 @@ static BOOL parse_rundll(context_t * cx)
             while ( c )
             {
                 txtW[0] = c;
             while ( c )
             {
                 txtW[0] = c;

-                ptr = strchrW(optionsW, c);
+                ptr = wcschr(optionsW, c);

                 if (ptr) {
                     index = ptr - optionsW;
                     cx->options[index] = get_next_wstr(cx);
                 if (ptr) {
                     index = ptr - optionsW;
                     cx->options[index] = get_next_wstr(cx);


@@ -160,7 +159,7 @@ static BOOL parse_rundll(context_t * cx)
                 }
                 else
                 {
                 }
                 else
                 {

-                    ptr = strchrW(flagsW, c);
+                    ptr = wcschr(flagsW, c);

                     if (ptr) {
                         index = ptr - flagsW;
                         cx->flags[index] = TRUE;
                     if (ptr) {
                         index = ptr - flagsW;
                         cx->flags[index] = TRUE;

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index b5e19d9..b2ba781 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -151,7 +151,7 @@ dll/win32/olethk32            # Synced to WineStaging-3.3
 dll/win32/pdh                 # Synced to WineStaging-4.18
 dll/win32/pidgen              # Synced to WineStaging-4.18
 dll/win32/powrprof            # Forked at Wine-1.0rc5
 dll/win32/pdh                 # Synced to WineStaging-4.18
 dll/win32/pidgen              # Synced to WineStaging-4.18
 dll/win32/powrprof            # Forked at Wine-1.0rc5

-dll/win32/printui             # Synced to WineStaging-3.3
+dll/win32/printui             # Synced to WineStaging-4.18

 dll/win32/propsys             # Synced to WineStaging-4.0
 dll/win32/pstorec             # Synced to WineStaging-3.3
 dll/win32/qmgr                # Synced to WineStaging-4.0
 dll/win32/propsys             # Synced to WineStaging-4.0
 dll/win32/pstorec             # Synced to WineStaging-3.3
 dll/win32/qmgr                # Synced to WineStaging-4.0