wine-devel February 2022

wine-devel@winehq.org

87 participants
926 discussions

[PATCH] win32u/tests: Build without -DWINE_NO_LONG_TYPES.
by Jacek Caban 18 Feb '22

18 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/Makefile.in | 1 - dlls/win32u/tests/win32u.c | 52 +++++++++++++++++------------------ 2 files changed, 26 insertions(+), 27 deletions(-)

1 0

[PATCH 2/2] winex11: Get primary monitor rect from win32u.
by Jacek Caban 18 Feb '22

18 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 11 ++-- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 101 +---------------------------------- include/ntuser.h | 1 + 4 files changed, 11 insertions(+), 104 deletions(-)

2 1

[PATCH 1/2] winex11: Get virtual screen rect from win32u.
by Jacek Caban 18 Feb '22

18 Feb '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 3 +++ dlls/winex11.drv/display.c | 8 +------- include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-)

2 1

[PATCH resend] wininet: Support more internet time format.
by Ziqing Hui 18 Feb '22

18 Feb '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/wininet/internet.c | 42 +++++++++++++++++++++++++---------- dlls/wininet/tests/internet.c | 16 ++++++------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 59fae2fbc95..61e713f41e2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3400,36 +3400,54 @@ BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD r * a SYSTEMTIME structure. */ - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalnum(*s)) s++; + if (*s == '\0') return TRUE; time->wDayOfWeek = 7; - for (i = 0; i < 7; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_wkday[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 7; i++) { - time->wDayOfWeek = i; - break; + if (!wcsnicmp(WININET_wkday[i], s, 3)) + { + time->wDayOfWeek = i; + break; + } } } + else + { + time->wDayOfWeek = *s - '0'; + ++s; + } if (time->wDayOfWeek > 6) return TRUE; while (*s && !iswdigit( *s )) s++; time->wDay = wcstol( s, &end, 10 ); s = end; - while (*s && !iswalpha( *s )) s++; - if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; + while (*s && !iswalnum(*s)) s++; + if (*s == '\0') return TRUE; time->wMonth = 0; - for (i = 0; i < 12; i++) + if (iswalpha(*s)) { - if (!wcsnicmp( WININET_month[i], s, 3 )) + if (s[1] == '\0' || s[2] == '\0') return TRUE; + for (i = 0; i < 12; i++) { - time->wMonth = i + 1; - break; + if (!wcsnicmp(WININET_month[i], s, 3)) + { + time->wMonth = i + 1; + break; + } } } + else + { + time->wMonth = wcstol(s, &end, 10); + s = end; + } if (time->wMonth == 0) return TRUE; while (*s && !iswdigit( *s )) s++; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8fc72be8431..19d6ae7e639 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -917,14 +917,14 @@ static void test_InternetTimeToSystemTime(void) { { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE }, { " fri, 7 jan 2005 12 06 35", &expect1, TRUE }, - { "Fri, 07-01-2005 12:06:35", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE, TRUE }, - { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE, TRUE }, - { "2, 11 01 2022 11 13 05", &expect2, TRUE, TRUE }, - { "2, 11-01-2022 11#13^05", &expect2, TRUE, TRUE }, - { "2, 11*01/2022 11+13=05", &expect2, TRUE, TRUE }, - { "2, 11-Jan-2022 11:13:05", &expect2, TRUE, TRUE }, + { "Fri, 07-01-2005 12:06:35", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT;", &expect1, TRUE }, + { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE }, + { "2, 11 01 2022 11 13 05", &expect2, TRUE }, + { "2, 11-01-2022 11#13^05", &expect2, TRUE }, + { "2, 11*01/2022 11+13=05", &expect2, TRUE }, + { "2, 11-Jan-2022 11:13:05", &expect2, TRUE }, { "Fr", NULL, FALSE }, }; -- 2.25.1

2 1

[PATCH 1/5] d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap().
by Matteo Bruni 18 Feb '22

18 Feb '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52561 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 62f4eaec124..2ed9131d788 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -4520,7 +4520,7 @@ static void test_D3DXSHProjectCubeMap(void) { hr = IDirect3DCubeTexture9_LockRect(texture, face, level, &map_desc, NULL, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - memset(map_desc.pBits, 0xcc, 4 * map_desc.Pitch); + memset(map_desc.pBits, 0xcc, (8 >> level) * map_desc.Pitch); hr = IDirect3DCubeTexture9_UnlockRect(texture, face, level); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } -- 2.34.1

1 4

[PATCH 1/4] dinput: Also trace report buffers on immediate ReadFile success.
by Rémi Bernon 18 Feb '22

18 Feb '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 68db935c44a..4987a9f9872 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1226,24 +1226,23 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) BOOL ret; ret = GetOverlappedResult( impl->device, &impl->read_ovl, &count, FALSE ); - if (ret && TRACE_ON(dinput)) - { - TRACE( "read size %lu report:\n", count ); - for (i = 0; i < count;) - { - char buffer[256], *buf = buffer; - buf += sprintf(buf, "%08lx ", i); - do - { - buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < count); - TRACE("%s\n", buffer); - } - } EnterCriticalSection( &impl->base.crit ); while (ret) { + if (TRACE_ON(dinput)) + { + TRACE( "iface %p, size %lu, report:\n", iface, count ); + for (i = 0; i < count;) + { + char buffer[256], *buf = buffer; + buf += sprintf(buf, "%08lx ", i); + do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); } + while (++i % 16 && i < count); + TRACE("%s\n", buffer); + } + } + count = impl->usages_count; memset( impl->usages_buf, 0, count * sizeof(*impl->usages_buf) ); status = HidP_GetUsagesEx( HidP_Input, 0, impl->usages_buf, &count, -- 2.34.1

1 3

[PATCH 01/24] dlls/sfc_os: enable compilation with long types
by Eric Pouech 18 Feb '22

18 Feb '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sfc_os/Makefile.in | 1 - dlls/sfc_os/sfc_os.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 5488245195f..e3e727fc262 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sfc_os.dll IMPORTLIB = sfc_os diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f6163f5b4eb..61614264c77 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -119,7 +119,7 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) DWORD WINAPI SfcConnectToServer(DWORD unknown) { - FIXME("%x\n", unknown); + FIXME("%lx\n", unknown); return 0; }

2 24

[PATCH 1/4] ncrypt: Validate existence of property before creating one.
by Santino Mazza 18 Feb '22

18 Feb '22

Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> --- dlls/ncrypt/main.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 8e789573924..dbcb0087445 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -181,11 +181,10 @@ static struct object *allocate_object(enum object_type type) return ret; } -static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +struct object_property *create_object_property(struct object *object, const WCHAR *name) { struct object_property *property; - FIXME("check duplicates\n"); if (!object->num_properties) { if (!(object->properties = malloc(sizeof(*property)))) @@ -215,8 +214,18 @@ static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *n } lstrcpyW(property->key, name); + + return property; +} + +static SECURITY_STATUS set_object_property(struct object *object, const WCHAR *name, BYTE *value, DWORD value_size) +{ + struct object_property *property = get_object_property(object, name); + + if(!property) property = create_object_property(object, name); + property->value_size = value_size; - if (!(property->value = malloc(value_size))) + if (!(property->value = realloc(property->value, value_size))) { ERR("Error allocating memory."); free(property->key); -- 2.32.0

3 7

[PATCH 0/7] Pass stream ptrs to helpers.
by Huw Davies 18 Feb '22

18 Feb '22

The aim of this series is to end up passing stream ptrs, as opposed to ACImpl (aka "This"), to helpers that'll move to the unixlib. The bulk of the patches relate to volume handling. Huw D. M. Davies (7): winealsa: Store the channel volumes in the stream. winealsa: Remove an unnecessary check on the session channel count. winealsa: Store the session channel vols in the stream. winealsa: Store the session master volume in the stream. winealsa: Store the session mute state in the stream volumes. winealsa: Pass a stream ptr to alsa_{read|write}_data(). winealsa: Keep a copy of the dataflow in the stream. dlls/winealsa.drv/mmdevdrv.c | 131 ++++++++++++++++++++++------------- dlls/winealsa.drv/unixlib.h | 2 + 2 files changed, 86 insertions(+), 47 deletions(-) -- 2.25.1

1 0

[PATCH 1/5] mfmediaengine: Shutdown media source when clearing current presentation.
by Nikolay Sivov 18 Feb '22

18 Feb '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 31aee0209f6..4a7d85348d7 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -141,6 +141,10 @@ struct media_engine IMFSourceResolver *resolver; BSTR current_source; struct + { + IMFMediaSource *source; + } presentation; + struct { LONGLONG pts; SIZE size; @@ -1071,6 +1075,16 @@ static HRESULT media_engine_create_video_renderer(struct media_engine *engine, I return hr; } +static void media_engine_clear_presentation(struct media_engine *engine) +{ + if (engine->presentation.source) + { + IMFMediaSource_Shutdown(engine->presentation.source); + IMFMediaSource_Release(engine->presentation.source); + } + memset(&engine->presentation, 0, sizeof(engine->presentation)); +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; @@ -1081,6 +1095,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi HRESULT hr; media_engine_release_video_frame_resources(engine); + media_engine_clear_presentation(engine); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) return hr; @@ -1134,6 +1149,9 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi return E_UNEXPECTED; } + engine->presentation.source = source; + IMFMediaSource_AddRef(engine->presentation.source); + media_engine_set_flag(engine, FLAGS_ENGINE_HAS_VIDEO, !!sd_video); media_engine_set_flag(engine, FLAGS_ENGINE_HAS_AUDIO, !!sd_audio); @@ -1340,6 +1358,7 @@ static void free_media_engine(struct media_engine *engine) if (engine->resolver) IMFSourceResolver_Release(engine->resolver); media_engine_release_video_frame_resources(engine); + media_engine_clear_presentation(engine); if (engine->device_manager) { IMFDXGIDeviceManager_CloseDeviceHandle(engine->device_manager, engine->device_handle); @@ -2086,6 +2105,7 @@ static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngineEx *iface) else { media_engine_set_flag(engine, FLAGS_ENGINE_SHUT_DOWN, TRUE); + media_engine_clear_presentation(engine); IMFMediaSession_Shutdown(engine->session); } LeaveCriticalSection(&engine->cs); -- 2.34.1

1 4

← Newer
1
...
29
30
31
32
33
34
35
...
93
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-devel February 2022