- Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Read debuggee environment by page.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 152e72c82c3450aad4ca1a31acc96fe6bd86f2e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/152e72c82c3450aad4ca1a31acc96f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 9 09:46:33 2023 +0200 dbghelp: Read debuggee environment by page. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 76761e4caf7..b15ece25c88 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -404,7 +404,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64) do { - size_t read_size = sysinfo.dwAllocationGranularity - (env & (sysinfo.dwAllocationGranularity - 1)); + size_t read_size = sysinfo.dwPageSize - (env & (sysinfo.dwPageSize - 1)); if (!(new_buf = realloc(buf, buf_size + read_size))) break; buf = new_buf;

1 0

Alistair Leslie-Hughes : d3dx9: Support empty mesh in D3DXLoadMeshHierarchyFromXInMemory().
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 21e91690b1688289a3b06951cd2152274998c5ba URL: https://gitlab.winehq.org/wine/wine/-/commit/21e91690b1688289a3b06951cd2152… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 28 12:35:29 2023 +1000 d3dx9: Support empty mesh in D3DXLoadMeshHierarchyFromXInMemory(). --- dlls/d3dx9_36/mesh.c | 51 +++++++++++++++++++++++++++++++++++++--------- dlls/d3dx9_36/tests/mesh.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 7aa70783735..d6c13007126 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3506,6 +3506,19 @@ HRESULT WINAPI D3DXLoadSkinMeshFromXof(struct ID3DXFileData *filedata, DWORD opt hr = parse_mesh(filedata, &mesh_data, provide_flags); if (FAILED(hr)) goto cleanup; + if (!mesh_data.num_vertices) + { + if (adjacency_out) + *adjacency_out = NULL; + if (materials_out) + *materials_out = NULL; + if (effects_out) + *effects_out = NULL; + *mesh_out = NULL; + hr = D3D_OK; + goto cleanup; + } + total_vertices = mesh_data.num_vertices; if (mesh_data.fvf & D3DFVF_NORMAL) { /* duplicate vertices with multiple normals */ @@ -3815,12 +3828,15 @@ static HRESULT load_mesh_container(struct ID3DXFileData *filedata, DWORD options hr = filedata_get_name(filedata, &name); if (FAILED(hr)) goto cleanup; - hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, - materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, - effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, - num_materials, - adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, - skin_info, mesh_container); + if (mesh_data.pMesh) + { + hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, + materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, + effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, + num_materials, + adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, + skin_info, mesh_container); + } cleanup: if (materials) ID3DXBuffer_Release(materials); @@ -4200,13 +4216,21 @@ static HRESULT parse_frame(struct ID3DXFileData *filedata, DWORD options, struct hr = E_OUTOFMEMORY; goto err; } - list_add_tail(container_list, &container->entry); - container->transform = transform; hr = D3DXLoadSkinMeshFromXof(child, options, device, (provide_flags & PROVIDE_ADJACENCY) ? &container->adjacency : NULL, (provide_flags & PROVIDE_MATERIALS) ? &container->materials : NULL, NULL, &container->num_materials, NULL, &container->mesh); + + if (container->mesh) + { + list_add_tail(container_list, &container->entry); + container->transform = transform; + } + else + { + HeapFree(GetProcessHeap(), HEAP_ZERO_MEMORY, container); + } } else if (IsEqualGUID(&type, &TID_D3DRMFrameTransformMatrix)) { D3DXMATRIX new_transform; hr = parse_transform_matrix(child, &new_transform); @@ -4294,13 +4318,20 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(const void *memory, DWORD memory_size, hr = E_OUTOFMEMORY; goto cleanup; } - list_add_tail(&container_list, &container_ptr->entry); - D3DXMatrixIdentity(&container_ptr->transform); hr = D3DXLoadSkinMeshFromXof(filedata, options, device, (provide_flags & PROVIDE_ADJACENCY) ? &container_ptr->adjacency : NULL, (provide_flags & PROVIDE_MATERIALS) ? &container_ptr->materials : NULL, NULL, &container_ptr->num_materials, NULL, &container_ptr->mesh); + if (container_ptr->mesh) + { + list_add_tail(&container_list, &container_ptr->entry); + D3DXMatrixIdentity(&container_ptr->transform); + } + else + { + HeapFree(GetProcessHeap(), 0, container_ptr); + } } else if (IsEqualGUID(&guid, &TID_D3DRMFrame)) { hr = parse_frame(filedata, options, device, &identity, &container_list, provide_flags); } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 7b7bb215b09..ce68903572b 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2068,6 +2068,14 @@ static void D3DXLoadMeshTest(void) "}" "Mesh { 3; 0.0; 0.0; 0.0;, 0.0; 1.0; 0.0;, 3.0; 1.0; 0.0;; 1; 3; 0, 1, 2;; }" "}"; + static const char framed_xfile_empty[] = + "xof 0303txt 0032" + "Frame Box01 {" + " Mesh { 0;; 0;;" + " MeshNormals { 0;; 0;; }" + " }" + "}"; + static const WORD framed_index_buffer[] = { 0, 1, 2 }; static const D3DXVECTOR3 framed_vertex_buffers[3][3] = { {{0.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 1.0, 0.0}}, @@ -2508,6 +2516,16 @@ static void D3DXLoadMeshTest(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#lx\n", hr); frame_hier = NULL; + hr = D3DXLoadMeshHierarchyFromXInMemory(framed_xfile_empty, sizeof(framed_xfile_empty) - 1, + D3DXMESH_MANAGED, device, &alloc_hier, NULL, &frame_hier, NULL); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + container = frame_hier->pMeshContainer; + ok(!strcmp(frame_hier->Name, "Box01"), "Unexpected name %s.\n", debugstr_a(frame_hier->Name)); + ok(!container, "Unexpected container %p.\n", container); + + hr = D3DXFrameDestroy(frame_hier, &alloc_hier); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + frame_hier = NULL; hr = D3DXLoadMeshFromXInMemory(NULL, 0, D3DXMESH_MANAGED, device, NULL, NULL, NULL, NULL, &mesh); @@ -11317,6 +11335,9 @@ static void test_load_skin_mesh_from_xof(void) "1;" "3; 0, 1, 2;;" "}"; + static const char simple_xfile_empty[] = + "xof 0303txt 0032" + "Mesh { 0;; 0;; }"; static const D3DVERTEXELEMENT9 expected_declaration[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, @@ -11428,6 +11449,28 @@ static void test_load_skin_mesh_from_xof(void) mesh->lpVtbl->Release(mesh); adjacency->lpVtbl->Release(adjacency); file_data->lpVtbl->Release(file_data); + + /* Empty Mesh Test */ + file_data = get_mesh_data(simple_xfile_empty, sizeof(simple_xfile_empty) - 1); + ok(!!file_data, "Failed to load mesh data.\n"); + + adjacency = materials = effects = (void *)0xdeadbeef; + count = 0xdeadbeefu; + skin_info = (void *)0xdeadbeef; + mesh = (void *)0xdeadbeef; + + hr = D3DXLoadSkinMeshFromXof(file_data, 0, device, &adjacency, &materials, &effects, &count, + &skin_info, &mesh); + todo_wine ok(hr == D3DXERR_LOADEDMESHASNODATA, "Unexpected hr %#lx.\n", hr); + ok(!adjacency, "Unexpected adjacency %p.\n", adjacency); + ok(!materials, "Unexpected materials %p.\n", materials); + ok(!effects, "Unexpected effects %p.\n", effects); + ok(count == 0xdeadbeefu, "Unexpected count %lu.\n", count); + ok(skin_info == (void *)0xdeadbeef, "Unexpected skin_info %p.\n", skin_info); + ok(!mesh, "Unexpected mesh %p.\n", mesh); + + file_data->lpVtbl->Release(file_data); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %lu references left.\n", refcount); DestroyWindow(hwnd);

1 0

Rémi Bernon : include: Avoid narrowing warning in wine_dbgstr_fourcc.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: bc7e51b48c9919cbb71a8bc0a7cb821c1dcbb5ec URL: https://gitlab.winehq.org/wine/wine/-/commit/bc7e51b48c9919cbb71a8bc0a7cb82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 9 15:57:36 2023 +0200 include: Avoid narrowing warning in wine_dbgstr_fourcc. --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index d1d751a2d8a..d0862942be8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -326,7 +326,7 @@ static inline const char *wine_dbgstr_guid( const GUID *id ) static inline const char *wine_dbgstr_fourcc( unsigned int fourcc ) { - char str[4] = { fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24 }; + char str[4] = { (char)fourcc, (char)(fourcc >> 8), (char)(fourcc >> 16), (char)(fourcc >> 24) }; if (!fourcc) return "''"; if (isprint( str[0] ) && isprint( str[1] ) && isprint( str[2] ) && isprint( str[3] ))

1 0

Matteo Bruni : d3dx9/tests: Get rid of unnecessary branches in D3DXLoadMeshTest().
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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

Alex Henrie : cmd: Reset ignoreBracket when moving to the next line.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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(a)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

Zhiyi Zhang : mf: Avoid a double free of presentation clock timers.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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

Piotr Caban : gdi32: Update printer DEVMODE in ResetDCW.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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 Oct. 9, 2023

Oct. 9, 2023

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

Nikolay Sivov : gdi32/emf: Fix miter limit serialization.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

Module: wine Branch: master Commit: 5b471a2963f52b5550e045ae0066bf4d393d7a56 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b471a2963f52b5550e045ae0066bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 7 17:53:00 2023 +0200 gdi32/emf: Fix miter limit serialization. --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/emfdc.c | 10 ++++++++++ dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi_private.h | 10 ++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e1f6703f81e..27211a2b1d2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1371,7 +1371,7 @@ BOOL WINAPI SetMiterLimit( HDC hdc, FLOAT limit, FLOAT *old_limit ) { DC_ATTR *dc_attr; if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - /* FIXME: record EMFs */ + if (dc_attr->emf && !EMFDC_SetMiterLimit( dc_attr, limit )) return 0; if (old_limit) *old_limit = dc_attr->miter_limit; dc_attr->miter_limit = limit; return TRUE; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 645592fea0a..35910b388c3 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2254,6 +2254,16 @@ BOOL EMFDC_SetMapMode( DC_ATTR *dc_attr, INT mode ) 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; + + emr.emr.iType = EMR_SETMITERLIMIT; + emr.emr.nSize = sizeof(emr); + emr.eMiterLimit = limit; + return emfdc_record( get_dc_emf( dc_attr ), &emr.emr ); +} + BOOL EMFDC_SetViewportExtEx( DC_ATTR *dc_attr, INT cx, INT cy ) { EMRSETVIEWPORTEXTEX emr; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 12449ecfdf0..0351d8c462d 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1680,7 +1680,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_SETMITERLIMIT: { - const EMRSETMITERLIMIT *lpSetMiterLimit = (const EMRSETMITERLIMIT *)mr; + const struct emr_set_miter_limit *lpSetMiterLimit = (const struct emr_set_miter_limit *)mr; SetMiterLimit( hdc, lpSetMiterLimit->eMiterLimit, NULL ); break; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f717181b252..a98c0f29917 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -160,6 +160,15 @@ typedef struct INT nBreakCount; } EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; +/* Public structure EMRSETMITERLIMIT is using a float field, + that does not match serialized output or documentation, + which are both using unsigned integer. */ +struct emr_set_miter_limit +{ + EMR emr; + DWORD eMiterLimit; +}; + BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ); BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, @@ -232,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_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 ); BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop );

1 0

Nikolay Sivov : winedump/emf: Add EMR_SETMITERLIMIT record dumping.
by Alexandre Julliard Oct. 9, 2023

Oct. 9, 2023

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