- wine-devel - winehq.org

[PATCH 03/13] msvcp90: Add implementation of _Concurrent_vector_capacity.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 90407f812d..2cfe6f7ed2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1612,6 +1612,9 @@ typedef struct __Concurrent_vector_base_v4 void **segment; } _Concurrent_vector_base_v4; +#define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) +#define SEGMENT_SIZE (sizeof(void*) * 8) + /* ??1_Concurrent_vector_base_v4@details@Concurrency@@IAE@XZ */ /* ??1_Concurrent_vector_base_v4@details@Concurrency@@IEAA@XZ */ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) @@ -1642,8 +1645,18 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4__Internal_capacity, 4) MSVCP_size_t __thiscall _Concurrent_vector_base_v4__Internal_capacity( const _Concurrent_vector_base_v4 *this) { - FIXME("(%p) stub\n", this); - return 0; + MSVCP_size_t last_block; + int i; + + TRACE("(%p)\n", this); + + last_block = (this->segment == this->storage ? STORAGE_SIZE : SEGMENT_SIZE); + for(i = 0; i < last_block; i++) + { + if(!this->segment[i]) + return !i ? 0 : 1 << i; + } + return 1 << i; } /* ?_Internal_clear@_Concurrent_vector_base_v4@details@Concurrency@@IAEIP6AXPAXI@Z@Z */ -- 2.11.0

1 0

[PATCH 02/13] msvcp90: Add implementation of _Concurrent_vector_dtor.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp90/misc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 701b2334e8..90407f812d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1618,7 +1618,10 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_vector_base_v4_dtor, 4) void __thiscall _Concurrent_vector_base_v4_dtor( _Concurrent_vector_base_v4 *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(this->segment != this->storage) + free(this->segment); } /* ?_Internal_assign@_Concurrent_vector_base_v4@details@Concurrency@@IAEXABV123@IP6AXPAXI@ZP6AX1PBXI@Z4@Z */ -- 2.11.0

1 0

[PATCH 01/13] msvcp120: Add test for _Concurrent_vector_base_v4->segment.
by Hua Meng 31 Jul '18

31 Jul '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) mode change 100644 => 100755 dlls/msvcp120/tests/msvcp120.c diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c old mode 100644 new mode 100755 index 959f7a86da..a67dddf980 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2818,7 +2818,8 @@ static void test_vector_base_v4(void) (long)vector.first_block); ok(vector.early_size == 1, "vector.early_size got %ld expected 1\n", (long)vector.early_size); - + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 2, "size of vector got %ld expected 2\n", (long)size); @@ -2842,11 +2843,12 @@ static void test_vector_base_v4(void) ok(idx == 2, "idx got %ld expected 2\n", (long)idx); vector_elem_count++; *data = 3; + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); ok(vector.first_block == 1, "vector.first_block got %ld expected 1\n", (long)vector.first_block); ok(vector.early_size == 3, "vector.early_size got %ld expected 3\n", (long)vector.early_size); - size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 4, "size of vector got %ld expected %d\n", (long)size, 4); @@ -2862,9 +2864,11 @@ static void test_vector_base_v4(void) data = call_func3(p_vector_base_v4__Internal_push_back, &vector, sizeof(int), &idx); CHECK_CALLED(concurrent_vector_int_alloc); ok(data != NULL, "_Internal_push_back returned NULL\n"); - ok(idx == 4, "idx got %ld expected 2\n", (long)idx); + ok(idx == 4, "idx got %ld expected 4\n", (long)idx); vector_elem_count++; *data = 5; + ok(vector.segment == vector.storage, "vector.segment got %p expected %p\n", + vector.segment, vector.storage); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &vector); ok(size == 8, "size of vector got %ld expected 8\n", (long)size); @@ -2879,7 +2883,8 @@ static void test_vector_base_v4(void) (long)v2.first_block); ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); - + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); @@ -2912,7 +2917,8 @@ static void test_vector_base_v4(void) (long)v2.first_block); ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", (long)v2.early_size); - + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); @@ -2965,6 +2971,8 @@ static void test_vector_base_v4(void) } ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); ok(v2.early_size == 4, "v2.early_size got %ld expected 4\n", (long)v2.early_size); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); memset(&b, 0xff, sizeof(b)); SET_EXPECT(concurrent_vector_int_alloc); SET_EXPECT(concurrent_vector_int_copy); @@ -2978,6 +2986,8 @@ static void test_vector_base_v4(void) ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); ok(v2.early_size == 4,"v2.early_size got %ld expected 4\n", (long)v2.early_size); ok(b.first_block == 1, "b.first_block got %ld expected 1\n", (long)b.first_block); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); for(i=0; i<2; i++){ ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); free(b.blocks[i]); @@ -3002,6 +3012,10 @@ static void test_vector_base_v4(void) vector_elem_count += 5; ok(v2.first_block == 2, "v2.first_block got %ld expected 2\n", (long)v2.first_block); ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p expected 0\n", + i, v2.segment[i]); memset(&b, 0xff, sizeof(b)); SET_EXPECT(concurrent_vector_int_alloc); SET_EXPECT(concurrent_vector_int_copy); @@ -3015,6 +3029,10 @@ static void test_vector_base_v4(void) ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); ok(b.first_block == 2, "b.first_block got %ld expected 2\n", (long)b.first_block); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); for(i=0; i<4; i++){ ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); /* only b.blocks[0] and b.blocks[>=b.first_block] are used */ @@ -3122,6 +3140,8 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_alloc); ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); ok(size == 4, "size of vector got %ld expected 4\n", (long)size); SET_EXPECT(concurrent_vector_int_alloc); @@ -3130,12 +3150,27 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_alloc); ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + ok(v2.segment == v2.storage, "v2.segment got %p expected %p\n", + v2.segment, v2.storage); size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); ok(size == 8, "size of vector got %ld expected 8\n", (long)size); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 9, sizeof(int), 16); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", (long)v2.first_block); + ok(v2.early_size == 2, "v2.early_size got %ld expected 2\n", (long)v2.early_size); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4;i < 32;i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); + size = (size_t)call_func1(p_vector_base_v4__Internal_capacity, &v2); + ok(size == 16, "size of vector got %ld expected 8\n", (long)size); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); - ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); + ok(size == 4, "_Internal_clear returned %ld expected 4\n", (long)size); CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); -- 2.11.0

1 0

[PATCH] msscript.ocx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 746c2d3892..ae5edb7944 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -169,7 +169,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); -- 2.14.4

1 0

[PATCH] msctf: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/documentmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index cf4c601cff..9fa6b0f0dd 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -188,7 +188,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { int i; - for (i = 0; i < sizeof(This->contextStack)/sizeof(This->contextStack[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->contextStack); i++) if (This->contextStack[i]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink, This->contextStack[i]); -- 2.14.4

1 0

[PATCH] mscms: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscms/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index f0c40877a1..cb4908cb27 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -295,7 +295,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; - GetSystemDirectoryW( colordir, sizeof(colordir) / sizeof(WCHAR) ); + GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); lstrcatW( colordir, colorsubdir ); len = lstrlenW( colordir ) * sizeof(WCHAR); -- 2.14.4

1 0

[PATCH] kernel32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/computername.c | 4 +-- dlls/kernel32/console.c | 4 +-- dlls/kernel32/file.c | 2 +- dlls/kernel32/lcformat.c | 54 ++++++++++++++++++------------------ dlls/kernel32/locale.c | 66 +++++++++++++++++++++----------------------- dlls/kernel32/module.c | 3 +- dlls/kernel32/path.c | 2 +- dlls/kernel32/process.c | 26 ++++++++--------- dlls/kernel32/profile.c | 7 ++--- dlls/kernel32/sync.c | 8 ++---- dlls/kernel32/term.c | 2 +- dlls/kernel32/volume.c | 12 ++++---- 12 files changed, 91 insertions(+), 99 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 1b5f4aa4e5..720d4ba222 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -538,9 +538,9 @@ static WCHAR netbios_char ( WCHAR wc ) static const WCHAR special[] = {'!','@','#','$','%','^','&','\'',')','(','-','_','{','}','~'}; static const WCHAR deflt = '_'; unsigned int i; - + if ( isalnumW ( wc ) ) return wc; - for ( i = 0; i < sizeof (special) / sizeof (WCHAR); i++ ) + for ( i = 0; i < ARRAY_SIZE( special ); i++ ) if ( wc == special[i] ) return wc; return deflt; } diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 51061de922..8b98a50888 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1156,7 +1156,7 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in break; case -1: /* we haven't found the string into key-db, push full input string into server */ - idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, sizeof(inputw) / sizeof(inputw[0])); + idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, ARRAY_SIZE(inputw)); /* we cannot translate yet... likely we need more chars (wait max 1/2s for next char) */ if (idxw == 0) @@ -1831,7 +1831,7 @@ BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR name) } RtlEnterCriticalSection(&CONSOLE_CritSect); - if (strlenW(name) < sizeof(input_exe)/sizeof(WCHAR)) strcpyW(input_exe, name); + if (strlenW(name) < ARRAY_SIZE(input_exe)) strcpyW(input_exe, name); RtlLeaveCriticalSection(&CONSOLE_CritSect); return TRUE; diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1e5b9fe3e7..0c30fb74f2 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1513,7 +1513,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, static const WCHAR conW[] = {'C','O','N'}; if (LOWORD(dosdev) == sizeof(conW) && - !memicmpW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, sizeof(conW)/sizeof(WCHAR))) + !memicmpW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, ARRAY_SIZE( conW ))) { switch (access & (GENERIC_READ|GENERIC_WRITE)) { diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index aeb48c6ea0..b1dd32de13 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -104,7 +104,7 @@ static DWORD NLS_GetLocaleNumber(LCID lcid, DWORD dwFlags) DWORD dwVal = 0; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); if (szBuff[0] && szBuff[1] == ';' && szBuff[2] != '0') dwVal = (szBuff[0] - '0') * 10 + (szBuff[2] - '0'); @@ -129,7 +129,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags) DWORD dwLen; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); dwLen = strlenW(szBuff) + 1; str = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); if (str) @@ -258,7 +258,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) GET_LOCALE_STRING(new_node->cyfmt.lpCurrencySymbol, LOCALE_SCURRENCY); /* Date/Time Format info, negative character, etc */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) { GET_LOCALE_STRING(new_node->lppszStrings[i], NLS_LocaleIndices[i]); } @@ -302,7 +302,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /* We raced and lost: The node was already added by another thread. * node points to the currently cached node, so free new_node. */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) HeapFree(GetProcessHeap(), 0, new_node->lppszStrings[i]); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpDecimalSep); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpThousandSep); @@ -677,7 +677,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, { static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); + snprintfW(buff, ARRAY_SIZE(buff), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0; @@ -773,10 +773,10 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, } if (lpFormat) - MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, sizeof(szFormat)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, ARRAY_SIZE(szFormat)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1063,21 +1063,21 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1112,7 +1112,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, LPCWSTR lpszValue, const NUMBERFMTW *lpFormat, LPWSTR lpNumberStr, int cchOut) { - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; @@ -1140,7 +1140,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; @@ -1427,26 +1427,26 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } if (lpFormat->lpCurrencySymbol) { - MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, sizeof(szCy)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, ARRAY_SIZE(szCy)); fmt.lpCurrencySymbol = szCy; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1502,7 +1502,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ }; - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; @@ -1533,7 +1533,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); @@ -1841,9 +1841,9 @@ static BOOL NLS_EnumDateFormats(const struct enumdateformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { @@ -1994,9 +1994,9 @@ static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2e0cf83568..0f370273a9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -355,8 +355,7 @@ static UINT find_charset( const WCHAR *name ) if (isalnum((unsigned char)name[i])) charset_name[j++] = name[i]; charset_name[j] = 0; - entry = bsearch( charset_name, charset_names, - sizeof(charset_names)/sizeof(charset_names[0]), + entry = bsearch( charset_name, charset_names, ARRAY_SIZE( charset_names ), sizeof(charset_names[0]), charset_cmp ); if (entry) return entry->codepage; return 0; @@ -395,8 +394,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, /* first check exact name */ if (data->win_name[0] && - GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, buffer, ARRAY_SIZE( buffer ))) { if (!strcmpiW( data->win_name, buffer )) { @@ -406,7 +404,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } if (!GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) return TRUE; if (strcmpiW( buffer, data->lang )) return TRUE; matches++; /* language name matched */ @@ -414,7 +412,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (data->script) { if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) { const WCHAR *p = buffer; unsigned int len = strlenW( data->script ); @@ -432,7 +430,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (data->country) { if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) { if (strcmpiW( buffer, data->country )) goto done; matches++; /* country name matched */ @@ -490,7 +488,7 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) name->matches = 0; name->codepage = 0; name->win_name[0] = 0; - lstrcpynW( name->lang, str, sizeof(name->lang)/sizeof(WCHAR) ); + lstrcpynW( name->lang, str, ARRAY_SIZE( name->lang )); if (!*name->lang) { @@ -816,8 +814,7 @@ static BOOL locale_update_registry( HKEY hkey, const WCHAR *name, LCID lcid, for (i = 0; i < nb_values; i++) { - GetLocaleInfoW( lcid, values[i] | LOCALE_NOUSEROVERRIDE, bufferW, - sizeof(bufferW)/sizeof(WCHAR) ); + GetLocaleInfoW( lcid, values[i] | LOCALE_NOUSEROVERRIDE, bufferW, ARRAY_SIZE( bufferW )); SetLocaleInfoW( lcid, values[i], bufferW ); } return TRUE; @@ -905,19 +902,19 @@ void LOCALE_InitRegistry(void) return; /* don't do anything if we can't create the registry key */ locale_update_registry( hkey, localeW, lcid_LC_MESSAGES, lc_messages_values, - sizeof(lc_messages_values)/sizeof(lc_messages_values[0]) ); + ARRAY_SIZE( lc_messages_values )); locale_update_registry( hkey, lc_monetaryW, lcid_LC_MONETARY, lc_monetary_values, - sizeof(lc_monetary_values)/sizeof(lc_monetary_values[0]) ); + ARRAY_SIZE( lc_monetary_values )); locale_update_registry( hkey, lc_numericW, lcid_LC_NUMERIC, lc_numeric_values, - sizeof(lc_numeric_values)/sizeof(lc_numeric_values[0]) ); + ARRAY_SIZE( lc_numeric_values )); locale_update_registry( hkey, lc_timeW, lcid_LC_TIME, lc_time_values, - sizeof(lc_time_values)/sizeof(lc_time_values[0]) ); + ARRAY_SIZE( lc_time_values )); locale_update_registry( hkey, lc_measurementW, lcid_LC_MEASUREMENT, lc_measurement_values, - sizeof(lc_measurement_values)/sizeof(lc_measurement_values[0]) ); + ARRAY_SIZE( lc_measurement_values )); locale_update_registry( hkey, lc_telephoneW, lcid_LC_TELEPHONE, lc_telephone_values, - sizeof(lc_telephone_values)/sizeof(lc_telephone_values[0]) ); + ARRAY_SIZE( lc_telephone_values )); locale_update_registry( hkey, lc_paperW, lcid_LC_PAPER, lc_paper_values, - sizeof(lc_paper_values)/sizeof(lc_paper_values[0]) ); + ARRAY_SIZE( lc_paper_values )); if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { @@ -943,10 +940,10 @@ void LOCALE_InitRegistry(void) nameW.Length = len * sizeof(WCHAR); if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { - for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) + for (i = 0; i < ARRAY_SIZE( update_cp_values ); i++) { count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE, - bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + bufferW, ARRAY_SIZE( bufferW )); RtlInitUnicodeString( &nameW, update_cp_values[i].name ); NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) ); } @@ -1112,7 +1109,7 @@ static UINT setup_unix_locales(void) if ((locale = get_locale( LC_CTYPE, "LC_CTYPE" ))) { - strcpynAtoW( ctype_buff, locale, sizeof(ctype_buff)/sizeof(WCHAR) ); + strcpynAtoW( ctype_buff, locale, ARRAY_SIZE( ctype_buff )); parse_locale_name( ctype_buff, &locale_name ); lcid_LC_CTYPE = locale_name.lcid; unix_cp = locale_name.codepage; @@ -1126,7 +1123,7 @@ static UINT setup_unix_locales(void) #define GET_UNIX_LOCALE(cat) do \ if ((locale = get_locale( cat, #cat ))) \ { \ - strcpynAtoW( buffer, locale, sizeof(buffer)/sizeof(WCHAR) ); \ + strcpynAtoW( buffer, locale, ARRAY_SIZE(buffer) ); \ if (!strcmpW( buffer, ctype_buff )) lcid_##cat = lcid_LC_CTYPE; \ else { \ parse_locale_name( buffer, &locale_name ); \ @@ -1444,7 +1441,7 @@ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) static struct registry_value *get_locale_registry_value( DWORD lctype ) { int i; - for (i=0; i < sizeof(registry_values)/sizeof(registry_values[0]); i++) + for (i = 0; i < ARRAY_SIZE( registry_values ); i++) if (registry_values[i].lctype == lctype) return &registry_values[i]; return NULL; @@ -1698,7 +1695,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) if (lcflags & LOCALE_RETURN_NUMBER) { WCHAR tmp[16]; - ret = get_registry_locale_info( value, tmp, sizeof(tmp)/sizeof(WCHAR) ); + ret = get_registry_locale_info( value, tmp, ARRAY_SIZE( tmp )); if (ret > 0) { WCHAR *end; @@ -2219,7 +2216,7 @@ BOOL WINAPI GetCPInfoExW( UINT codepage, DWORD dwFlags, LPCPINFOEXW cpinfo ) cpinfo->CodePage = table->info.codepage; cpinfo->UnicodeDefaultChar = table->info.def_unicode_char; MultiByteToWideChar( CP_ACP, 0, table->info.name, -1, cpinfo->CodePageName, - sizeof(cpinfo->CodePageName)/sizeof(WCHAR)); + ARRAY_SIZE( cpinfo->CodePageName )); break; } } @@ -2269,7 +2266,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla for (;;) { if (!(table = wine_cp_enum_table( index++ ))) break; - p = buffer + sizeof(buffer)/sizeof(WCHAR); + p = buffer + ARRAY_SIZE( buffer ); *--p = 0; page = table->info.codepage; do @@ -2989,7 +2986,7 @@ static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, unsigned int flags; GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer) / sizeof(WCHAR) ); + buffer, ARRAY_SIZE( buffer )); if (!GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) @@ -3254,7 +3251,7 @@ static INT compose_katakana( LPCWSTR src, INT srclen, LPWSTR dst ) default: { int shift = *src - 0xff61; - if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0]) ) + if (shift < 0 || shift >= ARRAY_SIZE( katakana_map )) return 0; else *dst = katakana_map[shift] | 0x3000; @@ -3362,7 +3359,7 @@ static INT decompose_katakana( WCHAR c, LPWSTR dst, INT dstlen ) INT len = 0, shift = c - 0x3099; BYTE k; - if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0])) + if (shift < 0 || shift >= ARRAY_SIZE( katakana_map )) return 0; k = katakana_map[shift]; @@ -4382,7 +4379,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) { WCHAR szGrpName[48]; - if (!NLS_GetLanguageGroupName( lgrpid, szGrpName, sizeof(szGrpName) / sizeof(WCHAR) )) + if (!NLS_GetLanguageGroupName( lgrpid, szGrpName, ARRAY_SIZE( szGrpName ))) szGrpName[0] = '\0'; if (lpProcs->procW) @@ -4390,7 +4387,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) lpProcs->lParam ); else { - char szNumberA[sizeof(szNumber)/sizeof(WCHAR)]; + char szNumberA[ARRAY_SIZE( szNumber )]; char szGrpNameA[48]; /* FIXME: MSDN doesn't say which code page the W->A translation uses, @@ -4584,7 +4581,7 @@ static BOOL NLS_EnumLanguageGroupLocales(ENUMLANGUAGEGROUPLOCALE_CALLBACKS *lpPr bContinue = lpProcs->procW( lgrpid, lcid, szNumber, lpProcs->lParam ); else { - char szNumberA[sizeof(szNumber)/sizeof(WCHAR)]; + char szNumberA[ARRAY_SIZE( szNumber )]; WideCharToMultiByte(CP_ACP, 0, szNumber, -1, szNumberA, sizeof(szNumberA), 0, 0); @@ -5174,7 +5171,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) int min, max; min = 0; - max = sizeof(geoinfodata)/sizeof(struct geoinfo_t)-1; + max = ARRAY_SIZE(geoinfodata)-1; while (min <= max) { const struct geoinfo_t *ptr; @@ -5324,7 +5321,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - for (i = 0; i < sizeof(geoinfodata)/sizeof(struct geoinfo_t); i++) { + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) @@ -5682,8 +5679,7 @@ INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cch } } - norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, - norm_str, sizeof(norm_str)/sizeof(WCHAR)-1); + norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, norm_str, ARRAY_SIZE(norm_str)-1); if(map_str != buf) HeapFree(GetProcessHeap(), 0, map_str); if(!norm_len) { diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3ab70e8f1c..118829895b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1142,8 +1142,7 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) if (flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE) protect |= SEC_IMAGE; - if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), - filenameW, NULL )) + if (SearchPathW( NULL, name, dotDLL, ARRAY_SIZE( filenameW ), filenameW, NULL )) { hFile = CreateFileW( filenameW, GENERIC_READ, sharing, NULL, OPEN_EXISTING, 0, 0 ); } diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743171..489f59e919 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -893,7 +893,7 @@ static NTSTATUS find_actctx_dllpath(const WCHAR *libname, WCHAR **path) strcpyW( p, DIR_Windows ); p += strlenW(p); memcpy( p, winsxsW, sizeof(winsxsW) ); - p += sizeof(winsxsW) / sizeof(WCHAR); + p += ARRAY_SIZE( winsxsW ); memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); *p++ = '\\'; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..5aa245cf1a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -377,7 +377,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) } /* PATH is magic */ if (env_name.Length == sizeof(pathW) && - !memicmpW( env_name.Buffer, pathW, sizeof(pathW)/sizeof(WCHAR) ) && + !memicmpW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && !RtlQueryEnvironmentVariable_U( NULL, &env_name, &tmp )) { RtlAppendUnicodeToString( &tmp, sep ); @@ -528,7 +528,7 @@ static void set_additional_environment(void) DWORD len; /* ComputerName */ - len = sizeof(buf) / sizeof(WCHAR); + len = ARRAY_SIZE( buf ); if (GetComputerNameW( buf, &len )) SetEnvironmentVariableW( computernameW, buf ); @@ -606,7 +606,7 @@ static void set_wow64_environment(void) /* set the PROCESSOR_ARCHITECTURE variable */ - if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch)/sizeof(WCHAR) )) + if (GetEnvironmentVariableW( arch6432W, arch, ARRAY_SIZE( arch ))) { if (is_win64) { @@ -614,7 +614,7 @@ static void set_wow64_environment(void) SetEnvironmentVariableW( arch6432W, NULL ); } } - else if (GetEnvironmentVariableW( archW, arch, sizeof(arch)/sizeof(WCHAR) )) + else if (GetEnvironmentVariableW( archW, arch, ARRAY_SIZE( arch ))) { if (is_wow64) { @@ -1002,7 +1002,7 @@ static void start_wineboot( HANDLE handles[2] ) PROCESS_INFORMATION pi; void *redir; WCHAR app[MAX_PATH]; - WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + ARRAY_SIZE( wineboot ) + ARRAY_SIZE( args )]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -1011,7 +1011,7 @@ static void start_wineboot( HANDLE handles[2] ) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( app, MAX_PATH - sizeof(wineboot)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( wineboot )); lstrcatW( app, wineboot ); Wow64DisableWow64FsRedirection( &redir ); @@ -1291,7 +1291,7 @@ void CDECL __wine_kernel_init(void) } args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, - NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); + NULL, error, 0, msgW, ARRAY_SIZE( msgW ), (__ms_va_list *)args ); WideCharToMultiByte( CP_UNIXCP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); MESSAGE( "wine: %s", msg ); ExitProcess( error ); @@ -1440,7 +1440,7 @@ static char **build_envp( const WCHAR *envW ) for (p = env; *p; p += strlen(p) + 1) if (is_special_env_var( p )) length += 4; /* prefix it with "WINE" */ - for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE( unix_vars ); i++) { if (!(p = getenv(unix_vars[i]))) continue; length += strlen(unix_vars[i]) + strlen(p) + 2; @@ -1453,7 +1453,7 @@ static char **build_envp( const WCHAR *envW ) char *dst = (char *)(envp + count); /* some variables must not be modified, so we get them directly from the unix env */ - for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE( unix_vars ); i++) { if (!(p = getenv(unix_vars[i]))) continue; *envptr++ = strcpy( dst, unix_vars[i] ); @@ -2048,7 +2048,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW while (*env_end) { static const WCHAR WINEDEBUG[] = {'W','I','N','E','D','E','B','U','G','=',0}; - if (!winedebug && !strncmpW( env_end, WINEDEBUG, sizeof(WINEDEBUG)/sizeof(WCHAR) - 1 )) + if (!winedebug && !strncmpW( env_end, WINEDEBUG, ARRAY_SIZE( WINEDEBUG ) - 1 )) { DWORD len = WideCharToMultiByte( CP_UNIXCP, 0, env_end, -1, NULL, 0, NULL, NULL ); if ((winedebug = HeapAlloc( GetProcessHeap(), 0, len ))) @@ -2219,7 +2219,7 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L WCHAR *newcmdline; BOOL ret; - if (!GetEnvironmentVariableW( comspecW, comspec, sizeof(comspec)/sizeof(WCHAR) )) + if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) return FALSE; if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(comspec) + 7 + strlenW(cmd_line) + 2) * sizeof(WCHAR)))) @@ -2340,7 +2340,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) ); - if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR), + if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &binary_info ))) return FALSE; if (hFile == INVALID_HANDLE_VALUE) goto done; @@ -3624,7 +3624,7 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp drive[0] = result->Buffer[0]; drive[1] = ':'; drive[2] = 0; - if (!QueryDosDeviceW(drive, device, sizeof(device)/sizeof(*device))) + if (!QueryDosDeviceW(drive, device, ARRAY_SIZE(device))) { status = STATUS_NO_SUCH_DEVICE; goto cleanup; diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 0974aafd6b..65a8f28768 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -772,7 +772,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) else { LPWSTR dummy; - GetFullPathNameW(filename, sizeof(buffer)/sizeof(buffer[0]), buffer, &dummy); + GetFullPathNameW(filename, ARRAY_SIZE(buffer), buffer, &dummy); } TRACE("path: %s\n", debugstr_w(buffer)); @@ -1238,9 +1238,8 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, UNICODE_STRING bufferW; ULONG result; - if (GetPrivateProfileStringW( section, entry, emptystringW, - buffer, sizeof(buffer)/sizeof(WCHAR), - filename ) == 0) + if (GetPrivateProfileStringW( section, entry, emptystringW, buffer, ARRAY_SIZE( buffer ), + filename ) == 0) return def_val; /* FIXME: if entry can be found but it's empty, then Win16 is diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 343998eeed..6c7249ca12 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1594,7 +1594,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) if (nt_name.Length >= MAX_PATH * sizeof(WCHAR) || nt_name.Length < sizeof(leadin) || - strncmpiW( nt_name.Buffer, leadin, sizeof(leadin)/sizeof(WCHAR)) != 0) + strncmpiW( nt_name.Buffer, leadin, ARRAY_SIZE( leadin )) != 0) { RtlFreeUnicodeString( &nt_name ); SetLastError( ERROR_PATH_NOT_FOUND ); @@ -1630,8 +1630,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) else pipe_wait->Timeout.QuadPart = (ULONGLONG)nTimeOut * -10000; pipe_wait->NameLength = nt_name.Length - sizeof(leadin); - memcpy(pipe_wait->Name, nt_name.Buffer + sizeof(leadin)/sizeof(WCHAR), - pipe_wait->NameLength); + memcpy( pipe_wait->Name, nt_name.Buffer + ARRAY_SIZE( leadin ), pipe_wait->NameLength ); RtlFreeUnicodeString( &nt_name ); status = NtFsControlFile( pipe_dev, NULL, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, @@ -2084,8 +2083,7 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, '\\','W','i','n','3','2','.','P','i','p','e','s','.','%','0','8','l', 'u','.','%','0','8','u','\0' }; - snprintfW(name, sizeof(name) / sizeof(name[0]), nameFmt, - GetCurrentProcessId(), ++index); + snprintfW(name, ARRAY_SIZE(name), nameFmt, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_WRITE, FILE_OVERWRITE_IF, diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 171476a31c..b8877d4035 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -373,7 +373,7 @@ static BOOL TERM_BuildKeyDB(void) struct dbkey_descr descr; char tmp[64]; - for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) + for (i = 0; i < ARRAY_SIZE(TERM_dbkey_init); i++) { if (!TERM_AddKeyDescr(tigetstr((char *)TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 3a4edf8ada..12084369cb 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -420,7 +420,7 @@ static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) DWORD offset; INT locations[] = { 256, -1, -257, 512 }; - for(i=0; i<sizeof(locations)/sizeof(locations[0]); i++) + for(i=0; i<ARRAY_SIZE(locations); i++) { if (!VOLUME_ReadCDBlock(handle, pvd, locations[i]*BLOCK_SIZE)) return FALSE; @@ -982,7 +982,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD { BOOL ret; WCHAR volumeW[50], *pathW = NULL; - DWORD len = min( sizeof(volumeW) / sizeof(WCHAR), size ); + DWORD len = min(ARRAY_SIZE(volumeW), size ); TRACE("(%s, %p, %x)\n", debugstr_a(path), volume, size); @@ -1105,7 +1105,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), o1->DeviceNameLength/sizeof(WCHAR))); - if (!strncmpW( p, volumeW, sizeof(volumeW)/sizeof(WCHAR) )) + if (!strncmpW( p, volumeW, ARRAY_SIZE( volumeW ))) { /* is there space in the return variable ?? */ if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size) @@ -1763,7 +1763,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } } - else if (GetCurrentDirectoryW( sizeof(cwdW)/sizeof(cwdW[0]), cwdW )) + else if (GetCurrentDirectoryW(ARRAY_SIZE(cwdW), cwdW )) { /* if the path is completely bogus then revert to the drive of the working directory */ fallbackpathW[0] = cwdW[0]; @@ -1942,12 +1942,12 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepa linkname = (const WCHAR *)((const char *)link + link->MountPoints[j].SymbolicLinkNameOffset); if (link->MountPoints[j].SymbolicLinkNameLength == sizeof(dosdevicesW) + 2 * sizeof(WCHAR) && - !memicmpW( linkname, dosdevicesW, sizeof(dosdevicesW) / sizeof(WCHAR) )) + !memicmpW( linkname, dosdevicesW, ARRAY_SIZE( dosdevicesW ))) { len += 4; if (volumepathname && len < buflen) { - path[0] = linkname[sizeof(dosdevicesW) / sizeof(WCHAR)]; + path[0] = linkname[ARRAY_SIZE( dosdevicesW )]; path[1] = ':'; path[2] = '\\'; path[3] = 0; -- 2.14.4

1 0

[PATCH] inetmib1: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetmib1/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index c0719c1d63..2f7b9cadfe 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1321,7 +1321,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, pFirstSupportedRegion); minSupportedIDLength = UINT_MAX; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) { if (supportedIDs[i].init) supportedIDs[i].init(); @@ -1337,7 +1337,7 @@ static void cleanup(void) { UINT i; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) if (supportedIDs[i].cleanup) supportedIDs[i].cleanup(); } -- 2.14.4

1 0

[PATCH] localui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This time with the signed off dlls/localui/localui.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 9fb975cd85..77c8bf0d76 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -375,7 +375,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP status = FALSE; res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); /* length is in WCHAR, including the '\0' */ - GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, sizeof(bufferW) / sizeof(bufferW[0])); + GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, ARRAY_SIZE(bufferW)); TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); /* native localui.dll use the same limits */ @@ -416,10 +416,10 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpiW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + if (!strncmpiW(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) return PORT_IS_LPT; - if (!strncmpiW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + if (!strncmpiW(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) return PORT_IS_COM; if (!strcmpiW(name, portname_FILE)) @@ -431,10 +431,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ -- 2.14.4

1 0

[PATCH] msscript.ocx: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 746c2d3892..ae5edb7944 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -169,7 +169,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); -- 2.14.4

1 0

[PATCH] msctf: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/msctf/documentmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index cf4c601cff..9fa6b0f0dd 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -188,7 +188,7 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) { int i; - for (i = 0; i < sizeof(This->contextStack)/sizeof(This->contextStack[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->contextStack); i++) if (This->contextStack[i]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink, This->contextStack[i]); -- 2.14.4

1 0

[PATCH] mscms: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/mscms/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index f0c40877a1..cb4908cb27 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -295,7 +295,7 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR machine, PWSTR buffer, PDWORD size ) if (machine || !size) return FALSE; - GetSystemDirectoryW( colordir, sizeof(colordir) / sizeof(WCHAR) ); + GetSystemDirectoryW( colordir, ARRAY_SIZE( colordir )); lstrcatW( colordir, colorsubdir ); len = lstrlenW( colordir ) * sizeof(WCHAR); -- 2.14.4

1 0

[PATCH] midimap: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 1b35da7609..290300a55a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -172,7 +172,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, ARRAY_SIZE(buffer)); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; -- 2.14.4

1 0

[PATCH] mciwave: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index fd4d6f6728..0fa9b204f8 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -427,7 +427,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { + if (!GetTempPathW(ARRAY_SIZE(szTmpPath), szTmpPath)) { WARN("can't retrieve temp path!\n"); *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; -- 2.14.4

1 0

[PATCH] kernel32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/kernel32/computername.c | 4 +-- dlls/kernel32/console.c | 4 +-- dlls/kernel32/file.c | 2 +- dlls/kernel32/lcformat.c | 54 ++++++++++++++++++------------------ dlls/kernel32/locale.c | 66 +++++++++++++++++++++----------------------- dlls/kernel32/module.c | 3 +- dlls/kernel32/path.c | 2 +- dlls/kernel32/process.c | 26 ++++++++--------- dlls/kernel32/profile.c | 7 ++--- dlls/kernel32/sync.c | 8 ++---- dlls/kernel32/term.c | 2 +- dlls/kernel32/volume.c | 12 ++++---- 12 files changed, 91 insertions(+), 99 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 1b5f4aa4e5..720d4ba222 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -538,9 +538,9 @@ static WCHAR netbios_char ( WCHAR wc ) static const WCHAR special[] = {'!','@','#','$','%','^','&','\'',')','(','-','_','{','}','~'}; static const WCHAR deflt = '_'; unsigned int i; - + if ( isalnumW ( wc ) ) return wc; - for ( i = 0; i < sizeof (special) / sizeof (WCHAR); i++ ) + for ( i = 0; i < ARRAY_SIZE( special ); i++ ) if ( wc == special[i] ) return wc; return deflt; } diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 51061de922..8b98a50888 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1156,7 +1156,7 @@ static enum read_console_input_return bare_console_fetch_input(HANDLE handle, in break; case -1: /* we haven't found the string into key-db, push full input string into server */ - idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, sizeof(inputw) / sizeof(inputw[0])); + idxw = MultiByteToWideChar(CP_UNIXCP, 0, input, idx, inputw, ARRAY_SIZE(inputw)); /* we cannot translate yet... likely we need more chars (wait max 1/2s for next char) */ if (idxw == 0) @@ -1831,7 +1831,7 @@ BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR name) } RtlEnterCriticalSection(&CONSOLE_CritSect); - if (strlenW(name) < sizeof(input_exe)/sizeof(WCHAR)) strcpyW(input_exe, name); + if (strlenW(name) < ARRAY_SIZE(input_exe)) strcpyW(input_exe, name); RtlLeaveCriticalSection(&CONSOLE_CritSect); return TRUE; diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1e5b9fe3e7..0c30fb74f2 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1513,7 +1513,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, static const WCHAR conW[] = {'C','O','N'}; if (LOWORD(dosdev) == sizeof(conW) && - !memicmpW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, sizeof(conW)/sizeof(WCHAR))) + !memicmpW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, ARRAY_SIZE( conW ))) { switch (access & (GENERIC_READ|GENERIC_WRITE)) { diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index aeb48c6ea0..b1dd32de13 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -104,7 +104,7 @@ static DWORD NLS_GetLocaleNumber(LCID lcid, DWORD dwFlags) DWORD dwVal = 0; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); if (szBuff[0] && szBuff[1] == ';' && szBuff[2] != '0') dwVal = (szBuff[0] - '0') * 10 + (szBuff[2] - '0'); @@ -129,7 +129,7 @@ static WCHAR* NLS_GetLocaleString(LCID lcid, DWORD dwFlags) DWORD dwLen; szBuff[0] = '\0'; - GetLocaleInfoW(lcid, dwFlags, szBuff, sizeof(szBuff) / sizeof(WCHAR)); + GetLocaleInfoW(lcid, dwFlags, szBuff, ARRAY_SIZE(szBuff)); dwLen = strlenW(szBuff) + 1; str = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); if (str) @@ -258,7 +258,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) GET_LOCALE_STRING(new_node->cyfmt.lpCurrencySymbol, LOCALE_SCURRENCY); /* Date/Time Format info, negative character, etc */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) { GET_LOCALE_STRING(new_node->lppszStrings[i], NLS_LocaleIndices[i]); } @@ -302,7 +302,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /* We raced and lost: The node was already added by another thread. * node points to the currently cached node, so free new_node. */ - for (i = 0; i < sizeof(NLS_LocaleIndices)/sizeof(NLS_LocaleIndices[0]); i++) + for (i = 0; i < ARRAY_SIZE(NLS_LocaleIndices); i++) HeapFree(GetProcessHeap(), 0, new_node->lppszStrings[i]); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpDecimalSep); HeapFree(GetProcessHeap(), 0, new_node->fmt.lpThousandSep); @@ -677,7 +677,7 @@ static INT NLS_GetDateTimeFormatW(LCID lcid, DWORD dwFlags, { static const WCHAR fmtW[] = {'%','.','*','d',0}; /* We have a numeric value to add */ - snprintfW(buff, sizeof(buff)/sizeof(WCHAR), fmtW, count, dwVal); + snprintfW(buff, ARRAY_SIZE(buff), fmtW, count, dwVal); } dwLen = szAdd ? strlenW(szAdd) : 0; @@ -773,10 +773,10 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, } if (lpFormat) - MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, sizeof(szFormat)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat, -1, szFormat, ARRAY_SIZE(szFormat)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1063,21 +1063,21 @@ INT WINAPI GetNumberFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1112,7 +1112,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, LPCWSTR lpszValue, const NUMBERFMTW *lpFormat, LPWSTR lpNumberStr, int cchOut) { - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0; @@ -1140,7 +1140,7 @@ INT WINAPI GetNumberFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; @@ -1427,26 +1427,26 @@ INT WINAPI GetCurrencyFormatA(LCID lcid, DWORD dwFlags, pfmt = &fmt; if (lpFormat->lpDecimalSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, sizeof(szDec)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpDecimalSep, -1, szDec, ARRAY_SIZE(szDec)); fmt.lpDecimalSep = szDec; } if (lpFormat->lpThousandSep) { - MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, sizeof(szGrp)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpThousandSep, -1, szGrp, ARRAY_SIZE(szGrp)); fmt.lpThousandSep = szGrp; } if (lpFormat->lpCurrencySymbol) { - MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, sizeof(szCy)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpFormat->lpCurrencySymbol, -1, szCy, ARRAY_SIZE(szCy)); fmt.lpCurrencySymbol = szCy; } } if (lpszValue) - MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, sizeof(szIn)/sizeof(WCHAR)); + MultiByteToWideChar(cp, 0, lpszValue, -1, szIn, ARRAY_SIZE(szIn)); - if (cchOut > (int)(sizeof(szOut)/sizeof(WCHAR))) - cchOut = sizeof(szOut)/sizeof(WCHAR); + if (cchOut > (int) ARRAY_SIZE(szOut)) + cchOut = ARRAY_SIZE(szOut); szOut[0] = '\0'; @@ -1502,7 +1502,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ }; - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szBuff[128], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; WCHAR szNegBuff[8]; const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; @@ -1533,7 +1533,7 @@ INT WINAPI GetCurrencyFormatW(LCID lcid, DWORD dwFlags, else { GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); + szNegBuff, ARRAY_SIZE(szNegBuff)); lpszNegStart = lpszNeg = szNegBuff; } dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); @@ -1841,9 +1841,9 @@ static BOOL NLS_EnumDateFormats(const struct enumdateformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { @@ -1994,9 +1994,9 @@ static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) lctype |= ctxt->flags & LOCALE_USE_CP_ACP; if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, sizeof(bufW)/sizeof(bufW[0])); + ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, sizeof(bufA)/sizeof(bufA[0])); + ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); if (ret) { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2e0cf83568..0f370273a9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -355,8 +355,7 @@ static UINT find_charset( const WCHAR *name ) if (isalnum((unsigned char)name[i])) charset_name[j++] = name[i]; charset_name[j] = 0; - entry = bsearch( charset_name, charset_names, - sizeof(charset_names)/sizeof(charset_names[0]), + entry = bsearch( charset_name, charset_names, ARRAY_SIZE( charset_names ), sizeof(charset_names[0]), charset_cmp ); if (entry) return entry->codepage; return 0; @@ -395,8 +394,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, /* first check exact name */ if (data->win_name[0] && - GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, buffer, ARRAY_SIZE( buffer ))) { if (!strcmpiW( data->win_name, buffer )) { @@ -406,7 +404,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } if (!GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) return TRUE; if (strcmpiW( buffer, data->lang )) return TRUE; matches++; /* language name matched */ @@ -414,7 +412,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (data->script) { if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) { const WCHAR *p = buffer; unsigned int len = strlenW( data->script ); @@ -432,7 +430,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (data->country) { if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer)/sizeof(WCHAR) )) + buffer, ARRAY_SIZE( buffer ))) { if (strcmpiW( buffer, data->country )) goto done; matches++; /* country name matched */ @@ -490,7 +488,7 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) name->matches = 0; name->codepage = 0; name->win_name[0] = 0; - lstrcpynW( name->lang, str, sizeof(name->lang)/sizeof(WCHAR) ); + lstrcpynW( name->lang, str, ARRAY_SIZE( name->lang )); if (!*name->lang) { @@ -816,8 +814,7 @@ static BOOL locale_update_registry( HKEY hkey, const WCHAR *name, LCID lcid, for (i = 0; i < nb_values; i++) { - GetLocaleInfoW( lcid, values[i] | LOCALE_NOUSEROVERRIDE, bufferW, - sizeof(bufferW)/sizeof(WCHAR) ); + GetLocaleInfoW( lcid, values[i] | LOCALE_NOUSEROVERRIDE, bufferW, ARRAY_SIZE( bufferW )); SetLocaleInfoW( lcid, values[i], bufferW ); } return TRUE; @@ -905,19 +902,19 @@ void LOCALE_InitRegistry(void) return; /* don't do anything if we can't create the registry key */ locale_update_registry( hkey, localeW, lcid_LC_MESSAGES, lc_messages_values, - sizeof(lc_messages_values)/sizeof(lc_messages_values[0]) ); + ARRAY_SIZE( lc_messages_values )); locale_update_registry( hkey, lc_monetaryW, lcid_LC_MONETARY, lc_monetary_values, - sizeof(lc_monetary_values)/sizeof(lc_monetary_values[0]) ); + ARRAY_SIZE( lc_monetary_values )); locale_update_registry( hkey, lc_numericW, lcid_LC_NUMERIC, lc_numeric_values, - sizeof(lc_numeric_values)/sizeof(lc_numeric_values[0]) ); + ARRAY_SIZE( lc_numeric_values )); locale_update_registry( hkey, lc_timeW, lcid_LC_TIME, lc_time_values, - sizeof(lc_time_values)/sizeof(lc_time_values[0]) ); + ARRAY_SIZE( lc_time_values )); locale_update_registry( hkey, lc_measurementW, lcid_LC_MEASUREMENT, lc_measurement_values, - sizeof(lc_measurement_values)/sizeof(lc_measurement_values[0]) ); + ARRAY_SIZE( lc_measurement_values )); locale_update_registry( hkey, lc_telephoneW, lcid_LC_TELEPHONE, lc_telephone_values, - sizeof(lc_telephone_values)/sizeof(lc_telephone_values[0]) ); + ARRAY_SIZE( lc_telephone_values )); locale_update_registry( hkey, lc_paperW, lcid_LC_PAPER, lc_paper_values, - sizeof(lc_paper_values)/sizeof(lc_paper_values[0]) ); + ARRAY_SIZE( lc_paper_values )); if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { @@ -943,10 +940,10 @@ void LOCALE_InitRegistry(void) nameW.Length = len * sizeof(WCHAR); if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { - for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++) + for (i = 0; i < ARRAY_SIZE( update_cp_values ); i++) { count = GetLocaleInfoW( lcid, update_cp_values[i].value | LOCALE_NOUSEROVERRIDE, - bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + bufferW, ARRAY_SIZE( bufferW )); RtlInitUnicodeString( &nameW, update_cp_values[i].name ); NtSetValueKey( nls_key, &nameW, 0, REG_SZ, bufferW, count * sizeof(WCHAR) ); } @@ -1112,7 +1109,7 @@ static UINT setup_unix_locales(void) if ((locale = get_locale( LC_CTYPE, "LC_CTYPE" ))) { - strcpynAtoW( ctype_buff, locale, sizeof(ctype_buff)/sizeof(WCHAR) ); + strcpynAtoW( ctype_buff, locale, ARRAY_SIZE( ctype_buff )); parse_locale_name( ctype_buff, &locale_name ); lcid_LC_CTYPE = locale_name.lcid; unix_cp = locale_name.codepage; @@ -1126,7 +1123,7 @@ static UINT setup_unix_locales(void) #define GET_UNIX_LOCALE(cat) do \ if ((locale = get_locale( cat, #cat ))) \ { \ - strcpynAtoW( buffer, locale, sizeof(buffer)/sizeof(WCHAR) ); \ + strcpynAtoW( buffer, locale, ARRAY_SIZE(buffer) ); \ if (!strcmpW( buffer, ctype_buff )) lcid_##cat = lcid_LC_CTYPE; \ else { \ parse_locale_name( buffer, &locale_name ); \ @@ -1444,7 +1441,7 @@ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) static struct registry_value *get_locale_registry_value( DWORD lctype ) { int i; - for (i=0; i < sizeof(registry_values)/sizeof(registry_values[0]); i++) + for (i = 0; i < ARRAY_SIZE( registry_values ); i++) if (registry_values[i].lctype == lctype) return &registry_values[i]; return NULL; @@ -1698,7 +1695,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) if (lcflags & LOCALE_RETURN_NUMBER) { WCHAR tmp[16]; - ret = get_registry_locale_info( value, tmp, sizeof(tmp)/sizeof(WCHAR) ); + ret = get_registry_locale_info( value, tmp, ARRAY_SIZE( tmp )); if (ret > 0) { WCHAR *end; @@ -2219,7 +2216,7 @@ BOOL WINAPI GetCPInfoExW( UINT codepage, DWORD dwFlags, LPCPINFOEXW cpinfo ) cpinfo->CodePage = table->info.codepage; cpinfo->UnicodeDefaultChar = table->info.def_unicode_char; MultiByteToWideChar( CP_ACP, 0, table->info.name, -1, cpinfo->CodePageName, - sizeof(cpinfo->CodePageName)/sizeof(WCHAR)); + ARRAY_SIZE( cpinfo->CodePageName )); break; } } @@ -2269,7 +2266,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla for (;;) { if (!(table = wine_cp_enum_table( index++ ))) break; - p = buffer + sizeof(buffer)/sizeof(WCHAR); + p = buffer + ARRAY_SIZE( buffer ); *--p = 0; page = table->info.codepage; do @@ -2989,7 +2986,7 @@ static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, unsigned int flags; GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, - buffer, sizeof(buffer) / sizeof(WCHAR) ); + buffer, ARRAY_SIZE( buffer )); if (!GetLocaleInfoW( MAKELCID( lang, SORT_DEFAULT ), LOCALE_INEUTRAL | LOCALE_NOUSEROVERRIDE | LOCALE_RETURN_NUMBER, (LPWSTR)&neutral, sizeof(neutral) / sizeof(WCHAR) )) @@ -3254,7 +3251,7 @@ static INT compose_katakana( LPCWSTR src, INT srclen, LPWSTR dst ) default: { int shift = *src - 0xff61; - if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0]) ) + if (shift < 0 || shift >= ARRAY_SIZE( katakana_map )) return 0; else *dst = katakana_map[shift] | 0x3000; @@ -3362,7 +3359,7 @@ static INT decompose_katakana( WCHAR c, LPWSTR dst, INT dstlen ) INT len = 0, shift = c - 0x3099; BYTE k; - if (shift < 0 || shift >= sizeof(katakana_map)/sizeof(katakana_map[0])) + if (shift < 0 || shift >= ARRAY_SIZE( katakana_map )) return 0; k = katakana_map[shift]; @@ -4382,7 +4379,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) { WCHAR szGrpName[48]; - if (!NLS_GetLanguageGroupName( lgrpid, szGrpName, sizeof(szGrpName) / sizeof(WCHAR) )) + if (!NLS_GetLanguageGroupName( lgrpid, szGrpName, ARRAY_SIZE( szGrpName ))) szGrpName[0] = '\0'; if (lpProcs->procW) @@ -4390,7 +4387,7 @@ static BOOL NLS_EnumSystemLanguageGroups(ENUMLANGUAGEGROUP_CALLBACKS *lpProcs) lpProcs->lParam ); else { - char szNumberA[sizeof(szNumber)/sizeof(WCHAR)]; + char szNumberA[ARRAY_SIZE( szNumber )]; char szGrpNameA[48]; /* FIXME: MSDN doesn't say which code page the W->A translation uses, @@ -4584,7 +4581,7 @@ static BOOL NLS_EnumLanguageGroupLocales(ENUMLANGUAGEGROUPLOCALE_CALLBACKS *lpPr bContinue = lpProcs->procW( lgrpid, lcid, szNumber, lpProcs->lParam ); else { - char szNumberA[sizeof(szNumber)/sizeof(WCHAR)]; + char szNumberA[ARRAY_SIZE( szNumber )]; WideCharToMultiByte(CP_ACP, 0, szNumber, -1, szNumberA, sizeof(szNumberA), 0, 0); @@ -5174,7 +5171,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) int min, max; min = 0; - max = sizeof(geoinfodata)/sizeof(struct geoinfo_t)-1; + max = ARRAY_SIZE(geoinfodata)-1; while (min <= max) { const struct geoinfo_t *ptr; @@ -5324,7 +5321,7 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - for (i = 0; i < sizeof(geoinfodata)/sizeof(struct geoinfo_t); i++) { + for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) @@ -5682,8 +5679,7 @@ INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cch } } - norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, - norm_str, sizeof(norm_str)/sizeof(WCHAR)-1); + norm_len = FoldStringW(MAP_FOLDCZONE, map_str, map_len, norm_str, ARRAY_SIZE(norm_str)-1); if(map_str != buf) HeapFree(GetProcessHeap(), 0, map_str); if(!norm_len) { diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 3ab70e8f1c..118829895b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1142,8 +1142,7 @@ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) if (flags & LOAD_LIBRARY_AS_IMAGE_RESOURCE) protect |= SEC_IMAGE; - if (SearchPathW( NULL, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), - filenameW, NULL )) + if (SearchPathW( NULL, name, dotDLL, ARRAY_SIZE( filenameW ), filenameW, NULL )) { hFile = CreateFileW( filenameW, GENERIC_READ, sharing, NULL, OPEN_EXISTING, 0, 0 ); } diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a389743171..489f59e919 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -893,7 +893,7 @@ static NTSTATUS find_actctx_dllpath(const WCHAR *libname, WCHAR **path) strcpyW( p, DIR_Windows ); p += strlenW(p); memcpy( p, winsxsW, sizeof(winsxsW) ); - p += sizeof(winsxsW) / sizeof(WCHAR); + p += ARRAY_SIZE( winsxsW ); memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); p += info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); *p++ = '\\'; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..5aa245cf1a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -377,7 +377,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) } /* PATH is magic */ if (env_name.Length == sizeof(pathW) && - !memicmpW( env_name.Buffer, pathW, sizeof(pathW)/sizeof(WCHAR) ) && + !memicmpW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && !RtlQueryEnvironmentVariable_U( NULL, &env_name, &tmp )) { RtlAppendUnicodeToString( &tmp, sep ); @@ -528,7 +528,7 @@ static void set_additional_environment(void) DWORD len; /* ComputerName */ - len = sizeof(buf) / sizeof(WCHAR); + len = ARRAY_SIZE( buf ); if (GetComputerNameW( buf, &len )) SetEnvironmentVariableW( computernameW, buf ); @@ -606,7 +606,7 @@ static void set_wow64_environment(void) /* set the PROCESSOR_ARCHITECTURE variable */ - if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch)/sizeof(WCHAR) )) + if (GetEnvironmentVariableW( arch6432W, arch, ARRAY_SIZE( arch ))) { if (is_win64) { @@ -614,7 +614,7 @@ static void set_wow64_environment(void) SetEnvironmentVariableW( arch6432W, NULL ); } } - else if (GetEnvironmentVariableW( archW, arch, sizeof(arch)/sizeof(WCHAR) )) + else if (GetEnvironmentVariableW( archW, arch, ARRAY_SIZE( arch ))) { if (is_wow64) { @@ -1002,7 +1002,7 @@ static void start_wineboot( HANDLE handles[2] ) PROCESS_INFORMATION pi; void *redir; WCHAR app[MAX_PATH]; - WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; + WCHAR cmdline[MAX_PATH + ARRAY_SIZE( wineboot ) + ARRAY_SIZE( args )]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -1011,7 +1011,7 @@ static void start_wineboot( HANDLE handles[2] ) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( app, MAX_PATH - sizeof(wineboot)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( wineboot )); lstrcatW( app, wineboot ); Wow64DisableWow64FsRedirection( &redir ); @@ -1291,7 +1291,7 @@ void CDECL __wine_kernel_init(void) } args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, - NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); + NULL, error, 0, msgW, ARRAY_SIZE( msgW ), (__ms_va_list *)args ); WideCharToMultiByte( CP_UNIXCP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); MESSAGE( "wine: %s", msg ); ExitProcess( error ); @@ -1440,7 +1440,7 @@ static char **build_envp( const WCHAR *envW ) for (p = env; *p; p += strlen(p) + 1) if (is_special_env_var( p )) length += 4; /* prefix it with "WINE" */ - for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE( unix_vars ); i++) { if (!(p = getenv(unix_vars[i]))) continue; length += strlen(unix_vars[i]) + strlen(p) + 2; @@ -1453,7 +1453,7 @@ static char **build_envp( const WCHAR *envW ) char *dst = (char *)(envp + count); /* some variables must not be modified, so we get them directly from the unix env */ - for (i = 0; i < sizeof(unix_vars)/sizeof(unix_vars[0]); i++) + for (i = 0; i < ARRAY_SIZE( unix_vars ); i++) { if (!(p = getenv(unix_vars[i]))) continue; *envptr++ = strcpy( dst, unix_vars[i] ); @@ -2048,7 +2048,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW while (*env_end) { static const WCHAR WINEDEBUG[] = {'W','I','N','E','D','E','B','U','G','=',0}; - if (!winedebug && !strncmpW( env_end, WINEDEBUG, sizeof(WINEDEBUG)/sizeof(WCHAR) - 1 )) + if (!winedebug && !strncmpW( env_end, WINEDEBUG, ARRAY_SIZE( WINEDEBUG ) - 1 )) { DWORD len = WideCharToMultiByte( CP_UNIXCP, 0, env_end, -1, NULL, 0, NULL, NULL ); if ((winedebug = HeapAlloc( GetProcessHeap(), 0, len ))) @@ -2219,7 +2219,7 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L WCHAR *newcmdline; BOOL ret; - if (!GetEnvironmentVariableW( comspecW, comspec, sizeof(comspec)/sizeof(WCHAR) )) + if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) return FALSE; if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(comspec) + 7 + strlenW(cmd_line) + 2) * sizeof(WCHAR)))) @@ -2340,7 +2340,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) ); - if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR), + if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &binary_info ))) return FALSE; if (hFile == INVALID_HANDLE_VALUE) goto done; @@ -3624,7 +3624,7 @@ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lp drive[0] = result->Buffer[0]; drive[1] = ':'; drive[2] = 0; - if (!QueryDosDeviceW(drive, device, sizeof(device)/sizeof(*device))) + if (!QueryDosDeviceW(drive, device, ARRAY_SIZE(device))) { status = STATUS_NO_SUCH_DEVICE; goto cleanup; diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 0974aafd6b..65a8f28768 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -772,7 +772,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) else { LPWSTR dummy; - GetFullPathNameW(filename, sizeof(buffer)/sizeof(buffer[0]), buffer, &dummy); + GetFullPathNameW(filename, ARRAY_SIZE(buffer), buffer, &dummy); } TRACE("path: %s\n", debugstr_w(buffer)); @@ -1238,9 +1238,8 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, UNICODE_STRING bufferW; ULONG result; - if (GetPrivateProfileStringW( section, entry, emptystringW, - buffer, sizeof(buffer)/sizeof(WCHAR), - filename ) == 0) + if (GetPrivateProfileStringW( section, entry, emptystringW, buffer, ARRAY_SIZE( buffer ), + filename ) == 0) return def_val; /* FIXME: if entry can be found but it's empty, then Win16 is diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 343998eeed..6c7249ca12 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1594,7 +1594,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) if (nt_name.Length >= MAX_PATH * sizeof(WCHAR) || nt_name.Length < sizeof(leadin) || - strncmpiW( nt_name.Buffer, leadin, sizeof(leadin)/sizeof(WCHAR)) != 0) + strncmpiW( nt_name.Buffer, leadin, ARRAY_SIZE( leadin )) != 0) { RtlFreeUnicodeString( &nt_name ); SetLastError( ERROR_PATH_NOT_FOUND ); @@ -1630,8 +1630,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) else pipe_wait->Timeout.QuadPart = (ULONGLONG)nTimeOut * -10000; pipe_wait->NameLength = nt_name.Length - sizeof(leadin); - memcpy(pipe_wait->Name, nt_name.Buffer + sizeof(leadin)/sizeof(WCHAR), - pipe_wait->NameLength); + memcpy( pipe_wait->Name, nt_name.Buffer + ARRAY_SIZE( leadin ), pipe_wait->NameLength ); RtlFreeUnicodeString( &nt_name ); status = NtFsControlFile( pipe_dev, NULL, NULL, NULL, &iosb, FSCTL_PIPE_WAIT, @@ -2084,8 +2083,7 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, '\\','W','i','n','3','2','.','P','i','p','e','s','.','%','0','8','l', 'u','.','%','0','8','u','\0' }; - snprintfW(name, sizeof(name) / sizeof(name[0]), nameFmt, - GetCurrentProcessId(), ++index); + snprintfW(name, ARRAY_SIZE(name), nameFmt, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_WRITE, FILE_OVERWRITE_IF, diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 171476a31c..b8877d4035 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -373,7 +373,7 @@ static BOOL TERM_BuildKeyDB(void) struct dbkey_descr descr; char tmp[64]; - for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) + for (i = 0; i < ARRAY_SIZE(TERM_dbkey_init); i++) { if (!TERM_AddKeyDescr(tigetstr((char *)TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 3a4edf8ada..12084369cb 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -420,7 +420,7 @@ static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) DWORD offset; INT locations[] = { 256, -1, -257, 512 }; - for(i=0; i<sizeof(locations)/sizeof(locations[0]); i++) + for(i=0; i<ARRAY_SIZE(locations); i++) { if (!VOLUME_ReadCDBlock(handle, pvd, locations[i]*BLOCK_SIZE)) return FALSE; @@ -982,7 +982,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointA( LPCSTR path, LPSTR volume, DWORD { BOOL ret; WCHAR volumeW[50], *pathW = NULL; - DWORD len = min( sizeof(volumeW) / sizeof(WCHAR), size ); + DWORD len = min(ARRAY_SIZE(volumeW), size ); TRACE("(%s, %p, %x)\n", debugstr_a(path), volume, size); @@ -1105,7 +1105,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR debugstr_wn((WCHAR*)((char *)output + o1->DeviceNameOffset), o1->DeviceNameLength/sizeof(WCHAR))); - if (!strncmpW( p, volumeW, sizeof(volumeW)/sizeof(WCHAR) )) + if (!strncmpW( p, volumeW, ARRAY_SIZE( volumeW ))) { /* is there space in the return variable ?? */ if ((o1->SymbolicLinkNameLength/sizeof(WCHAR))+2 > size) @@ -1763,7 +1763,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } } - else if (GetCurrentDirectoryW( sizeof(cwdW)/sizeof(cwdW[0]), cwdW )) + else if (GetCurrentDirectoryW(ARRAY_SIZE(cwdW), cwdW )) { /* if the path is completely bogus then revert to the drive of the working directory */ fallbackpathW[0] = cwdW[0]; @@ -1942,12 +1942,12 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepa linkname = (const WCHAR *)((const char *)link + link->MountPoints[j].SymbolicLinkNameOffset); if (link->MountPoints[j].SymbolicLinkNameLength == sizeof(dosdevicesW) + 2 * sizeof(WCHAR) && - !memicmpW( linkname, dosdevicesW, sizeof(dosdevicesW) / sizeof(WCHAR) )) + !memicmpW( linkname, dosdevicesW, ARRAY_SIZE( dosdevicesW ))) { len += 4; if (volumepathname && len < buflen) { - path[0] = linkname[sizeof(dosdevicesW) / sizeof(WCHAR)]; + path[0] = linkname[ARRAY_SIZE( dosdevicesW )]; path[1] = ':'; path[2] = '\\'; path[3] = 0; -- 2.14.4

1 0

[PATCH] inetmib1: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/inetmib1/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index c0719c1d63..2f7b9cadfe 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1321,7 +1321,7 @@ BOOL WINAPI SnmpExtensionInit(DWORD dwUptimeReference, pFirstSupportedRegion); minSupportedIDLength = UINT_MAX; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) { if (supportedIDs[i].init) supportedIDs[i].init(); @@ -1337,7 +1337,7 @@ static void cleanup(void) { UINT i; - for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + for (i = 0; i < ARRAY_SIZE(supportedIDs); i++) if (supportedIDs[i].cleanup) supportedIDs[i].cleanup(); } -- 2.14.4

1 0

[PATCH] localui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 30 Jul '18

30 Jul '18

--- dlls/localui/localui.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 9fb975cd85..77c8bf0d76 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -375,7 +375,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP status = FALSE; res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); /* length is in WCHAR, including the '\0' */ - GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, sizeof(bufferW) / sizeof(bufferW[0])); + GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, ARRAY_SIZE(bufferW)); TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); /* native localui.dll use the same limits */ @@ -416,10 +416,10 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpiW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + if (!strncmpiW(name, portname_LPT, ARRAY_SIZE(portname_LPT) -1)) return PORT_IS_LPT; - if (!strncmpiW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + if (!strncmpiW(name, portname_COM, ARRAY_SIZE(portname_COM) -1)) return PORT_IS_COM; if (!strcmpiW(name, portname_FILE)) @@ -431,10 +431,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) -1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) -1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ -- 2.14.4

1 0

[PATCH] mscoree: Add test for registration-less COM components
by Fabian Maurer 30 Jul '18

30 Jul '18

I don't see a way to build the .NET dll as part of the test, so I added a binary. If you don't trust the .NET binary, just rebuilt it, source is included (works with mono's csc) Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mscoree/tests/Makefile.in | 4 + dlls/mscoree/tests/comtest.c | 254 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 +++ dlls/mscoree/tests/comtest.dll | Bin 0 -> 3584 bytes dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 +++ 8 files changed, 371 insertions(+) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest.dll create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..9e53b7c577 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -2,6 +2,10 @@ TESTDLL = mscoree.dll IMPORTS = ole32 shlwapi uuid C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..f3db35f7ef --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,254 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + sprintf(path_file, "%s%s", path_tmp, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + +static void run_test(int run) +{ + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + if (hr == COR_E_NEWER_RUNTIME) + { + win_skip(".NET Framework 4 is not installed\n"); + return; + } + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (test) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(LoadLibraryA("mscoree"), "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + ok(hr == S_OK, "Got %x\n", hr); + + if (classFactory) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (test2) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + } + } +} + +static void prepare_and_run_test(int run, const char *dll) +{ + char path_tmp[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_current[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetCurrentDirectoryA(MAX_PATH, path_current); + GetTempPathA(MAX_PATH, path_tmp); + + if (!write_resource_file(path_current, dll, "comtest.dll", path_dll)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run %d: CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + skip("Failed to create activation context\n"); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run %d: ActivateActCtx failed: %d\n", run, GetLastError()); + + run_test(run); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run %d: DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } +return; + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(int run) +{ + char path_current[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + BOOL success; + + GetCurrentDirectoryA(MAX_PATH, path_current); + sprintf(path_dll, "%s%s", path_current, "comtest.dll"); + + success = DeleteFileA(path_dll); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); +} + +static void run_child_process(int run, const char *dll) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d %s", argv[0], argv[1], run, dll); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + int run = atoi(argv[2]); + const char *dll = argv[3]; + prepare_and_run_test(run, dll); + + CoUninitialize(); + return; + } + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + run_child_process(1, "comtest.dll"); + + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..64c67ccc9d --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest.dll b/dlls/mscoree/tests/comtest.dll new file mode 100644 index 0000000000000000000000000000000000000000..71b95583fc419b073cbb349006bbb90f26905ef1 GIT binary patch literal 3584 zcmeHJOK%%h6#m9};HES*Aey#3I&D(a2R36oE-9emCT>frv<b1B@+fM?<B2n9JY&s_ zOVULZp@PH)b;Xt<!3MElfkcJGlGmau`U5H<Sn}9aEE>LZZO3t`ia@G_L{D<RIj?&j z_s-nw6R%!E4}e~d)m7jMpF(+scZL<32X}lqh|f1%-FZcuy1KKp=tg=y46313({0Q5 zgIF&+df4!F*VhZvMZFeOob;wm1Ea0bGe>|atp~?HIrCaO+jZ>HH);mZPmK)HO_`u` z<T-%Nicd7_7KPNWXoX0<P!IBNi>v&1o-I*Sq)!=lT9`a=xiwG3HJS(RUlaZTqXWrx z?n%lou9MTTvlLVA?IX~p`n)AS)${2v3T>KIZFw@%==#7Esm`ZE#|!AFYMrN2V%<_W z{l=;7qU*A*B&jWdKFsUf59ZKB`7dZYdUot9?c0^u!y*T;Z@hSXTx&&>a?Y7)Bb_y} znS&C%4<7L%lZ{*ee&aJ1z8HtDUya10!k1H89ywLSB6-=$kz=PO3w$n7z9#ax7nJ!F zV%yrWVPJy@e`r~3Y4);_BHh)HrIG$*8O2X{8Ng4iXFooMq4ncyg$uZe2QWjIe&jJk z{dt9tDtu32O5sU`XSLr|v}R1{{zJ+O+5k}`ja^hJrN~JwLf`Za<0;BBx=253A|-HI zN$+gE!OT*<h96tl!|FHS1~o&(erzKSU@vhqGQ@{*n7AD;5p}#m>_-|Kkt05YL&Qh$ zIwmlJ1>$~OB4+VEY-&CripIus_#VA0OxZ;q8<Rb0(-RnMv%vEwf=a`44xunLg<50> zq34!ywBg&B2x^ml?1T%J?Ua`54kkP+in>+D8gAuq%>6Gn;#(a$`hrt#RI66mb2>Uk zpK~L(OV<^<%eC%$R_q4;tm9crii<k-*@hpxHHQ)FG?iV?jh8!C7j{sKohVLMJP*a? zD0XT{+i?)Kgml5Rs(ui~t{t^it&nL|QBW^B;W^iK{$iGtuIGen_GYL28n~=<pDw@Q z*fAzcOy4d;t^I{(zrFZFCUyL+{of5I%MT8tSJ$*;j}EPm%+QdCg8~U9Kc;YZ@{99l z=C+yF-xYClGO4wWmdE8KEhV;`4z2phz(2BNJ9SyD(qb6A8EN#pPrclGHH>B|W!p3l zW>UtOQAwFOJD0LDxk@VIWNq_6#wb@R{MP#<A~;dagG_wd$ruNmoRM;#vCNcdjvY*m z<+5X`vFrgeyO1%Ag^I1Fv|p}kqiqiOMR>g<ujkrlT2ps+A_xnfcfxZ0=KJV4YU9MZ zx|=c7?XZ6S|Cg7O3D^p(bgw~k+l<@j#ZT^zm-9fOeV9=$BuwHQia1L=f?0BtylGET zo+KV^-n#gz_t%^4)0Y$0=!F(1=ghjWN?RamjA|id9G7>9!<ar#vOw8K)#+5C)uJ|{ z-9k*ifKrn_>-~uDp~jkGdb!kBZxd-n`50*bnJAM7o@7PZnty@WBc7EKr{0xEr?0^; zs^dFH-;my&S`41VodJyT($-WrvGVm<yT|piP@@dy3CM{pBBoKHRqoI|s-`LGt7^ss z{pwg&RaLP_U#QO|ui{U)^wPP+Z?B?Acg|y~er7m7VD1L%iMbQqU3L1A-lQj4gTt&i iqGye(=&>^WZ|8C9J-XW~ptpV|=I(Z)d-4B^EAS`sU3HTH literal 0 HcmV?d00001 diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..bab62ef1f0 --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="DLL.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..4fec5ebc22 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..117ec55d46 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * 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 + */ + +#include "windef.h" + +/* @makedep: comtest.dll */ +comtest.dll RCDATA comtest.dll + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

3 9

[PATCH v2 1/3] msvcrt: Verify format string before reading past end of it
by janisozaur＠gmail.com 30 Jul '18

30 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> In some cases, e.g. unterminated selection specifier (%[]) could make scanf() family of functions could keep reading from the format string past end of it. Add a check to verify when format string ends, rather than blindly expect the termination to happen. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0903d6909a..68585468fe 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -637,7 +637,7 @@ _FUNCTION_ { while(*format && (*format != ']')) { /* According to msdn: * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { + if((*format == '-') && *(format + 1) && (*(format + 1) != ']')) { if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b7244835ac..e1e351e0bb 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -294,6 +294,12 @@ static void test_sscanf_s(void) ret = psscanf_s("123", "%3c", buf, 3); ok(!strcmp("123a", buf), "buf = %s\n", buf); + /* Test to verify how unterminated and invalid sequence gets handled */ + memset(buf, 'a', sizeof(buf)); + ret = psscanf_s(" ", "%[-", buf, 2); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(!strcmp(" ", buf), "buf = %s\n", buf); + i = 1; ret = psscanf_s("123 123", "%s %d", buf, 2, &i); ok(ret == 0, "Wrong number of arguments read: %d\n", ret); -- 2.18.0

3 6

[PATCH 1/2] devenum/tests: Add some more traces in test_devenum().
by Zebediah Figura 30 Jul '18

30 Jul '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/tests/devenum.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index bc3d105..4b1114a 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -68,6 +68,7 @@ static void test_devenum(IBindCtx *bind_ctx) IMoniker *moniker; BOOL have_mrle = FALSE; GUID cat_guid, clsid; + WCHAR *displayname; VARIANT var; HRESULT hr; @@ -84,19 +85,19 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); - ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); - - if (winetest_debug > 1) - trace("%s:\n", wine_dbgstr_w(V_BSTR(&var))); - - VariantClear(&var); hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); hr = CLSIDFromString(V_BSTR(&var), &cat_guid); ok(hr == S_OK, "got %#x\n", hr); + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); + + if (winetest_debug > 1) + trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); + IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -107,6 +108,9 @@ static void test_devenum(IBindCtx *bind_ctx) { while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { + hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); + ok(hr == S_OK, "got %#x\n", hr); + hr = IMoniker_GetClassID(moniker, NULL); ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); @@ -123,7 +127,7 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr); if (winetest_debug > 1) - trace(" %s\n", wine_dbgstr_w(V_BSTR(&var))); + trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); if (IsEqualGUID(&CLSID_VideoCompressorCategory, &cat_guid)) { /* Test well known compressor to ensure that we really enumerate codecs */ @@ -139,6 +143,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); } -- 2.7.4

1 1

[PATCH 1/9] setupapi: Remove a pointless cast.
by Zebediah Figura 30 Jul '18

30 Jul '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 4a852da..ea69dea 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3092,7 +3092,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); @@ -3155,7 +3155,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( struct DeviceInfoSet *set = DeviceInfoSet; struct DeviceInfo *devInfo; - TRACE("%04x %p %d %p %p %d %p\n", (DWORD)DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); -- 2.7.4

1 8

[PATCH v2] msvfw32: Reimplement ICGetDisplayFormat().
by Zebediah Figura 30 Jul '18

30 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44490 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix test failures on w7u dlls/msvfw32/msvideo_main.c | 136 ++++++++++++++++-------- dlls/msvfw32/tests/msvfw.c | 248 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+), 43 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5dc99a4..e3bedd9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,6 +223,15 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) @@ -715,57 +724,98 @@ HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, /*********************************************************************** * ICGetDisplayFormat [MSVFW32.@] */ -HIC VFWAPI ICGetDisplayFormat( - HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut, - INT depth,INT dx,INT dy) +HIC VFWAPI ICGetDisplayFormat(HIC hic, BITMAPINFOHEADER *in, BITMAPINFOHEADER *out, + int depth, int width, int height) { - HIC tmphic = hic; + HIC tmphic = hic; - TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy); + TRACE("(%p, %p, %p, %d, %d, %d)\n", hic, in, out, depth, width, height); - if (!tmphic) { - tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS); - if (!tmphic) - return tmphic; - } - if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth)) - dy = dx = 0; /* no resize needed */ + if (!tmphic) + { + tmphic = ICLocate(ICTYPE_VIDEO, 0, in, NULL, ICMODE_DECOMPRESS); + if (!tmphic) + return NULL; + } - /* Can we decompress it ? */ - if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) - goto errout; /* no, sorry */ + if (ICDecompressQuery(tmphic, in, NULL)) + goto err; - ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); + if (width <= 0 || height <= 0) + { + width = in->biWidth; + height = in->biHeight; + } - if (lpbiOut->biCompression != 0) { - FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", - lpbiOut->biCompression); - } - if (lpbiOut->biSize < sizeof(*lpbiOut)) { - FIXME("Ooch, size of output BIH is too small (%d)\n", - lpbiOut->biSize); - lpbiOut->biSize = sizeof(*lpbiOut); - } - if (!depth) { - HDC hdc; + if (!depth) + depth = 32; - hdc = GetDC(0); - depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES); - ReleaseDC(0,hdc); - if (depth==15) depth = 16; - if (depth<8) depth = 8; - } - if (lpbiIn->biBitCount == 8) - depth = 8; + *out = *in; + out->biSize = sizeof(*out); + out->biWidth = width; + out->biHeight = height; + out->biCompression = BI_RGB; + out->biSizeImage = get_size_image(width, height, depth); - TRACE("=> %p\n", tmphic); - return tmphic; -errout: - if (hic!=tmphic) - ICClose(tmphic); + /* first try the given depth */ + out->biBitCount = depth; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + { + if (depth == 8) + ICDecompressGetPalette(tmphic, in, out); + return tmphic; + } - TRACE("=> 0\n"); - return 0; + /* then try 16, both with BI_RGB and BI_BITFIELDS */ + if (depth <= 16) + { + out->biBitCount = 16; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + out->biCompression = BI_BITFIELDS; + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + out->biCompression = BI_RGB; + } + + /* then try 24 */ + if (depth <= 24) + { + out->biBitCount = 24; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* then try 32 */ + if (depth <= 32) + { + out->biBitCount = 32; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* as a last resort, try 32 bpp with the original width and height */ + out->biWidth = in->biWidth; + out->biHeight = in->biHeight; + out->biBitCount = 32; + out->biSizeImage = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + /* finally, ask the compressor for its default output format */ + if (!ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)in, (DWORD_PTR)out)) + return tmphic; + +err: + if (hic != tmphic) + ICClose(tmphic); + + return NULL; } /*********************************************************************** @@ -1358,7 +1408,7 @@ HANDLE VFWAPI ICImageDecompress( biSizeImage = lpbiOut->bmiHeader.biSizeImage; if ( biSizeImage == 0 ) - biSizeImage = ((((lpbiOut->bmiHeader.biWidth * lpbiOut->bmiHeader.biBitCount + 7) >> 3) + 3) & (~3)) * abs(lpbiOut->bmiHeader.biHeight); + biSizeImage = get_size_image(lpbiOut->bmiHeader.biWidth, lpbiOut->bmiHeader.biHeight, lpbiOut->bmiHeader.biBitCount); TRACE( "call ICDecompressBegin\n" ); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index beeca9f..406a35b 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -316,10 +316,258 @@ static void test_ICInfo(void) ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } +static int get_display_format_test; + +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + +static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; + +static BITMAPINFOHEADER gdf_in, *gdf_out; + +LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, + LPARAM lparam1, LPARAM lparam2) +{ + LRESULT ret = 0; + + if (winetest_debug > 1) + trace("(%#lx, %p, %#x, %#lx, %#lx)\n", id, driver, msg, lparam1, lparam2); + + switch(msg) + { + case DRV_LOAD: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_FREE: + return 1; + case ICM_DECOMPRESS_QUERY: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + DWORD expected_size; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + + if (!out) + return ICERR_OK; + + ok(out == gdf_out, "got output %p\n", out); + + ok(out->biSize == sizeof(*out), "got size %d\n", out->biSize); + expected_size = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + ok(out->biSizeImage == expected_size, "expected image size %d, got %d\n", + expected_size, out->biSizeImage); + + ok(out->biPlanes == 0xcccc, "got planes %d\n", out->biPlanes); + ok(out->biXPelsPerMeter == 0xcccccccc && out->biYPelsPerMeter == 0xcccccccc, + "got resolution %dx%d\n", out->biXPelsPerMeter, out->biYPelsPerMeter); + ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %u\n", out->biClrUsed); + ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %u\n", out->biClrImportant); + + switch (get_display_format_test) + { + case 0: + return ICERR_OK; + case 1: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 16) + return ICERR_OK; + break; + case 2: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_BITFIELDS && out->biBitCount == 16) + return ICERR_OK; + break; + case 3: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 24) + return ICERR_OK; + break; + case 4: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 5: + if (out->biWidth == 10 && out->biHeight == 20 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 6: + break; + } + + return ICERR_BADFORMAT; + } + case ICM_DECOMPRESS_GET_FORMAT: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == gdf_out, "got output %p\n", out); + + memset(out, 0x55, sizeof(*out)); + out->biWidth = 50; + out->biHeight = 60; + out->biBitCount = 0xdead; + out->biCompression = 0xbeef; + out->biSizeImage = 0; + + return ICERR_OK; + } + } + case ICM_DECOMPRESS_GET_PALETTE: + { + BITMAPINFO *out = (BITMAPINFO *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == (BITMAPINFO *)gdf_out, "got output %p\n", out); + + out->bmiHeader.biClrUsed = 1; + out->bmiColors[0] = color_yellow; + + return 0xdeadbeef; + } + } + } + + return ret; +} + +static void check_bitmap_header_(int line, BITMAPINFOHEADER *header, LONG width, LONG height, WORD depth, DWORD compression) +{ + ok_(__FILE__, line)(header->biWidth == width, "expected %d, got %d\n", width, header->biWidth); + ok_(__FILE__, line)(header->biHeight == height, "expected %d, got %d\n", height, header->biHeight); + ok_(__FILE__, line)(header->biBitCount == depth, "expected %d, got %d\n", depth, header->biBitCount); + ok_(__FILE__, line)(header->biCompression == compression, "expected %#x, got %#x\n", compression, header->biCompression); +} +#define check_bitmap_header(a,b,c,d,e) check_bitmap_header_(__LINE__,a,b,c,d,e) + +static void test_ICGetDisplayFormat(void) +{ + static const DWORD testcc = mmioFOURCC('t','e','s','t'); + char outbuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *out_bmi; + LRESULT lres; + BOOL ret; + HIC hic; + + memset(&gdf_in, 0xcc, sizeof(gdf_in)); + gdf_in.biSize = sizeof(gdf_in); + gdf_in.biWidth = 10; + gdf_in.biHeight = 20; + gdf_in.biBitCount = 1; + gdf_in.biCompression = testcc; + + ret = ICInstall(ICTYPE_VIDEO, testcc, (LPARAM)gdf_driver_proc, NULL, ICINSTALL_FUNCTION); + ok(ret, "ICInstall failed\n"); + + hic = ICOpen(ICTYPE_VIDEO, testcc, ICMODE_DECOMPRESS); + ok(ret, "ICOpen failed\n"); + + memset(outbuf, 0, sizeof(outbuf)); + gdf_out = (BITMAPINFOHEADER *)outbuf; + + /* ICGetDisplayFormat tries several default formats; make sure those work */ + get_display_format_test = 0; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 1, BI_RGB); + + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_RGB); + + get_display_format_test = 2; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_BITFIELDS); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 4; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 32, BI_RGB); + + get_display_format_test = 5; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 32, BI_RGB); + + /* if every default format is rejected, the output of + * ICM_DECOMPRESS_GET_FORMAT is returned */ + get_display_format_test = 6; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + /* given bpp is treated as a lower bound */ + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 0; + + /* width or height <= 0 causes the input width and height to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 0, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 0); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, -10, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, -10); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + /* zero bpp causes 32 bpp to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 0, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + ok(gdf_out->biBitCount == 32 || gdf_out->biBitCount == 24, + "got %d\n", gdf_out->biBitCount); + ok(gdf_out->biCompression == BI_RGB, "got %#x\n", gdf_out->biCompression); + + /* specifying 8 bpp yields a request for palette colours */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 8, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 8, BI_RGB); + ok(gdf_out->biClrUsed == 1, "got biClrUsed %u\n", gdf_out->biClrUsed); + out_bmi = (BITMAPINFO *)gdf_out; + ok(!memcmp(&out_bmi->bmiColors[0], &color_yellow, sizeof(color_yellow)), + "got wrong colour\n"); + + lres = ICClose(hic); + ok(lres == ICERR_OK, "got %ld\n", lres); + + ret = ICRemove(ICTYPE_VIDEO, testcc, 0); + ok(ret, "ICRemove failed\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); test_ICInfo(); + test_ICGetDisplayFormat(); } -- 2.7.4

1 0

[PATCH 1/2] msvcrt: Verify format string to prevent buffer overrun
by janisozaur＠gmail.com 29 Jul '18

29 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> An unexpected format string of form "%" can cause scanf() family of functions to read past end of it. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 68585468fe..138d4351a2 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -686,7 +686,7 @@ _FUNCTION_ { * use %%." */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); - if ((_CHAR_)nch == *format) { + if (*format && (_CHAR_)nch == *format) { suppress = 1; /* whoops no field to be read */ st = 1; /* but we got what we expected */ nch = _GETC_(file); diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index e1e351e0bb..5e961f19b0 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -300,6 +300,12 @@ static void test_sscanf_s(void) ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(!strcmp(" ", buf), "buf = %s\n", buf); + memset(buf, 'a', sizeof(buf)); + buf[4] = 0; + ret = psscanf_s(" ", "%", buf, 2); + ok(ret == 0, "Wrong number of arguments read: %d\n", ret); + ok(!strcmp("aaa", buf), "buf = %s\n", buf); + i = 1; ret = psscanf_s("123 123", "%s %d", buf, 2, &i); ok(ret == 0, "Wrong number of arguments read: %d\n", ret); -- 2.18.0

2 3

[PATCH] winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests
by Fabian Maurer 29 Jul '18

29 Jul '18

Fixes bug 45530 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winmm/tests/wave.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winmm/waveform.c | 6 ++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b402e21917..fa07c1e1c9 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1708,6 +1708,43 @@ static void test_PlaySound(void) DeleteFileA(test_file); } +static void test_waveOutOpen_invalid_parameter(void) +{ + HWAVEOUT handle; + MMRESULT ret; + WAVEFORMATEX wfx; + WAVEFORMATEX const const_wfx = { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nBlockAlign = 1, + .nAvgBytesPerSec = 11025 * 1, + .wBitsPerSample = 8, + .cbSize = 0 + }; + + ret = waveOutOpen(&handle, 0, &const_wfx, 0, 0, 0); + if (ret != MMSYSERR_NOERROR) + { + skip("Could not to invalid parameter test\n"); + return; + } + waveOutClose(handle); + + /* Start actual tests */ + + wfx = const_wfx; + wfx.nAvgBytesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_NOERROR, "Got %d\n", ret); + waveOutClose(handle); + + wfx = const_wfx; + wfx.nSamplesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_INVALPARAM, "Got %d\n", ret); +} + START_TEST(wave) { test_multiple_waveopens(); @@ -1715,4 +1752,5 @@ START_TEST(wave) test_sndPlaySound(); test_fragmentsize(); test_PlaySound(); + test_waveOutOpen_invalid_parameter(); } diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4ac20..58f830dad9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1106,6 +1106,12 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, WARN("Fixing bad nAvgBytesPerSec (%u)\n", device->orig_fmt->nAvgBytesPerSec); device->orig_fmt->nAvgBytesPerSec = device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign; } + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } }else{ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + info->format->cbSize); -- 2.18.0

2 1

[PATCH] msvcrt: Verify format string before reading past end of it
by janisozaur＠gmail.com 28 Jul '18

28 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> In some cases, e.g. unterminated selection specifier (%[]) could make scanf() family of functions could keep reading from the format string past end of it. Add a check to verify when format string ends, rather than blindly expect the termination to happen. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0903d6909a..68585468fe 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -637,7 +637,7 @@ _FUNCTION_ { while(*format && (*format != ']')) { /* According to msdn: * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { + if((*format == '-') && *(format + 1) && (*(format + 1) != ']')) { if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b7244835ac..e1e351e0bb 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -294,6 +294,12 @@ static void test_sscanf_s(void) ret = psscanf_s("123", "%3c", buf, 3); ok(!strcmp("123a", buf), "buf = %s\n", buf); + /* Test to verify how unterminated and invalid sequence gets handled */ + memset(buf, 'a', sizeof(buf)); + ret = psscanf_s(" ", "%[-", buf, 2); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(!strcmp(" ", buf), "buf = %s\n", buf); + i = 1; ret = psscanf_s("123 123", "%s %d", buf, 2, &i); ok(ret == 0, "Wrong number of arguments read: %d\n", ret); -- 2.18.0

1 0

Winebrowser
by Allen Bair 28 Jul '18

28 Jul '18

I was recently browsing the internet looking to understand how to change WINE so that it launches the default system browser rather than winebrowser and came up with a complicated series of regedit gymnastics. Out of curiosity, why not just set WINE by default to open browser links in the default system browser? This would solve a lot of problems for the user.

2 1

[PATCH v2] windowscodecs: Fix an MSVC warning about pNumericRepresentation.
by Serge Gautherie 28 Jul '18

28 Jul '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\info.c(1461) : error C4133: 'function' : incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/windowscodecs/info.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107..7dcfd22 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1450,11 +1450,18 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { + HRESULT hr; + DWORD numrep; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); TRACE("(%p,%p)\n", iface, pNumericRepresentation); - return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); + numrep = *pNumericRepresentation; + hr = ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, &numrep); + if (hr == S_OK) + *pNumericRepresentation = numrep; + return hr; } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { -- 2.10.0.windows.1

2 1

[PATCH] windowscodecs: Fix an MSVC warning about pNumericRepresentation.
by Serge Gautherie 28 Jul '18

28 Jul '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\info.c(1461) : error C4133: 'function' : incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/windowscodecs/info.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107..21b9c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1450,11 +1450,16 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { + HRESULT hr; + DWORD numrep; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); TRACE("(%p,%p)\n", iface, pNumericRepresentation); - return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); + hr = ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, &numrep); + *pNumericRepresentation = numrep; + return hr; } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { -- 2.10.0.windows.1

2 5

[PATCH] ntoskrnl: Emulate sti/cli instructions on x86_64
by Fabian Maurer 28 Jul '18

28 Jul '18

Fixes bug 45521. Thanks to Anastasius Focht for the clear bug report. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntoskrnl.exe/instr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index b2dac58fc4..67cdd327ee 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,6 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } break; /* Unable to emulate it */ } + + case 0xfa: /* cli */ + case 0xfb: /* sti */ + context->Rip += prefixlen + 1; + return ExceptionContinueExecution; } return ExceptionContinueSearch; /* Unable to emulate it */ } -- 2.18.0

1 0

[PATCH v3] sfnt2fon: Prevent reading past allocated buffer
by janisozaur＠gmail.com 28 Jul '18

28 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Some fonts (e.g. Courier) may cause sfnt2fon try reading past end of heap-allocated buffer. Rather than reading from uninitialised memory, return 0 in such case. Visual tests on .fon render of this font (using FontForge) shown no artifacts. This should fix Bug 45422 v2: - Improve C89 compatibility - Use cached index for both left and right bytes v3: - Sign-off Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- tools/sfnt2fon/sfnt2fon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763872..0f788da7e1 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -554,6 +554,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { + int idx, x_limit; if(y < ascent - face->glyph->bitmap_top || y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; @@ -565,16 +566,19 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, info->data[data_pos++] = 0; continue; } + idx = (y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off; if(x == x_off) left_byte = 0; else - left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; + left_byte = face->glyph->bitmap.buffer[idx - 1]; + /* FreeType allocates that many bytes for bitmap, but some fonts (e.g. Courier) might try reading past the buffer */ + x_limit = face->glyph->bitmap.rows * face->glyph->bitmap.pitch; /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ - if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) + if((idx >= x_limit) || (x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8)))) right_byte = 0; else - right_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off]; + right_byte = face->glyph->bitmap.buffer[idx]; byte = (left_byte << (8 - (face->glyph->bitmap_left & 7))) & 0xff; byte |= ((right_byte >> (face->glyph->bitmap_left & 7)) & 0xff); -- 2.18.0

2 1

[PATCH] msvfw32: Reimplement ICGetDisplayFormat().
by Zebediah Figura 28 Jul '18

28 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44490 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 136 ++++++++++++++++-------- dlls/msvfw32/tests/msvfw.c | 246 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 339 insertions(+), 43 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5dc99a4..e3bedd9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,6 +223,15 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) @@ -715,57 +724,98 @@ HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, /*********************************************************************** * ICGetDisplayFormat [MSVFW32.@] */ -HIC VFWAPI ICGetDisplayFormat( - HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut, - INT depth,INT dx,INT dy) +HIC VFWAPI ICGetDisplayFormat(HIC hic, BITMAPINFOHEADER *in, BITMAPINFOHEADER *out, + int depth, int width, int height) { - HIC tmphic = hic; + HIC tmphic = hic; - TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy); + TRACE("(%p, %p, %p, %d, %d, %d)\n", hic, in, out, depth, width, height); - if (!tmphic) { - tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS); - if (!tmphic) - return tmphic; - } - if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth)) - dy = dx = 0; /* no resize needed */ + if (!tmphic) + { + tmphic = ICLocate(ICTYPE_VIDEO, 0, in, NULL, ICMODE_DECOMPRESS); + if (!tmphic) + return NULL; + } - /* Can we decompress it ? */ - if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) - goto errout; /* no, sorry */ + if (ICDecompressQuery(tmphic, in, NULL)) + goto err; - ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); + if (width <= 0 || height <= 0) + { + width = in->biWidth; + height = in->biHeight; + } - if (lpbiOut->biCompression != 0) { - FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", - lpbiOut->biCompression); - } - if (lpbiOut->biSize < sizeof(*lpbiOut)) { - FIXME("Ooch, size of output BIH is too small (%d)\n", - lpbiOut->biSize); - lpbiOut->biSize = sizeof(*lpbiOut); - } - if (!depth) { - HDC hdc; + if (!depth) + depth = 32; - hdc = GetDC(0); - depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES); - ReleaseDC(0,hdc); - if (depth==15) depth = 16; - if (depth<8) depth = 8; - } - if (lpbiIn->biBitCount == 8) - depth = 8; + *out = *in; + out->biSize = sizeof(*out); + out->biWidth = width; + out->biHeight = height; + out->biCompression = BI_RGB; + out->biSizeImage = get_size_image(width, height, depth); - TRACE("=> %p\n", tmphic); - return tmphic; -errout: - if (hic!=tmphic) - ICClose(tmphic); + /* first try the given depth */ + out->biBitCount = depth; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + { + if (depth == 8) + ICDecompressGetPalette(tmphic, in, out); + return tmphic; + } - TRACE("=> 0\n"); - return 0; + /* then try 16, both with BI_RGB and BI_BITFIELDS */ + if (depth <= 16) + { + out->biBitCount = 16; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + out->biCompression = BI_BITFIELDS; + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + out->biCompression = BI_RGB; + } + + /* then try 24 */ + if (depth <= 24) + { + out->biBitCount = 24; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* then try 32 */ + if (depth <= 32) + { + out->biBitCount = 32; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* as a last resort, try 32 bpp with the original width and height */ + out->biWidth = in->biWidth; + out->biHeight = in->biHeight; + out->biBitCount = 32; + out->biSizeImage = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + /* finally, ask the compressor for its default output format */ + if (!ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)in, (DWORD_PTR)out)) + return tmphic; + +err: + if (hic != tmphic) + ICClose(tmphic); + + return NULL; } /*********************************************************************** @@ -1358,7 +1408,7 @@ HANDLE VFWAPI ICImageDecompress( biSizeImage = lpbiOut->bmiHeader.biSizeImage; if ( biSizeImage == 0 ) - biSizeImage = ((((lpbiOut->bmiHeader.biWidth * lpbiOut->bmiHeader.biBitCount + 7) >> 3) + 3) & (~3)) * abs(lpbiOut->bmiHeader.biHeight); + biSizeImage = get_size_image(lpbiOut->bmiHeader.biWidth, lpbiOut->bmiHeader.biHeight, lpbiOut->bmiHeader.biBitCount); TRACE( "call ICDecompressBegin\n" ); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index beeca9f..5bff6d1 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -316,10 +316,256 @@ static void test_ICInfo(void) ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } +static int get_display_format_test; + +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + +static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; + +static BITMAPINFOHEADER gdf_in, *gdf_out; + +LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, + LPARAM lparam1, LPARAM lparam2) +{ + LRESULT ret = 0; + + if (winetest_debug > 1) + trace("(%#lx, %p, %#x, %#lx, %#lx)\n", id, driver, msg, lparam1, lparam2); + + switch(msg) + { + case DRV_LOAD: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_FREE: + return 1; + case ICM_DECOMPRESS_QUERY: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + DWORD expected_size; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + + if (!out) + return ICERR_OK; + + ok(out == gdf_out, "got output %p\n", out); + + ok(out->biSize == sizeof(*out), "got size %d\n", out->biSize); + expected_size = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + ok(out->biSizeImage == expected_size, "expected image size %d, got %d\n", + expected_size, out->biSizeImage); + + ok(out->biPlanes == 0xcccc, "got planes %d\n", out->biPlanes); + ok(out->biXPelsPerMeter == 0xcccccccc && out->biYPelsPerMeter == 0xcccccccc, + "got resolution %dx%d\n", out->biXPelsPerMeter, out->biYPelsPerMeter); + ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %u\n", out->biClrUsed); + ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %u\n", out->biClrImportant); + + switch (get_display_format_test) + { + case 0: + return ICERR_OK; + case 1: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 16) + return ICERR_OK; + break; + case 2: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_BITFIELDS && out->biBitCount == 16) + return ICERR_OK; + break; + case 3: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 24) + return ICERR_OK; + break; + case 4: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 5: + if (out->biWidth == 10 && out->biHeight == 20 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 6: + break; + } + + return ICERR_BADFORMAT; + } + case ICM_DECOMPRESS_GET_FORMAT: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == gdf_out, "got output %p\n", out); + + memset(out, 0x55, sizeof(*out)); + out->biWidth = 50; + out->biHeight = 60; + out->biBitCount = 0xdead; + out->biCompression = 0xbeef; + out->biSizeImage = 0; + + return ICERR_OK; + } + } + case ICM_DECOMPRESS_GET_PALETTE: + { + BITMAPINFO *out = (BITMAPINFO *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == (BITMAPINFO *)gdf_out, "got output %p\n", out); + + out->bmiHeader.biClrUsed = 1; + out->bmiColors[0] = color_yellow; + + return 0xdeadbeef; + } + } + } + + return ret; +} + +static void check_bitmap_header_(int line, BITMAPINFOHEADER *header, LONG width, LONG height, WORD depth, DWORD compression) +{ + ok_(__FILE__, line)(header->biWidth == width, "expected %d, got %d\n", width, header->biWidth); + ok_(__FILE__, line)(header->biHeight == height, "expected %d, got %d\n", height, header->biHeight); + ok_(__FILE__, line)(header->biBitCount == depth, "expected %d, got %d\n", depth, header->biBitCount); + ok_(__FILE__, line)(header->biCompression == compression, "expected %#x, got %#x\n", compression, header->biCompression); +} +#define check_bitmap_header(a,b,c,d,e) check_bitmap_header_(__LINE__,a,b,c,d,e) + +static void test_ICGetDisplayFormat(void) +{ + static const DWORD testcc = mmioFOURCC('t','e','s','t'); + char outbuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *out_bmi; + LRESULT lres; + BOOL ret; + HIC hic; + + memset(&gdf_in, 0xcc, sizeof(gdf_in)); + gdf_in.biSize = sizeof(gdf_in); + gdf_in.biWidth = 10; + gdf_in.biHeight = 20; + gdf_in.biBitCount = 1; + gdf_in.biCompression = testcc; + + ret = ICInstall(ICTYPE_VIDEO, testcc, (LPARAM)gdf_driver_proc, NULL, ICINSTALL_FUNCTION); + ok(ret, "ICInstall failed\n"); + + hic = ICOpen(ICTYPE_VIDEO, testcc, ICMODE_DECOMPRESS); + ok(ret, "ICOpen failed\n"); + + memset(outbuf, 0, sizeof(outbuf)); + gdf_out = (BITMAPINFOHEADER *)outbuf; + + /* ICGetDisplayFormat tries several default formats; make sure those work */ + get_display_format_test = 0; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 1, BI_RGB); + + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_RGB); + + get_display_format_test = 2; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_BITFIELDS); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 4; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 32, BI_RGB); + + get_display_format_test = 5; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 32, BI_RGB); + + /* if every default format is rejected, the output of + * ICM_DECOMPRESS_GET_FORMAT is returned */ + get_display_format_test = 6; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + /* given bpp is treated as a lower bound */ + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 0; + + /* width or height <= 0 causes the input width and height to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 0, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 0); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, -10, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, -10); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + /* zero bpp causes 32 bpp to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 0, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 32, BI_RGB); + + /* specifying 8 bpp yields a request for palette colours */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 8, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 8, BI_RGB); + ok(gdf_out->biClrUsed == 1, "got biClrUsed %u\n", gdf_out->biClrUsed); + out_bmi = (BITMAPINFO *)gdf_out; + ok(!memcmp(&out_bmi->bmiColors[0], &color_yellow, sizeof(color_yellow)), + "got wrong colour\n"); + + lres = ICClose(hic); + ok(lres == ICERR_OK, "got %ld\n", lres); + + ret = ICRemove(ICTYPE_VIDEO, testcc, 0); + ok(ret, "ICRemove failed\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); test_ICInfo(); + test_ICGetDisplayFormat(); } -- 2.7.4

2 1

Wine-staging patch request.
by Alistair Leslie-Hughes 27 Jul '18

27 Jul '18

Hi, Since this wine release cycle has been extended. I was looking a do a release of staging next Friday. Do you have any patches not yet sent that could do with some extra testing? Let us know, so we can consider them for the next release. Regards Alistair

1 0

[PATCH] dxdiagn: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/provider.c | 92 +++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1fdab5e2db..ec30574b84 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -494,7 +494,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); @@ -518,21 +518,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); + snprintfW(language_str, ARRAY_SIZE(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); + snprintfW(language_str, ARRAY_SIZE(language_str), languages_fmtW, system_lang, + regional_setting_engW, user_lang); hr = add_bstr_property(node, szLanguagesEnglish, language_str); if (FAILED(hr)) @@ -555,21 +557,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); + snprintfW(datetime_str, ARRAY_SIZE(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); + snprintfW(datetime_str, ARRAY_SIZE(datetime_str), datetime_fmtW, date_str, time_str); hr = add_bstr_property(node, szTimeEnglish, datetime_str); if (FAILED(hr)) @@ -596,7 +598,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)) @@ -798,25 +800,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))); + snprintfW(print_buf, ARRAY_SIZE(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); + snprintfW(print_buf, ARRAY_SIZE(print_buf), pagefile_fmtW, usedpage_mb, availpage_mb); hr = add_bstr_property(node, szPageFileEnglish, print_buf); if (FAILED(hr)) @@ -828,7 +831,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; @@ -984,7 +987,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); + snprintfW(buffer, ARRAY_SIZE(buffer), adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); if (!display_adapter) { @@ -1001,9 +1004,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)) @@ -1017,7 +1022,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), driverversion_fmtW, + snprintfW(buffer, ARRAY_SIZE(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)); @@ -1025,22 +1030,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); + snprintfW(buffer, ARRAY_SIZE(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); + snprintfW(buffer, ARRAY_SIZE(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); + snprintfW(buffer, ARRAY_SIZE(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); + snprintfW(buffer, ARRAY_SIZE(buffer), id_fmtW, adapter_info.Revision); hr = add_bstr_property(display_adapter, szRevisionId, buffer); if (FAILED(hr)) goto cleanup; @@ -1074,7 +1079,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, + snprintfW(buffer, ARRAY_SIZE(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); @@ -1109,7 +1114,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); + snprintfW(buffer, ARRAY_SIZE(buffer), mem_fmt, available_mem / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1288,7 +1293,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); + snprintfW(buffer, ARRAY_SIZE(buffer), mem_fmt, tmp / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1329,7 +1334,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)) @@ -1465,12 +1470,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)); + snprintfW(szVersion_v, ARRAY_SIZE(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)); @@ -1542,14 +1544,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); + snprintfW(szFileID, ARRAY_SIZE(szFileID), szFormat, i); file_container = allocate_information_node(szFileID); if (!file_container) @@ -1624,7 +1626,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc goto cleanup; pRF = ((REGFILTER2**)ppRF)[0]; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + snprintfW(bufferW, ARRAY_SIZE(bufferW), szVersionFormat, pRF->dwVersion); hr = add_bstr_property(subcont, szVersionW, bufferW); if (FAILED(hr)) goto cleanup; @@ -1796,7 +1798,7 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node WCHAR bufferW[10]; IDxDiagContainerImpl_Container *subcont; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + snprintfW(bufferW, ARRAY_SIZE(bufferW), szIdFormat, i); subcont = allocate_information_node(bufferW); if (!subcont) { @@ -1893,7 +1895,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; -- 2.14.4

1 0

[PATCH] d3d8: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c967a33d8c..364798f79b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2126,7 +2126,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); - if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (Type >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid Type %#x passed.\n", Type); return D3D_OK; @@ -2152,7 +2152,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value); - if (type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (type >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid type %#x passed.\n", type); return D3D_OK; -- 2.14.4

2 1

[PATCH] d3d10: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 10d8404559..cd6f4a3e1d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1139,7 +1139,7 @@ static const struct d3d10_effect_state_property_info *get_property_info(UINT id) { unsigned int i; - for (i = 0; i < sizeof(property_info) / sizeof(*property_info); ++i) + for (i = 0; i < ARRAY_SIZE(property_info); ++i) { if (property_info[i].id == id) return &property_info[i]; @@ -1152,7 +1152,7 @@ static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER { unsigned int i; - for (i = 0; i < sizeof(d3d10_effect_state_storage_info) / sizeof(*d3d10_effect_state_storage_info); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_effect_state_storage_info); ++i) { if (d3d10_effect_state_storage_info[i].id == id) return &d3d10_effect_state_storage_info[i]; -- 2.14.4

2 1

[PATCH] dx8vb: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dx8vb/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index aa6b9436ce..a1ee7c918e 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -157,13 +157,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) && !IsEqualGUID( &IID_IUnknown, riid)) return E_NOINTERFACE; - for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

2 1

[PATCH 1/3] kernel32: Add SearchPath test showing working directory priority.
by Erich E. Hoover 27 Jul '18

27 Jul '18

From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> --- dlls/kernel32/tests/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index ca1cbf30ec..ce75f99b63 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1806,10 +1806,11 @@ static void test_SearchPathA(void) static const CHAR testdeprelA[] = "./testdep.dll"; static const CHAR kernel32A[] = "kernel32.dll"; static const CHAR fileA[] = ""; - CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH]; - CHAR *ptrA = NULL; + CHAR pathA[MAX_PATH], buffA[MAX_PATH], path2A[MAX_PATH], path3A[MAX_PATH], curdirA[MAX_PATH]; + CHAR tmpdirA[MAX_PATH], *ptrA = NULL; ULONG_PTR cookie; HANDLE handle; + BOOL bret; DWORD ret; if (!pSearchPathA) @@ -1883,6 +1884,28 @@ static void test_SearchPathA(void) ret = pDeactivateActCtx(0, cookie); ok(ret, "failed to deactivate context, %u\n", GetLastError()); pReleaseActCtx(handle); + + /* test the search path priority of the working directory */ + GetTempPathA(sizeof(tmpdirA), tmpdirA); + ret = GetCurrentDirectoryA(MAX_PATH, curdirA); + ok(ret, "failed to obtain working directory.\n"); + sprintf(pathA, "%s\\%s", tmpdirA, kernel32A); + ret = pSearchPathA(NULL, kernel32A, NULL, sizeof(path2A)/sizeof(CHAR), path2A, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + bret = CopyFileA(path2A, pathA, FALSE); + ok(bret != 0, "failed to copy test executable to temp directory, %u\n", GetLastError()); + sprintf(path3A, "%s%s%s", curdirA, curdirA[strlen(curdirA)-1] != '\\' ? "\\" : "", kernel32A); + bret = CopyFileA(path2A, path3A, FALSE); + ok(bret != 0, "failed to copy test executable to launch directory, %u\n", GetLastError()); + bret = SetCurrentDirectoryA(tmpdirA); + ok(bret, "failed to change working directory\n"); + ret = pSearchPathA(NULL, kernel32A, ".exe", sizeof(buffA), buffA, NULL); + ok(ret && ret == strlen(buffA), "got %d\n", ret); + ok(strcmp(buffA, path3A) == 0, "expected %s, got %s\n", path3A, buffA); + bret = SetCurrentDirectoryA(curdirA); + ok(bret, "failed to reset working directory\n"); + DeleteFileA(path3A); + DeleteFileA(pathA); } static void test_SearchPathW(void) -- 2.14.1

1 2

[PATCH] odbc32: Rename functions to avoid conflicts with native drivers.
by Daniel Lehman 27 Jul '18

27 Jul '18

supercedes https://urldefense.proofpoint.com/v2/url?u=https-3A__source.winehq.org_patc…

1 0

[PATCH 1/2] winevulkan: Expose driver vkGetInstanceProcAddr via winevulkan exports.
by Jacek Caban 27 Jul '18

27 Jul '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/winevulkan.spec | 1 + 3 files changed, 12 insertions(+)

2 2

[PATCH] mscoree: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 26 Jul '18

26 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/config.c | 18 +++++++----------- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/mscoree_main.c | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 48f12f4d53..a5c0666904 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -417,7 +417,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, TRACE("%s %s %s\n", debugstr_wn(pNamespaceUri,nNamespaceUri), debugstr_wn(pLocalName,nLocalName), debugstr_wn(pQName,nQName)); - if (This->statenum == sizeof(This->states) / sizeof(This->states[0]) - 1) + if (This->statenum == ARRAY_SIZE(This->states) - 1) { ERR("file has too much nesting\n"); return E_FAIL; @@ -426,8 +426,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, switch (This->states[This->statenum]) { case STATE_ROOT: - if (nLocalName == sizeof(configuration)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, configuration) == 0) + if (nLocalName == ARRAY_SIZE(configuration) - 1 && lstrcmpW(pLocalName, configuration) == 0) { This->states[++This->statenum] = STATE_CONFIGURATION; break; @@ -435,15 +434,13 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_CONFIGURATION: - if (nLocalName == sizeof(startup)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, startup) == 0) + if (nLocalName == ARRAY_SIZE(startup) - 1 && lstrcmpW(pLocalName, startup) == 0) { hr = parse_startup(This, pAttr); This->states[++This->statenum] = STATE_STARTUP; break; } - else if (nLocalName == sizeof(runtime)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, runtime) == 0) + else if (nLocalName == ARRAY_SIZE(runtime) - 1 && lstrcmpW(pLocalName, runtime) == 0) { This->states[++This->statenum] = STATE_RUNTIME; break; @@ -451,7 +448,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_RUNTIME: - if (nLocalName == sizeof(assemblyBinding)/sizeof(WCHAR)-1 && + if (nLocalName == ARRAY_SIZE(assemblyBinding) - 1 && lstrcmpW(pLocalName, assemblyBinding) == 0) { This->states[++This->statenum] = STATE_ASSEMBLY_BINDING; @@ -460,8 +457,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_ASSEMBLY_BINDING: - if (nLocalName == sizeof(probing)/sizeof(WCHAR)-1 && - lstrcmpW(pLocalName, probing) == 0) + if (nLocalName == ARRAY_SIZE(probing) - 1 && lstrcmpW(pLocalName, probing) == 0) { hr = parse_probing(This, pAttr); This->states[++This->statenum] = STATE_PROBING; @@ -470,7 +466,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, else goto unknown; case STATE_STARTUP: - if (nLocalName == sizeof(supportedRuntime)/sizeof(WCHAR)-1 && + if (nLocalName == ARRAY_SIZE(supportedRuntime) - 1 && lstrcmpW(pLocalName, supportedRuntime) == 0) { hr = parse_supported_runtime(This, pAttr); diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 0c933cac29..5c4e7f1d6e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -138,7 +138,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf if (!config_path) { - DWORD len = sizeof(config_dir)/sizeof(*config_dir); + DWORD len = ARRAY_SIZE(config_dir); static const WCHAR machine_configW[] = {'\\','C','O','N','F','I','G','\\','m','a','c','h','i','n','e','.','c','o','n','f','i','g',0}; @@ -159,7 +159,7 @@ static HRESULT RuntimeHost_GetDefaultDomain(RuntimeHost *This, const WCHAR *conf goto end; } - GetModuleFileNameW(NULL, base_dir, sizeof(base_dir) / sizeof(*base_dir)); + GetModuleFileNameW(NULL, base_dir, ARRAY_SIZE(base_dir)); base_dirA = WtoA(base_dir); if (!base_dirA) { @@ -1674,7 +1674,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) if (res != ERROR_SUCCESS || numKeys == 0) goto cleanup; numKeys--; - keyLength = sizeof(subkeyName) / sizeof(WCHAR); + keyLength = ARRAY_SIZE(subkeyName); res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); if (res != ERROR_SUCCESS) goto cleanup; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index eda380a1ca..5612ff6b89 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -751,7 +751,7 @@ static BOOL install_wine_mono(void) } } - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + 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))); @@ -759,7 +759,7 @@ static BOOL install_wine_mono(void) return FALSE; memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); TRACE("starting %s\n", debugstr_w(args)); -- 2.14.4

2 1

[PATCH] msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore.
by Piotr Caban 26 Jul '18

26 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45495 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/ios.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v5 1/2] kernel32: resource: Changed QUEUEDUPDATES to match MS offset
by Jon Doron 26 Jul '18

26 Jul '18

The utility muirct.exe for some reason accesses the opaque HANDLE that is returned by BeginUpdateResource, it assumes a certain structure in which (on 32bit systems) there is a pointer to the wide repesentation of the file name in offset 0x18 (0x30 on 64bit). Refer to: muirct!BldToolsEndUpdateResourceW called from muirct!CopyChecksumToFile Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 73f3cca363..dda3a5c3a2 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -635,6 +635,7 @@ DWORD WINAPI SizeofResource( HINSTANCE hModule, HRSRC hRsrc ) typedef struct { + void *Unknown[6]; LPWSTR pFileName; BOOL bDeleteExistingResources; struct list root; -- 2.17.1

1 1

[PATCH] msvideo.dll16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvideo.dll16/msvideo16.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index d390020ecc..bc239a8ab3 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -889,7 +889,7 @@ DWORD WINAPI VideoCapDriverDescAndVer16(WORD nr, LPSTR buf1, WORD buf1len, RegQueryInfoKeyA( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExA(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; if (strncasecmp(buf, "vid", 3)) continue; -- 2.14.4

1 0

[PATCH] storage.dll16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/storage.dll16/storage.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 865411f9cb..23e88b42d1 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -776,8 +776,8 @@ STORAGE_init_storage(stream_access16 *str) { /* block 1 is the root directory entry */ memset(block,0x00,sizeof(block)); stde = (struct storage_pps_entry*)block; - MultiByteToWideChar( CP_ACP, 0, "RootEntry", -1, stde->pps_rawname, - sizeof(stde->pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, "RootEntry", -1, stde->pps_rawname, + ARRAY_SIZE(stde->pps_rawname)); stde->pps_sizeofname = (strlenW(stde->pps_rawname)+1) * sizeof(WCHAR); stde->pps_type = 5; stde->pps_dir = -1; @@ -1750,8 +1750,8 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName assert(ret); nPPSEntries = STORAGE_get_pps_entry(&lpstg->str,ppsent,&(lpstg->stde)); assert(nPPSEntries == 1); - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, lpstg->stde.pps_rawname, - sizeof(lpstg->stde.pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstg->stde.pps_rawname, + ARRAY_SIZE(lpstg->stde.pps_rawname)); lpstg->stde.pps_sizeofname = (strlenW(lpstg->stde.pps_rawname)+1)*sizeof(WCHAR); lpstg->stde.pps_next = -1; lpstg->stde.pps_prev = -1; @@ -1813,8 +1813,8 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, assert(ret); nPPSEntries = STORAGE_get_pps_entry(&lpstr->str,ppsent,&(lpstr->stde)); assert(nPPSEntries == 1); - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, lpstr->stde.pps_rawname, - sizeof(lpstr->stde.pps_rawname)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstr->stde.pps_rawname, + ARRAY_SIZE(lpstr->stde.pps_rawname)); lpstr->stde.pps_sizeofname = (strlenW(lpstr->stde.pps_rawname)+1) * sizeof(WCHAR); lpstr->stde.pps_next = -1; lpstr->stde.pps_prev = -1; @@ -1855,7 +1855,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, lpstg->str.lockbytes = This->str.lockbytes; _ilockbytes16_addref(This->str.lockbytes); } - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, name, ARRAY_SIZE(name)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { IStorage16_fnRelease(&lpstg->IStorage16_iface); @@ -1897,7 +1897,7 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v lpstr->str.lockbytes = This->str.lockbytes; _ilockbytes16_addref(This->str.lockbytes); } - MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, name, ARRAY_SIZE(name)); newpps = STORAGE_look_for_named_pps(&lpstr->str,This->stde.pps_dir,name); if (newpps==-1) { IStream16_fnRelease(&lpstr->IStream16_iface); -- 2.14.4

1 0

[PATCH] scrobj: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrobj/scrobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 3e6535a607..989a648370 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -102,7 +102,7 @@ static void release_typelib(void) if (!typelib) return; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); @@ -369,7 +369,7 @@ static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR if (FAILED(hr)) return hr; - hr = StringFromGUID2(&guid, guidW, sizeof(guidW)/sizeof(guidW[0])); + hr = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW)); if (FAILED(hr)) return hr; -- 2.14.4

1 0

[PATCH] msrle32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msrle32/msrle32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 66880408d4..5bcfa86f97 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1183,8 +1183,8 @@ static LRESULT GetInfo(const CodecInfo *pi, ICINFO *icinfo, DWORD dwSize) icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(MSRLE32_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(MSRLE32_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); return sizeof(ICINFO); } @@ -1206,8 +1206,8 @@ static LRESULT About(CodecInfo *pi, HWND hWnd) /* pre-condition */ assert(MSRLE32_hModule != 0); - LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, sizeof(szTitle)/sizeof(szTitle[0])); - LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, sizeof(szAbout)/sizeof(szAbout[0])); + LoadStringW(MSRLE32_hModule, IDS_NAME, szTitle, ARRAY_SIZE(szTitle)); + LoadStringW(MSRLE32_hModule, IDS_ABOUT, szAbout, ARRAY_SIZE(szAbout)); MessageBoxW(hWnd, szAbout, szTitle, MB_OK|MB_ICONINFORMATION); -- 2.14.4

1 0

[PATCH] mpr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/wnet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 78759ecb15..ad4f1ddb65 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -130,9 +130,8 @@ static void _tryLoadProvider(PCWSTR provider) HKEY hKey; TRACE("%s\n", debugstr_w(provider)); - snprintfW(serviceName, sizeof(serviceName) / sizeof(WCHAR), serviceFmt, - servicePrefix, provider); - serviceName[sizeof(serviceName) / sizeof(WCHAR) - 1] = '\0'; + snprintfW(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider); + serviceName[ARRAY_SIZE(serviceName) - 1] = '\0'; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { @@ -2127,7 +2126,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, if (wideLocalName) { WCHAR wideRemoteStatic[MAX_PATH]; - DWORD wideRemoteSize = sizeof(wideRemoteStatic) / sizeof(WCHAR); + DWORD wideRemoteSize = ARRAY_SIZE(wideRemoteStatic); MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len); -- 2.14.4

1 0

[PATCH 1/4] wined3d: Fix WINED3D_MCS_COLOR2.
by Stefan Dösinger 25 Jul '18

25 Jul '18

Don't use it unless we have a specular color in the vertex attributes, but allow it if there's no diffuse color. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/utils.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..ccf5b846efc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5854,6 +5854,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; + BOOL has_diffuse, has_specular; memset(settings, 0, sizeof(*settings)); @@ -5911,12 +5912,38 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->point_size = state->gl_primitive_type == GL_POINTS; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); - if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1u << WINED3D_FFP_DIFFUSE))) + has_diffuse = si->use_map & (1u << WINED3D_FFP_DIFFUSE); + has_specular = si->use_map & (1u << WINED3D_FFP_SPECULAR); + + if (state->render_states[WINED3D_RS_COLORVERTEX] && (has_diffuse || has_specular)) { - settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; - settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; - settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; + if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->diffuse_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->diffuse_source = WINED3D_MCS_COLOR2; + else + settings->diffuse_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->emissive_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->emissive_source = WINED3D_MCS_COLOR2; + else + settings->emissive_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->ambient_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->ambient_source = WINED3D_MCS_COLOR2; + else + settings->ambient_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->specular_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->specular_source = WINED3D_MCS_COLOR2; + else + settings->specular_source = WINED3D_MCS_MATERIAL; } else { -- 2.16.4

1 3

This year's changes to the "Submitting Patches" page
by Alex Henrie 25 Jul '18

25 Jul '18

Hello everyone, I've made (and Alexandre has approved) changes to our commit message recommendations <https://wiki.winehq.org/Submitting_Patches> to reflect this year's WineConf discussions. The major differences from the previous information on the wiki are: - Explicitly request use of the imperative mood - Add more instructions on how to write paragraphs of explanation - Recommend inclusion of a Wine-Bug line with a URL to Bugzilla (similar to Gentoo's Gentoo-Bug) - Clarify that Signed-off-by means that you think a patch is good enough to go into Wine (and not that you are obligated fix any regressions it may cause) - Clarify that Signed-off-by also signifies compliance with legal requirements for developing Wine code (although we don't have a "Developer Certificate of Origin" yet) - Tell patch submitters to put extra information (not intended for the commit log) below three dashes Please let me know if you notice any more problems with the page, although it is on a wiki, so you are welcome to improve it yourself ;-) -Alex

6 8

[PATCH] programs: Allow to disable MIME-type associations.
by Dmitry Timoshkov 25 Jul '18

25 Jul '18

This patch should at least mitigate the state of the bug 19182. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/winecfg/resource.h | 1 + programs/winecfg/theme.c | 30 ++++++++++++++-- programs/winecfg/winecfg.rc | 40 ++++++++++++---------- programs/winemenubuilder/winemenubuilder.c | 23 ++++++++++++- 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 0c0b038ff9..2760e92c00 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -176,6 +176,7 @@ #define IDC_SYSPARAM_COLOR_TEXT 1415 #define IDC_SYSPARAM_COLOR 1416 #define IDC_SYSPARAM_FONT 1417 +#define IDC_ENABLE_FILE_ASSOCIATIONS 1418 #define IDC_SYSPARAMS_BUTTON 8400 #define IDC_SYSPARAMS_BUTTON_TEXT 8401 diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index f98dcc3ae7..863bc6bb93 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1168,6 +1168,26 @@ static void on_select_font(HWND hDlg) SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); } +static void init_mime_types(HWND hDlg) +{ + char *buf = get_reg_key(config_key, keypath("MIME-types"), "EnableFileAssociations", "Y"); + int state = IS_OPTION_TRUE(*buf) ? BST_CHECKED : BST_UNCHECKED; + + CheckDlgButton(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS, state); + + HeapFree(GetProcessHeap(), 0, buf); +} + +static void update_mime_types(HWND hDlg) +{ + const char *state = "Y"; + + if (IsDlgButtonChecked(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS) != BST_CHECKED) + state = "N"; + + set_reg_key(config_key, keypath("MIME-types"), "EnableFileAssociations", state); +} + INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1177,8 +1197,9 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) init_shell_folder_listview_headers(hDlg); update_shell_folder_listview(hDlg); read_sysparams(hDlg); + init_mime_types(hDlg); break; - + case WM_DESTROY: free_theme_files(); break; @@ -1186,7 +1207,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: set_window_title(hDlg); break; - + case WM_COMMAND: switch(HIWORD(wParam)) { case CBN_SELCHANGE: { @@ -1296,6 +1317,10 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; } + + case IDC_ENABLE_FILE_ASSOCIATIONS: + update_mime_types(hDlg); + break; } break; } @@ -1314,6 +1339,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) apply_sysparams(); read_shell_folder_link_targets(); update_shell_folder_listview(hDlg); + update_mime_types(hDlg); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 5908b491d4..d37a55e9e6 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -284,25 +284,29 @@ IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Appearance",IDC_STATIC,8,4,244,106 - LTEXT "&Theme:",IDC_STATIC,15,16,130,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 - LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 - COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "It&em:",IDC_STATIC,15,80,105,8 - COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED - PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,90,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,80,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,157,90,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13 - PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,90,55,13,WS_DISABLED - GROUPBOX "Folders",IDC_STATIC,8,114,244,100 + GROUPBOX "Appearance",IDC_STATIC,8,4,244,90 + LTEXT "&Theme:",IDC_STATIC,15,15,130,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,25,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,25,93,13 + LTEXT "&Color:",IDC_THEME_COLORTEXT,15,40,105,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,50,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,126,40,120,8 + COMBOBOX IDC_THEME_SIZECOMBO,126,50,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,65,105,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,75,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,65,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,75,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,65,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,157,75,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,75,15,13 + + GROUPBOX "MIME types",IDC_STATIC,8,95,244,23 + CONTROL "Allow Wine to manage file &associations",IDC_ENABLE_FILE_ASSOCIATIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,105,230,8 + + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,75,55,13,WS_DISABLED + GROUPBOX "Folders",IDC_STATIC,8,120,244,94 CONTROL "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | - LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,132,230,58 CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,65,13 EDITTEXT IDC_EDIT_SFPATH,80,195,110,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0013b04cee..dd69ff96da 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -104,6 +104,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); #define in_startmenu(csidl) ((csidl)==CSIDL_STARTMENU || \ (csidl)==CSIDL_COMMON_STARTMENU) +#define IS_OPTION_TRUE(ch) \ + ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + /* link file formats */ #include "pshpack1.h" @@ -3619,6 +3622,23 @@ static BOOL init_xdg(void) return FALSE; } +static BOOL associations_enabled(void) +{ + BOOL ret = TRUE; + HKEY hkey; + BYTE buf[32]; + DWORD len; + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\MIME-types", &hkey)) + { + len = sizeof(buf); + if (!RegQueryValueExA(hkey, "EnableFileAssociations", NULL, NULL, buf, &len)) + ret = IS_OPTION_TRUE(buf[0]); + } + + return ret; +} + /*********************************************************************** * * wWinMain @@ -3654,7 +3674,8 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh break; if( !strcmpW( token, dash_aW ) ) { - RefreshFileTypeAssociations(); + if (associations_enabled()) + RefreshFileTypeAssociations(); continue; } if( !strcmpW( token, dash_rW ) ) -- 2.17.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel