August 2020 - Wine-Devel - list.winehq.org

[PATCH v2] ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb.
by Mikołaj Zalewski Aug. 5, 2020

Aug. 5, 2020

Without it, Raspbian gcc thinks the next function (raise_func_trampoline_arm) is in Thumb and will create its own trampoline to to execute it as Thumb (bad). Signed-off-by: Mikołaj Zalewski <mikolaj(a)zalewski.pl>

1 0

[PATCH 1/3] ntdll: Add additional fields to generated SMBIOS baseboard info table.
by Brendan Shanks Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 57 +++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4e0841175eb..69532669bef 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -123,6 +123,12 @@ struct smbios_board BYTE product; BYTE version; BYTE serial; + BYTE asset_tag; + BYTE feature_flags; + BYTE location; + WORD chassis_handle; + BYTE board_type; + BYTE num_contained_handles; }; struct smbios_chassis @@ -1250,8 +1256,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON size_t system_vendor_len, system_product_len, system_version_len, system_serial_len; char system_sku[128], system_family[128]; size_t system_sku_len, system_family_len; - char board_vendor[128], board_product[128], board_version[128], board_serial[128]; - size_t board_vendor_len, board_product_len, board_version_len, board_serial_len; + char board_vendor[128], board_product[128], board_version[128], board_serial[128], board_asset_tag[128]; + size_t board_vendor_len, board_product_len, board_version_len, board_serial_len, board_asset_tag_len; char chassis_vendor[128], chassis_version[128], chassis_serial[128], chassis_asset_tag[128]; char chassis_type[11] = "2"; /* unknown */ size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len; @@ -1279,6 +1285,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON board_product_len = get_smbios_string("/sys/class/dmi/id/board_name", S(board_product)); board_version_len = get_smbios_string("/sys/class/dmi/id/board_version", S(board_version)); board_serial_len = get_smbios_string("/sys/class/dmi/id/board_serial", S(board_serial)); + board_asset_tag_len = get_smbios_string("/sys/class/dmi/id/board_asset_tag", S(board_asset_tag)); chassis_vendor_len = get_smbios_string("/sys/class/dmi/id/chassis_vendor", S(chassis_vendor)); chassis_version_len = get_smbios_string("/sys/class/dmi/id/chassis_version", S(chassis_version)); chassis_serial_len = get_smbios_string("/sys/class/dmi/id/chassis_serial", S(chassis_serial)); @@ -1297,7 +1304,8 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON L(system_serial_len) + L(system_sku_len) + L(system_family_len) + 1, 2); *required_len += sizeof(struct smbios_board); - *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + L(board_serial_len) + 1, 2); + *required_len += max(L(board_vendor_len) + L(board_product_len) + L(board_version_len) + + L(board_serial_len) + L(board_asset_tag_len) + 1, 2); *required_len += sizeof(struct smbios_chassis); *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) + @@ -1371,24 +1379,6 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; - string_count = 0; - board = (struct smbios_board*)buffer; - board->hdr.type = 2; - board->hdr.length = sizeof(struct smbios_board); - board->hdr.handle = handle_count++; - board->vendor = board_vendor_len ? ++string_count : 0; - board->product = board_product_len ? ++string_count : 0; - board->version = board_version_len ? ++string_count : 0; - board->serial = board_serial_len ? ++string_count : 0; - buffer += sizeof(struct smbios_board); - - copy_smbios_string(&buffer, board_vendor, board_vendor_len); - copy_smbios_string(&buffer, board_product, board_product_len); - copy_smbios_string(&buffer, board_version, board_version_len); - copy_smbios_string(&buffer, board_serial, board_serial_len); - if (!string_count) *buffer++ = 0; - *buffer++ = 0; - string_count = 0; chassis = (struct smbios_chassis*)buffer; chassis->hdr.type = 3; @@ -1412,6 +1402,31 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON if (!string_count) *buffer++ = 0; *buffer++ = 0; + string_count = 0; + board = (struct smbios_board*)buffer; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = handle_count++; + board->vendor = board_vendor_len ? ++string_count : 0; + board->product = board_product_len ? ++string_count : 0; + board->version = board_version_len ? ++string_count : 0; + board->serial = board_serial_len ? ++string_count : 0; + board->asset_tag = board_asset_tag_len ? ++string_count : 0; + board->feature_flags = 0x5; /* hosting board, removable */ + board->location = 0; + board->chassis_handle = chassis->hdr.handle; + board->board_type = 0xa; /* motherboard */ + board->num_contained_handles = 0; + buffer += sizeof(struct smbios_board); + + copy_smbios_string(&buffer, board_vendor, board_vendor_len); + copy_smbios_string(&buffer, board_product, board_product_len); + copy_smbios_string(&buffer, board_version, board_version_len); + copy_smbios_string(&buffer, board_serial, board_serial_len); + copy_smbios_string(&buffer, board_asset_tag, board_asset_tag_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + end_of_table = (struct smbios_header*)buffer; end_of_table->type = 127; end_of_table->length = sizeof(struct smbios_header); -- 2.26.2

1 2

[PATCH 1/2] include: Define all CLSID/IID_IXACT3Engine versions
by Alistair Leslie-Hughes Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/xact3.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/include/xact3.h b/include/xact3.h index 80059c124a5..2b4f0e07f3c 100644 --- a/include/xact3.h +++ b/include/xact3.h @@ -30,11 +30,34 @@ extern "C" { #endif -DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#if XACT3_VER == 0x0300 + DEFINE_GUID(CLSID_XACTEngine, 0x3b80ee2a, 0xb0f5, 0x4780, 0x9e, 0x30, 0x90, 0xcb, 0x39, 0x68, 0x5b, 0x03); +#elif XACT3_VER == 0x0301 + DEFINE_GUID(CLSID_XACTEngine, 0x962f5027, 0x99be, 0x4692, 0xa4, 0x68, 0x85, 0x80, 0x2c, 0xf8, 0xde, 0x61); +#elif XACT3_VER == 0x0302 + DEFINE_GUID(CLSID_XACTEngine, 0xd3332f02, 0x3dd0, 0x4de9, 0x9a, 0xec, 0x20, 0xd8, 0x5c, 0x41, 0x11, 0xb6); +#elif XACT3_VER == 0x0303 + DEFINE_GUID(CLSID_XACTEngine, 0x94c1affa, 0x66e7, 0x4961, 0x95, 0x21, 0xcf, 0xde, 0xf3, 0x12, 0x8d, 0x4f); +#elif XACT3_VER == 0x0304 + DEFINE_GUID(CLSID_XACTEngine, 0x0977d092, 0x2d95, 0x4e43, 0x8d, 0x42, 0x9d, 0xdc, 0xc2, 0x54, 0x5e, 0xd5); +#elif XACT3_VER == 0x0305 + DEFINE_GUID(CLSID_XACTEngine, 0x074b110f, 0x7f58, 0x4743, 0xae, 0xa5, 0x12, 0xf1, 0x5b, 0x50, 0x74, 0xed); +#elif XACT3_VER == 0x0306 + DEFINE_GUID(CLSID_XACTEngine, 0x248d8a3b, 0x6256, 0x44d3, 0xa0, 0x18, 0x2a, 0xc9, 0x6c, 0x45, 0x9f, 0x47); +#else /* XACT3_VER == 0x0307 or not defined */ + DEFINE_GUID(CLSID_XACTEngine, 0xbcc782bc, 0x6492, 0x4c22, 0x8c, 0x35, 0xf5, 0xd7, 0x2f, 0xe7, 0x3c, 0x6e); +#endif + DEFINE_GUID(CLSID_XACTAuditionEngine, 0x9ecdd80d, 0x0e81, 0x40d8, 0x89, 0x03, 0x2b, 0xf7, 0xb1, 0x31, 0xac, 0x43); DEFINE_GUID(CLSID_XACTDebugEngine, 0x02860630, 0xbf3b, 0x42a8, 0xb1, 0x4e, 0x91, 0xed, 0xa2, 0xf5, 0x1e, 0xa5); -DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#if XACT3_VER == 0x0300 + DEFINE_GUID(IID_IXACT3Engine, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); +#elif XACT3_VER >= 0x0301 && XACT3_VER <= 0x304 + DEFINE_GUID(IID_IXACT3Engine, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); +#else + DEFINE_GUID(IID_IXACT3Engine, 0xb1ee676a, 0xd9cd, 0x4d2a, 0x89, 0xa8, 0xfa, 0x53, 0xeb, 0x9e, 0x48, 0x0b); +#endif typedef struct IXACT3SoundBank IXACT3SoundBank; typedef struct IXACT3WaveBank IXACT3WaveBank; -- 2.27.0

2 1

[PATCH v2 1/3] amstream/tests: Split test_IDirectDrawStreamSample().
by Gijs Vermeulen Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 268 ++++++++++++++++++++------------- 1 file changed, 167 insertions(+), 101 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index cf66538a7a..1310e42cf2 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2543,106 +2543,6 @@ static void test_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_IDirectDrawStreamSample(void) -{ - IDirectDrawMediaStream *ddraw_stream = NULL; - IDirectDrawStreamSample *sample = NULL; - IDirectDrawSurface *surface, *surface2; - IMediaStream *stream2, *stream = NULL; - DDSURFACEDESC desc = { sizeof(desc) }; - IAMMultiMediaStream *mmstream; - IDirectDrawSurface7 *surface7; - HRESULT hr; - RECT rect; - - if (!(mmstream = create_ammultimediastream())) - return; - if (!create_directdraw()) - { - IAMMultiMediaStream_Release(mmstream); - return; - } - - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IAMMultiMediaStream_GetMediaStream(mmstream, &MSPID_PrimaryVideo, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (FAILED(hr)) goto error; - - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - - surface = NULL; - hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface != NULL, "got %p\n", surface); - - /* Crashes on native. */ - if (0) - { - hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); - ok(hr == E_POINTER, "Got hr %#x.\n", hr); - } - - hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); - IMediaStream_Release(stream2); - - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDirectDrawSurface7_Release(surface7); - - hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); - ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); - ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); - IDirectDrawSurface_Release(surface); - IDirectDrawStreamSample_Release(sample); - - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); - ok(hr == S_OK, "got 0x%08x\n", hr); - - EXPECT_REF(surface, 1); - hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); - ok(hr == S_OK, "got 0x%08x\n", hr); - EXPECT_REF(surface, 2); - - surface2 = NULL; - SetRectEmpty(&rect); - hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(surface == surface2, "got %p\n", surface2); - ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); - EXPECT_REF(surface, 3); - IDirectDrawSurface_Release(surface2); - - hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - IDirectDrawStreamSample_Release(sample); - IDirectDrawSurface_Release(surface); - -error: - if (ddraw_stream) - IDirectDrawMediaStream_Release(ddraw_stream); - if (stream) - IMediaStream_Release(stream); - - release_directdraw(); - IAMMultiMediaStream_Release(mmstream); -} - static IUnknown *create_audio_data(void) { IUnknown *audio_data = NULL; @@ -5728,6 +5628,170 @@ static void test_audiostreamsample_get_audio_data(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_create_sample(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawSurface *surface, *surface2; + DDSURFACEDESC desc = { sizeof(desc) }; + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream; + IDirectDraw *ddraw; + HRESULT hr; + RECT rect; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + SetRectEmpty(&rect); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + EXPECT_REF(stream, 3); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine EXPECT_REF(stream, 4); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, NULL, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + IDirectDrawSurface_Release(surface); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(sample, &surface, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface != NULL, "Expected non-NULL surface.\n"); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); + ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(stream, 3); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + SetRectEmpty(&rect); + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(surface2 == surface, "Expected surface %p, got %p.\n", surface, surface2); + ok(rect.right > 0 && rect.bottom > 0, "Got rect %d, %d.\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(sample); + EXPECT_REF(surface, 1); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ddrawstreamsample_get_media_stream(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IDirectDrawMediaStream *ddraw_stream; + IDirectDrawStreamSample *sample; + IMediaStream *stream, *stream2; + IDirectDraw *ddraw; + HRESULT hr; + ULONG ref; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, (IUnknown *)ddraw, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Crashes on native. */ + if (0) + { + hr = IDirectDrawStreamSample_GetMediaStream(sample, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + todo_wine EXPECT_REF(stream, 4); + hr = IDirectDrawStreamSample_GetMediaStream(sample, &stream2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(stream2 == stream, "Expected stream %p, got %p.\n", stream, stream2); + todo_wine EXPECT_REF(stream, 5); + IMediaStream_Release(stream2); + todo_wine EXPECT_REF(stream, 4); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDraw_Release(ddraw); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { const WCHAR *test_avi_path; @@ -5744,7 +5808,6 @@ START_TEST(amstream) test_set_state(); test_enum_media_types(); test_media_types(); - test_IDirectDrawStreamSample(); test_avi_path = load_resource(L"test.avi"); @@ -5780,6 +5843,9 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); test_ddrawstream_receive_connection(); + test_ddrawstream_create_sample(); + + test_ddrawstreamsample_get_media_stream(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.28.0

3 5

[PATCH v2 1/2] fsutil: Print out usage message
by Arkadiusz Hiler Aug. 5, 2020

Aug. 5, 2020

From: Michael Müller <michael(a)fds-team.de> Fsutil doesn't do anything yet other than printing out usage message. This patch puts some thing in place in preparation for the implementation of hardlink subcommand. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- programs/fsutil/Makefile.in | 4 +++ programs/fsutil/fsutil.mc | 27 ++++++++++++++++ programs/fsutil/main.c | 63 ++++++++++++++++++++++++++++++++++--- programs/fsutil/resources.h | 21 +++++++++++++ 4 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 programs/fsutil/fsutil.mc create mode 100644 programs/fsutil/resources.h diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index 64307e83ac..fe736bad5d 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,6 +1,10 @@ MODULE = fsutil.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +MC_SRCS = \ + fsutil.mc diff --git a/programs/fsutil/fsutil.mc b/programs/fsutil/fsutil.mc new file mode 100644 index 0000000000..54c801cb2b --- /dev/null +++ b/programs/fsutil/fsutil.mc @@ -0,0 +1,27 @@ +; +; Copyright 2020 Arkadiusz Hiler for CodeWeavers +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:fsutil) + +MessageId=101 +SymbolicName=STRING_USAGE +Language=ENU +- Supported Commands - + +[NONE] +. diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index eb4e341297..1d61edab75 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -1,5 +1,6 @@ /* * Copyright 2016 Austin English + * Copyright 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +17,70 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> + #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(fsutil); +static void output_write(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!msgA) return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } +} + +static int WINAPIV output_string(int msg, ...) +{ + WCHAR out[8192]; + __ms_va_list arguments; + int len; + + __ms_va_start(arguments, msg); + len = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE, NULL, msg, 0, out, ARRAY_SIZE(out), &arguments); + __ms_va_end(arguments); + + if (len == 0 && GetLastError() != NO_ERROR) + WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg); + else + output_write(out, len); + + return 0; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); + TRACE("Command line:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", debugstr_w(argv[i])); + TRACE("\n"); - return 0; + if (argc > 1) + { + FIXME("unsupported command %s\n", debugstr_w(argv[1])); + ret = 1; + } + + output_string(STRING_USAGE); + return ret; } diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h new file mode 100644 index 0000000000..36b0ffc35f --- /dev/null +++ b/programs/fsutil/resources.h @@ -0,0 +1,21 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#define STRING_USAGE 101 -- 2.28.0

2 3

[PATCH 1/2] fsutil: Print out usage message
by Arkadiusz Hiler Aug. 5, 2020

Aug. 5, 2020

From: Michael Müller <michael(a)fds-team.de> Fsutil doesn't do anything yet other than printing out usage message. This patch puts some thing in place in preparation for the implementation of hardlink subcommand. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- programs/fsutil/Makefile.in | 4 +++ programs/fsutil/fsutil.mc | 27 ++++++++++++++++ programs/fsutil/main.c | 63 ++++++++++++++++++++++++++++++++++--- programs/fsutil/resources.h | 21 +++++++++++++ 4 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 programs/fsutil/fsutil.mc create mode 100644 programs/fsutil/resources.h diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index 64307e83ac..fe736bad5d 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,6 +1,10 @@ MODULE = fsutil.exe +IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +MC_SRCS = \ + fsutil.mc diff --git a/programs/fsutil/fsutil.mc b/programs/fsutil/fsutil.mc new file mode 100644 index 0000000000..54c801cb2b --- /dev/null +++ b/programs/fsutil/fsutil.mc @@ -0,0 +1,27 @@ +; +; Copyright 2020 Arkadiusz Hiler for CodeWeavers +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2.1 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the Free Software +; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +; + +LanguageNames=(ENU=0x409:fsutil) + +MessageId=101 +SymbolicName=STRING_USAGE +Language=ENU +- Supported Commands - + +[NONE] +. diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index eb4e341297..1d61edab75 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -1,5 +1,6 @@ /* * Copyright 2016 Austin English + * Copyright 2016 Michael Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +17,70 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> + #include "wine/debug.h" +#include "resources.h" WINE_DEFAULT_DEBUG_CHANNEL(fsutil); +static void output_write(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + if (!msgA) return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } +} + +static int WINAPIV output_string(int msg, ...) +{ + WCHAR out[8192]; + __ms_va_list arguments; + int len; + + __ms_va_start(arguments, msg); + len = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE, NULL, msg, 0, out, ARRAY_SIZE(out), &arguments); + __ms_va_end(arguments); + + if (len == 0 && GetLastError() != NO_ERROR) + WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg); + else + output_write(out, len); + + return 0; +} + int __cdecl wmain(int argc, WCHAR *argv[]) { - int i; + int i, ret = 0; - WINE_FIXME("stub:"); + TRACE("Command line:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + TRACE(" %s", debugstr_w(argv[i])); + TRACE("\n"); - return 0; + if (argc > 1) + { + FIXME("unsupported command %s\n", debugstr_w(argv[1])); + ret = 1; + } + + output_string(STRING_USAGE); + return ret; } diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h new file mode 100644 index 0000000000..36b0ffc35f --- /dev/null +++ b/programs/fsutil/resources.h @@ -0,0 +1,21 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +#define STRING_USAGE 101 -- 2.28.0

2 4

[PATCH 2/2] msvcrt: Import acos from musl.
by Piotr Caban Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] msvcrt: Import acosf from musl.
by Piotr Caban Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 63 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 9 deletions(-)

1 0

[PATCH] ntdll: Catch EXCEPTION_INVALID_HANDLE in NtClose.
by Rémi Bernon Aug. 5, 2020

Aug. 5, 2020

That was dropped in 4752e252ea6ee084b679a9b9551a1c55f8744451 and it causes Metal Gear Solid V: Ground Zeroes to crash on start. The game debugs itself and closes an invalid handle as an anti-debug check. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not sure why the try catch was removed, and maybe there's a better fix to it? dlls/ntdll/unix/server.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 4d7962fddc7..e45accf4f2b 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -87,6 +87,7 @@ #include "winnt.h" #include "wine/library.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/debug.h" #include "unix_private.h" #include "ddk/wdm.h" @@ -1634,6 +1635,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} /************************************************************************** * NtClose @@ -1656,8 +1662,15 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) if (!NtCurrentTeb()->Peb->BeingDebugged) return ret; if (!NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL) && port) { - NtCurrentTeb()->ExceptionCode = ret; - pKiRaiseUserExceptionDispatcher(); + __TRY + { + NtCurrentTeb()->ExceptionCode = ret; + pKiRaiseUserExceptionDispatcher(); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY } return ret; } -- 2.27.0

1 0

[PATCH 2/2] msvcrt: Use correct code page in _write when outputing to console.
by Piotr Caban Aug. 5, 2020

Aug. 5, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 75 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 5 deletions(-)

1 0