October 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] ucrtbase: Add __std_terminate export.
by Piotr Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/ucrtbase.spec | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 7/7] win32u: Use syscall interface for some palette functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 ++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ----------------------- dlls/wow64win/gdi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-)

2 1

[PATCH 6/7] win32u: Use syscall interface for some mapping functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-)

2 1

[PATCH 4/7] win32u: Use syscall interface for some font functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 8 --- dlls/win32u/syscall.c | 8 +++ dlls/win32u/win32u.spec | 16 +++--- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 46 ----------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++ dlls/wow64win/wow64win_private.h | 12 +++++ 8 files changed, 125 insertions(+), 76 deletions(-)

2 1

[PATCH 3/7] win32u: Use syscall interface for some DC functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 7 ----- dlls/win32u/syscall.c | 7 +++++ dlls/win32u/win32u.spec | 14 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 35 --------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 +++++- 7 files changed, 82 insertions(+), 58 deletions(-)

2 1

[PATCH 2/7] win32u: Use syscall interface for region functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 13 ---- dlls/win32u/syscall.c | 13 ++++ dlls/win32u/win32u.spec | 26 ++++---- dlls/win32u/win32u_private.h | 14 ---- dlls/win32u/wrappers.c | 66 ------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 ++++- 7 files changed, 161 insertions(+), 107 deletions(-)

2 1

[PATCH 1/7] win32u: Use syscall interface for bitmap functions.
by Jacek Caban Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 6 --- dlls/win32u/syscall.c | 6 +++ dlls/win32u/win32u.spec | 12 +++--- dlls/win32u/win32u_private.h | 9 ----- dlls/win32u/wrappers.c | 33 ---------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++- dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 99 insertions(+), 55 deletions(-)

2 1

[PATCH] wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http connections
by Alistair Leslie-Hughes Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8e40a4cee2b..d0150c235a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2330,6 +2330,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if(!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *((PCERT_CHAIN_CONTEXT*)buffer) = (PCERT_CHAIN_CONTEXT)CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b3fcc93b704..567f63b9c8a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -7129,6 +7129,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -7160,6 +7161,14 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(PCCERT_CHAIN_CONTEXT); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8*/, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + CertFreeCertificateChain(ctx); + } + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -8099,6 +8108,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -8119,6 +8129,10 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(PCCERT_CHAIN_CONTEXT); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), "InternetQueryOption failed: %d\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); -- 2.33.0

2 1

[PATCH] maintainers: Update GDI files.
by Huw Davies Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..5bf636cfd34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -129,6 +129,26 @@ F: dlls/mscoree/ GDI M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ +F: dlls/win32u/bitblt.c +F: dlls/win32u/bitmap.c +F: dlls/win32u/brush.c +F: dlls/win32u/clipping.c +F: dlls/win32u/dc.c +F: dlls/win32u/dib.c +F: dlls/win32u/dibdrv/ +F: dlls/win32u/driver.c +F: dlls/win32u/emfdrv.c +F: dlls/win32u/font.c +F: dlls/win32u/freetype.c +F: dlls/win32u/gdiobj.c +F: dlls/win32u/mapping.c +F: dlls/win32u/opentype.c +F: dlls/win32u/painting.c +F: dlls/win32u/palette.c +F: dlls/win32u/path.c +F: dlls/win32u/pen.c +F: dlls/win32u/printdrv.c +F: dlls/win32u/region.c GDIPlus M: Esme Povirk <vincent(a)codeweavers.com> -- 2.23.0

1 0

[PATCH 1/6] dinput: Move device_instance_is_disabled to device.c.
by Rémi Bernon Oct. 11, 2021

Oct. 11, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 48 ++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 ------------------------------------ 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d869f439101..61f6effad19 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -314,6 +314,54 @@ DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer return ERROR_FILE_NOT_FOUND; } +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) +{ + static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; + static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; + WCHAR buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL disable = FALSE; + + get_app_key( &hkey, &appkey ); + if (override) *override = FALSE; + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; + RegCloseKey( appkey ); + appkey = temp; + } + + if (hkey) + { + if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; + RegCloseKey( hkey ); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) + { + if (!strcmpW( disabled_str, buffer )) + { + TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + disable = TRUE; + } + else if (override && !strcmpW( override_str, buffer )) + { + TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + *override = TRUE; + } + } + + if (appkey) RegCloseKey( appkey ); + if (hkey) RegCloseKey( hkey ); + + return disable; +} + /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 90eab627c26..8aced6d84dd 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -98,6 +98,7 @@ extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e573e8741a..979d5a5c7f2 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -279,54 +279,6 @@ BOOL device_disabled_registry(const char* name) return device_instance_is_disabled( &instance, NULL ); } -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) -{ - static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; - static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; - static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; - WCHAR buffer[MAX_PATH]; - HKEY hkey, appkey, temp; - BOOL disable = FALSE; - - get_app_key(&hkey, &appkey); - if (override) *override = FALSE; - - /* Joystick settings are in the 'joysticks' subkey */ - if (appkey) - { - if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; - RegCloseKey(appkey); - appkey = temp; - } - - if (hkey) - { - if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; - RegCloseKey(hkey); - hkey = temp; - } - - /* Look for the "controllername"="disabled" key */ - if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) - { - if (!strcmpW( disabled_str, buffer )) - { - TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - disable = TRUE; - } - else if (override && !strcmpW( override_str, buffer )) - { - TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - *override = TRUE; - } - } - - if (appkey) RegCloseKey(appkey); - if (hkey) RegCloseKey(hkey); - - return disable; -} - BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) { int i; -- 2.33.0

2 6