October 2020 - Wine-commits

Jacek Caban : kernelbase: Move console code page validation to conhost.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 1d8c2d28cb2ec313d1b5c1f762624be776a3dca7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8c2d28cb2ec313d1b5c1f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 18:20:09 2020 +0200 kernelbase: Move console code page validation to conhost. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 16 ++-------------- programs/conhost/conhost.c | 6 ++++++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 2b3c6c3315a..d387b49c534 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -637,7 +637,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.input_cp ? info.input_cp : GetOEMCP(); + return info.input_cp; } @@ -710,7 +710,7 @@ UINT WINAPI DECLSPEC_HOTPATCH GetConsoleOutputCP(void) if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL )) return 0; - return info.output_cp ? info.output_cp : GetOEMCP(); + return info.output_cp; } @@ -1092,12 +1092,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.input_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); @@ -1237,12 +1231,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) { struct condrv_input_info_params params = { SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE }; - if (!IsValidCodePage( cp )) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - params.info.output_cp = cp; return console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_SET_INPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3b4255ea310..6985a9ca0b0 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2407,9 +2407,15 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.input_cp )) return STATUS_INVALID_PARAMETER; console->input_cp = params->info.input_cp; + } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) + { + if (!IsValidCodePage( params->info.output_cp )) return STATUS_INVALID_PARAMETER; console->output_cp = params->info.output_cp; + } return STATUS_SUCCESS; }

1 0

Austin English : qedit: Add a version resource.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: c130054120cffe595e21f43d5e7d2202f23c91a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130054120cffe595e21f43d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:36:22 2020 -0500 qedit: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 2 ++ dlls/qedit/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 4891328c7a9..4eb57322f5e 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ timeline.c IDL_SRCS = qedit_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qedit/version.rc b/dlls/qedit/version.rc new file mode 100644 index 00000000000..dd5f3ccbc7f --- /dev/null +++ b/dlls/qedit/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qedit" +#define WINE_FILENAME_STR "qedit.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : qasf: Add a version resource.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 1737a7878f034534fb8eb908e6940cffe55494b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1737a7878f034534fb8eb908… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:38:41 2020 -0500 qasf: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/Makefile.in | 2 ++ dlls/qasf/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/qasf/Makefile.in b/dlls/qasf/Makefile.in index 39239d38aea..928bf04d80e 100644 --- a/dlls/qasf/Makefile.in +++ b/dlls/qasf/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ IDL_SRCS = \ qasf_classes.idl + +RC_SRCS = version.rc diff --git a/dlls/qasf/version.rc b/dlls/qasf/version.rc new file mode 100644 index 00000000000..dab46194395 --- /dev/null +++ b/dlls/qasf/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine qasf" +#define WINE_FILENAME_STR "qasf.dll" +#define WINE_FILEVERSION 9,0,0,4503 +#define WINE_FILEVERSION_STR "9.0.0.4503" +#define WINE_PRODUCTVERSION 9,0,0,4503 +#define WINE_PRODUCTVERSION_STR "9.0.0.4503" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : dsdmo: Add a version resource.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 8a70e7eba178614ccaa992bf5551d5986dd0d953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a70e7eba178614ccaa992bf… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 14 03:39:27 2020 -0500 dsdmo: Add a version resource. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/Makefile.in | 2 ++ dlls/dsdmo/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dsdmo/Makefile.in b/dlls/dsdmo/Makefile.in index d184b025ad0..d86dbbd804a 100644 --- a/dlls/dsdmo/Makefile.in +++ b/dlls/dsdmo/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ IDL_SRCS = \ dsdmo.idl + +RC_SRCS = version.rc diff --git a/dlls/dsdmo/version.rc b/dlls/dsdmo/version.rc new file mode 100644 index 00000000000..77cc1728fbf --- /dev/null +++ b/dlls/dsdmo/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine dsdmo" +#define WINE_FILENAME_STR "dsdmo.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc"

1 0

Aaron Hill : cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 8e54cad6a15b3901a748fa228d1a7e456911b9ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e54cad6a15b3901a748fa22… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Mon Oct 12 17:36:05 2020 -0400 cmd: Set errorlevel to 0 when 'call' is invoked with an empty string. Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 73b0917c275..c7418b759e4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3149,6 +3149,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47e43fcd675..2b55a39dca3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1053,6 +1053,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + if (!firstParam[0]) { + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'};

1 0

Dmitry Timoshkov : advapi32/tests: Add QueryServiceStatusEx test for the EventLog service.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: de679af492ed93d70c99dff7f7cfc01cc8f25eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de679af492ed93d70c99dff7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 29 19:28:52 2020 +0300 advapi32/tests: Add QueryServiceStatusEx test for the EventLog service. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 22 ++++++++++++++++++++++ include/winsvc.h | 3 +++ 2 files changed, 25 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 817d0cb9ab0..d216e096207 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2684,6 +2684,7 @@ static void test_EventLog(void) DWORD size; BOOL ret; QUERY_SERVICE_CONFIGA *config; + SERVICE_STATUS_PROCESS status; scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); @@ -2719,6 +2720,27 @@ todo_wine HeapFree(GetProcessHeap(), 0, config); + memset(&status, 0, sizeof(status)); + size = sizeof(status); + ret = QueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&status, size, &size); + ok(ret, "QueryServiceStatusEx error %u\n", GetLastError()); + ok(status.dwServiceType == SERVICE_WIN32_SHARE_PROCESS || + status.dwServiceType == (SERVICE_WIN32_SHARE_PROCESS | SERVICE_WIN32_OWN_PROCESS) /* Win10 */, + "got %#x\n", status.dwServiceType); + ok(status.dwCurrentState == SERVICE_RUNNING, "got %#x\n", status.dwCurrentState); +todo_wine + ok(status.dwControlsAccepted == SERVICE_ACCEPT_SHUTDOWN /* XP */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN) /* 2008 */ || + status.dwControlsAccepted == (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_TIMECHANGE | SERVICE_ACCEPT_SHUTDOWN), + "got %#x\n", status.dwControlsAccepted); + ok(status.dwWin32ExitCode == 0, "got %#x\n", status.dwWin32ExitCode); + ok(status.dwServiceSpecificExitCode == 0, "got %#x\n", status.dwServiceSpecificExitCode); + ok(status.dwCheckPoint == 0, "got %#x\n", status.dwCheckPoint); + ok(status.dwWaitHint == 0, "got %#x\n", status.dwWaitHint); + ok(status.dwProcessId != 0, "got %#x\n", status.dwProcessId); + ok(status.dwServiceFlags == 0 || status.dwServiceFlags == SERVICE_RUNS_IN_SYSTEM_PROCESS /* XP */, + "got %#x\n", status.dwServiceFlags); + CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); } diff --git a/include/winsvc.h b/include/winsvc.h index aa5e9f1ae88..768ba5bf9b8 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -85,6 +85,8 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_ACCEPT_POWEREVENT 0x00000040 #define SERVICE_ACCEPT_SESSIONCHANGE 0x00000080 #define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100 +#define SERVICE_ACCEPT_TIMECHANGE 0x00000200 +#define SERVICE_ACCEPT_TRIGGEREVENT 0x00000400 /* Service Control Manager Object access types */ #define SC_MANAGER_CONNECT 0x0001 @@ -124,6 +126,7 @@ static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e',' #define SERVICE_NO_CHANGE 0xffffffff +#define SERVICE_RUNS_IN_SYSTEM_PROCESS 0x00000001 /* Handle types */

1 0

Michael Stefaniuc : msisip: Use wide-char string literals.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 0e8c432051b09d3bc3558ba2dc94392724c80d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8c432051b09d3bc3558ba2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:21:59 2020 +0200 msisip: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) {

1 0

Michael Stefaniuc : spoolss: Use wide-char string literals.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 6873f8f1d07bf4569436f84d180a3789ee594600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6873f8f1d07bf4569436f84d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:00 2020 +0200 spoolss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW");

1 0

Michael Stefaniuc : lz32/tests: Use wide-char string literals.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 14012ea2bbfb9eef4f9eaf30f8f74698facf51ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=14012ea2bbfb9eef4f9eaf30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:03 2020 +0200 lz32/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/lz32/tests/lzexpand_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c37f3fa47e7..3c80bc09a6b 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -30,23 +30,23 @@ /* Compressed file names end with underscore. */ static char filename [] = "testfile.xxx"; static char filename_[] = "testfile.xx_"; -static WCHAR filenameW [] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; -static WCHAR filenameW_[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static WCHAR filenameW [] = L"testfile.xxx"; +static WCHAR filenameW_[] = L"testfile.xx_"; static char dotless [] = "dotless"; static char dotless_[] = "dotless._"; -static WCHAR dotlessW [] = {'d','o','t','l','e','s','s', 0}; -static WCHAR dotlessW_[] = {'d','o','t','l','e','s','s','.','_', 0}; +static WCHAR dotlessW [] = L"dotless"; +static WCHAR dotlessW_[] = L"dotless._"; static char extless [] = "extless."; static char extless_[] = "extless._"; -static WCHAR extlessW [] = {'e','x','t','l','e','s','s','.', 0}; -static WCHAR extlessW_[] = {'e','x','t','l','e','s','s','.','_', 0}; +static WCHAR extlessW [] = L"extless."; +static WCHAR extlessW_[] = L"extless._"; static char _terminated [] = "_terminated.xxxx_"; static char _terminated_[] = "_terminated.xxxx_"; -static WCHAR _terminatedW [] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; -static WCHAR _terminatedW_[] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; +static WCHAR _terminatedW [] = L"_terminated.xxxx_"; +static WCHAR _terminatedW_[] = L"_terminated.xxxx_"; static char filename2[] = "testfile.yyy"; @@ -700,7 +700,7 @@ static void test_LZOpenFileW(void) OFSTRUCT test; DWORD retval; INT file; - static WCHAR badfilenameW[] = {'b','a','d','f','i','l','e','n','a','m','e','.','x','t','n',0}; + static WCHAR badfilenameW[] = L"badfilename.xtn"; char expected[MAX_PATH]; SetLastError(0xfaceabee);

1 0

Alexandre Julliard : server: Create the NLS directory.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 892780a5d255136622f6c6402545cc85110be057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=892780a5d255136622f6c640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 20:14:14 2020 +0200 server: Create the NLS directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/directory.c b/server/directory.c index 4d6978f61af..6f8fb179808 100644 --- a/server/directory.c +++ b/server/directory.c @@ -249,12 +249,14 @@ static void create_session( unsigned int id ) static const WCHAR dir_bnolinksW[] = {'B','N','O','L','I','N','K','S'}; static const WCHAR dir_bnoW[] = {'B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR dir_dosdevicesW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR dir_nlsW[] = {'N','L','S'}; static const WCHAR dir_windowsW[] = {'W','i','n','d','o','w','s'}; static const WCHAR dir_winstationsW[] = {'W','i','n','d','o','w','S','t','a','t','i','o','n','s'}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; static const struct unicode_str dir_bnolinks_str = {dir_bnolinksW, sizeof(dir_bnolinksW)}; static const struct unicode_str dir_bno_str = {dir_bnoW, sizeof(dir_bnoW)}; static const struct unicode_str dir_dosdevices_str = {dir_dosdevicesW, sizeof(dir_dosdevicesW)}; + static const struct unicode_str dir_nls_str = {dir_nlsW, sizeof(dir_nlsW)}; static const struct unicode_str dir_windows_str = {dir_windowsW, sizeof(dir_windowsW)}; static const struct unicode_str dir_winstations_str = {dir_winstationsW, sizeof(dir_winstationsW)}; @@ -278,6 +280,7 @@ static void create_session( unsigned int id ) dir_bno_global = create_directory( &root_directory->obj, &dir_bno_str, OBJ_PERMANENT, HASH_SIZE, NULL ); dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, OBJ_PERMANENT, HASH_SIZE, NULL ); dir_bnolinks = create_directory( &dir_sessions->obj, &dir_bnolinks_str, OBJ_PERMANENT, HASH_SIZE, NULL ); + release_object( create_directory( &root_directory->obj, &dir_nls_str, OBJ_PERMANENT, HASH_SIZE, NULL )); release_object( dir_bno_global ); release_object( dir_bnolinks ); release_object( dir_sessions );

1 0