July 2023 - Wine-commits - list.winehq.org

Francois Gouget : user32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: d569196e95944686162c4cbd4c71e5cd2260d436 URL: https://gitlab.winehq.org/wine/wine/-/commit/d569196e95944686162c4cbd4c71e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:31:29 2023 +0200 user32/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/user32/tests/monitor.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b7f7b44b15..429a55eb277 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2065,19 +2065,21 @@ static void test_DisplayConfigSetDeviceInfo(void) HKEY key; LONG ret; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } + ret = FALSE; CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) CHECK_FUNC(GetDpiForMonitorInternal) CHECK_FUNC(SetThreadDpiAwarenessContext) + if (ret) return; #undef CHECK_FUNC

1 0

Francois Gouget : uxtheme/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 858811a9f5b24a3bbf0bcc841ebf2a3d2a19cb84 URL: https://gitlab.winehq.org/wine/wine/-/commit/858811a9f5b24a3bbf0bcc841ebf2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:31:42 2023 +0200 uxtheme/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/uxtheme/tests/system.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f8253c6a983..2e769625dab 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -173,17 +173,18 @@ static BOOL set_primary_monitor_effective_dpi(unsigned int primary_dpi) BOOL ret = FALSE; LONG error; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return FALSE; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) + if (ret) return FALSE; #undef CHECK_FUNC

1 0

Francois Gouget : msvcrt/tests: Check that some functions are only available in 32-bit code.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: fc37683985168c952a3dc6fba3280d2845977168 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc37683985168c952a3dc6fba3280d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:17:24 2023 +0200 msvcrt/tests: Check that some functions are only available in 32-bit code. --- dlls/msvcrt/tests/environ.c | 20 ++++++-------------- dlls/msvcrt/tests/time.c | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 3d6b55dffa8..22f697a12ea 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -95,14 +95,10 @@ static void test__environ(void) return; } - /* Examine the returned pointer from __p__environ(), if available. */ - if (p__p__environ) - { - ok( *p__p__environ() == *p_environ, - "Expected _environ pointers to be identical\n" ); - } + if (sizeof(void*) != sizeof(int)) + ok( !p__p__environ, "__p__environ() should be 32-bit only\n"); else - skip( "__p__environ() is not available\n" ); + ok( *p__p__environ() == *p_environ, "Expected _environ pointers to be identical\n" ); if (p_get_environ) { @@ -158,14 +154,10 @@ static void test__wenviron(void) return; } - /* Examine the returned pointer from __p__wenviron(), if available. */ - if (p__p__wenviron) - { - ok( *p__p__wenviron() == NULL, - "Expected _wenviron pointers to be NULL\n" ); - } + if (sizeof(void*) != sizeof(int)) + ok( !p__p__wenviron, "__p__wenviron() should be 32-bit only\n"); else - skip( "__p__wenviron() is not available\n" ); + ok( *p__p__wenviron() == NULL, "Expected _wenviron pointers to be NULL\n" ); if (p_get_wenviron) { diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index d4e0ac40239..4ed17c940a9 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -590,15 +590,15 @@ static void test_daylight(void) return; } - if (!p___p__daylight) + /* Examine the returned pointer from __p__environ(), if available. */ + if (sizeof(void*) != sizeof(int)) + ok( !p___p__daylight, "___p__daylight() should be 32-bit only\n"); + else { - skip("__p__daylight not available\n"); - return; + ret1 = p__daylight(); + ret2 = p___p__daylight(); + ok(ret1 && ret1 == ret2, "got %p\n", ret1); } - - ret1 = p__daylight(); - ret2 = p___p__daylight(); - ok(ret1 && ret1 == ret2, "got %p\n", ret1); } static void test_strftime(void) @@ -907,8 +907,11 @@ static void test__tzset(void) char TZ_env[256]; int ret; - if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { - skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + if (sizeof(void*) != sizeof(int)) + { + ok(!p___p__daylight, "___p__daylight() should be 32-bit only\n"); + ok(!p___p__timezone, "___p__timezone() should be 32-bit only\n"); + ok(!p___p__dstbias, "___p__dstbias() should be 32-bit only\n"); return; }

1 0

Francois Gouget : riched20/tests: Make the editor paste test failures more informative and unique.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: b8950d04e439f649f2167477a36ee453ad8b81ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b8950d04e439f649f2167477a36ee4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 19 10:55:21 2023 +0200 riched20/tests: Make the editor paste test failures more informative and unique. Knowing the content of the edit field is more useful than knowing the strcmp() result. The text field may contain carriage returns and linefeeds so use wine_dbgstr_a() so they are clearly visible in the failure message. Also prefix the ok messages with a unique string to indicate which test_WM_PASTE() test failed. --- dlls/riched20/tests/editor.c | 61 ++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9682a4ad99f..f8abb7a3e65 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5606,16 +5606,12 @@ static void test_WM_PASTE(void) send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Pasted text should be visible at this step */ - result = strcmp(text1_step1, buffer); - ok(result == 0, - "test paste: strcmp = %i, text='%s'\n", result, buffer); + ok(strcmp(text1_step1, buffer) == 0, "1:Ctrl-V %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ - result = strcmp(text1_after, buffer); - ok(result == 0, - "test paste: strcmp = %i, text='%s'\n", result, buffer); + ok(strcmp(text1_after, buffer) == 0, "1:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 8, 13); @@ -5624,21 +5620,15 @@ static void test_WM_PASTE(void) send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Pasted text should be visible at this step */ - result = strcmp(text3, buffer); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(text3, buffer) == 0, "2:Ctrl-V %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ - result = strcmp(text2_after, buffer); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(text2_after, buffer) == 0, "2:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Y'); /* Redo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should revert to post-paste state */ - result = strcmp(buffer,text3); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(buffer,text3) == 0, "2:Ctrl-Y %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); /* Send WM_CHAR to simulate Ctrl-V */ @@ -5646,9 +5636,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('V', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Shouldn't paste because pasting is handled by WM_KEYDOWN */ - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "3:Ctrl-V %s\n", wine_dbgstr_a(buffer)); /* Send keystrokes with WM_KEYDOWN after setting the modifiers * with SetKeyboard state. */ @@ -5660,9 +5648,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('V', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"paste"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "paste") == 0, "VK:Ctrl-V %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); SendMessageA(hwndRichEdit, EM_SETSEL, 0, 7); @@ -5674,9 +5660,7 @@ static void test_WM_PASTE(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"testing"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "testing") == 0, "VK:Ctrl-C %s\n", wine_dbgstr_a(buffer)); /* Cut with WM_KEYDOWN to simulate Ctrl-X */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"cut"); @@ -5689,30 +5673,22 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('X', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "VK:Ctrl-A,X %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "cut\r\n") == 0, "VK:paste %s\n", wine_dbgstr_a(buffer)); /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_KEYDOWN, 'Z', (MapVirtualKeyA('Z', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "VK:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); /* Simulates redo (Ctrl-Y) */ SendMessageA(hwndRichEdit, WM_KEYDOWN, 'Y', (MapVirtualKeyA('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "cut\r\n") == 0, "VK:Ctrl-Y %s\n", wine_dbgstr_a(buffer)); release_key(VK_CONTROL); /* Copy multiline text to clipboard for future use */ @@ -5723,19 +5699,16 @@ static void test_WM_PASTE(void) /* Paste into read-only control */ result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); + ok(result, "ro:set failed\n"); SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, text3); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, text3) == 0, "ro:paste %s\n", wine_dbgstr_a(buffer)); /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, text3); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, text3) == 0, "ro:cut %s\n", wine_dbgstr_a(buffer)); /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ OleFlushClipboard(); @@ -5745,9 +5718,7 @@ static void test_WM_PASTE(void) hwndRichEdit = new_richedit_with_style(NULL, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, "testing paste"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "testing paste") == 0, "multi:paste %s\n", wine_dbgstr_a(buffer)); DestroyWindow(hwndRichEdit); }

1 0

Gabriel Ivăncescu : mshtml: Grab the binding while aborting it.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 8713e2ad6497e6eba63a4dd7136d47a80a430815 URL: https://gitlab.winehq.org/wine/wine/-/commit/8713e2ad6497e6eba63a4dd7136d47… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jul 18 20:44:07 2023 +0300 mshtml: Grab the binding while aborting it. Holding the BindStatusCallback ref is not enough; Abort can end up calling OnStopBinding which intentionally removes the binding and releases its ref. urlmon's Abort will then have a use-after-free when accessing the state to set BINDING_ABORTED, if it was destroyed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4706167875e..112b63ba4b1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1993,10 +1993,16 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_AddRef(&iter->IBindStatusCallback_iface); - if(iter->binding) - IBinding_Abort(iter->binding); - else + if(iter->binding) { + IBinding *binding = iter->binding; + + /* Abort can end up calling our OnStopBinding, which releases the binding. */ + IBinding_AddRef(binding); + IBinding_Abort(binding); + IBinding_Release(binding); + }else { iter->vtbl->stop_binding(iter, E_ABORT); + } iter->window = NULL; list_remove(&iter->entry);

1 0

Alexandre Julliard : comctl32/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 297a7349ec6f449e8664c654f02d5004ee1e6c7e URL: https://gitlab.winehq.org/wine/wine/-/commit/297a7349ec6f449e8664c654f02d50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:16:25 2023 +0200 comctl32/tests: Use nameless unions/structs. --- dlls/comctl32/tests/propsheet.c | 88 ++++++++++++++++++------------------ dlls/comctl32/tests/treeview.c | 98 ++++++++++++++++++++--------------------- 2 files changed, 93 insertions(+), 93 deletions(-)

1 0

Alexandre Julliard : comdlg32/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 786dc0808bc6fa446461180e91d0f0aac6c40765 URL: https://gitlab.winehq.org/wine/wine/-/commit/786dc0808bc6fa446461180e91d0f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:16:51 2023 +0200 comdlg32/tests: Use nameless unions/structs. --- dlls/comdlg32/tests/printdlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 6bef12bcb05..ad8ddf0a7f7 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -248,8 +248,8 @@ static void test_PrintDlgA(void) ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); /* some broken drivers use always PD_USEDEVMODECOPIES */ - ok((S1(U1(*dm)).dmCopies == 1) || broken(S1(U1(*dm)).dmCopies == 123), - "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); + ok((dm->dmCopies == 1) || broken(dm->dmCopies == 123), + "expected dm->dmCopies 1, got %d\n", dm->dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); @@ -263,7 +263,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(S1(U1(*dm)).dmCopies == 123, "expected dm->dmCopies 123, got %d\n", S1(U1(*dm)).dmCopies); + ok(dm->dmCopies == 123, "expected dm->dmCopies 123, got %d\n", dm->dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Alexandre Julliard : compstui/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: a0b9b4ee2a7cd5254c3a0d5a3094b8acebfb3e1f URL: https://gitlab.winehq.org/wine/wine/-/commit/a0b9b4ee2a7cd5254c3a0d5a3094b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:17:20 2023 +0200 compstui/tests: Use nameless unions/structs. --- dlls/compstui/tests/compstui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/compstui/tests/compstui.c b/dlls/compstui/tests/compstui.c index 2634875db63..74d7e34e39e 100644 --- a/dlls/compstui/tests/compstui.c +++ b/dlls/compstui/tests/compstui.c @@ -198,7 +198,7 @@ static LONG WINAPI propsheetui_callback(PROPSHEETUI_INFO *info, LPARAM lparam) memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); - U(psp).pszTemplate = L"prop_page1"; + psp.pszTemplate = L"prop_page1"; psp.pfnDlgProc = prop_page_proc2; ret = info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_PROPSHEETPAGEW, (LPARAM)&psp, 0); ok(ret, "ret = 0\n");

1 0

Alexandre Julliard : crypt32/tests: Use nameless unions/structs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 7bcfc123e660cd127619bd2c6148ba34224c097a URL: https://gitlab.winehq.org/wine/wine/-/commit/7bcfc123e660cd127619bd2c6148ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:18:10 2023 +0200 crypt32/tests: Use nameless unions/structs. --- dlls/crypt32/tests/chain.c | 2 +- dlls/crypt32/tests/encode.c | 230 +++++++++++++++++++++----------------------- dlls/crypt32/tests/msg.c | 78 +++++++-------- dlls/crypt32/tests/oid.c | 10 +- 4 files changed, 153 insertions(+), 167 deletions(-)

1 0

Hans Leidekker : include: Add windows.applicationmodel.idl.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 573e20e9de56597ef20b13f46052b4cc62ff2f9e URL: https://gitlab.winehq.org/wine/wine/-/commit/573e20e9de56597ef20b13f46052b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 19 10:13:07 2023 +0200 include: Add windows.applicationmodel.idl. --- include/Makefile.in | 1 + include/windows.applicationmodel.idl | 116 +++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 94b5e77e849..53d4d0fe3fb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -809,6 +809,7 @@ SOURCES = \ windef.h \ windns.h \ windot11.h \ + windows.applicationmodel.idl \ windows.devices.bluetooth.idl \ windows.devices.enumeration.idl \ windows.devices.geolocation.idl \ diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl new file mode 100644 index 00000000000..cea2c9423d8 --- /dev/null +++ b/include/windows.applicationmodel.idl @@ -0,0 +1,116 @@ +/* + * Copyright 2023 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.foundation.idl"; +import "windows.storage.idl"; +import "windows.system.idl"; + +namespace Windows.ApplicationModel { + typedef struct PackageVersion PackageVersion; + + interface IPackage; + interface IPackageId; + interface IPackageIdWithMetadata; + interface IPackageStatics; + + runtimeclass Package; + runtimeclass PackageId; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.ApplicationModel.Package *>; + interface Windows.Foundation.Collections.IIterator<Windows.ApplicationModel.Package *>; + interface Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct PackageVersion + { + UINT16 Major; + UINT16 Minor; + UINT16 Build; + UINT16 Revision; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.Package), + uuid(163c792f-bd75-413c-bf23-b1fe7b95d825) + ] + interface IPackage : IInspectable + { + [propget] HRESULT Id([out, retval] Windows.ApplicationModel.PackageId **value); + [propget] HRESULT InstalledLocation([out, retval] Windows.Storage.StorageFolder **value); + [propget] HRESULT IsFramework([out, retval] boolean *value); + [propget] HRESULT Dependencies([out, retval] Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *> **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.PackageId), + uuid(1adb665e-37c7-4790-9980-dd7ae74e8bb2) + ] + interface IPackageId : IInspectable + { + [propget] HRESULT Name([out, retval] HSTRING *value); + [propget] HRESULT Version([out, retval] Windows.ApplicationModel.PackageVersion *value); + [propget] HRESULT Architecture([out, retval] Windows.System.ProcessorArchitecture *value); + [propget] HRESULT ResourceId([out, retval] HSTRING *value); + [propget] HRESULT Publisher([out, retval] HSTRING *value); + [propget] HRESULT PublisherId([out, retval] HSTRING *value); + [propget] HRESULT FullName([out, retval] HSTRING *value); + [propget] HRESULT FamilyName([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.PackageId), + uuid(40577a7c-0c9e-443d-9074-855f5ce0a08d) + ] + interface IPackageIdWithMetadata : IInspectable + { + [propget] HRESULT ProductId([out, retval] HSTRING *value); + [propget] HRESULT Author([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.ApplicationModel.IPackageStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Package + { + [default] interface Windows.ApplicationModel.IPackage; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass PackageId + { + [default] interface Windows.ApplicationModel.IPackageId; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.ApplicationModel.IPackageIdWithMetadata; + } +}

1 0