August 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Partially implement MFInitMediaTypeFromVideoInfoHeader().
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 1e2f552428e18b72ceaac8d57d695bc9d4ccc39c URL: https://gitlab.winehq.org/wine/wine/-/commit/1e2f552428e18b72ceaac8d57d695b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 25 20:08:27 2022 +0300 mfplat: Partially implement MFInitMediaTypeFromVideoInfoHeader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 6 ------ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index d8f7fbea504..84f6ef4f81d 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -24,6 +24,7 @@ #include "initguid.h" #include "ks.h" #include "ksmedia.h" +#include "amvideo.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -2957,6 +2958,12 @@ static void mediatype_set_uint32(IMFMediaType *mediatype, const GUID *attr, unsi *hr = IMFMediaType_SetUINT32(mediatype, attr, value); } +static void mediatype_set_uint64(IMFMediaType *mediatype, const GUID *attr, unsigned int high, unsigned int low, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetUINT64(mediatype, attr, (UINT64)high << 32 | low); +} + static void mediatype_set_guid(IMFMediaType *mediatype, const GUID *attr, const GUID *value, HRESULT *hr) { if (SUCCEEDED(*hr)) @@ -3558,6 +3565,16 @@ HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD h return S_OK; } +static HRESULT mf_get_stride_for_bitmap_info_header(DWORD fourcc, const BITMAPINFOHEADER *bih, LONG *stride) +{ + HRESULT hr; + + if (FAILED(hr = MFGetStrideForBitmapInfoHeader(fourcc, bih->biWidth, stride))) return hr; + if (bih->biHeight < 0) *stride *= -1; + + return hr; +} + /*********************************************************************** * MFCreateVideoMediaTypeFromVideoInfoHeader (mfplat.@) */ @@ -3577,9 +3594,37 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromVideoInfoHeader(const KS_VIDEOINFOHEADE HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, const VIDEOINFOHEADER *vih, UINT32 size, const GUID *subtype) { + HRESULT hr = S_OK; + DWORD height; + LONG stride; + FIXME("%p, %p, %u, %s.\n", media_type, vih, size, debugstr_guid(subtype)); - return E_NOTIMPL; + IMFMediaType_DeleteAllItems(media_type); + + if (!subtype) + { + FIXME("Implicit subtype is not supported.\n"); + return E_NOTIMPL; + } + + height = abs(vih->bmiHeader.biHeight); + + mediatype_set_guid(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video, &hr); + mediatype_set_guid(media_type, &MF_MT_SUBTYPE, subtype, &hr); + mediatype_set_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, 1, 1, &hr); + mediatype_set_uint32(media_type, &MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, &hr); + mediatype_set_uint64(media_type, &MF_MT_FRAME_SIZE, vih->bmiHeader.biWidth, height, &hr); + + if (SUCCEEDED(mf_get_stride_for_bitmap_info_header(subtype->Data1, &vih->bmiHeader, &stride))) + { + mediatype_set_uint32(media_type, &MF_MT_DEFAULT_STRIDE, stride, &hr); + mediatype_set_uint32(media_type, &MF_MT_SAMPLE_SIZE, abs(stride) * height, &hr); + mediatype_set_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1, &hr); + mediatype_set_uint32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); + } + + return hr; } /*********************************************************************** diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 39cd6706551..44f3f9036cc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8263,13 +8263,7 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) vih.bmiHeader.biBitCount = 32; hr = MFInitMediaTypeFromVideoInfoHeader(media_type, &vih, sizeof(vih), &GUID_NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (FAILED(hr)) - { - IMFMediaType_Release(media_type); - return; - } hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : mfplat: Partially implement MFInitMediaTypeFromAMMediaType().
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: wine Branch: master Commit: 4690a7df51d2b34eceff75665563539b8212a0bd URL: https://gitlab.winehq.org/wine/wine/-/commit/4690a7df51d2b34eceff7566556353… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 26 06:58:23 2022 +0300 mfplat: Partially implement MFInitMediaTypeFromAMMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- dlls/mfplat/tests/mfplat.c | 6 ----- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 84f6ef4f81d..c1c8d0048c3 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -21,6 +21,7 @@ #include "mfplat_private.h" #include "dxva2api.h" +#include "uuids.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" @@ -3575,6 +3576,19 @@ static HRESULT mf_get_stride_for_bitmap_info_header(DWORD fourcc, const BITMAPIN return hr; } +static const GUID * get_mf_subtype_for_am_subtype(const GUID *subtype) +{ + static const GUID null; + + if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32)) + return &MFVideoFormat_RGB32; + else + { + FIXME("Unknown subtype %s.\n", debugstr_guid(subtype)); + return &null; + } +} + /*********************************************************************** * MFCreateVideoMediaTypeFromVideoInfoHeader (mfplat.@) */ @@ -3632,7 +3646,54 @@ HRESULT WINAPI MFInitMediaTypeFromVideoInfoHeader(IMFMediaType *media_type, cons */ HRESULT WINAPI MFInitMediaTypeFromAMMediaType(IMFMediaType *media_type, const AM_MEDIA_TYPE *am_type) { - FIXME("%p, %p.\n", media_type, am_type); + HRESULT hr = S_OK; + + TRACE("%p, %p.\n", media_type, am_type); + + IMFMediaType_DeleteAllItems(media_type); + + if (IsEqualGUID(&am_type->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&am_type->formattype, &FORMAT_VideoInfo)) + { + const VIDEOINFOHEADER *vih = (const VIDEOINFOHEADER *)am_type->pbFormat; + const GUID *subtype; + DWORD height; + LONG stride; + + subtype = get_mf_subtype_for_am_subtype(&am_type->subtype); + height = abs(vih->bmiHeader.biHeight); + + mediatype_set_guid(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video, &hr); + mediatype_set_guid(media_type, &MF_MT_SUBTYPE, subtype, &hr); + mediatype_set_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, 1, 1, &hr); + mediatype_set_uint32(media_type, &MF_MT_INTERLACE_MODE, MFVideoInterlace_Progressive, &hr); + mediatype_set_uint64(media_type, &MF_MT_FRAME_SIZE, vih->bmiHeader.biWidth, height, &hr); + mediatype_set_uint32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); + + if (SUCCEEDED(mf_get_stride_for_bitmap_info_header(subtype->Data1, &vih->bmiHeader, &stride))) + { + mediatype_set_uint32(media_type, &MF_MT_DEFAULT_STRIDE, stride, &hr); + mediatype_set_uint32(media_type, &MF_MT_SAMPLE_SIZE, abs(stride) * height, &hr); + mediatype_set_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1, &hr); + } + else + { + if (am_type->bFixedSizeSamples) + mediatype_set_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, 1, &hr); + if (am_type->lSampleSize) + mediatype_set_uint32(media_type, &MF_MT_SAMPLE_SIZE, am_type->lSampleSize, &hr); + } + + return hr; + } + else + { + FIXME("Unsupported format type %s.\n", debugstr_guid(&am_type->formattype)); + } + } + else + FIXME("Unsupported major type %s.\n", debugstr_guid(&am_type->majortype)); return E_NOTIMPL; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 44f3f9036cc..83d2aacf843 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8375,13 +8375,7 @@ static void test_MFInitMediaTypeFromAMMediaType(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = MFInitMediaTypeFromAMMediaType(media_type, &mt); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (FAILED(hr)) - { - IMFMediaType_Release(media_type); - return; - } hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &guid); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Floris Renaud : obs-sync: Change Signed-By path.
by Alexandre Julliard 28 Aug '22

28 Aug '22

Module: tools Branch: master Commit: a04dba287be44fd00a8ed57cef6c0fdea23ed4a5 URL: https://gitlab.winehq.org/winehq/tools/-/commit/a04dba287be44fd00a8ed57cef6… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Aug 25 16:11:02 2022 +0000 obs-sync: Change Signed-By path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53554 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53356 --- packaging/obs/obs-sync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 4167d1b8..54fff2ae 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -145,7 +145,7 @@ URIs: https://dl.winehq.org/wine-builds/$1 Suites: $2 Components: main Architectures: amd64 i386 -Signed-By: /usr/share/keyrings/winehq-archive.key +Signed-By: /etc/apt/keyrings/winehq-archive.key EOF }

1 0

Gijs Vermeulen : kernel32: Add SetProcessDefaultCpuSets stub.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: a9ed113347eea3ad60f95b4c1fe16a9254192384 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9ed113347eea3ad60f95b4c1fe16a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Aug 25 14:45:13 2022 +0200 kernel32: Add SetProcessDefaultCpuSets stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53589 --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a5fa757da9f..7c5fb8ed74f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1444,6 +1444,7 @@ @ stdcall -import SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) @ stdcall -import SetProcessAffinityUpdateMode(long long) +@ stdcall -import SetProcessDefaultCpuSets(ptr ptr long) @ stdcall SetProcessDEPPolicy(long) @ stdcall -import SetProcessMitigationPolicy(long ptr long) @ stdcall -import SetProcessPreferredUILanguages(long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1296757b29a..feb1fce8f7a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1490,7 +1490,7 @@ @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) @ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) -# @ stub SetProcessDefaultCpuSets +@ stdcall SetProcessDefaultCpuSets(ptr ptr long) @ stdcall SetProcessGroupAffinity(long ptr ptr) # @ stub SetProcessInformation @ stdcall SetProcessMitigationPolicy(long ptr long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 2418c670557..14d8c4817a5 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -1336,6 +1336,17 @@ BOOL WINAPI SetThreadSelectedCpuSets(HANDLE thread, const ULONG *cpu_set_ids, UL } +/*********************************************************************** + * SetProcessDefaultCpuSets (kernelbase.@) + */ +BOOL WINAPI SetProcessDefaultCpuSets(HANDLE process, const ULONG *cpu_set_ids, ULONG count) +{ + FIXME( "process %p, cpu_set_ids %p, count %lu stub.\n", process, cpu_set_ids, count ); + + return TRUE; +} + + /********************************************************************** * GetNumaHighestNodeNumber (kernelbase.@) */

1 0

Brendan Shanks : shell32/tests: Test ExtractIcon() with an empty/invalid path.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 584eb4e80423b3ac0c00dc2936f69dc6717c9590 URL: https://gitlab.winehq.org/wine/wine/-/commit/584eb4e80423b3ac0c00dc2936f69d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 24 15:22:14 2022 -0700 shell32/tests: Test ExtractIcon() with an empty/invalid path. --- dlls/shell32/tests/shelllink.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c8a0308a9cb..13dce3302c7 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1174,6 +1174,7 @@ static void test_ExtractIcon(void) { static const WCHAR nameW[] = {'\\','e','x','t','r','a','c','t','i','c','o','n','_','t','e','s','t','.','t','x','t',0}; static const WCHAR shell32W[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + static const WCHAR emptyW[] = {0}; WCHAR pathW[MAX_PATH]; HICON hicon, hicon2; char path[MAX_PATH]; @@ -1223,6 +1224,14 @@ static void test_ExtractIcon(void) r = DeleteFileA(path); ok(r, "failed to delete file %s (%ld)\n", path, GetLastError()); + /* Empty file path */ + hicon = ExtractIconA(NULL, "", -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconA(NULL, "", 0); + todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + /* same for W variant */ if (0) { @@ -1270,6 +1279,14 @@ if (0) r = DeleteFileW(pathW); ok(r, "failed to delete file %s (%ld)\n", path, GetLastError()); + + /* Empty file path */ + hicon = ExtractIconW(NULL, emptyW, -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconW(NULL, emptyW, 0); + todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); } static void test_ExtractAssociatedIcon(void)

1 0

Brendan Shanks : shell32: Return NULL from ExtractIcon() for all error cases.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 42f9a8ef79aa8d793bd6ec8667dafc2cfa37cba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/42f9a8ef79aa8d793bd6ec8667dafc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Aug 24 15:26:03 2022 -0700 shell32: Return NULL from ExtractIcon() for all error cases. --- dlls/shell32/shell32_main.c | 11 ++++------- dlls/shell32/tests/shelllink.c | 7 ------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 212de7445a4..2aac022f9e4 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -606,16 +606,13 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex ret = PrivateExtractIconsW(lpszFile, 0, cx, cy, NULL, NULL, 0, LR_DEFAULTCOLOR); if (ret != (UINT)-1 && ret) return (HICON)(UINT_PTR)ret; - return NULL; } else + { ret = PrivateExtractIconsW(lpszFile, nIconIndex, cx, cy, &hIcon, NULL, 1, LR_DEFAULTCOLOR); - - if (ret == (UINT)-1) - return (HICON)1; - else if (ret > 0 && hIcon) - return hIcon; - + if (ret > 0 && hIcon) + return hIcon; + } return NULL; } diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 13dce3302c7..345484d9a5d 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1185,7 +1185,6 @@ static void test_ExtractIcon(void) /* specified instance handle */ hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); ok(hicon2 != NULL, "Got icon %p\n", hicon2); @@ -1211,14 +1210,12 @@ static void test_ExtractIcon(void) CloseHandle(file); hicon = ExtractIconA(NULL, path, 0); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, path, 1); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileA(path); @@ -1229,7 +1226,6 @@ static void test_ExtractIcon(void) ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconA(NULL, "", 0); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); /* same for W variant */ @@ -1267,14 +1263,12 @@ if (0) CloseHandle(file); hicon = ExtractIconW(NULL, pathW, 0); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, -1); ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, pathW, 1); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); r = DeleteFileW(pathW); @@ -1285,7 +1279,6 @@ if (0) ok(hicon == NULL, "Got icon %p\n", hicon); hicon = ExtractIconW(NULL, emptyW, 0); - todo_wine ok(hicon == NULL, "Got icon %p\n", hicon); }

1 0

Loïc Rebmeister : wintypes: Add RoResolveNamespace stub.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: ddb0339fa126379b0d6a39a38ce2aee6c52f5711 URL: https://gitlab.winehq.org/wine/wine/-/commit/ddb0339fa126379b0d6a39a38ce2ae… Author: Loïc Rebmeister <fox2code(a)gmail.com> Date: Thu Aug 25 18:08:47 2022 +0200 wintypes: Add RoResolveNamespace stub. Signed-off-by: Loïc Rebmeister <fox2code(a)gmail.com> --- dlls/wintypes/main.c | 15 +++++++++++++++ dlls/wintypes/wintypes.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index 1ca8d94cd67..74eda4af5ce 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -354,3 +354,18 @@ HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **fac IUnknown_AddRef(*factory); return S_OK; } + +HRESULT WINAPI RoResolveNamespace(HSTRING name, HSTRING windowsMetaDataDir, + DWORD packageGraphDirsCount, const HSTRING *packageGraphDirs, + DWORD *metaDataFilePathsCount, HSTRING **metaDataFilePaths, + DWORD *subNamespacesCount, HSTRING **subNamespaces) +{ + FIXME("name %s, windowsMetaDataDir %s, metaDataFilePaths %p, subNamespaces %p stub!\n", + debugstr_hstring(name), debugstr_hstring(windowsMetaDataDir), + metaDataFilePaths, subNamespaces); + + if (!metaDataFilePaths && !subNamespaces) + return E_INVALIDARG; + + return RO_E_METADATA_NAME_NOT_FOUND; +} diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec index 7c3a8d402a7..305344fef42 100644 --- a/dlls/wintypes/wintypes.spec +++ b/dlls/wintypes/wintypes.spec @@ -8,4 +8,4 @@ @ stub RoIsApiContractMajorVersionPresent @ stub RoIsApiContractPresent @ stub RoParseTypeName -@ stub RoResolveNamespace +@ stdcall RoResolveNamespace(ptr ptr long ptr ptr ptr ptr ptr)

1 0

André Zwing : wow64: Fix the ARM32 machine type.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 9eaeebf0393927cfc54124054fc8653993a1712c URL: https://gitlab.winehq.org/wine/wine/-/commit/9eaeebf0393927cfc54124054fc865… Author: André Zwing <nerv(a)dawncrow.de> Date: Thu Aug 25 20:03:16 2022 +0200 wow64: Fix the ARM32 machine type. --- dlls/wow64/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8cb5f92c245..0f9e64fd53b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -552,7 +552,7 @@ static const WCHAR *get_cpu_dll_name(void) { case IMAGE_FILE_MACHINE_I386: return (native_machine == IMAGE_FILE_MACHINE_ARM64 ? L"xtajit.dll" : L"wow64cpu.dll"); - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: return L"wowarmhw.dll"; default: ERR( "unsupported machine %04x\n", current_machine );

1 0

Jacek Caban : user32: Support resource ID strings in CREATESTRUCT Unicode conversion.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: f28824eb58fed990f177bb4a9796f779154fea8f URL: https://gitlab.winehq.org/wine/wine/-/commit/f28824eb58fed990f177bb4a9796f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 15:37:39 2022 +0200 user32: Support resource ID strings in CREATESTRUCT Unicode conversion. --- dlls/user32/hook.c | 38 +++++++++++++++++++++++++++++++------- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 20 ++++++++++++++++---- dlls/user32/winproc.c | 17 +++++++++++++++-- 4 files changed, 109 insertions(+), 13 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 4201e2375ae..4a905eb8e5e 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -222,6 +222,7 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L CREATESTRUCTW csW; LPWSTR nameW = NULL; LPWSTR classW = NULL; + WCHAR name_buf[3]; cbtcwW.lpcs = &csW; cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; @@ -229,8 +230,18 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszName)) { - RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); - csW.lpszName = nameW = usBuffer.Buffer; + if (cbtcwA->lpcs->lpszName[0] != '\xff') + { + RtlCreateUnicodeStringFromAsciiz( &usBuffer, cbtcwA->lpcs->lpszName ); + csW.lpszName = nameW = usBuffer.Buffer; + } + else + { + name_buf[0] = 0xffff; + name_buf[1] = MAKEWORD( cbtcwA->lpcs->lpszName[1], cbtcwA->lpcs->lpszName[2] ); + name_buf[2] = 0; + csW.lpszName = name_buf; + } } if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszClass)) { @@ -263,16 +274,29 @@ static LRESULT call_hook_WtoA( HOOKPROC proc, INT id, INT code, WPARAM wparam, L int len; LPSTR nameA = NULL; LPSTR classA = NULL; + char name_buf[4]; cbtcwA.lpcs = &csA; cbtcwA.hwndInsertAfter = cbtcwW->hwndInsertAfter; csA = *(CREATESTRUCTA *)cbtcwW->lpcs; - if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszName)) { - len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, NULL, 0, NULL, NULL ); - nameA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); - WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, nameA, len, NULL, NULL ); - csA.lpszName = nameA; + if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszName)) + { + if (cbtcwW->lpcs->lpszName[0] != 0xffff) + { + len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, NULL, 0, NULL, NULL ); + nameA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); + WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, nameA, len, NULL, NULL ); + csA.lpszName = nameA; + } + else + { + name_buf[0] = '\xff'; + name_buf[1] = cbtcwW->lpcs->lpszName[1]; + name_buf[2] = cbtcwW->lpcs->lpszName[1] >> 8; + name_buf[3] = 0; + csA.lpszName = name_buf; + } } if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszClass)) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d43c1ad1aa..9c77bdc7c09 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18990,6 +18990,52 @@ static void test_button_style(void) } } +static LRESULT WINAPI test_create_name_procW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + switch (msg) + { + case WM_NCCREATE: + case WM_CREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + memcpy( cs->lpCreateParams, cs->lpszName, 3 * sizeof(WCHAR) ); + break; + } + case WM_SETTEXT: + trace("%s\n", debugstr_w((const WCHAR *)lparam)); + break; + } + + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} + +static void test_create_name(void) +{ + WNDCLASSW clsW = { 0 }; + WCHAR name_buf[3]; + HWND hwnd; + + clsW.lpfnWndProc = test_create_name_procW; + clsW.lpszClassName = L"TestCreateNameClassW"; + RegisterClassW( &clsW ); + + hwnd = CreateWindowExW( 0, L"TestCreateNameClassW", L"\xffff\x6162", + WS_POPUP, 0,0,0,0,0,0,0, name_buf ); + ok( hwnd != NULL, "CreateWindowEx failed: %lu\n", GetLastError() ); + ok(!memcmp(name_buf, L"\xffff\x6162", 2 * sizeof(WCHAR)), + "name param = %s\n", debugstr_wn(name_buf, 2)); + DestroyWindow( hwnd ); + + hwnd = CreateWindowExA( 0, "TestCreateNameClassW", "\xff\0\x61\x60", + WS_POPUP, 0,0,0,0,0,0,0, name_buf ); + ok( hwnd != NULL, "CreateWindowEx failed: %lu\n", GetLastError() ); + ok(!memcmp(name_buf, L"\xffff\x6100", 2 * sizeof(WCHAR)), + "name param = %s\n", debugstr_wn(name_buf, 2)); + DestroyWindow( hwnd ); + + UnregisterClassW( L"TestCreateNameClassW", NULL ); +} + START_TEST(msg) { char **test_argv; @@ -19105,6 +19151,7 @@ START_TEST(msg) test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); + test_create_name(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9507486754b..7d873155c3b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -304,6 +304,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, HWND hwnd, top_child = 0; MDICREATESTRUCTW mdi_cs; WNDCLASSEXW info; + WCHAR name_buf[8]; HMENU menu; if (!get_class_info( module, className, &info, &class, FALSE )) return FALSE; @@ -398,10 +399,21 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - if (unicode || !cs->lpszName) - RtlInitUnicodeString( &window_name, cs->lpszName ); - else if (!RtlCreateUnicodeStringFromAsciiz( &window_name, (const char *)cs->lpszName )) - return 0; + if (!unicode && cs->lpszName) + { + const char *nameA = (const char *)cs->lpszName; + /* resource ID string is a special case */ + if (nameA[0] == '\xff') + { + name_buf[0] = 0xffff; + name_buf[1] = MAKEWORD( nameA[1], nameA[2] ); + name_buf[2] = 0; + RtlInitUnicodeString( &window_name, name_buf ); + } + else if (!RtlCreateUnicodeStringFromAsciiz( &window_name, (const char *)cs->lpszName )) + return 0; + } + else RtlInitUnicodeString( &window_name, cs->lpszName ); menu = cs->hMenu; if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7e2be5b1be0..deae1a061f8 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -475,6 +475,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; MDICREATESTRUCTA mdi_cs; DWORD name_lenA = 0, name_lenW = 0, class_lenA = 0, class_lenW = 0; + char int_name_buf[4]; if (!IS_INTRESOURCE(csW->lpszClass)) { @@ -483,8 +484,20 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN } if (!IS_INTRESOURCE(csW->lpszName)) { - name_lenW = (lstrlenW(csW->lpszName) + 1) * sizeof(WCHAR); - RtlUnicodeToMultiByteSize(&name_lenA, csW->lpszName, name_lenW); + /* resource ID string is a special case */ + if (csW->lpszName[0] == 0xffff) + { + int_name_buf[0] = 0xff; + int_name_buf[1] = csW->lpszName[1]; + int_name_buf[2] = csW->lpszName[1] >> 8; + int_name_buf[3] = 0; + csA.lpszName = int_name_buf; + } + else + { + name_lenW = (lstrlenW(csW->lpszName) + 1) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize(&name_lenA, csW->lpszName, name_lenW); + } } if (!(cls = get_buffer( buffer, sizeof(buffer), class_lenA + name_lenA ))) break;

1 0

Jacek Caban : user32: Support passing bitmap and icon resource ID as a string when creating static control.
by Alexandre Julliard 25 Aug '22

25 Aug '22

Module: wine Branch: master Commit: 2e9c40d50acbbbb915488fdc70e70c4cc1d205bb URL: https://gitlab.winehq.org/wine/wine/-/commit/2e9c40d50acbbbb915488fdc70e70c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 22 13:45:10 2022 +0200 user32: Support passing bitmap and icon resource ID as a string when creating static control. --- dlls/user32/static.c | 38 ++++++++++++++++++++++++++++++++------ dlls/user32/tests/static.c | 18 ++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index a88203f5716..f5cef12b12a 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -418,22 +418,48 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam switch (style) { case SS_ICON: { + const WCHAR *name = cs->lpszName; HICON hIcon; - if (unicode || IS_INTRESOURCE(cs->lpszName)) - hIcon = STATIC_LoadIconW(cs->hInstance, cs->lpszName, full_style); + + if (!unicode) + { + const char *nameA = (const char *)name; + if (nameA && nameA[0] == '\xff') + name = MAKEINTRESOURCEW(MAKEWORD(nameA[1], nameA[2])); + } + else if (name && name[0] == 0xffff) + { + name = MAKEINTRESOURCEW(name[1]); + } + + if (unicode || IS_INTRESOURCE(name)) + hIcon = STATIC_LoadIconW(cs->hInstance, name, full_style); else - hIcon = STATIC_LoadIconA(cs->hInstance, (LPCSTR)cs->lpszName, full_style); + hIcon = STATIC_LoadIconA(cs->hInstance, (const char *)name, full_style); STATIC_SetIcon(hwnd, hIcon, full_style); } break; case SS_BITMAP: if ((ULONG_PTR)cs->hInstance >> 16) { + const WCHAR *name = cs->lpszName; HBITMAP hBitmap; - if (unicode || IS_INTRESOURCE(cs->lpszName)) - hBitmap = LoadBitmapW(cs->hInstance, cs->lpszName); + + if (!unicode) + { + const char *nameA = (const char *)name; + if (nameA && nameA[0] == '\xff') + name = MAKEINTRESOURCEW(MAKEWORD(nameA[1], nameA[2])); + } + else if (name && name[0] == 0xffff) + { + name = MAKEINTRESOURCEW(name[1]); + } + + if (unicode || IS_INTRESOURCE(name)) + hBitmap = LoadBitmapW(cs->hInstance, name); else - hBitmap = LoadBitmapA(cs->hInstance, (LPCSTR)cs->lpszName); + hBitmap = LoadBitmapA(cs->hInstance, (const char *)name); STATIC_SetBitmap(hwnd, hBitmap, full_style); } break; diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 09e399990cd..a02cb249d49 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -197,6 +197,24 @@ static void test_set_image(void) DestroyWindow(hwnd); DeleteObject(image); + + hwnd = CreateWindowW(L"static", L"\uffff\x65", WS_VISIBLE|WS_CHILD|SS_BITMAP, 5, 5, 100, 100, + hMainWnd, (HMENU)CTRL_ID, GetModuleHandleW(NULL), 0); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp != NULL, "got NULL\n"); + test_image(bmp); + + DestroyWindow(hwnd); + + hwnd = CreateWindowA("static", "\xff\x65\0", WS_VISIBLE|WS_CHILD|SS_BITMAP, 5, 5, 100, 100, + hMainWnd, (HMENU)CTRL_ID, GetModuleHandleW(NULL), 0); + + bmp = (HBITMAP)SendMessageW(hwnd, STM_GETIMAGE, IMAGE_BITMAP, 0); + ok(bmp != NULL, "got NULL\n"); + test_image(bmp); + + DestroyWindow(hwnd); } static void test_STM_SETIMAGE(void)

1 0