Ros-diffs October 2019

ros-diffs@reactos.org

23 participants
180 discussions

[reactos] 01/01: [NTOS] Fix a bug in the PE loader, which caused images to be loaded up to MmHighestUserAddress, thus overwriting the shared user page.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56da95671ce87fc3c9fff… commit 56da95671ce87fc3c9fffbf33f411759ce330e49 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 21 00:36:14 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 26 21:38:13 2019 +0200 [NTOS] Fix a bug in the PE loader, which caused images to be loaded up to MmHighestUserAddress, thus overwriting the shared user page. This is now fixed by using MM_HIGHEST_VAD_ADDRESS as the margin instead. Should fix CORE-11717 --- ntoskrnl/mm/section.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 1d7a043c2a1..8278226b074 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -4579,11 +4579,11 @@ MmMapViewOfSection(IN PVOID SectionObject, ImageSectionObject->ImageInformation.ImageFileSize = (ULONG)ImageSize; /* Check for an illegal base address */ - if (((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) || + if (((ImageBase + ImageSize) > (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS) || ((ImageBase + ImageSize) < ImageSize)) { ASSERT(*BaseAddress == NULL); - ImageBase = ALIGN_DOWN_BY((ULONG_PTR)MmHighestUserAddress - ImageSize, + ImageBase = ALIGN_DOWN_BY((ULONG_PTR)MM_HIGHEST_VAD_ADDRESS - ImageSize, MM_VIRTMEM_GRANULARITY); NotAtBase = TRUE; }

4 years, 10 months

[reactos] 01/01: [D3DCOMPILER_43_WINETEST] Make sure d3dcommon.h is generated before we get to compiling this module.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3f1265f8c1efd80a27969… commit 3f1265f8c1efd80a27969150a5807ee8a8da1dda Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:19:05 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:19:05 2019 +0100 [D3DCOMPILER_43_WINETEST] Make sure d3dcommon.h is generated before we get to compiling this module. --- modules/rostests/winetests/d3dcompiler_43/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/winetests/d3dcompiler_43/CMakeLists.txt b/modules/rostests/winetests/d3dcompiler_43/CMakeLists.txt index 2fe06983fcc..f2dbf6b067d 100644 --- a/modules/rostests/winetests/d3dcompiler_43/CMakeLists.txt +++ b/modules/rostests/winetests/d3dcompiler_43/CMakeLists.txt @@ -9,5 +9,6 @@ add_executable(d3dcompiler_43_winetest testlist.c) set_module_type(d3dcompiler_43_winetest win32cui) +add_dependencies(d3dcompiler_43_winetest d3d_idl_headers) add_importlibs(d3dcompiler_43_winetest d3d9 d3dx9_43 user32 msvcrt kernel32) add_rostests_file(TARGET d3dcompiler_43_winetest)

4 years, 10 months

[reactos] 01/01: [ATL] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51373fdd8680f09c79a4a… commit 51373fdd8680f09c79a4a3cd317ad897136f9de5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:08:57 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:08:57 2019 +0100 [ATL] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/atl/atl.c | 3 +-- dll/win32/atl/atl30.c | 5 ++--- dll/win32/atl/atl_ax.c | 25 ++++++++++++------------- dll/win32/atl/registrar.c | 25 ++++++++++++------------- media/doc/README.WINE | 2 +- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/dll/win32/atl/atl.c b/dll/win32/atl/atl.c index 4acee5de3c1..6461d69fc33 100644 --- a/dll/win32/atl/atl.c +++ b/dll/win32/atl/atl.c @@ -24,7 +24,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #ifdef __REACTOS__ #include <wingdi.h> @@ -351,7 +350,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex, TRACE("(%p %s %p %p)\n", inst, debugstr_w(lpszIndex), pbstrPath, ppTypeLib); - index_len = lpszIndex ? strlenW(lpszIndex) : 0; + index_len = lpszIndex ? lstrlenW(lpszIndex) : 0; path = heap_alloc((MAX_PATH+index_len)*sizeof(WCHAR) + sizeof(tlb_extW)); if(!path) return E_OUTOFMEMORY; diff --git a/dll/win32/atl/atl30.c b/dll/win32/atl/atl30.c index dcdddd96326..06504d09940 100644 --- a/dll/win32/atl/atl30.c +++ b/dll/win32/atl/atl30.c @@ -29,7 +29,6 @@ #include "wine/atlwin.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -314,7 +313,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - snprintf(wci->m_szAutoName, sizeof(wci->m_szAutoName), "ATL%08lx", (UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -374,7 +373,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - snprintfW(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); + swprintf(wci->m_szAutoName, szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } diff --git a/dll/win32/atl/atl_ax.c b/dll/win32/atl/atl_ax.c index ef81d4d8510..eabf8942a9c 100644 --- a/dll/win32/atl/atl_ax.c +++ b/dll/win32/atl/atl_ax.c @@ -38,7 +38,6 @@ #include "wine/atlwin.h" #include "shlwapi.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -1023,7 +1022,7 @@ static enum content get_content_type(LPCOLESTR name, CLSID *control_id) return IsURL; } - if (!strncmpiW(name, mshtml_prefixW, 7)) + if (!_wcsnicmp(name, mshtml_prefixW, 7)) { FIXME("mshtml prefix not implemented\n"); *control_id = CLSID_WebBrowser; @@ -1211,16 +1210,16 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) if ( GET_WORD(src) == 0xFFFF ) /* menu */ src += 2; else - src += strlenW(src) + 1; + src += lstrlenW(src) + 1; if ( GET_WORD(src) == 0xFFFF ) /* class */ src += 2; else - src += strlenW(src) + 1; - src += strlenW(src) + 1; /* title */ + src += lstrlenW(src) + 1; + src += lstrlenW(src) + 1; /* title */ if ( style & (DS_SETFONT | DS_SHELLFONT) ) { src += 3; - src += strlenW(src) + 1; + src += lstrlenW(src) + 1; } } else { ext = FALSE; @@ -1231,16 +1230,16 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) if ( GET_WORD(src) == 0xFFFF ) /* menu */ src += 2; else - src += strlenW(src) + 1; + src += lstrlenW(src) + 1; if ( GET_WORD(src) == 0xFFFF ) /* class */ src += 2; else - src += strlenW(src) + 1; - src += strlenW(src) + 1; /* title */ + src += lstrlenW(src) + 1; + src += lstrlenW(src) + 1; /* title */ if ( style & DS_SETFONT ) { src++; - src += strlenW(src) + 1; + src += lstrlenW(src) + 1; } } PUT_BLOCK(tmp, src-tmp); @@ -1263,14 +1262,14 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) src += 2; } else { - src += strlenW(src) + 1; + src += lstrlenW(src) + 1; } - src += strlenW(src) + 1; /* title */ + src += lstrlenW(src) + 1; /* title */ if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); - PUT_BLOCK(tmp, strlenW(tmp)+1); + PUT_BLOCK(tmp, lstrlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); diff --git a/dll/win32/atl/registrar.c b/dll/win32/atl/registrar.c index d96bd340860..c7bfc2b1234 100644 --- a/dll/win32/atl/registrar.c +++ b/dll/win32/atl/registrar.c @@ -21,7 +21,6 @@ #include "wine/atlbase.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -107,7 +106,7 @@ static HRESULT get_word(LPCOLESTR *str, strbuf *buf) buf->len = 0; buf->str[0] = '\0'; - while(isspaceW(*iter2)) + while(iswspace(*iter2)) iter2++; iter = iter2; if(!*iter) { @@ -119,7 +118,7 @@ static HRESULT get_word(LPCOLESTR *str, strbuf *buf) strbuf_write(iter++, buf, 1); }else if(*iter == '\'') { iter2 = ++iter; - iter = strchrW(iter, '\''); + iter = wcschr(iter, '\''); if(!iter) { WARN("Unexpected end of script\n"); *str = iter; @@ -128,12 +127,12 @@ static HRESULT get_word(LPCOLESTR *str, strbuf *buf) strbuf_write(iter2, buf, iter-iter2); iter++; }else { - while(*iter && !isspaceW(*iter)) + while(*iter && !iswspace(*iter)) iter++; strbuf_write(iter2, buf, iter-iter2); } - while(isspaceW(*iter)) + while(iswspace(*iter)) iter++; *str = iter; return S_OK; @@ -145,14 +144,14 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) rep_list *rep_iter; static const WCHAR wstr[] = {'%',0}; - iter = strchrW(data, '%'); + iter = wcschr(data, '%'); while(iter) { strbuf_write(iter2, buf, iter-iter2); iter2 = ++iter; if(!*iter2) return DISP_E_EXCEPTION; - iter = strchrW(iter2, '%'); + iter = wcschr(iter2, '%'); if(!iter) return DISP_E_EXCEPTION; @@ -161,7 +160,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 - && !memicmpW(iter2, rep_iter->key, rep_iter->key_len)) + && !_wcsnicmp(iter2, rep_iter->key, rep_iter->key_len)) break; } if(!rep_iter) { @@ -173,7 +172,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) } iter2 = ++iter; - iter = strchrW(iter, '%'); + iter = wcschr(iter, '%'); } strbuf_write(iter2, buf, -1); @@ -280,7 +279,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO hres = get_word(&iter, buf); if(FAILED(hres)) break; - dw = atoiW(buf->str); + dw = wcstol(buf->str, NULL, 10); lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) { @@ -305,14 +304,14 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO } for(i = 0; i < count && buf->str[2*i]; i++) { WCHAR digits[3]; - if(!isxdigitW(buf->str[2*i]) || !isxdigitW(buf->str[2*i + 1])) { + if(!iswxdigit(buf->str[2*i]) || !iswxdigit(buf->str[2*i + 1])) { hres = E_FAIL; break; } digits[0] = buf->str[2*i]; digits[1] = buf->str[2*i + 1]; digits[2] = 0; - bytes[i] = (BYTE) strtoulW(digits, NULL, 16); + bytes[i] = (BYTE) wcstoul(digits, NULL, 16); } if(SUCCEEDED(hres)) { lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_BINARY, @@ -344,7 +343,7 @@ static HRESULT do_process_key(LPCOLESTR *pstr, HKEY parent_key, strbuf *buf, BOO break; } - if(key_type != IS_VAL && key_type != DO_DELETE && *iter == '{' && isspaceW(iter[1])) { + if(key_type != IS_VAL && key_type != DO_DELETE && *iter == '{' && iswspace(iter[1])) { hres = get_word(&iter, buf); if(FAILED(hres)) break; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 1f4ff18efaf..aaf193814b9 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -46,7 +46,7 @@ dll/directx/wine/wined3d # Synced to WineStaging-3.3 dll/win32/activeds # Synced to WineStaging-4.18 dll/win32/actxprxy # Synced to WineStaging-3.3 dll/win32/advpack # Synced to WineStaging-4.18 -dll/win32/atl # Synced to WineStaging-4.0 +dll/win32/atl # Synced to WineStaging-4.18 dll/win32/atl80 # Synced to WineStaging-3.3 dll/win32/atl100 # Synced to WineStaging-3.3 dll/win32/avifil32 # Synced to WineStaging-4.0

4 years, 10 months

[reactos] 01/01: [ADVPACK_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=14d97256f4314e5725d12… commit 14d97256f4314e5725d126d15d879296557749d8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:08:29 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:08:29 2019 +0100 [ADVPACK_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/advpack/advpack.c b/modules/rostests/winetests/advpack/advpack.c index 8d7c5ebb485..5bd39f76fdb 100644 --- a/modules/rostests/winetests/advpack/advpack.c +++ b/modules/rostests/winetests/advpack/advpack.c @@ -189,14 +189,14 @@ static void delnode_test(void) ok (hr == S_OK, "DelNode failed deleting a directory containing multiple files\n"); } -static void append_str(char **str, const char *data, ...) +static void WINAPIV append_str(char **str, const char *data, ...) { - va_list valist; + __ms_va_list valist; - va_start(valist, data); + __ms_va_start(valist, data); vsprintf(*str, data, valist); *str += strlen(*str); - va_end(valist); + __ms_va_end(valist); } static void create_inf_file(void)

4 years, 10 months

[reactos] 01/01: [ADVPACK] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa8d16a0eb52a6fe3d496… commit fa8d16a0eb52a6fe3d49671f8f69d51d7d341a15 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:08:05 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:08:05 2019 +0100 [ADVPACK] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/advpack/advpack.c | 10 +++++----- dll/win32/advpack/files.c | 4 ++-- dll/win32/advpack/install.c | 17 ++++++++--------- dll/win32/advpack/precomp.h | 2 +- dll/win32/advpack/reg.c | 10 +++++----- media/doc/README.WINE | 2 +- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dll/win32/advpack/advpack.c b/dll/win32/advpack/advpack.c index 2e8027f6402..f2de8a6b257 100644 --- a/dll/win32/advpack/advpack.c +++ b/dll/win32/advpack/advpack.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -29,7 +30,6 @@ #include "winnls.h" #include "setupapi.h" #include "advpub.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "advpack_private.h" @@ -139,7 +139,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) /* SetupGetLineTextW returns the value if there is only one key, but * returns the whole line if there is more than one key */ - if (!(value = strchrW(line, '='))) + if (!(value = wcschr(line, '='))) { SetupGetStringFieldW(&context, 0, NULL, 0, &size); key = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); @@ -158,10 +158,10 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) value++; /* Extract the flags */ - ptr = strchrW(value, ','); + ptr = wcschr(value, ','); if (ptr) { *ptr = '\0'; - flags = atolW(ptr+1); + flags = wcstol(ptr+1, NULL, 10); } /* set dest to pszWorkingDir if key is SourceDir */ @@ -177,7 +177,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) /* set all ldids to dest */ while ((ptr = get_parameter(&key, ',', FALSE))) { - ldid = atolW(ptr); + ldid = wcstol(ptr, NULL, 10); SetupSetDirectoryIdW(hInf, ldid, dest); } HeapFree(GetProcessHeap(), 0, key_copy); diff --git a/dll/win32/advpack/files.c b/dll/win32/advpack/files.c index c5efbb25642..3e4cb366007 100644 --- a/dll/win32/advpack/files.c +++ b/dll/win32/advpack/files.c @@ -25,13 +25,13 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "winnls.h" #include "winver.h" #include "winternl.h" #include "setupapi.h" #include "advpub.h" #include "fdi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -505,7 +505,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT szFlags = get_parameter(&cmdline_ptr, ',', TRUE); if (szFlags) - dwFlags = atolW(szFlags); + dwFlags = wcstol(szFlags, NULL, 10); res = DelNodeW(szFilename, dwFlags); diff --git a/dll/win32/advpack/install.c b/dll/win32/advpack/install.c index c3caf3ae7eb..70dc4d74aa6 100644 --- a/dll/win32/advpack/install.c +++ b/dll/win32/advpack/install.c @@ -31,7 +31,6 @@ #include "advpub.h" #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -207,7 +206,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) if (quoted && *token == '"') { - WCHAR *end = strchrW(token + 1, '"'); + WCHAR *end = wcschr(token + 1, '"'); if (end) { *end = 0; @@ -216,7 +215,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) } } - *params = strchrW(*params, separator); + *params = wcschr(*params, separator); if (*params) *(*params)++ = '\0'; @@ -397,7 +396,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work static const WCHAR backslash[] = {'\\',0}; static const WCHAR inf_dir[] = {'\\','I','N','F',0}; - if ((ptr = strrchrW(inf_filename, '\\'))) + if ((ptr = wcsrchr(inf_filename, '\\'))) { len = ptr - inf_filename + 1; ptr = inf_filename; @@ -451,7 +450,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 }; - if (!(ptr = strrchrW(inf_filename, '\\'))) + if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; len = lstrlenW(ptr); @@ -493,7 +492,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, lstrcatW(info->inf_path, backslash); lstrcatW(info->inf_path, info->inf_filename); - /* RunSetupCommand opens unmodifed filename parameter */ + /* RunSetupCommand opens unmodified filename parameter */ if (flags & RSC_FLAG_INF) path = inf_filename; else @@ -769,7 +768,7 @@ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT sho str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) { - DWORD inf_flags = atolW(str_flags); + DWORD inf_flags = wcstol(str_flags, NULL, 10); if (inf_flags & LIS_QUIET) flags |= RSC_FLAG_QUIET; if (inf_flags & LIS_NOGRPCONV) flags |= RSC_FLAG_NGCONV; } @@ -867,7 +866,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, I flags = get_parameter(&cmdline_ptr, ',', TRUE); if (flags) - cabinfo.dwFlags = atolW(flags); + cabinfo.dwFlags = wcstol(flags, NULL, 10); if (!is_full_path(cabinfo.pszCab) && !is_full_path(cabinfo.pszInf)) { @@ -883,7 +882,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, I else lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); - ptr = strrchrW(cabinfo.szSrcPath, '\\'); + ptr = wcsrchr(cabinfo.szSrcPath, '\\'); *(++ptr) = '\0'; } diff --git a/dll/win32/advpack/precomp.h b/dll/win32/advpack/precomp.h index a1c236fe339..99f9b22c4f5 100644 --- a/dll/win32/advpack/precomp.h +++ b/dll/win32/advpack/precomp.h @@ -12,11 +12,11 @@ #include <winbase.h> #include <winuser.h> #include <winreg.h> +#include <winnls.h> #include <winternl.h> #include <advpub.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "advpack_private.h" diff --git a/dll/win32/advpack/reg.c b/dll/win32/advpack/reg.c index 82c1d2b6e8c..d6c4a6d36ad 100644 --- a/dll/win32/advpack/reg.c +++ b/dll/win32/advpack/reg.c @@ -22,11 +22,11 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winnls.h" #include "winerror.h" #include "winuser.h" #include "winternl.h" #include "advpub.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -186,16 +186,16 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) *sys_root = '\0'; GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); - if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) + if(!_wcsnicmp(sys_root, mod_path + 1, lstrlenW(sys_root))) { *sys_mod_path = '\"'; - strcpyW(sys_mod_path + 1, escaped_SystemRoot); - strcatW(sys_mod_path, mod_path + 1 + strlenW(sys_root)); + lstrcpyW(sys_mod_path + 1, escaped_SystemRoot); + lstrcatW(sys_mod_path, mod_path + 1 + lstrlenW(sys_root)); } else { FIXME("SYS_MOD_PATH needs more work\n"); - strcpyW(sys_mod_path, mod_path); + lstrcpyW(sys_mod_path, mod_path); } WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, ini_path); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index e9355bf8981..1f4ff18efaf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -45,7 +45,7 @@ dll/directx/wine/wined3d # Synced to WineStaging-3.3 dll/win32/activeds # Synced to WineStaging-4.18 dll/win32/actxprxy # Synced to WineStaging-3.3 -dll/win32/advpack # Synced to WineStaging-4.0 +dll/win32/advpack # Synced to WineStaging-4.18 dll/win32/atl # Synced to WineStaging-4.0 dll/win32/atl80 # Synced to WineStaging-3.3 dll/win32/atl100 # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [ACTIVEDS] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8f780a9dbe94836956e2… commit a8f780a9dbe94836956e27b6c0ca71afa61daf10 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:07:38 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:07:38 2019 +0100 [ACTIVEDS] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/activeds/activeds_main.c | 1 - media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/activeds/activeds_main.c b/dll/win32/activeds/activeds_main.c index 15a329e99c4..69c5c447dcc 100644 --- a/dll/win32/activeds/activeds_main.c +++ b/dll/win32/activeds/activeds_main.c @@ -33,7 +33,6 @@ #include "iads.h" #include "adshlp.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(activeds); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 597a03c0c75..e9355bf8981 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -43,7 +43,7 @@ dll/directx/wine/qedit # Synced to WineStaging-3.17 dll/directx/wine/quartz # Synced to WineStaging-3.9 dll/directx/wine/wined3d # Synced to WineStaging-3.3 -dll/win32/activeds # Synced to WineStaging-3.3 +dll/win32/activeds # Synced to WineStaging-4.18 dll/win32/actxprxy # Synced to WineStaging-3.3 dll/win32/advpack # Synced to WineStaging-4.0 dll/win32/atl # Synced to WineStaging-4.0

4 years, 10 months

[reactos] 01/01: [D3DXOF] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee5f98cc007d162c34062… commit ee5f98cc007d162c340623e9200a491417b6fb1b Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:07:07 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:07:07 2019 +0100 [D3DXOF] Sync with Wine Staging 4.18. CORE-16441 --- dll/directx/wine/d3dxof/d3dxof.c | 5 ++- dll/directx/wine/d3dxof/d3dxof_private.h | 2 +- dll/directx/wine/d3dxof/parsing.c | 53 ++++++++++++++++---------------- dll/directx/wine/d3dxof/precomp.h | 2 -- media/doc/README.WINE | 2 +- 5 files changed, 30 insertions(+), 34 deletions(-) diff --git a/dll/directx/wine/d3dxof/d3dxof.c b/dll/directx/wine/d3dxof/d3dxof.c index 549955193a5..e16b0d802f3 100644 --- a/dll/directx/wine/d3dxof/d3dxof.c +++ b/dll/directx/wine/d3dxof/d3dxof.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS @@ -264,7 +263,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } *ppEnumObj = &object->IDirectXFileEnumObject_iface; @@ -343,7 +342,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } hr = DXFILE_OK; diff --git a/dll/directx/wine/d3dxof/d3dxof_private.h b/dll/directx/wine/d3dxof/d3dxof_private.h index cf33ed21cea..ff29261b608 100644 --- a/dll/directx/wine/d3dxof/d3dxof_private.h +++ b/dll/directx/wine/d3dxof/d3dxof_private.h @@ -130,7 +130,7 @@ typedef struct { BOOL list_separator; ULONG cur_pos_data; LPBYTE cur_pstrings; - BYTE value[100]; + BYTE value[512]; xobject** pxo_globals; ULONG nb_pxo_globals; xobject* pxo_tab; diff --git a/dll/directx/wine/d3dxof/parsing.c b/dll/directx/wine/d3dxof/parsing.c index f7724ec1913..520dc5f7845 100644 --- a/dll/directx/wine/d3dxof/parsing.c +++ b/dll/directx/wine/d3dxof/parsing.c @@ -18,14 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "wine/debug.h" #define COBJMACROS #include "winbase.h" #include "wingdi.h" +#include "wine/winternl.h" #include "d3dxof_private.h" #include "dxfile.h" @@ -132,38 +131,38 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) clsid = &ptemplate->class_id; - DPRINTF("template %s\n", ptemplate->name); - DPRINTF("{\n"); - DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + wine_dbg_printf("template %s\n", ptemplate->name); + wine_dbg_printf("{\n"); + wine_dbg_printf(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); for (j = 0; j < ptemplate->nb_members; j++) { if (ptemplate->members[j].nb_dims) - DPRINTF("array "); + wine_dbg_printf("array "); if (ptemplate->members[j].type == TOKEN_NAME) - DPRINTF("%s ", templates_array[ptemplate->members[j].idx_template].name); + wine_dbg_printf("%s ", templates_array[ptemplate->members[j].idx_template].name); else - DPRINTF("%s ", get_primitive_string(ptemplate->members[j].type)); - DPRINTF("%s", ptemplate->members[j].name); + wine_dbg_printf("%s ", get_primitive_string(ptemplate->members[j].type)); + wine_dbg_printf("%s", ptemplate->members[j].name); for (k = 0; k < ptemplate->members[j].nb_dims; k++) { if (ptemplate->members[j].dim_fixed[k]) - DPRINTF("[%d]", ptemplate->members[j].dim_value[k]); + wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]); else - DPRINTF("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); + wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); } - DPRINTF(";\n"); + wine_dbg_printf(";\n"); } if (ptemplate->open) - DPRINTF("[...]\n"); + wine_dbg_printf("[...]\n"); else if (ptemplate->nb_children) { - DPRINTF("[%s", ptemplate->children[0]); + wine_dbg_printf("[%s", ptemplate->children[0]); for (j = 1; j < ptemplate->nb_children; j++) - DPRINTF(",%s", ptemplate->children[j]); - DPRINTF("]\n"); + wine_dbg_printf(",%s", ptemplate->children[j]); + wine_dbg_printf("]\n"); } - DPRINTF("}\n"); + wine_dbg_printf("}\n"); } static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) @@ -405,7 +404,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 +971,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 +1175,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; @@ -1208,13 +1207,13 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_WORD) { - *(((WORD*)(buf->pdata + buf->cur_pos_data))) = (WORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 2; + *(WORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 2; } else if (pt->members[i].type == TOKEN_DWORD) { - *(((DWORD*)(buf->pdata + buf->cur_pos_data))) = (DWORD)(*(DWORD*)buf->value); - buf->cur_pos_data += 4; + *(DWORD *)(buf->pdata + buf->cur_pos_data) = *(DWORD *)buf->value; + buf->cur_pos_data += 4; } else { @@ -1230,8 +1229,8 @@ static BOOL parse_object_members_list(parse_buffer * buf) return FALSE; if (pt->members[i].type == TOKEN_FLOAT) { - *(((float*)(buf->pdata + buf->cur_pos_data))) = (float)(*(float*)buf->value); - buf->cur_pos_data += 4; + *(float *)(buf->pdata + buf->cur_pos_data) = *(float *)buf->value; + buf->cur_pos_data += 4; } else { @@ -1392,7 +1391,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); diff --git a/dll/directx/wine/d3dxof/precomp.h b/dll/directx/wine/d3dxof/precomp.h index a7878468b98..722cf3a7d7e 100644 --- a/dll/directx/wine/d3dxof/precomp.h +++ b/dll/directx/wine/d3dxof/precomp.h @@ -2,8 +2,6 @@ #ifndef _D3DXOF_PRECOMP_H_ #define _D3DXOF_PRECOMP_H_ -#include <wine/config.h> - #include <stdio.h> #define WIN32_NO_STATUS diff --git a/media/doc/README.WINE b/media/doc/README.WINE index a2ab499a1bb..597a03c0c75 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -27,7 +27,7 @@ dll/directx/wine/d3d9 # Synced to WineStaging-3.3 dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-4.18 dll/directx/wine/d3drm # Synced to WineStaging-4.18 dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-4.0 -dll/directx/wine/d3dxof # Synced to WineStaging-3.17 +dll/directx/wine/d3dxof # Synced to WineStaging-4.18 dll/directx/wine/ddraw # Synced to WineStaging-3.3 dll/directx/wine/devenum # Synced to WineStaging-4.18 dll/directx/wine/dinput # Synced to WineStaging-4.18

4 years, 10 months

[reactos] 01/01: [MSDMO] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b25254dcdaf00316b9afb… commit b25254dcdaf00316b9afb6c4b994270c4c1b9eb4 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:06:37 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:06:37 2019 +0100 [MSDMO] Sync with Wine Staging 4.18. CORE-16441 --- dll/directx/wine/msdmo/dmoreg.c | 20 +++++++++++--------- media/doc/README.WINE | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/directx/wine/msdmo/dmoreg.c b/dll/directx/wine/msdmo/dmoreg.c index 864cb859e60..34532f58cff 100644 --- a/dll/directx/wine/msdmo/dmoreg.c +++ b/dll/directx/wine/msdmo/dmoreg.c @@ -27,7 +27,6 @@ #include "winerror.h" #include "winreg.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dmo.h" @@ -121,7 +120,7 @@ static HRESULT string_to_guid(const WCHAR *string, GUID *guid) { WCHAR buffer[39]; buffer[0] = '{'; - strcpyW(buffer + 1, string); + lstrcpyW(buffer + 1, string); buffer[37] = '}'; buffer[38] = 0; return CLSIDFromString(buffer, guid); @@ -218,7 +217,7 @@ HRESULT WINAPI DMORegister( /* Set default Name value */ ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, - (strlenW(szName) + 1) * sizeof(WCHAR)); + (lstrlenW(szName) + 1) * sizeof(WCHAR)); /* Set InputTypes */ hres = write_types(hkey, szDMOInputType, pInTypes, cInTypes); @@ -530,7 +529,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); - if (!pCLSID || !Names) + if (!pCLSID) return E_POINTER; if (!pcItemsFetched && cItemsToFetch > 1) @@ -656,14 +655,17 @@ static HRESULT WINAPI IEnumDMO_fnNext( } /* Media object wasn't filtered so add it to return list */ - Names[count] = NULL; len = MAX_PATH * sizeof(WCHAR); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); - if (ERROR_SUCCESS == ret) + if (Names) { - Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); - if (Names[count]) - strcpyW(Names[count], szValue); + Names[count] = NULL; + if (ret == ERROR_SUCCESS) + { + Names[count] = CoTaskMemAlloc((lstrlenW(szValue) + 1) * sizeof(WCHAR)); + if (Names[count]) + lstrcpyW(Names[count], szValue); + } } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index c61431446bb..a2ab499a1bb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -38,7 +38,7 @@ dll/directx/wine/dplayx # Synced to WineStaging-4.18 dll/directx/wine/dpnhpast # Synced to WineStaging-4.18 dll/directx/wine/dsound # Synced to Wine-1.3.29 dll/directx/wine/dxdiagn # Synced to WineStaging-4.18 -dll/directx/wine/msdmo # Synced to WineStaging-3.17 +dll/directx/wine/msdmo # Synced to WineStaging-4.18 dll/directx/wine/qedit # Synced to WineStaging-3.17 dll/directx/wine/quartz # Synced to WineStaging-3.9 dll/directx/wine/wined3d # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [DXDIAGN_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5765ed9cbde1a8cbff59… commit e5765ed9cbde1a8cbff5963386c5f0d25cc9fca1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:06:11 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:06:11 2019 +0100 [DXDIAGN_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/dxdiagn/container.c | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/rostests/winetests/dxdiagn/container.c b/modules/rostests/winetests/dxdiagn/container.c index 2e58493a8fb..8088546ac73 100644 --- a/modules/rostests/winetests/dxdiagn/container.c +++ b/modules/rostests/winetests/dxdiagn/container.c @@ -163,7 +163,7 @@ static void test_EnumChildContainerNames(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); @@ -183,7 +183,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer to be untouched, got %s\n", wine_dbgstr_w(container)); memcpy(container, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(container, zerotestW, sizeof(zerotestW)), @@ -226,7 +226,7 @@ static void test_EnumChildContainerNames(void) "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); /* Get the container name to compare against. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); @@ -298,7 +298,7 @@ static void test_GetChildContainer(void) ok(child == NULL, "Expected output pointer to be NULL, got %p\n", child); /* Get the name of a suitable child container. */ - hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) @@ -372,7 +372,7 @@ static void test_dot_parsing(void) { IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, sizeof(containerbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, ARRAY_SIZE(containerbufW)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -385,7 +385,7 @@ static void test_dot_parsing(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, sizeof(childbufW)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, ARRAY_SIZE(childbufW)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); IDxDiagContainer_Release(child); @@ -404,7 +404,7 @@ static void test_dot_parsing(void) trace("Testing IDxDiagContainer::GetChildContainer dot parsing with container %s and child container %s.\n", wine_dbgstr_w(containerbufW), wine_dbgstr_w(childbufW)); - for (i = 0; i < sizeof(test_strings)/sizeof(test_strings[0]); i++) + for (i = 0; i < ARRAY_SIZE(test_strings); i++) { IDxDiagContainer *child; char containerbufA[256]; @@ -415,7 +415,7 @@ static void test_dot_parsing(void) WideCharToMultiByte(CP_ACP, 0, containerbufW, -1, containerbufA, sizeof(containerbufA), NULL, NULL); WideCharToMultiByte(CP_ACP, 0, childbufW, -1, childbufA, sizeof(childbufA), NULL, NULL); sprintf(dotbufferA, test_strings[i].format, containerbufA, childbufA); - MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, sizeof(dotbufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, ARRAY_SIZE(dotbufferW)); trace("Trying container name %s\n", wine_dbgstr_w(dotbufferW)); hr = IDxDiagContainer_GetChildContainer(pddc, dotbufferW, &child); @@ -456,7 +456,7 @@ static void test_EnumPropNames(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -498,7 +498,7 @@ static void test_EnumPropNames(void) "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); memcpy(property, testW, sizeof(testW)); - hr = IDxDiagContainer_EnumPropNames(child, ~0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, ~0, property, ARRAY_SIZE(property)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); ok(!memcmp(property, testW, sizeof(testW)), "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); @@ -531,7 +531,7 @@ static void test_EnumPropNames(void) ok(property[0] == '\0', "Expected the property buffer string to be empty, got %s\n", wine_dbgstr_w(property)); - hr = IDxDiagContainer_EnumPropNames(child, index, temp, sizeof(temp)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, index, temp, ARRAY_SIZE(temp)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumPropNames to return S_OK, got 0x%08x\n", hr); @@ -601,7 +601,7 @@ static void test_GetProp(void) for (index = 0; index < count; index++) { - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); if (FAILED(hr)) { @@ -614,7 +614,7 @@ static void test_GetProp(void) if (SUCCEEDED(hr)) { - hr = IDxDiagContainer_EnumPropNames(child, 0, property, sizeof(property)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumPropNames(child, 0, property, ARRAY_SIZE(property)); ok(hr == S_OK || hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); @@ -750,10 +750,10 @@ static void test_root_children(void) goto cleanup; } - ok(count == sizeof(root_children)/sizeof(root_children[0]), + ok(count == ARRAY_SIZE(root_children), "Got unexpected count %u for the number of child containers\n", count); - if (count != sizeof(root_children)/sizeof(root_children[0])) + if (count != ARRAY_SIZE(root_children)) { skip("Received unexpected number of child containers\n"); goto cleanup; @@ -763,7 +763,7 @@ static void test_root_children(void) { WCHAR container[256]; - hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, ARRAY_SIZE(container)); if (hr == E_INVALIDARG) { ok(index == count, @@ -920,7 +920,7 @@ static void test_DxDiag_SystemInfo(void) if (hr == S_OK) { trace("Testing container DxDiag_SystemInfo\n"); - test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(container, property_tests, ARRAY_SIZE(property_tests)); container2 = NULL; hr = IDxDiagContainer_GetChildContainer(container, empty, &container2); @@ -1019,7 +1019,7 @@ static void test_DxDiag_DisplayDevices(void) WCHAR child_container[256]; IDxDiagContainer *child; - hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + hr = IDxDiagContainer_EnumChildContainerNames(display_cont, i, child_container, ARRAY_SIZE(child_container)); ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); hr = IDxDiagContainer_GetChildContainer(display_cont, child_container, &child); @@ -1028,7 +1028,7 @@ static void test_DxDiag_DisplayDevices(void) if (hr == S_OK) { trace("Testing container %s\n", wine_dbgstr_w(child_container)); - test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); } IDxDiagContainer_Release(child); }

4 years, 10 months

[reactos] 01/01: [DXDIAGN] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6c879a0e0d08d5dae37c… commit d6c879a0e0d08d5dae37c9b7f9a8e56505cd7291 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 26 13:05:45 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Oct 26 13:05:45 2019 +0100 [DXDIAGN] Sync with Wine Staging 4.18. CORE-16441 --- dll/directx/wine/dxdiagn/CMakeLists.txt | 3 +- dll/directx/wine/dxdiagn/container.c | 20 +--- dll/directx/wine/dxdiagn/dxdiag_main.c | 1 - dll/directx/wine/dxdiagn/fil_data.idl | 47 ---------- dll/directx/wine/dxdiagn/guid.c | 2 +- dll/directx/wine/dxdiagn/precomp.h | 2 - dll/directx/wine/dxdiagn/provider.c | 158 +++++++++++++++++--------------- media/doc/README.WINE | 2 +- 8 files changed, 93 insertions(+), 142 deletions(-) diff --git a/dll/directx/wine/dxdiagn/CMakeLists.txt b/dll/directx/wine/dxdiagn/CMakeLists.txt index 34c3b637378..16fdc1f73a8 100644 --- a/dll/directx/wine/dxdiagn/CMakeLists.txt +++ b/dll/directx/wine/dxdiagn/CMakeLists.txt @@ -2,7 +2,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(dxdiagn.dll dxdiagn.spec) -add_idl_headers(dxdiagn_idlheader fil_data.idl) list(APPEND SOURCE container.c @@ -18,7 +17,7 @@ add_library(dxdiagn MODULE set_module_type(dxdiagn win32dll) target_link_libraries(dxdiagn strmiids dxguid uuid wine) -add_dependencies(dxdiagn dxdiagn_idlheader) +add_dependencies(dxdiagn wineheaders) add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 dsound msvcrt kernel32 ntdll) add_pch(dxdiagn precomp.h SOURCE) add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dxdiagn/container.c b/dll/directx/wine/dxdiagn/container.c index 6e068e572d5..d84f185a795 100644 --- a/dll/directx/wine/dxdiagn/container.c +++ b/dll/directx/wine/dxdiagn/container.c @@ -19,12 +19,10 @@ * */ -#include "config.h" #define COBJMACROS #include "dxdiag_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -114,7 +112,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(IDxDiagContai if (dwIndex == i) { TRACE("Found container name %s, copying string\n", debugstr_w(p->contName)); lstrcpynW(pwszContainer, p->contName, cchContainer); - return (cchContainer <= strlenW(p->contName)) ? + return (cchContainer <= lstrlenW(p->contName)) ? DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } ++i; @@ -157,20 +155,12 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i *ppInstance = NULL; - tmp_len = strlenW(pwszContainer) + 1; + tmp_len = lstrlenW(pwszContainer) + 1; orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); if (NULL == tmp) return E_FAIL; lstrcpynW(tmp, pwszContainer, tmp_len); - /* special handling for an empty string and leaf container */ - if (!tmp[0] && list_empty(&pContainer->subContainers)) { - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance); - if (SUCCEEDED(hr)) - TRACE("Succeeded in getting the container instance\n"); - goto out; - } - - cur = strchrW(tmp, '.'); + cur = wcschr(tmp, '.'); while (NULL != cur) { *cur = '\0'; /* cut tmp string to '.' */ if (!*(cur + 1)) break; /* Account for a lone terminating period, as in "cont1.cont2.". */ @@ -180,7 +170,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i goto out; cur++; /* go after '.' (just replaced by \0) */ tmp = cur; - cur = strchrW(tmp, '.'); + cur = wcschr(tmp, '.'); } TRACE("Trying to get container %s\n", debugstr_w(tmp)); @@ -227,7 +217,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(IDxDiagContainer *iface if (dwIndex == i) { TRACE("Found property name %s, copying string\n", debugstr_w(p->propName)); lstrcpynW(pwszPropName, p->propName, cchPropName); - return (cchPropName <= strlenW(p->propName)) ? + return (cchPropName <= lstrlenW(p->propName)) ? DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } ++i; diff --git a/dll/directx/wine/dxdiagn/dxdiag_main.c b/dll/directx/wine/dxdiagn/dxdiag_main.c index e034b4e595e..719984f4e7d 100644 --- a/dll/directx/wine/dxdiagn/dxdiag_main.c +++ b/dll/directx/wine/dxdiagn/dxdiag_main.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dll/directx/wine/dxdiagn/fil_data.idl b/dll/directx/wine/dxdiagn/fil_data.idl deleted file mode 100644 index 7e37a755d91..00000000000 --- a/dll/directx/wine/dxdiagn/fil_data.idl +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2009 Vitaliy Margolen - * - * 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 - */ - -#pragma makedep header - -import "objidl.idl"; -import "strmif.idl"; -import "unknwn.idl"; - - -/***************************************************************************** - * IAMFilterData interface - */ -[ - object, - uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), - pointer_default(unique) -] -interface IAMFilterData : IUnknown -{ - typedef [unique] IAMFilterData *LPIAMFILTERDATA; - - HRESULT ParseFilterData( - [in] BYTE * rgbFilterData, - [in] ULONG cb, - [out] BYTE ** prgbRegFilter2); - - HRESULT CreateFilterData( - [in] REGFILTER2 * prf2, - [out] BYTE ** prgbFilterData, - [out] ULONG * pcb); -} diff --git a/dll/directx/wine/dxdiagn/guid.c b/dll/directx/wine/dxdiagn/guid.c index d72e84cb7cf..119dcf0a6e9 100644 --- a/dll/directx/wine/dxdiagn/guid.c +++ b/dll/directx/wine/dxdiagn/guid.c @@ -11,7 +11,7 @@ #include <wingdi.h> #include <objbase.h> #include <initguid.h> -#include <fil_data.h> +#include <wine/fil_data.h> #include <wbemcli.h> #include <wine/dxdiag.h> diff --git a/dll/directx/wine/dxdiagn/precomp.h b/dll/directx/wine/dxdiagn/precomp.h index dcc9acb99c1..d310510b1be 100644 --- a/dll/directx/wine/dxdiagn/precomp.h +++ b/dll/directx/wine/dxdiagn/precomp.h @@ -2,8 +2,6 @@ #ifndef __WINE_DXDIAG_PRECOMP_H #define __WINE_DXDIAG_PRECOMP_H -#include <wine/config.h> - #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H diff --git a/dll/directx/wine/dxdiagn/provider.c b/dll/directx/wine/dxdiagn/provider.c index f0498532f57..063e58c827e 100644 --- a/dll/directx/wine/dxdiagn/provider.c +++ b/dll/directx/wine/dxdiagn/provider.c @@ -20,13 +20,16 @@ * */ -#include "config.h" #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + +#ifdef __REACTOS__ +#include <wchar.h> +#endif + #include "dxdiag_private.h" -#include "wine/unicode.h" #include "winver.h" #include "objidl.h" #include "uuids.h" @@ -35,7 +38,7 @@ #include "d3d9.h" #include "strmif.h" #include "initguid.h" -#include "fil_data.h" +#include "wine/fil_data.h" #include "psapi.h" #include "wbemcli.h" #include "dsound.h" @@ -271,13 +274,13 @@ static IDxDiagContainerImpl_Container *allocate_information_node(const WCHAR *na if (name) { - ret->contName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(*name)); + ret->contName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(*name)); if (!ret->contName) { HeapFree(GetProcessHeap(), 0, ret); return NULL; } - strcpyW(ret->contName, name); + lstrcpyW(ret->contName, name); } list_init(&ret->subContainers); @@ -294,13 +297,13 @@ static IDxDiagContainerImpl_Property *allocate_property_information(const WCHAR if (!ret) return NULL; - ret->propName = HeapAlloc(GetProcessHeap(), 0, (strlenW(name) + 1) * sizeof(*name)); + ret->propName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(name) + 1) * sizeof(*name)); if (!ret->propName) { HeapFree(GetProcessHeap(), 0, ret); return NULL; } - strcpyW(ret->propName, name); + lstrcpyW(ret->propName, name); return ret; } @@ -495,7 +498,7 @@ static BOOL is_netmeeting_running(void) for (i = 0; i < list_count; i++) { - if (get_process_name_from_pid(pid_list[i], process_name, sizeof(process_name)/sizeof(WCHAR)) && + if (get_process_name_from_pid(pid_list[i], process_name, ARRAY_SIZE(process_name)) && !lstrcmpW(conf_exe, process_name)) { HeapFree(GetProcessHeap(), 0, pid_list); @@ -519,21 +522,23 @@ static HRESULT fill_language_information(IDxDiagContainerImpl_Container *node) HRESULT hr; /* szLanguagesLocalized */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SNATIVELANGNAME, system_lang, sizeof(system_lang)/sizeof(WCHAR)); - LoadStringW(dxdiagn_instance, IDS_REGIONAL_SETTING, regional_setting, sizeof(regional_setting)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SNATIVELANGNAME, user_lang, sizeof(user_lang)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SNATIVELANGNAME, system_lang, ARRAY_SIZE(system_lang)); + LoadStringW(dxdiagn_instance, IDS_REGIONAL_SETTING, regional_setting, ARRAY_SIZE(regional_setting)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SNATIVELANGNAME, user_lang, ARRAY_SIZE(user_lang)); - snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting, user_lang); + swprintf(language_str, languages_fmtW, system_lang, regional_setting, + user_lang); hr = add_bstr_property(node, szLanguagesLocalized, language_str); if (FAILED(hr)) return hr; /* szLanguagesEnglish */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE, system_lang, sizeof(system_lang)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SENGLANGUAGE, user_lang, sizeof(user_lang)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE, system_lang, ARRAY_SIZE(system_lang)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SENGLANGUAGE, user_lang, ARRAY_SIZE(user_lang)); - snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting_engW, user_lang); + swprintf(language_str, languages_fmtW, system_lang, + regional_setting_engW, user_lang); hr = add_bstr_property(node, szLanguagesEnglish, language_str); if (FAILED(hr)) @@ -556,21 +561,21 @@ static HRESULT fill_datetime_information(IDxDiagContainerImpl_Container *node) GetLocalTime(&curtime); - GetTimeFormatW(LOCALE_NEUTRAL, 0, &curtime, time_fmtW, time_str, sizeof(time_str)/sizeof(WCHAR)); + GetTimeFormatW(LOCALE_NEUTRAL, 0, &curtime, time_fmtW, time_str, ARRAY_SIZE(time_str)); /* szTimeLocalized */ - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &curtime, NULL, date_str, sizeof(date_str)/sizeof(WCHAR)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &curtime, NULL, date_str, ARRAY_SIZE(date_str)); - snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + swprintf(datetime_str, datetime_fmtW, date_str, time_str); hr = add_bstr_property(node, szTimeLocalized, datetime_str); if (FAILED(hr)) return hr; /* szTimeEnglish */ - GetDateFormatW(LOCALE_NEUTRAL, 0, &curtime, date_fmtW, date_str, sizeof(date_str)/sizeof(WCHAR)); + GetDateFormatW(LOCALE_NEUTRAL, 0, &curtime, date_fmtW, date_str, ARRAY_SIZE(date_str)); - snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + swprintf(datetime_str, datetime_fmtW, date_str, time_str); hr = add_bstr_property(node, szTimeEnglish, datetime_str); if (FAILED(hr)) @@ -597,7 +602,7 @@ static HRESULT fill_os_string_information(IDxDiagContainerImpl_Container *node, /* FIXME: OS detection should be performed, and localized OS strings * should contain translated versions of the "build" phrase. */ - for (i = 0; i < sizeof(prop_list)/sizeof(prop_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(prop_list); i++) { hr = add_bstr_property(node, prop_list[i], winxpW); if (FAILED(hr)) @@ -675,7 +680,8 @@ static HRESULT fill_processor_information(IDxDiagContainerImpl_Container *node) if(FAILED(hr)) return hr; - sprintfW(print_buf, processor_fmtW, V_BSTR(&cpu_name), V_I4(&cpu_no), V_I4(&clock_speed)); + swprintf(print_buf, processor_fmtW, + V_BSTR(&cpu_name), V_I4(&cpu_no), V_I4(&clock_speed)); VariantClear(&cpu_name); VariantClear(&cpu_no); VariantClear(&clock_speed); @@ -799,25 +805,26 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) return hr; /* FIXME: Roundoff should not be done with truncated division. */ - snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), physmem_fmtW, (DWORD)(msex.ullTotalPhys / (1024 * 1024))); + swprintf(print_buf, physmem_fmtW, + (DWORD)(msex.ullTotalPhys / (1024 * 1024))); hr = add_bstr_property(node, szPhysicalMemoryEnglish, print_buf); if (FAILED(hr)) return hr; usedpage_mb = (DWORD)((msex.ullTotalPageFile - msex.ullAvailPageFile) / (1024 * 1024)); availpage_mb = (DWORD)(msex.ullAvailPageFile / (1024 * 1024)); - LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, sizeof(localized_pagefile_fmt)/sizeof(WCHAR)); + LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, + ARRAY_SIZE(localized_pagefile_fmt)); args[0] = usedpage_mb; args[1] = availpage_mb; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - localized_pagefile_fmt, 0, 0, print_buf, - sizeof(print_buf)/sizeof(*print_buf), (__ms_va_list*)args); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, localized_pagefile_fmt, + 0, 0, print_buf, ARRAY_SIZE(print_buf), (__ms_va_list*)args); hr = add_bstr_property(node, szPageFileLocalized, print_buf); if (FAILED(hr)) return hr; - snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), pagefile_fmtW, usedpage_mb, availpage_mb); + swprintf(print_buf, pagefile_fmtW, usedpage_mb, availpage_mb); hr = add_bstr_property(node, szPageFileEnglish, print_buf); if (FAILED(hr)) @@ -829,7 +836,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; - count = sizeof(computer_name)/sizeof(WCHAR); + count = ARRAY_SIZE(computer_name); if (!GetComputerNameW(computer_name, &count)) return E_FAIL; @@ -918,31 +925,37 @@ static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id) { + unsigned int i; + static const WCHAR atiW[] = {'A','T','I',' ','T','e','c','h','n','o','l','o','g','i','e','s',' ','I','n','c','.',0}; static const WCHAR nvidiaW[] = {'N','V','I','D','I','A',0}; static const WCHAR intelW[] = {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; + static const WCHAR vmwareW[] = {'V','M','w','a','r','e',0}; + static const WCHAR redhatW[] = {'R','e','d',' ','H','a','t',0}; static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; - - /* Enumeration copied from dlls/wined3d/wined3d_private.h and slightly modified. */ - enum pci_vendor + static const struct { - HW_VENDOR_AMD = 0x1002, - HW_VENDOR_NVIDIA = 0x10de, - HW_VENDOR_INTEL = 0x8086, + DWORD id; + const WCHAR *name; + } + vendors[] = + { + {0x1002, atiW}, + {0x10de, nvidiaW}, + {0x15ad, vmwareW}, + {0x1af4, redhatW}, + {0x8086, intelW}, }; - switch (vendor_id) + for (i = 0; i < ARRAY_SIZE(vendors); ++i) { - case HW_VENDOR_AMD: - return atiW; - case HW_VENDOR_NVIDIA: - return nvidiaW; - case HW_VENDOR_INTEL: - return intelW; - default: - FIXME("Unknown PCI vendor ID 0x%04x\n", vendor_id); - return unknownW; + if (vendors[i].id == vendor_id) + return vendors[i].name; } + + FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id); + + return unknownW; } static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node) @@ -985,7 +998,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node DWORD available_mem = 0; BOOL hardware_accel; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); + swprintf(buffer, adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); if (!display_adapter) { @@ -1002,9 +1015,11 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node WCHAR descriptionW[sizeof(adapter_info.Description)]; WCHAR devicenameW[sizeof(adapter_info.DeviceName)]; - MultiByteToWideChar(CP_ACP, 0, adapter_info.Driver, -1, driverW, sizeof(driverW)/sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, adapter_info.Description, -1, descriptionW, sizeof(descriptionW)/sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, adapter_info.DeviceName, -1, devicenameW, sizeof(devicenameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.Driver, -1, driverW, ARRAY_SIZE(driverW)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.Description, -1, descriptionW, + ARRAY_SIZE(descriptionW)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.DeviceName, -1, devicenameW, + ARRAY_SIZE(devicenameW)); hr = add_bstr_property(display_adapter, szDriverName, driverW); if (FAILED(hr)) @@ -1018,7 +1033,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), driverversion_fmtW, + swprintf(buffer, driverversion_fmtW, HIWORD(adapter_info.DriverVersion.u.HighPart), LOWORD(adapter_info.DriverVersion.u.HighPart), HIWORD(adapter_info.DriverVersion.u.LowPart), LOWORD(adapter_info.DriverVersion.u.LowPart)); @@ -1026,22 +1041,22 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.VendorId); + swprintf(buffer, id_fmtW, adapter_info.VendorId); hr = add_bstr_property(display_adapter, szVendorId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.DeviceId); + swprintf(buffer, id_fmtW, adapter_info.DeviceId); hr = add_bstr_property(display_adapter, szDeviceId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), subsysid_fmtW, adapter_info.SubSysId); + swprintf(buffer, subsysid_fmtW, adapter_info.SubSysId); hr = add_bstr_property(display_adapter, szSubSysId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.Revision); + swprintf(buffer, id_fmtW, adapter_info.Revision); hr = add_bstr_property(display_adapter, szRevisionId, buffer); if (FAILED(hr)) goto cleanup; @@ -1075,7 +1090,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height, + swprintf(buffer, mode_fmtW, adapter_mode.Width, adapter_mode.Height, depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate); hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer); @@ -1110,7 +1125,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) WARN("get_texture_memory helper failed\n"); - snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, available_mem / 1000000.0f); + swprintf(buffer, mem_fmt, available_mem / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1289,7 +1304,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container { static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; - snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, tmp / 1000000.0f); + swprintf(buffer, mem_fmt, tmp / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1330,7 +1345,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container if (FAILED(hr)) goto cleanup; - for (tmp = 0; tmp < sizeof(empty_properties)/sizeof(empty_properties[0]); tmp++) + for (tmp = 0; tmp < ARRAY_SIZE(empty_properties); tmp++) { hr = add_bstr_property(display_adapter, empty_properties[tmp], szEmpty); if (FAILED(hr)) @@ -1393,7 +1408,7 @@ BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID cont /* the default device is enumerated twice, one time without GUID */ if (!guid) return TRUE; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); + _snwprintf(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); device = allocate_information_node(buffer); if (!device) { @@ -1417,8 +1432,8 @@ BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID cont return FALSE; name = module; - if ((p = strrchrW(name, '\\'))) name = p + 1; - if ((p = strrchrW(name, '/'))) name = p + 1; + if ((p = wcsrchr(name, '\\'))) name = p + 1; + if ((p = wcsrchr(name, '/'))) name = p + 1; enum_ctx->hr = add_bstr_property(device, szDriverName, name); if (FAILED(enum_ctx->hr)) @@ -1556,12 +1571,9 @@ static HRESULT fill_file_description(IDxDiagContainerImpl_Container *node, const if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), - szVersionFormat, - HIWORD(pFileInfo->dwFileVersionMS), - LOWORD(pFileInfo->dwFileVersionMS), - HIWORD(pFileInfo->dwFileVersionLS), - LOWORD(pFileInfo->dwFileVersionLS)); + swprintf(szVersion_v, szVersionFormat, + HIWORD(pFileInfo->dwFileVersionMS), LOWORD(pFileInfo->dwFileVersionMS), + HIWORD(pFileInfo->dwFileVersionLS), LOWORD(pFileInfo->dwFileVersionLS)); TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); @@ -1633,14 +1645,14 @@ static HRESULT build_directxfiles_tree(IDxDiagContainerImpl_Container *node) GetSystemDirectoryW(szFilePath, MAX_PATH); - for (i = 0; i < sizeof(dlls) / sizeof(dlls[0]); i++) + for (i = 0; i < ARRAY_SIZE(dlls); i++) { static const WCHAR szFormat[] = {'%','d',0}; WCHAR szFileID[5]; IDxDiagContainerImpl_Container *file_container; - snprintfW(szFileID, sizeof(szFileID)/sizeof(szFileID[0]), szFormat, i); + swprintf(szFileID, szFormat, i); file_container = allocate_information_node(szFileID); if (!file_container) @@ -1710,12 +1722,12 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, &ppRF); if (FAILED(hr)) goto cleanup; pRF = ((REGFILTER2**)ppRF)[0]; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + swprintf(bufferW, szVersionFormat, pRF->dwVersion); hr = add_bstr_property(subcont, szVersionW, bufferW); if (FAILED(hr)) goto cleanup; @@ -1887,7 +1899,7 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node WCHAR bufferW[10]; IDxDiagContainerImpl_Container *subcont; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + swprintf(bufferW, szIdFormat, i); subcont = allocate_information_node(bufferW); if (!subcont) { @@ -1984,7 +1996,7 @@ static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_roo if (!info_root) return E_OUTOFMEMORY; - for (index = 0; index < sizeof(root_children)/sizeof(root_children[0]); index++) + for (index = 0; index < ARRAY_SIZE(root_children); index++) { IDxDiagContainerImpl_Container *node; HRESULT hr; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 97ff756270b..c61431446bb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -37,7 +37,7 @@ dll/directx/wine/dplay # Synced to WineStaging-3.3 dll/directx/wine/dplayx # Synced to WineStaging-4.18 dll/directx/wine/dpnhpast # Synced to WineStaging-4.18 dll/directx/wine/dsound # Synced to Wine-1.3.29 -dll/directx/wine/dxdiagn # Synced to WineStaging-3.3 +dll/directx/wine/dxdiagn # Synced to WineStaging-4.18 dll/directx/wine/msdmo # Synced to WineStaging-3.17 dll/directx/wine/qedit # Synced to WineStaging-3.17 dll/directx/wine/quartz # Synced to WineStaging-3.9

4 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2019