September 2021 - Wine-commits

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

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

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 : 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 : wineps: Introduce DrvDocumentProperties entry point.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 0da3ffc4b941ec35e08b93ceb2981c1d42723a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da3ffc4b941ec35e08b93ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:49:44 2021 +0200 wineps: Introduce DrvDocumentProperties entry point. This is not compatible with native. We should use DrvDevicePropertySheets instead, but that requires support for CPSUI support first. 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 | 116 +++++++++++++++++++++------------------- dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 62 insertions(+), 55 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c4dcd405c26..18ede3d028d 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -435,19 +435,6 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPage) (LPCPROPSHEETPAGEW); static int (WINAPI *pPropertySheet) (LPCPROPSHEETHEADERW); -static PRINTERINFO *PSDRV_FindPrinterInfoA(LPCSTR name) -{ - int len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - PRINTERINFO *pi; - - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - pi = PSDRV_FindPrinterInfo( nameW ); - HeapFree( GetProcessHeap(), 0, nameW ); - - return pi; -} - /*********************************************************** * DEVMODEdupWtoA * @@ -489,27 +476,12 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) return dmA; } - /****************************************************************** - * PSDRV_ExtDeviceMode +/****************************************************************************** + * DrvDocumentProperties (wineps.drv.@) * * Retrieves or modifies device-initialization information for the PostScript * driver, or displays a driver-supplied dialog box for configuring the driver. * - * PARAMETERS - * lpszDriver -- Driver name - * hwnd -- Parent window for the dialog box - * lpdmOutput -- Address of a DEVMODE structure for writing initialization information - * lpszDevice -- Device name - * lpszPort -- Port name - * lpdmInput -- Address of a DEVMODE structure for reading initialization information - * lpProfile -- Name of initialization file, defaults to WIN.INI if NULL - * wMode -- Operation to perform. Can be a combination if > 0. - * (0) -- Returns number of bytes required by DEVMODE structure - * DM_UPDATE (1) -- Write current settings to environment and initialization file - * DM_COPY (2) -- Write current settings to lpdmOutput - * DM_PROMPT (4) -- Presents the driver's modal dialog box (USER.240) - * DM_MODIFY (8) -- Changes current settings according to lpdmInput before any other operation - * * RETURNS * Returns size of DEVMODE structure if wMode is 0. Otherwise, IDOK is returned for success * for both dialog and non-dialog operations. IDCANCEL is returned if the dialog box was cancelled. @@ -519,31 +491,29 @@ static DEVMODEA *DEVMODEdupWtoA( const DEVMODEW *dmW ) * * Just returns default devmode at the moment. No use of initialization file. */ -INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD dwMode) +INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *output, + DEVMODEW *input, DWORD mode) { - PRINTERINFO *pi = PSDRV_FindPrinterInfoA(lpszDevice); - if(!pi) return -1; + PRINTERINFO *pi; + + TRACE("(hwnd=%p, Device='%s', devOut=%p, devIn=%p, Mode=%04x)\n", + hwnd, debugstr_w(device), output, input, mode); - TRACE("(Driver=%s, hwnd=%p, devOut=%p, Device='%s', Port='%s', devIn=%p, Profile='%s', Mode=%04x)\n", - lpszDriver, hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, debugstr_a(lpszProfile), dwMode); + if (!(pi = PSDRV_FindPrinterInfo(device))) return -1; - /* If dwMode == 0, return size of DEVMODE structure */ - if(!dwMode) - return pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra - CCHDEVICENAME - CCHFORMNAME; + /* If mode == 0, return size of DEVMODE structure */ + if (!mode) + return pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra; /* If DM_MODIFY is set, change settings in accordance with lpdmInput */ - if((dwMode & DM_MODIFY) && lpdmInput) + if ((mode & DM_MODIFY) && input) { - DEVMODEW *dmW = GdiConvertToDevmodeW( lpdmInput ); - TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", lpdmInput->dmFields); - if (dmW) PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)dmW, pi); - HeapFree( GetProcessHeap(), 0, dmW ); + TRACE("DM_MODIFY set. devIn->dmFields = %08x\n", input->dmFields); + PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)input, pi); } /* If DM_PROMPT is set, present modal dialog box */ - if(dwMode & DM_PROMPT) { + if (mode & DM_PROMPT) { HINSTANCE hinstComctl32; HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEW psp; @@ -581,22 +551,58 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput } /* If DM_UPDATE is set, should write settings to environment and initialization file */ - if(dwMode & DM_UPDATE) + if (mode & DM_UPDATE) FIXME("Mode DM_UPDATE. Just do the same as DM_COPY\n"); /* If DM_COPY is set, should write settings to lpdmOutput */ - if((dwMode & DM_COPY) || (dwMode & DM_UPDATE)) { - if (lpdmOutput) - { - DEVMODEA *dmA = DEVMODEdupWtoA( &pi->Devmode->dmPublic ); + if (output && (mode & (DM_COPY | DM_UPDATE))) + memcpy( output, &pi->Devmode->dmPublic, + pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra ); + return IDOK; +} + +INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, + LPSTR lpszDevice, LPSTR lpszPort, LPDEVMODEA lpdmInput, + LPSTR lpszProfile, DWORD dwMode) +{ + DEVMODEW *outputW = NULL, *inputW = NULL; + WCHAR *device = NULL; + unsigned int len; + int ret; + + len = MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, NULL, 0); + if (len) { + device = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, device, len); + } + + if (lpdmOutput && (dwMode & (DM_COPY | DM_UPDATE))) { + ret = DrvDocumentProperties(hwnd, device, NULL, NULL, 0); + if (ret <= 0) { + HeapFree(GetProcessHeap(), 0, device); + return -1; + } + outputW = HeapAlloc(GetProcessHeap(), 0, ret); + } + + if (lpdmInput) inputW = GdiConvertToDevmodeW( lpdmInput ); + + ret = DrvDocumentProperties(hwnd, device, outputW, inputW, dwMode); + + if (ret >= 0 && outputW && (dwMode & (DM_COPY | DM_UPDATE))) { + DEVMODEA *dmA = DEVMODEdupWtoA( outputW ); if (dmA) memcpy( lpdmOutput, dmA, dmA->dmSize + dmA->dmDriverExtra ); HeapFree( GetProcessHeap(), 0, dmA ); } - else - FIXME("lpdmOutput is NULL what should we do??\n"); - } - return IDOK; + + HeapFree(GetProcessHeap(), 0, device); + HeapFree(GetProcessHeap(), 0, inputW); + HeapFree(GetProcessHeap(), 0, outputW); + + if (!dwMode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; + return ret; } + /*********************************************************************** * PSDRV_DeviceCapabilities * diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 6cd7e680350..4dbdc0a2998 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -2,3 +2,4 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) +@ stdcall DrvDocumentProperties(long ptr wstr ptr long)

1 0

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

13 Sep '21

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

Jacek Caban : winspool: Use DocumentPropertiesW for DocumentPropertiesA.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 8eddb793a6f287cdaa3d9952d07e752b7755a3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eddb793a6f287cdaa3d9952… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:50:24 2021 +0200 winspool: Use DocumentPropertiesW for DocumentPropertiesA. 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 | 82 +++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 76c83345ebb..edfdab218c4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -198,11 +198,6 @@ static opened_printer_t **printer_handles; static UINT nb_printer_handles; static LONG next_job_id = 1; -static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput, - LPSTR lpszDevice, LPSTR lpszPort, - LPDEVMODEA lpdmInput, LPSTR lpszProfile, - DWORD fwMode ); - static const WCHAR DriversW[] = { 'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'c','o','n','t','r','o','l','\\', @@ -394,18 +389,6 @@ static LPWSTR strdupW(LPCWSTR p) return ret; } -static LPSTR strdupWtoA( LPCWSTR str ) -{ - LPSTR ret; - INT len; - - if (!str) return NULL; - len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - ret = HeapAlloc( GetProcessHeap(), 0, len ); - if(ret) WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - return ret; -} - static DEVMODEW *dup_devmode( const DEVMODEW *dm ) { DEVMODEW *ret; @@ -2513,46 +2496,47 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, /****************************************************************** * DocumentPropertiesA [WINSPOOL.@] - * - * FIXME: implement DocumentPropertiesA via DocumentPropertiesW, not vice versa */ -LONG WINAPI DocumentPropertiesA(HWND hWnd,HANDLE hPrinter, - LPSTR pDeviceName, LPDEVMODEA pDevModeOutput, - LPDEVMODEA pDevModeInput,DWORD fMode ) +LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DEVMODEA *output, + DEVMODEA *input, DWORD mode) { - LPSTR lpName = pDeviceName, dupname = NULL; - static CHAR port[] = "LPT1:"; - LONG ret; + DEVMODEW *outputW = NULL, *inputW = NULL; + WCHAR *device = NULL; + unsigned int len; + int ret; - TRACE("(%p,%p,%s,%p,%p,%d)\n", - hWnd,hPrinter,pDeviceName,pDevModeOutput,pDevModeInput,fMode - ); + TRACE("(%p,%p,%s,%p,%p,%d)\n", hwnd, printer, debugstr_a(device_name), output, input, mode); - if(!pDeviceName || !*pDeviceName) { - LPCWSTR lpNameW = get_opened_printer_name(hPrinter); - if(!lpNameW) { - ERR("no name from hPrinter?\n"); - SetLastError(ERROR_INVALID_HANDLE); - return -1; - } - lpName = dupname = strdupWtoA(lpNameW); + len = MultiByteToWideChar(CP_ACP, 0, device_name, -1, NULL, 0); + if (len) { + device = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, device_name, -1, device, len); } - if (!GDI_CallExtDeviceMode16) - { - GDI_CallExtDeviceMode16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), - (LPCSTR)102 ); - if (!GDI_CallExtDeviceMode16) { - ERR("No CallExtDeviceMode16?\n"); - ret = -1; - goto end; - } + if (output && (mode & (DM_COPY | DM_UPDATE))) { + ret = DocumentPropertiesW(hwnd, printer, device, NULL, NULL, 0); + if (ret <= 0) { + HeapFree(GetProcessHeap(), 0, device); + return -1; + } + outputW = HeapAlloc(GetProcessHeap(), 0, ret); } - ret = GDI_CallExtDeviceMode16(hWnd, pDevModeOutput, lpName, port, - pDevModeInput, NULL, fMode); -end: - HeapFree(GetProcessHeap(), 0, dupname); + if (input) inputW = GdiConvertToDevmodeW(input); + + ret = DocumentPropertiesW(hwnd, printer, device, outputW, inputW, mode); + + if (ret >= 0 && outputW && (mode & (DM_COPY | DM_UPDATE))) { + DEVMODEA *dmA = DEVMODEdupWtoA( outputW ); + if (dmA) memcpy(output, dmA, dmA->dmSize + dmA->dmDriverExtra); + HeapFree(GetProcessHeap(), 0, dmA); + } + + HeapFree(GetProcessHeap(), 0, device); + HeapFree(GetProcessHeap(), 0, inputW); + HeapFree(GetProcessHeap(), 0, outputW); + + if (!mode && ret > 0) ret -= CCHDEVICENAME + CCHFORMNAME; return ret; }

1 0

Jacek Caban : gdi32: Remove ordinal exports.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 689046b2162a7eaade0b6902eadb7b7396628640 URL: https://source.winehq.org/git/wine.git/?a=commit;h=689046b2162a7eaade0b6902… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 13 13:50:58 2021 +0200 gdi32: Remove ordinal exports. We no longer need them for our winspool and they are not present on Windows. 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/gdi32/driver.c | 134 -------------------------------------------------- dlls/gdi32/gdi32.spec | 7 --- 2 files changed, 141 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d5528128089..ea857599b93 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -935,140 +935,6 @@ BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) } -/***************************************************************************** - * @ [GDI32.100] - * - * This should thunk to 16-bit and simply call the proc with the given args. - */ -INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd, - LPSTR lpModelName, LPSTR OldPort, LPSTR NewPort ) -{ - FIXME("(%p, %p, %s, %s, %s)\n", lpfnDevInstallProc, hWnd, lpModelName, OldPort, NewPort ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.101] - * - * This should load the correct driver for lpszDevice and calls this driver's - * ExtDeviceModePropSheet proc. - * - * Note: The driver calls a callback routine for each property sheet page; these - * pages are supposed to be filled into the structure pointed to by lpPropSheet. - * The layout of this structure is: - * - * struct - * { - * DWORD nPages; - * DWORD unknown; - * HPROPSHEETPAGE pages[10]; - * }; - */ -INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice, - LPCSTR lpszPort, LPVOID lpPropSheet ) -{ - FIXME("(%p, %s, %s, %p)\n", hWnd, lpszDevice, lpszPort, lpPropSheet ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.102] - * - * This should load the correct driver for lpszDevice and call this driver's - * ExtDeviceMode proc. - * - * FIXME: convert ExtDeviceMode to unicode in the driver interface - */ -INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, - LPDEVMODEA lpdmOutput, LPSTR lpszDevice, - LPSTR lpszPort, LPDEVMODEA lpdmInput, - LPSTR lpszProfile, DWORD fwMode ) -{ - WCHAR deviceW[300]; - WCHAR bufW[300]; - char buf[300]; - HDC hdc; - DC *dc; - INT ret = -1; - - TRACE("(%p, %p, %s, %s, %p, %s, %d)\n", - hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode ); - - if (!lpszDevice) return -1; - if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1; - - if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1; - - if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); - ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode ); - release_dc_ptr( dc ); - } - DeleteDC( hdc ); - return ret; -} - -/**************************************************************************** - * @ [GDI32.103] - * - * This should load the correct driver for lpszDevice and calls this driver's - * AdvancedSetupDialog proc. - */ -INT WINAPI GDI_CallAdvancedSetupDialog16( HWND hwnd, LPSTR lpszDevice, - LPDEVMODEA devin, LPDEVMODEA devout ) -{ - TRACE("(%p, %s, %p, %p)\n", hwnd, lpszDevice, devin, devout ); - return -1; -} - -/***************************************************************************** - * @ [GDI32.104] - * - * This should load the correct driver for lpszDevice and calls this driver's - * DeviceCapabilities proc. - * - * FIXME: convert DeviceCapabilities to unicode in the driver interface - */ -DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, - WORD fwCapability, LPSTR lpszOutput, - LPDEVMODEA lpdm ) -{ - WCHAR deviceW[300]; - WCHAR bufW[300]; - char buf[300]; - HDC hdc; - DC *dc; - INT ret = -1; - - TRACE("(%s, %s, %d, %p, %p)\n", lpszDevice, lpszPort, fwCapability, lpszOutput, lpdm ); - - if (!lpszDevice) return -1; - if (!MultiByteToWideChar(CP_ACP, 0, lpszDevice, -1, deviceW, 300)) return -1; - - if(!DRIVER_GetDriverName( deviceW, bufW, 300 )) return -1; - - if (!WideCharToMultiByte(CP_ACP, 0, bufW, -1, buf, 300, NULL, NULL)) return -1; - - if (!(hdc = CreateICA( buf, lpszDevice, lpszPort, NULL ))) return -1; - - if ((dc = get_dc_ptr( hdc ))) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities ); - ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, - fwCapability, lpszOutput, lpdm ); - release_dc_ptr( dc ); - } - DeleteDC( hdc ); - return ret; -} - - /****************************************************************************** * NtGdiExtEscape (win32u.@) * diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 81a4dd5d1e9..6dbc8a9bf12 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -1,10 +1,3 @@ -# ordinal exports -100 stdcall @(long long str str str) GDI_CallDevInstall16 -101 stdcall @(long str str ptr) GDI_CallExtDeviceModePropSheet16 -102 stdcall @(long ptr str str ptr str long) GDI_CallExtDeviceMode16 -103 stdcall @(long str ptr ptr) GDI_CallAdvancedSetupDialog16 -104 stdcall @(str str long ptr ptr) GDI_CallDeviceCapabilities16 - @ stdcall AbortDoc(long) @ stdcall AbortPath(long) @ stdcall AddFontMemResourceEx(ptr long ptr ptr)

1 0

Alexandre Julliard : Revert "kernel32: Forward power request functions to ntdll."
by Alexandre Julliard 13 Sep '21

13 Sep '21

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

Alexandre Julliard : Revert "ntdll: Stub power request APIs."
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 1649785bec36564ddae4e6821ba2f240e981f60e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1649785bec36564ddae4e682… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 10 22:49:34 2021 +0200 Revert "ntdll: Stub power request APIs." This reverts commit ca2b7012496c4a97d7c03bc34b388592fd1157f5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51741 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 ------ dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unix/system.c | 30 ------------------------------ dlls/wow64/sync.c | 37 ------------------------------------- dlls/wow64/syscall.h | 3 --- include/winternl.h | 20 -------------------- 6 files changed, 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1649785bec36564ddae4…

1 0