April 2019 - Wine-Commits - list.winehq.org

Piotr Caban : shlwapi: Fix PathIsContentTypeA implementation.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 28f7e4615d9a02b6f556434e51568aab68edc35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f7e4615d9a02b6f556434e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:01:03 2019 +0200 shlwapi: Fix PathIsContentTypeA implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/path.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index ad78c5d..1c4af7e 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2027,22 +2027,18 @@ BOOL WINAPI PathIsSameRootW(LPCWSTR lpszPath1, LPCWSTR lpszPath2) * a content type is registered, it is compared (case insensitively) to * lpszContentType. Only if this matches does the function succeed. */ -BOOL WINAPI PathIsContentTypeA(LPCSTR lpszPath, LPCSTR lpszContentType) +BOOL WINAPI PathIsContentTypeA(LPCSTR path, LPCSTR content_type) { - LPCSTR szExt; - DWORD dwDummy; - char szBuff[MAX_PATH]; + char buf[MAX_PATH]; + DWORD size = sizeof(buf); + LPCSTR ext; - TRACE("(%s,%s)\n", debugstr_a(lpszPath), debugstr_a(lpszContentType)); + TRACE("(%s,%s)\n", debugstr_a(path), debugstr_a(content_type)); - if (lpszPath && (szExt = PathFindExtensionA(lpszPath)) && *szExt && - !SHGetValueA(HKEY_CLASSES_ROOT, szExt, "Content Type", - REG_NONE, szBuff, &dwDummy) && - !strcasecmp(lpszContentType, szBuff)) - { - return TRUE; - } - return FALSE; + if(!path) return FALSE; + if(!(ext = PathFindExtensionA(path)) || !*ext) return FALSE; + if(SHGetValueA(HKEY_CLASSES_ROOT, ext, "Content Type", NULL, buf, &size)) return FALSE; + return !lstrcmpiA(content_type, buf); } /*************************************************************************

1 0

Piotr Caban : shell32: Don't use strcasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 232255f3c5c48a2685d317101d0c0d068414a6ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=232255f3c5c48a2685d31710… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 17:04:53 2019 +0200 shell32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index e11a918..54fb818 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -511,7 +511,7 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pidltemp1 = ILGetNext(pidltemp1); @@ -563,7 +563,7 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b _ILSimpleGetText(pParent, szData1, MAX_PATH); _ILSimpleGetText(pChild, szData2, MAX_PATH); - if (strcasecmp( szData1, szData2 )) + if (lstrcmpiA( szData1, szData2 )) return FALSE; pParent = ILGetNext(pParent); @@ -630,7 +630,7 @@ LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) _ILSimpleGetText(pidltemp1, szData1, MAX_PATH); _ILSimpleGetText(pidltemp2, szData2, MAX_PATH); - if (strcasecmp(szData1,szData2)) + if (lstrcmpiA(szData1,szData2)) break; pidltemp1 = ILGetNext(pidltemp1);

1 0

Piotr Caban : d3dxof: Don't use strncasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 718b07b34340e0702bc4fd67039ae3420f315e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718b07b34340e0702bc4fd67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:22 2019 +0200 d3dxof: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/parsing.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 6f93bfe..82cb186 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "wingdi.h" +#include "winternl.h" #include "d3dxof_private.h" #include "dxfile.h" @@ -405,7 +406,7 @@ static BOOL is_keyword(parse_buffer* buf, const char* keyword) if (!read_bytes(buf, tmp, len)) return FALSE; - if (strncasecmp(tmp, keyword, len)) + if (_strnicmp(tmp, keyword, len)) { rewind_bytes(buf, len); return FALSE; @@ -972,7 +973,7 @@ static BOOL parse_template_members_list(parse_buffer * buf) cur_member->idx_template = 1; while (cur_member->idx_template < buf->pdxf->nb_xtemplates) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name, -1)) break; cur_member->idx_template++; } @@ -1176,7 +1177,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) /* To do template lookup */ for (j = 0; j < buf->pdxf->nb_xtemplates; j++) { - if (!strcasecmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name)) + if (!_strnicmp(buf->pdxf->xtemplates[pt->members[i].idx_template].name, buf->pdxf->xtemplates[j].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[j]; break; @@ -1392,7 +1393,7 @@ BOOL parse_object(parse_buffer * buf) /* To do template lookup */ for (i = 0; i < buf->pdxf->nb_xtemplates; i++) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[i].name)) + if (!_strnicmp((char*)buf->value, buf->pdxf->xtemplates[i].name, -1)) { buf->pxt[buf->level] = &buf->pdxf->xtemplates[i]; memcpy(&buf->pxo->type, &buf->pdxf->xtemplates[i].class_id, 16);

1 0

Vincent Povirk : mscoree: Don't return from _CorExeMain.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: fe4f00681e8e4f1c63ab253490af0d3acfd0262c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4f00681e8e4f1c63ab2534… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:21:59 2019 -0500 mscoree: Don't return from _CorExeMain. Testing on Windows shows that unmanaged threads do not keep the process open after a .NET program's entry point and all .NET foreground threads have exited. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ca8ba0d..95f6a9a 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1524,6 +1524,8 @@ __int32 WINAPI _CorExeMain(void) mono_runtime_quit(); } + ExitProcess(exit_code); + return exit_code; }

1 0

Vincent Povirk : mscoree: Update install process to account for shared installs.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 23181b40c5d8eba1275ffa41f30e84d30660064e URL: https://source.winehq.org/git/wine.git/?a=commit;h=23181b40c5d8eba1275ffa41… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:32 2019 -0500 mscoree: Update install process to account for shared installs. This will install the support MSI if it's found in a shared install. Otherwise, it'll fall back to appwiz as before. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 4 +- dlls/mscoree/mscoree_main.c | 166 +++++++++++++++++++++++++++++------------ dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 122 insertions(+), 50 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3c4f803..50d43b3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -129,8 +129,6 @@ void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); -static BOOL get_mono_path(LPWSTR path); - static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); @@ -772,7 +770,7 @@ static BOOL get_mono_path_datadir(LPWSTR path) return ret; } -static BOOL get_mono_path(LPWSTR path) +BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || get_mono_path_registry(path) || diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7bb6359..6393af8 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -665,30 +665,81 @@ static void parse_msi_version_string(const char *version, int *parts) } } +static int compare_versions(const char *a, const char *b) +{ + int a_parts[3], b_parts[3], i; + + parse_msi_version_string(a, a_parts); + parse_msi_version_string(b, b_parts); + + for (i=0; i<3; i++) + if (a_parts[i] != b_parts[i]) + return a_parts[i] - b_parts[i]; + + return 0; +} + +static BOOL invoke_appwiz(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + WCHAR *args; + LONG len; + BOOL ret; + + static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; + static const WCHAR argsW[] = + {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; + + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); + memcpy(app+len, controlW, sizeof(controlW)); + + args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); + if(!args) + return FALSE; + + memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); + memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, args); + if (ret) { + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + } + + return ret; +} + static BOOL install_wine_mono(void) { + static const WCHAR support_msi_relative[] = {'\\','s','u','p','p','o','r','t','\\','w','i','n','e','m','o','n','o','-','s','u','p','p','o','r','t','.','m','s','i',0}; BOOL is_wow64 = FALSE; - HMODULE hmsi; + HMODULE hmsi = NULL; + HRESULT initresult = E_FAIL; UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); + UINT (WINAPI *pMsiOpenPackageW)(LPCWSTR,ULONG*); + UINT (WINAPI *pMsiGetProductPropertyA)(ULONG,LPCSTR,LPSTR,LPDWORD); + UINT (WINAPI *pMsiCloseHandle)(ULONG); + UINT (WINAPI *pMsiInstallProductW)(LPCWSTR,LPCWSTR); char versionstringbuf[15]; char productcodebuf[39]; UINT res; DWORD buffer_size; - PROCESS_INFORMATION pi; - STARTUPINFOW si; - WCHAR app[MAX_PATH]; - WCHAR *args; - LONG len; + ULONG msiproduct; BOOL ret; + WCHAR mono_path[MAX_PATH]; + WCHAR support_msi_path[MAX_PATH]; - static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; - static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; - static const WCHAR argsW[] = - {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; - IsWow64Process(GetCurrentProcess(), &is_wow64); if (is_wow64) @@ -697,6 +748,16 @@ static BOOL install_wine_mono(void) return TRUE; } + TRACE("searching for mono runtime\n"); + + if (!get_mono_path(mono_path)) + { + TRACE("mono runtime not found\n"); + return invoke_appwiz(); + } + + TRACE("mono runtime is at %s\n", debugstr_w(mono_path)); + hmsi = LoadLibraryA("msi"); if (!hmsi) @@ -722,57 +783,68 @@ static BOOL install_wine_mono(void) ERR("MsiEnumRelatedProducts failed, err=%u\n", res); } - FreeLibrary(hmsi); + if (res == ERROR_SUCCESS) + { + TRACE("found installed support package %s\n", versionstringbuf); + + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("support package is at least %s, quitting\n", WINE_MONO_VERSION); + ret = TRUE; + goto end; + } + } + + strcpyW(support_msi_path, mono_path); + strcatW(support_msi_path, support_msi_relative); + + initresult = CoInitialize(NULL); + + pMsiOpenPackageW = (void*)GetProcAddress(hmsi, "MsiOpenPackageW"); + + res = pMsiOpenPackageW(support_msi_path, &msiproduct); if (res == ERROR_SUCCESS) { - int current_version[3], wanted_version[3], i; + buffer_size = sizeof(versionstringbuf); - TRACE("found installed version %s\n", versionstringbuf); + pMsiGetProductPropertyA = (void*)GetProcAddress(hmsi, "MsiGetProductPropertyA"); - parse_msi_version_string(versionstringbuf, current_version); - parse_msi_version_string(mono_version, wanted_version); + res = pMsiGetProductPropertyA(msiproduct, "ProductVersion", versionstringbuf, &buffer_size); - for (i=0; i<3; i++) - { - if (current_version[i] < wanted_version[i]) - break; - else if (current_version[i] > wanted_version[i]) - { - TRACE("installed version is newer than %s, quitting\n", mono_version); - return TRUE; - } - } + pMsiCloseHandle = (void*)GetProcAddress(hmsi, "MsiCloseHandle"); - if (i == 3) - { - TRACE("version %s is already installed, quitting\n", mono_version); - return TRUE; - } + pMsiCloseHandle(msiproduct); } - len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); - memcpy(app+len, controlW, sizeof(controlW)); + if (res == ERROR_SUCCESS) { + TRACE("found support msi version %s at %s\n", versionstringbuf, debugstr_w(support_msi_path)); - args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); - if(!args) - return FALSE; + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("installing support msi\n"); - memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + pMsiInstallProductW = (void*)GetProcAddress(hmsi, "MsiInstallProductW"); - TRACE("starting %s\n", debugstr_w(args)); + res = pMsiInstallProductW(support_msi_path, NULL); - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - HeapFree(GetProcessHeap(), 0, args); - if (ret) { - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); + if (res == ERROR_SUCCESS) + { + ret = TRUE; + goto end; + } + else + ERR("MsiInstallProduct failed, err=%i\n", res); + } } + ret = invoke_appwiz(); + +end: + if (hmsi) + FreeLibrary(hmsi); + if (SUCCEEDED(initresult)) + CoUninitialize(); return ret; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 7761099..43209fd 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -108,6 +108,8 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; +extern BOOL get_mono_path(LPWSTR path) DECLSPEC_HIDDEN; + extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : mscoree: Search shared addon locations for mono runtime.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: dc2c580bdfab2b6850241afae66d7dee5db94c0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc2c580bdfab2b6850241afa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:31 2019 -0500 mscoree: Search shared addon locations for mono runtime. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 2 ++ dlls/mscoree/metahost.c | 67 +++++++++++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 2 +- dlls/mscoree/mscoree_private.h | 2 ++ 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 634869e..9ae43df 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ mscoree_main.c IDL_SRCS = mscoree_classes.idl + +metahost_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d6af7b6..3c4f803 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -712,10 +712,75 @@ static BOOL get_mono_path_registry(LPWSTR path) return ret; } +static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) +{ + static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); + LPWSTR dos_dir; + WCHAR mono_dll_path[MAX_PATH]; + BOOL ret; + + if (!p_wine_get_dos_file_name) + { + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + if (!p_wine_get_dos_file_name) + return FALSE; + } + + dos_dir = p_wine_get_dos_file_name(unix_dir); + if (!dos_dir) + return FALSE; + + ret = find_mono_dll(dos_dir, mono_dll_path); + if (ret) + strcpyW(path, dos_dir); + + heap_free(dos_dir); + + return ret; +} + +static BOOL get_mono_path_datadir(LPWSTR path) +{ + const char *data_dir; + char *package_dir; + int len; + BOOL ret; + + if((data_dir = wine_get_data_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/mono/wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/mono/wine-mono-" WINE_MONO_VERSION); + } + else if((data_dir = wine_get_build_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/../wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/../wine-mono-" WINE_MONO_VERSION); + } + else + { + return FALSE; + } + + ret = get_mono_path_unix(package_dir, path); + + heap_free(package_dir); + + return ret; +} + static BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || - get_mono_path_registry(path); + get_mono_path_registry(path) || + get_mono_path_datadir(path) || + get_mono_path_unix(INSTALL_DATADIR "/wine/mono/wine-mono-" WINE_MONO_VERSION, path) || + (strcmp(INSTALL_DATADIR, "/usr/share") && + get_mono_path_unix("/usr/share/wine/mono/wine-mono-" WINE_MONO_VERSION, path)) || + get_mono_path_unix("/opt/wine/mono/wine-mono-" WINE_MONO_VERSION, path); } struct InstalledRuntimeEnum diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 198e279..7bb6359 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.1"; + static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 4e7ee01..7761099 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,6 +45,8 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; +#define WINE_MONO_VERSION "4.8.1" + /* Mono embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly;

1 0

Vincent Povirk : mscoree: Check for mono runtime path in registry.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 179797a6fb7b609e86f5c9767bf5349a8015e388 URL: https://source.winehq.org/git/wine.git/?a=commit;h=179797a6fb7b609e86f5c976… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 4 10:05:30 2019 -0500 mscoree: Check for mono runtime path in registry. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fc1d178..d6af7b6 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -667,7 +667,7 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path) return (attributes != INVALID_FILE_ATTRIBUTES); } -static BOOL get_mono_path(LPWSTR path) +static BOOL get_mono_path_local(LPWSTR path) { static const WCHAR subdir_mono[] = {'\\','m','o','n','o','\\','m','o','n','o','-','2','.','0', 0}; WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; @@ -685,6 +685,39 @@ static BOOL get_mono_path(LPWSTR path) return FALSE; } +static BOOL get_mono_path_registry(LPWSTR path) +{ + static const WCHAR keyname[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','o','n','o',0}; + static const WCHAR valuename[] = {'R','u','n','t','i','m','e','P','a','t','h',0}; + WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; + HKEY hkey; + DWORD res, valuesize; + BOOL ret=FALSE; + + /* @@ Wine registry key: HKCU\Software\Wine\Mono */ + res = RegOpenKeyW(HKEY_CURRENT_USER, keyname, &hkey); + if (res != ERROR_SUCCESS) + return FALSE; + + valuesize = sizeof(base_path); + res = RegGetValueW(hkey, NULL, valuename, RRF_RT_REG_SZ, NULL, base_path, &valuesize); + if (res == ERROR_SUCCESS && find_mono_dll(base_path, mono_dll_path)) + { + strcpyW(path, base_path); + ret = TRUE; + } + + RegCloseKey(hkey); + + return ret; +} + +static BOOL get_mono_path(LPWSTR path) +{ + return get_mono_path_local(path) || + get_mono_path_registry(path); +} + struct InstalledRuntimeEnum { IEnumUnknown IEnumUnknown_iface;

1 0

Vijay Kiran Kamuju : d3dx9: Generate ID3DXSkinInfo in D3DXLoadSkinMeshFromXof() when needed.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 70d722340ad546ab988fffe4577e0c0ebe35a982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d722340ad546ab988fffe4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 4 16:54:35 2019 +0200 d3dx9: Generate ID3DXSkinInfo in D3DXLoadSkinMeshFromXof() when needed. Based on a patch by Michael Müller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33904 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 7 ++++++ dlls/d3dx9_36/tests/mesh.c | 58 +++++++++++++++++++++------------------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index acbb247..40f0355 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data, goto end; } + if ((provide_flags & PROVIDE_SKININFO) && !mesh_data->skin_info) + { + if (FAILED(hr = D3DXCreateSkinInfoFVF(mesh_data->num_vertices, mesh_data->fvf, + mesh_data->nb_bones, &mesh_data->skin_info))) + goto end; + } + hr = D3D_OK; end: diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index a33ed2c..da9b80c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11319,53 +11319,49 @@ static void test_load_skin_mesh_from_xof(void) ok(!materials, "Got unexpected value %p.\n", materials); ok(!effects, "Got unexpected value %p.\n", effects); ok(!count, "Got unexpected value %u.\n", count); - todo_wine ok(!!skin_info, "Got unexpected value %p.\n", skin_info); + ok(!!skin_info, "Got unexpected value %p.\n", skin_info); ok(!!mesh, "Got unexpected value %p.\n", mesh); count = mesh->lpVtbl->GetNumVertices(mesh); ok(count == 3, "Got unexpected value %u.\n", count); count = mesh->lpVtbl->GetNumFaces(mesh); ok(count == 1, "Got unexpected value %u.\n", count); - if (skin_info) - { - hr = skin_info->lpVtbl->GetDeclaration(skin_info, declaration); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - compare_elements(declaration, expected_declaration, __LINE__, 0); - - fvf = skin_info->lpVtbl->GetFVF(skin_info); - ok(fvf == D3DFVF_XYZ, "Got unexpected value %u.\n", fvf); + hr = skin_info->lpVtbl->GetDeclaration(skin_info, declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + compare_elements(declaration, expected_declaration, __LINE__, 0); - count = skin_info->lpVtbl->GetNumBones(skin_info); - ok(!count, "Got unexpected value %u.\n", count); + fvf = skin_info->lpVtbl->GetFVF(skin_info); + ok(fvf == D3DFVF_XYZ, "Got unexpected value %u.\n", fvf); - influence = skin_info->lpVtbl->GetMinBoneInfluence(skin_info); - ok(!influence, "Got unexpected value %.8e.\n", influence); + count = skin_info->lpVtbl->GetNumBones(skin_info); + ok(!count, "Got unexpected value %u.\n", count); - memset(max_influences, 0x55, sizeof(max_influences)); - hr = skin_info->lpVtbl->GetMaxVertexInfluences(skin_info, max_influences); - ok(hr == D3D_OK, "Got unexpected value %#x.\n", hr); - ok(!max_influences[0], "Got unexpected value %u.\n", max_influences[0]); - ok(max_influences[1] == 0x55555555, "Got unexpected value %u.\n", max_influences[1]); - ok(max_influences[2] == 0x55555555, "Got unexpected value %u.\n", max_influences[2]); + influence = skin_info->lpVtbl->GetMinBoneInfluence(skin_info); + ok(!influence, "Got unexpected value %.8e.\n", influence); - bone_name = skin_info->lpVtbl->GetBoneName(skin_info, 0); - ok(!bone_name, "Got unexpected value %p.\n", bone_name); + memset(max_influences, 0x55, sizeof(max_influences)); + hr = skin_info->lpVtbl->GetMaxVertexInfluences(skin_info, max_influences); + todo_wine ok(hr == D3D_OK, "Got unexpected value %#x.\n", hr); + todo_wine ok(!max_influences[0], "Got unexpected value %u.\n", max_influences[0]); + ok(max_influences[1] == 0x55555555, "Got unexpected value %u.\n", max_influences[1]); + ok(max_influences[2] == 0x55555555, "Got unexpected value %u.\n", max_influences[2]); - count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 0); - ok(!count, "Got unexpected value %u.\n", count); + bone_name = skin_info->lpVtbl->GetBoneName(skin_info, 0); + ok(!bone_name, "Got unexpected value %p.\n", bone_name); - count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 1); - ok(!count, "Got unexpected value %u.\n", count); + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 0); + ok(!count, "Got unexpected value %u.\n", count); - matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, -1); - ok(!matrix, "Got unexpected value %p.\n", matrix); + count = skin_info->lpVtbl->GetNumBoneInfluences(skin_info, 1); + ok(!count, "Got unexpected value %u.\n", count); - matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, 0); - ok(!matrix, "Got unexpected value %p.\n", matrix); + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, -1); + ok(!matrix, "Got unexpected value %p.\n", matrix); - skin_info->lpVtbl->Release(skin_info); - } + matrix = skin_info->lpVtbl->GetBoneOffsetMatrix(skin_info, 0); + ok(!matrix, "Got unexpected value %p.\n", matrix); + skin_info->lpVtbl->Release(skin_info); mesh->lpVtbl->Release(mesh); adjacency->lpVtbl->Release(adjacency); file_data->lpVtbl->Release(file_data);

1 0

Zebediah Figura : d3d8: Forbid creating a stateblock while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a2c29deb196a2cedeb0f10e73daa69da3e7b14a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c29deb196a2cedeb0f10e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:44 2019 -0500 d3d8: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4bd7578..4eb44e2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2027,6 +2027,12 @@ static HRESULT WINAPI d3d8_device_CreateStateBlock(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to create a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } hr = wined3d_stateblock_create(device->wined3d_device, (enum wined3d_stateblock_type)type, &stateblock); if (FAILED(hr)) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 37f4c5c..af58789 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7283,7 +7283,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Zebediah Figura : d3d8/tests: Add more tests for calling stateblock methods while recording.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 74b3f9e3afc5837fbb804f9491298418e127b8c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b3f9e3afc5837fbb804f94… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 21:18:41 2019 -0500 d3d8/tests: Add more tests for calling stateblock methods while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 57 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c5ec9aa..f0acd9f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7231,10 +7231,11 @@ cleanup: static void test_begin_end_state_block(void) { + DWORD stateblock, stateblock2; IDirect3DDevice8 *device; - DWORD stateblock; IDirect3D8 *d3d; ULONG refcount; + DWORD value; HWND window; HRESULT hr; @@ -7249,28 +7250,54 @@ static void test_begin_end_state_block(void) return; } - /* Should succeed. */ hr = IDirect3DDevice8_BeginStateBlock(device); - ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Calling BeginStateBlock() while recording should return - * D3DERR_INVALIDCALL. */ - hr = IDirect3DDevice8_BeginStateBlock(device); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Should succeed. */ stateblock = 0xdeadbeef; hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); - ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); - IDirect3DDevice8_DeleteStateBlock(device, stateblock); - /* Calling EndStateBlock() while not recording should return - * D3DERR_INVALIDCALL. stateblock should not be touched. */ - stateblock = 0xdeadbeef; - hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - ok(stateblock == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Detlef Riekenberg : iphlpapi/tests: Remove a test with a wrong assumption.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: f0db9c4b3be1f44289d2f7e26d4fa3548edf6d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db9c4b3be1f44289d2f7e2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 18:25:22 2019 +0200 iphlpapi/tests: Remove a test with a wrong assumption. The order of the interfaces is not fixed and can change, Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1be9f3c..a2be862 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -285,9 +285,6 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - /* loopback must never be the first when more than one interface is found */ - if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) - ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); } } HeapFree(GetProcessHeap(), 0, buf);

1 0

Detlef Riekenberg : combase/tests: Remove a no longer useful test.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: baac17030cfb9d6aec5549125f117c5ff47c0b86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baac17030cfb9d6aec554912… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 3 17:43:39 2019 +0200 combase/tests: Remove a no longer useful test. Microsoft changed the behavior from returning NULL into returning a valid pointer. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 7a705da..04d0f3e 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -227,7 +227,6 @@ static void test_string_buffer(void) /* Test creation of an empty buffer */ ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n"); - ok(buf == NULL, "Empty string buffer isn't a null string\n"); ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n");

1 0

Matteo Bruni : d3dx9/tests: Avoid a test failure on Vista testbot.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ccdb74d81ac4a95aa87414f6459a8b44d451358a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccdb74d81ac4a95aa87414f6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 4 16:54:33 2019 +0200 d3dx9/tests: Avoid a test failure on Vista testbot. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index becd55d..3b7acfc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -414,7 +414,8 @@ static void D3DXMatrixTest(void) ret = D3DXMatrixInverse(&gotmat, &determinant, &mat2); ok(!ret, "Unexpected return value %p.\n", ret); expect_matrix(&expectedmat, &gotmat, 1); - ok(compare_float(determinant, 5.0f, 0), "Unexpected determinant %.8e.\n", determinant); + ok(compare_float(determinant, 5.0f, 0) || broken(!determinant), /* Vista 64 bit testbot */ + "Unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE;

1 0

Vijay Kiran Kamuju : taskmgr: Use StrFormatKBSizeW/ StrFormatByteSizeW to show memory usage.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 17056908acae1d5c7cf5d255ec232210abfe86da URL: https://source.winehq.org/git/wine.git/?a=commit;h=17056908acae1d5c7cf5d255… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 3 15:18:37 2019 +0200 taskmgr: Use StrFormatKBSizeW/StrFormatByteSizeW to show memory usage. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/Makefile.in | 2 +- programs/taskmgr/graph.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index 48313e9..6006ac3 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -1,6 +1,6 @@ MODULE = taskmgr.exe APPMODE = -mwindows -mno-cygwin -IMPORTS = shell32 comctl32 user32 gdi32 advapi32 +IMPORTS = shell32 shlwapi comctl32 user32 gdi32 advapi32 C_SRCS = \ about.c \ diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 7e978e1..9a8f569 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -26,6 +26,7 @@ #include <windows.h> #include <commctrl.h> +#include <shlwapi.h> #include <winnt.h> #include "taskmgr.h" @@ -239,8 +240,6 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* Top bars that are "unused", i.e. are dark green, representing free memory */ int i; - static const WCHAR wszFormat[] = {'%','d','K',0}; - /* * Get the client area rectangle */ @@ -257,7 +256,10 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); - swprintf(Text, wszFormat, (int)CommitChargeTotal); + if (CommitChargeTotal < 1024) + StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); + else + StrFormatByteSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text)); /* * Draw the font text onto the graph

1 0

Piotr Caban : wined3d: Don't use strcasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: dcd3c95dbd3748d5dc246ad7529f18c35252534e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd3c95dbd3748d5dc246ad7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:57 2019 +0200 wined3d: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8fae8e2..7ebfd4d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3727,7 +3727,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !strcasecmp(e[i].semantic_name, semantic_name) + && !_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0a0121d..180e2d2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -240,17 +240,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) { - if (!strcasecmp(buffer, "glsl")) + if (!_strnicmp(buffer, "glsl", -1)) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!strcasecmp(buffer, "arb")) + else if (!_strnicmp(buffer, "arb", -1)) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!strcasecmp(buffer, "none")) + else if (!_strnicmp(buffer, "none", -1)) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE;

1 0

Piotr Caban : winspool.drv: Don't use strcasecmp.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 4c106a931934a8fee8e2f0e07d5420efe7e22919 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c106a931934a8fee8e2f0e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:48 2019 +0200 winspool.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bfa63f9..763d244 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1194,14 +1194,14 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) e = s; while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; for(prettyname = s+1; isspace(*prettyname); prettyname++) ; } e = prettyname + strlen(prettyname); while(isspace(*--e)) *e = '\0'; TRACE("\t%s\n", debugstr_a(prettyname)); - if(env_default && !strcasecmp(prettyname, env_default)) set_default = TRUE; + if(env_default && !_strnicmp(prettyname, env_default, -1)) set_default = TRUE; /* prettyname must fit into the dmDeviceName member of DEVMODE struct, * if it is too long, we use it as comment below. */

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ae4d8e1838753a11666592b6406fabd7789f8a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4d8e1838753a11666592b6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:28 2019 +0300 comctl32/tests: Add tests for BCM_SETSPLITINFO and BCM_GETSPLITINFO. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 211 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae4d8e1838753a116665…

1 0

Gabriel Ivăncescu : comctl32/button: Implement BCM_GETIDEALSIZE for split buttons.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 9c62f7e42bc4ba0f87d23dd59eb4d6091a6e0059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c62f7e42bc4ba0f87d23dd5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:32 2019 +0300 comctl32/button: Implement BCM_GETIDEALSIZE for split buttons. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1f29fb2..e974f86 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -197,6 +197,7 @@ typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { PB_GetIdealSize, /* BS_PUSHBUTTON */ @@ -211,9 +212,9 @@ static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ GB_GetIdealSize, /* BS_PUSHBOX */ GB_GetIdealSize, /* BS_OWNERDRAW */ + SB_GetIdealSize, /* BS_SPLITBUTTON */ + SB_GetIdealSize, /* BS_DEFSPLITBUTTON */ /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ - PB_GetIdealSize, /* BS_SPLITBUTTON */ - PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ PB_GetIdealSize, /* BS_COMMANDLINK */ PB_GetIdealSize /* BS_DEFCOMMANDLINK */ }; @@ -1347,6 +1348,25 @@ static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) return TRUE; } +static BOOL SB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG extra_width = infoPtr->glyph_size.cx * 2 + GetSystemMetrics(SM_CXEDGE); + SIZE label_size; + + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + size->cx = max(size->cx, extra_width); + } + else + { + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &label_size); + size->cx = label_size.cx + ((size->cx == 0) ? extra_width : 0); + size->cy = label_size.cy; + } + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects *

1 0

Gabriel Ivăncescu : comctl32/button: Implement split buttons.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: ee2f71d8f6f00d6252a8a1a37dc2c37806dc7f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2f71d8f6f00d6252a8a1a3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:29 2019 +0300 comctl32/button: Implement split buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20123 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee2f71d8f6f00d6252a8…

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: b6b78db30d65f46e9201f884702349e2f8e5b16b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b78db30d65f46e9201f884… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:50 2019 -0500 quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7ecf852..cbaf081 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -42,6 +42,13 @@ static IBaseFilter *create_vmr9(DWORD mode) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -235,6 +242,150 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HRESULT set_mixing_mode(IBaseFilter *filter) +{ + IVMRFilterConfig9 *config; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IVMRFilterConfig9_Release(config); + return hr; +} + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + } + + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -252,6 +403,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Nikolay Sivov : mferror: Consistently format error messages.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: a3fa08de6161e294f4161b70d6673b876fd2a215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3fa08de6161e294f4161b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 4 10:53:44 2019 +0300 mferror: Consistently format error messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 24 ++++++++++++------------ po/ar.po | 32 ++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++---------------- po/ca.po | 32 ++++++++++++++++++-------------- po/cs.po | 32 ++++++++++++++++++-------------- po/da.po | 32 ++++++++++++++++++-------------- po/de.po | 32 ++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++---------------- po/en.po | 48 ++++++++++++++++++++++++------------------------ po/en_US.po | 48 ++++++++++++++++++++++++------------------------ po/eo.po | 40 ++++++++++++++++++++++++---------------- po/es.po | 32 ++++++++++++++++++-------------- po/fa.po | 27 ++++++++++++++------------- po/fi.po | 32 ++++++++++++++++++-------------- po/fr.po | 32 ++++++++++++++++++-------------- po/he.po | 33 ++++++++++++++++++--------------- po/hi.po | 24 ++++++++++++------------ po/hr.po | 32 ++++++++++++++++++-------------- po/hu.po | 32 ++++++++++++++++++-------------- po/it.po | 32 ++++++++++++++++++-------------- po/ja.po | 32 ++++++++++++++++++-------------- po/ko.po | 32 ++++++++++++++++++-------------- po/lt.po | 48 ++++++++++++++++++++++++++++++++++++------------ po/ml.po | 28 +++++++++++++++------------- po/nb_NO.po | 32 ++++++++++++++++++-------------- po/nl.po | 32 ++++++++++++++++++-------------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 32 ++++++++++++++++++-------------- po/pt_BR.po | 32 ++++++++++++++++++-------------- po/pt_PT.po | 32 ++++++++++++++++++-------------- po/rm.po | 30 ++++++++++++++++-------------- po/ro.po | 32 ++++++++++++++++++-------------- po/ru.po | 32 ++++++++++++++++++-------------- po/si.po | 46 ++++++++++++++++++++++++++++++++-------------- po/sk.po | 32 ++++++++++++++++++-------------- po/sl.po | 32 ++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 37 +++++++++++++++++++++---------------- po/sr_RS(a)latin.po | 37 +++++++++++++++++++++---------------- po/sv.po | 32 ++++++++++++++++++-------------- po/ta.po | 24 ++++++++++++------------ po/te.po | 24 ++++++++++++------------ po/th.po | 33 ++++++++++++++++++--------------- po/tr.po | 32 ++++++++++++++++++-------------- po/uk.po | 32 ++++++++++++++++++-------------- po/wa.po | 27 ++++++++++++++------------- po/wine.pot | 24 ++++++++++++------------ po/zh_CN.po | 32 ++++++++++++++++++-------------- po/zh_TW.po | 32 ++++++++++++++++++-------------- 49 files changed, 887 insertions(+), 699 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3fa08de6161e294f416…

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 filter interfaces.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 8233e1166faa540199ac06ecb77579ff63a961a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8233e1166faa540199ac06ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:49 2019 -0500 quartz/tests: Add tests for VMR9 filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d642c6..7ecf852 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -24,6 +24,24 @@ #include "vmr9.h" #include "wine/test.h" +static IBaseFilter *create_vmr9(DWORD mode) +{ + IBaseFilter *filter = NULL; + IVMRFilterConfig9 *config; + HRESULT hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (mode) + { + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVMRFilterConfig9_SetRenderingMode(config, mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRFilterConfig9_Release(config); + } + return filter; +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -125,6 +143,98 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_vmr9(0); + ULONG ref; + + check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); + todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); + check_interface(filter, &IID_IVMRFilterConfig9, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDirectDrawVideo, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); + check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRMixerBitmap, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Windowless); + + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Renderless); + + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -141,6 +251,7 @@ START_TEST(vmr9) IBaseFilter_Release(filter); test_filter_config(); + test_interfaces(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 957111ef0a612508f65c70d1f91b928ac9969458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957111ef0a612508f65c70d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:48 2019 -0500 quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr9.c | 146 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ce59b73..1a12ffa 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ systemclock.c \ videorenderer.c \ vmr7.c \ + vmr9.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c new file mode 100644 index 0000000..2d642c6 --- /dev/null +++ b/dlls/quartz/tests/vmr9.c @@ -0,0 +1,146 @@ +/* + * Video Mixing Renderer 9 unit tests + * + * Copyright 2019 Zebediah Figura + * + * 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 + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig9 *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Renderless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr9) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter))) + { + skip("Failed to create VMR9, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_filter_config(); + + CoUninitialize(); +}

1 0

Gabriel Ivăncescu : comctl32/tests: Add tests for BCN_DROPDOWN notification.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: 09bdf5d07d2bb7f4f6c7eac08e1cc5f65d0a8694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09bdf5d07d2bb7f4f6c7eac0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:31 2019 +0300 comctl32/tests: Add tests for BCN_DROPDOWN notification. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 4de0769..bb9c87f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -186,6 +186,7 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam static HDC cd_first_hdc; struct message msg = { 0 }; NMCUSTOMDRAW *cd = (NMCUSTOMDRAW*)lParam; + NMBCDROPDOWN *bcd = (NMBCDROPDOWN*)lParam; LRESULT ret; if (ignore_message( message )) return 0; @@ -252,6 +253,29 @@ static LRESULT WINAPI test_parent_wndproc(HWND hwnd, UINT message, WPARAM wParam return ret; } + if (message == WM_NOTIFY && bcd->hdr.code == BCN_DROPDOWN) + { + UINT button = GetWindowLongW(bcd->hdr.hwndFrom, GWL_STYLE) & BS_TYPEMASK; + RECT rc; + + GetClientRect(bcd->hdr.hwndFrom, &rc); + + ok(bcd->hdr.hwndFrom != NULL, "Received BCN_DROPDOWN with no hwnd attached, wParam %lu id %lu\n", + wParam, bcd->hdr.idFrom); + ok(bcd->hdr.idFrom == wParam, "[%u] Mismatch between wParam (%lu) and idFrom (%lu)\n", + button, wParam, bcd->hdr.idFrom); + ok(EqualRect(&rc, &bcd->rcButton), "[%u] Wrong rcButton, expected %s got %s\n", + button, wine_dbgstr_rect(&rc), wine_dbgstr_rect(&bcd->rcButton)); + + msg.message = message; + msg.flags = sent|parent|wparam|lparam|id; + msg.wParam = wParam; + msg.lParam = lParam; + msg.id = BCN_DROPDOWN; + add_message(sequences, COMBINED_SEQ_INDEX, &msg); + return 0; + } + if (message == WM_PAINT) { PAINTSTRUCT ps; @@ -569,6 +593,20 @@ static const struct message pre_post_pre_post_cd_seq[] = { 0 } }; +static const struct message bcn_dropdown_seq[] = +{ + { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, + { BCM_SETDROPDOWNSTATE, sent|wparam|lparam|defwinproc, 1, 0 }, + { WM_NOTIFY, sent|parent|id, 0, 0, BCN_DROPDOWN }, + { BCM_SETDROPDOWNSTATE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_KEYUP, sent|wparam|lparam, VK_DOWN, 0xc0000000 }, + { WM_PAINT, sent }, + { WM_DRAWITEM, sent|parent|optional }, /* for owner draw button */ + { WM_PAINT, sent|optional }, /* sometimes sent rarely */ + { WM_DRAWITEM, sent|parent|optional }, + { 0 } +}; + static HWND create_button(DWORD style, HWND parent) { HMENU menuid = 0; @@ -932,6 +970,17 @@ static void test_button_messages(void) } disable_test_cd(); + + if (!broken(LOBYTE(LOWORD(GetVersion())) < 6)) /* not available pre-Vista */ + { + /* Send down arrow key to make the buttons send the drop down notification */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); + SendMessageW(hwnd, WM_KEYUP, VK_DOWN, 0xc0000000); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, bcn_dropdown_seq, "BCN_DROPDOWN from the button", FALSE); + } + DestroyWindow(hwnd); }

1 0

Gabriel Ivăncescu : comctl32/tests: Also test for split buttons when testing BCM_GETIDEALSIZE.
by Alexandre Julliard April 4, 2019

April 4, 2019

Module: wine Branch: master Commit: e41cb8e9947f97ed5b286954c93c92872837fb36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41cb8e9947f97ed5b286954… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:33 2019 +0300 comctl32/tests: Also test for split buttons when testing BCM_GETIDEALSIZE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 223 +++++++++++++++++++++++++------------------ 1 file changed, 130 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e41cb8e9947f97ed5b28…

1 0