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

Francois Gouget : user32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard July 19, 2023

July 19, 2023

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 July 19, 2023

July 19, 2023

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

Alexandre Julliard : dmsynth/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: 6fe186468c317c1ee8d62519ce6d266ad3bdd1d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fe186468c317c1ee8d62519ce6d26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:20:19 2023 +0200 dmsynth/tests: Use nameless unions/structs. --- dlls/dmsynth/tests/dmsynth.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index a8bf65cd73e..f21e543705a 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -108,30 +108,30 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %#lx\n", hr); - S(U(property)).Id = 0; - S(U(property)).Flags = KSPROPERTY_TYPE_GET; + property.Id = 0; + property.Flags = KSPROPERTY_TYPE_GET; - S(U(property)).Set = GUID_DMUS_PROP_INSTRUMENT2; + property.Set = GUID_DMUS_PROP_INSTRUMENT2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == TRUE, "Return value: %lu, should be 1\n", value); - S(U(property)).Set = GUID_DMUS_PROP_DLS2; + property.Set = GUID_DMUS_PROP_DLS2; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == TRUE, "Return value: %lu, should be 1\n", value); - S(U(property)).Set = GUID_DMUS_PROP_GM_Hardware; + property.Set = GUID_DMUS_PROP_GM_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == FALSE, "Return value: %lu, should be 0\n", value); - S(U(property)).Set = GUID_DMUS_PROP_GS_Hardware; + property.Set = GUID_DMUS_PROP_GS_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); ok(value == FALSE, "Return value: %lu, should be 0\n", value); - S(U(property)).Set = GUID_DMUS_PROP_XG_Hardware; + property.Set = GUID_DMUS_PROP_XG_Hardware; hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes); @@ -140,7 +140,7 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %#lx\n", hr); - S(U(property)).Set = GUID_DMUS_PROP_SinkUsesDSound; + property.Set = GUID_DMUS_PROP_SinkUsesDSound; hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes); ok(hr == S_OK, "IKsControl_KsProperty returned: %#lx\n", hr); ok(bytes == sizeof(DWORD), "Returned bytes: %lu, should be 4\n", bytes);

1 0

Alexandre Julliard : devenum/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: af2bda32bb9293cd40812da63006d9b248087c6e URL: https://gitlab.winehq.org/wine/wine/-/commit/af2bda32bb9293cd40812da63006d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:20:04 2023 +0200 devenum/tests: Use nameless unions/structs. --- dlls/devenum/tests/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index b3ef3da0356..52a96c122b8 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -269,7 +269,7 @@ static void test_register_filter(void) rgf2.dwVersion = 2; rgf2.dwMerit = MERIT_UNLIKELY; - S2(U(rgf2)).cPins2 = 0; + rgf2.cPins2 = 0; hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, NULL, NULL, &rgf2);

1 0

Alexandre Julliard : cryptui/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: master Commit: d98b09183c2ee7d5cffd69a08ec8c7faf4e9c5f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d98b09183c2ee7d5cffd69a08ec8c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 19 12:18:26 2023 +0200 cryptui/tests: Use nameless unions/structs. --- dlls/cryptui/tests/cryptui.c | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 111115a16ce..8a4706de358 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -19,7 +19,6 @@ */ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION #include <windef.h> #include <winbase.h> #include <winerror.h> @@ -307,9 +306,9 @@ static BOOL find_and_delete_cert_in_store(HCERTSTORE store, PCCERT_CONTEXT cert) PCCERT_CONTEXT found; id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; - memcpy(&id.u.IssuerSerialNumber.Issuer, + memcpy(&id.IssuerSerialNumber.Issuer, &cert->pCertInfo->Issuer, sizeof(CERT_NAME_BLOB)); - memcpy(&id.u.IssuerSerialNumber.SerialNumber, + memcpy(&id.IssuerSerialNumber.SerialNumber, &cert->pCertInfo->SerialNumber, sizeof(CRYPT_INTEGER_BLOB)); found = CertFindCertificateInStore(store, X509_ASN_ENCODING, 0, CERT_FIND_CERT_ID, &id, NULL); @@ -371,28 +370,28 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); /* Check allowed vs. given type mismatches */ - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CRL, 0, NULL, &info, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CRL_CONTEXT; - info.u.pCRLContext = CertCreateCRLContext(X509_ASN_ENCODING, + info.pCRLContext = CertCreateCRLContext(X509_ASN_ENCODING, signedCRL, sizeof(signedCRL)); SetLastError(0xdeadbeef); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_ALLOW_CERT, 0, NULL, &info, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); - CertFreeCRLContext(info.u.pCRLContext); + CertFreeCRLContext(info.pCRLContext); /* Imports the following cert--self-signed, with no basic constraints set-- * to the CA store. Puts up a dialog at the end if it succeeds or fails. */ info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT; - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -403,19 +402,19 @@ static void test_crypt_ui_wiz_import(void) if (ca) { - ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); + ret = find_and_delete_cert_in_store(ca, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find v1CertWithValidPubKey in CA store\n"); CertCloseStore(ca, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); /* Imports the following cert--not self-signed, with a basic constraints2 * extensions--to the "AddressBook" store. Puts up a dialog at the end if * it succeeds or fails. */ - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert3, sizeof(iTunesCert3)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -427,7 +426,7 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { ret = find_and_delete_cert_in_store(addressBook, - info.u.pCertContext); + info.pCertContext); ok(ret || broken(!ret), /* Windows 2000 and earlier */ "expected to find iTunesCert3 in AddressBook store\n"); @@ -460,14 +459,14 @@ static void test_crypt_ui_wiz_import(void) ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI | CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); - ret = find_and_delete_cert_in_store(store, info.u.pCertContext); + ret = find_and_delete_cert_in_store(store, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find iTunesCert3 in memory store\n"); - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); CertCloseStore(store, 0); - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert1, sizeof(iTunesCert1)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -479,16 +478,16 @@ static void test_crypt_ui_wiz_import(void) if (addressBook) { ret = find_and_delete_cert_in_store(addressBook, - info.u.pCertContext); + info.pCertContext); ok(ret || broken(!ret), /* Windows 2000 and earlier */ "expected to find iTunesCert1 in AddressBook store\n"); CertCloseStore(addressBook, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); - info.u.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, + info.pCertContext = CertCreateCertificateContext(X509_ASN_ENCODING, iTunesCert2, sizeof(iTunesCert2)); ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL); ok(ret, "CryptUIWizImport failed: %08lx\n", GetLastError()); @@ -499,21 +498,21 @@ static void test_crypt_ui_wiz_import(void) if (ca) { - ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); + ret = find_and_delete_cert_in_store(ca, info.pCertContext); ok(ret || broken(!ret) /* Win9x/NT4 */, "expected to find iTunesCert2 in CA store\n"); CertCloseStore(ca, 0); } } - CertFreeCertificateContext(info.u.pCertContext); + CertFreeCertificateContext(info.pCertContext); - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCertificateToStore(info.u.hCertStore, X509_ASN_ENCODING, + CertAddEncodedCertificateToStore(info.hCertStore, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); - CertAddEncodedCRLToStore(info.u.hCertStore, X509_ASN_ENCODING, signedCRL, + CertAddEncodedCRLToStore(info.hCertStore, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); info.dwSubjectChoice = CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_STORE; /* The ALLOW flags aren't allowed with a store as the source if the source @@ -557,14 +556,14 @@ static void test_crypt_ui_wiz_import(void) ok(count == 1, "expected 1 CRL, got %ld\n", count); } CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); /* If the ALLOW flags match the content of the store, the store can be * imported. */ - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCertificateToStore(info.u.hCertStore, X509_ASN_ENCODING, + CertAddEncodedCertificateToStore(info.hCertStore, X509_ASN_ENCODING, v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey), CERT_STORE_ADD_ALWAYS, NULL); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -598,14 +597,14 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); /* Again, if the ALLOW flags match the content of the store, the store can * be imported. */ - info.u.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + info.hCertStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - CertAddEncodedCRLToStore(info.u.hCertStore, X509_ASN_ENCODING, signedCRL, + CertAddEncodedCRLToStore(info.hCertStore, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -638,7 +637,7 @@ static void test_crypt_ui_wiz_import(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08lx\n", GetLastError()); CertCloseStore(store, 0); - CertCloseStore(info.u.hCertStore, 0); + CertCloseStore(info.hCertStore, 0); UnhookWindowsHookEx(hook); }

1 0

Alexandre Julliard : crypt32/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

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

Alexandre Julliard : compstui/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

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 : comdlg32/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

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 : comctl32/tests: Use nameless unions/structs.
by Alexandre Julliard July 19, 2023

July 19, 2023

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

Hans Leidekker : include: Add windows.applicationmodel.idl.
by Alexandre Julliard July 19, 2023

July 19, 2023

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