November 2016 - Wine-commits

Jacek Caban : vbscript: Call GetItemInfo() with original item name.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: c46dbfb131958849ac5fa5eab5703ad404cd0c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46dbfb131958849ac5fa5eab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 14:08:17 2016 +0100 vbscript: Call GetItemInfo() with original item name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bc34860..02180d9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -183,7 +183,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ if(!item->disp) { IUnknown *unk; - hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); + hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL); if(FAILED(hres)) { WARN("GetItemInfo failed: %08x\n", hres); continue; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5662719..00a0dee 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2126,6 +2126,12 @@ static void run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_af(0, "TEST.reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + SET_EXPECT(global_vbvar_d); SET_EXPECT(global_vbvar_i); parse_script_a("Option Explicit\nvbvar = 3");

1 0

Huw Davies : rsaenh/tests: Don't initialize the environment, the tests that follow do that.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 441fe55a4b19263bab037e3ef6731b05273cba27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441fe55a4b19263bab037e3ef… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 7 12:51:21 2016 +0000 rsaenh/tests: Don't initialize the environment, the tests that follow do that. This also ensures that the permissions tests are actually run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b7616fc..ebdbba8 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -3836,7 +3836,7 @@ START_TEST(rsaenh) if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH"); clean_up_base_environment(); } - if (!init_base_environment(MS_ENHANCED_PROV_A, 0)) + test_key_permissions(); test_key_initialization(); test_schannel_provider();

1 0

Donat Enikeev : crypt32: Import system root certs into volatile registry keys instead of dedicated root store.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: c2b0dfd73d15e51c14960007336d004dccf01444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b0dfd73d15e51c149600073… Author: Donat Enikeev <donat(a)enikeev.net> Date: Mon Nov 7 17:37:29 2016 +0100 crypt32: Import system root certs into volatile registry keys instead of dedicated root store. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 6 +- dlls/crypt32/main.c | 1 - dlls/crypt32/regstore.c | 11 ++-- dlls/crypt32/rootstore.c | 123 ++++++++++++++--------------------------- dlls/crypt32/store.c | 12 +--- 5 files changed, 56 insertions(+), 97 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index ad4a827..8b1b003 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -336,7 +336,11 @@ WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreA(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; WINECRYPT_CERTSTORE *CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) DECLSPEC_HIDDEN; -WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) DECLSPEC_HIDDEN; + +void CRYPT_ImportSystemRootCertsToReg(void) DECLSPEC_HIDDEN; +BOOL CRYPT_SerializeContextsToReg(HKEY key, DWORD flags, const WINE_CONTEXT_INTERFACE *contextInterface, + HCERTSTORE memStore) DECLSPEC_HIDDEN; + BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) DECLSPEC_HIDDEN; /* Allocates and initializes a certificate chain engine, but without creating diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 241a1d9..9ff7592 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -49,7 +49,6 @@ BOOL WINAPI DllMain(HINSTANCE hInst, DWORD fdwReason, PVOID pvReserved) if (pvReserved) break; crypt_oid_free(); crypt_sip_free(); - root_store_free(); default_chain_engine_free(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index b79387f..5a39a26 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -179,7 +179,7 @@ static void CRYPT_RegReadFromReg(HKEY key, HCERTSTORE store) } /* Hash is assumed to be 20 bytes in length (a SHA-1 hash) */ -static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *buf, +static BOOL CRYPT_WriteSerializedToReg(HKEY key, DWORD flags, const BYTE *hash, const BYTE *buf, DWORD len) { WCHAR asciiHash[20 * 2 + 1]; @@ -188,7 +188,7 @@ static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *b BOOL ret; CRYPT_HashToStr(hash, asciiHash); - rc = RegCreateKeyExW(key, asciiHash, 0, NULL, 0, KEY_ALL_ACCESS, NULL, + rc = RegCreateKeyExW(key, asciiHash, 0, NULL, flags, KEY_ALL_ACCESS, NULL, &subKey, NULL); if (!rc) { @@ -205,7 +205,7 @@ static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *b return ret; } -static BOOL CRYPT_SerializeContextsToReg(HKEY key, +BOOL CRYPT_SerializeContextsToReg(HKEY key, DWORD flags, const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE memStore) { const void *context = NULL; @@ -232,7 +232,7 @@ static BOOL CRYPT_SerializeContextsToReg(HKEY key, { ret = contextInterface->serialize(context, 0, buf, &size); if (ret) - ret = CRYPT_WriteSerializedToReg(key, hash, buf, size); + ret = CRYPT_WriteSerializedToReg(key, flags, hash, buf, size); } CryptMemFree(buf); } @@ -287,8 +287,7 @@ static BOOL CRYPT_RegWriteToReg(WINE_REGSTOREINFO *store) } LeaveCriticalSection(&store->cs); } - ret = CRYPT_SerializeContextsToReg(key, interfaces[i], - store->memStore); + ret = CRYPT_SerializeContextsToReg(key, 0, interfaces[i], store->memStore); RegCloseKey(key); } else diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 5cee235..8e1dc2a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -435,53 +435,6 @@ static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, return ret; } -static BOOL WINAPI CRYPT_RootWriteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT cert, DWORD dwFlags) -{ - /* The root store can't have certs added */ - return FALSE; -} - -static BOOL WINAPI CRYPT_RootDeleteCert(HCERTSTORE hCertStore, - PCCERT_CONTEXT cert, DWORD dwFlags) -{ - /* The root store can't have certs deleted */ - return FALSE; -} - -static BOOL WINAPI CRYPT_RootWriteCRL(HCERTSTORE hCertStore, - PCCRL_CONTEXT crl, DWORD dwFlags) -{ - /* The root store can have CRLs added. At worst, a malicious application - * can DoS itself, as the changes aren't persisted in any way. - */ - return TRUE; -} - -static BOOL WINAPI CRYPT_RootDeleteCRL(HCERTSTORE hCertStore, - PCCRL_CONTEXT crl, DWORD dwFlags) -{ - /* The root store can't have CRLs deleted */ - return FALSE; -} - -static void *rootProvFuncs[] = { - NULL, /* CERT_STORE_PROV_CLOSE_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */ - CRYPT_RootWriteCert, - CRYPT_RootDeleteCert, - NULL, /* CERT_STORE_PROV_SET_CERT_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CRL_FUNC */ - CRYPT_RootWriteCRL, - CRYPT_RootDeleteCRL, - NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */ - NULL, /* CERT_STORE_PROV_CONTROL_FUNC */ -}; - static const char * const CRYPT_knownLocations[] = { "/etc/ssl/certs/ca-certificates.crt", "/etc/ssl/certs", @@ -790,55 +743,65 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) static HCERTSTORE create_root_store(void) { - HCERTSTORE root = NULL; HCERTSTORE memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - CERT_STORE_PROV_INFO provInfo = { - sizeof(CERT_STORE_PROV_INFO), - sizeof(rootProvFuncs) / sizeof(rootProvFuncs[0]), - rootProvFuncs, - NULL, - 0, - NULL - }; - read_trusted_roots_from_known_locations(memStore); add_ms_root_certs(memStore); - root = CRYPT_ProvCreateStore(0, memStore, &provInfo); } - TRACE("returning %p\n", root); - return root; + + TRACE("returning %p\n", memStore); + return memStore; } -static WINECRYPT_CERTSTORE *CRYPT_rootStore; +static const WCHAR certs_root_pathW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s','\\', + 'R','o','o','t','\\', 'C','e','r','t','i','f','i','c','a','t','e','s', 0}; +static const WCHAR semaphoreW[] = + {'c','r','y','p','t','3','2','_','r','o','o','t','_','s','e','m','a','p','h','o','r','e',0}; -WINECRYPT_CERTSTORE *CRYPT_RootOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags) +void CRYPT_ImportSystemRootCertsToReg(void) { - TRACE("(%ld, %08x)\n", hCryptProv, dwFlags); + HCERTSTORE store = NULL; + HKEY key; + LONG rc; + HANDLE hsem; + + static BOOL root_certs_imported = FALSE; - if (dwFlags & CERT_STORE_DELETE_FLAG) + if (root_certs_imported) + return; + + hsem = CreateSemaphoreW( NULL, 0, 1, semaphoreW); + if (!hsem) { - WARN("root store can't be deleted\n"); - SetLastError(ERROR_ACCESS_DENIED); - return NULL; + ERR("Failed to create semaphore\n"); + return; } - if (!CRYPT_rootStore) - { - HCERTSTORE root = create_root_store(); - InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root, - NULL); - if (CRYPT_rootStore != root) - CertCloseStore(root, 0); + if(GetLastError() == ERROR_ALREADY_EXISTS) + WaitForSingleObject(hsem, INFINITE); + else + { + if ((store = create_root_store())) + { + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, certs_root_pathW, 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &key, 0); + if (!rc) + { + if (!CRYPT_SerializeContextsToReg(key, REG_OPTION_VOLATILE, pCertInterface, store)) + ERR("Failed to import system certs into registry, %08x\n", GetLastError()); + RegCloseKey(key); + } + CertCloseStore(store, 0); + } else + ERR("Failed to create root store\n"); } - CRYPT_rootStore->vtbl->addref(CRYPT_rootStore); - return CRYPT_rootStore; -} -void root_store_free(void) -{ - CertCloseStore(CRYPT_rootStore, 0); + root_certs_imported = TRUE; + ReleaseSemaphore(hsem, 1, NULL); + CloseHandle(hsem); } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 356712b..19eca22 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -424,21 +424,15 @@ static WINECRYPT_CERTSTORE *CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, SetLastError(E_INVALIDARG); return NULL; } - /* FIXME: In Windows, the root store (even the current user location) is - * protected: adding to it or removing from it present a user interface, - * and the keys are owned by the system process, not the current user. - * Wine's registry doesn't implement access controls, so a similar - * mechanism isn't possible yet. - */ - if ((dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) == - CERT_SYSTEM_STORE_LOCAL_MACHINE && !lstrcmpiW(storeName, rootW)) - return CRYPT_RootOpenStore(hCryptProv, dwFlags); switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) { case CERT_SYSTEM_STORE_LOCAL_MACHINE: root = HKEY_LOCAL_MACHINE; base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH; + /* If the HKLM\Root certs are requested, expressing system certs into the registry */ + if (!lstrcmpiW(storeName, rootW)) + CRYPT_ImportSystemRootCertsToReg(); break; case CERT_SYSTEM_STORE_CURRENT_USER: root = HKEY_CURRENT_USER;

1 0

Donat Enikeev : crypt32/tests: Testing priorities and flags of stores in a collection; and whether certs are saved in registry endpoint.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 30164ea3e8d42a6afa21e40f8886e646562c64ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=30164ea3e8d42a6afa21e40f8… Author: Donat Enikeev <donat(a)enikeev.net> Date: Mon Nov 7 17:37:48 2016 +0100 crypt32/tests: Testing priorities and flags of stores in a collection; and whether certs are saved in registry endpoint. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/Makefile.in | 2 +- dlls/crypt32/tests/store.c | 285 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30164ea3e8d42a6afa21e…

1 0

Andrey Gusev : ext-ms-win-gdi-dc-l1-2-0: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: 579be451a1e18dc079ccfbd44723d15494e4d049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579be451a1e18dc079ccfbd44… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 5 22:41:59 2016 +0200 ext-ms-win-gdi-dc-l1-2-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in | 1 + .../ext-ms-win-gdi-dc-l1-2-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index 8814d56..6685ea8 100755 --- a/configure +++ b/configure @@ -1164,6 +1164,7 @@ enable_esent enable_evr enable_explorerframe enable_ext_ms_win_gdi_dc_create_l1_1_1 +enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 @@ -17929,6 +17930,7 @@ wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 +wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 diff --git a/configure.ac b/configure.ac index 8b7c80a..5f8ad7d 100644 --- a/configure.ac +++ b/configure.ac @@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in b/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in new file mode 100644 index 0000000..84b297f --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-l1-2-0.dll diff --git a/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec b/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec new file mode 100644 index 0000000..80ce933 --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-l1-2-0/ext-ms-win-gdi-dc-l1-2-0.spec @@ -0,0 +1,16 @@ +@ stdcall CreatePalette(ptr) gdi32.CreatePalette +@ stdcall GetClipBox(long ptr) gdi32.GetClipBox +@ stdcall GetCurrentObject(long long) gdi32.GetCurrentObject +@ stdcall GetDCOrgEx(long ptr) gdi32.GetDCOrgEx +@ stdcall GetObjectA(long long ptr) gdi32.GetObjectA +@ stdcall GetObjectType(long) gdi32.GetObjectType +@ stdcall GetObjectW(long long ptr) gdi32.GetObjectW +@ stdcall GetPaletteEntries(long long long ptr) gdi32.GetPaletteEntries +@ stdcall GetStockObject(long) gdi32.GetStockObject +@ stdcall GetSystemPaletteEntries(long long long ptr) gdi32.GetSystemPaletteEntries +@ stdcall RealizePalette(long) gdi32.RealizePalette +@ stdcall RestoreDC(long long) gdi32.RestoreDC +@ stdcall SaveDC(long) gdi32.SaveDC +@ stdcall SelectObject(long long) gdi32.SelectObject +@ stdcall SelectPalette(long long long) gdi32.SelectPalette +@ stdcall SetDCBrushColor(long long) gdi32.SetDCBrushColor diff --git a/tools/make_specfiles b/tools/make_specfiles index cc956e6..c2748d8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -293,6 +293,7 @@ my @dll_groups = [ "gdi32", "ext-ms-win-gdi-dc-create-l1-1-1", + "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", ], [

1 0

Andrey Gusev : ext-ms-win-gdi-draw-l1-1-1: Add dll.
by Alexandre Julliard 07 Nov '16

07 Nov '16

Module: wine Branch: master Commit: bdd427695a467a36e00b7052015416a48fd2c371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd427695a467a36e00b70520… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 5 23:20:01 2016 +0200 ext-ms-win-gdi-draw-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-1.spec | 36 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 6685ea8..38a5e28 100755 --- a/configure +++ b/configure @@ -1166,6 +1166,7 @@ enable_explorerframe enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -17932,6 +17933,7 @@ wine_fn_config_test dlls/explorerframe/tests explorerframe_test wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +wine_fn_config_dll ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 5f8ad7d..a037569 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,6 +3008,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in new file mode 100644 index 0000000..d7f6c5d --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-1.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec b/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec new file mode 100644 index 0000000..f0fdb43 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-1/ext-ms-win-gdi-draw-l1-1-1.spec @@ -0,0 +1,36 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateBitmapIndirect(ptr) gdi32.CreateBitmapIndirect +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreatePatternBrush(long) gdi32.CreatePatternBrush +@ stdcall CreatePen(long long long) gdi32.CreatePen +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall DPtoLP(long ptr long) gdi32.DPtoLP +@ stdcall GdiAlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetBkColor(long) gdi32.GetBkColor +@ stdcall GetBkMode(long) gdi32.GetBkMode +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetPixel(long long long) gdi32.GetPixel +@ stdcall GetViewportOrgEx(long ptr) gdi32.GetViewportOrgEx +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall OffsetViewportOrgEx(long long long ptr) gdi32.OffsetViewportOrgEx +@ stdcall PatBlt(long long long long long long) gdi32.PatBlt +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall Polyline(long ptr long) gdi32.Polyline +@ stdcall Rectangle(long long long long long) gdi32.Rectangle +@ stdcall SetBkColor(long long) gdi32.SetBkColor +@ stdcall SetBkMode(long long) gdi32.SetBkMode +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetStretchBltMode(long long) gdi32.SetStretchBltMode +@ stdcall SetWindowExtEx(long long long ptr) gdi32.SetWindowExtEx +@ stdcall SetWindowOrgEx(long long long ptr) gdi32.SetWindowOrgEx +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index c2748d8..ac4f651 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -295,6 +295,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", + "ext-ms-win-gdi-draw-l1-1-1", ], [ "combase",

1 0

Hans Leidekker : msi: Properly remove the product code from the ugrade codes key.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: d17d54e16d5c3e6a33015bc6675e6554e70902c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17d54e16d5c3e6a33015bc66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:28:11 2016 +0100 msi: Properly remove the product code from the ugrade codes key. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 47 +++++++++++++++++++++++++++++++++++-------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 12 +++++++++++ dlls/msi/tests/install.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 751462b..4d7e8b9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5285,9 +5285,46 @@ static UINT msi_unpublish_icons( MSIPACKAGE *package ) return ERROR_SUCCESS; } +static void remove_product_upgrade_code( MSIPACKAGE *package ) +{ + WCHAR *code, product[SQUASHED_GUID_SIZE]; + HKEY hkey; + LONG res; + DWORD count; + + squash_guid( package->ProductCode, product ); + if (!(code = msi_dup_property( package->db, szUpgradeCode ))) + { + WARN( "upgrade code not found\n" ); + return; + } + if (!MSIREG_OpenUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUpgradeCodesKey( code ); + } + if (!MSIREG_OpenUserUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteUserUpgradeCodesKey( code ); + } + if (!MSIREG_OpenClassesUpgradeCodesKey( code, &hkey, FALSE )) + { + RegDeleteValueW( hkey, product ); + res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, NULL, NULL, &count, NULL, NULL, NULL, NULL, NULL ); + RegCloseKey( hkey ); + if (!res && !count) MSIREG_DeleteClassesUpgradeCodesKey( code ); + } + + msi_free( code ); +} + static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) { - WCHAR *upgrade; MSIPATCHINFO *patch; MSIREG_DeleteProductKey(package->ProductCode); @@ -5299,13 +5336,7 @@ static UINT ACTION_UnpublishProduct(MSIPACKAGE *package) MSIREG_DeleteUserProductKey(package->ProductCode); MSIREG_DeleteUserFeaturesKey(package->ProductCode); - upgrade = msi_dup_property(package->db, szUpgradeCode); - if (upgrade) - { - MSIREG_DeleteUserUpgradeCodesKey(upgrade); - MSIREG_DeleteClassesUpgradeCodesKey(upgrade); - msi_free(upgrade); - } + remove_product_upgrade_code( package ); LIST_FOR_EACH_ENTRY(patch, &package->patches, MSIPATCHINFO, entry) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a2939b3..56ba725 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -919,6 +919,7 @@ extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR, MSIINSTALLCONTEXT) DECLSPEC extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; +extern UINT MSIREG_DeleteUpgradeCodesKey(const WCHAR *) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) DECLSPEC_HIDDEN; extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create) DECLSPEC_HIDDEN; extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) DECLSPEC_HIDDEN; diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 8852f57..1f87cbb 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -940,6 +940,18 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat return RegOpenKeyW(HKEY_CURRENT_USER, keypath, key); } +UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) +{ + WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + + if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; + TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); + + strcpyW( keypath, szInstaller_UpgradeCodes ); + strcatW( keypath, squashed_code ); + return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); +} + UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) { WCHAR squashed_uc[SQUASHED_GUID_SIZE], keypath[0x200]; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e1113e7..a377184 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5888,6 +5888,57 @@ static void test_shared_component(void) DeleteFileA(msifile2); } +static void test_remove_upgrade_code(void) +{ + UINT r; + LONG res; + HKEY hkey; + REGSAM access = KEY_ALL_ACCESS; + DWORD type, size; + char buf[1]; + + if (is_process_limited()) + { + skip( "process is limited\n" ); + return; + } + if (is_wow64) access |= KEY_WOW64_64KEY; + + create_test_files(); + create_database( msifile, icon_base_tables, sizeof(icon_base_tables)/sizeof(icon_base_tables[0]) ); + + MsiSetInternalUI( INSTALLUILEVEL_NONE, NULL ); + + r = MsiInstallProductA( msifile, "FULL=1" ); + ok(r == ERROR_SUCCESS, "got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + + type = 0xdeadbeef; + buf[0] = 0x55; + size = sizeof(buf); + res = RegQueryValueExA( hkey, "94A88FD7F6998CE40A22FB59F6B9C2BB", NULL, &type, (BYTE *)buf, &size ); + ok( res == ERROR_SUCCESS, "got %d\n", res ); + ok( type == REG_SZ, "got %u\n", type ); + ok( size == 1, "got %u\n", size ); + ok( !buf[0], "wrong data\n" ); + RegCloseKey( hkey ); + + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyExA( HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2", + 0, access, &hkey ); + ok( res == ERROR_FILE_NOT_FOUND, "got %d\n", res ); + + RemoveDirectoryA( "msitest" ); + DeleteFileA( msifile ); +} + START_TEST(install) { DWORD len; @@ -5974,6 +6025,7 @@ START_TEST(install) test_mixed_package(); test_volume_props(); test_shared_component(); + test_remove_upgrade_code(); DeleteFileA(log_file);

1 0

Hans Leidekker : netapi32/tests: Fix a test failure on Windows 7.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 83af2eec506c65ba4802eab984998aeacede8c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83af2eec506c65ba4802eab98… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 4 13:29:29 2016 +0100 netapi32/tests: Fix a test failure on Windows 7. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/tests/access.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index f44a6d3..f095d77 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -558,7 +558,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR path2[] = {'h','t','t','p',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; static const WCHAR path3[] = - {'h','t','t','p','s',':','/','/','s','e','r','v','e','r','/','p','a','t','h',0}; + {'h','t','t','p','s',':','/','/','h','o','s','t','/','p','a','t','h',0}; static const WCHAR path4[] = {'\\','\\','s','e','r','v','e','r',0}; static const WCHAR path5[] = @@ -598,7 +598,7 @@ static void test_DavGetUNCFromHTTPPath(void) static const WCHAR result[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t','\\','p','a','t','h',0}; static const WCHAR result2[] = - {'\\','\\','s','e','r','v','e','r','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', + {'\\','\\','h','o','s','t','@','S','S','L','\\','D','a','v','W','W','W','R','o','o','t','\\', 'p','a','t','h',0}; static const WCHAR result3[] = {'\\','\\','s','e','r','v','e','r','\\','D','a','v','W','W','W','R','o','o','t',0}; @@ -626,7 +626,7 @@ static void test_DavGetUNCFromHTTPPath(void) { { path, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path2, MAX_PATH, ERROR_SUCCESS, result, 25 }, - { path3, MAX_PATH, ERROR_SUCCESS, result2, 29 }, + { path3, MAX_PATH, ERROR_SUCCESS, result2, 27 }, { path4, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path5, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH }, { path6, MAX_PATH, ERROR_INVALID_PARAMETER, NULL, MAX_PATH },

1 0

Nikolay Sivov : vbscript: Implement StrComp().
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 5c6aa8d6c3436f8b6174fa938e35b12d004ebeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c6aa8d6c3436f8b6174fa938… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 16:32:24 2016 +0300 vbscript: Implement StrComp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 20 ++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 129d6ce..a1ffa50 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1027,10 +1027,41 @@ static HRESULT Global_MidB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI return E_NOTIMPL; } -static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR left, right; + int mode, ret; + HRESULT hres; + short val; + + TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1)); + + assert(args_cnt == 2 || args_cnt == 3); + + if(V_VT(args) != VT_BSTR || V_VT(args+1) != VT_BSTR) { + FIXME("args[0] = %s, args[1] = %s\n", debugstr_variant(args), debugstr_variant(args+1)); + return E_NOTIMPL; + } + + if (args_cnt == 3) { + hres = to_int(args+2, &mode); + if(FAILED(hres)) + return hres; + + if (mode != 0 && mode != 1) { + FIXME("unknown compare mode = %d\n", mode); + return E_FAIL; + } + } + else + mode = 0; + + left = V_BSTR(args); + right = V_BSTR(args+1); + + ret = mode ? strcmpiW(left, right) : strcmpW(left, right); + val = ret < 0 ? -1 : (ret > 0 ? 1 : 0); + return return_short(res, val); } static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2a365c7..91d34ce 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -440,6 +440,26 @@ TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) +Sub TestStrComp(str_left, str_right, mode, ex) + x = StrComp(str_left, str_right, mode) + Call ok(x = ex, "StrComp(" & str_left & ", " & str_right & ", " & mode & ") = " & x & " expected " & ex) +End Sub + +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABC", "abc", 0, -1 +TestStrComp "abc", "ABC", 0, 1 +TestStrComp "ABC", "ABC", 0, 0 +TestStrComp "ABCD", "ABC", 0, 1 +TestStrComp "ABC", "ABCD", 0, -1 +TestStrComp "ABC", "abc", 1, 0 +TestStrComp "ABC", "ABC", 1, 0 +TestStrComp "ABCD", "ABC", 1, 1 +TestStrComp "ABC", "ABCD", 1, -1 +TestStrComp "ABC", "ABCD", "0", -1 +TestStrComp "ABC", "ABCD", "1", -1 + Call ok(Len("abc") = 3, "Len(abc) = " & Len("abc")) Call ok(Len("") = 0, "Len() = " & Len("")) Call ok(Len(1) = 1, "Len(1) = " & Len(1))

1 0

Jacek Caban : rpcsal.h: Added __RPC__range and __RPC__in_range defines.
by Alexandre Julliard 04 Nov '16

04 Nov '16

Module: wine Branch: master Commit: 9d348189880a6e7a1e7a6a303915e47af3255972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d348189880a6e7a1e7a6a303… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 4 15:45:52 2016 +0100 rpcsal.h: Added __RPC__range and __RPC__in_range defines. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcsal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/rpcsal.h b/include/rpcsal.h index ffa114a..72a61ef 100644 --- a/include/rpcsal.h +++ b/include/rpcsal.h @@ -165,3 +165,6 @@ #define __RPC_ref_pointer #define __RPC_string #define __RPC_unique_pointer + +#define __RPC__range(min,max) +#define __RPC__in_range(min,max)

1 0