wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Sven Baars : d3dx9: Don't release textures when D3DXSPRITE_DO_NOT_ADDREF_TEXTURE is specified.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 9eda5c043047fd117441473651b2089b80a4ed80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eda5c043047fd1174414736… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 16:03:04 2020 +0100 d3dx9: Don't release textures when D3DXSPRITE_DO_NOT_ADDREF_TEXTURE is specified. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/sprite.c | 18 ++++++++++++------ dlls/d3dx9_36/tests/core.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 9ef7f9c47e0..cd244e657ef 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -112,10 +112,13 @@ static ULONG WINAPI d3dx9_sprite_Release(ID3DXSprite *iface) { int i; - for (i = 0; i < sprite->sprite_count; ++i) + if (!(sprite->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) { - if (sprite->sprites[i].texture) - IDirect3DTexture9_Release(sprite->sprites[i].texture); + for (i = 0; i < sprite->sprite_count; ++i) + { + if (sprite->sprites[i].texture) + IDirect3DTexture9_Release(sprite->sprites[i].texture); + } } HeapFree(GetProcessHeap(), 0, sprite->sprites); @@ -518,10 +521,13 @@ static HRESULT WINAPI d3dx9_sprite_OnResetDevice(ID3DXSprite *iface) TRACE("iface %p.\n", iface); - for (i = 0; i < sprite->sprite_count; ++i) + if (!(sprite->flags & D3DXSPRITE_DO_NOT_ADDREF_TEXTURE)) { - if (sprite->sprites[i].texture) - IDirect3DTexture9_Release(sprite->sprites[i].texture); + for (i = 0; i < sprite->sprite_count; ++i) + { + if (sprite->sprites[i].texture) + IDirect3DTexture9_Release(sprite->sprites[i].texture); + } } sprite->sprite_count = 0; diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 020f18e622c..a8477591e87 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -306,6 +306,20 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device) hr = ID3DXSprite_End(sprite); ok (hr == D3DERR_INVALIDCALL, "End returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + /* Test D3DXSPRITE_DO_NOT_ADDREF_TEXTURE */ + hr = ID3DXSprite_Begin(sprite, D3DXSPRITE_DO_NOT_ADDREF_TEXTURE); + ok (hr == D3D_OK, "Begin returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_Draw(sprite, tex2, &rect, &center, &pos, D3DCOLOR_XRGB(255, 255, 255)); + ok (hr == D3D_OK, "Draw returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_OnResetDevice(sprite); + ok (hr == D3D_OK, "OnResetDevice returned %#x, expected %#x\n", hr, D3D_OK); + check_ref((IUnknown*)tex2, 1); + + hr = ID3DXSprite_Begin(sprite, D3DXSPRITE_DO_NOT_ADDREF_TEXTURE); + ok (hr == D3D_OK, "Begin returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXSprite_Draw(sprite, tex2, &rect, &center, &pos, D3DCOLOR_XRGB(255, 255, 255)); + ok (hr == D3D_OK, "Draw returned %#x, expected %#x\n", hr, D3D_OK); + IDirect3DDevice9_EndScene(device); check_release((IUnknown*)sprite, 0); check_release((IUnknown*)tex2, 0);

1 0

Nikolay Sivov : mf/evr: Derive stream attributes from mixer input attributes.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 15346b36ccbb30788894a344684f2cc6ea0d9a81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15346b36ccbb30788894a344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:30 2020 +0300 mf/evr: Derive stream attributes from mixer input attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 42 +++++++++++++++++++++++++++++++----------- dlls/mf/tests/mf.c | 3 +-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 4be59331b6b..47a506a94c6 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -942,10 +942,26 @@ static const IMFAttributesVtbl video_stream_attributes_vtbl = video_stream_attributes_CopyAllItems, }; +static BOOL video_renderer_is_mixer_d3d_aware(const struct video_renderer *renderer) +{ + IMFAttributes *attributes; + unsigned int value = 0; + BOOL ret; + + if (FAILED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFAttributes, (void **)&attributes))) + return FALSE; + + ret = SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value; + IMFAttributes_Release(attributes); + return ret; +} + static HRESULT video_renderer_stream_create(struct video_renderer *renderer, unsigned int id, struct video_stream **ret) { struct video_stream *stream; + IMFAttributes *attributes; + unsigned int value; HRESULT hr; if (!(stream = heap_alloc_zero(sizeof(*stream)))) @@ -968,6 +984,16 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns IMFMediaSink_AddRef(&stream->parent->IMFMediaSink_iface); stream->id = id; + if (video_renderer_is_mixer_d3d_aware(renderer)) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_D3D_AWARE, 1); + + if (SUCCEEDED(IMFTransform_GetInputStreamAttributes(renderer->mixer, id, &attributes))) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &value))) + IMFAttributes_SetUINT32(stream->attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, value); + IMFAttributes_Release(attributes); + } + *ret = stream; return S_OK; @@ -1491,7 +1517,6 @@ static HRESULT video_renderer_create_presenter(struct video_renderer *renderer, static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) { IMFTopologyServiceLookupClient *lookup_client; - IMFAttributes *attributes; HRESULT hr; if (SUCCEEDED(hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFTopologyServiceLookupClient, @@ -1537,21 +1562,16 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) } /* Set device manager that presenter should have created. */ - if (SUCCEEDED(IMFTransform_QueryInterface(renderer->mixer, &IID_IMFAttributes, (void **)&attributes))) + if (video_renderer_is_mixer_d3d_aware(renderer)) { IDirect3DDeviceManager9 *device_manager; - unsigned int value; - if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value)) && value) + if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IDirect3DDeviceManager9, (void **)&device_manager))) { - if (SUCCEEDED(MFGetService((IUnknown *)renderer->presenter, &MR_VIDEO_ACCELERATION_SERVICE, - &IID_IDirect3DDeviceManager9, (void **)&device_manager))) - { - IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); - IDirect3DDeviceManager9_Release(device_manager); - } + IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)device_manager); + IDirect3DDeviceManager9_Release(device_manager); } - IMFAttributes_Release(attributes); } return hr; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index aabdc51e577..78a3d75e0a7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3341,7 +3341,6 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine { ok(count == 2, "Unexpected count %u.\n", count); value = 0; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_REQUIRED_SAMPLE_COUNT, &value); @@ -3351,7 +3350,7 @@ todo_wine { hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(value == 1, "Unexpected attribute value %u.\n", value); -} + hr = IMFAttributes_QueryInterface(attributes, &IID_IMFStreamSink, (void **)&unk); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk);

1 0

Nikolay Sivov : evr/tests: Relax allocator initialization test.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 1deea8e1fe4e5e4b6073298d394b24e2bbfd6dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=1deea8e1fe4e5e4b6073298d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:29 2020 +0300 evr/tests: Relax allocator initialization test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 18822e1e4fa..bebffada509 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1384,10 +1384,10 @@ static void test_MFCreateVideoSampleAllocator(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - /* It expects IMFVideoMediaType. */ + /* It expects IMFVideoMediaType aka video major type. Exact return code is E_NOINTERFACE, + likely coming from querying for IMFVideoMediaType. Does not seem valuable to match it. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 2, media_type); -todo_wine - ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); video_type = create_video_type(&MFVideoFormat_RGB32);

1 0

Nikolay Sivov : mf/evr: Add support for per-stream attributes.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: a76a90e7d2b2aafd3cbff2d64a7e1c90b8f5ec60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a76a90e7d2b2aafd3cbff2d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:48:28 2020 +0300 mf/evr: Add support for per-stream attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mf/tests/mf.c | 32 ++++- 2 files changed, 386 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a76a90e7d2b2aafd3cbf…

1 0

Nikolay Sivov : mfplat: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 04106fa7872fc40ce28d634c8dd5dc5c832173f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04106fa7872fc40ce28d634c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:47:49 2020 +0300 mfplat: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 44f29522487..6394784593e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -624,21 +624,8 @@ HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) return create_transform_activate(NULL, activate); } -static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s',0}; -static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s','\\', - 'C','a','t','e','g','o','r','i','e','s',0}; -static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; -static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; -static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; -static const WCHAR mftflagsW[] = {'M','F','T','F','l','a','g','s',0}; -static const WCHAR szGUIDFmt[] = -{ - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', - '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', - 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 -}; +static const WCHAR transform_keyW[] = L"MediaFoundation\\Transforms"; +static const WCHAR categories_keyW[] = L"MediaFoundation\\Transforms\\Categories"; static const BYTE guid_conv_table[256] = { @@ -653,10 +640,10 @@ static const BYTE guid_conv_table[256] = static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) { - swprintf(str, 39, szGUIDFmt, guid->Data1, guid->Data2, - guid->Data3, guid->Data4[0], guid->Data4[1], - guid->Data4[2], guid->Data4[3], guid->Data4[4], - guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); return str; } @@ -733,7 +720,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { - static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; @@ -742,7 +728,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT8 *blob; GUIDToString(buffer, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, transform_keyW, buffer); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) hr = HRESULT_FROM_WIN32(ret); @@ -757,14 +743,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + if ((ret = RegSetValueExW(hclsid, L"InputTypes", 0, REG_BINARY, (BYTE *)input_types, size))) hr = HRESULT_FROM_WIN32(ret); } if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + if ((ret = RegSetValueExW(hclsid, L"OutputTypes", 0, REG_BINARY, (BYTE *)output_types, size))) hr = HRESULT_FROM_WIN32(ret); } @@ -776,7 +762,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 { if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) { - if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + if ((ret = RegSetValueExW(hclsid, L"Attributes", 0, REG_BINARY, blob, size))) hr = HRESULT_FROM_WIN32(ret); } heap_free(blob); @@ -788,7 +774,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && flags) { - if ((ret = RegSetValueExW(hclsid, mftflagsW, 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) + if ((ret = RegSetValueExW(hclsid, L"MFTFlags", 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) hr = HRESULT_FROM_WIN32(ret); } @@ -798,7 +784,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 static HRESULT register_category(CLSID *clsid, GUID *category) { - static const WCHAR reg_format[] = {'%','s','\\','%','s','\\','%','s',0}; HKEY htmp1; WCHAR guid1[64], guid2[64]; WCHAR str[350]; @@ -806,7 +791,7 @@ static HRESULT register_category(CLSID *clsid, GUID *category) GUIDToString(guid1, category); GUIDToString(guid2, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, categories_keyW, guid1, guid2); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s\\%s", categories_keyW, guid1, guid2); if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &htmp1)) return E_FAIL; @@ -1157,13 +1142,13 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (!GUIDFromString(clsidW, &mft.clsid)) goto next; - mft_get_reg_flags(clsidW, mftflagsW, &mft.flags); + mft_get_reg_flags(clsidW, L"MFTFlags", &mft.flags); if (output_type) - mft_get_reg_type_info(clsidW, outputtypesW, &mft.output_types, &mft.output_types_count); + mft_get_reg_type_info(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); if (input_type) - mft_get_reg_type_info(clsidW, inputtypesW, &mft.input_types, &mft.input_types_count); + mft_get_reg_type_info(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { @@ -6139,7 +6124,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSchemeHandler **handler) { - static const WCHAR fileschemeW[] = {'f','i','l','e',':',0}; + static const WCHAR fileschemeW[] = L"file:"; const WCHAR *ptr = url; unsigned int len; WCHAR *scheme;

1 0

Nikolay Sivov : xmllite/writer: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: f8182ac19ce1f8ded2ae37b6e5da9491fb18369b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8182ac19ce1f8ded2ae37b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:42 2020 +0300 xmllite/writer: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 130 +++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8182ac19ce1f8ded2ae…

1 0

Nikolay Sivov : xmllite/reader: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 6b5bf48c51214c23c6f73bf30cf651c69f313a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5bf48c51214c23c6f73bf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:41 2020 +0300 xmllite/reader: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 138 +++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5bf48c51214c23c6f7…

1 0

Michael Stefaniuc : dxdiagn: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: ea298a4c0967045a0a6db3c3feaaf7b5fe88adba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea298a4c0967045a0a6db3c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:41 2020 +0100 dxdiagn: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 604 +++++++++++++++++------------------------------- 1 file changed, 208 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea298a4c0967045a0a6d…

1 0

Michael Stefaniuc : dpnet: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: ffa8f64889be4c84be2ea85e68703b2bc0af0aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa8f64889be4c84be2ea85e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:40 2020 +0100 dpnet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 9 +++------ dlls/dpnet/tests/address.c | 21 ++++++++++----------- dlls/dpnet/tests/client.c | 16 ++++++++-------- dlls/dpnet/tests/server.c | 22 +++++++--------------- dlls/dpnet/tests/thread.c | 5 ++--- 5 files changed, 30 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffa8f64889be4c84be2e…

1 0

Michael Stefaniuc : winmm/tests: Use a string literal instead of a char array.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: da0b1336550978a9ba5e0999ed5723e75380acd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0b1336550978a9ba5e0999… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:39 2020 +0100 winmm/tests: Use a string literal instead of a char array. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index f6e126d29d1..73668c21031 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -553,7 +553,7 @@ static void test_openclose(HWND hwnd) MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; MCIERROR err; - char drive[] = {'a',':','\\','X','\0'}; + char drive[] = "a:\\X"; if (ok_open == MCIERR_CANNOT_LOAD_DRIVER) { /* todo_wine Every open below should yield this same error. */ skip("CD-ROM device likely not installed or disabled.\n");

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
86
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 November 2020