wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Rémi Bernon : mf: Allow resolving topology with missing downstream current type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 346c2d8d7cfb4cd8e5d510b232c0938ad0fee574 URL: https://gitlab.winehq.org/wine/wine/-/commit/346c2d8d7cfb4cd8e5d510b232c093… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 13:49:44 2022 +0200 mf: Allow resolving topology with missing downstream current type. And without enumerating the downstream types either. --- dlls/mf/tests/mf.c | 6 ++++-- dlls/mf/topology_loader.c | 53 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5d95b092002..dd61a10fc77 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1374,8 +1374,10 @@ static HRESULT WINAPI test_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *ifac static HRESULT WINAPI test_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) { + /* FIXME: Wine sets downstream media type when resolving topology, native doesn't */ + todo_wine ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI test_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **media_type) @@ -2424,7 +2426,7 @@ static void test_topology_loader(void) /* RGB32 -> Any Video, no current output type */ .input_type = &video_i420_1280, .output_type = &video_dummy, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NO_CURRENT_OUTPUT | LOADER_TODO, + .flags = LOADER_NO_CURRENT_OUTPUT, }, { /* RGB32 -> Any Video, no current output type, refuse input type */ diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 08ee7922094..09fb9322261 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -253,7 +253,6 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode *node; unsigned int i, count; GUID category, guid; - DWORD flags; HRESULT hr; TRACE("topology %p, method_mask %#x, branch %s, up_type %p, down_type %p.\n", @@ -263,13 +262,15 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC return hr; if (FAILED(hr = IMFMediaType_GetGUID(up_type, &MF_MT_SUBTYPE, &input_info.guidSubtype))) return hr; - if (FAILED(hr = IMFMediaType_GetMajorType(down_type, &output_info.guidMajorType))) - return hr; - if (FAILED(hr = IMFMediaType_GetGUID(down_type, &MF_MT_SUBTYPE, &output_info.guidSubtype))) - return hr; - if (FAILED(hr = IMFMediaType_IsEqual(up_type, down_type, &flags)) - || !(flags & MF_MEDIATYPE_EQUAL_MAJOR_TYPES)) - return MF_E_INVALIDMEDIATYPE; + if (!down_type) + output_info = input_info; + else + { + if (FAILED(hr = IMFMediaType_GetMajorType(down_type, &output_info.guidMajorType))) + return hr; + if (FAILED(hr = IMFMediaType_GetGUID(down_type, &MF_MT_SUBTYPE, &output_info.guidSubtype))) + return hr; + } if (IsEqualGUID(&input_info.guidMajorType, &MFMediaType_Audio)) category = decoder ? MFT_CATEGORY_AUDIO_DECODER : MFT_CATEGORY_AUDIO_EFFECT; @@ -300,10 +301,13 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type); - if (SUCCEEDED(hr)) - hr = topology_branch_fill_media_type(up_type, down_type); - if (SUCCEEDED(hr)) - hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); + if (down_type) + { + if (SUCCEEDED(hr)) + hr = topology_branch_fill_media_type(up_type, down_type); + if (SUCCEEDED(hr)) + hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); + } IMFTransform_Release(transform); if (SUCCEEDED(hr)) @@ -328,8 +332,8 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME struct topology_branch *branch, IMFMediaType *up_type) { IMFMediaTypeHandler *down_handler; + IMFMediaType *down_type = NULL; MF_CONNECT_METHOD method; - IMFMediaType *down_type; DWORD flags; HRESULT hr; @@ -346,27 +350,18 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME && IMFMediaType_IsEqual(up_type, down_type, &flags) == S_OK) { TRACE("Connecting branch %s with current type %p.\n", debugstr_topology_branch(branch), up_type); - IMFMediaTypeHandler_Release(down_handler); - IMFMediaType_Release(down_type); - - return IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + goto done; } - if (FAILED(hr) && FAILED(hr = IMFMediaTypeHandler_GetMediaTypeByIndex(down_handler, 0, &down_type))) - return hr; - if (SUCCEEDED(hr = IMFMediaTypeHandler_IsMediaTypeSupported(down_handler, up_type, NULL)) && SUCCEEDED(hr = IMFMediaTypeHandler_SetCurrentMediaType(down_handler, up_type))) { TRACE("Connected branch %s with upstream type %p.\n", debugstr_topology_branch(branch), up_type); - IMFMediaTypeHandler_Release(down_handler); - IMFMediaType_Release(down_type); - - return IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + hr = IMFTopologyNode_ConnectOutput(branch->up.node, branch->up.stream, branch->down.node, branch->down.stream); + goto done; } - IMFMediaTypeHandler_Release(down_handler); - if (FAILED(hr) && (method & method_mask & MF_CONNECT_ALLOW_CONVERTER) == MF_CONNECT_ALLOW_CONVERTER) hr = topology_branch_connect_indirect(topology, MF_CONNECT_ALLOW_CONVERTER, branch, up_type, down_type); @@ -375,7 +370,11 @@ static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_ME hr = topology_branch_connect_indirect(topology, MF_CONNECT_ALLOW_DECODER, branch, up_type, down_type); - IMFMediaType_Release(down_type); +done: + if (down_type) + IMFMediaType_Release(down_type); + IMFMediaTypeHandler_Release(down_handler); + return hr; }

1 0

Rémi Bernon : mf/tests: Add more topology loader converter and enumeration tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 245ac9b46e960ee1189a426a88acc574c588a3a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/245ac9b46e960ee1189a426a88acc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 09:38:40 2022 +0200 mf/tests: Add more topology loader converter and enumeration tests. --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f6024f95768..5d95b092002 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2210,6 +2210,16 @@ static void test_topology_loader(void) ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1), ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 8), }; + static const media_type_desc audio_float_48000 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 48000), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + }; static const media_type_desc audio_mp3_44100 = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), @@ -2332,6 +2342,13 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_EXPECTED_CONVERTER, }, + { + /* PCM -> PCM, different enumerated bps, same current type, sink allow converter, force enumerate */ + .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_CONVERTER, .source_method = -1, + .current_input = &audio_pcm_48000, + .expected_result = S_OK, + .flags = LOADER_EXPECTED_CONVERTER | LOADER_SET_ENUMERATE_SOURCE_TYPES | LOADER_TODO, + }, { /* PCM -> PCM, different enumerated bps, no current type, sink allow decoder */ .input_type = &audio_pcm_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = MF_CONNECT_DIRECT, @@ -2377,6 +2394,13 @@ static void test_topology_loader(void) .expected_result = S_OK, .flags = LOADER_EXPECTED_DECODER | LOADER_TODO, }, + { + /* MP3 -> PCM, need both decoder and converter */ + .input_type = &audio_mp3_44100, .output_type = &audio_float_48000, .sink_method = MF_CONNECT_ALLOW_DECODER, .source_method = -1, + .current_input = &audio_mp3_44100, + .expected_result = S_OK, + .flags = LOADER_EXPECTED_DECODER | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, { /* I420 -> RGB32, Color Convert media type */

1 0

Rémi Bernon : mf/tests: Add some MP3 decoder transform tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 5b7a3aaf6d50b210b7405babfff4e0267343607f URL: https://gitlab.winehq.org/wine/wine/-/commit/5b7a3aaf6d50b210b7405babfff4e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 17:14:29 2022 +0200 mf/tests: Add some MP3 decoder transform tests. There's some differences in the decoded data between Windows versions, the results have been taken from a Windows 10 VM. --- dlls/mf/tests/mf.c | 435 +++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mp3decdata.bin | Bin 0 -> 94656 bytes dlls/mf/tests/mp3encdata.bin | Bin 0 -> 6295 bytes dlls/mf/tests/resource.rc | 13 ++ 4 files changed, 448 insertions(+)

1 0

Rémi Bernon : mf/tests: Add some topology loader tests with missing output type.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 27c3069f4a354c695ebf38e62c86573648225063 URL: https://gitlab.winehq.org/wine/wine/-/commit/27c3069f4a354c695ebf38e62c8657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 11 10:51:12 2022 +0200 mf/tests: Add some topology loader tests with missing output type. --- dlls/mf/tests/mf.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 159 insertions(+), 24 deletions(-)

1 0

Zhiyi Zhang : comctl32: Set reference data to zero on failure for GetWindowSubclass().
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 3aefc3a4225c6a5c9419f9f8405d91758aefd694 URL: https://gitlab.winehq.org/wine/wine/-/commit/3aefc3a4225c6a5c9419f9f8405d91… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:42:31 2022 +0800 comctl32: Set reference data to zero on failure for GetWindowSubclass(). --- dlls/comctl32/commctrl.c | 5 ++++- dlls/comctl32/tests/subclass.c | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 14b148d591d..c5910b40869 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1173,7 +1173,7 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, /* See if we have been called for this window */ stack = GetPropW (hWnd, COMCTL32_wSubclass); if (!stack) - return FALSE; + goto done; proc = stack->SubclassProcs; while (proc) { @@ -1186,6 +1186,9 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, proc = proc->next; } +done: + if (pdwRef) + *pdwRef = 0; return FALSE; } diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 9f1955c4258..e2e8573f4c0 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -356,19 +356,16 @@ static void test_GetWindowSubclass(void) data = 0xdeadbeef; ret = pGetWindowSubclass(NULL, wnd_proc_sub, 2, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, NULL, 2, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 0, &data); ok(!ret, "GetWindowSubclass succeeded.\n"); - todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL);

1 0

Zhiyi Zhang : comctl32: Check reference data pointer before using it.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 9b9fef2e112ff2ce0e1ce2da3aaacd2ffefa6d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b9fef2e112ff2ce0e1ce2da3aaacd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:25:46 2022 +0800 comctl32: Check reference data pointer before using it. Fix the crash when opening notepad++ v8.4.4 preference dialog before e52e42b. --- dlls/comctl32/commctrl.c | 3 ++- dlls/comctl32/tests/subclass.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 57863928fc7..14b148d591d 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1179,7 +1179,8 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass, while (proc) { if ((proc->id == uID) && (proc->subproc == pfnSubclass)) { - *pdwRef = proc->ref; + if (pdwRef) + *pdwRef = proc->ref; return TRUE; } proc = proc->next; diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index b7b4dd0508d..9f1955c4258 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -371,12 +371,8 @@ static void test_GetWindowSubclass(void) todo_wine ok(data == 0, "Got unexpected data %#Ix.\n", data); - /* Crash on Wine */ - if (strcmp(winetest_platform, "wine")) - { ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); ok(ret, "GetWindowSubclass failed.\n"); - } data = 0xdeadbeef; ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data);

1 0

Zhiyi Zhang : comctl32/tests: Add GetWindowSubclass() tests.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: f7443102009fb67a0dc7a5bca60f6cc46209bb30 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7443102009fb67a0dc7a5bca60f6c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 16 11:22:55 2022 +0800 comctl32/tests: Add GetWindowSubclass() tests. --- dlls/comctl32/tests/subclass.c | 52 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 439d61a83c8..b7b4dd0508d 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -29,6 +29,7 @@ #include "wine/heap.h" #include "wine/test.h" +static BOOL (WINAPI *pGetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR *); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -311,11 +312,12 @@ static BOOL init_function_pointers(void) */ #define MAKEFUNC_ORD(f, ord) (p##f = (void*)GetProcAddress(hmod, (LPSTR)(ord))) MAKEFUNC_ORD(SetWindowSubclass, 410); + MAKEFUNC_ORD(GetWindowSubclass, 411); MAKEFUNC_ORD(RemoveWindowSubclass, 412); MAKEFUNC_ORD(DefSubclassProc, 413); #undef MAKEFUNC_ORD - if(!pSetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) + if(!pSetWindowSubclass || !pGetWindowSubclass || !pRemoveWindowSubclass || !pDefSubclassProc) { win_skip("SetWindowSubclass and friends are not available\n"); return FALSE; @@ -338,6 +340,53 @@ static BOOL init_function_pointers(void) return TRUE; } +static void test_GetWindowSubclass(void) +{ + DWORD_PTR data; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowA("TestSubclass", "Test subclass", WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, + 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %ld.\n", GetLastError()); + + ret = pSetWindowSubclass(hwnd, wnd_proc_sub, 2, 7); + ok(ret, "SetWindowSubclass failed.\n"); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(NULL, wnd_proc_sub, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, NULL, 2, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 0, &data); + ok(!ret, "GetWindowSubclass succeeded.\n"); + todo_wine + ok(data == 0, "Got unexpected data %#Ix.\n", data); + + /* Crash on Wine */ + if (strcmp(winetest_platform, "wine")) + { + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, NULL); + ok(ret, "GetWindowSubclass failed.\n"); + } + + data = 0xdeadbeef; + ret = pGetWindowSubclass(hwnd, wnd_proc_sub, 2, &data); + ok(ret, "GetWindowSubclass failed.\n"); + ok(data == 7, "Got unexpected data %#Ix.\n", data); + + pRemoveWindowSubclass(hwnd, wnd_proc_sub, 2); + DestroyWindow(hwnd); +} + START_TEST(subclass) { if(!init_function_pointers()) return; @@ -345,4 +394,5 @@ START_TEST(subclass) if(!register_window_classes()) return; test_subclass(); + test_GetWindowSubclass(); }

1 0

Piotr Caban : winspool.drv: Fix get_config_module when printer and driver names differ.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 26c95858a18de555bd56cffb64f8902d5b88a18d URL: https://gitlab.winehq.org/wine/wine/-/commit/26c95858a18de555bd56cffb64f890… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 15 21:13:17 2022 +0200 winspool.drv: Fix get_config_module when printer and driver names differ. --- dlls/winspool.drv/info.c | 89 ++++++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index d800eae159f..3806384ee08 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -374,6 +374,30 @@ static HKEY WINSPOOL_OpenDriverReg(const void *pEnvironment) return retval; } +enum printers_key +{ + system_printers_key, + user_printers_key, + user_ports_key, + user_default_key, +}; + +static DWORD create_printers_reg_key( enum printers_key type, HKEY *key ) +{ + switch( type ) + { + case system_printers_key: + return RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Print\\Printers", key ); + case user_printers_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices", key ); + case user_ports_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\PrinterPorts", key ); + case user_default_key: + return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", key ); + } + return ERROR_PATH_NOT_FOUND; +} + static CRITICAL_SECTION config_modules_cs; static CRITICAL_SECTION_DEBUG config_modules_cs_debug = { @@ -400,13 +424,13 @@ static void release_config_module(config_module_t *config_module) static config_module_t *get_config_module(const WCHAR *device, BOOL grab) { - WCHAR driver[MAX_PATH]; + WCHAR driver_name[100], driver[MAX_PATH]; DWORD size, len; - HKEY driver_key, device_key; + HKEY printers_key, printer_key, drivers_key, driver_key; HMODULE driver_module; config_module_t *ret = NULL; struct wine_rb_entry *entry; - DWORD type; + DWORD r, type; LSTATUS res; EnterCriticalSection(&config_modules_cs); @@ -418,15 +442,38 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) } if (!grab) goto ret; - if (!(driver_key = WINSPOOL_OpenDriverReg(NULL))) goto ret; + if (create_printers_reg_key(system_printers_key, &printers_key)) + { + ERR("Can't create Printers key\n"); + goto ret; + } - res = RegOpenKeyW(driver_key, device, &device_key); - RegCloseKey(driver_key); - if (res) { + r = RegOpenKeyW(printers_key, device, &printer_key); + RegCloseKey(printers_key); + if (r) + { WARN("Device %s key not found\n", debugstr_w(device)); goto ret; } + size = sizeof(driver_name); + r = RegQueryValueExW(printer_key, L"Printer Driver", 0, &type, (BYTE *)driver_name, &size); + RegCloseKey(printer_key); + if (r || type != REG_SZ) + { + WARN("Can't get Printer Driver name\n"); + goto ret; + } + + if (!(drivers_key = WINSPOOL_OpenDriverReg(NULL))) goto ret; + + res = RegOpenKeyW(drivers_key, driver_name, &driver_key); + RegCloseKey(drivers_key); + if (res) { + WARN("Driver %s key not found\n", debugstr_w(driver_name)); + goto ret; + } + size = sizeof(driver); if (!GetPrinterDriverDirectoryW(NULL, NULL, 1, (LPBYTE)driver, size, &size)) goto ret; @@ -435,9 +482,9 @@ static config_module_t *get_config_module(const WCHAR *device, BOOL grab) driver[len++] = '3'; driver[len++] = '\\'; size = sizeof(driver) - len * sizeof(WCHAR); - res = RegQueryValueExW( device_key, L"Configuration File", NULL, &type, + res = RegQueryValueExW( driver_key, L"Configuration File", NULL, &type, (BYTE *)(driver + len), &size ); - RegCloseKey(device_key); + RegCloseKey(driver_key); if (res || type != REG_SZ) { WARN("no configuration file: %lu\n", res); goto ret; @@ -553,30 +600,6 @@ static HANDLE get_backend_handle( HANDLE hprn ) return printer->backend_printer; } -enum printers_key -{ - system_printers_key, - user_printers_key, - user_ports_key, - user_default_key, -}; - -static DWORD create_printers_reg_key( enum printers_key type, HKEY *key ) -{ - switch( type ) - { - case system_printers_key: - return RegCreateKeyW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Print\\Printers", key ); - case user_printers_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Devices", key ); - case user_ports_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\PrinterPorts", key ); - case user_default_key: - return RegCreateKeyW( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows", key ); - } - return ERROR_PATH_NOT_FOUND; -} - static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) { HKEY printers;

1 0

Piotr Caban : winspool.drv: Ignore device name if printer handle is passed in DocumentProperties.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 4723b6b8c5370782c5735cac98fedf5bc4b239cf URL: https://gitlab.winehq.org/wine/wine/-/commit/4723b6b8c5370782c5735cac98fedf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 15 19:56:21 2022 +0200 winspool.drv: Ignore device name if printer handle is passed in DocumentProperties. --- dlls/winspool.drv/info.c | 2 +- dlls/winspool.drv/tests/info.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e1cd0338207..d800eae159f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1889,7 +1889,7 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, TRACE("(%p,%p,%s,%p,%p,%ld)\n", hWnd, hPrinter, debugstr_w(pDeviceName), pDevModeOutput, pDevModeInput, fMode); - device = pDeviceName && pDeviceName[0] ? pDeviceName : get_opened_printer_name(hPrinter); + device = hPrinter ? get_opened_printer_name(hPrinter) : pDeviceName; if (!device) { ERR("no device name\n"); return -1; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f7464d9d696..47f602b7de3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2679,6 +2679,7 @@ static void test_DocumentProperties(void) LONG dm_size, ret; DEVMODEA *dm; char empty_str[] = ""; + char non_existing_str[] = "non existing printer"; if (!default_printer) { @@ -2707,6 +2708,9 @@ static void test_DocumentProperties(void) ret = DocumentPropertiesA(0, hprn, empty_str, dm, dm, DM_OUT_BUFFER); ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); + ret = DocumentPropertiesA(0, hprn, non_existing_str, dm, dm, DM_OUT_BUFFER); + ok(ret == IDOK, "DocumentPropertiesA ret value %ld != expected IDOK\n", ret); + test_DEVMODEA(dm, dm_size, default_printer); HeapFree(GetProcessHeap(), 0, dm);

1 0

Alexandre Julliard : winetest: Exit with error 3 when there are test failures.
by Alexandre Julliard 16 Aug '22

16 Aug '22

Module: wine Branch: master Commit: 5fabd968d4987c2b4d54787e77b9662a29f00b64 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fabd968d4987c2b4d54787e77b966… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 16 17:42:34 2022 +0200 winetest: Exit with error 3 when there are test failures. --- programs/winetest/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7caa20d862a..ff76eec6e64 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1476,7 +1476,7 @@ int __cdecl main( int argc, char *argv[] ) if (nb_filters && !exclude_tests) { run_tests( logname, outdir ); - exit(0); + exit( failures ? 3 : 0 ); } while (!tag) { @@ -1534,5 +1534,5 @@ int __cdecl main( int argc, char *argv[] ) } ExitWindowsEx(EWX_SHUTDOWN | EWX_POWEROFF | EWX_FORCEIFHUNG, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); } - exit (0); + exit( failures ? 3 : 0 ); }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
60
Older →

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