March 2024 - Wine-commits - list.winehq.org

Hans Leidekker : dnsapi/tests: Skip tests if no CNAME records are returned.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 1482e2f960d9997a0e1fc23c2c72151d4bf64be7 URL: https://gitlab.winehq.org/wine/wine/-/commit/1482e2f960d9997a0e1fc23c2c7215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 12 13:34:08 2024 +0100 dnsapi/tests: Skip tests if no CNAME records are returned. --- dlls/dnsapi/tests/query.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dnsapi/tests/query.c b/dlls/dnsapi/tests/query.c index 1412fdfa17b..d2472f61f88 100644 --- a/dlls/dnsapi/tests/query.c +++ b/dlls/dnsapi/tests/query.c @@ -167,6 +167,11 @@ static void test_DnsQuery(void) skip("query timed out\n"); return; } + if (status == DNS_INFO_NO_RECORDS) + { + skip("no CNAME records\n"); + return; + } ok(status == ERROR_SUCCESS, "got %ld\n", status); if (status == ERROR_SUCCESS && winetest_debug > 1) {

1 0

David Gow : evr/dshow: Support NV12 in evr_render.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: e2b1de523e8bd59ed43fc17e90ff791a4870fdaa URL: https://gitlab.winehq.org/wine/wine/-/commit/e2b1de523e8bd59ed43fc17e90ff79… Author: David Gow <david(a)ingeniumdigital.com> Date: Sun Feb 25 23:47:53 2024 +0800 evr/dshow: Support NV12 in evr_render. Add support for NV12 to evr_render(), as otherwise no video is rendered at all in games like Age of Empires II DE. In the process, the evr_copy_sample_buffer() function has been refactored to move the MFCopyImage() call into format-specific code (to better handle multi-planar formats cleanly). Signed-off-by: David Gow <david(a)ingeniumdigital.com> --- dlls/evr/evr.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 516427c5fff..52c5de5e2c4 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -354,6 +354,7 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, I LONG src_stride; HRESULT hr; BYTE *src; + BYTE *dst_uv; if (FAILED(hr = IMFMediaType_GetUINT32(filter->media_type, &MF_MT_DEFAULT_STRIDE, (UINT32 *)&src_stride))) { @@ -364,14 +365,6 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, I width = frame_size >> 32; lines = frame_size; - if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) - { - width = (3 * width + 3) & ~3; - } - else - { - width *= 4; - } if (FAILED(hr = IMediaSample_GetPointer(input_sample, &src))) { @@ -392,6 +385,30 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, I if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) { if (src_stride < 0) src += (-src_stride) * (lines - 1); + + if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) + { + width = (3 * width + 3) & ~3; + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); + } + else if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) + { + /* Width and height must be rounded up to even. */ + width = (width + 1) & ~1; + lines = (lines + 1) & ~1; + + /* Y plane */ + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); + + /* UV plane */ + dst_uv = (BYTE *)locked_rect.pBits + (lines * locked_rect.Pitch); + MFCopyImage(dst_uv, locked_rect.Pitch, src + (lines * src_stride), src_stride, width, lines / 2); + } + else + { + /* All other formats are 32-bit, single plane. */ + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); + } MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); IDirect3DSurface9_UnlockRect(surface); } @@ -427,7 +444,8 @@ static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *input_s if (IsEqualGUID(&subtype, &MFVideoFormat_ARGB32) || IsEqualGUID(&subtype, &MFVideoFormat_RGB32) - || IsEqualGUID(&subtype, &MFVideoFormat_YUY2)) + || IsEqualGUID(&subtype, &MFVideoFormat_YUY2) + || IsEqualGUID(&subtype, &MFVideoFormat_NV12)) { if (SUCCEEDED(hr = evr_copy_sample_buffer(filter, &subtype, input_sample, &sample))) {

1 0

Piotr Caban : ntdll: Workaround sendmsg bug on macOS.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 174bb7776d3971e1ed91d57a47a7599b14c6eb45 URL: https://gitlab.winehq.org/wine/wine/-/commit/174bb7776d3971e1ed91d57a47a759… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 8 13:37:30 2024 +0100 ntdll: Workaround sendmsg bug on macOS. There's a race on macOS when sending socket fd with sendmsg. The fd may get broken if it's closed before recvmsg is called. --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 4342ac8ac45..2c6dc1b43cc 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -846,7 +846,6 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ #endif wine_server_send_fd( socketfd[1] ); - close( socketfd[1] ); /* create the process on the server side */ @@ -875,6 +874,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ process_info = wine_server_ptr_handle( reply->info ); } SERVER_END_REQ; + close( socketfd[1] ); free( objattr ); free( handles ); free( jobs );

1 0

Nikolay Sivov : d3dcompiler: Set correct compilation target for effects profiles.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: d01ae1512fe0f0b4288a97b38cf888095159b919 URL: https://gitlab.winehq.org/wine/wine/-/commit/d01ae1512fe0f0b4288a97b38cf888… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:10:34 2024 +0100 d3dcompiler: Set correct compilation target for effects profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 77 +++++++++++++++++++++++++----------------- dlls/d3dx9_36/tests/effect.c | 11 +----- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ded52bad965..c1940e8d888 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -397,29 +397,12 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, - const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, - const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, - const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, - ID3DBlob **messages_blob) +static enum vkd3d_shader_target_type get_target_for_profile(const char *profile) { - struct d3dcompiler_include_from_file include_from_file; - struct vkd3d_shader_preprocess_info preprocess_info; - struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[4]; - struct vkd3d_shader_compile_info compile_info; - struct vkd3d_shader_compile_option *option; - struct vkd3d_shader_code byte_code; - const D3D_SHADER_MACRO *macro; size_t profile_len, i; - char *messages; - HRESULT hr; - int ret; static const char * const d3dbc_profiles[] = { - "fx_2_", - "ps.1.", "ps.2.", "ps.3.", @@ -439,6 +422,50 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen "tx_1_", }; + static const char * const fx_profiles[] = + { + "fx_2_0", + "fx_4_0", + "fx_4_1", + "fx_5_0", + }; + + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + return VKD3D_SHADER_TARGET_D3D_BYTECODE; + } + + for (i = 0; i < ARRAY_SIZE(fx_profiles); ++i) + { + if (!strcmp(profile, fx_profiles[i])) + return VKD3D_SHADER_TARGET_FX; + } + + return VKD3D_SHADER_TARGET_DXBC_TPF; +} + +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, + const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, + ID3DBlob **messages_blob) +{ + struct d3dcompiler_include_from_file include_from_file; + struct vkd3d_shader_preprocess_info preprocess_info; + struct vkd3d_shader_hlsl_source_info hlsl_info; + struct vkd3d_shader_compile_option options[4]; + struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_compile_option *option; + struct vkd3d_shader_code byte_code; + const D3D_SHADER_MACRO *macro; + char *messages; + HRESULT hr; + int ret; + TRACE("data %p, data_size %Iu, filename %s, macros %p, include %p, entry_point %s, " "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " "secondary_data_size %Iu, shader_blob %p, messages_blob %p.\n", @@ -477,24 +504,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.source.code = data; compile_info.source.size = data_size; compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; - compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; + compile_info.target_type = get_target_for_profile(profile); compile_info.options = options; compile_info.option_count = 1; compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; - profile_len = strlen(profile); - for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) - { - size_t len = strlen(d3dbc_profiles[i]); - - if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) - { - compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; - break; - } - } - preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; preprocess_info.next = &hlsl_info; preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5420501c92f..0e7028f38b6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -257,12 +257,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); - todo_wine ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); - if (FAILED(hr)) - { - skip("Failed to compile effect, skipping test.\n"); - return; - } + ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); ok(hr == E_NOINTERFACE, "QueryInterface failed, got %lx, expected %lx (E_NOINTERFACE)\n", hr, E_NOINTERFACE); @@ -8041,15 +8036,12 @@ static void test_create_effect_from_file(void) /* This is apparently broken on native, it ends up using the wrong include. */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "Unexpected error, hr %#lx.\n", hr); if (messages) { trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); } - if (effect) - effect->lpVtbl->Release(effect); delete_file("effect1.fx"); delete_file("effect2.fx"); @@ -8067,7 +8059,6 @@ static void test_create_effect_from_file(void) * is "ID3DXEffectCompiler: There were no techniques" */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, &include.ID3DXInclude_iface, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "D3DXInclude test failed with error %#lx.\n", hr); if (messages) {

1 0

Nikolay Sivov : d3dcompiler: Wrap fx_4_x output in a dxbc container.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: a44681e19be3d4c20cb6c98e1a12e7982b94acce URL: https://gitlab.winehq.org/wine/wine/-/commit/a44681e19be3d4c20cb6c98e1a12e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:20:51 2024 +0100 d3dcompiler: Wrap fx_4_x output in a dxbc container. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 14 ++++++++++++++ dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index c1940e8d888..e5c9981ded5 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -601,6 +601,20 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen return S_OK; } + /* Unlike other effect profiles fx_4_x is using DXBC container. */ + if (!strcmp(profile, "fx_4_0") || !strcmp(profile, "fx_4_1")) + { + struct vkd3d_shader_dxbc_section_desc section = { .tag = TAG_FX10, .data = byte_code }; + struct vkd3d_shader_code dxbc; + + ret = vkd3d_shader_serialize_dxbc(1, &section, &dxbc, NULL); + vkd3d_shader_free_shader_code(&byte_code); + if (ret) + return hresult_from_vkd3d_result(ret); + + byte_code = dxbc; + } + if (SUCCEEDED(hr = D3DCreateBlob(byte_code.size, shader_blob))) memcpy(ID3D10Blob_GetBufferPointer(*shader_blob), byte_code.code, byte_code.size); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 33c82c000c5..a1759da661e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -523,6 +523,7 @@ void SlDeleteShader(struct bwriter_shader *shader); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_Aon9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') +#define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5')

1 0

Nikolay Sivov : d3d10/tests: Add a small effect compilation test.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 40afa8d937e034bf4183a9b6773c5ce449e12ec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/40afa8d937e034bf4183a9b6773c5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:37:59 2024 +0100 d3d10/tests: Add a small effect compilation test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a9f4c1e47e5..0935541ced0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9875,6 +9875,36 @@ static void test_effect_fx_4_1_blend_state(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_effect_compiler(void) +{ + static char empty_effect[] = "technique10 {};"; + D3D10_EFFECT_DESC desc; + ID3D10Device *device; + ID3D10Effect *effect; + ID3D10Blob *blob; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = D3D10CompileEffectFromMemory(empty_effect, sizeof(empty_effect), NULL, NULL, NULL, 0, 0, + &blob, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = create_effect(ID3D10Blob_GetBufferPointer(blob), 0, device, NULL, &effect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = ID3D10Effect_GetDesc(effect, &desc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(desc.Techniques == 1, "Unexpected technique count %u.\n", desc.Techniques); + ID3D10Effect_Release(effect); + + ID3D10Device_Release(device); + ID3D10Blob_Release(blob); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -9903,4 +9933,5 @@ START_TEST(effect) test_effect_value_expression(); test_effect_fx_4_1(); test_effect_fx_4_1_blend_state(); + test_effect_compiler(); }

1 0

Gabriel Ivăncescu : shell32: Construct the proper path target for UnixFolder.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: a9b3fdd3aebe0ef2f7f7905864e7c4fe01f5c4fd URL: https://gitlab.winehq.org/wine/wine/-/commit/a9b3fdd3aebe0ef2f7f7905864e7c4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 4 21:52:06 2024 +0200 shell32: Construct the proper path target for UnixFolder. Worse than just no unix integration is that it can actually crash if you parse e.g. "/". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_fs.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 808b20c9cae..928cadfc77c 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1797,7 +1797,7 @@ static const IDropTargetVtbl dtvt = { ISFDropTarget_Drop }; -static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid) +static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid, const WCHAR *path_target) { IGenericSFImpl *sf; HRESULT hr; @@ -1820,6 +1820,16 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL sf->ISFHelper_iface.lpVtbl = &shvt; sf->pclsid = clsid; sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner; + if (path_target) + { + SIZE_T size = (wcslen(path_target) + 1) * sizeof(WCHAR); + if (!(sf->sPathTarget = SHAlloc(size))) + { + LocalFree(sf); + return E_OUTOFMEMORY; + } + memcpy(sf->sPathTarget, path_target, size); + } hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv); IUnknown_Release(&sf->IUnknown_inner); @@ -1830,25 +1840,25 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder, NULL ); } HRESULT WINAPI UnixFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder, L"\\\\?\\unix\\" ); } HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder ); + return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder, NULL ); } HRESULT WINAPI FolderShortcut_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut ); + return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut, NULL ); } HRESULT WINAPI MyDocuments_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv) { - return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments ); + return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments, NULL ); }

1 0

Brendan McGrath : comdlg32: Use values from DeviceCapabilities in combobox.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 4ec559743d254e3547c0cabdcb1014854404e108 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ec559743d254e3547c0cabdcb1014… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 30 06:05:23 2024 +1100 comdlg32: Use values from DeviceCapabilities in combobox. dpiX,dpiY are the default printer values from the GetDeviceCaps calls. This causes the item data to be the same for every option in the combobox. The item data should reflect the selected values. --- dlls/comdlg32/printdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 700119bc9ff..2a2b7e9d1b2 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1229,7 +1229,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru if(IsDefault) SendMessageA(hQuality, CB_SETCURSEL, Index, 0); - SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(dpiX,dpiY)); + SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(Resolutions[i], Resolutions[i+1])); } free(Resolutions); }

1 0

Brendan McGrath : comdlg32: Add resolutions to PRINTDLG_ChangePrinterW.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 8b7d1a65d0201271cea40d1a6474eb40df834e22 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7d1a65d0201271cea40d1a6474eb… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 23 13:15:42 2024 +1100 comdlg32: Add resolutions to PRINTDLG_ChangePrinterW. This was done in PRINTDLG_ChangePrinterA, but missing from PRINTDLG_ChangePrinterW --- dlls/comdlg32/printdlg.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 2a2b7e9d1b2..b777a83825f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1386,6 +1386,61 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, if (lppd->Flags & PD_HIDEPRINTTOFILE) ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE); + /* Fill print quality combo, PrintDlg16 */ + if (GetDlgItem(hDlg, cmb1)) + { + DWORD num_resolutions = DeviceCapabilitiesW(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, NULL, lpdm); + + if (num_resolutions != -1) + { + HWND quality = GetDlgItem(hDlg, cmb1); + LONG* resolutions; + WCHAR buf[255]; + DWORD i; + int dpiX, dpiY; + HDC printer = CreateDCW(PrintStructures->lpPrinterInfo->pDriverName, + PrintStructures->lpPrinterInfo->pPrinterName, + 0, lpdm); + + resolutions = malloc(num_resolutions * sizeof(LONG) * 2); + DeviceCapabilitiesW(PrintStructures->lpPrinterInfo->pPrinterName, + PrintStructures->lpPrinterInfo->pPortName, + DC_ENUMRESOLUTIONS, (LPWSTR)resolutions, lpdm); + + dpiX = GetDeviceCaps(printer, LOGPIXELSX); + dpiY = GetDeviceCaps(printer, LOGPIXELSY); + DeleteDC(printer); + + SendMessageW(quality, CB_RESETCONTENT, 0, 0); + for (i = 0; i < (num_resolutions * 2); i += 2) + { + BOOL is_default = FALSE; + LRESULT index; + + if (resolutions[i] == resolutions[i+1]) + { + if (dpiX == resolutions[i]) + is_default = TRUE; + swprintf(buf, sizeof(buf), L"%ld dpi", resolutions[i]); + } else + { + if (dpiX == resolutions[i] && dpiY == resolutions[i+1]) + is_default = TRUE; + swprintf(buf, sizeof(buf), L"%ld dpi x %ld dpi", resolutions[i], resolutions[i+1]); + } + + index = SendMessageW(quality, CB_ADDSTRING, 0, (LPARAM)buf); + + if (is_default) + SendMessageW(quality, CB_SETCURSEL, index, 0); + + SendMessageW(quality, CB_SETITEMDATA, index, MAKELONG(resolutions[i], resolutions[i+1])); + } + free(resolutions); + } + } } else { /* PD_PRINTSETUP */ BOOL bPortrait = (lpdm->dmOrientation == DMORIENT_PORTRAIT);

1 0

Brendan McGrath : comdlg32: Populate printer name on the print dialogs.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: 91207991f2c64ed9f5cc564926c5b0e528712e44 URL: https://gitlab.winehq.org/wine/wine/-/commit/91207991f2c64ed9f5cc564926c5b0… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Tue Jan 23 13:24:01 2024 +1100 comdlg32: Populate printer name on the print dialogs. This will display the name of the selected printer on the Print dialog and the default printer on the Print Setup dialog --- dlls/comdlg32/printdlg.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index b777a83825f..e90a9e00efb 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -978,10 +978,11 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, /*********************************************************************** * PRINTDLG_UpdatePrinterInfoTexts [internal] */ -static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *pi) +static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, DWORD flags, const PRINTER_INFO_2A *pi) { char StatusMsg[256]; char ResourceString[256]; + char printer_name[256]; int i; /* Status Message */ @@ -1004,6 +1005,17 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *p SetDlgItemTextA(hDlg, stc12, StatusMsg); /* set all other printer info texts */ + if (flags & PD_PRINTSETUP) + { + DWORD dwBufLen = ARRAY_SIZE(printer_name); + GetDefaultPrinterA(printer_name, &dwBufLen); + } + else + { + /* FIXME: Windows decorates the printer name with text like 'System Printer' or 'on <port>'. */ + lstrcpynA(printer_name, pi->pPrinterName, ARRAY_SIZE(printer_name)); + } + SetDlgItemTextA(hDlg, stc1, printer_name); SetDlgItemTextA(hDlg, stc11, pi->pDriverName); if (pi->pLocation != NULL && pi->pLocation[0] != '\0') @@ -1014,11 +1026,12 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *p return; } -static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *pi) +static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, DWORD flags, const PRINTER_INFO_2W *pi) { WCHAR StatusMsg[256]; WCHAR ResourceString[256]; - int i; + WCHAR printer_name[256]; + int i; /* Status Message */ StatusMsg[0]='\0'; @@ -1040,6 +1053,17 @@ static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *p SetDlgItemTextW(hDlg, stc12, StatusMsg); /* set all other printer info texts */ + if (flags & PD_PRINTSETUP) + { + DWORD dwBufLen = ARRAY_SIZE(printer_name); + GetDefaultPrinterW(printer_name, &dwBufLen); + } + else + { + /* FIXME: Windows decorates the printer name with text like 'System Printer' or 'on <port>'. */ + lstrcpynW(printer_name, pi->pPrinterName, ARRAY_SIZE(printer_name)); + } + SetDlgItemTextW(hDlg, stc1, printer_name); SetDlgItemTextW(hDlg, stc11, pi->pDriverName); if (pi->pLocation != NULL && pi->pLocation[0] != '\0') SetDlgItemTextW(hDlg, stc14, pi->pLocation); @@ -1081,7 +1105,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru } ClosePrinter(hprn); - PRINTDLG_UpdatePrinterInfoTextsA(hDlg, PrintStructures->lpPrinterInfo); + PRINTDLG_UpdatePrinterInfoTextsA(hDlg, lppd->Flags, PrintStructures->lpPrinterInfo); free(PrintStructures->lpDevMode); PrintStructures->lpDevMode = NULL; @@ -1288,7 +1312,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, } ClosePrinter(hprn); - PRINTDLG_UpdatePrinterInfoTextsW(hDlg, PrintStructures->lpPrinterInfo); + PRINTDLG_UpdatePrinterInfoTextsW(hDlg, lppd->Flags, PrintStructures->lpPrinterInfo); free(PrintStructures->lpDevMode); PrintStructures->lpDevMode = NULL;

1 0