March 2022 - Wine-Commits - list.winehq.org

Nikolay Sivov : scrobj/tests: Use CRT memory allocation functions.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: a406123812b53af016e9e37f139830932bf46719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a406123812b53af016e9e37f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 08:55:49 2022 +0300 scrobj/tests: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/tests/scrobj.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 108b30e7bea..64b07832227 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -27,7 +27,6 @@ #include <mshtmhst.h> #include "wine/test.h" -#include "wine/heap.h" static HRESULT (WINAPI *pDllInstall)(BOOL, const WCHAR *); @@ -715,7 +714,7 @@ static WCHAR *get_test_file(const char *res_name) ok(res, "CloseHandle failed: %lu\n", GetLastError()); size = (wcslen(buffer) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); + ret = malloc(size); memcpy(ret, buffer, size); return ret; } @@ -1078,7 +1077,7 @@ START_TEST(scrobj) register_script_object(FALSE, test_file); register_script_engine(FALSE); - heap_free(test_file); + free(test_file); } else skip("Could not register script engine\n");

1 0

Nikolay Sivov : scrobj: Use CRT allocation functions.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 1a9922734a2cd70af84ec39bc4c85fd1bbcff630 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9922734a2cd70af84ec39b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 08:55:47 2022 +0300 scrobj: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 92 ++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a9922734a2cd70af84e…

1 0

Alexandre Julliard : kernelbase: Reimplement values computed from currency formats in GetLocaleInfoW/Ex.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: c957158730906cbbf5c2c27593914c6e3499d189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c957158730906cbbf5c2c275… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:11:55 2022 +0200 kernelbase: Reimplement values computed from currency formats in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 669e1b14290..3efadb51f6e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1042,6 +1042,9 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ WCHAR *buffer, int len ) { static const WCHAR spermille[] = { 0x2030, 0 }; /* this one seems hardcoded */ + static const BYTE ipossignposn[] = { 3, 3, 4, 2, 1, 1, 3, 4, 1, 3, 4, 2, 4, 3, 3, 1 }; + static const BYTE inegsignposn[] = { 0, 3, 4, 2, 0, 1, 3, 4, 1, 3, 4, 2, 4, 3, 0, 0 }; + static const BYTE inegsymprecedes[] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, }; const WCHAR *sort; UINT val; @@ -1234,22 +1237,40 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_string( locale->snegativesign, type, buffer, len ); case LOCALE_IPOSSIGNPOSN: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_INEGCURR | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( ipossignposn[val], type, buffer, len ); case LOCALE_INEGSIGNPOSN: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_INEGCURR | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( inegsignposn[val], type, buffer, len ); case LOCALE_IPOSSYMPRECEDES: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_ICURRENCY | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( !(val & 1), type, buffer, len ); case LOCALE_IPOSSEPBYSPACE: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_ICURRENCY | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( !!(val & 2), type, buffer, len ); case LOCALE_INEGSYMPRECEDES: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_INEGCURR | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( inegsymprecedes[val], type, buffer, len ); case LOCALE_INEGSEPBYSPACE: - return -1; + if (!get_locale_info( locale, lcid, + LOCALE_INEGCURR | LOCALE_RETURN_NUMBER | (type & LOCALE_NOUSEROVERRIDE), + (WCHAR *)&val, sizeof(val)/sizeof(WCHAR) )) break; + return locale_return_number( (val >= 8), type, buffer, len ); case LOCALE_FONTSIGNATURE: return locale_return_data( locale_strings + locale->fontsignature + 1,

1 0

Nikolay Sivov : fusion: Use CRT memory allocation functions.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: d3fe9faff0ebe8e9ff53c513442f2e47b0ffd6b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3fe9faff0ebe8e9ff53c513… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 09:47:46 2022 +0300 fusion: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmcache.c | 44 ++++++++++++++++++++++---------------------- dlls/fusion/asmenum.c | 14 +++++++------- dlls/fusion/asmname.c | 46 ++++++++++++++++++++++------------------------ dlls/fusion/assembly.c | 26 +++++++++++++------------- dlls/fusion/fusionpriv.h | 14 -------------- 5 files changed, 64 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3fe9faff0ebe8e9ff53…

1 0

Rémi Bernon : mf/tests: Increase the H264 decoder tests video frame size.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 7735b4800685f94ed2eaaecd4461fcffaf19dfe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7735b4800685f94ed2eaaecd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 29 11:55:28 2022 +0200 mf/tests: Increase the H264 decoder tests video frame size. GStreamer vaapi decoder suffers from bugs which are causing double frees when the frame size is too small. Test file has been generated with: gst-launch-1.0 videotestsrc num-buffers=60 ! \ video/x-raw,format=I420,width=82,height=84,framerate=30000/1001 ! \ videoconvert ! x264enc ! filesink location=dlls/mf/tests/h264data.bin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/h264data.bin | Bin 49137 -> 52276 bytes dlls/mf/tests/mf.c | 53 ++++++++++++++++++++++---------------------- dlls/mf/tests/nv12frame.bin | Bin 9600 -> 13824 bytes 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/mf/tests/h264data.bin b/dlls/mf/tests/h264data.bin index d014052ca49..d06aa5fb5f2 100644 Binary files a/dlls/mf/tests/h264data.bin and b/dlls/mf/tests/h264data.bin differ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b2d2880bea6..48eeeeffde2 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6541,17 +6541,18 @@ static void test_h264_decoder(void) ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), {0}, }; - static const MFVideoArea actual_aperture = {.Area={78, 74}}; - static const media_type_desc actual_outputs[] = + static const MFVideoArea actual_aperture = {.Area={82,84}}; + static const DWORD actual_width = 96, actual_height = 96; + const media_type_desc actual_outputs[] = { { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6563,9 +6564,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6577,9 +6578,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6591,9 +6592,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 3 / 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6605,9 +6606,9 @@ static void test_h264_decoder(void) ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), - ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80, .todo_value = TRUE), - ATTR_UINT32(MF_MT_SAMPLE_SIZE, 12800, .todo_value = TRUE), - ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 160, .todo_value = TRUE), + ATTR_RATIO(MF_MT_FRAME_SIZE, actual_width, actual_height, .todo_value = TRUE), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, actual_width * actual_height * 2, .todo_value = TRUE), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, actual_width * 2, .todo_value = TRUE), /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), @@ -6870,7 +6871,7 @@ static void test_h264_decoder(void) todo_wine ok(i == 2, "got %lu iterations\n", i); todo_wine - ok(h264_encoded_data_len == 44959, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); + ok(h264_encoded_data_len == 48194, "got h264_encoded_data_len %lu\n", h264_encoded_data_len); todo_wine ok(hr == MF_E_TRANSFORM_STREAM_CHANGE, "ProcessOutput returned %#lx\n", hr); ok(output.dwStreamID == 0, "got dwStreamID %lu\n", output.dwStreamID); @@ -6892,7 +6893,7 @@ static void test_h264_decoder(void) ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); ok(output_info.dwFlags == flags, "got dwFlags %#lx\n", output_info.dwFlags); todo_wine - ok(output_info.cbSize == 0x3200, "got cbSize %#lx\n", output_info.cbSize); + ok(output_info.cbSize == actual_width * actual_height * 2, "got cbSize %#lx\n", output_info.cbSize); ok(output_info.cbAlignment == 0, "got cbAlignment %#lx\n", output_info.cbAlignment); i = -1; @@ -6918,11 +6919,11 @@ static void test_h264_decoder(void) ok(resource != 0, "FindResourceW failed, error %lu\n", GetLastError()); nv12_frame_data = LockResource(LoadResource(GetModuleHandleW(NULL), resource)); nv12_frame_len = SizeofResource(GetModuleHandleW(NULL), resource); - ok(nv12_frame_len == 9600, "got frame length %lu\n", nv12_frame_len); + ok(nv12_frame_len == actual_width * actual_height * 3 / 2, "got frame length %lu\n", nv12_frame_len); status = 0; memset(&output, 0, sizeof(output)); - output.pSample = create_sample(NULL, 0x3200); + output.pSample = create_sample(NULL, actual_width * actual_height * 2); hr = IMFTransform_ProcessOutput(transform, 0, 1, &output, &status); todo_wine ok(hr == S_OK, "ProcessOutput returned %#lx\n", hr); @@ -6943,13 +6944,13 @@ static void test_h264_decoder(void) ok(length == nv12_frame_len, "got length %lu\n", length); if (length == nv12_frame_len) { - for (i = 0; i < 74; ++i) + for (i = 0; i < actual_aperture.Area.cy; ++i) { - memset(data + 80 * i + 78, 0xcd, 2); - memset(data + 80 * (80 + i) + 78, 0xcd, 2); + memset(data + actual_width * i + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); + memset(data + actual_width * (actual_height + i) + actual_aperture.Area.cx, 0xcd, actual_width - actual_aperture.Area.cx); } - memset(data + 80 * 74, 0xcd, 6 * 80); - memset(data + 80 * 117, 0xcd, 3 * 80); + memset(data + actual_width * actual_aperture.Area.cy, 0xcd, (actual_height - actual_aperture.Area.cy) * actual_width); + memset(data + actual_width * (actual_height + actual_aperture.Area.cy / 2), 0xcd, (actual_height - actual_aperture.Area.cy) / 2 * actual_width); } hr = IMFMediaBuffer_Unlock(media_buffer); ok(hr == S_OK, "Unlock returned %#lx\n", hr); diff --git a/dlls/mf/tests/nv12frame.bin b/dlls/mf/tests/nv12frame.bin index 9ceceb8fedb..4267981efd4 100644 Binary files a/dlls/mf/tests/nv12frame.bin and b/dlls/mf/tests/nv12frame.bin differ

1 0

Nikolay Sivov : sxs: Use CRT memory allocation functions.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: a31b107924e91e653b65b02ddf470aa6b1ea0002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31b107924e91e653b65b02d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 09:48:15 2022 +0300 sxs: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 76 +++++++++++++++++++++++++------------------------- dlls/sxs/name.c | 34 +++++++++++----------- dlls/sxs/sxs.c | 6 ++-- dlls/sxs/sxs_private.h | 10 ------- 4 files changed, 58 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a31b107924e91e653b65…

1 0

Zhiyi Zhang : setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: f9d838423d3aa2f5f97af172514ea4493cd1e0cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9d838423d3aa2f5f97af172… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 30 14:57:35 2022 +0800 setupapi: Return CR_SUCCESS for CM_Get_DevNode_Status{_Ex}. One Piece: Pirate Warriors 4 relies on CM_Get_DevNode_Status() to return CR_SUCCESS. Otherwise, it shows a graphics driver error dialog and exits. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/stubs.c | 5 ++--- include/cfgmgr32.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4b1585c8df6..75185de047c 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -455,8 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); - return CR_FAILURE; + return CM_Get_DevNode_Status_Ex(status, problem, dev, flags, NULL); } /*********************************************************************** @@ -466,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST ULONG flags, HMACHINE machine) { FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); - return CR_FAILURE; + return CR_SUCCESS; } /*********************************************************************** diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 7c4f4714126..d300c4babaa 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -234,6 +234,8 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); +CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void);

1 0

Ziqing Hui : include: Add defines for ID2D1TransformedImageSource.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: adb6f4ab70684450a985e2607999c29475cda77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb6f4ab70684450a985e260… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Mar 30 11:57:46 2022 +0800 include: Add defines for ID2D1TransformedImageSource. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 60 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 643212e1a27..d1030d19d9e 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -25,6 +25,34 @@ typedef enum D2D1_INK_NIB_SHAPE D2D1_INK_NIB_SHAPE_FORCE_DWORD = 0xffffffff } D2D1_INK_NIB_SHAPE; +typedef enum D2D1_PATCH_EDGE_MODE +{ + D2D1_PATCH_EDGE_MODE_ALIASED = 0x0, + D2D1_PATCH_EDGE_MODE_ANTIALIASED = 0x1, + D2D1_PATCH_EDGE_MODE_ALIASED_INFLATED = 0x2, + D2D1_PATCH_EDGE_MODE_FORCE_DWORD = 0xffffffff +} D2D1_PATCH_EDGE_MODE; + +typedef enum D2D1_ORIENTATION +{ + D2D1_ORIENTATION_DEFAULT = 0x1, + D2D1_ORIENTATION_FLIP_HORIZONTAL = 0x2, + D2D1_ORIENTATION_ROTATE_CLOCKWISE180 = 0x3, + D2D1_ORIENTATION_ROTATE_CLOCKWISE180_FLIP_HORIZONTAL = 0x4, + D2D1_ORIENTATION_ROTATE_CLOCKWISE90_FLIP_HORIZONTAL = 0x5, + D2D1_ORIENTATION_ROTATE_CLOCKWISE270 = 0x6, + D2D1_ORIENTATION_ROTATE_CLOCKWISE270_FLIP_HORIZONTAL = 0x7, + D2D1_ORIENTATION_ROTATE_CLOCKWISE90 = 0x8, + D2D1_ORIENTATION_FORCE_DWORD = 0xffffffff +} D2D1_ORIENTATION; + +typedef enum D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS +{ + D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_NONE = 0x0, + D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_DISABLE_DPI_SCALE = 0x1, + D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS; + typedef struct D2D1_INK_POINT { float x; @@ -39,14 +67,6 @@ typedef struct D2D1_INK_BEZIER_SEGMENT D2D1_INK_POINT point3; } D2D1_INK_BEZIER_SEGMENT; -typedef enum D2D1_PATCH_EDGE_MODE -{ - D2D1_PATCH_EDGE_MODE_ALIASED = 0x0, - D2D1_PATCH_EDGE_MODE_ANTIALIASED = 0x1, - D2D1_PATCH_EDGE_MODE_ALIASED_INFLATED = 0x2, - D2D1_PATCH_EDGE_MODE_FORCE_DWORD = 0xffffffff -} D2D1_PATCH_EDGE_MODE; - typedef struct D2D1_GRADIENT_MESH_PATCH { D2D1_POINT_2F point00; @@ -75,6 +95,15 @@ typedef struct D2D1_GRADIENT_MESH_PATCH D2D1_PATCH_EDGE_MODE rightEdgeMode; } D2D1_GRADIENT_MESH_PATCH; +typedef struct D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES +{ + D2D1_ORIENTATION orientation; + float scaleX; + float scaleY; + D2D1_INTERPOLATION_MODE interpolationMode; + D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS options; +} D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES; + [ object, uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), @@ -184,3 +213,18 @@ interface ID2D1ImageSourceFromWic : ID2D1ImageSource [out] IWICBitmapSource **source ); }; + +[ + object, + uuid(7f1f79e5-2796-416c-8f55-700f911445e5), + local, +] +interface ID2D1TransformedImageSource : ID2D1Image +{ + void GetSource( + [out] ID2D1ImageSource **source + ); + void GetProperties( + [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out + ); +};

1 0

Alexandre Julliard : kernelbase: Reimplement values computed from date/time formats in GetLocaleInfoW/Ex.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 781086670dedf208a5357872f412741d284c6a9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=781086670dedf208a5357872… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:11:59 2022 +0200 kernelbase: Reimplement values computed from date/time formats in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 88 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 78 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 3efadb51f6e..26308d722ef 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -961,6 +961,27 @@ static int locale_return_strarray_concat( DWORD pos, LCTYPE type, WCHAR *buffer, } +/* find the first format char in a format string */ +static WCHAR *find_format( WCHAR *str, const WCHAR *accept ) +{ + for ( ; *str; str++) + { + if (*str == '\'') + { + if (!(str = wcschr( str + 1, '\'' ))) return NULL; + } + else if (wcschr( accept, *str )) + { + /* ignore "ddd" and "dddd" */ + if (str[0] != 'd' || str[1] != 'd' || str[2] != 'd') return str; + str += 2; + while (str[1] == 'd') str++; + } + } + return NULL; +} + + /* FIXME: hardcoded, sortname is apparently not available in locale.nls */ static const WCHAR *get_locale_sortname( LCID lcid ) { @@ -1046,6 +1067,7 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ static const BYTE inegsignposn[] = { 0, 3, 4, 2, 0, 1, 3, 4, 1, 3, 4, 2, 4, 3, 0, 0 }; static const BYTE inegsymprecedes[] = { 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 1, 0, }; const WCHAR *sort; + WCHAR *str, *end, tmp[80]; UINT val; if (locale != user_locale) type |= LOCALE_NOUSEROVERRIDE; @@ -1140,10 +1162,22 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( locale->inegcurr, type, buffer, len ); case LOCALE_SDATE: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SSHORTDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"dMy" ))) break; + while (str[1] == str[0]) str++; /* skip repeated chars */ + if (!(end = find_format( ++str, L"dMy" ))) break; + *end++ = 0; + return locale_return_data( str, end - str, type, buffer, len ); case LOCALE_STIME: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_STIMEFORMAT | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"Hhms" ))) break; + while (str[1] == str[0]) str++; /* skip repeated chars */ + if (!(end = find_format( ++str, L"Hhms" ))) break; + *end++ = 0; + return locale_return_data( str, end - str, type, buffer, len ); case LOCALE_SSHORTDATE: return locale_return_strarray( locale->sshortdate, 0, type, buffer, len ); @@ -1152,25 +1186,56 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_strarray( locale->slongdate, 0, type, buffer, len ); case LOCALE_IDATE: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SSHORTDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + /* if both year and day are found before month, the last one takes precedence */ + for (val = 0, str = find_format( tmp, L"dMy" ); str; str = find_format( str + 1, L"dMy" )) + { + if (*str == 'M') break; + val = (*str == 'y' ? 2 : 1); + } + return locale_return_number( val, type, buffer, len ); case LOCALE_ILDATE: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SLONGDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + /* if both year and day are found before month, the last one takes precedence */ + for (val = 0, str = find_format( tmp, L"dMy" ); str; str = find_format( str + 1, L"dMy" )) + { + if (*str == 'M') break; + val = (*str == 'y' ? 2 : 1); + } + return locale_return_number( val, type, buffer, len ); case LOCALE_ITIME: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_STIMEFORMAT | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"Hh" ))) break; + return locale_return_number( *str == 'H', type, buffer, len ); case LOCALE_ICENTURY: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SSHORTDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"y" ))) break; + return locale_return_number( !wcsncmp( str, L"yyyy", 4 ), type, buffer, len ); case LOCALE_ITLZERO: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_STIMEFORMAT | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"Hh" ))) break; + return locale_return_number( str[1] == str[0], type, buffer, len ); case LOCALE_IDAYLZERO: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SSHORTDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"d" ))) break; + return locale_return_number( str[1] == 'd', type, buffer, len ); case LOCALE_IMONLZERO: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_SSHORTDATE | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"M" ))) break; + return locale_return_number( str[1] == 'M', type, buffer, len ); case LOCALE_S1159: return locale_return_string( locale->s1159, type, buffer, len ); @@ -1404,7 +1469,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( val, type, buffer, len ); case LOCALE_ITIMEMARKPOSN: - return -1; + if (!get_locale_info( locale, lcid, LOCALE_STIMEFORMAT | (type & LOCALE_NOUSEROVERRIDE), + tmp, ARRAY_SIZE( tmp ))) break; + if (!(str = find_format( tmp, L"Hhmst" ))) break; + return locale_return_number( *str == 't', type, buffer, len ); case LOCALE_SYEARMONTH: return locale_return_strarray( locale->syearmonth, 0, type, buffer, len );

1 0

Alexandre Julliard : kernelbase: Reimplement fetching customized values from the registry in GetLocaleInfoW/Ex.
by Alexandre Julliard March 30, 2022

March 30, 2022

Module: wine Branch: master Commit: 1398a0106491e044bc3d4d173a3317a919d3faee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1398a0106491e044bc3d4d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 22:12:09 2022 +0200 kernelbase: Reimplement fetching customized values from the registry in GetLocaleInfoW/Ex. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 209 ++++++++++++++++++++++++++++------------------- 1 file changed, 124 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1398a0106491e044bc3d…

1 0