December 2018 - Wine-commits

Nikolay Sivov : comctl32/listview: Fix NM_CLICK notification when clicking on checkboxes.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: e6a91103a0027cb206ce276ae4095f83d57604ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6a91103a0027cb206ce276a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 12:49:02 2018 +0300 comctl32/listview: Fix NM_CLICK notification when clicking on checkboxes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c5978b3..1230c55 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10238,7 +10238,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) { + notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); toggle_checkbox_state(infoPtr, nItem); + infoPtr->bLButtonDown = FALSE; return 0; }

1 0

Jacek Caban : jscript: Add Array.prototype.forEach implementation.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: cda846b8cbc39c07ce360a6660a1c8b2e2aca24b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cda846b8cbc39c07ce360a66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 20:42:27 2018 +0100 jscript: Add Array.prototype.forEach implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 45 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 24 ++++++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e74ca7f..28289cb 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -36,6 +36,7 @@ typedef struct { static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; +static const WCHAR forEachW[] = {'f','o','r','E','a','c','h',0}; static const WCHAR joinW[] = {'j','o','i','n',0}; static const WCHAR popW[] = {'p','o','p',0}; static const WCHAR pushW[] = {'p','u','s','h',0}; @@ -947,6 +948,47 @@ static HRESULT Array_toLocaleString(script_ctx_t *ctx, vdisp_t *vthis, WORD flag return E_NOTIMPL; } +static HRESULT Array_forEach(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsval_t value, args[3], res; + jsdisp_t *jsthis; + unsigned length, i; + HRESULT hres; + + TRACE("\n"); + + /* FIXME: Check IsCallable */ + if(argc != 1 || !is_object_instance(argv[0])) { + FIXME("Unsupported arguments\n"); + return E_NOTIMPL; + } + + hres = get_length(ctx, vthis, &jsthis, &length); + if(FAILED(hres)) + return hres; + + for(i = 0; i < length; i++) { + hres = jsdisp_get_idx(jsthis, i, &value); + if(hres == DISP_E_UNKNOWNNAME) + continue; + if(FAILED(hres)) + return hres; + + args[0] = value; + args[1] = jsval_number(i); + args[2] = jsval_obj(jsthis); + hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, ARRAY_SIZE(args), args, &res); + jsval_release(value); + if(FAILED(hres)) + return hres; + jsval_release(res); + } + + if(r) *r = jsval_undefined(); + return S_OK; +} + static HRESULT Array_indexOf(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1100,7 +1142,8 @@ static void Array_on_put(jsdisp_t *dispex, const WCHAR *name) static const builtin_prop_t Array_props[] = { {concatW, Array_concat, PROPF_METHOD|1}, - {indexOfW, Array_indexOf, PROPF_ES5|PROPF_METHOD|1}, + {forEachW, Array_forEach, PROPF_METHOD|PROPF_ES5|1}, + {indexOfW, Array_indexOf, PROPF_METHOD|PROPF_ES5|1}, {joinW, Array_join, PROPF_METHOD|1}, {lengthW, NULL,0, Array_get_length, Array_set_length}, {popW, Array_pop, PROPF_METHOD}, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9884def..58c7a4c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -187,6 +187,7 @@ function test_javascript() { test_exposed("now", Date, true); test_exposed("toISOString", Date.prototype, v >= 9); test_exposed("isArray", Array, v >= 9); + test_exposed("forEach", Array.prototype, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); test_exposed("trim", String.prototype, v >= 9); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 3e81961..928c558 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -90,6 +90,28 @@ function test_indexOf() { next_test(); } +function test_array_forEach() { + ok(Array.prototype.forEach.length === 1, "forEach.length = " + Array.prototype.forEach.length); + + function test(array, expect) { + var r = Array.prototype.forEach.call(array, function(value, index, arr) { + ok(arr === array, "unexpected array " + arr); + ok(index === expect[0][0], "index = " + index + " expected " + expect[0][0]); + ok(value === expect[0][1], "value = " + value + " expected " + expect[0][1]); + expect.shift(); + }); + ok(r === undefined, "forEach returned " + r); + ok(expect.length === 0, "too few forEach() calls, expected " + expect.length + " more"); + } + + test(["a",2,"c"], [[0,"a"],[1,2],[2,"c"]]); + test({length: 1000, 500: false, c: 30, 3: "x", 999: 1}, [[3,"x"],[500,false],[999,1]]); + test(new String("abc"), [[0,"a"],[1,"b"],[2,"c"]]); + test([], []); + + next_test(); +} + function test_isArray() { function expect_array(a, exr) { var r = Array.isArray(a); @@ -438,7 +460,6 @@ function test_property_definitions() { if(have_getter) { ok(typeof(desc.get) === "function", "desc.get = " + desc.get); ok(typeof(desc.get.prototype) === "object", "desc.get.prototype = " + desc.get.prototype); - trace("" + desc.get); }else { ok(!("get" in obj), "desc.get = " + desc.get); } @@ -575,6 +596,7 @@ var tests = [ test_date_now, test_toISOString, test_indexOf, + test_array_forEach, test_isArray, test_identifier_keywords, test_getOwnPropertyDescriptor,

1 0

Nikolay Sivov : shlwapi: Forward SHAnsiToAnsi() to shcore.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: 454264f0bf15f9c5a6abe6adec222dcd8fb6b8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454264f0bf15f9c5a6abe6ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:17 2018 +0300 shlwapi: Forward SHAnsiToAnsi() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c96fcf0..c104d82 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -342,7 +342,7 @@ 342 stdcall -noname SHInterlockedCompareExchange(ptr ptr ptr) 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) -345 stdcall -ordinal SHAnsiToAnsi(str ptr long) +345 stdcall -ordinal SHAnsiToAnsi(str ptr long) shcore.SHAnsiToAnsi 346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index baa9c29..d400f8b 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2750,30 +2750,6 @@ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) } /************************************************************************* - * @ [SHLWAPI.345] - * - * Copy one string to another. - * - * PARAMS - * lpszSrc [I] Source string to copy - * lpszDst [O] Destination for copy - * iLen [I] Length of lpszDst in characters - * - * RETURNS - * The length of the copied string, including the terminating NUL. lpszDst - * contains iLen characters of lpszSrc. - */ -DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) -{ - LPSTR lpszRet; - - TRACE("(%s,%p,0x%08x)\n", debugstr_a(lpszSrc), lpszDst, iLen); - - lpszRet = StrCpyNXA(lpszDst, lpszSrc, iLen); - return lpszRet - lpszDst + 1; -} - -/************************************************************************* * @ [SHLWAPI.364] * * Determine if an Ascii string converts to Unicode and back identically.

1 0

Nikolay Sivov : shlwapi: Forward SHUnicodeToUnicode() to shcore.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: f7c33804e3cca97aa62e11001151097aabd0e5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c33804e3cca97aa62e1100… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:16 2018 +0300 shlwapi: Forward SHUnicodeToUnicode() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/string.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4c31724..c96fcf0 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -343,7 +343,7 @@ 343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) 344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) 345 stdcall -ordinal SHAnsiToAnsi(str ptr long) -346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) +346 stdcall -ordinal SHUnicodeToUnicode(wstr ptr long) shcore.SHUnicodeToUnicode 347 stdcall -noname RegDeleteValueWrapW(long wstr) advapi32.RegDeleteValueW 348 stub -noname SHGetFileDescriptionW 349 stub -noname SHGetFileDescriptionA diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b190ffc..baa9c29 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2774,21 +2774,6 @@ DWORD WINAPI SHAnsiToAnsi(LPCSTR lpszSrc, LPSTR lpszDst, int iLen) } /************************************************************************* - * @ [SHLWAPI.346] - * - * Unicode version of SSHAnsiToAnsi. - */ -DWORD WINAPI SHUnicodeToUnicode(LPCWSTR lpszSrc, LPWSTR lpszDst, int iLen) -{ - LPWSTR lpszRet; - - TRACE("(%s,%p,0x%08x)\n", debugstr_w(lpszSrc), lpszDst, iLen); - - lpszRet = StrCpyNXW(lpszDst, lpszSrc, iLen); - return lpszRet - lpszDst + 1; -} - -/************************************************************************* * @ [SHLWAPI.364] * * Determine if an Ascii string converts to Unicode and back identically.

1 0

Alistair Leslie-Hughes : comctl32/edit: Don' t set caret position when we don't have focus.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: 929058a2ef890ab58ce7b5a2e5340d72f1adb64f URL: https://source.winehq.org/git/wine.git/?a=commit;h=929058a2ef890ab58ce7b5a2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 5 10:07:45 2018 +0300 comctl32/edit: Don't set caret position when we don't have focus. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 06e1f49..1f17276 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1707,9 +1707,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1778,7 +1783,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); }

1 0

Nikolay Sivov : shlwapi: Forward SHCopyKey() to shcore.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: 3e3ed6f431c034cfac77c8f0856e2f2ac7846017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3ed6f431c034cfac77c8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:18 2018 +0300 shlwapi: Forward SHCopyKey() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 133 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 +- 2 files changed, 2 insertions(+), 135 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index fa091ab..2ff7977 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -1994,139 +1994,6 @@ HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) return newKey; } - -/************************************************************************* - * SHCopyKeyA [SHLWAPI.@] - * - * Copy a key and its values/sub keys to another location. - * - * PARAMS - * hKeySrc [I] Source key to copy from - * lpszSrcSubKey [I] Sub key under hKeySrc, or NULL to use hKeySrc directly - * hKeyDst [I] Destination key - * dwReserved [I] Reserved, must be 0 - * - * RETURNS - * Success: ERROR_SUCCESS. The key is copied to the destination key. - * Failure: A standard windows error code. - * - * NOTES - * If hKeyDst is a key under hKeySrc, this function will misbehave - * (It will loop until out of stack, or the registry is full). This - * bug is present in Win32 also. - */ -DWORD WINAPI SHCopyKeyA(HKEY hKeySrc, LPCSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) -{ - WCHAR szSubKeyW[MAX_PATH]; - - TRACE("(hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); - - if (lpszSrcSubKey) - MultiByteToWideChar(CP_ACP, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); - - return SHCopyKeyW(hKeySrc, lpszSrcSubKey ? szSubKeyW : NULL, hKeyDst, dwReserved); -} - -/************************************************************************* - * SHCopyKeyW [SHLWAPI.@] - * - * See SHCopyKeyA. - */ -DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD dwReserved) -{ - DWORD dwKeyCount = 0, dwValueCount = 0, dwMaxKeyLen = 0; - DWORD dwMaxValueLen = 0, dwMaxDataLen = 0, i; - BYTE buff[1024]; - LPVOID lpBuff = buff; - WCHAR szName[MAX_PATH], *lpszName = szName; - DWORD dwRet = S_OK; - - TRACE("hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_w(lpszSrcSubKey), hKeyDst, dwReserved); - - if(!hKeyDst || !hKeySrc) - dwRet = ERROR_INVALID_PARAMETER; - else - { - /* Open source key */ - if(lpszSrcSubKey) - dwRet = RegOpenKeyExW(hKeySrc, lpszSrcSubKey, 0, KEY_ALL_ACCESS, &hKeySrc); - - if(dwRet) - hKeyDst = NULL; /* Don't close this key since we didn't open it */ - else - { - /* Get details about sub keys and values */ - dwRet = RegQueryInfoKeyW(hKeySrc, NULL, NULL, NULL, &dwKeyCount, &dwMaxKeyLen, - NULL, &dwValueCount, &dwMaxValueLen, &dwMaxDataLen, - NULL, NULL); - if(!dwRet) - { - if (dwMaxValueLen > dwMaxKeyLen) - dwMaxKeyLen = dwMaxValueLen; /* Get max size for key/value names */ - - if (dwMaxKeyLen++ > MAX_PATH - 1) - lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxKeyLen * sizeof(WCHAR)); - - if (dwMaxDataLen > sizeof(buff)) - lpBuff = HeapAlloc(GetProcessHeap(), 0, dwMaxDataLen); - - if (!lpszName || !lpBuff) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - } - } - } - - /* Copy all the sub keys */ - for(i = 0; i < dwKeyCount && !dwRet; i++) - { - HKEY hSubKeySrc, hSubKeyDst; - DWORD dwSize = dwMaxKeyLen; - - dwRet = RegEnumKeyExW(hKeySrc, i, lpszName, &dwSize, NULL, NULL, NULL, NULL); - - if(!dwRet) - { - /* Open source sub key */ - dwRet = RegOpenKeyExW(hKeySrc, lpszName, 0, KEY_READ, &hSubKeySrc); - - if(!dwRet) - { - /* Create destination sub key */ - dwRet = RegCreateKeyW(hKeyDst, lpszName, &hSubKeyDst); - - if(!dwRet) - { - /* Recursively copy keys and values from the sub key */ - dwRet = SHCopyKeyW(hSubKeySrc, NULL, hSubKeyDst, 0); - RegCloseKey(hSubKeyDst); - } - } - RegCloseKey(hSubKeySrc); - } - } - - /* Copy all the values in this key */ - for (i = 0; i < dwValueCount && !dwRet; i++) - { - DWORD dwNameSize = dwMaxKeyLen, dwType, dwLen = dwMaxDataLen; - - dwRet = RegEnumValueW(hKeySrc, i, lpszName, &dwNameSize, NULL, &dwType, lpBuff, &dwLen); - - if (!dwRet) - dwRet = SHSetValueW(hKeyDst, NULL, lpszName, dwType, lpBuff, dwLen); - } - - /* Free buffers if allocated */ - if (lpszName != szName) - HeapFree(GetProcessHeap(), 0, lpszName); - if (lpBuff != buff) - HeapFree(GetProcessHeap(), 0, lpBuff); - - if (lpszSrcSubKey && hKeyDst) - RegCloseKey(hKeyDst); - return dwRet; -} - /* * The following functions are ORDINAL ONLY: */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c104d82..55655a6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -680,8 +680,8 @@ @ stdcall PathUnquoteSpacesA (str) @ stdcall PathUnquoteSpacesW (wstr) @ stdcall SHAutoComplete(ptr long) -@ stdcall SHCopyKeyA(long str long long) -@ stdcall SHCopyKeyW(long wstr long long) +@ stdcall SHCopyKeyA(long str long long) shcore.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shcore.SHCopyKeyW @ stdcall SHCreateShellPalette(long) @ stdcall SHCreateStreamOnFileA(str long ptr) shcore.SHCreateStreamOnFileA @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shcore.SHCreateStreamOnFileEx

1 0

Nikolay Sivov : shlwapi: Forward IsOS() to shcore.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: 47b976e693400509eb016f9c0c4fcebed3dbc13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b976e693400509eb016f9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 5 08:58:19 2018 +0300 shlwapi: Forward IsOS() to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 131 ---------------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 132 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 810b574..4118d4b 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3806,137 +3806,6 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) } /************************************************************************* - * @ [SHLWAPI.437] - * - * Determine if the OS supports a given feature. - * - * PARAMS - * dwFeature [I] Feature requested (undocumented) - * - * RETURNS - * TRUE If the feature is available. - * FALSE If the feature is not available. - */ -BOOL WINAPI IsOS(DWORD feature) -{ - OSVERSIONINFOA osvi; - DWORD platform, majorv, minorv; - - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - if(!GetVersionExA(&osvi)) { - ERR("GetVersionEx failed\n"); - return FALSE; - } - - majorv = osvi.dwMajorVersion; - minorv = osvi.dwMinorVersion; - platform = osvi.dwPlatformId; - -#define ISOS_RETURN(x) \ - TRACE("(0x%x) ret=%d\n",feature,(x)); \ - return (x); - - switch(feature) { - case OS_WIN32SORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32s - || platform == VER_PLATFORM_WIN32_WINDOWS) - case OS_NT: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_WIN95ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS) - case OS_NT4ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 4) - case OS_WIN2000ORGREATER_ALT: - case OS_WIN2000ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_WIN98ORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 10) - case OS_WIN98_GOLD: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 10) - case OS_WIN2000PRO: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_WIN2000SERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000ADVSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000DATACENTER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_WIN2000TERMINAL: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && (minorv == 0 || minorv == 1)) - case OS_EMBEDDED: - FIXME("(OS_EMBEDDED) What should we return here?\n"); - return FALSE; - case OS_TERMINALCLIENT: - FIXME("(OS_TERMINALCLIENT) What should we return here?\n"); - return FALSE; - case OS_TERMINALREMOTEADMIN: - FIXME("(OS_TERMINALREMOTEADMIN) What should we return here?\n"); - return FALSE; - case OS_WIN95_GOLD: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv == 0) - case OS_MEORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_WINDOWS && minorv >= 90) - case OS_XPORGREATER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1) - case OS_HOME: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5 && minorv >= 1) - case OS_PROFESSIONAL: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_DATACENTER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_ADVSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 5) - case OS_SERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_TERMINALSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_PERSONALTERMINALSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && minorv >= 1 && majorv >= 5) - case OS_FASTUSERSWITCHING: - FIXME("(OS_FASTUSERSWITCHING) What should we return here?\n"); - return TRUE; - case OS_WELCOMELOGONUI: - FIXME("(OS_WELCOMELOGONUI) What should we return here?\n"); - return FALSE; - case OS_DOMAINMEMBER: - FIXME("(OS_DOMAINMEMBER) What should we return here?\n"); - return TRUE; - case OS_ANYSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_WOW6432: - { - BOOL is_wow64; - IsWow64Process(GetCurrentProcess(), &is_wow64); - return is_wow64; - } - case OS_WEBSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_SMALLBUSINESSSERVER: - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT) - case OS_TABLETPC: - FIXME("(OS_TABLETPC) What should we return here?\n"); - return FALSE; - case OS_SERVERADMINUI: - FIXME("(OS_SERVERADMINUI) What should we return here?\n"); - return FALSE; - case OS_MEDIACENTER: - FIXME("(OS_MEDIACENTER) What should we return here?\n"); - return FALSE; - case OS_APPLIANCE: - FIXME("(OS_APPLIANCE) What should we return here?\n"); - return FALSE; - case 0x25: /*OS_VISTAORGREATER*/ - ISOS_RETURN(platform == VER_PLATFORM_WIN32_NT && majorv >= 6) - } - -#undef ISOS_RETURN - - WARN("(0x%x) unknown parameter\n",feature); - - return FALSE; -} - -/************************************************************************* * @ [SHLWAPI.439] */ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 55655a6..060dacc 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -434,7 +434,7 @@ 434 stdcall -noname SendMessageTimeoutWrapW(long long long long long long ptr) user32.SendMessageTimeoutW 435 stdcall -noname CLSIDFromProgIDWrap(wstr ptr) ole32.CLSIDFromProgID 436 stdcall -noname CLSIDFromStringWrap(wstr ptr) -437 stdcall -ordinal IsOS(long) +437 stdcall -ordinal IsOS(long) shcore.IsOS 438 stub -noname SHLoadRegUIStringA 439 stdcall -noname SHLoadRegUIStringW(ptr wstr ptr long) 440 stdcall -noname SHGetWebFolderFilePathA(str ptr long)

1 0

Michael Stefaniuc : comctl32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: f98f01b368eb7628591f96429b99b203886519df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98f01b368eb7628591f9642… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 4 20:19:51 2018 +0100 comctl32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 5 +---- dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 81461de..09ec4a1 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1366,10 +1366,7 @@ static void test_get_set_textmargin(void) BOOL ret; DWORD type; - margin_in.top = 1; - margin_in.left = 2; - margin_in.right = 3; - margin_in.bottom = 4; + SetRect(&margin_in, 2, 1, 3, 4); for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) { hwnd = create_button(type, NULL); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 7c78540..11a637f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1798,7 +1798,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_CALENDARDATE, ret); expect_hex(MCHT_CALENDARDATE, mchit.uHit); @@ -1815,7 +1815,7 @@ static void test_hittest_v6(void) mchit.iOffset = -1; mchit.iCol = mchit.iRow = -1; mchit.uHit = 0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); expect_hex(MCHT_TITLE, ret); expect_hex(MCHT_TITLE, mchit.uHit); @@ -1834,7 +1834,7 @@ static void test_hittest_v6(void) mchit.iOffset = -2; mchit.iCol = mchit.iRow = -2; mchit.uHit = ~0; - mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1; + SetRect(&mchit.rc, -1, -1, -1, -1); ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit); todo_wine expect_hex(MCHT_NOWHERE, ret); todo_wine expect_hex(MCHT_NOWHERE, mchit.uHit);

1 0

Alexandre Julliard : makefiles: Remove some unused variables.
by Alexandre Julliard 05 Dec '18

05 Dec '18

Module: wine Branch: master Commit: 05fa21e1883fe0c3a519216e85c1e4595314f4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fa21e1883fe0c3a519216e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 10:47:05 2018 +0100 makefiles: Remove some unused variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 17 ++++------------- configure | 11 ++++------- configure.ac | 9 ++++----- libs/wine/Makefile.in | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index 249c9a2..4990b04 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,8 +34,6 @@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ srcdir = @srcdir@ SHELL = /bin/sh -RM = rm -f -MV = mv CC = @CC@ CXX = @CXX@ CPPBIN = @CPPBIN@ @@ -55,7 +53,6 @@ EXEEXT = @EXEEXT@ TOOLSEXT = @TOOLSEXT@ DLLTOOL = @DLLTOOL@ AR = @AR@ -ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ @@ -73,17 +70,11 @@ CROSSTARGET = @CROSSTARGET@ SUBDIRS = @SUBDIRS@ RUNTESTFLAGS = -q -P wine MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) -WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) PACKAGE_VERSION = @PACKAGE_VERSION@ SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ -INSTALL_PROGRAM = STRIPPROG="$(STRIP)" $(top_srcdir)/tools/install-sh $(INSTALL_PROGRAM_FLAGS) -INSTALL_SCRIPT = $(top_srcdir)/tools/install-sh $(INSTALL_SCRIPT_FLAGS) -INSTALL_DATA = $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) -prog_manext = 1 api_manext = 3w -conf_manext = 5 WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_LDFLAGS = @WINELOADER_LDFLAGS@ @@ -114,12 +105,12 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status # Rules for cleaning distclean:: clean - $(RM) -r autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext) + rm -rf autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext) # Rules for API documentation install-manpages:: manpages - for i in documentation/man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done + for i in documentation/man$(api_manext)/*.$(api_manext); do $(top_srcdir)/tools/install-sh -m 644 $(INSTALL_DATA_FLAGS) $$i $(DESTDIR)$(mandir)/$$i; done .PHONY: install-manpages @@ -139,9 +130,9 @@ libs/port libs/wine libs/wpp: include/config.h TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)' TAGS etags: - $(RM) TAGS + rm -f TAGS (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS) tags ctags: - $(RM) tags + rm -f tags (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS) diff --git a/configure b/configure index 4c9b24d..23ba36c 100755 --- a/configure +++ b/configure @@ -755,7 +755,6 @@ EGREP GREP LN_S RANLIB -ARFLAGS STRIP ac_ct_AR AR @@ -5999,8 +5998,6 @@ else STRIP="$ac_cv_prog_STRIP" fi -ARFLAGS=rc - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -20223,13 +20220,13 @@ then rm -f fonts server 2>/dev/null wine_fn_append_rule "all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: - \$(RM) \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ + rm -f \$@ && \$(LN_S) $reldir$with_wine64/\$@ \$@ $with_wine64/loader/wine: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ + rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine \$@ $with_wine64/loader/wine-preloader: - \$(RM) \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ + rm -f \$@ && \$(LN_S) $ac_pwd/loader/wine-preloader \$@ clean:: - \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" + rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/configure.ac b/configure.ac index 2222c68..8ec69fe 100644 --- a/configure.ac +++ b/configure.ac @@ -292,7 +292,6 @@ fi AC_CHECK_TOOLS(AR,[ar gar],ar) AC_CHECK_TOOL(STRIP,strip,strip) -AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_EGREP @@ -4078,13 +4077,13 @@ then WINE_APPEND_RULE( [all: loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader loader/wine64 loader/wine64-preloader: - \$(RM) \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] + rm -f \$[@] && \$(LN_S) $reldir$with_wine64/\$[@] \$[@] $with_wine64/loader/wine: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] + rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine \$[@] $with_wine64/loader/wine-preloader: - \$(RM) \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] + rm -f \$[@] && \$(LN_S) $ac_pwd/loader/wine-preloader \$[@] clean:: - \$(RM) loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) + rm -f loader/wine64 loader/wine64-preloader $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else TOP_INSTALL_DEV="$TOP_INSTALL_DEV include" TOP_INSTALL_LIB="$TOP_INSTALL_LIB \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5047449..4833eb5 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS) libwine_DEPS = $(LIBWINE_DEPENDS) version.c: dummy - version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1) + version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) dummy: .PHONY: dummy

1 0

Dmitry Timoshkov : windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails.
by Alexandre Julliard 04 Dec '18

04 Dec '18

Module: wine Branch: master Commit: d90047ed91f783dea5395f54a8f4dc04f35b632a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90047ed91f783dea5395f54… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 30 09:53:31 2018 +0300 windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 2 +- dlls/windowscodecs/tests/pngformat.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fc1f756..c0e5a59 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -622,7 +622,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; - hr = E_FAIL; + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; } ppng_set_error_fn(This->png_ptr, jmpbuf, user_error_fn, user_warning_fn); diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index 5f4a5e1..d08a5fb 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -811,7 +811,6 @@ static void test_color_formats(void) hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -840,7 +839,6 @@ next_1: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, TRUE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -869,7 +867,6 @@ next_2: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load) @@ -897,7 +894,6 @@ next_3: hr = create_decoder(buf, sizeof(buf), &decoder); if (!is_valid_png_type_depth(td[i].color_type, td[i].bit_depth, FALSE)) -todo_wine ok(hr == WINCODEC_ERR_UNKNOWNIMAGEFORMAT, "%d: wrong error %#x\n", i, hr); else todo_wine_if(td[i].todo_load)

1 0