October 2021 - Wine-commits

Jan Sikorski : d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: fa63f80d0ebc80e9c8b32dde95ad6f1089c528d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa63f80d0ebc80e9c8b32dde… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:16 2021 +0200 d3d11: Don't grab wined3d lock for wined3d_device_context_copy_uav_counter(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e5618f09174..248634a245d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1392,10 +1392,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_CopyStructureCount(ID3D11Devi buffer_impl = unsafe_impl_from_ID3D11Buffer(dst_buffer); uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); - wined3d_mutex_lock(); wined3d_device_context_copy_uav_counter(context->wined3d_context, buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); - wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_device_context_ClearRenderTargetView(ID3D11DeviceContext1 *iface,

1 0

Zebediah Figura : wined3d: Fully initialize the allocator structure in wined3d_allocator_init().
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: b344d1d0913fb7f87c72e7c4693587a78915abef URL: https://source.winehq.org/git/wine.git/?a=commit;h=b344d1d0913fb7f87c72e7c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 17 15:08:30 2021 -0500 wined3d: Fully initialize the allocator structure in wined3d_allocator_init(). Allows the allocator to be uninitialized and reinitialized. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47718c9f710..29326668e07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -7432,5 +7432,7 @@ bool wined3d_allocator_init(struct wined3d_allocator *allocator, list_init(&allocator->pools[i].chunks); } + allocator->free = NULL; + return true; }

1 0

Alex Henrie : ws2_32: Clear last error in WSASocketW.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 63110f9879df16981c926a795287131c2bc424d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63110f9879df16981c926a79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 17 23:45:28 2021 -0600 ws2_32: Clear last error in WSASocketW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..50ea15c5b0e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3363,6 +3363,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, CloseHandle(handle); return INVALID_SOCKET; } + WSASetLastError(0); return ret; done: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2bb219d7c0e..eadc47a8ea6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2418,7 +2418,7 @@ static void test_WSASocket(void) { SetLastError( 0xdeadbeef ); sock = WSASocketA( tests[i].family, tests[i].type, tests[i].protocol, NULL, 0, 0 ); - todo_wine_if (!tests[i].error || i == 7) + todo_wine_if (i == 7) ok(WSAGetLastError() == tests[i].error, "Test %u: got wrong error %u\n", i, WSAGetLastError()); if (tests[i].error) {

1 0

Jacek Caban : win32u: Use syscall interface for some D3DKMT functions.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 00222f6d063e7d55989eb79695ed638c4d092bb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00222f6d063e7d55989eb796… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:28 2021 +0200 win32u: Use syscall interface for some D3DKMT functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/gdiobj.c | 7 --- dlls/win32u/syscall.c | 7 +++ dlls/win32u/win32u.spec | 14 +++--- dlls/win32u/win32u_private.h | 7 --- dlls/win32u/wrappers.c | 35 --------------- dlls/wow64win/gdi.c | 105 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 7 +++ 7 files changed, 126 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00222f6d063e7d55989e…

1 0

Jacek Caban : win32u: Don't use CDECL for font backend functions.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: a859171327a743d146c5c8c4c59e8226226fa96d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a859171327a743d146c5c8c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:39 2021 +0200 win32u: Don't use CDECL for font backend functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/freetype.c | 44 ++++++++++++++++++++++---------------------- dlls/win32u/ntgdi_private.h | 40 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a859171327a743d146c5…

1 0

Jacek Caban : win32u: Don't use CDECL for OSMesa functions.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: fd413f69c9c617d30c5e12d8eaaad79e12e9a00d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd413f69c9c617d30c5e12d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:53:50 2021 +0200 win32u: Don't use CDECL for OSMesa functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/dibdrv/dibdrv.h | 12 ++++++------ dlls/win32u/dibdrv/opengl.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/dibdrv/dibdrv.h b/dlls/win32u/dibdrv/dibdrv.h index d5606388e30..b6f6bb41098 100644 --- a/dlls/win32u/dibdrv/dibdrv.h +++ b/dlls/win32u/dibdrv/dibdrv.h @@ -292,12 +292,12 @@ static inline const RGBQUAD *get_dib_color_table( const dib_info *dib ) struct osmesa_funcs { - void (CDECL *get_gl_funcs)( struct opengl_funcs *funcs ); - struct wgl_context * (CDECL *create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ); - BOOL (CDECL *delete_context)( struct wgl_context *context ); - PROC (CDECL *get_proc_address)( const char *proc ); - BOOL (CDECL *make_current)( struct wgl_context *context, void *bits, - int width, int height, int bpp, int stride ); + void (*get_gl_funcs)( struct opengl_funcs *funcs ); + struct wgl_context * (*create_context)( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ); + BOOL (*delete_context)( struct wgl_context *context ); + PROC (*get_proc_address)( const char *proc ); + BOOL (*make_current)( struct wgl_context *context, void *bits, + int width, int height, int bpp, int stride ); }; extern const struct osmesa_funcs *init_opengl_lib(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/dibdrv/opengl.c b/dlls/win32u/dibdrv/opengl.c index 9261cc09299..9504e8efd25 100644 --- a/dlls/win32u/dibdrv/opengl.c +++ b/dlls/win32u/dibdrv/opengl.c @@ -119,7 +119,7 @@ failed: /*********************************************************************** * osmesa_get_gl_funcs */ -static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs ) +static void osmesa_get_gl_funcs( struct opengl_funcs *funcs ) { funcs->gl = opengl_funcs.gl; } @@ -127,7 +127,7 @@ static void CDECL osmesa_get_gl_funcs( struct opengl_funcs *funcs ) /*********************************************************************** * osmesa_create_context */ -static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ) +static struct wgl_context * osmesa_create_context( HDC hdc, const PIXELFORMATDESCRIPTOR *descr ) { struct wgl_context *context; UINT gl_format; @@ -162,7 +162,7 @@ static struct wgl_context * CDECL osmesa_create_context( HDC hdc, const PIXELFOR /*********************************************************************** * osmesa_delete_context */ -static BOOL CDECL osmesa_delete_context( struct wgl_context *context ) +static BOOL osmesa_delete_context( struct wgl_context *context ) { pOSMesaDestroyContext( context->context ); free( context ); @@ -172,7 +172,7 @@ static BOOL CDECL osmesa_delete_context( struct wgl_context *context ) /*********************************************************************** * osmesa_get_proc_address */ -static PROC CDECL osmesa_get_proc_address( const char *proc ) +static PROC osmesa_get_proc_address( const char *proc ) { return (PROC)pOSMesaGetProcAddress( proc ); } @@ -180,8 +180,8 @@ static PROC CDECL osmesa_get_proc_address( const char *proc ) /*********************************************************************** * osmesa_make_current */ -static BOOL CDECL osmesa_make_current( struct wgl_context *context, void *bits, - int width, int height, int bpp, int stride ) +static BOOL osmesa_make_current( struct wgl_context *context, void *bits, + int width, int height, int bpp, int stride ) { BOOL ret; GLenum type;

1 0

Jacek Caban : win32u: Don't call abort proc in NtGdiStartDoc.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: fcb6ae29a6ee45a5a0e4e41dd8785c6ad5c921f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcb6ae29a6ee45a5a0e4e41d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 16:54:04 2021 +0200 win32u: Don't call abort proc in NtGdiStartDoc. It's called by StartDocW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/printdrv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/printdrv.c b/dlls/win32u/printdrv.c index 37f5817c62f..6fb0d07cfb9 100644 --- a/dlls/win32u/printdrv.c +++ b/dlls/win32u/printdrv.c @@ -68,22 +68,19 @@ DWORD WINAPI NtGdiInitSpool(void) */ INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc, BOOL *banding, INT job ) { - INT ret; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype), doc->fwType); - if(!dc) return SP_ERROR; - - if (dc->attr->abort_proc && !dc->attr->abort_proc( hdc, 0 )) ret = 0; - else + if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); ret = physdev->funcs->pStartDoc( physdev, doc ); + release_dc_ptr( dc ); } - release_dc_ptr( dc ); return ret; }

1 0

Alistair Leslie-Hughes : wbemprox: Add WMI namespace.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 725655de79be751ee478b584a6c9aef482b33b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=725655de79be751ee478b584… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 16 19:01:25 2021 +1100 wbemprox: Add WMI namespace. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/tests/services.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 58b5ed76dfa..346ba365b74 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4138,6 +4138,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"wmi", NULL, 0}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 86ee99c335c..f72d43c0b0b 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -258,6 +258,7 @@ static void test_namespaces(void) { {L"ROOT\\CIMV2"}, {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + {L"ROOT\\WMI"}, }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 6b94bbb9ef6..a2bf5071612 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -24,6 +24,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, };

1 0

Nikolay Sivov : dwrite: Add properties for new Unicode 13 scripts.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 992e0a604541caaec2b84a2fa9dd4c9605f6102b URL: https://source.winehq.org/git/wine.git/?a=commit;h=992e0a604541caaec2b84a2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 18 15:55:20 2021 +0300 dwrite: Add properties for new Unicode 13 scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++++ dlls/dwrite/scripts.h | 6 +++++- tools/make_unicode | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 89c76da0bb9..e8a30a7ae45 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -198,6 +198,10 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Hmnp */ { 0x706e6d48, 451, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('h','m','n','p') } }, { /* Nand */ { 0x646e614e, 311, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('n','a','n','d') } }, { /* Wcho */ { 0x6f686357, 283, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('w','c','h','o') } }, + { /* Chrs */ { 0x73726843, 109, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('c','h','r','s') } }, + { /* Diak */ { 0x6b616944, 342, 8, 0x0020, 1, 1, 0, 0, 0, 0, 0 }, { _OT('d','i','a','k') } }, + { /* Kits */ { 0x7374694b, 288, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, { _OT('k','i','t','s') } }, + { /* Yezi */ { 0x697a6559, 192, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('y','e','z','i') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index 594d9edea87..fbc467c38bb 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -156,5 +156,9 @@ enum unicode_script_id { Script_Nyiakeng_Puachue_Hmong = 150, Script_Nandinagari = 151, Script_Wancho = 152, - Script_LastId = 152 + Script_Chorasmian = 153, + Script_Dives_Akuru = 154, + Script_Khitan_Small_Script = 155, + Script_Yezidi = 156, + Script_LastId = 156 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4c9d3d6d988..2bfe6f9bb32 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1512,6 +1512,11 @@ my %scripts = "Nyiakeng_Puachue_Hmong" => 150, "Nandinagari" => 151, "Wancho" => 152, + # Win11 + "Chorasmian" => 153, + "Dives_Akuru" => 154, + "Khitan_Small_Script" => 155, + "Yezidi" => 156, ); ################################################################

1 0

Piotr Caban : ucrtbase: Fix fopen x mode test failures.
by Alexandre Julliard 18 Oct '21

18 Oct '21

Module: wine Branch: master Commit: 658473332756991b2db05dd3fa70ea6dcc520750 URL: https://source.winehq.org/git/wine.git/?a=commit;h=658473332756991b2db05dd3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 18 14:57:29 2021 +0200 ucrtbase: Fix fopen x mode test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51894 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index a91ea6c98b8..f5dbac70ddb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1545,17 +1545,18 @@ static void test_fopen_exclusive( void ) DWORD len; FILE *fp; - if (!GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "__std_terminate")) - { - win_skip("skipping fopen x mode tests.\n"); - return; - } - len = GetTempPathA(MAX_PATH, path); ok(len, "GetTempPathA failed\n"); strcat(path, "\\fileexcl.tst"); + SET_EXPECT(global_invalid_parameter_handler); fp = fopen(path, "wx"); + if(called_global_invalid_parameter_handler) + { + win_skip("skipping fopen x mode tests.\n"); + return; + } + expect_global_invalid_parameter_handler = FALSE; ok(fp != NULL, "creating file with mode wx failed\n"); fclose(fp); @@ -1582,7 +1583,7 @@ static void test_fopen_exclusive( void ) ok(!fp, "creating file with mode xw succeeded\n"); fp = fopen(path, "wbx"); - ok(fp != NULL, "creating file with mode wx failed\n"); + ok(fp != NULL, "creating file with mode wbx failed\n"); fclose(fp); unlink(path); }

1 0