November 2020 - Wine-commits

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 : 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: 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

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

Sven Baars : d3dx9: Fully initialize the glyph position.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 2481e617bbd529a297266ad53b1afe1d96e9af89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2481e617bbd529a297266ad5… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:30 2020 +0100 d3dx9: Fully initialize the glyph position. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49376 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/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 4b909406df1..235ae11072b 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -726,7 +726,6 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len, i; GCP_RESULTSW results; - D3DXVECTOR3 pos; string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); @@ -756,6 +755,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, for (i = 0; i < results.nGlyphs; ++i) { IDirect3DTexture9 *texture; + D3DXVECTOR3 pos; POINT cell_inc; RECT black_box; @@ -766,6 +766,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.x = cell_inc.x + x + results.lpCaretPos[i]; pos.y = cell_inc.y + y; + pos.z = 0; ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture);

1 0

Sven Baars : d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 84cbf6a49dfe75b9fd497b2c3ef7e922857bb618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84cbf6a49dfe75b9fd497b2c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:31 2020 +0100 d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49546 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/font.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 235ae11072b..f5775384da3 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -583,7 +583,6 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, } else if (format & DT_SINGLELINE) { - *dest_len = num_fit; *count = 0; } } @@ -768,6 +767,21 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, pos.y = cell_inc.y + y; pos.z = 0; + if (!(format & DT_NOCLIP)) + { + if (pos.x > rect->right) + { + IDirect3DTexture9_Release(texture); + continue; + } + + if (pos.x + black_box.right - black_box.left > rect->right) + black_box.right = black_box.left + rect->right - pos.x; + + if (pos.y + black_box.bottom - black_box.top > rect->bottom) + black_box.bottom = black_box.top + rect->bottom - pos.y; + } + ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color); IDirect3DTexture9_Release(texture); }

1 0

Sven Baars : d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: a097f54ea1e7e75b78842ceb835f5db5f08fea06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a097f54ea1e7e75b78842ceb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Nov 17 15:33:32 2020 +0100 d3dx9: Remove unreachable DT_SINGLELINE handling from ID3DXFont_DrawText. 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/font.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index f5775384da3..13cffe4c514 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -512,7 +512,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, } static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, - unsigned int chars_fit, unsigned int *chars_used, DWORD format, SIZE *size) + unsigned int chars_fit, unsigned int *chars_used, SIZE *size) { SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; @@ -535,7 +535,7 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, --i; /* If the there is no word that fits put in all characters that do fit */ - if (!sla[i].fSoftBreak || (format & DT_SINGLELINE)) + if (!sla[i].fSoftBreak) i = chars_fit; *chars_used = i; @@ -571,20 +571,13 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count, num_fit = 0; GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, size); - if (num_fit < *dest_len) + if (num_fit < *dest_len && (format & DT_WORDBREAK)) { - if (format & DT_WORDBREAK) - { - unsigned int chars_used; + unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, format, size); - *count = orig_count - chars_used; - i = chars_used; - } - else if (format & DT_SINGLELINE) - { - *count = 0; - } + word_break(hdc, dest, dest_len, num_fit, &chars_used, size); + *count = orig_count - chars_used; + i = chars_used; } if (*count && str[i] == '\n')

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 6ffc3ecbd8ce9fe10d7f57183ecd2440d812cc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ffc3ecbd8ce9fe10d7f5718… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Nov 18 13:22:08 2020 +0100 d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 54cb4df3b7b..f9bd40a72cb 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -626,6 +626,43 @@ static ID3D10Device *create_device(void) return NULL; } +static HMODULE create_resource_module(const WCHAR *filename, const void *data, unsigned int size) +{ + WCHAR resource_module_path[MAX_PATH], current_module_path[MAX_PATH]; + HANDLE resource; + HMODULE module; + BOOL ret; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(resource_module_path, temp_dir); + lstrcatW(resource_module_path, filename); + + GetModuleFileNameW(NULL, current_module_path, ARRAY_SIZE(current_module_path)); + ret = CopyFileW(current_module_path, resource_module_path, FALSE); + ok(ret, "CopyFileW failed, error %u.\n", GetLastError()); + SetFileAttributesW(resource_module_path, FILE_ATTRIBUTE_NORMAL); + + resource = BeginUpdateResourceW(resource_module_path, TRUE); + UpdateResourceW(resource, (LPCWSTR)RT_RCDATA, filename, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), (void *)data, size); + EndUpdateResourceW(resource, FALSE); + + module = LoadLibraryExW(resource_module_path, NULL, LOAD_LIBRARY_AS_DATAFILE); + + return module; +} + +static void delete_resource_module(const WCHAR *filename, HMODULE module) +{ + WCHAR path[MAX_PATH]; + + FreeLibrary(module); + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsigned int line) { ok_(__FILE__, line)(image_info->Width == test_image[i].expected.Width, @@ -1364,8 +1401,10 @@ static void test_D3DX10CreateAsyncResourceLoader(void) static void test_get_image_info(void) { + static const WCHAR test_resource_name[] = L"resource.data"; static const WCHAR test_filename[] = L"image.data"; D3DX10_IMAGE_INFO image_info; + HMODULE resource_module; WCHAR path[MAX_PATH]; unsigned int i; DWORD dword; @@ -1418,6 +1457,40 @@ static void test_get_image_info(void) delete_file(test_filename); } + + /* D3DX10GetImageInfoFromResource tests */ + + todo_wine + { + hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + + hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + delete_resource_module(test_resource_name, resource_module); + } + CoUninitialize(); }

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 43aa33714ee081a8dcb6b489753a977d32b3fb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=43aa33714ee081a8dcb6b489… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 16 10:05:16 2020 +0800 d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++--- dlls/d3dx10_43/texture.c | 66 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index f9bd40a72cb..5d7ffcfde3f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1460,8 +1460,6 @@ static void test_get_image_info(void) /* D3DX10GetImageInfoFromResource tests */ - todo_wine - { hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); @@ -1470,20 +1468,19 @@ static void test_get_image_info(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 23d7b93e649..ea9b5120c47 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -148,6 +148,22 @@ done: return hr; } +static HRESULT load_resource(HMODULE module, HRSRC res_info, void **buffer, DWORD *size) +{ + HGLOBAL resource; + + if (!(*size = SizeofResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(resource = LoadResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(*buffer = LockResource(resource))) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -201,19 +217,61 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + HRSRC res_info; + void *buffer; + HRESULT hr; + DWORD size; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_a(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceA(module, resource, (const char *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + unsigned int size; + HRSRC res_info; + void *buffer; + HRESULT hr; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,

1 0

Alexandre Julliard : msvcrt: Use the msvcrt math functions internally.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 1be5e83859229d0e8a6c4fb3913865beea00a085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be5e83859229d0e8a6c4fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:01:52 2020 +0100 msvcrt: Use the msvcrt math functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 78 +++++++++++++++++++++++++--------------------------- dlls/msvcrt/msvcrt.h | 7 +++++ dlls/msvcrt/printf.h | 6 ++-- dlls/msvcrt/string.c | 2 +- 4 files changed, 48 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be5e83859229d0e8a6c…

1 0