wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Rémi Bernon : win32u: Force update display cache after NtUserChangeDisplaySettingsEx.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 0f1d8329f050f90273352e5a67dec888a7e26215 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f1d8329f050f90273352e5a67dec8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 27 11:24:13 2022 +0200 win32u: Force update display cache after NtUserChangeDisplaySettingsEx. --- dlls/win32u/sysparams.c | 3 +++ dlls/winemac.drv/display.c | 4 +--- dlls/winex11.drv/display.c | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index d2e5a2f1e2b..98ef5b276b7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2443,6 +2443,9 @@ static LONG apply_display_settings( const WCHAR *devname, const DEVMODEW *devmod free( displays ); if (ret) return ret; + if (!update_display_cache( TRUE )) + WARN( "Failed to update display cache after mode change.\n" ); + if ((adapter = find_adapter( NULL ))) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e5dbadde332..e18e57281f7 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -830,9 +830,7 @@ LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, HWND hwnd, DWORD flags, L bpp, mode->dmDisplayFrequency); ret = DISP_CHANGE_BADMODE; } - else if (macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) - macdrv_init_display_devices(TRUE); - else + else if (!macdrv_set_display_mode(&macdrv_displays[0], best_display_mode)) { WARN("Failed to set display mode\n"); ret = DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 572b81aa491..2a4a34e2c02 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -418,8 +418,6 @@ LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, HWND hwnd, DWORD flags, ret = apply_display_settings( displays, ids, FALSE ); if (ret == DISP_CHANGE_SUCCESSFUL) ret = apply_display_settings( displays, ids, TRUE ); - if (ret == DISP_CHANGE_SUCCESSFUL) - X11DRV_DisplayDevices_Init(TRUE); done: free( ids );

1 0

Rémi Bernon : win32u: Add a BOOL force parameter to update_display_cache.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 8a9c34edb54d8403405701ceeb0807d53d562fbf URL: https://gitlab.winehq.org/wine/wine/-/commit/8a9c34edb54d8403405701ceeb0807… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 11:45:22 2022 +0200 win32u: Add a BOOL force parameter to update_display_cache. And call it recursively with force = TRUE instead of calling graphics driver pUpdateDisplayDevices separately. --- dlls/win32u/sysparams.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index da1b3bbcd2e..d2e5a2f1e2b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1512,7 +1512,7 @@ static BOOL update_display_cache_from_registry(void) return ret; } -static BOOL update_display_cache(void) +static BOOL update_display_cache( BOOL force ) { HWINSTA winstation = NtUserGetProcessWindowStation(); struct device_manager_ctx ctx = {0}; @@ -1529,17 +1529,7 @@ static BOOL update_display_cache(void) return TRUE; } - user_driver->pUpdateDisplayDevices( &device_manager, FALSE, &ctx ); - release_display_manager_ctx( &ctx ); - - if (update_display_cache_from_registry()) return TRUE; - if (ctx.gpu_count) - { - ERR( "driver reported devices, but we failed to read them\n" ); - return FALSE; - } - - if (!user_driver->pUpdateDisplayDevices( &device_manager, TRUE, &ctx )) + if (!user_driver->pUpdateDisplayDevices( &device_manager, force, &ctx ) && force) { static const DEVMODEW modes[] = { @@ -1578,15 +1568,27 @@ static BOOL update_display_cache(void) if (!update_display_cache_from_registry()) { - ERR( "failed to read display config\n" ); - return FALSE; + if (force) + { + ERR( "Failed to read display config.\n" ); + return FALSE; + } + + if (ctx.gpu_count) + { + ERR( "Driver reported devices, but we failed to read them.\n" ); + return FALSE; + } + + return update_display_cache( TRUE ); } + return TRUE; } static BOOL lock_display_devices(void) { - if (!update_display_cache()) return FALSE; + if (!update_display_cache( FALSE )) return FALSE; pthread_mutex_lock( &display_lock ); return TRUE; }

1 0

Hans Leidekker : bcrypt: Validate hash output length.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d75f651404028baa23d2591edf222837a167f790 URL: https://gitlab.winehq.org/wine/wine/-/commit/d75f651404028baa23d2591edf2228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 12:09:38 2022 +0100 bcrypt: Validate hash output length. --- dlls/bcrypt/bcrypt_main.c | 19 ++++++++++++------- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index e2eb8e95057..266c30fa426 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -496,7 +496,7 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, UCHAR * return STATUS_SUCCESS; } -static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, UCHAR *output, ULONG size ) +static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, UCHAR *output ) { switch (alg_id) { @@ -920,8 +920,7 @@ static NTSTATUS hash_prepare( struct hash *hash ) struct hash_impl temp; if ((status = hash_init( &temp, hash->alg_id ))) return status; if ((status = hash_update( &temp, hash->alg_id, hash->secret, hash->secret_len ))) return status; - if ((status = hash_finish( &temp, hash->alg_id, buffer, - builtin_algorithms[hash->alg_id].hash_length ))) return status; + if ((status = hash_finish( &temp, hash->alg_id, buffer ))) return status; } else memcpy( buffer, hash->secret, hash->secret_len ); @@ -1050,15 +1049,15 @@ static NTSTATUS hash_finalize( struct hash *hash, UCHAR *output, ULONG size ) if (!(hash->flags & HASH_FLAG_HMAC)) { - if ((status = hash_finish( &hash->inner, hash->alg_id, output, size ))) return status; + if ((status = hash_finish( &hash->inner, hash->alg_id, output ))) return status; if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; } hash_length = builtin_algorithms[hash->alg_id].hash_length; - if ((status = hash_finish( &hash->inner, hash->alg_id, buffer, hash_length ))) return status; + if ((status = hash_finish( &hash->inner, hash->alg_id, buffer ))) return status; if ((status = hash_update( &hash->outer, hash->alg_id, buffer, hash_length ))) return status; - if ((status = hash_finish( &hash->outer, hash->alg_id, output, size ))) return status; + if ((status = hash_finish( &hash->outer, hash->alg_id, output ))) return status; if (hash->flags & HASH_FLAG_REUSABLE) return hash_prepare( hash ); return STATUS_SUCCESS; @@ -1071,7 +1070,7 @@ NTSTATUS WINAPI BCryptFinishHash( BCRYPT_HASH_HANDLE handle, UCHAR *output, ULON TRACE( "%p, %p, %lu, %#lx\n", handle, output, size, flags ); if (!hash) return STATUS_INVALID_HANDLE; - if (!output) return STATUS_INVALID_PARAMETER; + if (!output || size != builtin_algorithms[hash->alg_id].hash_length) return STATUS_INVALID_PARAMETER; return hash_finalize( hash, output, size ); } @@ -1086,8 +1085,14 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE handle, UCHAR *secret, ULONG secre TRACE( "%p, %p, %lu, %p, %lu, %p, %lu\n", handle, secret, secret_len, input, input_len, output, output_len ); if (!alg) return STATUS_INVALID_HANDLE; + if (!output) return STATUS_INVALID_PARAMETER; if ((status = hash_create( alg, secret, secret_len, 0, &hash ))) return status; + if (output_len != builtin_algorithms[hash->alg_id].hash_length) + { + hash_destroy( hash ); + return STATUS_INVALID_PARAMETER; + } if ((status = hash_update( &hash->inner, hash->alg_id, input, input_len ))) { hash_destroy( hash ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index d30e8888e49..2035ce346e6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -330,8 +330,23 @@ static void test_hash(const struct hash_test *test) if (pBCryptHash) { + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, NULL, 0, hash_buf, 20); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), NULL, 20); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), hash_buf, 21); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = pBCryptHash(BCRYPT_SHA1_ALG_HANDLE, NULL, 0, (UCHAR *)"test", sizeof("test"), hash_buf, 20); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptCreateHash(BCRYPT_SHA1_ALG_HANDLE, &hash, NULL, 0, NULL, 0, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptFinishHash(hash, hash_buf, 21, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptFinishHash(hash, hash_buf, 20, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); }

1 0

Hans Leidekker : bcrypt: Use get_object() in more places.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d1291ebd4030c3ecc2f30199b963015077ab218c URL: https://gitlab.winehq.org/wine/wine/-/commit/d1291ebd4030c3ecc2f30199b96301… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:12:01 2022 +0200 bcrypt: Use get_object() in more places. --- dlls/bcrypt/bcrypt_main.c | 114 +++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 51 deletions(-)

1 0

Hans Leidekker : rsaenh: Pass exact size to BCryptFinishHash().
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 4e3b28709303b93b716e72b21abd6461009775a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e3b28709303b93b716e72b21abd64… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 1 15:08:30 2022 +0100 rsaenh: Pass exact size to BCryptFinishHash(). --- dlls/rsaenh/implglue.c | 4 ++-- dlls/rsaenh/implglue.h | 2 +- dlls/rsaenh/rsaenh.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index b4fe985af9b..636fe4b6ee0 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -70,9 +70,9 @@ BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD return TRUE; } -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) { - BCryptFinishHash(hash_handle, pbHashValue, RSAENH_MAX_HASH_SIZE, 0); + BCryptFinishHash(hash_handle, hash_value, hash_size, 0); BCryptDestroyHash(hash_handle); return TRUE; } diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 06fa3f4430a..423474dc52e 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -41,7 +41,7 @@ typedef union tagKEY_CONTEXT { BOOL init_hash_impl(ALG_ID aiAlgid, BCRYPT_HASH_HANDLE *hash_handle) DECLSPEC_HIDDEN; BOOL update_hash_impl(BCRYPT_HASH_HANDLE hash_handle, const BYTE *pbData, DWORD dwDataLen) DECLSPEC_HIDDEN; -BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *pbHashValue) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(BCRYPT_HASH_HANDLE hash_handle, BYTE *hash_value, DWORD hash_size) DECLSPEC_HIDDEN; BOOL duplicate_hash_impl(BCRYPT_HASH_HANDLE src_hash_handle, BCRYPT_HASH_HANDLE *dest_hash_handle) DECLSPEC_HIDDEN; diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index beac3c7e850..3a2d7126ca4 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -816,7 +816,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) if (pCryptHash->pHMACInfo) { BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); memcpy(abHashValue, pCryptHash->abHashValue, pCryptHash->dwHashSize); init_hash_impl(pCryptHash->pHMACInfo->HashAlgid, &pCryptHash->hash_handle); update_hash_impl(pCryptHash->hash_handle, @@ -824,7 +824,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) pCryptHash->pHMACInfo->cbOuterString); update_hash_impl(pCryptHash->hash_handle, abHashValue, pCryptHash->dwHashSize); - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); pCryptHash->hash_handle = NULL; } break; @@ -842,7 +842,7 @@ static inline void finalize_hash(CRYPTHASH *pCryptHash) break; default: - finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue); + finalize_hash_impl(pCryptHash->hash_handle, pCryptHash->abHashValue, pCryptHash->dwHashSize); pCryptHash->hash_handle = NULL; } }

1 0

Martin Storsjö : winegcc: Prefer -Wl,--pdb=<file> over -Wl,-pdb,<file>.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 6705a710450b015de9f378a4a4480b7623c837ad URL: https://gitlab.winehq.org/wine/wine/-/commit/6705a710450b015de9f378a4a4480b… Author: Martin Storsjö <martin(a)martin.st> Date: Thu Oct 20 23:52:13 2022 +0300 winegcc: Prefer -Wl,--pdb=<file> over -Wl,-pdb,<file>. The previously used syntax, -Wl,-pdb,<file>, was the originally supported one in lld (since 2018). Later (in 2019) the second syntax was added, allowing both -Wl,-pdb=<file> and -Wl,-pdb,<file>. (This other parameter syntax allows easier distinguishing an empty argument, for letting the linker implicitly pick the file name.) Move over to using the more modern syntax - reducing the usage of the old form of the option. This potentially allows deprecating the original syntax and maybe allows using --pdb as a boolean flag for implying an automatically named PDB file (which currently requires using the awkward syntax "--pdb="). Also prefer the long two dashes form, i.e. --pdb instead of -pdb; the single dash form is only allowed by getopt when there are no conflicts with single-letter options, while the form with two dashes is unambiguous. --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e40aa9270ec..ddd513e55d0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -464,7 +464,7 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, "-static-libgcc" ); if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) - strarray_add(&link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + strarray_add(&link_args, strmake("-Wl,--pdb=%s", opts->debug_file)); if (opts->out_implib) strarray_add(&link_args, strmake("-Wl,--out-implib,%s", opts->out_implib));

1 0

Piotr Caban : wineps.drv: Remove DrvDocumentProperties entry point.
by Alexandre Julliard 01 Nov '22

01 Nov '22

1 0

Piotr Caban : winspool.drv: Use DrvDocumentPropertySheets driver entry in DocumentProperties.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: d005d1ee60f3ab795a9ab82aafcb088cf1181ee9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d005d1ee60f3ab795a9ab82aafcb08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 29 21:47:18 2022 +0200 winspool.drv: Use DrvDocumentPropertySheets driver entry in DocumentProperties. --- dlls/winspool.drv/Makefile.in | 2 +- dlls/winspool.drv/info.c | 64 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index b4948ccb5e8..3f6d32cb44d 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,7 +1,7 @@ MODULE = winspool.drv UNIXLIB = winspool.so IMPORTLIB = winspool -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 compstui UNIX_CFLAGS = $(CUPS_CFLAGS) UNIX_LIBS = $(APPLICATIONSERVICES_LIBS) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3806384ee08..22422f7e966 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -51,6 +51,7 @@ #include "wine/heap.h" #include <wine/unixlib.h> +#include "ddk/compstui.h" #include "ddk/winsplp.h" #include "wspool.h" @@ -115,11 +116,27 @@ typedef struct /* entry points */ DWORD (WINAPI *pDrvDeviceCapabilities)(HANDLE, const WCHAR *, WORD, void *, const DEVMODEW *); - INT (WINAPI *pDrvDocumentProperties)(HWND, const WCHAR *, DEVMODEW *, DEVMODEW *, DWORD); + LONG (WINAPI *pDrvDocumentPropertySheets)(PROPSHEETUI_INFO*, LPARAM); WCHAR name[1]; } config_module_t; +typedef struct { + WORD cbSize; + WORD Reserved; + HANDLE hPrinter; + LPCWSTR pszPrinterName; + PDEVMODEW pdmIn; + PDEVMODEW pdmOut; + DWORD cbOut; + DWORD fMode; +} DOCUMENTPROPERTYHEADERW; + +typedef struct { + DOCUMENTPROPERTYHEADERW dph; + config_module_t *config; +} document_property_t; + /* ############################### */ static opened_printer_t **printer_handles; @@ -502,7 +519,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"); + ret->pDrvDocumentPropertySheets = (void *)GetProcAddress(driver_module, "DrvDocumentPropertySheets"); wcscpy( ret->name, device ); wine_rb_put(&config_modules, ret->name, &ret->entry); @@ -1896,6 +1913,18 @@ LONG WINAPI DocumentPropertiesA(HWND hwnd, HANDLE printer, char *device_name, DE return ret; } +static LONG WINAPI document_callback(PROPSHEETUI_INFO *info, LPARAM lparam) +{ + if (info->Reason == PROPSHEETUI_REASON_INIT) + { + document_property_t *dp = (document_property_t *)info->lParamInit; + + if (!info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PFNPROPSHEETUIW, + (LPARAM)dp->config->pDrvDocumentPropertySheets, (LPARAM)&dp->dph)) + return ERR_CPSUI_GETLASTERROR; + } + return CPSUI_OK; +} /***************************************************************************** * DocumentPropertiesW (WINSPOOL.@) @@ -1905,8 +1934,8 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, LPDEVMODEW pDevModeOutput, LPDEVMODEW pDevModeInput, DWORD fMode) { - config_module_t *config = NULL; - const WCHAR *device = NULL; + document_property_t dp; + const WCHAR *device; LONG ret; TRACE("(%p,%p,%s,%p,%p,%ld)\n", @@ -1918,17 +1947,30 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, return -1; } - config = get_config_module(device, TRUE); - if (!config) { + dp.dph.cbSize = sizeof(dp.dph); + dp.dph.Reserved = 0; + dp.dph.hPrinter = hPrinter; + dp.dph.pszPrinterName = device; + dp.dph.pdmIn = pDevModeInput; + dp.dph.pdmOut = pDevModeOutput; + dp.dph.cbOut = dp.dph.pdmOut ? dp.dph.pdmOut->dmSize : 0; + dp.dph.fMode = fMode; + dp.config = get_config_module(device, TRUE); + if (!dp.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); + if (!(fMode & ~(DM_IN_BUFFER | DM_OUT_BUFFER | DM_OUT_DEFAULT))) { + ret = dp.config->pDrvDocumentPropertySheets(NULL, (LPARAM)&dp.dph); + + if ((!fMode || !pDevModeOutput) && dp.dph.cbOut != ret) + FIXME("size mismatch: ret = %ld cbOut = %ld\n", ret, dp.dph.cbOut); + } else { + ret = CommonPropertySheetUIW(hWnd, document_callback, (LPARAM)&dp, NULL); + } + + release_config_module(dp.config); return ret; }

1 0

Piotr Caban : wineps.drv: Add DrvDocumentPropertySheets implementation.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: 1f89a88660bb148a1af09187963ae4782dcad9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f89a88660bb148a1af09187963ae4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 29 21:57:01 2022 +0200 wineps.drv: Add DrvDocumentPropertySheets implementation. --- dlls/wineps.drv/driver.c | 101 ++++++++++++++++++++++++++++++++++++++++ dlls/wineps.drv/wineps.drv.spec | 1 + 2 files changed, 102 insertions(+) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 3b0300f3fd2..592d1b33599 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -23,6 +23,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -39,6 +40,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); +typedef struct +{ + WORD cbSize; + WORD Reserved; + HANDLE hPrinter; + LPCWSTR pszPrinterName; + PDEVMODEW pdmIn; + PDEVMODEW pdmOut; + DWORD cbOut; + DWORD fMode; +} DOCUMENTPROPERTYHEADERW; + /* convert points to paper size units (10th of a millimeter) */ static inline int paper_size_from_points( float size ) { @@ -521,6 +534,94 @@ INT WINAPI DrvDocumentProperties(HWND hwnd, const WCHAR *device, DEVMODEW *outpu return IDOK; } +/****************************************************************************** + * DrvDocumentPropertySheets (wineps.drv.@) + */ +LONG WINAPI DrvDocumentPropertySheets(PROPSHEETUI_INFO *info, LPARAM lparam) +{ + DOCUMENTPROPERTYHEADERW *dph; + PRINTERINFO *pi; + + TRACE("(info=%p, lparam=%Id)\n", info, lparam); + + dph = (DOCUMENTPROPERTYHEADERW *)(info ? info->lParamInit : lparam); + + if (!(pi = PSDRV_FindPrinterInfo(dph->pszPrinterName))) return ERR_CPSUI_GETLASTERROR; + + if (!info || info->Reason == PROPSHEETUI_REASON_INIT) + { + /* If dph->fMode == 0, return size of DEVMODE structure */ + if (!dph->fMode || !dph->pdmOut) + { + dph->cbOut = pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra; + return dph->cbOut; + } + + /* If DM_MODIFY is set, change settings in accordance with pdmIn */ + if ((dph->fMode & DM_MODIFY) && dph->pdmIn) + { + TRACE("DM_MODIFY set. devIn->dmFields = %08lx\n", dph->pdmIn->dmFields); + PSDRV_MergeDevmodes(pi->Devmode, (PSDRV_DEVMODE *)dph->pdmIn, pi); + } + + /* If DM_PROMPT is set, present modal dialog box */ + if (dph->fMode & DM_PROMPT) + { + PROPSHEETPAGEW psp; + PSDRV_DLGINFO *di; + + if (!info) + { + ERR("DM_PROMPT passed with NULL PROPSHEETUI_INFO\n"); + return ERR_CPSUI_GETLASTERROR; + } + + di = malloc(sizeof(*di)); + if (!di) + return ERR_CPSUI_ALLOCMEM_FAILED; + info->UserData = (ULONG_PTR)di; + + di->dlgdm = malloc(sizeof(*di->dlgdm)); + if (!di->dlgdm) + return ERR_CPSUI_ALLOCMEM_FAILED; + + memset(&psp, 0, sizeof(psp)); + di->pi = pi; + *di->dlgdm = *pi->Devmode; + psp.dwSize = sizeof(psp); + psp.hInstance = PSDRV_hInstance; + psp.pszTemplate = L"PAPER"; + psp.pszIcon = NULL; + psp.pfnDlgProc = PSDRV_PaperDlgProc; + psp.lParam = (LPARAM)di; + + if (!info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PROPSHEETPAGEW, (LPARAM)&psp, 0)) + return ERR_CPSUI_GETLASTERROR; + } + } + + if (info && info->Reason == PROPSHEETUI_REASON_DESTROY) + { + if (info->UserData) + free(((PSDRV_DLGINFO *)info->UserData)->dlgdm); + free((void *)info->UserData); + } + + if (!info || (info->Reason == PROPSHEETUI_REASON_DESTROY && lparam)) + { + /* If DM_UPDATE is set, should write settings to environment and initialization file */ + if (dph->fMode & DM_UPDATE) + FIXME("Mode DM_UPDATE. Just do the same as DM_COPY\n"); + + /* If DM_COPY is set, should write settings to pdmOut */ + if (dph->pdmOut && (dph->fMode & (DM_COPY | DM_UPDATE))) + memcpy(dph->pdmOut, &pi->Devmode->dmPublic, + pi->Devmode->dmPublic.dmSize + pi->Devmode->dmPublic.dmDriverExtra); + } + + return CPSUI_OK; +} + /****************************************************************************** * DrvDeviceCapabilities (wineps.drv.@) */ diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 470bbd8e5c6..c5775b0328b 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -3,3 +3,4 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) @ stdcall DrvDocumentProperties(long wstr ptr ptr long) +@ stdcall DrvDocumentPropertySheets(ptr long)

1 0

Eric Pouech : dbghelp: Get rid of symt_inlinesite by merging it inside symt_function.
by Alexandre Julliard 01 Nov '22

01 Nov '22

Module: wine Branch: master Commit: c4f1f5b18509b99f61d2fe43f56fac356030af47 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4f1f5b18509b99f61d2fe43f56fac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 1 10:40:02 2022 +0100 dbghelp: Get rid of symt_inlinesite by merging it inside symt_function. Basically: - extending symt_function to enable storage of multiple address ranges - symt_function and sym_inlinesite now share the same fields, so get rid to the later. Note that only the first range of a top level function is actually stored and used (even if the structure allows for more). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 4 +- dlls/dbghelp/dbghelp_private.h | 31 ++++++-------- dlls/dbghelp/dwarf.c | 14 +++---- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/msc.c | 50 +++++++++++------------ dlls/dbghelp/symbol.c | 92 ++++++++++++++++++++++-------------------- dlls/dbghelp/type.c | 24 ++++------- 7 files changed, 101 insertions(+), 116 deletions(-)

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 November 2022