wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Matteo Bruni : d3dx9/tests: Get rid of unnecessary branches in D3DXLoadMeshTest().
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 526909f8b111495a874355ac18ab5058554ba639 URL: https://gitlab.winehq.org/wine/wine/-/commit/526909f8b111495a874355ac18ab50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 9 16:03:07 2023 +0200 d3dx9/tests: Get rid of unnecessary branches in D3DXLoadMeshTest(). --- dlls/d3dx9_36/tests/mesh.c | 126 +++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index e5ba6e24996..7b7bb215b09 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2383,6 +2383,8 @@ static void D3DXLoadMeshTest(void) D3DXMATRIX transform; struct test_context *test_context; ID3DXAnimationController *controller; + D3DXMESHCONTAINER *container; + unsigned int i; if (!(test_context = new_test_context())) { @@ -2418,26 +2420,24 @@ static void D3DXLoadMeshTest(void) hr = D3DXLoadMeshHierarchyFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - if (SUCCEEDED(hr)) { - D3DXMESHCONTAINER *container = frame_hier->pMeshContainer; - - ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); - D3DXMatrixIdentity(&transform); - check_matrix(&frame_hier->TransformationMatrix, &transform); - - ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name); - ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n", - D3DXMESHTYPE_MESH, container->MeshData.Type); - mesh = container->MeshData.pMesh; - check_vertex_buffer(mesh, simple_vertex_buffer, ARRAY_SIZE(simple_vertex_buffer), simple_fvf); - check_index_buffer(mesh, simple_index_buffer, ARRAY_SIZE(simple_index_buffer), sizeof(*simple_index_buffer)); - check_materials(container->pMaterials, container->NumMaterials, NULL, 0); - check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects); - check_generated_adjacency(mesh, container->pAdjacency, 0.0f); - hr = D3DXFrameDestroy(frame_hier, &alloc_hier); - ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - frame_hier = NULL; - } + container = frame_hier->pMeshContainer; + + ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); + D3DXMatrixIdentity(&transform); + check_matrix(&frame_hier->TransformationMatrix, &transform); + + ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name); + ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n", + D3DXMESHTYPE_MESH, container->MeshData.Type); + mesh = container->MeshData.pMesh; + check_vertex_buffer(mesh, simple_vertex_buffer, ARRAY_SIZE(simple_vertex_buffer), simple_fvf); + check_index_buffer(mesh, simple_index_buffer, ARRAY_SIZE(simple_index_buffer), sizeof(*simple_index_buffer)); + check_materials(container->pMaterials, container->NumMaterials, NULL, 0); + check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects); + check_generated_adjacency(mesh, container->pAdjacency, 0.0f); + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + frame_hier = NULL; controller = (ID3DXAnimationController *)0xdeadbeef; hr = D3DXLoadMeshHierarchyFromXInMemory(box_anim_xfile, sizeof(box_anim_xfile) - 1, @@ -2459,59 +2459,54 @@ static void D3DXLoadMeshTest(void) hr = D3DXLoadMeshHierarchyFromXInMemory(box_xfile, sizeof(box_xfile) - 1, D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, &controller); ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - if (SUCCEEDED(hr)) - { - D3DXMESHCONTAINER *container = frame_hier->pMeshContainer; + container = frame_hier->pMeshContainer; + + ok(!controller, "Animation Controller returned.\n"); + ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); + D3DXMatrixIdentity(&transform); + check_matrix(&frame_hier->TransformationMatrix, &transform); + + ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name); + ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n", + D3DXMESHTYPE_MESH, container->MeshData.Type); + mesh = container->MeshData.pMesh; + check_vertex_buffer(mesh, box_vertex_buffer, ARRAY_SIZE(box_vertex_buffer), box_fvf); + check_index_buffer(mesh, box_index_buffer, ARRAY_SIZE(box_index_buffer), sizeof(*box_index_buffer)); + check_materials(container->pMaterials, container->NumMaterials, box_materials, ARRAY_SIZE(box_materials)); + check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects); + check_generated_adjacency(mesh, container->pAdjacency, 0.0f); + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + frame_hier = NULL; + + hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile, sizeof(framed_xfile) - 1, + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); + container = frame_hier->pMeshContainer; - ok(!controller, "Animation Controller returned.\n"); - ok(frame_hier->Name == NULL, "Expected NULL, got '%s'\n", frame_hier->Name); - D3DXMatrixIdentity(&transform); - check_matrix(&frame_hier->TransformationMatrix, &transform); + ok(!strcmp(frame_hier->Name, ""), "Expected '', got '%s'\n", frame_hier->Name); + /* last frame transform replaces the first */ + D3DXMatrixIdentity(&transform); + transform.m[3][2] = 3.0; + check_matrix(&frame_hier->TransformationMatrix, &transform); + for (i = 0; i < 3; ++i) + { ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name); ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n", - D3DXMESHTYPE_MESH, container->MeshData.Type); + D3DXMESHTYPE_MESH, container->MeshData.Type); mesh = container->MeshData.pMesh; - check_vertex_buffer(mesh, box_vertex_buffer, ARRAY_SIZE(box_vertex_buffer), box_fvf); - check_index_buffer(mesh, box_index_buffer, ARRAY_SIZE(box_index_buffer), sizeof(*box_index_buffer)); - check_materials(container->pMaterials, container->NumMaterials, box_materials, ARRAY_SIZE(box_materials)); + check_vertex_buffer(mesh, framed_vertex_buffers[i], ARRAY_SIZE(framed_vertex_buffers[0]), framed_fvf); + check_index_buffer(mesh, framed_index_buffer, ARRAY_SIZE(framed_index_buffer), sizeof(*framed_index_buffer)); + check_materials(container->pMaterials, container->NumMaterials, NULL, 0); check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects); check_generated_adjacency(mesh, container->pAdjacency, 0.0f); - hr = D3DXFrameDestroy(frame_hier, &alloc_hier); - ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - frame_hier = NULL; + container = container->pNextMeshContainer; } - - hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile, sizeof(framed_xfile) - 1, - D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + ok(container == NULL, "Expected NULL, got %p\n", container); + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - if (SUCCEEDED(hr)) { - D3DXMESHCONTAINER *container = frame_hier->pMeshContainer; - int i; - - ok(!strcmp(frame_hier->Name, ""), "Expected '', got '%s'\n", frame_hier->Name); - /* last frame transform replaces the first */ - D3DXMatrixIdentity(&transform); - transform.m[3][2] = 3.0; - check_matrix(&frame_hier->TransformationMatrix, &transform); - - for (i = 0; i < 3; i++) { - ok(!strcmp(container->Name, ""), "Expected '', got '%s'\n", container->Name); - ok(container->MeshData.Type == D3DXMESHTYPE_MESH, "Expected %d, got %d\n", - D3DXMESHTYPE_MESH, container->MeshData.Type); - mesh = container->MeshData.pMesh; - check_vertex_buffer(mesh, framed_vertex_buffers[i], ARRAY_SIZE(framed_vertex_buffers[0]), framed_fvf); - check_index_buffer(mesh, framed_index_buffer, ARRAY_SIZE(framed_index_buffer), sizeof(*framed_index_buffer)); - check_materials(container->pMaterials, container->NumMaterials, NULL, 0); - check_generated_effects(container->pMaterials, container->NumMaterials, container->pEffects); - check_generated_adjacency(mesh, container->pAdjacency, 0.0f); - container = container->pNextMeshContainer; - } - ok(container == NULL, "Expected NULL, got %p\n", container); - hr = D3DXFrameDestroy(frame_hier, &alloc_hier); - ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - frame_hier = NULL; - } + frame_hier = NULL; hr = D3DXLoadMeshFromXInMemory(NULL, 0, D3DXMESH_MANAGED, @@ -2541,8 +2536,7 @@ static void D3DXLoadMeshTest(void) hr = D3DXLoadMeshFromXInMemory(simple_xfile, sizeof(simple_xfile) - 1, D3DXMESH_MANAGED, device, NULL, NULL, NULL, NULL, &mesh); ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(mesh); + IUnknown_Release(mesh); test_LoadMeshFromX(device, simple_xfile, simple_vertex_buffer, simple_fvf, simple_index_buffer, default_materials, TRUE); test_LoadMeshFromX(device, box_xfile, box_vertex_buffer, box_fvf, box_index_buffer, box_materials, TRUE);

1 0

Zhiyi Zhang : mf: Avoid a double free of presentation clock timers.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: e4cdcb1ec9f4f561773646e8708e6da18dbe4f5c URL: https://gitlab.winehq.org/wine/wine/-/commit/e4cdcb1ec9f4f561773646e8708e6d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 27 10:25:23 2023 +0800 mf: Avoid a double free of presentation clock timers. In clock_change_state() when a clock is running, a timer is removed from clock->timers. The same timer is then used to create an async result, which will eventually calls present_clock_timer_callback_Invoke() and release the same timer. Check if the timer is still in clock->timers before releasing it. --- dlls/mf/clock.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index aef4366c6d9..e6be05d2794 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -1108,13 +1108,19 @@ static HRESULT WINAPI present_clock_timer_callback_Invoke(IMFAsyncCallback *ifac if (FAILED(hr = IMFAsyncResult_GetObject(result, &object))) return hr; - timer = impl_clock_timer_from_IUnknown(object); - EnterCriticalSection(&clock->cs); - list_remove(&timer->entry); - IUnknown_Release(&timer->IUnknown_iface); + LIST_FOR_EACH_ENTRY(timer, &clock->timers, struct clock_timer, entry) + { + if (&timer->IUnknown_iface == object) + { + list_remove(&timer->entry); + IUnknown_Release(&timer->IUnknown_iface); + break; + } + } LeaveCriticalSection(&clock->cs); + timer = impl_clock_timer_from_IUnknown(object); IMFAsyncCallback_Invoke(timer->callback, timer->result); IUnknown_Release(object);

1 0

Alex Henrie : cmd: Reset ignoreBracket when moving to the next line.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 8f282944347c4f8628e412992c61a1f831d213c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f282944347c4f8628e412992c61a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 6 22:56:59 2023 -0600 cmd: Reset ignoreBracket when moving to the next line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55528 --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ programs/cmd/wcmdmain.c | 1 + 3 files changed, 15 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 08595933622..510a1ba5931 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1276,9 +1276,21 @@ if ""=="" for %%i in (A) DO (echo %%i) if not ""=="" for %%i in (B) DO (echo %%i) echo ------------ Testing if/set ------------ +rem a left parenthesis is part of the value, not the start of an 'if' block set x=C:\Program Files (x86) if ""=="" set y=%x%\dummy echo %y% +if 1 == 1 set z= ( +echo '%z%' +rem 'set' in one-line 'if' statement does not interfere with other 'if' blocks +setlocal enableDelayedExpansion +if 1 == 1 ( + if 1 == 1 set z=zeta + if 1 == 1 ( + echo !z! + ) +) +endlocal echo --- Testing if + var subst in delayed expansion mode setlocal enableDelayedExpansion diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 85e734b048a..0f48a823109 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -928,6 +928,8 @@ x@space@ A ------------ Testing if/set ------------ C:\Program Files (x86)\dummy +' (' +zeta --- Testing if + var subst in delayed expansion mode [DEBUG] checking {abc} [DEBUG] checking {10.0} diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cc81534fff3..843fef8ea50 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2302,6 +2302,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WINE_TRACE("Need to read more data as outstanding brackets or carets\n"); inOneLine = FALSE; + ignoreBracket = FALSE; prevDelim = CMD_NONE; inQuotes = 0; memset(extraSpace, 0x00, (MAXSTRING+1) * sizeof(WCHAR));

1 0

Piotr Caban : gdi32: Update printer DEVMODE in ResetDCW.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 01fab4c4098f0e974f38448a44815747df691128 URL: https://gitlab.winehq.org/wine/wine/-/commit/01fab4c4098f0e974f38448a448157… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:32:37 2023 +0200 gdi32: Update printer DEVMODE in ResetDCW. --- dlls/gdi32/dc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3185fb273ba..02c6a8c84cd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -524,7 +524,18 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) print = get_dc_print( dc_attr ); if (print && print->flags & CALL_END_PAGE) return 0; if (!NtGdiResetDC( hdc, devmode, NULL, NULL, NULL )) return 0; - if (print && !print_copy_devmode( print, devmode )) return 0; + if (print) + { + PRINTER_DEFAULTSW prn_defaults = + { + .pDatatype = NULL, + .pDevMode = (DEVMODEW *)devmode, + .DesiredAccess = PRINTER_ACCESS_USE + }; + + if (!print_copy_devmode( print, devmode )) return 0; + ResetPrinterW( print->printer, &prn_defaults ); + } return hdc; }

1 0

Piotr Caban : winspool.drv: Add ResetPrinterW implementation.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 09bcad740376250a87f098cfedc926ce2ba300b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/09bcad740376250a87f098cfedc926… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:42:27 2023 +0200 winspool.drv: Add ResetPrinterW implementation. --- dlls/winspool.drv/info.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8a948ce7575..c1c3b8bf629 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3280,10 +3280,19 @@ BOOL WINAPI ResetPrinterA(HANDLE hPrinter, LPPRINTER_DEFAULTSA pDefault) /***************************************************************************** * ResetPrinterW [WINSPOOL.@] */ -BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) +BOOL WINAPI ResetPrinterW(HANDLE printer, PRINTER_DEFAULTSW *def) { - FIXME("(%p, %p): stub\n", hPrinter, pDefault); - return FALSE; + HANDLE handle = get_backend_handle(printer); + + TRACE("(%p, %p)\n", printer, def); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpResetPrinter(handle, def); } /*****************************************************************************

1 0

Piotr Caban : localspl: Add ResetPrinter implementation.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: b6b8d5f49c06394a5edffa392928a3a577db75ad URL: https://gitlab.winehq.org/wine/wine/-/commit/b6b8d5f49c06394a5edffa392928a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 5 14:56:34 2023 +0200 localspl: Add ResetPrinter implementation. --- dlls/localspl/provider.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 762f61dbf57..26e9c66bea0 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2472,6 +2472,36 @@ static BOOL WINAPI fpDeleteMonitor(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMo return FALSE; } +static BOOL WINAPI fpResetPrinter(HANDLE hprinter, PRINTER_DEFAULTSW *def) +{ + printer_t *printer = (printer_t *)hprinter; + + if (!printer || printer->header.type != HANDLE_PRINTER) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!def) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + free(printer->datatype); + if (def->pDatatype) + printer->datatype = wcsdup(def->pDatatype); + else + printer->datatype = NULL; + + free(printer->devmode); + if (def->pDevMode) + printer->devmode = dup_devmode(def->pDevMode); + else + printer->devmode = NULL; + return TRUE; +} + /***************************************************************************** * fpDeletePort [exported through PRINTPROVIDOR] * @@ -4111,7 +4141,7 @@ static const PRINTPROVIDOR backend = { NULL, /* fpPrinterMessageBox */ fpAddMonitor, fpDeleteMonitor, - NULL, /* fpResetPrinter */ + fpResetPrinter, NULL, /* fpGetPrinterDriverEx */ NULL, /* fpFindFirstPrinterChangeNotification */ NULL, /* fpFindClosePrinterChangeNotification */

1 0

Nikolay Sivov : winedump/emf: Add EMR_SETMITERLIMIT record dumping.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 372c43868bd0950935c9542a1af2c9a0bf705f9e URL: https://gitlab.winehq.org/wine/wine/-/commit/372c43868bd0950935c9542a1af2c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:33:47 2023 +0200 winedump/emf: Add EMR_SETMITERLIMIT record dumping. --- tools/winedump/emf.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 8a04886571c..42b1f9469af 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -174,7 +174,6 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) EMRCASE(EMR_ARCTO); EMRCASE(EMR_POLYDRAW); EMRCASE(EMR_SETARCDIRECTION); - EMRCASE(EMR_SETMITERLIMIT); EMRCASE(EMR_BEGINPATH); EMRCASE(EMR_ENDPATH); EMRCASE(EMR_CLOSEFIGURE); @@ -186,6 +185,15 @@ unsigned long dump_emfrecord(const char *pfx, unsigned long offset) EMRCASE(EMR_SELECTCLIPPATH); EMRCASE(EMR_ABORTPATH); + case EMR_SETMITERLIMIT: + { + const EMRSETMITERLIMIT *record = PRD(offset, sizeof(*record)); + + printf("%s%-20s %08x\n", pfx, "EMR_SETMITERLIMIT", length); + printf("%s miter limit %u\n", pfx, *(unsigned int *)&record->eMiterLimit); + break; + } + case EMR_GDICOMMENT: { printf("%s%-20s %08x\n", pfx, "EMR_GDICOMMENT", length);

1 0

Nikolay Sivov : gdi32/emf: Add SetMetaRgn() recording.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: fea9bb75237bb83eebdc0cbaa4b02f4bf6e8a54a URL: https://gitlab.winehq.org/wine/wine/-/commit/fea9bb75237bb83eebdc0cbaa4b02f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:25:06 2023 +0200 gdi32/emf: Add SetMetaRgn() recording. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/emfdc.c | 9 +++++++++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 09068c7d13a..3185fb273ba 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2253,7 +2253,7 @@ INT WINAPI SetMetaRgn( HDC hdc ) DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - if (dc_attr->emf) FIXME( "EMFs are not yet supported\n" ); + if (dc_attr->emf && !EMFDC_SetMetaRgn( dc_attr )) return FALSE; return NtGdiSetMetaRgn( hdc ); } diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 35910b388c3..e94f3c69b12 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2254,6 +2254,15 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); } +BOOL EMFDC_SetMetaRgn( DC_ATTR *dc_attr ) +{ + EMRSETMETARGN emr; + + emr.emr.iType = EMR_SETMETARGN; + emr.emr.nSize = sizeof(emr); + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} + BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ) { struct emr_set_miter_limit emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a98c0f29917..d9bf1c32895 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -241,6 +241,7 @@ INT EMFDC_SetDIBitsToDevice( DC_ATTR *dc_attr, INT x_dest, INT y_dest, DWORD wi BOOL EMFDC_SetLayout( DC_ATTR *dc_attr, DWORD layout ); BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ); BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ); +BOOL EMFDC_SetMetaRgn( DC_ATTR *dc_attr ); BOOL EMFDC_SetMiterLimit( DC_ATTR *dc_attr, FLOAT limit ); BOOL EMFDC_SetPixel( DC_ATTR *dc_attr, INT x, INT y, COLORREF color ); BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode );

1 0

Nikolay Sivov : gdi32: Reject invalid values in SetMiterLimit().
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 200d795ff3dd3792abb524e1720756a050660974 URL: https://gitlab.winehq.org/wine/wine/-/commit/200d795ff3dd3792abb524e1720756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:13:51 2023 +0200 gdi32: Reject invalid values in SetMiterLimit(). --- dlls/gdi32/dc.c | 1 + dlls/gdi32/tests/dc.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27211a2b1d2..09068c7d13a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1372,6 +1372,7 @@ BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_SetMiterLimit( dc_attr, limit )) return 0; + if (limit < 1.0f) return FALSE; if (old_limit) *old_limit = dc_attr->miter_limit; dc_attr->miter_limit = limit; return TRUE; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d8204acfc14..ef121470dfe 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -101,15 +101,12 @@ static void test_dc_values(void) limit = 456.0; ret = SetMiterLimit(hdc, 0.9f, &limit); - todo_wine ok(!ret, "Unexpected return value.\n"); - todo_wine ok(limit == 456.0f, "Unexpected default miter limit %f.\n", limit); limit = 0.0; ret = SetMiterLimit(hdc, 1.0f, &limit); ok(ret, "Unexpected return value.\n"); - todo_wine ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); DeleteDC( hdc );

1 0

Nikolay Sivov : gdi32/tests: Add some tests for SetMiterLimit() argument validation.
by Alexandre Julliard 09 Oct '23

09 Oct '23

Module: wine Branch: master Commit: 3f304014952636e6ee78c2f7495ee6fb60604d0b URL: https://gitlab.winehq.org/wine/wine/-/commit/3f304014952636e6ee78c2f7495ee6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 18:11:41 2023 +0200 gdi32/tests: Add some tests for SetMiterLimit() argument validation. --- dlls/gdi32/tests/dc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e3d29ae9ca9..d8204acfc14 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -38,6 +38,8 @@ static void test_dc_values(void) HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; int extra, attr; + float limit; + BOOL ret; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -91,6 +93,25 @@ static void test_dc_values(void) ok(!attr, "GetDeviceCaps rets %d\n", attr); ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); + /* Miter limit */ + limit = 123.0f; + ret = GetMiterLimit(hdc, &limit); + ok(ret, "Unexpected return value.\n"); + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 456.0; + ret = SetMiterLimit(hdc, 0.9f, &limit); + todo_wine + ok(!ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 456.0f, "Unexpected default miter limit %f.\n", limit); + + limit = 0.0; + ret = SetMiterLimit(hdc, 1.0f, &limit); + ok(ret, "Unexpected return value.\n"); + todo_wine + ok(limit == 10.0f, "Unexpected default miter limit %f.\n", limit); + DeleteDC( hdc ); }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
71
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 October 2023