wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : wordpad: Use GetSysColorBrush().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: dcd9376ae711d56778032f146480e1d1aaf245ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd9376ae711d56778032f14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:14 2019 -0500 wordpad: Use GetSysColorBrush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index d34fd66..acc583e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -376,10 +376,9 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) HDC hdcPrint = make_dc(); RECT printRect = get_print_rect(hdcPrint); RECT drawRect; - HBRUSH hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); GetClientRect(hWnd, &drawRect); - FillRect(hdc, &drawRect, hBrush); + FillRect(hdc, &drawRect, GetSysColorBrush(COLOR_MENU)); InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; @@ -399,7 +398,6 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) add_ruler_units(hdc, &drawRect, NewMetrics, EditLeftmost); SelectObject(hdc, GetStockObject(BLACK_BRUSH)); - DeleteObject(hBrush); DeleteDC(hdcPrint); EndPaint(hWnd, &ps); }

1 0

Zebediah Figura : user32: Use GetSysColorBrush().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 8d251a1dd1d523bd20c30b355b79421340f53a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d251a1dd1d523bd20c30b35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:13 2019 -0500 user32: Use GetSysColorBrush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 5 +---- dlls/user32/uitools.c | 11 +++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 10a3882..ada89bc 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -865,7 +865,6 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) { HDC hMemDC; HBITMAP hBitmap, hOldBitmap; - HBRUSH hBrush; HDC hdc = GetDC(hChild); if (hdc) @@ -877,10 +876,8 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hBitmap = CreateCompatibleBitmap(hdc, cx, cy); hOldBitmap = SelectObject(hMemDC, hBitmap); SetMapMode(hMemDC, MM_TEXT); - hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); - DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, hBrush, DI_NORMAL); + DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL); SelectObject (hMemDC, hOldBitmap); - DeleteObject(hBrush); DeleteDC(hMemDC); ReleaseDC(hChild, hdc); hSysMenuBitmap = hBitmap; diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 73ec34b..8657f27 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1693,26 +1693,22 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp } if (flags & DSS_DISABLED) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); + hbrtmp = GetSysColorBrush(COLOR_3DHILIGHT); else if (flags & DSS_DEFAULT) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) { - if(!hbrtmp) goto cleanup; hbsave = SelectObject(hdc, hbrtmp); if(!hbsave) goto cleanup; if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; SelectObject(hdc, hbsave); - DeleteObject(hbrtmp); - hbrtmp = 0; } if (flags & DSS_DISABLED) { - hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); - if(!hbrtmp) goto cleanup; + hbr = GetSysColorBrush(COLOR_3DSHADOW); } else if (!hbr) { @@ -1731,7 +1727,6 @@ cleanup: if(hbsave) SelectObject(hdc, hbsave); if(hbmsave) SelectObject(memdc, hbmsave); - if(hbrtmp) DeleteObject(hbrtmp); if(hbm) DeleteObject(hbm); if(memdc) DeleteDC(memdc);

1 0

Józef Kucia : vkd3d-shader: Remove vkd3d_shader_parse_root_signature().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: 16f36b0c9bd8d245c7bf95a2ca2283292c03cb51 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16f36b0c9bd8d245c7bf95a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:36 2019 +0200 vkd3d-shader: Remove vkd3d_shader_parse_root_signature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 10 ++-------- libs/vkd3d-shader/dxbc.c | 26 -------------------------- libs/vkd3d-shader/vkd3d_shader.map | 1 - tests/vkd3d_shader_api.c | 14 +++++++------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7bf3bd5..ae315e6 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,13 +566,10 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, @@ -602,13 +599,10 @@ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxb const struct vkd3d_shader_compile_arguments *compile_args); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); -typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); - typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 082e01d..5903ed8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2503,32 +2503,6 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont return shader_parse_root_signature(data, data_size, desc); } -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature) -{ - struct vkd3d_versioned_root_signature_desc desc = {0}; - int ret; - - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); - - memset(root_signature, 0, sizeof(*root_signature)); - if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return ret; - } - - if (desc.version != VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return VKD3D_ERROR_NOT_IMPLEMENTED; - } - - *root_signature = desc.u.v_1_0; - - return VKD3D_OK; -} - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature) { diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index e1f1f1c..2959c57 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,7 +9,6 @@ global: vkd3d_shader_free_shader_signature; vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; - vkd3d_shader_parse_root_signature; vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 65099f2..4e6080d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -54,17 +54,17 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_parse_versioned_root_signature pfn_vkd3d_shader_parse_versioned_root_signature; + PFN_vkd3d_shader_free_versioned_root_signature pfn_vkd3d_shader_free_versioned_root_signature; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; - PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; - PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; - struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_signature signature; @@ -90,21 +90,21 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_parse_versioned_root_signature = vkd3d_shader_parse_versioned_root_signature; + pfn_vkd3d_shader_free_versioned_root_signature = vkd3d_shader_free_versioned_root_signature; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; - pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; - pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_versioned_root_signature(&dxbc, &root_signature_desc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_versioned_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature);

1 0

Józef Kucia : vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: f300781c7900c620e6489bf0f24ab84b8fa1e98a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f300781c7900c620e6489bf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:35 2019 +0200 vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 85ecb39..7534655 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1006,7 +1006,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, HRESULT hr; int ret; - if ((ret = vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc.vkd3d)) < 0) + if ((ret = vkd3d_parse_root_signature_v_1_0(&dxbc, &root_signature_desc.vkd3d)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 9af2bbc..e074d1c 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,7 +167,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; -static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be0ef2e..c680a04 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -619,6 +619,9 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct d3d12_graphics_pipeline_state { VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES];

1 0

Józef Kucia : vkd3d: Reimplement ID3D12RootSignatureDeserializer on top of vkd3d_shader_parse_versioned_root_signature ().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: ac8ffc3cd0295d2b190fe85c23ac8bb3c0463dd4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ac8ffc3cd0295d2b190fe85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:34 2019 +0200 vkd3d: Reimplement ID3D12RootSignatureDeserializer on top of vkd3d_shader_parse_versioned_root_signature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_main.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index be8c400..9af2bbc 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,6 +167,40 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; +static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *out_desc) +{ + struct vkd3d_versioned_root_signature_desc desc, converted_desc; + int ret; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &desc)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return ret; + } + + if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + *out_desc = desc.u.v_1_0; + } + else + { + enum vkd3d_root_signature_version version = desc.version; + + ret = vkd3d_shader_convert_root_signature(&converted_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &desc); + vkd3d_shader_free_versioned_root_signature(&desc); + if (ret < 0) + { + WARN("Failed to convert from version %#x, vkd3d result %d.\n", version, ret); + return ret; + } + + *out_desc = converted_desc.u.v_1_0; + } + + return ret; +} + static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signature_deserializer *deserializer, const struct vkd3d_shader_code *dxbc) { @@ -175,11 +209,8 @@ static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signatur deserializer->ID3D12RootSignatureDeserializer_iface.lpVtbl = &d3d12_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) - { - WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + if ((ret = vkd3d_parse_root_signature_v_1_0(dxbc, &deserializer->desc.vkd3d)) < 0) return hresult_from_vkd3d_result(ret); - } return S_OK; }

1 0

Józef Kucia : vkd3d-shader: Implement conversion between root signature 1.0 and 1.1.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: fbeabe084991f3d18bfec005dfd73649aeea90ff URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fbeabe084991f3d18bfec00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:33 2019 +0200 vkd3d-shader: Implement conversion between root signature 1.0 and 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 6 + libs/vkd3d-shader/dxbc.c | 286 +++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + 3 files changed, 293 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=fbeabe084991f3d18bf…

1 0

Józef Kucia : vkd3d: Implement vkd3d_create_versioned_root_signature_deserializer().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: cb895ff6465dfc0f983af98a22edfbddb0be8556 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb895ff6465dfc0f983af98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:32 2019 +0200 vkd3d: Implement vkd3d_create_versioned_root_signature_deserializer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_main.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 8f9351b..be8c400 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -92,6 +92,8 @@ struct d3d12_root_signature_deserializer } desc; }; +STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc)); + static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer( ID3D12RootSignatureDeserializer *iface) { @@ -205,13 +207,144 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } +/* ID3D12VersionedRootSignatureDeserializer */ +struct d3d12_versioned_root_signature_deserializer +{ + ID3D12VersionedRootSignatureDeserializer ID3D12VersionedRootSignatureDeserializer_iface; + LONG refcount; + + union + { + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; + } desc; +}; + +STATIC_ASSERT(sizeof(D3D12_VERSIONED_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_versioned_root_signature_desc)); + +static struct d3d12_versioned_root_signature_deserializer *impl_from_ID3D12VersionedRootSignatureDeserializer( + ID3D12VersionedRootSignatureDeserializer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_versioned_root_signature_deserializer, + ID3D12VersionedRootSignatureDeserializer_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_QueryInterface( + ID3D12VersionedRootSignatureDeserializer *iface, REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + /* QueryInterface() implementation is broken, E_NOINTERFACE is returned for + * IUnknown. + */ + if (IsEqualGUID(iid, &IID_ID3D12VersionedRootSignatureDeserializer)) + { + ID3D12VersionedRootSignatureDeserializer_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRef(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedIncrement(&deserializer->refcount); + + TRACE("%p increasing refcount to %u.\n", deserializer, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Release(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedDecrement(&deserializer->refcount); + + TRACE("%p decreasing refcount to %u.\n", deserializer, refcount); + + if (!refcount) + { + vkd3d_shader_free_versioned_root_signature(&deserializer->desc.vkd3d); + vkd3d_free(deserializer); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion( + ID3D12VersionedRootSignatureDeserializer *iface, D3D_ROOT_SIGNATURE_VERSION version, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc) +{ + FIXME("iface %p, version %#x, desc %p stub!\n", iface, version, desc); + + *desc = NULL; + return E_NOTIMPL; +} + +static const D3D12_VERSIONED_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE +d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + + TRACE("iface %p.\n", iface); + + return &deserializer->desc.d3d12; +} + +static const struct ID3D12VersionedRootSignatureDeserializerVtbl d3d12_versioned_root_signature_deserializer_vtbl = +{ + /* IUnknown methods */ + d3d12_versioned_root_signature_deserializer_QueryInterface, + d3d12_versioned_root_signature_deserializer_AddRef, + d3d12_versioned_root_signature_deserializer_Release, + /* ID3D12VersionedRootSignatureDeserializer methods */ + d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion, + d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc, +}; + +static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_versioned_root_signature_deserializer *deserializer, + const struct vkd3d_shader_code *dxbc) +{ + int ret; + + deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; + deserializer->refcount = 1; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return hresult_from_vkd3d_result(ret); + } + + return S_OK; +} + HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - FIXME("data %p, data_size %lu, iid %s, deserializer %p stub!\n", + struct d3d12_versioned_root_signature_deserializer *object; + struct vkd3d_shader_code dxbc = {data, data_size}; + HRESULT hr; + + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); - return E_NOTIMPL; + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_versioned_root_signature_deserializer_init(object, &dxbc))) + { + vkd3d_free(object); + return hr; + } + + return return_interface(&object->ID3D12VersionedRootSignatureDeserializer_iface, + &IID_ID3D12VersionedRootSignatureDeserializer, iid, deserializer); } /* ID3DBlob */

1 0

Józef Kucia : vkd3d-shader: Implement parsing of root signature 1.1.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: vkd3d Branch: master Commit: f9b9ae8cc7b58aa240b6d71e07bd556d10ac6865 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f9b9ae8cc7b58aa240b6d71… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 19 11:07:31 2019 +0200 vkd3d-shader: Implement parsing of root signature 1.1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 82 +++++++++ libs/vkd3d-shader/dxbc.c | 306 +++++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader.map | 2 + libs/vkd3d-shader/vkd3d_shader_main.c | 35 ++++ 4 files changed, 369 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f9b9ae8cc7b58aa240b…

1 0

Andrew Eikum : dinput: Report controllers as gamepads, not joysticks.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 085e58878f58c8e9fd03f8b56ac5489ab844b3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085e58878f58c8e9fd03f8b5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 17 09:11:59 2019 -0500 dinput: Report controllers as gamepads, not joysticks. This matches what Windows does with common controllers like xbox 360. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 9 +++------ dlls/dinput/joystick_linuxinput.c | 9 +++------ dlls/dinput/joystick_osx.c | 7 +++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 963e62f..736a06e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -316,9 +316,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joystick_devices[id].bus_type == BUS_USB && @@ -326,10 +326,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 910e755..cea669b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -355,9 +355,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joydevs[id].bus_type == BUS_USB && @@ -365,10 +365,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0701b9f..daef1a1 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -969,9 +969,12 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + lpddi->wUsage = 0x05; /* Game Pad */ sprintf(lpddi->tszInstanceName, "Joystick %d", id); /* get the device name */

1 0

Dmitry Timoshkov : cryptui: Implement CryptUIDlgSelectCertificateFromStore.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: wine Branch: master Commit: 0d20dfa9ece8efbc6ba3c762bcc1e57fba2f8563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d20dfa9ece8efbc6ba3c762… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 17 18:52:03 2019 +0800 cryptui: Implement CryptUIDlgSelectCertificateFromStore. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 41938f5..33f25a4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7550,8 +7550,21 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore LPCWSTR pwszDisplayString, DWORD dwDontUseColumn, DWORD dwFlags, void *pvReserved) { - FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); - return NULL; + CRYPTUI_SELECTCERTIFICATE_STRUCTW sc; + + TRACE("%p %p %s %s %x %x %p\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + + memset(&sc, 0, sizeof(sc)); + + sc.dwSize = sizeof(sc); + sc.hwndParent = hwnd; + sc.dwFlags = dwFlags; + sc.szTitle = pwszTitle; + sc.szDisplayString = pwszDisplayString; + sc.dwDontUseColumn = dwDontUseColumn; + sc.cDisplayStores = 1; + sc.rghDisplayStores = &hCertStore; + return CryptUIDlgSelectCertificateW(&sc); } BOOL WINAPI CryptUIWizDigitalSign(DWORD flags, HWND parent, LPCWSTR title, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO info,

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
81
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 April 2019