- Wine-Devel - list.winehq.org

Re: [PATCH 4/5] dlls/msvcrt: add support for restrict and unaligned qualifiers in demangling
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119097 Your paranoid android. === w7u_2qxl (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_adm (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_el (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8adm (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (32 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_2qxl (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_adm (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_en_AE_u8 (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ar (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ja (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_zh_CN (64 bit report) === msvcrt: cpp.c:1307: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1310: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)"

1 0

Re: [PATCH 3/5] dlls/msvcrt: fix and cleanup undecoration of templatized functions and methods
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119096 Your paranoid android. === w7u_2qxl (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_adm (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_el (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8adm (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (32 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_2qxl (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_adm (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_en_AE_u8 (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ar (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ja (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_zh_CN (64 bit report) === msvcrt: cpp.c:1306: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1309: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)"

1 0

Re: [PATCH 2/5] msvcrt: add support for C++11 operator "" in demangling
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119095 Your paranoid android. === w7u_2qxl (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_adm (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w7u_el (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w8adm (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (32 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w864 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1507 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064v1809 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_2qxl (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_adm (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w1064_tsign (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_en_AE_u8 (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ar (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_ja (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)" === w10pro64_zh_CN (64 bit report) === msvcrt: cpp.c:1305: Test failed: 132: Got name "??__K_l@@YA?AUCC@@I(a)Z" cpp.c:1308: Test failed: 132: Expected "struct CC __cdecl operator "" _l(unsigned int)"

1 0

[PATCH v2] winspool.drv: Implement OpenPrinter2.
by Dmitry Timoshkov July 15, 2022

July 15, 2022

v2: Forward OpenPrinter() to OpenPrinter2(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 96 +++++++++++++++++++---------- dlls/winspool.drv/winspool.drv.spec | 2 + include/winspool.h | 29 ++++++++- 3 files changed, 92 insertions(+), 35 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 482f70a2235..e1cd0338207 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1990,32 +1990,9 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) * See OpenPrinterW. * */ -BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, - LPPRINTER_DEFAULTSA pDefault) +BOOL WINAPI OpenPrinterA(LPSTR name, HANDLE *printer, PRINTER_DEFAULTSA *defaults) { - UNICODE_STRING lpPrinterNameW; - UNICODE_STRING usBuffer; - PRINTER_DEFAULTSW DefaultW, *pDefaultW = NULL; - PWSTR pwstrPrinterNameW; - BOOL ret; - - TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); - - pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); - - if(pDefault) { - DefaultW.pDatatype = asciitounicode(&usBuffer,pDefault->pDatatype); - DefaultW.pDevMode = pDefault->pDevMode ? GdiConvertToDevmodeW(pDefault->pDevMode) : NULL; - DefaultW.DesiredAccess = pDefault->DesiredAccess; - pDefaultW = &DefaultW; - } - ret = OpenPrinterW(pwstrPrinterNameW, phPrinter, pDefaultW); - if(pDefault) { - RtlFreeUnicodeString(&usBuffer); - HeapFree(GetProcessHeap(), 0, DefaultW.pDevMode); - } - RtlFreeUnicodeString(&lpPrinterNameW); - return ret; + return OpenPrinter2A(name, printer, defaults, NULL); } /****************************************************************** @@ -2045,22 +2022,73 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, *| pDefaults is ignored * */ -BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) +BOOL WINAPI OpenPrinterW(LPWSTR name, HANDLE *printer, PRINTER_DEFAULTSW *defaults) +{ + return OpenPrinter2W(name, printer, defaults, NULL); +} + +BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, + PRINTER_DEFAULTSA *defaults, PRINTER_OPTIONSA *options) +{ + UNICODE_STRING nameU; + UNICODE_STRING datatypeU; + PRINTER_DEFAULTSW defaultsW, *p_defaultsW = NULL; + PRINTER_OPTIONSW optionsW, *p_optionsW = NULL; + WCHAR *nameW; + BOOL ret; + + TRACE("(%s,%p,%p,%p)\n", debugstr_a(name), printer, defaults, options); + + nameW = asciitounicode(&nameU, name); + + if (options) + { + optionsW.cbSize = sizeof(optionsW); + optionsW.dwFlags = options->dwFlags; + p_optionsW = &optionsW; + } + + if (defaults) + { + defaultsW.pDatatype = asciitounicode(&datatypeU, defaults->pDatatype); + defaultsW.pDevMode = defaults->pDevMode ? GdiConvertToDevmodeW(defaults->pDevMode) : NULL; + defaultsW.DesiredAccess = defaults->DesiredAccess; + p_defaultsW = &defaultsW; + } + + ret = OpenPrinter2W(nameW, printer, p_defaultsW, p_optionsW); + + if (p_defaultsW) + { + RtlFreeUnicodeString(&datatypeU); + HeapFree(GetProcessHeap(), 0, defaultsW.pDevMode); + } + RtlFreeUnicodeString(&nameU); + + return ret; +} + +BOOL WINAPI OpenPrinter2W(LPWSTR name, HANDLE *printer, + PRINTER_DEFAULTSW *defaults, PRINTER_OPTIONSW *options) { HKEY key; - TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); + TRACE("(%s,%p,%p,%p)\n", debugstr_w(name), printer, defaults, options); - if(!phPrinter) { + if (options) + FIXME("flags %08lx ignored\n", options->dwFlags); + + if(!printer) + { /* NT: FALSE with ERROR_INVALID_PARAMETER, 9x: TRUE */ - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } /* Get the unique handle of the printer or Printserver */ - *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); + *printer = get_opened_printer_entry( name, defaults ); - if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) + if (*printer && WINSPOOL_GetOpenedPrinterRegKey( *printer, &key ) == ERROR_SUCCESS) { DWORD deleting = 0, size = sizeof( deleting ), type; DWORD status; @@ -2070,12 +2098,12 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU set_reg_DWORD( key, L"Status", status & ~PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); ReleaseMutex( init_mutex ); if (!deleting && (status & PRINTER_STATUS_DRIVER_UPDATE_NEEDED)) - update_driver( *phPrinter ); + update_driver( *printer ); RegCloseKey( key ); } - TRACE("returning %d with %lu and %p\n", *phPrinter != NULL, GetLastError(), *phPrinter); - return (*phPrinter != 0); + TRACE("returning %d with %lu and %p\n", *printer != NULL, GetLastError(), *printer); + return (*printer != NULL); } /****************************************************************** diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index d7bb49bd34b..39c2613a4a0 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -149,6 +149,8 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stdcall OpenPrinter2A(str ptr ptr ptr) +@ stdcall OpenPrinter2W(wstr ptr ptr ptr) @ stdcall PerfClose() @ stdcall PerfCollect(wstr ptr ptr ptr) @ stdcall PerfOpen(wstr) diff --git a/include/winspool.h b/include/winspool.h index db8773ec418..ef39104ea30 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1143,6 +1143,30 @@ typedef struct _BIDI_RESPONSE_CONTAINER { BIDI_RESPONSE_DATA aData[1]; } BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; +typedef enum _PRINTER_OPTION_FLAGS +{ + PRINTER_OPTION_NO_CACHE = 1 << 0, + PRINTER_OPTION_CACHE = 1 << 1, + PRINTER_OPTION_CLIENT_CHANGE = 1 << 2, + PRINTER_OPTION_NO_CLIENT_DATA = 1 << 3, +} PRINTER_OPTION_FLAGS; + +typedef struct _PRINTER_OPTIONSA +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSA, *PPRINTER_OPTIONSA, *LPPRINTER_OPTIONSA; + +typedef struct _PRINTER_OPTIONSW +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSW, *PPRINTER_OPTIONSW, *LPPRINTER_OPTIONSW; + +DECL_WINELIB_TYPE_AW(PRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(PPRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(LPPRINTER_OPTIONS) + /* string constants */ #define SPLREG_DEFAULT_SPOOL_DIRECTORYA "DefaultSpoolDirectory" @@ -1400,9 +1424,12 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault); - #define OpenPrinter WINELIB_NAME_AW(OpenPrinter) +BOOL WINAPI OpenPrinter2A(LPSTR,HANDLE *,PRINTER_DEFAULTSA *,PRINTER_OPTIONSA *); +BOOL WINAPI OpenPrinter2W(LPWSTR,HANDLE *,PRINTER_DEFAULTSW *,PRINTER_OPTIONSW *); +#define OpenPrinter2 WINELIB_NAME_AW(OpenPrinter2) + BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); #define ResetPrinter WINELIB_NAME_AW(ResetPrinter) -- 2.36.1

2 1

[PATCH] programs/services: Start service dependencies.
by Dmitry Timoshkov July 15, 2022

July 15, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/services/services.c | 39 +++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 2edc02d300c..08b7488473b 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1190,12 +1190,49 @@ static DWORD process_send_start_message(struct process_entry *process, BOOL shar return result; } +static DWORD start_service_deps(struct service_entry *service) +{ + struct service_entry *entry; + LPWSTR name; + DWORD err; + + if (!service->dependOnServices) + return ERROR_SUCCESS; + + for (name = service->dependOnServices; *name; name += lstrlenW(name) + 1) + { + entry = scmdatabase_find_service(service->db, name); + if (!entry) + { + WINE_ERR("Service %s depends on %s which doesn't exist\n", debugstr_w(service->name), debugstr_w(name)); + return ERROR_SERVICE_DEPENDENCY_DELETED; + } + + err = service_start(entry, 0, NULL); + if (err != ERROR_SUCCESS && err != ERROR_SERVICE_ALREADY_RUNNING) + { + WINE_FIXME("Dependent on service %s failed to start: %lu\n", + wine_dbgstr_w(entry->name), err); + return ERROR_SERVICE_DEPENDENCY_FAIL; + } + } + + return ERROR_SUCCESS; +} + DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv) { struct process_entry *process = NULL; BOOL shared_process; DWORD err; + err = start_service_deps(service); + if (err != ERROR_SUCCESS) + { + WINE_TRACE("returning %lu\n", err); + return err; + } + err = service_start_process(service, &process, &shared_process); if (err == ERROR_SUCCESS) { @@ -1221,7 +1258,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * release_process(process); } - WINE_TRACE("returning %ld\n", err); + WINE_TRACE("returning %lu\n", err); return err; } -- 2.36.1

2 4

[PATCH] winspool.drv: Implement OpenPrinter2.
by Dmitry Timoshkov July 15, 2022

July 15, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winspool.drv/info.c | 18 ++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ include/winspool.h | 29 ++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 482f70a2235..c536253317b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2078,6 +2078,24 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU return (*phPrinter != 0); } +BOOL WINAPI OpenPrinter2A(LPSTR name, HANDLE *printer, + PRINTER_DEFAULTSA *defaults, PRINTER_OPTIONSA *options) +{ + if (options) + FIXME("flags %08lx ignored\n", options->dwFlags); + + return OpenPrinterA(name, printer, defaults); +} + +BOOL WINAPI OpenPrinter2W(LPWSTR name, HANDLE *printer, + PRINTER_DEFAULTSW *defaults, PRINTER_OPTIONSW *options) +{ + if (options) + FIXME("flags %08lx ignored\n", options->dwFlags); + + return OpenPrinterW(name, printer, defaults); +} + /****************************************************************** * AddMonitorA [WINSPOOL.@] * diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index d7bb49bd34b..39c2613a4a0 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -149,6 +149,8 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stdcall OpenPrinter2A(str ptr ptr ptr) +@ stdcall OpenPrinter2W(wstr ptr ptr ptr) @ stdcall PerfClose() @ stdcall PerfCollect(wstr ptr ptr ptr) @ stdcall PerfOpen(wstr) diff --git a/include/winspool.h b/include/winspool.h index db8773ec418..ef39104ea30 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1143,6 +1143,30 @@ typedef struct _BIDI_RESPONSE_CONTAINER { BIDI_RESPONSE_DATA aData[1]; } BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; +typedef enum _PRINTER_OPTION_FLAGS +{ + PRINTER_OPTION_NO_CACHE = 1 << 0, + PRINTER_OPTION_CACHE = 1 << 1, + PRINTER_OPTION_CLIENT_CHANGE = 1 << 2, + PRINTER_OPTION_NO_CLIENT_DATA = 1 << 3, +} PRINTER_OPTION_FLAGS; + +typedef struct _PRINTER_OPTIONSA +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSA, *PPRINTER_OPTIONSA, *LPPRINTER_OPTIONSA; + +typedef struct _PRINTER_OPTIONSW +{ + UINT cbSize; + DWORD dwFlags; +} PRINTER_OPTIONSW, *PPRINTER_OPTIONSW, *LPPRINTER_OPTIONSW; + +DECL_WINELIB_TYPE_AW(PRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(PPRINTER_OPTIONS) +DECL_WINELIB_TYPE_AW(LPPRINTER_OPTIONS) + /* string constants */ #define SPLREG_DEFAULT_SPOOL_DIRECTORYA "DefaultSpoolDirectory" @@ -1400,9 +1424,12 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault); - #define OpenPrinter WINELIB_NAME_AW(OpenPrinter) +BOOL WINAPI OpenPrinter2A(LPSTR,HANDLE *,PRINTER_DEFAULTSA *,PRINTER_OPTIONSA *); +BOOL WINAPI OpenPrinter2W(LPWSTR,HANDLE *,PRINTER_DEFAULTSW *,PRINTER_OPTIONSW *); +#define OpenPrinter2 WINELIB_NAME_AW(OpenPrinter2) + BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault); BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault); #define ResetPrinter WINELIB_NAME_AW(ResetPrinter) -- 2.36.1

2 2

Re: [PATCH v4 2/2] win32u/window: Ignore changing WS_EX_TOPMOST for message-only windows.
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119088 Your paranoid android. === w10pro64_ja (64 bit report) === user32: win.c:189: Test failed: didn't get start_event win.c:10399: Test failed: WindowFromPoint returned 0000000000020338, expected 0000000000000000 win.c:10407: Test failed: WindowFromPoint returned 0000000000040336, expected 0000000000000000 win.c:10336: Test failed: transparent window didn't get WM_NCHITTEST message === debian11 (32 bit report) === user32: win.c:8992: Test failed: Unexpected event was delivered === debian11 (32 bit Hebrew:Israel report) === user32: win.c:8992: Test failed: Unexpected event was delivered === debian11 (32 bit Hindi:India report) === user32: win.c:8992: Test failed: Unexpected event was delivered

1 0

Re: [PATCH v4 1/2] user32/tests: Check that message-only windows ignore WS_EX_TOPMOST.
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119087 Your paranoid android. === w10pro64_ja (64 bit report) === user32: win.c:4558: Test failed: hwnd 00000000000C032A/00000000000C032A message 0200 win.c:4563: Test failed: hwnd 00000000000C032A/00000000000C032A message 0203 win.c:4567: Test failed: message 0202 available

1 0

[PATCH] include: Add dxcore.idl.
by Biswapriyo Nath July 15, 2022

July 15, 2022

4 8

Re: [PATCH v2 1/1] po: Update Korean translation.
by Marvin July 15, 2022

July 15, 2022

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119078 Your paranoid android. === debian11 (build log) === error: patch failed: po/ko.po:3972 Task: Patch failed to apply === debian11 (build log) === error: patch failed: po/ko.po:3972 Task: Patch failed to apply

1 0