July 2019 - Wine-devel - list.winehq.org

[PATCH] d2d1: Remove unused function.
by Nikolay Sivov 02 Jul '19

02 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 9e4acb6ea2..98f06a281a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -207,11 +207,6 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) -{ - return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); -} - static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct d2d_device_context *context = impl_from_IUnknown(iface); -- 2.20.1

3 2

[PATCH] d3drm: Fix reference leak in d3drm_viewport2_Clear().
by Jeff Smith 02 Jul '19

02 Jul '19

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index eefd33ed2f..ea68838948 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -7014,10 +7014,12 @@ static void test_viewport_clear1(void) ret_color = IDirect3DRMFrame_GetSceneBackground(camera1); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMViewport_Clear(viewport1); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f); ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr); @@ -7217,10 +7219,12 @@ static void test_viewport_clear2(void) ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 81d3af444f..51174cd59e 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -50,6 +50,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) return hr; color = IDirect3DRMFrame_GetSceneBackground(root_frame); + IDirect3DRMFrame_Release(root_frame); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); -- 2.14.3

2 1

[PATCH] shlwapi: Remove unused function.
by Nikolay Sivov 02 Jul '19

02 Jul '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/path.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a8d1c97172..e7b56a7ade 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -54,21 +54,6 @@ static fnpIsNetDrive pIsNetDrive; HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); -static inline WCHAR* heap_strdupAtoW(LPCSTR str) -{ - WCHAR *ret = NULL; - - if (str) - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - /************************************************************************* * PathBuildRootA [SHLWAPI.@] * -- 2.20.1

2 1

[PATCH 2/2] winedbg: Set auto attach event after processing the first exception.
by Jacek Caban 02 Jul '19

02 Jul '19

On Windows, the process is broken by ordering and actual debug break execution in a new thread. We need to process this even before continuing exception handling in debuggee to avoid race. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/tgt_active.c | 14 +++++--------- programs/winedbg/winedbg.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-)

1 0

[PATCH 1/2] winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee.
by Jacek Caban 02 Jul '19

02 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH] xaudio2: Fix the export order for CreateAudioReverb/CreateAudioVolumeMeter
by elee＠codeweavers.com 02 Jul '19

02 Jul '19

From: Ethan Lee <elee(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47437 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_9/xaudio2_9.spec +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) -- 2.21.0

1 0

[PATCH 1/2] xaudio2: Add TRACE functions to CreateAudioReverb/CreateAudioVolumeMeter
by elee＠codeweavers.com 02 Jul '19

02 Jul '19

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da0b0aa606..a87e0124d3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2075,6 +2075,8 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; @@ -2091,6 +2093,8 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; -- 2.21.0

3 4

[PATCH] msvcrt: Fix handling of dst == src in wcscpy_s.
by Dmitry Timoshkov 02 Jul '19

02 Jul '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0f1ee47d17..da6478c1b1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* dest == source */ + ret = p_wcscpy_s(szDest, 18, szDest); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* Copy smaller buffer size */ errno = EBADF; szDest[0] = 'A'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e62ac25edc..6b8c7bbe0f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; - wcDest[0] = 0; - - if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcSrc)) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } size = strlenW(wcSrc) + 1; if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) + { + wcDest[0] = 0; return MSVCRT_ERANGE; + } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + memmove( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0; } -- 2.20.1

2 1

[PATCH 3/3] ntdll: Use the machine ID for the system UUID on Linux.
by Hans Leidekker 02 Jul '19

02 Jul '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7cfe57c9bd..1211234293 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -101,6 +101,7 @@ struct smbios_system { BYTE product; BYTE version; BYTE serial; + BYTE uuid[16]; }; struct smbios_board { @@ -2064,6 +2065,45 @@ static size_t get_smbios_string(const char *path, char *str, size_t size) return len; } +static void get_system_uuid( GUID *uuid ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + int fd; + + memset( uuid, 0xff, sizeof(*uuid) ); + if ((fd = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32], *p = buf; + if (read( fd, buf, sizeof(buf) ) == sizeof(buf)) + { + uuid->Data1 = hex[p[6]] << 28 | hex[p[7]] << 24 | hex[p[4]] << 20 | hex[p[5]] << 16 | + hex[p[2]] << 12 | hex[p[3]] << 8 | hex[p[0]] << 4 | hex[p[1]]; + + uuid->Data2 = hex[p[10]] << 12 | hex[p[11]] << 8 | hex[p[8]] << 4 | hex[p[9]]; + uuid->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[12]] << 4 | hex[p[13]]; + + uuid->Data4[0] = hex[p[16]] << 4 | hex[p[17]]; + uuid->Data4[1] = hex[p[18]] << 4 | hex[p[19]]; + uuid->Data4[2] = hex[p[20]] << 4 | hex[p[21]]; + uuid->Data4[3] = hex[p[22]] << 4 | hex[p[23]]; + uuid->Data4[4] = hex[p[24]] << 4 | hex[p[25]]; + uuid->Data4[5] = hex[p[26]] << 4 | hex[p[27]]; + uuid->Data4[6] = hex[p[28]] << 4 | hex[p[29]]; + uuid->Data4[7] = hex[p[30]] << 4 | hex[p[31]]; + } + close( fd ); + } +} + static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) { switch (sfti->ProviderSignature) @@ -2163,6 +2203,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; + get_system_uuid( (GUID *)system->uuid ); buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len); -- 2.11.0

2 1

[PATCH 2/3] ntdll: Use a common structure for the SMBIOS table entry header.
by Hans Leidekker 02 Jul '19

02 Jul '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2a2bd4fd60..7cfe57c9bd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -79,10 +79,14 @@ struct smbios_prologue { DWORD length; }; -struct smbios_bios { +struct smbios_header { BYTE type; BYTE length; WORD handle; +}; + +struct smbios_bios { + struct smbios_header hdr; BYTE vendor; BYTE version; WORD start; @@ -92,9 +96,7 @@ struct smbios_bios { }; struct smbios_system { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -102,9 +104,7 @@ struct smbios_system { }; struct smbios_board { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -112,9 +112,7 @@ struct smbios_board { }; struct smbios_chassis { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE shape; BYTE version; @@ -2139,9 +2137,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; bios = (struct smbios_bios*)buffer; - bios->type = 0; - bios->length = sizeof(struct smbios_bios); - bios->handle = 0; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = 0; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -2158,9 +2156,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; system = (struct smbios_system*)buffer; - system->type = 1; - system->length = sizeof(struct smbios_system); - system->handle = 0; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = 0; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -2176,9 +2174,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; board = (struct smbios_board*)buffer; - board->type = 2; - board->length = sizeof(struct smbios_board); - board->handle = 0; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = 0; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -2194,9 +2192,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; chassis = (struct smbios_chassis*)buffer; - chassis->type = 3; - chassis->length = sizeof(struct smbios_chassis); - chassis->handle = 0; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->shape = 0x2; /* unknown */ chassis->version = chassis_version_len ? ++string_count : 0; -- 2.11.0

2 1