April 2023 - Wine-commits - list.winehq.org

Illia Polishchuk : d3d9: Always draw only a single instance for non-indexed draws.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 89519338d1b26d767aec77369c36ffcdd809c0a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/89519338d1b26d767aec77369c36ff… Author: Illia Polishchuk <illia.a.polishchuk(a)globallogic.com> Date: Tue Feb 28 22:58:35 2023 +0200 d3d9: Always draw only a single instance for non-indexed draws. Windows d3d9 always draws only a single instance for non-indexed draws. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54570 (cherry picked from commit af65f0c9a09c040a615e4eaa4c290240c0a12847) --- dlls/d3d9/device.c | 16 ++++++++++++---- dlls/d3d9/tests/visual.c | 9 +++------ dlls/wined3d/adapter_vk.c | 2 -- dlls/wined3d/context_gl.c | 6 ------ dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eddb2a0ebdd..bb3e0b8e6d4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3052,7 +3052,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, d3d9_generate_auto_mipmaps(device); wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); - wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, start_vertex, vertex_count, 0, 1); + d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3092,7 +3095,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d9_device_upload_sysmem_index_buffer(device, &start_idx, index_count); - wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, 0); + wined3d_device_context_draw_indexed(device->immediate_context, base_vertex_idx, start_idx, index_count, 0, + device->stateblock_state->streams[0].frequency); d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3144,7 +3148,10 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); - wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 0); + + /* Instancing is ignored for non-indexed draws. */ + wined3d_device_context_draw(device->immediate_context, vb_pos / stride, vtx_count, 0, 1); + wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); d3d9_rts_flag_auto_gen_mipmap(device); @@ -3211,7 +3218,8 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_context_set_primitive_type(device->immediate_context, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_context_draw_indexed(device->immediate_context, - vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, 0); + vb_pos / vertex_stride - min_vertex_idx, ib_pos / idx_fmt_size, idx_count, 0, + device->stateblock_state->streams[0].frequency); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); wined3d_stateblock_set_index_buffer(device->state, NULL, WINED3DFMT_UNKNOWN); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cdc9ed11a00..2c83965f0cb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13101,14 +13101,11 @@ static void stream_test(void) color = getPixelColor(device, 200, 340); ok(color == act.color1, "has color 0x%08x, expected 0x%08x (case %i)\n", color, act.color1, i); color = getPixelColor(device, 400, 340); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 400, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); color = getPixelColor(device, 200, 180); - todo_wine_if(color != 0x00ffffff) - ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); + ok(color == 0x00ffffff, "has color 0x%08x, expected 0x%08x (case %i)\n", color, 0x00ffffff, i); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 713aaec9e39..ff8a5ee2675 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1821,8 +1821,6 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, else { instance_count = parameters->u.direct.instance_count; - if (context_vk->c.instance_count) - instance_count = context_vk->c.instance_count; if (!instance_count) instance_count = 1; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0217e12d903..c7442514788 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5321,8 +5321,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s else { unsigned int instance_count = parameters->u.direct.instance_count; - if (context->instance_count) - instance_count = context->instance_count; if (context->use_immediate_mode_draw || emulation) draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, @@ -5466,7 +5464,6 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte /* This is used for the fixed-function pipeline only, and the * fixed-function pipeline doesn't do instancing. */ - context_gl->c.instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; /* Blend data */ @@ -5680,7 +5677,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c unsigned int i; /* Default to no instancing. */ - context->instance_count = 0; current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; if (stream_info->use_map & ~wined3d_mask_from_size(gl_info->limits.vertex_attribs)) @@ -5726,8 +5722,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c stream = &state->streams[element->stream_idx]; stream->buffer->bo_user.valid = true; - if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7abf77bb445..9e06a7c14d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2292,7 +2292,6 @@ struct wined3d_context DWORD numbered_array_mask; enum fogsource fog_source; - UINT instance_count; void *shader_backend_data; void *fragment_pipe_data;

1 0

Gijs Vermeulen : shell32: Add Shell_GetCachedImageIndexA/W exports.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 8aaf665bcd697eabaad3d890b232dcb481ea71c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aaf665bcd697eabaad3d890b232dc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat Feb 25 18:43:53 2023 +0100 shell32: Add Shell_GetCachedImageIndexA/W exports. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54581 (cherry picked from commit a4e51c6beceb60c4d67e90559ce115cb60274432) --- dlls/shell32/iconcache.c | 4 ++-- dlls/shell32/shell32.spec | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 3f3741540d0..d75daa3fa8d 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -737,7 +737,7 @@ HRESULT WINAPI SHMapIDListToImageListIndexAsync(IUnknown *pts, IShellFolder *psf * Shell_GetCachedImageIndex [SHELL32.72] * */ -static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateDoc) { INT ret, len; LPWSTR szTemp; @@ -755,7 +755,7 @@ static INT Shell_GetCachedImageIndexA(LPCSTR szPath, INT nIndex, BOOL bSimulateD return ret; } -static INT Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) +INT WINAPI Shell_GetCachedImageIndexW(LPCWSTR szPath, INT nIndex, BOOL bSimulateDoc) { WARN("(%s,%08x,%08x) semi-stub.\n",debugstr_w(szPath), nIndex, bSimulateDoc); diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 59285c89c57..4a64b80ddd9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -453,6 +453,8 @@ @ stdcall ShellExecuteExW (long) @ stdcall ShellExecuteW (long wstr wstr wstr wstr long) @ stdcall ShellHookProc(long long long) +@ stdcall Shell_GetCachedImageIndexA(str long long) +@ stdcall Shell_GetCachedImageIndexW(wstr long long) @ stdcall Shell_NotifyIcon(long ptr) Shell_NotifyIconA @ stdcall Shell_NotifyIconA(long ptr) @ stdcall Shell_NotifyIconW(long ptr)

1 0

Piotr Caban : winspool: Fix FILE: output handling in StartDocDlgW.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: ac61163dd69d991fea9b037aecd6c116cd22870d URL: https://gitlab.winehq.org/wine/wine/-/commit/ac61163dd69d991fea9b037aecd6c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Feb 19 17:18:38 2023 +0100 winspool: Fix FILE: output handling in StartDocDlgW. (cherry picked from commit 4a8cdc2b4981cc776d02a02de32fcb70dd86c0cd) --- dlls/winspool.drv/info.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bc55d7f6d73..a137432b188 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7491,9 +7491,6 @@ static BOOL is_port(const WCHAR *port_list, const WCHAR *output) { size_t len; - if (!output) - return FALSE; - if (wcschr(output, ':')) return TRUE; @@ -7533,7 +7530,7 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrinter, DOCINFOW *doc ) /* Check whether default port is FILE: */ b = !doc->lpszOutput && (!pi5->pPortName || wcscmp( pi5->pPortName, L"FILE:" )); - if (!b) + if (!b && doc->lpszOutput && wcscmp( doc->lpszOutput, L"FILE:" )) b = is_port(pi5->pPortName, doc->lpszOutput); free(pi5); if (b)

1 0

Piotr Caban : localspl: Ignore an empty output string.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: b1d190d66114462df8b2291bb742e12926980756 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1d190d66114462df8b2291bb742e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 21 14:45:16 2023 +0100 localspl: Ignore an empty output string. We should probably ignore all incorrect ports. This is a minimal change that restores 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 commit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54379 (cherry picked from commit 48d3271f963319b6e45eeaf18b44ac1a1bd3c190) --- dlls/localspl/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 790d9d64c00..f0f2a1deb44 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3697,7 +3697,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) } port = job->port; - if (!port) + if (!port || !*port) port = printer->info->port; TRACE("need to schedule job %ld filename %s to port %s\n", job->id, debugstr_w(job->filename), debugstr_w(port));

1 0

Eric Pouech : conhost: Only update font when running with a window.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 233e588b7350f93ccccbd527e8e76b103ad30203 URL: https://gitlab.winehq.org/wine/wine/-/commit/233e588b7350f93ccccbd527e8e76b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 10:30:34 2023 +0100 conhost: Only update font when running with a window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54449 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 7077c5bcabbfe9f18c92a5a1e89f408329515ba6) --- programs/conhost/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 0a44186beb1..63bf532fd73 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -932,6 +932,8 @@ void update_console_font( struct console *console, const WCHAR *face_name, size_ { LOGFONTW lf; + if (!console->window) return; + fill_logfont( &lf, face_name, face_name_size, height, weight ); set_console_font( console, &lf );

1 0

Hugh McMaster : regedit: Allow export_key() to return TRUE.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: f31559dfc8309c78aa9bf3962bf92365dfc5035f URL: https://gitlab.winehq.org/wine/wine/-/commit/f31559dfc8309c78aa9bf3962bf923… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 9 21:22:48 2023 +1100 regedit: Allow export_key() to return TRUE. We don't handle errors in export_registry_data() anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54491 (cherry picked from commit f5fe9a6cf9121004ecdf5c0b285fcd88ec8a0d94) --- programs/regedit/framewnd.c | 2 +- programs/regedit/regproc.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d821d4dad77..3bc60ee0f75 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -500,7 +500,7 @@ static BOOL ExportRegistryFile(HWND hWnd) BOOL result; result = export_registry_key(ofn.lpstrFile, (LPWSTR)ofn.lCustData, ofn.nFilterIndex); if (!result) { - /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ + FIXME("Registry export failed.\n"); return FALSE; } } else { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4f84c5883be..30106380241 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1328,7 +1328,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) #define MAX_SUBKEY_LEN 257 -static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) +static void export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { LONG rc; DWORD max_value_len = 256, value_len; @@ -1398,7 +1398,6 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) } free(subkey_name); - return 0; } static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) @@ -1450,7 +1449,6 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) HKEY key_class, key; WCHAR *subkey; FILE *fp; - BOOL ret; if (!(key_class = parse_key_name(path, &subkey))) { @@ -1463,12 +1461,12 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); - ret = export_registry_data(fp, key, path, unicode); + export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); RegCloseKey(key); - return ret; + return TRUE; } static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode)

1 0

Hugh McMaster : regedit: Append '.reg' file extension if necessary.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 930833331e2487720a90a58d700c7b0254d01560 URL: https://gitlab.winehq.org/wine/wine/-/commit/930833331e2487720a90a58d700c7b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 9 21:30:26 2023 +1100 regedit: Append '.reg' file extension if necessary. (cherry picked from commit 1a61a4e1a66f24b3c8fb2090e85f006af703741e) --- programs/regedit/framewnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 3bc60ee0f75..c2af414d268 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -493,6 +493,7 @@ static BOOL ExportRegistryFile(HWND hWnd) InitOpenFileName(hWnd, &ofn); LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; + ofn.lpstrDefExt = L"reg"; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCEW(IDD_EXPORT_TEMPLATE);

1 0

Nikolay Sivov : apisetschema: Add ext-ms-win-networking-wlanapi-l1-1-0.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 38cb4548e1e0da530cb780d3636aa395e6dbd312 URL: https://gitlab.winehq.org/wine/wine/-/commit/38cb4548e1e0da530cb780d3636aa3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 07:40:10 2023 +0100 apisetschema: Add ext-ms-win-networking-wlanapi-l1-1-0. (cherry picked from commit 2f229869d8f3940cafe60563f3938a8fbe78c1d8) --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index cb22c25c054..981b80c6976 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -384,6 +384,7 @@ apiset ext-ms-win-mm-pehelper-l1-1-0 = mf.dll apiset ext-ms-win-mm-wmvcore-l1-1-0 = wmvcore.dll apiset ext-ms-win-msi-misc-l1-1-0 = msi.dll apiset ext-ms-win-msimg-draw-l1-1-0 = msimg32.dll +apiset ext-ms-win-networking-wlanapi-l1-1-0 = wlanapi.dll apiset ext-ms-win-ntdsapi-activedirectoryclient-l1-1-1 = ntdsapi.dll apiset ext-ms-win-ntuser-caret-l1-1-0 = user32.dll apiset ext-ms-win-ntuser-chartranslation-l1-1-0 = user32.dll

1 0

Piotr Caban : gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 207bae2ca5a168b849ec613815c02c37afeaff47 URL: https://gitlab.winehq.org/wine/wine/-/commit/207bae2ca5a168b849ec613815c02c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 3 15:56:29 2023 +0100 gdiplus: Use transparency instead of background color if transparent color flag is set in GIF GCE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54563 (cherry picked from commit 333a63c456fec24f249a7096b1d858252c9a6bf4) --- dlls/gdiplus/image.c | 16 +++--------- dlls/gdiplus/tests/image.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 101e7ae1c93..3b9ce3c14f1 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3881,20 +3881,10 @@ static DWORD get_gif_background_color(GpBitmap *bitmap) UINT i; for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; - break; - } - } - - for(i=0; i<bitmap->prop_count; i++) { - if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { - BYTE transparent_idx; - transparent_idx = *(BYTE*)bitmap->prop_item[i].value; - - if(transparent_idx == bgcolor_idx) - return 0; - } + else if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) + return 0; } for(i=0; i<bitmap->prop_count; i++) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9e35cf33eb4..e32b4c81240 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2899,10 +2899,11 @@ static const unsigned char gifanimation[72] = { * -dispose previous -page +4+0 -size 2x2 xc:green \ * -dispose undefined -page +6+0 -size 2x2 xc:gray \ * test.gif + * Background color index changed to 1. */ static const unsigned char gifanimation2[] = { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, - 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, @@ -2937,6 +2938,43 @@ static ARGB gifanimation2_pixels[5][4] = { {0xffff0000, 0, 0, 0xff7e7e7e} }; +static const unsigned char gifanimation3[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x05, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x09, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0d, 0x64, 0x00, 0x10, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x10, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation3_pixels[5][4] = { + {0xff000000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff000000}, + {0xffff0000, 0xff0000ff, 0xff000000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff008000, 0xff000000}, + {0xffff0000, 0xff000000, 0xff000000, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -3185,6 +3223,31 @@ static void test_multiframegif(void) } GdipDisposeImage((GpImage*)bmp); + + hglob = GlobalAlloc (0, sizeof(gifanimation3)); + data = GlobalLock (hglob); + memcpy(data, gifanimation3, sizeof(gifanimation3)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation3_pixels[i%5][j] == color, "at %d,%d got %lx, expected %lx\n", i, j, color, gifanimation3_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void)

1 0

Jinoh Kang : riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 7b360c9c08da82571f8c2149d59bb02d15880253 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b360c9c08da82571f8c2149d59bb0… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 21:58:40 2023 +0900 riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze. (cherry picked from commit 3105fad82b9bae390fcd710a2fc10a18988b4622) --- dlls/riched20/tests/richole.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/txtsrv.c | 28 ++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d648354729e..529291b5fd1 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -31,6 +31,8 @@ #include <richedit.h> #include <richole.h> #include <tom.h> +#include <imm.h> +#include <textserv.h> #include <wine/test.h> #define EXPECT_TODO_WINE 0x80000000UL @@ -605,6 +607,7 @@ static HRESULT testoleobj_Create( struct testoleobj **objptr ) static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; @@ -5444,6 +5447,88 @@ static void test_undo_control(void) release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection); } +static void test_freeze(void) +{ + ITextSelection *selection = NULL; + DWORD lasterr, style1, style2; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + HRESULT hr; + LONG count; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + + SetLastError(0xdeadbeef); + style1 = GetWindowLongW(hwnd, GWL_STYLE); + lasterr = GetLastError(); + ok(lasterr == 0xdeadbeefUL, "GetLastError() returned %#lx\n", lasterr); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + style2 = GetWindowLongW(hwnd, GWL_STYLE); + ok(style2 == style1, "expected window style to not change from %#lx, got %#lx\n", style1, style2); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 2, "expected count to be %d, got %ld\n", 2, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_FALSE, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + + release_interfaces(&hwnd, &reole, &doc, &selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5487,4 +5572,5 @@ START_TEST(richole) test_clipboard(); test_undo(); test_undo_control(); + test_freeze(); } diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 16904347919..2777f4eea21 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -815,15 +815,20 @@ static void test_TxGetNaturalSize(void) static void test_TxDraw(void) { ITextServices *txtserv; + ITextDocument *txtdoc; ITextHost *host; HRESULT hr; RECT client = {0, 0, 100, 100}; ITextHostTestImpl *host_impl; + LONG freeze_count; HDC hdc; if (!init_texthost(&txtserv, &host)) return; + hr = ITextServices_QueryInterface( txtserv, &IID_ITextDocument, (void **)&txtdoc ); + ok( hr == S_OK, "ITextServices_QueryInterface (ITextDocument) returned %#lx\n", hr ); + host_impl = impl_from_ITextHost( host ); host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 400, 400, 0, 0, 0, NULL ); @@ -856,9 +861,32 @@ static void test_TxDraw(void) NULL, NULL, 0, TXTVIEW_INACTIVE ); ok( hr == S_OK, "got %08lx\n", hr ); + freeze_count = 0xdeadbeef; + hr = ITextDocument_Freeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 1, "expected count to be %d, got %ld\n", 1, freeze_count ); + + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_INACTIVE ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + todo_wine + ok( hr == E_UNEXPECTED, "got %08lx\n", hr ); + + freeze_count = 0xdeadbeef; + hr = ITextDocument_Unfreeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 0, "expected count to be %d, got %ld\n", 0, freeze_count ); + hr = ITextServices_OnTxInPlaceDeactivate( txtserv ); ReleaseDC( host_impl->window, hdc ); + ITextDocument_Release(txtdoc); ITextServices_Release(txtserv); DestroyWindow( host_impl->window ); ITextHost_Release(host);

1 0