wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Jacek Caban : winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 7b28bb433df2f4724f33b42cced6094215f77cfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b28bb433df2f4724f33b42c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:49:18 2021 +0200 winspool: Use DeviceCapabilitiesW for DeviceCapabilitiesA. 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 | 67 +++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f14ab103ded..d7f2b7fb7d1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -197,9 +197,6 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static DWORD (WINAPI *GDI_CallDeviceCapabilities16)( LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpdm ); static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput, LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, LPSTR lpszProfile, @@ -2464,34 +2461,56 @@ static void free_printer_info( void *data, DWORD level ) * DeviceCapabilitiesA [WINSPOOL.@] * */ -INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, - LPSTR pOutput, LPDEVMODEA lpdm) +INT WINAPI DeviceCapabilitiesA(const char *device, const char *portA, WORD cap, + char *output, DEVMODEA *devmodeA) { - INT ret; + WCHAR *device_name = NULL, *port = NULL; + DEVMODEW *devmode = NULL; + DWORD ret, len; - TRACE("%s,%s,%u,%p,%p\n", debugstr_a(pDevice), debugstr_a(pPort), cap, pOutput, lpdm); + 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 (!GDI_CallDeviceCapabilities16) - { - GDI_CallDeviceCapabilities16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), - (LPCSTR)104 ); - if (!GDI_CallDeviceCapabilities16) return -1; + len = MultiByteToWideChar(CP_ACP, 0, portA, -1, NULL, 0); + if (len) { + port = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, portA, -1, port, len); } - ret = GDI_CallDeviceCapabilities16(pDevice, pPort, cap, pOutput, lpdm); - /* If DC_PAPERSIZE map POINT16s to POINTs */ - if(ret != -1 && cap == DC_PAPERSIZE && pOutput) { - POINT16 *tmp = HeapAlloc( GetProcessHeap(), 0, ret * sizeof(POINT16) ); - POINT *pt = (POINT *)pOutput; - INT i; - memcpy(tmp, pOutput, ret * sizeof(POINT16)); - for(i = 0; i < ret; i++, pt++) - { - pt->x = tmp[i].x; - pt->y = tmp[i].y; + if (devmodeA) devmode = GdiConvertToDevmodeW( devmodeA ); + + if (output && (cap == DC_BINNAMES || cap == DC_FILEDEPENDENCIES || cap == DC_PAPERNAMES)) { + /* These need A -> W translation */ + unsigned int size = 0, i; + WCHAR *outputW; + + ret = DeviceCapabilitiesW(device_name, port, cap, NULL, devmode); + if (ret == -1) return ret; + + switch (cap) { + case DC_BINNAMES: + size = 24; + break; + case DC_PAPERNAMES: + case DC_FILEDEPENDENCIES: + size = 64; + break; } - HeapFree( GetProcessHeap(), 0, tmp ); + outputW = HeapAlloc(GetProcessHeap(), 0, size * ret * sizeof(WCHAR)); + ret = DeviceCapabilitiesW(device_name, port, cap, 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 = DeviceCapabilitiesW(device_name, port, cap, (WCHAR *)output, devmode); } + HeapFree(GetProcessHeap(), 0, device_name); + HeapFree(GetProcessHeap(), 0, devmode); + HeapFree(GetProcessHeap(), 0, port); return ret; }

1 0

Jacek Caban : winspool: Use configuration file for DeviceCapabilitiesW.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 13 Sep '21

13 Sep '21

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 13 Sep '21

13 Sep '21

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

Fabian Maurer : msi: Set dialog as parent in subsequent dialog.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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

Hans Leidekker : msi: Don't leak the file handle on error in cabinet_close_file_info().
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: a0a800ab1bd174e78b03d4592d1caca0322cd1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a800ab1bd174e78b03d459… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 13 12:05:00 2021 +0200 msi: Don't leak the file handle on error in cabinet_close_file_info(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index cc4648481ba..af6e83b893e 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint, data->mi->is_continuous = FALSE; if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) + { + CloseHandle(handle); return -1; + } if (!LocalFileTimeToFileTime(&ft, &ftLocal)) + { + CloseHandle(handle); return -1; + } if (!SetFileTime(handle, &ftLocal, 0, &ftLocal)) + { + CloseHandle(handle); return -1; + } CloseHandle(handle); - - data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, - data->user); + data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user); msi_free(data->curfile); data->curfile = NULL;

1 0

Alexandre Julliard : comdlg32: Fix path validation of UNC paths in the file dialog.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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 : ntoskrnl.exe/tests: Fix inverted winetest_win_skip condition.
by Alexandre Julliard 13 Sep '21

13 Sep '21

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

Rémi Bernon : hidclass.sys: Enforce output packet lengths to match report lengths.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 88a8e824e69a6160e6b87a354b2ab55f6fbe5278 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a8e824e69a6160e6b87a35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:58 2021 +0200 hidclass.sys: Enforce output packet lengths to match report lengths. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 3 --- dlls/dinput8/tests/driver_hid.h | 1 - dlls/dinput8/tests/hid.c | 3 --- dlls/hidclass.sys/device.c | 17 ++++++----------- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 7d613f1d92c..91f420d7bf6 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -389,7 +389,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); @@ -439,7 +438,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); @@ -489,7 +487,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) winetest_push_context( "%s expect[%d]", expect.context, index ); ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); - todo_wine_if( expect.todo_report_len ) ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); ok( RtlCompareMemory( packet->reportBuffer, expect.report_buf, expect.report_len ) == expect.report_len, "unexpected data\n" ); diff --git a/dlls/dinput8/tests/driver_hid.h b/dlls/dinput8/tests/driver_hid.h index e7202594c25..c9c75c6d081 100644 --- a/dlls/dinput8/tests/driver_hid.h +++ b/dlls/dinput8/tests/driver_hid.h @@ -48,7 +48,6 @@ struct hid_expect DWORD ret_status; BYTE broken; /* missing on some win versions */ BYTE report_id; - BYTE todo_report_len; BYTE report_len; BYTE report_buf[128]; char context[64]; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 5bcfc5b9f83..85ccc2a05df 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -946,7 +946,6 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, { .code = IOCTL_HID_SET_FEATURE, .report_id = report_id, - .todo_report_len = TRUE, .report_len = report_len - (report_id ? 0 : 1), .report_buf = { @@ -1048,7 +1047,6 @@ static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len, { .code = IOCTL_HID_SET_OUTPUT_REPORT, .report_id = report_id, - .todo_report_len = TRUE, .report_len = report_len - (report_id ? 0 : 1), .report_buf = {report_id,0,0xcd,0xcd,0xcd}, .ret_length = 3, @@ -1135,7 +1133,6 @@ static void test_write_file( HANDLE file, int report_id, ULONG report_len ) { .code = IOCTL_HID_WRITE_REPORT, .report_id = report_id, - .todo_report_len = report_id == 0, .report_len = report_len - (report_id ? 0 : 1), .report_buf = {report_id ? report_id : 0xcd,0xcd,0xcd,0xcd,0xcd}, .ret_length = 3, diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9b91834267e..71fb4a366db 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -365,7 +365,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP HIDP_REPORT_IDS *reports = ext->u.pdo.device_desc.ReportIDs; ULONG report_count = ext->u.pdo.device_desc.ReportIDsLength; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG i, report_len = 0, buffer_len = 0; + ULONG i, offset = 0, report_len = 0, buffer_len = 0; HID_XFER_PACKET packet; BYTE *buffer = NULL; @@ -402,6 +402,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP irp->IoStatus.Status = STATUS_INVALID_PARAMETER; return; } + if (!reports[i].ReportID) offset = 1; switch (code) { @@ -423,26 +424,20 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP return; } - packet.reportId = buffer[0]; - packet.reportBuffer = buffer; - packet.reportBufferLen = buffer_len; - - if (!reports[i].ReportID) - { - packet.reportId = 0; - packet.reportBuffer++; - packet.reportBufferLen--; - } + packet.reportId = reports[i].ReportID; + packet.reportBuffer = buffer + offset; switch (code) { case IOCTL_HID_GET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: + packet.reportBufferLen = buffer_len - offset; call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); break; case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: case IOCTL_HID_WRITE_REPORT: + packet.reportBufferLen = report_len - offset; call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; break;

1 0

Rémi Bernon : dinput8/tests: Control expected GET_INPUT reports from the test executable.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 29b90620c17082ca9a17f94e2c91afd46d121134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b90620c17082ca9a17f94e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 10:48:57 2021 +0200 dinput8/tests: Control expected GET_INPUT reports from the test executable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 14 ++-- dlls/dinput8/tests/hid.c | 137 ++++++++++++++++++++++++++++------------ 2 files changed, 105 insertions(+), 46 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 528f4af9939..7d613f1d92c 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -411,10 +411,16 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); - memset( packet->reportBuffer, 0xa5, 3 ); - if (report_id) ((char *)packet->reportBuffer)[0] = report_id; - irp->IoStatus.Information = 3; - ret = STATUS_SUCCESS; + expect_queue_next( &expect_queue, code, packet, &index, &expect, FALSE ); + winetest_push_context( "%s expect[%d]", expect.context, index ); + ok( expect.code == code, "got %#x, expected %#x\n", expect.code, code ); + ok( packet->reportId == expect.report_id, "got id %u\n", packet->reportId ); + ok( packet->reportBufferLen == expect.report_len, "got len %u\n", packet->reportBufferLen ); + winetest_pop_context(); + + memcpy( packet->reportBuffer, expect.report_buf, expect.ret_length ); + irp->IoStatus.Information = expect.ret_length; + ret = expect.ret_status; break; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index b8188690c1d..5bcfc5b9f83 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -743,6 +743,100 @@ static void set_hid_expect_( int line, HANDLE file, struct hid_expect *expect, D ok( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %u\n", GetLastError() ); } +static void test_hidp_get_input( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) +{ + struct hid_expect expect[] = + { + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .report_id = report_id, + .report_len = report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,2}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .report_id = report_id, + .report_len = 2 * report_len - (report_id ? 0 : 1), + .report_buf = {report_id ? report_id : 0xa5,0xa5,1}, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }, + }; + + char buffer[200], report[200]; + NTSTATUS status; + ULONG length; + BOOL ret; + + memset( report, 0xcd, sizeof(report) ); + status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed, report, report_len ); + ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, 0 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, report_len - 1 ); + ok( !ret, "HidD_GetInputReport succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + + if (!report_id) + { + struct hid_expect broken_expect = + { + .code = IOCTL_HID_GET_INPUT_REPORT, + .broken = TRUE, + .report_len = report_len - 1, + .report_buf = + { + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a,0x5a, + 0x5a,0x5a,0x5a,0x5a,0x5a, + }, + .ret_length = 3, + .ret_status = STATUS_SUCCESS, + }; + + set_hid_expect( file, &broken_expect, sizeof(broken_expect) ); + } + + SetLastError( 0xdeadbeef ); + memset( buffer, 0x5a, sizeof(buffer) ); + ret = HidD_GetInputReport( file, buffer, report_len ); + if (report_id || broken( !ret ) /* w7u */) + { + ok( !ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), + "HidD_GetInputReport returned error %u\n", GetLastError() ); + } + else + { + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); + } + + set_hid_expect( file, expect, sizeof(expect) ); + + SetLastError( 0xdeadbeef ); + ret = HidD_GetInputReport( file, report, report_len ); + ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + SetLastError( 0xdeadbeef ); + length = report_len * 2; + ret = sync_ioctl( file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &length ); + ok( ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError() ); + ok( length == 3, "got length %u, expected 3\n", length ); + ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); + + set_hid_expect( file, NULL, 0 ); +} + static void test_hidp_get_feature( HANDLE file, int report_id, ULONG report_len, PHIDP_PREPARSED_DATA preparsed ) { struct hid_expect expect[] = @@ -1938,48 +2032,7 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status ); ok( value == 0xfffffd0b, "got value %x, expected %#x\n", value, 0xfffffd0b ); - memset( report, 0xcd, sizeof(report) ); - status = HidP_InitializeReportForID( HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength ); - ok( status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, 0 ); - ok( !ret, "HidD_GetInputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, caps.InputReportByteLength - 1 ); - ok( !ret, "HidD_GetInputReport succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetInputReport returned error %u\n", GetLastError() ); - - SetLastError( 0xdeadbeef ); - memset( buffer, 0x5a, sizeof(buffer) ); - ret = HidD_GetInputReport( file, buffer, caps.InputReportByteLength ); - if (report_id || broken( !ret ) /* w7u */) - { - ok( !ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError() ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken( GetLastError() == ERROR_CRC ), - "HidD_GetInputReport returned error %u\n", GetLastError() ); - } - else - { - ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); - ok( buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0] ); - } - - SetLastError( 0xdeadbeef ); - ret = HidD_GetInputReport( file, report, caps.InputReportByteLength ); - ok( ret, "HidD_GetInputReport failed, last error %u\n", GetLastError() ); - ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); - - SetLastError( 0xdeadbeef ); - value = caps.InputReportByteLength * 2; - ret = sync_ioctl( file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value ); - ok( ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError() ); - ok( value == 3, "got length %u, expected 3\n", value ); - ok( report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id ); - + test_hidp_get_input( file, report_id, caps.InputReportByteLength, preparsed_data ); test_hidp_get_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_feature( file, report_id, caps.FeatureReportByteLength, preparsed_data ); test_hidp_set_output( file, report_id, caps.OutputReportByteLength, preparsed_data );

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021