May 2018 - Wine-Commits - list.winehq.org

Michael Stefaniuc : bcrypt/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 7f99932a39d9930f28e51cc711dd3c2c7478a1c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f99932a39d9930f28e51cc7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:21 2018 +0200 bcrypt/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2a49971..6865e87 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -145,7 +145,7 @@ static void format_hash(const UCHAR *bytes, ULONG size, char *buf) static int strcmp_wa(const WCHAR *strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(buf[0])); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -229,7 +229,7 @@ static void test_hash(const struct hash_test *test) NTSTATUS ret; ULONG len; - MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, sizeof(alg_name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, test->alg, -1, alg_name, ARRAY_SIZE(alg_name)); alg = NULL; ret = pBCryptOpenAlgorithmProvider(&alg, alg_name, MS_PRIMITIVE_PROVIDER, 0); @@ -349,7 +349,7 @@ static void test_hashes(void) }; unsigned i; - for(i = 0; i < sizeof(tests)/sizeof(*tests); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) test_hash(tests+i); }

1 0

Alex Henrie : include: Add wmemset to wchar.h.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: ae023be3eeb98fbeee4130972fdfbd1866b8e495 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae023be3eeb98fbeee413097… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:57 2018 -0600 include: Add wmemset to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 2114c43..ce5423e 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -506,6 +506,14 @@ static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t return memmove(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n) +{ + size_t i; + for (i = 0; i < n; i++) + s[i] = c; + return s; +} + #ifdef __cplusplus } #endif

1 0

Michael Stefaniuc : winspool.drv/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 8bbba3fc707d66ee4eceac92145395e01b82bf95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bbba3fc707d66ee4eceac92… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:28 2018 +0200 winspool.drv/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3c28bc0..bfc80ce 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -219,7 +219,7 @@ static struct monitor_entry * find_installed_monitor(void) if (entry) return entry; - num_tests = (sizeof(monitor_table)/sizeof(struct monitor_entry)); + num_tests = ARRAY_SIZE(monitor_table); /* cleanup */ DeleteMonitorA(NULL, env_x64, winetest);

1 0

Michael Stefaniuc : dplayx/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 589a57741616090fb781e5034664663066cefafb URL: https://source.winehq.org/git/wine.git/?a=commit;h=589a57741616090fb781e503… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:26 2018 +0200 dplayx/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index f4e7301..ea6525f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -767,7 +767,7 @@ static BOOL CALLBACK callback_providersA(GUID* guid, char *name, DWORD major, DW if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -786,7 +786,7 @@ static BOOL CALLBACK callback_providersW(GUID* guid, WCHAR *name, DWORD major, D if (!prov) return TRUE; - if (prov->call_count < sizeof(prov->guid_data) / sizeof(prov->guid_data[0])) + if (prov->call_count < ARRAY_SIZE(prov->guid_data)) { prov->guid_ptr[prov->call_count] = guid; prov->guid_data[prov->call_count] = *guid; @@ -896,7 +896,7 @@ static BOOL CALLBACK EnumAddress_cb2( REFGUID guidDataType, { BOOL found = FALSE; int i; - for( i=0; i < sizeof(sps) / sizeof(sps[0]) && !found; i++ ) + for( i=0; i < ARRAY_SIZE(sps) && !found; i++ ) found = IsEqualGUID( sps[i], lpData ); ok( found, "Unknown Address type found %s\n", wine_dbgstr_guid(lpData) ); }

1 0

Michael Stefaniuc : dpvoice/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 7619786b7f7e6fedf56b528d96671b23d6528ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7619786b7f7e6fedf56b528d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:27 2018 +0200 dpvoice/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpvoice/tests/voice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpvoice/tests/voice.c b/dlls/dpvoice/tests/voice.c index 7f0faa3..2d77049 100644 --- a/dlls/dpvoice/tests/voice.c +++ b/dlls/dpvoice/tests/voice.c @@ -428,11 +428,11 @@ static void test_GetCompressionTypes(IDirectPlayVoiceClient *client_iface, IDire "%s: expected ret=%x got ret=%x\n", name, DVERR_BUFFERTOOSMALL, ret); ok(data_size > sizeof(DVCOMPRESSIONINFO) && data_size < sizeof(data) - 1, "%s: got data_size=%u\n", name, data_size); - tests[sizeof(tests) / sizeof(tests[0]) - 3].data_size = data_size - 1; - tests[sizeof(tests) / sizeof(tests[0]) - 2].data_size = data_size; - tests[sizeof(tests) / sizeof(tests[0]) - 1].data_size = data_size + 1; + tests[ARRAY_SIZE(tests) - 3].data_size = data_size - 1; + tests[ARRAY_SIZE(tests) - 2].data_size = data_size; + tests[ARRAY_SIZE(tests) - 1].data_size = data_size + 1; - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) + for(i = 0; i < ARRAY_SIZE(tests); i++) { memset(data, 0x23, sizeof(data));

1 0

Zebediah Figura : msi/tests: Simplify key access flags in test_register_product().
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 8d72829a874810c788bddbd46cee98366165fdb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d72829a874810c788bddbd4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 28 21:07:50 2018 -0500 msi/tests: Simplify key access flags in test_register_product(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 80 ++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 980ed50..cefa1d7 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2633,12 +2633,9 @@ static void test_register_product(void) LPSTR usersid; char date[MAX_PATH], temp[MAX_PATH], keypath[MAX_PATH], path[MAX_PATH]; DWORD size, type; - REGSAM access = KEY_ALL_ACCESS; static const CHAR uninstall[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; - static const CHAR uninstall_32node[] = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion" - "\\Uninstall\\{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; static const CHAR userdata[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" "\\UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR ugkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" @@ -2663,9 +2660,6 @@ static void test_register_product(void) create_database(msifile, pp_tables, sizeof(pp_tables) / sizeof(msi_table)); - if (is_wow64) - access |= KEY_WOW64_64KEY; - MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); /* RegisterProduct */ @@ -2682,16 +2676,8 @@ static void test_register_product(void) res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(!res, "got %d\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2718,14 +2704,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, usersid); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2758,26 +2745,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); /* RegisterProduct, machine */ @@ -2786,19 +2778,11 @@ static void test_register_product(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, userugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - if (is_64bit) - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall_32node, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } - else - { - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_ALL_ACCESS, &hkey); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - } + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, uninstall, 0, KEY_READ | KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); @@ -2825,14 +2809,15 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); sprintf(keypath, userdata, "S-1-5-18"); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, keypath, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyExA(hkey, "InstallProperties", 0, access, &props); + res = RegOpenKeyExA(hkey, "InstallProperties", 0, KEY_READ, &props); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); size = sizeof(path); @@ -2865,26 +2850,31 @@ static void test_register_product(void) todo_wine CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); - delete_key(props, "", access); + res = RegDeleteKeyA(props, ""); + ok(!res, "got %d\n", res); RegCloseKey(props); - res = RegOpenKeyExA(hkey, "Usage", 0, access, &usage); + res = RegOpenKeyExA(hkey, "Usage", 0, KEY_READ, &usage); todo_wine { ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - delete_key(usage, "", access); + res = RegDeleteKeyA(usage, ""); +todo_wine + ok(!res, "got %d\n", res); RegCloseKey(usage); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); - res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, access, &hkey); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ugkey, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); - delete_key(hkey, "", access); + res = RegDeleteKeyA(hkey, ""); + ok(!res, "got %d\n", res); RegCloseKey(hkey); error:

1 0

Zebediah Figura : widl: Don' t remove the FDUAL flag from non-dispatchable interfaces.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 8c968f774c1a507c71addbeb2f558d47990700d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c968f774c1a507c71addbeb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 29 08:49:36 2018 +0100 widl: Don't remove the FDUAL flag from non-dispatchable interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.idl | 2 -- dlls/oleaut32/tests/typelib.c | 31 +++++++++++-------------------- tools/widl/write_msft.c | 4 ---- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 12c0bd5..996e948 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -208,9 +208,7 @@ library TestTypelib [ odl, uuid(a028db05-30f0-4b93-b17a-41c72f831d84), -#if 0 /* FIXME: commented out as causes widl to generate incorrect typelib */ dual, -#endif oleautomation ] interface IKindaEnumWidget : IUnknown diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 05476a3..f4ad8f9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1507,16 +1507,10 @@ static void test_inheritance(void) FUNCDESC *pFD; WCHAR path[MAX_PATH]; CHAR pathA[MAX_PATH]; - static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; - - BOOL use_midl_tlb = FALSE; GetModuleFileNameA(NULL, pathA, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); - if(use_midl_tlb) - memcpy(path, tl_path, sizeof(tl_path)); - hr = LoadTypeLib(path, &pTL); if(FAILED(hr)) return; @@ -1592,17 +1586,13 @@ static void test_inheritance(void) hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); - if (hr == S_OK) - { - ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); - if(use_midl_tlb) { - ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); - } - ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); - ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); - ITypeInfo_ReleaseTypeAttr(pTI, pTA); - } + ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); + ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(pTI, pTA); + hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p); @@ -4903,8 +4893,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FOLEAUTOMATION }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION }, - { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ }, - { TKIND_DISPATCH, 0 /* TYPEFLAG_FDUAL - widl clears this flag for non-IDispatch derived interfaces */ }, + { TKIND_DISPATCH, TYPEFLAG_FDUAL }, + { TKIND_DISPATCH, TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FDUAL }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, @@ -4979,7 +4969,8 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); ok(dual_attr->typekind == TKIND_INTERFACE, "%d: got kind %d\n", i, dual_attr->typekind); - ok(dual_attr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE | TYPEFLAG_FOLEAUTOMATION | TYPEFLAG_FDUAL), "%d: got flags %04x\n", i, dual_attr->wTypeFlags); + ok(dual_attr->wTypeFlags == (attrs[i].flags | TYPEFLAG_FOLEAUTOMATION), + "%d: got flags %04x\n", i, dual_attr->wTypeFlags); ITypeInfo_ReleaseTypeAttr(dual_info, dual_attr); ITypeInfo_Release(dual_info); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 3775a31..52c68b4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2166,10 +2166,6 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if (derived->name && !strcmp(derived->name, "IDispatch")) msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ - /* can't be dual if it doesn't derive from IDispatch */ - if (!(msft_typeinfo->typeinfo->flags & 0x1000)) /* TYPEFLAG_FDISPATCHABLE */ - msft_typeinfo->typeinfo->flags &= ~0x40; /* TYPEFLAG_FDUAL */ - if(type_iface_get_inherit(interface)) add_impl_type(msft_typeinfo, type_iface_get_inherit(interface), ref_importinfo);

1 0

Alex Henrie : include: Add wmemmove to wchar.h.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: b583a636c15b7d377967ed05acf8c7473e916062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b583a636c15b7d377967ed05… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:56 2018 -0600 include: Add wmemmove to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/wchar.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 4a6b788..2114c43 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -501,6 +501,11 @@ static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t return memcpy(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) +{ + return memmove(dst, src, n * sizeof(wchar_t)); +} + #ifdef __cplusplus } #endif

1 0

Michael Stefaniuc : wmp/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: 0f0647e1fc1e74684203561c246ced068553d748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f0647e1fc1e74684203561c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:30 2018 +0200 wmp/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 3fd74ad..218b80f 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -77,7 +77,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 41179da..6dfaa1c 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -79,7 +79,7 @@ static inline WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Michael Stefaniuc : wscript/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 29, 2018

May 29, 2018

Module: wine Branch: master Commit: d72112eda8067b1ce49419a8c7174510d63dafa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d72112eda8067b1ce49419a8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue May 29 01:05:32 2018 +0200 wscript/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/tests/run.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 770fd8f..16d14ff 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -77,7 +77,7 @@ static HANDLE wscript_process; static int strcmp_wa(LPCWSTR strw, const char *stra) { WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf)); return lstrcmpW(strw, buf); } @@ -220,7 +220,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullName, ARRAY_SIZE(fullName)); if(res == 0) return E_FAIL; if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) @@ -237,7 +237,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); V_VT(pVarResult) = VT_BSTR; - res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, ARRAY_SIZE(fullPath)); if(res == 0) return E_FAIL; pos = mystrrchr(fullPath, '\\');

1 0