wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Zebediah Figura : build: Create object directories before running bison or flex.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: vkd3d Branch: master Commit: 4bee8dd89bf8a2366b90ea9f76f2d176864e4463 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4bee8dd89bf8a2366b90ea9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 14 21:57:31 2020 -0600 build: Create object directories before running bison or flex. Vkd3d-Bug: https://bugs.winehq.org/show_bug.cgi?id=50334 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> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 32c8777..bf1d7bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,9 +119,11 @@ vkd3d_v_bison_0 = @echo " BISON " $@; vkd3d_v_bison_1 = libs/vkd3d-shader/preproc.yy.c: libs/vkd3d-shader/preproc.l + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $< libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-shader/preproc.y + @$(MKDIR_P) libs/vkd3d-shader $(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $< BUILT_SOURCES += libs/vkd3d-shader/preproc.tab.h

1 0

Jacek Caban : dbghelp: Fetch version info only for PE modules in minidumps.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 04ddabfdff644561adf0e36050db1bbc63cad83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ddabfdff644561adf0e360… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 21:11:36 2020 +0100 dbghelp: Fetch version info only for PE modules in minidumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/minidump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index be155c67ce9..cae966b8e80 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -540,7 +540,8 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) mdModule.ModuleNameRva = dc->rva; ms->Length -= sizeof(WCHAR); append(dc, ms, sizeof(ULONG) + ms->Length + sizeof(WCHAR)); - fetch_module_versioninfo(ms->Buffer, &mdModule.VersionInfo); + if (!dump_elf) fetch_module_versioninfo(ms->Buffer, &mdModule.VersionInfo); + else memset(&mdModule.VersionInfo, 0, sizeof(mdModule.VersionInfo)); mdModule.CvRecord.DataSize = 0; /* FIXME */ mdModule.CvRecord.Rva = 0; /* FIXME */ mdModule.MiscRecord.DataSize = 0; /* FIXME */

1 0

Francois Gouget : ntdll/tests: The case-sensitivity tests don't need write access.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 84907a9eb149363782cf05037759c52e1b34ef2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=84907a9eb149363782cf0503… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 16:06:16 2020 +0100 ntdll/tests: The case-sensitivity tests don't need write access. This fixes the tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 24832312460..9335d9cc927 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -614,6 +614,7 @@ static void test_NtCreateKey(void) pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ + am = GENERIC_READ; attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); @@ -624,14 +625,14 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str );

1 0

Francois Gouget : ntdll/tests: Skip some registry tests when missing elevated privileges.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: cbff1b9540a46853a1700e8c895a57dade69e16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbff1b9540a46853a1700e8c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 16:06:06 2020 +0100 ntdll/tests: Skip some registry tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 51562786e99..24832312460 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1458,6 +1458,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, wine64W ); status = pNtCreateKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify KEY_WOW64_64KEY, no redirection\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, wine32W );

1 0

Francois Gouget : ws2_32/tests: Skip some raw socket tests when missing elevated privileges.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 948e08152bbe12c511526e2515bd11b5da4e78fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=948e08152bbe12c511526e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 14 15:45:46 2020 +0100 ws2_32/tests: Skip some raw socket tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d69a05aec5..8711b65fcea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2551,29 +2551,35 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); - todo_wine { sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); + if (sock != INVALID_SOCKET) + { + todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); } + else if (WSAGetLastError() == WSAEACCES) + skip("SOCK_RAW is not available\n"); + else + ok(0, "Failed to create socket: %d\n", WSAGetLastError()); - sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); } /* IPX socket tests */

1 0

Alexandre Julliard : gdi32: Properly fail mapping glyph for invalid characters in fonts without encoding.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: a0559ad5c3678527f7153da7f9e069ca05236b52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0559ad5c3678527f7153da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 16:55:14 2020 +0100 gdi32: Properly fail mapping glyph for invalid characters in fonts without encoding. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50252 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 764eb110086..00bbeb0a11f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2919,6 +2919,8 @@ static UINT get_glyph_index( struct gdi_font *font, UINT glyph ) glyph = (unsigned char)ch; font_funcs->get_glyph_index( font, &glyph, FALSE ); } + else return 0; + return glyph; }

1 0

Alexandre Julliard : gdi32: Don't create font substitutes for identical names.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 057b4b41483fc03fb0518195c8115ac1305eb716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057b4b41483fc03fb0518195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 16:54:55 2020 +0100 gdi32: Don't create font substitutes for identical names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5da8b620fd4..764eb110086 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -605,7 +605,7 @@ static struct gdi_font_family *create_family( const WCHAR *name, const WCHAR *se family->refcount = 1; lstrcpynW( family->family_name, name, LF_FACESIZE ); - if (second_name && second_name[0]) + if (second_name && second_name[0] && wcsicmp( name, second_name )) { lstrcpynW( family->second_name, second_name, LF_FACESIZE ); add_gdi_font_subst( second_name, -1, name, -1 );

1 0

Akihiro Sagawa : po: Update Japanese translation style.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: b9f5eb5f4891cc6293df1fb994c8cf270ca47100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f5eb5f4891cc6293df1fb9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 14 22:55:49 2020 +0900 po: Update Japanese translation style. Follow recent Microsoft Japanese Style Guide, especially Katakana prolonged sound mark. As of 2008, they followed the June 1991 Cabinet Notification on Loanword Orthography. It states prolonged the sound mark should be used for long vowels when English original terms have final -er, -or, -ar, in general. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 894 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 452 insertions(+), 442 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f5eb5f4891cc6293df…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: 4b7ae7398ecdffafb26e25b74504660170474915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7ae7398ecdffafb26e25b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 14 22:55:47 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 196 +++++++++++++++++++-------------------------------------------- 1 file changed, 57 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b7ae7398ecdffafb26e…

1 0

Rafał Harabień : d3d9: Fix handling of D3DENUM_WHQL_LEVEL.
by Alexandre Julliard 14 Dec '20

14 Dec '20

Module: wine Branch: master Commit: e6c777d26d9095e0b551869fe107a115034218c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c777d26d9095e0b551869f… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Mon Dec 14 18:15:24 2020 +0330 d3d9: Fix handling of D3DENUM_WHQL_LEVEL. D3DENUM_NO_WHQL_LEVEL from Direct3D 8 was replaced with D3DENUM_WHQL_LEVEL in Direct3D 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..3818cb79952 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + /* D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL */ + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
42
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 December 2020