wine-commits

wine-commits@winehq.org

1 participants
185885 discussions

Krzysztof Bogacki : win32u: Log Vulkan GPU's PCI IDs when matching against them.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: e2aaba33a903c474834e0e59580cc24b47b5f0f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2aaba33a903c474834e0e59580cc2… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:27:58 2024 +0200 win32u: Log Vulkan GPU's PCI IDs when matching against them. We already have input GPU's PCI IDs logged by TRACE above; logging Vulkan GPU's IDs the second time is a bit inconsistent and misleading. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 54f514f557e..9d765545d26 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1235,14 +1235,16 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if ((vulkan_gpu = find_vulkan_gpu_from_uuid( ctx, vulkan_uuid ))) TRACE( "Found vulkan GPU matching uuid %s, pci_id %#04x:%#04x, name %s\n", debugstr_guid(&vulkan_gpu->uuid), - pci_id->vendor, pci_id->device, debugstr_a(vulkan_gpu->name)); + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_a(vulkan_gpu->name)); else if ((vulkan_gpu = find_vulkan_gpu_from_pci_id( ctx, pci_id ))) - TRACE( "Found vulkan GPU matching pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + TRACE( "Found vulkan GPU matching pci_id %#04x:%#04x, uuid %s, name %s\n", + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); else if ((ptr = list_head( &ctx->vulkan_gpus ))) { vulkan_gpu = LIST_ENTRY( ptr, struct vulkan_gpu, entry ); - WARN( "Using vulkan GPU pci_id %#04x:%#04x, uuid %s, name %s\n", pci_id->vendor, pci_id->device, + WARN( "Using vulkan GPU pci_id %#04x:%#04x, uuid %s, name %s\n", + vulkan_gpu->pci_id.vendor, vulkan_gpu->pci_id.device, debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); }

1 0

Krzysztof Bogacki : win32u: Use separate variable for inner loop.
by Alexandre Julliard 28 May '24

28 May '24

Module: wine Branch: master Commit: acea64b0ac12ad58583e81a32e6c481566d063fb URL: https://gitlab.winehq.org/wine/wine/-/commit/acea64b0ac12ad58583e81a32e6c48… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:10:20 2024 +0200 win32u: Use separate variable for inner loop. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/d3dkmt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/d3dkmt.c b/dlls/win32u/d3dkmt.c index b644135bfa1..5f3804c165d 100644 --- a/dlls/win32u/d3dkmt.c +++ b/dlls/win32u/d3dkmt.c @@ -563,7 +563,7 @@ NTSTATUS WINAPI NtGdiDdDDICheckVidPnExclusiveOwnership( const D3DKMT_CHECKVIDPNE BOOL get_vulkan_gpus( struct list *gpus ) { VkPhysicalDevice *devices; - UINT i, count; + UINT i, j, count; if (!d3dkmt_use_vulkan()) return FALSE; if (!(count = get_vulkan_physical_devices( &devices ))) return FALSE; @@ -583,10 +583,10 @@ BOOL get_vulkan_gpus( struct list *gpus ) gpu->pci_id.device = properties2.properties.deviceID; pvkGetPhysicalDeviceMemoryProperties( devices[i], &mem_properties ); - for (i = 0; i < mem_properties.memoryHeapCount; i++) + for (j = 0; j < mem_properties.memoryHeapCount; j++) { - if (mem_properties.memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) - gpu->memory += mem_properties.memoryHeaps[i].size; + if (mem_properties.memoryHeaps[j].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + gpu->memory += mem_properties.memoryHeaps[j].size; } list_add_tail( gpus, &gpu->entry );

1 0

Henri Verbeet : tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 9693271dcfb96e9cd8d44c181cf70044edbf6861 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9693271dcfb96e9cd8d44c181cf70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 20:13:53 2024 +0200 tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC. For consistency with the other VKD3D_TEST_* environment variables. --- README | 3 +++ gitlab/test.yml | 4 ++-- tests/shader_runner.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README b/README index 5cb8ebb3..27da28b7 100644 --- a/README +++ b/README @@ -86,6 +86,9 @@ commas or semicolons. platform controls the behavior of todo(), todo_if(), bug_if() and broken() conditions in tests. + * VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will + be skipped. + * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader diff --git a/gitlab/test.yml b/gitlab/test.yml index da01425f..2e8ee834 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -19,13 +19,13 @@ test-win-64: extends: .test-win variables: TEST_ARCH: "64" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-32: extends: .test-win variables: TEST_ARCH: "32" - VKD3D_TESTS_SKIP_DXC: "1" + VKD3D_TEST_SKIP_DXC: "1" test-win-64-dxc: stage: test diff --git a/tests/shader_runner.c b/tests/shader_runner.c index e91db918..c2fc30d1 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -2158,7 +2158,7 @@ static IDxcCompiler3 *dxcompiler_create(void) HRESULT hr; void *dll; - if ((skip_dxc = getenv("VKD3D_TESTS_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) + if ((skip_dxc = getenv("VKD3D_TEST_SKIP_DXC")) && strcmp(skip_dxc, "") != 0) return NULL; #ifdef VKD3D_CROSSTEST

1 0

Henri Verbeet : build: Fix the order of a couple of shader runner tests.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 695ef722e8cfd8ddf34dbd1d5f2fee776f2e2a60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/695ef722e8cfd8ddf34dbd1d5f2fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 24 23:07:01 2024 +0200 build: Fix the order of a couple of shader runner tests. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index b3288b50..544e6a90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,8 +135,8 @@ vkd3d_shader_tests = \ tests/hlsl/initializer-objects.shader_test \ tests/hlsl/initializer-static-array.shader_test \ tests/hlsl/initializer-struct.shader_test \ - tests/hlsl/intrinsic-override.shader_test \ tests/hlsl/instance-id.shader_test \ + tests/hlsl/intrinsic-override.shader_test \ tests/hlsl/invalid.shader_test \ tests/hlsl/inverse-trig.shader_test \ tests/hlsl/is-front-face.shader_test \ @@ -194,8 +194,8 @@ vkd3d_shader_tests = \ tests/hlsl/side-effects.shader_test \ tests/hlsl/sign.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \ - tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm1-const-allocation.shader_test \ + tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/smoothstep.shader_test \

1 0

Henri Verbeet : include: Add a \since tag for VKD3D_FALSE.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: b363fdbb21188b740f6289c86121021deaf8810f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b363fdbb21188b740f6289c861210… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 12:27:12 2024 +0200 include: Add a \since tag for VKD3D_FALSE. --- include/vkd3d_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vkd3d_types.h b/include/vkd3d_types.h index 420dd787..706fa7ed 100644 --- a/include/vkd3d_types.h +++ b/include/vkd3d_types.h @@ -41,7 +41,7 @@ enum vkd3d_result { /** Success. */ VKD3D_OK = 0, - /** Success as a result of there being nothing to do. */ + /** Success as a result of there being nothing to do. \since 1.12 */ VKD3D_FALSE = 1, /** An unspecified failure occurred. */ VKD3D_ERROR = -1,

1 0

Henri Verbeet : include: Document the additional HLSL transformations supported by vkd3d_shader_compile().
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 007233a016082ce0ef6ad39c89e29a91c77b0148 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/007233a016082ce0ef6ad39c89e29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 24 23:04:13 2024 +0200 include: Document the additional HLSL transformations supported by vkd3d_shader_compile(). --- include/vkd3d_shader.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b32b8a3..082f3417 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -2059,8 +2059,12 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_SPIRV_TEXT * (if vkd3d was compiled with SPIRV-Tools) * - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_D3D_ASM - * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_BINARY + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_TEXT + * (if vkd3d was compiled with SPIRV-Tools) + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_ASM * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_BYTECODE + * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_FX * * Supported transformations can also be detected at runtime with the functions

1 0

Nikolay Sivov : vkd3d-shader/ir: Set texture register dimension as VEC4 when normalising combined samplers.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 308d735923288e04a7ad418fbd201aa749c112aa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/308d735923288e04a7ad418fbd201… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 12:58:39 2024 +0200 vkd3d-shader/ir: Set texture register dimension as VEC4 when normalising combined samplers. Thanks, Giovanni. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/ir.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 37818d4d..b3b745fc 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1886,6 +1886,7 @@ static enum vkd3d_result vsir_program_normalise_combined_samplers(struct vsir_pr srcs[1].reg.idx[1] = ins->src[1].reg.idx[0]; srcs[1].reg.idx_count = 2; srcs[1].reg.data_type = VKD3D_DATA_RESOURCE; + srcs[1].reg.dimension = VSIR_DIMENSION_VEC4; srcs[1].swizzle = VKD3D_SHADER_NO_SWIZZLE; srcs[2].reg.type = VKD3DSPR_SAMPLER;

1 0

Giovanni Mascellani : tests: Skip a test that freezes the GPU on NVIDIA.
by Alexandre Julliard 27 May '24

27 May '24

Module: vkd3d Branch: master Commit: 9a3fa67c1f7af66ac5143289bcfca2d941ecdd0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a3fa67c1f7af66ac5143289bcfca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat May 25 14:16:12 2024 +0200 tests: Skip a test that freezes the GPU on NVIDIA. --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 26b6e2b8..75989215 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35625,6 +35625,13 @@ static void test_conditional_rendering(void) for (i = 0; i < 2; ++i) { + if (i == 0 && is_nvidia_device(context.device)) + { + /* I can reproduce that on an NVIDIA Quadro P2000, driver version 535.161.08. */ + skip("Triggers a GPU freeze on NVIDIA.\n"); + continue; + } + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(command_list,

1 0

Dmitry Timoshkov : comctl32/tests: Create a fully updated ListView window.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: 5f7b9a5b837a77a85754b3b55b974e39e199f817 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f7b9a5b837a77a85754b3b55b974e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 27 15:06:28 2024 +0300 comctl32/tests: Create a fully updated ListView window. so that the tests don't get remaining messages from the window creation process, and verify message sequences for the actually being tested functionality. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ad60fa5b6b6..1081a045cde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -115,7 +115,6 @@ static const struct message redraw_listview_seq[] = { { WM_NCPAINT, sent|id|defwinproc, 0, 0, HEADER_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, HEADER_ID }, { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, - { WM_NCPAINT, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, LISTVIEW_ID }, { 0 } }; @@ -810,6 +809,8 @@ static HWND create_listview_control(DWORD style) if (!hwnd) return NULL; + UpdateWindow(hwnd); + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); @@ -833,6 +834,8 @@ static HWND create_listview_controlW(DWORD style, HWND parent) if (!hwnd) return NULL; + UpdateWindow(hwnd); + oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)listview_subclass_proc); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); @@ -1888,7 +1891,10 @@ static void test_create(BOOL is_version_6) /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ flush_sequences(sequences, NUM_MSG_SEQUENCES); - hList = create_listview_control(LVS_OWNERDRAWFIXED | LVS_REPORT); + hList = CreateWindowExA(0, WC_LISTVIEWA, NULL, + WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_OWNERDRAWFIXED | LVS_REPORT, + 0, 0, 100, 100, hwndparent, NULL, GetModuleHandleA(NULL), NULL); + ok(hList != NULL, "Failed to create ListView window.\n"); ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, "created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE); DestroyWindow(hList); @@ -2198,8 +2204,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); r = ValidateRect(hwnd, NULL); expect(TRUE, r); @@ -2208,8 +2214,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); r = ValidateRect(hwnd, NULL); expect(TRUE, r); @@ -2218,8 +2224,8 @@ static void test_color(void) rect.right = rect.bottom = 1; r = GetUpdateRect(hwnd, &rect, TRUE); - todo_wine expect(FALSE, r); - ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); + expect(FALSE, r); + ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect)); DestroyWindow(hwnd); }

1 0

Rémi Bernon : win32u: Use NtGdiDdDDICreateDCFromMemory for gdi16 DIBDRV.
by Alexandre Julliard 27 May '24

27 May '24

Module: wine Branch: master Commit: b3bec339d7851b14abf6f6ca341731d560c7f44b URL: https://gitlab.winehq.org/wine/wine/-/commit/b3bec339d7851b14abf6f6ca341731… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 17 00:53:39 2024 +0100 win32u: Use NtGdiDdDDICreateDCFromMemory for gdi16 DIBDRV. Instead of a custom dib_window_surface. --- dlls/gdi.exe16/gdi.c | 80 ++++++++++++++++++++++++++- dlls/win32u/dc.c | 6 -- dlls/win32u/dce.c | 128 ------------------------------------------- dlls/win32u/win32u_private.h | 1 - include/ntgdi.h | 3 - 5 files changed, 77 insertions(+), 141 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 3f363ef2401..c634f0739c7 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -43,6 +43,15 @@ struct saved_visrgn static struct list saved_regions = LIST_INIT( saved_regions ); +struct saved_bitmap +{ + struct list entry; + HDC hdc; + HBITMAP hbitmap; +}; + +static struct list saved_bitmaps = LIST_INIT( saved_bitmaps ); + static HPALETTE16 hPrimaryPalette; /* @@ -1175,8 +1184,62 @@ HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output, { if (!lstrcmpiA( driver, "dib" ) || !lstrcmpiA( driver, "dirdib" )) { - DRIVER_INFO_2W driver_info = { .cVersion = NTGDI_WIN16_DIB }; - return HDC_16( NtGdiOpenDCW( NULL, NULL, NULL, 0, TRUE, 0, &driver_info, (void *)initData )); + PALETTEENTRY palette[256]; + BITMAPINFO *info = (BITMAPINFO *)initData; + D3DKMT_CREATEDCFROMMEMORY desc = + { + .Width = info->bmiHeader.biWidth, + .Height = info->bmiHeader.biHeight, + .Pitch = info->bmiHeader.biWidth * info->bmiHeader.biBitCount / 8, + }; + struct saved_bitmap *bitmap; + int color; + + if (info->bmiHeader.biBitCount <= 8) + { + if (info->bmiHeader.biClrUsed) + { + for (color = 0; color < info->bmiHeader.biClrUsed; color++) + { + palette[color].peBlue = info->bmiColors[color].rgbBlue; + palette[color].peGreen = info->bmiColors[color].rgbGreen; + palette[color].peRed = info->bmiColors[color].rgbRed; + } + } + else + { + for (color = 0; color < (1 << info->bmiHeader.biBitCount); color++) + { + palette[color].peBlue = color; + palette[color].peGreen = color; + palette[color].peRed = color; + } + } + desc.pColorTable = palette; + desc.Format = D3DDDIFMT_P8; + desc.pMemory = &info->bmiColors[color]; + } + else if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + desc.Format = D3DDDIFMT_R5G6B5; + desc.pMemory = &info->bmiColors[3]; + } + else + { + desc.Format = info->bmiHeader.biBitCount == 24 ? D3DDDIFMT_R8G8B8 : D3DDDIFMT_X8R8G8B8; + desc.pMemory = &info->bmiColors[0]; + } + + if (NtGdiDdDDICreateDCFromMemory( &desc )) return 0; + + if ((bitmap = HeapAlloc( GetProcessHeap(), 0, sizeof(*bitmap) ))) + { + bitmap->hdc = desc.hDc; + bitmap->hbitmap = desc.hBitmap; + list_add_tail( &saved_bitmaps, &bitmap->entry ); + } + + return HDC_16( desc.hDc ); } return HDC_16( CreateDCA( driver, device, output, initData ) ); } @@ -1329,8 +1392,10 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) { if (DeleteDC( HDC_32(hdc) )) { - struct saved_visrgn *saved, *next; + struct saved_visrgn *saved; + struct saved_bitmap *bitmap; struct gdi_thunk* thunk; + void *next; if ((thunk = GDI_FindThunk(hdc))) GDI_DeleteThunk(thunk); @@ -1341,6 +1406,15 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) DeleteObject( saved->hrgn ); HeapFree( GetProcessHeap(), 0, saved ); } + + LIST_FOR_EACH_ENTRY_SAFE( bitmap, next, &saved_bitmaps, struct saved_bitmap, entry ) + { + if (bitmap->hdc != HDC_32(hdc)) continue; + list_remove( &bitmap->entry ); + DeleteObject( bitmap->hbitmap ); + HeapFree( GetProcessHeap(), 0, bitmap ); + } + return TRUE; } return FALSE; diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 16920e08d33..24a3bca5544 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -765,12 +765,6 @@ HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, UNICOD DC_InitDC( dc ); release_dc_ptr( dc ); - if (driver_info && driver_info->cVersion == NTGDI_WIN16_DIB && - !create_dib_surface( hdc, pdev )) - { - NtGdiDeleteObjectApp( hdc ); - return 0; - } return hdc; } diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 39bbc77f29f..5c4f691b460 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -245,134 +245,6 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = &impl->header; } -/* window surface used to implement the DIB.DRV driver */ - -struct dib_window_surface -{ - struct window_surface header; - RECT bounds; - void *bits; - UINT info_size; - BITMAPINFO info; /* variable size, must be last */ -}; - -static struct dib_window_surface *get_dib_surface( struct window_surface *surface ) -{ - return (struct dib_window_surface *)surface; -} - -/*********************************************************************** - * dib_surface_lock - */ -static void dib_surface_lock( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_unlock - */ -static void dib_surface_unlock( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_get_bitmap_info - */ -static void *dib_surface_get_bitmap_info( struct window_surface *window_surface, BITMAPINFO *info ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - memcpy( info, &surface->info, surface->info_size ); - return surface->bits; -} - -/*********************************************************************** - * dib_surface_get_bounds - */ -static RECT *dib_surface_get_bounds( struct window_surface *window_surface ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - return &surface->bounds; -} - -/*********************************************************************** - * dib_surface_set_region - */ -static void dib_surface_set_region( struct window_surface *window_surface, HRGN region ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_flush - */ -static void dib_surface_flush( struct window_surface *window_surface ) -{ - /* nothing to do */ -} - -/*********************************************************************** - * dib_surface_destroy - */ -static void dib_surface_destroy( struct window_surface *window_surface ) -{ - struct dib_window_surface *surface = get_dib_surface( window_surface ); - - TRACE( "freeing %p\n", surface ); - free( surface ); -} - -static const struct window_surface_funcs dib_surface_funcs = -{ - dib_surface_lock, - dib_surface_unlock, - dib_surface_get_bitmap_info, - dib_surface_get_bounds, - dib_surface_set_region, - dib_surface_flush, - dib_surface_destroy -}; - -BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info ) -{ - struct dib_window_surface *surface; - int color = 0; - HRGN region; - RECT rect; - - if (info->bmiHeader.biBitCount <= 8) - color = info->bmiHeader.biClrUsed ? info->bmiHeader.biClrUsed : (1 << info->bmiHeader.biBitCount); - else if (info->bmiHeader.biCompression == BI_BITFIELDS) - color = 3; - - surface = calloc( 1, offsetof( struct dib_window_surface, info.bmiColors[color] )); - if (!surface) return FALSE; - - rect.left = 0; - rect.top = 0; - rect.right = info->bmiHeader.biWidth; - rect.bottom = abs(info->bmiHeader.biHeight); - - surface->header.funcs = &dib_surface_funcs; - surface->header.rect = rect; - surface->header.ref = 1; - surface->info_size = offsetof( BITMAPINFO, bmiColors[color] ); - surface->bits = (char *)info + surface->info_size; - memcpy( &surface->info, info, surface->info_size ); - - TRACE( "created %p %ux%u for info %p bits %p\n", - surface, (int)rect.right, (int)rect.bottom, info, surface->bits ); - - region = NtGdiCreateRectRgn( rect.left, rect.top, rect.right, rect.bottom ); - set_visible_region( hdc, region, &rect, &rect, &surface->header ); - TRACE( "using hdc %p surface %p\n", hdc, surface ); - window_surface_release( &surface->header ); - return TRUE; -} - /******************************************************************* * register_window_surface * diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7672cf3b356..222db6fb5f7 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -45,7 +45,6 @@ extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ); /* dce.c */ extern struct window_surface dummy_surface; -extern BOOL create_dib_surface( HDC hdc, const BITMAPINFO *info ); extern void create_offscreen_window_surface( const RECT *visible_rect, struct window_surface **surface ); extern void erase_now( HWND hwnd, UINT rdw_flags ); diff --git a/include/ntgdi.h b/include/ntgdi.h index 50973535c7a..a33638deee4 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -219,9 +219,6 @@ struct font_enum_entry /* flag for NtGdiGetRandomRgn to respect LAYOUT_RTL */ #define NTGDI_RGN_MIRROR_RTL 0x80000000 -/* magic driver version that we use for win16 DCs with DIB surfaces */ -#define NTGDI_WIN16_DIB 0xfafa000 - #endif /* __WINESRC__ */ struct font_realization_info

1 0

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