September 2021 - Wine-Commits

Fabian Maurer : msi: Set dialog as parent in subsequent dialog.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 4b88e290521ef9fde9290c9bcbae7420966a6f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b88e290521ef9fde9290c9b… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 12 01:56:58 2021 +0200 msi: Set dialog as parent in subsequent dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..6463c3062ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3904,7 +3904,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,9 +3917,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name ));

1 0

Alexandre Julliard : comdlg32: Fix path validation of UNC paths in the file dialog.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: c8e2802391b060a5ff7fe7b0f9db08fa186ad1c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e2802391b060a5ff7fe7b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 13 17:47:48 2021 +0200 comdlg32: Fix path validation of UNC paths in the file dialog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0ada09aad96..0f74c85fcd8 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2454,11 +2454,16 @@ int FILEDLG95_ValidatePathAction(LPWSTR lpstrPathAndFile, IShellFolder **ppsf, LPWSTR p; lstrcpyW(lpwstrTemp, lpszTemp); - p = PathFindNextComponentW(lpwstrTemp); - - if (!p) break; /* end of path */ - - *p = 0; + if (lpszTemp == lpstrPathAndFile && (p = PathSkipRootW(lpwstrTemp))) + { + *p = 0; + } + else + { + p = PathFindNextComponentW(lpwstrTemp); + if (!p) break; /* end of path */ + *p = 0; + } lpszTemp = lpszTemp + lstrlenW(lpwstrTemp); /* There are no wildcards when OFN_NOVALIDATE is set */

1 0

Rémi Bernon : dinput8/tests: Fix inverted winetest_win_skip condition.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 7e1609db5f63aecb157b0ffee42d1f1b7005ced6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e1609db5f63aecb157b0ffe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:52 2021 +0200 dinput8/tests: Fix inverted winetest_win_skip condition. And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index 8fad343157d..42d12a0cf27 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -326,7 +326,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf( msg, args ); InterlockedIncrement( &skipped ); } @@ -347,7 +347,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start( args, msg ); - if (running_under_wine) winetest_vskip( msg, args ); + if (!running_under_wine) winetest_vskip( msg, args ); else winetest_vok( 0, msg, args ); __ms_va_end( args ); }

1 0

Rémi Bernon : ntoskrnl.exe/tests: Fix inverted winetest_win_skip condition.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 757325bf7712ae4fecd974f1a52a38586423037e URL: https://source.winehq.org/git/wine.git/?a=commit;h=757325bf7712ae4fecd974f1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:59 2021 +0200 ntoskrnl.exe/tests: Fix inverted winetest_win_skip condition. And change skipped test message. It's not really useful and it will fail the tests if the main test summary doesn't match the number of skipped messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h index f73f6f938ca..98fe3f97864 100644 --- a/dlls/ntoskrnl.exe/tests/utils.h +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -306,7 +306,7 @@ static inline void winetest_vskip( const char *msg, __ms_va_list args ) { if (winetest_add_line() < winetest_mute_threshold) { - winetest_print_context( "Tests skipped: " ); + winetest_print_context( "Driver tests skipped: " ); kvprintf(msg, args); InterlockedIncrement(&skipped); } @@ -328,7 +328,7 @@ static inline void WINAPIV winetest_win_skip( const char *msg, ... ) { __ms_va_list args; __ms_va_start(args, msg); - if (running_under_wine) + if (!running_under_wine) winetest_vskip(msg, args); else winetest_vok(0, msg, args);

1 0

Jacek Caban : winspool: Use configuration file for DeviceCapabilitiesW.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: afc7c0c9d1dabe8a01af3518025d67245318c7dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc7c0c9d1dabe8a01af3518… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:48:52 2021 +0200 winspool: Use configuration file for DeviceCapabilitiesW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 228 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 155 insertions(+), 73 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8a17355f120..f14ab103ded 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -119,6 +119,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" +#include "wine/rbtree.h" #include "wine/heap.h" #include "winnls.h" @@ -178,6 +179,18 @@ typedef struct { LPCWSTR versionsubdir; } printenv_t; +typedef struct +{ + struct wine_rb_entry entry; + HMODULE module; + LONG ref; + + /* entry points */ + DWORD (WINAPI *pDrvDeviceCapabilities)(HANDLE, const WCHAR *, WORD, void *, const DEVMODEW *); + + WCHAR name[1]; +} config_module_t; + /* ############################### */ static opened_printer_t **printer_handles; @@ -500,6 +513,127 @@ static inline const DWORD *form_string_info( DWORD level ) return NULL; } +/***************************************************************************** + * WINSPOOL_OpenDriverReg [internal] + * + * opens the registry for the printer drivers depending on the given input + * variable pEnvironment + * + * RETURNS: + * the opened hkey on success + * NULL on error + */ +static HKEY WINSPOOL_OpenDriverReg(const void *pEnvironment) +{ + HKEY retval = NULL; + LPWSTR buffer; + const printenv_t *env; + + TRACE("(%s)\n", debugstr_w(pEnvironment)); + + env = validate_envW(pEnvironment); + if (!env) return NULL; + + buffer = HeapAlloc( GetProcessHeap(), 0, + (strlenW(DriversW) + strlenW(env->envname) + + strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); + if(buffer) { + wsprintfW(buffer, DriversW, env->envname, env->versionregpath); + RegCreateKeyW(HKEY_LOCAL_MACHINE, buffer, &retval); + HeapFree(GetProcessHeap(), 0, buffer); + } + return retval; +} + +static CRITICAL_SECTION config_modules_cs; +static CRITICAL_SECTION_DEBUG config_modules_cs_debug = +{ + 0, 0, &config_modules_cs, + { &config_modules_cs_debug.ProcessLocksList, &config_modules_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": config_modules_cs") } +}; +static CRITICAL_SECTION config_modules_cs = { &config_modules_cs_debug, -1, 0, 0, 0, 0 }; + +static int compare_config_modules(const void *key, const struct wine_rb_entry *entry) +{ + config_module_t *module = WINE_RB_ENTRY_VALUE(entry, config_module_t, entry); + return lstrcmpiW(key, module->name); +} + +static struct wine_rb_tree config_modules = { compare_config_modules }; + +static void release_config_module(config_module_t *config_module) +{ + if (InterlockedDecrement(&config_module->ref)) return; + FreeLibrary(config_module->module); + HeapFree(GetProcessHeap(), 0, config_module); +} + +static config_module_t *get_config_module(const WCHAR *device, BOOL grab) +{ + WCHAR driver[MAX_PATH]; + DWORD size, len; + HKEY driver_key, device_key; + HMODULE driver_module; + config_module_t *ret = NULL; + struct wine_rb_entry *entry; + DWORD type; + LSTATUS res; + + EnterCriticalSection(&config_modules_cs); + entry = wine_rb_get(&config_modules, device); + if (entry) { + ret = WINE_RB_ENTRY_VALUE(entry, config_module_t, entry); + if (grab) InterlockedIncrement(&ret->ref); + goto ret; + } + if (!grab) goto ret; + + if (!(driver_key = WINSPOOL_OpenDriverReg(NULL))) goto ret; + + res = RegOpenKeyW(driver_key, device, &device_key); + RegCloseKey(driver_key); + if (res) { + WARN("Device %s key not found\n", debugstr_w(device)); + goto ret; + } + + size = sizeof(driver); + if (!GetPrinterDriverDirectoryW(NULL, NULL, 1, (LPBYTE)driver, size, &size)) goto ret; + + len = size / sizeof(WCHAR) - 1; + driver[len++] = '\\'; + driver[len++] = '3'; + driver[len++] = '\\'; + size = sizeof(driver) - len * sizeof(WCHAR); + res = RegQueryValueExW(device_key, Configuration_FileW, NULL, &type, + (BYTE *)(driver + len), &size); + RegCloseKey(device_key); + if (res || type != REG_SZ) { + WARN("no configuration file: %u\n", res); + goto ret; + } + + if (!(driver_module = LoadLibraryW(driver))) { + WARN("Could not load %s\n", debugstr_w(driver)); + goto ret; + } + + len = lstrlenW(device); + if (!(ret = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(config_module_t, name[len + 1])))) + goto ret; + + ret->ref = 2; /* one for config_module and one for the caller */ + ret->module = driver_module; + ret->pDrvDeviceCapabilities = (void *)GetProcAddress(driver_module, "DrvDeviceCapabilities"); + lstrcpyW(ret->name, device); + + wine_rb_put(&config_modules, ret->name, &ret->entry); +ret: + LeaveCriticalSection(&config_modules_cs); + return ret; +} + /****************************************************************** * verify, that the filename is a local file * @@ -2361,57 +2495,28 @@ INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, return ret; } - /***************************************************************************** * DeviceCapabilitiesW [WINSPOOL.@] * - * Call DeviceCapabilitiesA since we later call 16bit stuff anyway - * */ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pOutput, const DEVMODEW *pDevMode) { - LPDEVMODEA dmA = DEVMODEdupWtoA(pDevMode); - LPSTR pDeviceA = strdupWtoA(pDevice); - LPSTR pPortA = strdupWtoA(pPort); - INT ret; + config_module_t *config; + int ret; - TRACE("%s,%s,%u,%p,%p\n", debugstr_w(pDevice), debugstr_w(pPort), fwCapability, pOutput, pDevMode); - - if(pOutput && (fwCapability == DC_BINNAMES || - fwCapability == DC_FILEDEPENDENCIES || - fwCapability == DC_PAPERNAMES)) { - /* These need A -> W translation */ - INT size = 0, i; - LPSTR pOutputA; - ret = DeviceCapabilitiesA(pDeviceA, pPortA, fwCapability, NULL, - dmA); - if(ret == -1) - return ret; - switch(fwCapability) { - case DC_BINNAMES: - size = 24; - break; - case DC_PAPERNAMES: - case DC_FILEDEPENDENCIES: - size = 64; - break; - } - pOutputA = HeapAlloc(GetProcessHeap(), 0, size * ret); - ret = DeviceCapabilitiesA(pDeviceA, pPortA, fwCapability, pOutputA, - dmA); - for(i = 0; i < ret; i++) - MultiByteToWideChar(CP_ACP, 0, pOutputA + (i * size), -1, - pOutput + (i * size), size); - HeapFree(GetProcessHeap(), 0, pOutputA); - } else { - ret = DeviceCapabilitiesA(pDeviceA, pPortA, fwCapability, - (LPSTR)pOutput, dmA); + TRACE("%s,%s,%u,%p,%p\n", debugstr_w(pDevice), debugstr_w(pPort), fwCapability, + pOutput, pDevMode); + + if (!(config = get_config_module(pDevice, TRUE))) { + WARN("Could not load config module for %s\n", debugstr_w(pDevice)); + return 0; } - HeapFree(GetProcessHeap(),0,pPortA); - HeapFree(GetProcessHeap(),0,pDeviceA); - HeapFree(GetProcessHeap(),0,dmA); + + ret = config->pDrvDeviceCapabilities(NULL /* FIXME */, pDevice, fwCapability, + pOutput, pDevMode); + release_config_module(config); return ret; } @@ -3186,38 +3291,6 @@ BOOL WINAPI GetPrintProcessorDirectoryW(LPWSTR server, LPWSTR env, return backend->fpGetPrintProcessorDirectory(server, env, level, Info, cbBuf, pcbNeeded); } -/***************************************************************************** - * WINSPOOL_OpenDriverReg [internal] - * - * opens the registry for the printer drivers depending on the given input - * variable pEnvironment - * - * RETURNS: - * the opened hkey on success - * NULL on error - */ -static HKEY WINSPOOL_OpenDriverReg( LPCVOID pEnvironment) -{ - HKEY retval = NULL; - LPWSTR buffer; - const printenv_t * env; - - TRACE("(%s)\n", debugstr_w(pEnvironment)); - - env = validate_envW(pEnvironment); - if (!env) return NULL; - - buffer = HeapAlloc( GetProcessHeap(), 0, - (strlenW(DriversW) + strlenW(env->envname) + - strlenW(env->versionregpath) + 1) * sizeof(WCHAR)); - if(buffer) { - wsprintfW(buffer, DriversW, env->envname, env->versionregpath); - RegCreateKeyW(HKEY_LOCAL_MACHINE, buffer, &retval); - HeapFree(GetProcessHeap(), 0, buffer); - } - return retval; -} - /***************************************************************************** * set_devices_and_printerports [internal] * @@ -3499,6 +3572,7 @@ BOOL WINAPI DeleteFormW( HANDLE printer, WCHAR *name ) BOOL WINAPI DeletePrinter(HANDLE hPrinter) { LPCWSTR lpNameW = get_opened_printer_name(hPrinter); + config_module_t *config_module; HKEY hkeyPrinters, hkey; WCHAR def[MAX_PATH]; DWORD size = ARRAY_SIZE(def); @@ -3507,6 +3581,14 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter) SetLastError(ERROR_INVALID_HANDLE); return FALSE; } + + EnterCriticalSection(&config_modules_cs); + if ((config_module = get_config_module(lpNameW, FALSE))) { + wine_rb_remove(&config_modules, &config_module->entry); + release_config_module(config_module); + } + LeaveCriticalSection(&config_modules_cs); + if(RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { RegDeleteTreeW(hkeyPrinters, lpNameW); RegCloseKey(hkeyPrinters);

1 0

Jacek Caban : wineps.drv: Export DrvDeviceCapabilities.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: a8c4020029af1d61c76a94c13431d228ea321bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8c4020029af1d61c76a94c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:48:30 2021 +0200 wineps.drv: Export DrvDeviceCapabilities. Allows wineps.drv to act as printer configuration interface DLL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 101 +++++++++++++++++++++++++++++----------- dlls/wineps.drv/wineps.drv.spec | 3 ++ include/ddk/winddiui.h | 1 + 3 files changed, 78 insertions(+), 27 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 27e1c6e03c8..c4dcd405c26 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "psdrv.h" +#include "ddk/winddiui.h" #include "winuser.h" #include "wine/wingdi16.h" @@ -612,40 +613,87 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput * Returns * Result depends on the setting of fwCapability. -1 indicates failure. */ -DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, LPDEVMODEA lpDevMode) +DWORD CDECL PSDRV_DeviceCapabilities(char *driver, const char *device, const char *port, + WORD capability, char *output, DEVMODEA *devmodeA) +{ + WCHAR *device_name = NULL; + DEVMODEW *devmode = NULL; + DWORD ret, len; + + len = MultiByteToWideChar(CP_ACP, 0, device, -1, NULL, 0); + if (len) { + device_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, device, -1, device_name, len); + } + + if (devmodeA) devmode = GdiConvertToDevmodeW( devmodeA ); + + if (output && (capability == DC_BINNAMES || + capability == DC_FILEDEPENDENCIES || + capability == DC_PAPERNAMES)) { + /* These need A -> W translation */ + unsigned int size = 0, i; + WCHAR *outputW; + + ret = DrvDeviceCapabilities(NULL, device_name, capability, NULL, devmode); + if (ret == -1) return ret; + + switch (capability) { + case DC_BINNAMES: + size = 24; + break; + case DC_PAPERNAMES: + case DC_FILEDEPENDENCIES: + size = 64; + break; + } + outputW = HeapAlloc(GetProcessHeap(), 0, size * ret * sizeof(WCHAR)); + ret = DrvDeviceCapabilities(NULL, device_name, capability, outputW, devmode); + for (i = 0; i < ret; i++) + WideCharToMultiByte(CP_ACP, 0, outputW + (i * size), -1, + output + (i * size), size, NULL, NULL); + HeapFree(GetProcessHeap(), 0, outputW); + } else { + ret = DrvDeviceCapabilities(NULL, device_name, capability, output, devmode); + } + HeapFree(GetProcessHeap(), 0, device_name); + HeapFree(GetProcessHeap(), 0, devmode); + return ret; +} + +/****************************************************************************** + * DrvDeviceCapabilities (wineps.drv.@) + */ +DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capability, + void *output, DEVMODEW *devmode) { PRINTERINFO *pi; DEVMODEW *lpdm; DWORD ret; - pi = PSDRV_FindPrinterInfoA(lpszDevice); - TRACE("%s %s %s, %u, %p, %p\n", debugstr_a(lpszDriver), debugstr_a(lpszDevice), - debugstr_a(lpszPort), fwCapability, lpszOutput, lpDevMode); + TRACE("%s %u, %p, %p\n", debugstr_w(device_name), capability, output, devmode); - if (!pi) { - ERR("no printer info for %s %s, return 0!\n", - debugstr_a(lpszDriver), debugstr_a(lpszDevice)); + if (!(pi = PSDRV_FindPrinterInfo(device_name))) { + ERR("no printer info for %s, return 0!\n", debugstr_w(device_name)); return 0; } lpdm = &pi->Devmode->dmPublic; - if (lpDevMode) lpdm = GdiConvertToDevmodeW( lpDevMode ); + if (devmode) lpdm = devmode; - switch(fwCapability) { + switch(capability) { case DC_PAPERS: { PAGESIZE *ps; - WORD *wp = (WORD *)lpszOutput; + WORD *wp = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { TRACE("DC_PAPERS: %u\n", ps->WinPage); i++; - if(lpszOutput != NULL) - *wp++ = ps->WinPage; + if (output != NULL) *wp++ = ps->WinPage; } ret = i; break; @@ -654,14 +702,14 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_PAPERSIZE: { PAGESIZE *ps; - POINT16 *pt = (POINT16 *)lpszOutput; + POINT16 *pt = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { TRACE("DC_PAPERSIZE: %f x %f\n", ps->PaperDimension->x, ps->PaperDimension->y); i++; - if(lpszOutput != NULL) { + if (output != NULL) { pt->x = paper_size_from_points( ps->PaperDimension->x ); pt->y = paper_size_from_points( ps->PaperDimension->y ); pt++; @@ -674,15 +722,15 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_PAPERNAMES: { PAGESIZE *ps; - char *cp = lpszOutput; + WCHAR *cp = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) { TRACE("DC_PAPERNAMES: %s\n", debugstr_a(ps->FullName)); i++; - if(lpszOutput != NULL) { - lstrcpynA(cp, ps->FullName, 64); + if (output != NULL) { + MultiByteToWideChar(CP_ACP, 0, ps->FullName, -1, cp, 64); cp += 64; } } @@ -697,13 +745,13 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_BINS: { INPUTSLOT *slot; - WORD *wp = (WORD *)lpszOutput; + WORD *wp = output; int i = 0; LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) { i++; - if (lpszOutput != NULL) + if (output != NULL) *wp++ = slot->WinBin; } ret = i; @@ -713,15 +761,15 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_BINNAMES: { INPUTSLOT *slot; - char *cp = lpszOutput; + WCHAR *cp = output; int i = 0; LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) { i++; - if (lpszOutput != NULL) + if (output != NULL) { - lstrcpynA( cp, slot->FullName, 24 ); + MultiByteToWideChar(CP_ACP, 0, slot->FullName, -1, cp, 24); cp += 24; } } @@ -737,13 +785,13 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR case DC_ENUMRESOLUTIONS: { RESOLUTION *res; - LONG *lp = (LONG *)lpszOutput; + LONG *lp = output; int i = 0; LIST_FOR_EACH_ENTRY(res, &pi->ppd->Resolutions, RESOLUTION, entry) { i++; - if (lpszOutput != NULL) + if (output != NULL) { lp[0] = res->resx; lp[1] = res->resy; @@ -936,11 +984,10 @@ DWORD CDECL PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR break; default: - FIXME("Unsupported capability %d\n", fwCapability); + FIXME("Unsupported capability %d\n", capability); ret = -1; } - if (lpDevMode) HeapFree( GetProcessHeap(), 0, lpdm ); return ret; } diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 176b9ac2f4b..6cd7e680350 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -1 +1,4 @@ @ cdecl wine_get_gdi_driver(long) PSDRV_get_gdi_driver + +# Printer driver config exports +@ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) diff --git a/include/ddk/winddiui.h b/include/ddk/winddiui.h index 7c6e775b588..b5d0c707d81 100644 --- a/include/ddk/winddiui.h +++ b/include/ddk/winddiui.h @@ -40,6 +40,7 @@ extern "C" { #define PRINTER_EVENT_FLAG_NO_UI 1 +DWORD WINAPI DrvDeviceCapabilities(HANDLE, WCHAR *, WORD, void *, DEVMODEW *); BOOL WINAPI DrvDriverEvent(DWORD, DWORD, LPBYTE, LPARAM); BOOL WINAPI DrvPrinterEvent(LPWSTR, INT, DWORD, LPARAM);

1 0

Jan Sikorski : wined3d: Allow constant buffers to be forced to be write-mappable.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 9d9d44e44bde3099228e033fe90ca8f62f5dcc13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9d44e44bde3099228e033f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Sep 10 09:49:03 2021 +0200 wined3d: Allow constant buffers to be forced to be write-mappable. Using a registry setting. Games sometimes use DEFAULT usage and no CPU access combined with UpdateSubresource() for often-changing constants, causing us to interrupt the render pass and transfer through a staging buffer on each update. In such cases forcing the buffers to be mappable greatly increases performance. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 +++++++-- dlls/wined3d/wined3d_main.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index da61f36af45..3ea3bf4b180 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1139,6 +1139,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_R8_UNORM, desc->bind_flags); struct wined3d_resource *resource = &buffer->resource; + unsigned int access; HRESULT hr; TRACE("buffer %p, device %p, desc byte_width %u, usage %s, bind_flags %s, " @@ -1164,8 +1165,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_INVALIDARG; } + access = desc->access; + if (desc->bind_flags & WINED3D_BIND_CONSTANT_BUFFER && wined3d_settings.cb_access_map_w) + access |= WINED3D_RESOURCE_ACCESS_MAP_W; + if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, access, desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); @@ -1179,7 +1184,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING - || wined3d_resource_access_is_managed(desc->access)) + || wined3d_resource_access_is_managed(access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6e93b8dc683..a360eadecc9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -394,6 +394,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.renderer = WINED3D_RENDERER_NO3D; } } + if (!get_config_key_dword(hkey, appkey, "cb_access_map_w", &tmpvalue) && tmpvalue) + { + TRACE("Forcing all constant buffers to be write-mappable.\n"); + wined3d_settings.cb_access_map_w = TRUE; + } } if (appkey) RegCloseKey( appkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86c053df0db..4b9fc8d9ae8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -482,6 +482,7 @@ struct wined3d_settings unsigned int max_sm_cs; enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; + BOOL cb_access_map_w; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

1 0

Jacek Caban : winspool: Use configuration file for DocumentPropertiesW.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: 68feb134af0538d7fc589c2ddb6403de9cea1055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68feb134af0538d7fc589c2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:50:08 2021 +0200 winspool: Use configuration file for DocumentPropertiesW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 77 +++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 54 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d7f2b7fb7d1..76c83345ebb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -187,6 +187,7 @@ typedef struct /* entry points */ DWORD (WINAPI *pDrvDeviceCapabilities)(HANDLE, const WCHAR *, WORD, void *, const DEVMODEW *); + INT (WINAPI *pDrvDocumentProperties)(HWND, const WCHAR *, DEVMODEW *, DEVMODEW *, DWORD); WCHAR name[1]; } config_module_t; @@ -623,6 +624,7 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) ret->ref = 2; /* one for config_module and one for the caller */ ret->module = driver_module; ret->pDrvDeviceCapabilities = (void *)GetProcAddress(driver_module, "DrvDeviceCapabilities"); + ret->pDrvDocumentProperties = (void *)GetProcAddress(driver_module, "DrvDocumentProperties"); lstrcpyW(ret->name, device); wine_rb_put(&config_modules, ret->name, &ret->entry); @@ -1878,36 +1880,6 @@ static job_t *get_job(HANDLE hprn, DWORD JobId) return NULL; } -/*********************************************************** - * DEVMODEcpyAtoW - */ -static LPDEVMODEW DEVMODEcpyAtoW(DEVMODEW *dmW, const DEVMODEA *dmA) -{ - BOOL Formname; - ptrdiff_t off_formname = (const char *)dmA->dmFormName - (const char *)dmA; - DWORD size; - - Formname = (dmA->dmSize > off_formname); - size = dmA->dmSize + CCHDEVICENAME + (Formname ? CCHFORMNAME : 0); - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)dmA->dmDeviceName, -1, - dmW->dmDeviceName, CCHDEVICENAME); - if(!Formname) { - memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, - dmA->dmSize - CCHDEVICENAME); - } else { - memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, - off_formname - CCHDEVICENAME); - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)dmA->dmFormName, -1, - dmW->dmFormName, CCHFORMNAME); - memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA->dmSize - - (off_formname + CCHFORMNAME)); - } - dmW->dmSize = size; - memcpy((char *)dmW + dmW->dmSize, (const char *)dmA + dmA->dmSize, - dmA->dmDriverExtra); - return dmW; -} - /****************************************************************** * convert_printerinfo_W_to_A [internal] * @@ -2587,39 +2559,36 @@ end: /***************************************************************************** * DocumentPropertiesW (WINSPOOL.@) - * - * FIXME: implement DocumentPropertiesA via DocumentPropertiesW, not vice versa */ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPWSTR pDeviceName, LPDEVMODEW pDevModeOutput, LPDEVMODEW pDevModeInput, DWORD fMode) { - - LPSTR pDeviceNameA = strdupWtoA(pDeviceName); - LPDEVMODEA pDevModeInputA; - LPDEVMODEA pDevModeOutputA = NULL; + config_module_t *config = NULL; + const WCHAR *device = NULL; LONG ret; TRACE("(%p,%p,%s,%p,%p,%d)\n", - hWnd,hPrinter,debugstr_w(pDeviceName),pDevModeOutput,pDevModeInput, - fMode); - if(pDevModeOutput) { - ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, NULL, NULL, 0); - if(ret < 0) return ret; - pDevModeOutputA = HeapAlloc(GetProcessHeap(), 0, ret); - } - pDevModeInputA = (fMode & DM_IN_BUFFER) ? DEVMODEdupWtoA(pDevModeInput) : NULL; - ret = DocumentPropertiesA(hWnd, hPrinter, pDeviceNameA, pDevModeOutputA, - pDevModeInputA, fMode); - if(pDevModeOutput) { - DEVMODEcpyAtoW(pDevModeOutput, pDevModeOutputA); - HeapFree(GetProcessHeap(),0,pDevModeOutputA); - } - if(fMode == 0 && ret > 0) - ret += (CCHDEVICENAME + CCHFORMNAME); - HeapFree(GetProcessHeap(),0,pDevModeInputA); - HeapFree(GetProcessHeap(),0,pDeviceNameA); + hWnd, hPrinter, debugstr_w(pDeviceName), pDevModeOutput, pDevModeInput, fMode); + + device = pDeviceName && pDeviceName[0] ? pDeviceName : get_opened_printer_name(hPrinter); + if (!device) { + ERR("no device name\n"); + return -1; + } + + config = get_config_module(device, TRUE); + if (!config) { + ERR("Could not load config module for %s\n", debugstr_w(device)); + return -1; + } + + /* FIXME: This uses Wine-specific config file entry point. + * We should use DrvDevicePropertySheets instead (requires CPSUI support first). + */ + ret = config->pDrvDocumentProperties(hWnd, device, pDevModeOutput, pDevModeInput, fMode); + release_config_module(config); return ret; }

1 0

Alexandre Julliard : Revert "kernel32: Forward power request functions to ntdll."
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: c40c0450dbfdf18d16d52d08dd0cfcbbfa559f24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c40c0450dbfdf18d16d52d08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 22:46:53 2021 +0200 Revert "kernel32: Forward power request functions to ntdll." This reverts commit 49ffaddf9bc4d3fbf73abb16c31dec48b48b9a6f. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51741 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 8c55686c552..ca62019b256 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -19,8 +19,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -28,7 +26,6 @@ #include "winternl.h" #include "kernel_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(powermgnt); @@ -147,35 +144,10 @@ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) */ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) { - COUNTED_REASON_CONTEXT nt_context; - HANDLE handle; - NTSTATUS status; - WCHAR module_name[MAX_PATH]; - - TRACE( "(%p)\n", context ); - - nt_context.Version = context->Version; - nt_context.Flags = context->Flags; - if (context->Flags & POWER_REQUEST_CONTEXT_SIMPLE_STRING) - RtlInitUnicodeString( &nt_context.u.SimpleString, context->Reason.SimpleReasonString ); - else if (context->Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) - { - int i; - - GetModuleFileNameW( context->Reason.Detailed.LocalizedReasonModule, module_name, ARRAY_SIZE(module_name) ); - RtlInitUnicodeString( &nt_context.u.s.ResourceFileName, module_name ); - nt_context.u.s.ResourceReasonId = context->Reason.Detailed.LocalizedReasonId; - nt_context.u.s.StringCount = context->Reason.Detailed.ReasonStringCount; - nt_context.u.s.ReasonStrings = heap_alloc( nt_context.u.s.StringCount * sizeof(UNICODE_STRING) ); - for (i = 0; i < nt_context.u.s.StringCount; i++) - RtlInitUnicodeString( &nt_context.u.s.ReasonStrings[i], context->Reason.Detailed.ReasonStrings[i] ); - } + FIXME("(%p): stub\n", context); - status = NtCreatePowerRequest( &handle, &nt_context ); - if (nt_context.Flags & POWER_REQUEST_CONTEXT_DETAILED_STRING) - heap_free( nt_context.u.s.ReasonStrings ); - if (!set_ntstatus( status )) return INVALID_HANDLE_VALUE; - return handle; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return INVALID_HANDLE_VALUE; } /*********************************************************************** @@ -183,7 +155,10 @@ HANDLE WINAPI PowerCreateRequest(REASON_CONTEXT *context) */ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) { - return set_ntstatus( NtSetPowerRequest( request, type )); + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -191,5 +166,8 @@ BOOL WINAPI PowerSetRequest(HANDLE request, POWER_REQUEST_TYPE type) */ BOOL WINAPI PowerClearRequest(HANDLE request, POWER_REQUEST_TYPE type) { - return set_ntstatus( NtClearPowerRequest( request, type )); + FIXME("(%p, %u): stub\n", request, type); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; }

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Sept. 13, 2021

Sept. 13, 2021

Module: wine Branch: master Commit: df71272b0c373dafd5882a8c683c0dd84c0ac797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df71272b0c373dafd5882a8c… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Sep 12 11:14:32 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Bob <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 452 ++++++++++++++++++++++++------------------------------------ 1 file changed, 183 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df71272b0c373dafd588…

1 0