May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : cdosys: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 07efbbf329f4efc66da4c3c655f0efee9916f54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07efbbf329f4efc66da4c3c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:24 2019 +0200 cdosys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cdosys/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/cdosys/Makefile.in b/dlls/cdosys/Makefile.in index d1ce780..fefa8e8 100644 --- a/dlls/cdosys/Makefile.in +++ b/dlls/cdosys/Makefile.in @@ -1,5 +1,7 @@ MODULE = cdosys.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : clusapi: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: ff5d625943a3affd7ed9e9b500333bfb28a4a07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5d625943a3affd7ed9e9b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:30 2019 +0200 clusapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/clusapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/clusapi/Makefile.in b/dlls/clusapi/Makefile.in index a548f44..2084e28 100644 --- a/dlls/clusapi/Makefile.in +++ b/dlls/clusapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = clusapi.dll IMPORTLIB = clusapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ clusapi.c

1 0

Alexandre Julliard : combase: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 6e2241a331eb6a96eb0282a565d56f85e3d3ccf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e2241a331eb6a96eb0282a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:39:37 2019 +0200 combase: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/Makefile.in | 2 ++ dlls/combase/string.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index df051ad..0f3c9f8 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,8 @@ MODULE = combase.dll IMPORTS = advapi32 ole32 uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ roapi.c \ string.c diff --git a/dlls/combase/string.c b/dlls/combase/string.c index dfbe368..2092e43 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -17,11 +17,11 @@ */ #include <string.h> +#include <wchar.h> #include "windows.h" #include "winerror.h" #include "hstring.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winstring); @@ -427,7 +427,7 @@ HRESULT WINAPI WindowsTrimStringStart(HSTRING str1, HSTRING str2, HSTRING *out) } for (start = 0; start < priv1->length; start++) { - if (!memchrW(priv2->buffer, priv1->buffer[start], priv2->length)) + if (!wmemchr(priv2->buffer, priv1->buffer[start], priv2->length)) break; } return start ? WindowsCreateString(&priv1->buffer[start], priv1->length - start, out) : @@ -454,7 +454,7 @@ HRESULT WINAPI WindowsTrimStringEnd(HSTRING str1, HSTRING str2, HSTRING *out) } for (len = priv1->length; len > 0; len--) { - if (!memchrW(priv2->buffer, priv1->buffer[len - 1], priv2->length)) + if (!wmemchr(priv2->buffer, priv1->buffer[len - 1], priv2->length)) break; } return (len < priv1->length) ? WindowsCreateString(priv1->buffer, len, out) :

1 0

Alexandre Julliard : comcat: Build with msvcrt.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 20b6c7cba5be5cebea585a38913c6c26fd48c86f URL: https://source.winehq.org/git/wine.git/?a=commit;h=20b6c7cba5be5cebea585a38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 28 07:40:04 2019 +0200 comcat: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comcat/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comcat/Makefile.in b/dlls/comcat/Makefile.in index 2d105df..42061a1 100644 --- a/dlls/comcat/Makefile.in +++ b/dlls/comcat/Makefile.in @@ -1,6 +1,8 @@ MODULE = comcat.dll IMPORTS = ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ comcat_main.c

1 0

Nikolay Sivov : kernelbase: Add remaining registry helpers from shlwapi.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 2150de870000e8b9e447ca886e4d1aa09edf360c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2150de870000e8b9e447ca88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 27 16:28:42 2019 +0300 kernelbase: Add remaining registry helpers from shlwapi. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +-- dlls/kernelbase/registry.c | 210 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 212 insertions(+), 10 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 83b9889..c223656 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1367,16 +1367,16 @@ @ stdcall SHRegEnumUSKeyW(long long wstr ptr long) @ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) @ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) -@ stdcall SHRegGetBoolUSValueA(str str long long) shlwapi.SHRegGetBoolUSValueA -@ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW -@ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA -@ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW +@ stdcall SHRegGetBoolUSValueA(str str long long) +@ stdcall SHRegGetBoolUSValueW(wstr wstr long long) +@ stdcall SHRegGetUSValueA(str str ptr ptr ptr long ptr long) +@ stdcall SHRegGetUSValueW(wstr wstr ptr ptr ptr long ptr long) @ stdcall SHRegOpenUSKeyA(str long long long long) @ stdcall SHRegOpenUSKeyW(wstr long long long long) @ stdcall SHRegQueryInfoUSKeyA(long ptr ptr ptr ptr long) @ stdcall SHRegQueryInfoUSKeyW(long ptr ptr ptr ptr long) -@ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA -@ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW +@ stdcall SHRegQueryUSValueA(long str ptr ptr ptr long ptr long) +@ stdcall SHRegQueryUSValueW(long wstr ptr ptr ptr long ptr long) @ stdcall SHRegSetUSValueA(str str long ptr long long) @ stdcall SHRegSetUSValueW(wstr wstr long ptr long long) @ stdcall SHRegWriteUSValueA(long str long ptr long long) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index bfc7f10..0bf6b44 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -430,8 +430,8 @@ LONG WINAPI SHRegSetUSValueW(const WCHAR *subkey, const WCHAR *value, DWORD type return ret; } -LONG WINAPI SHRegQueryInfoUSKeyA(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subkey_len, DWORD *values, DWORD *max_value_name_len, - SHREGENUM_FLAGS flags) +LONG WINAPI SHRegQueryInfoUSKeyA(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subkey_len, DWORD *values, + DWORD *max_value_name_len, SHREGENUM_FLAGS flags) { HKEY dokey; LONG ret; @@ -453,8 +453,8 @@ LONG WINAPI SHRegQueryInfoUSKeyA(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subke return ERROR_INVALID_FUNCTION; } -LONG WINAPI SHRegQueryInfoUSKeyW(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subkey_len, DWORD *values, DWORD *max_value_name_len, - SHREGENUM_FLAGS flags) +LONG WINAPI SHRegQueryInfoUSKeyW(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subkey_len, DWORD *values, + DWORD *max_value_name_len, SHREGENUM_FLAGS flags) { HKEY dokey; LONG ret; @@ -475,3 +475,205 @@ LONG WINAPI SHRegQueryInfoUSKeyW(HUSKEY hUSKey, DWORD *subkeys, DWORD *max_subke return ERROR_INVALID_FUNCTION; } + +LONG WINAPI SHRegQueryUSValueA(HUSKEY hUSKey, const char *value, DWORD *type, void *data, DWORD *data_len, + BOOL ignore_hkcu, void *default_data, DWORD default_data_len) +{ + LONG ret = ~ERROR_SUCCESS; + DWORD move_len; + HKEY dokey; + + /* If user wants HKCU, and it exists, then try it */ + if (!ignore_hkcu && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE))) + { + ret = RegQueryValueExA(dokey, value, 0, type, data, data_len); + TRACE("HKCU RegQueryValue returned %d\n", ret); + } + + /* If HKCU did not work and HKLM exists, then try it */ + if ((ret != ERROR_SUCCESS) && (dokey = reg_get_hkey_from_huskey(hUSKey, FALSE))) + { + ret = RegQueryValueExA(dokey, value, 0, type, data, data_len); + TRACE("HKLM RegQueryValue returned %d\n", ret); + } + + /* If neither worked, and default data exists, then use it */ + if (ret != ERROR_SUCCESS) + { + if (default_data && default_data_len) + { + move_len = default_data_len >= *data_len ? *data_len : default_data_len; + memmove(data, default_data, move_len); + *data_len = move_len; + TRACE("setting default data\n"); + ret = ERROR_SUCCESS; + } + } + + return ret; +} + +LONG WINAPI SHRegQueryUSValueW(HUSKEY hUSKey, const WCHAR *value, DWORD *type, void *data, DWORD *data_len, + BOOL ignore_hkcu, void *default_data, DWORD default_data_len) +{ + LONG ret = ~ERROR_SUCCESS; + DWORD move_len; + HKEY dokey; + + /* If user wants HKCU, and it exists, then try it */ + if (!ignore_hkcu && (dokey = reg_get_hkey_from_huskey(hUSKey, TRUE))) + { + ret = RegQueryValueExW(dokey, value, 0, type, data, data_len); + TRACE("HKCU RegQueryValue returned %d\n", ret); + } + + /* If HKCU did not work and HKLM exists, then try it */ + if ((ret != ERROR_SUCCESS) && (dokey = reg_get_hkey_from_huskey(hUSKey, FALSE))) + { + ret = RegQueryValueExW(dokey, value, 0, type, data, data_len); + TRACE("HKLM RegQueryValue returned %d\n", ret); + } + + /* If neither worked, and default data exists, then use it */ + if (ret != ERROR_SUCCESS) + { + if (default_data && default_data_len) + { + move_len = default_data_len >= *data_len ? *data_len : default_data_len; + memmove(data, default_data, move_len); + *data_len = move_len; + TRACE("setting default data\n"); + ret = ERROR_SUCCESS; + } + } + + return ret; +} + +LONG WINAPI SHRegGetUSValueA(const char *subkey, const char *value, DWORD *type, void *data, DWORD *data_len, + BOOL ignore_hkcu, void *default_data, DWORD default_data_len) +{ + HUSKEY myhuskey; + LONG ret; + + if (!data || !data_len) + return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/ + + TRACE("%s, %s, %d\n", debugstr_a(subkey), debugstr_a(value), *data_len); + + ret = SHRegOpenUSKeyA(subkey, KEY_QUERY_VALUE, 0, &myhuskey, ignore_hkcu); + if (!ret) + { + ret = SHRegQueryUSValueA(myhuskey, value, type, data, data_len, ignore_hkcu, default_data, default_data_len); + SHRegCloseUSKey(myhuskey); + } + + return ret; +} + +LONG WINAPI SHRegGetUSValueW(const WCHAR *subkey, const WCHAR *value, DWORD *type, void *data, DWORD *data_len, + BOOL ignore_hkcu, void *default_data, DWORD default_data_len) +{ + HUSKEY myhuskey; + LONG ret; + + if (!data || !data_len) + return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/ + + TRACE("%s, %s, %d\n", debugstr_w(subkey), debugstr_w(value), *data_len); + + ret = SHRegOpenUSKeyW(subkey, KEY_QUERY_VALUE, 0, &myhuskey, ignore_hkcu); + if (!ret) + { + ret = SHRegQueryUSValueW(myhuskey, value, type, data, data_len, ignore_hkcu, default_data, default_data_len); + SHRegCloseUSKey(myhuskey); + } + + return ret; +} + +BOOL WINAPI SHRegGetBoolUSValueA(const char *subkey, const char *value, BOOL ignore_hkcu, BOOL default_value) +{ + BOOL ret = default_value; + DWORD type, datalen; + char data[10]; + + TRACE("%s, %s, %d\n", debugstr_a(subkey), debugstr_a(value), ignore_hkcu); + + datalen = ARRAY_SIZE(data) - 1; + if (!SHRegGetUSValueA(subkey, value, &type, data, &datalen, ignore_hkcu, 0, 0)) + { + switch (type) + { + case REG_SZ: + data[9] = '\0'; + if (!lstrcmpiA(data, "YES") || !lstrcmpiA(data, "TRUE")) + ret = TRUE; + else if (!lstrcmpiA(data, "NO") || !lstrcmpiA(data, "FALSE")) + ret = FALSE; + break; + case REG_DWORD: + ret = *(DWORD *)data != 0; + break; + case REG_BINARY: + if (datalen == 1) + { + ret = !!data[0]; + break; + } + default: + FIXME("Unsupported registry data type %d\n", type); + ret = FALSE; + } + TRACE("got value (type=%d), returning %d\n", type, ret); + } + else + TRACE("returning default value %d\n", ret); + + return ret; +} + +BOOL WINAPI SHRegGetBoolUSValueW(const WCHAR *subkey, const WCHAR *value, BOOL ignore_hkcu, BOOL default_value) +{ + static const WCHAR yesW[]= {'Y','E','S',0}; + static const WCHAR trueW[] = {'T','R','U','E',0}; + static const WCHAR noW[] = {'N','O',0}; + static const WCHAR falseW[] = {'F','A','L','S','E',0}; + BOOL ret = default_value; + DWORD type, datalen; + WCHAR data[10]; + + TRACE("%s, %s, %d\n", debugstr_w(subkey), debugstr_w(value), ignore_hkcu); + + datalen = (ARRAY_SIZE(data) - 1) * sizeof(WCHAR); + if (!SHRegGetUSValueW(subkey, value, &type, data, &datalen, ignore_hkcu, 0, 0)) + { + switch (type) + { + case REG_SZ: + data[9] = '\0'; + if (!lstrcmpiW(data, yesW) || !lstrcmpiW(data, trueW)) + ret = TRUE; + else if (!lstrcmpiW(data, noW) || !lstrcmpiW(data, falseW)) + ret = FALSE; + break; + case REG_DWORD: + ret = *(DWORD *)data != 0; + break; + case REG_BINARY: + if (datalen == 1) + { + ret = !!data[0]; + break; + } + default: + FIXME("Unsupported registry data type %d\n", type); + ret = FALSE; + } + TRACE("got value (type=%d), returning %d\n", type, ret); + } + else + TRACE("returning default value %d\n", ret); + + return ret; +}

1 0

Zhiyi Zhang : gdi32/tests: Add D3DKMTCheckOcclusion tests.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 4f201cfcc939d6bc3d00f82abd0f3861d66b3847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f201cfcc939d6bc3d00f82a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat May 25 11:55:07 2019 +0800 gdi32/tests: Add D3DKMTCheckOcclusion tests. Mostly to show that D3DKMTCheckOcclusion is mainly composed of ownership checks rather than actually window occlusion. Also composition status doesn't affect its behavior despite MSDN say so. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f201cfcc939d6bc3d00…

1 0

Jactry Zeng : riched20: Implement ITextRange::SetRange.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: fec6920638cbd2b41b3af3940bb9226c69b12763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fec6920638cbd2b41b3af394… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon May 27 11:07:45 2019 +0800 riched20: Implement ITextRange::SetRange. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 42 ++++++++++++++++++++++++--------------- dlls/riched20/tests/richole.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 4b47310..c111920 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -2026,6 +2026,24 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde return E_NOTIMPL; } +static void cp2range(ME_TextEditor *editor, LONG *cp1, LONG *cp2) +{ + int len = ME_GetTextLength(editor) + 1; + + *cp1 = max(*cp1, 0); + *cp2 = max(*cp2, 0); + *cp1 = min(*cp1, len); + *cp2 = min(*cp2, len); + if (*cp1 > *cp2) + { + int tmp = *cp1; + *cp1 = *cp2; + *cp2 = tmp; + } + if (*cp1 == len) + *cp1 = *cp2 = len - 1; +} + static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG active) { ITextRangeImpl *This = impl_from_ITextRange(me); @@ -2035,7 +2053,13 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + cp2range(This->child.reole->editor, &anchor, &active); + if (anchor == This->start && active == This->end) + return S_FALSE; + + This->start = anchor; + This->end = active; + return S_OK; } static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret) @@ -4109,26 +4133,12 @@ static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG c ITextRange **ppRange) { IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface); - const int len = ME_GetTextLength(This->editor) + 1; TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2); if (!ppRange) return E_INVALIDARG; - cp1 = max(cp1, 0); - cp2 = max(cp2, 0); - cp1 = min(cp1, len); - cp2 = min(cp2, len); - if (cp1 > cp2) - { - LONG tmp; - tmp = cp1; - cp1 = cp2; - cp2 = tmp; - } - if (cp1 == len) - cp1 = cp2 = len - 1; - + cp2range(This->editor, &cp1, &cp2); return CreateITextRange(This, cp1, cp2, ppRange); } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 40feb76..7064620 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3590,6 +3590,51 @@ static void _check_selection(ITextSelection *selection, LONG expected_start, LON expected_end, value); } +static void test_ITextRange_SetRange(void) +{ + static const CHAR test_text1[] = "TestSomeText"; + ITextDocument *txtDoc = NULL; + IRichEditOle *reOle = NULL; + ITextRange *txtRge = NULL; + HRESULT hr; + HWND w; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, 0, 0, &txtRge); + + hr = ITextRange_SetRange(txtRge, 2, 4); + ok(hr == S_OK, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 2, 4); + + hr = ITextRange_SetRange(txtRge, 2, 4); + ok(hr == S_FALSE, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 2, 4); + + hr = ITextRange_SetRange(txtRge, 4, 2); + ok(hr == S_FALSE, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 2, 4); + + hr = ITextRange_SetRange(txtRge, 14, 14); + ok(hr == S_OK, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 12, 12); + + hr = ITextRange_SetRange(txtRge, 15, 15); + ok(hr == S_FALSE, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 12, 12); + + hr = ITextRange_SetRange(txtRge, 14, 1); + ok(hr == S_OK, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 1, 13); + + hr = ITextRange_SetRange(txtRge, -1, 4); + ok(hr == S_OK, "got 0x%08x.\n", hr); + CHECK_RANGE(txtRge, 0, 4); + + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + static void test_Expand(void) { static const char test_text1[] = "TestSomeText"; @@ -3780,6 +3825,7 @@ START_TEST(richole) test_ITextRange_GetChar(); test_ITextRange_ScrollIntoView(); test_ITextRange_GetStart_GetEnd(); + test_ITextRange_SetRange(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); test_GetClientSite();

1 0

Alistair Leslie-Hughes : bcrypt: Add BCryptDestroySecret/ BCryptSecretAgreement stubs.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 08bc5b0d349b40efec0fc41e60988a18de3a9d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08bc5b0d349b40efec0fc41e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 03:32:56 2019 +0000 bcrypt: Add BCryptDestroySecret/BCryptSecretAgreement stubs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 4 ++-- dlls/bcrypt/bcrypt_main.c | 16 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- include/bcrypt.h | 3 +++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 052a099..dfe08e7 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -11,7 +11,7 @@ @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) -@ stub BCryptDestroySecret +@ stdcall BCryptDestroySecret(ptr) @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) @ stdcall BCryptDuplicateKey(ptr ptr ptr long long) @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) @@ -44,7 +44,7 @@ @ stdcall BCryptRemoveContextFunction(long wstr long wstr) @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders -@ stub BCryptSecretAgreement +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) @ stub BCryptSetAuditingInterface @ stub BCryptSetContextFunctionProperty @ stdcall BCryptSetProperty(ptr wstr ptr long long) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b9c51a1..18783f0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1580,6 +1580,22 @@ NTSTATUS WINAPI BCryptDeriveKeyPBKDF2( BCRYPT_ALG_HANDLE handle, UCHAR *pwd, ULO return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE handle, BCRYPT_KEY_HANDLE key, BCRYPT_SECRET_HANDLE *secret, ULONG flags) +{ + FIXME( "%p, %p, %p, %08x\n", handle, key, secret, flags ); + + if(secret) + *secret = (BCRYPT_SECRET_HANDLE *)0xDEADFEED; + + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) +{ + FIXME( "%p\n", secret ); + return STATUS_SUCCESS; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 85fa5c0..d4a32ed 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -12,7 +12,7 @@ @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey -@ stub BCryptDestroySecret +@ stdcall BCryptDestroySecret(ptr) bcrypt.BCryptDestroySecret @ stdcall BCryptDuplicateHash(ptr ptr ptr long long) bcrypt.BCryptDuplicateHash @ stdcall BCryptDuplicateKey(ptr ptr ptr long long) bcrypt.BCryptDuplicateKey @ stdcall BCryptEncrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptEncrypt @@ -46,7 +46,7 @@ @ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction @ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders -@ stub BCryptSecretAgreement +@ stdcall BCryptSecretAgreement(ptr ptr ptr long) bcrypt.BCryptSecretAgreement @ stub BCryptSetAuditingInterface @ stub BCryptSetContextFunctionProperty @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty diff --git a/include/bcrypt.h b/include/bcrypt.h index a0b0d52..f0185d1 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -211,6 +211,7 @@ typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE; typedef PVOID BCRYPT_HASH_HANDLE; +typedef PVOID BCRYPT_SECRET_HANDLE; /* Flags for BCryptGenRandom */ #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 @@ -231,6 +232,7 @@ NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE); +NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE); NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG); @@ -245,6 +247,7 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptImportKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, UCHAR *, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); +NTSTATUS WINAPI BCryptSecretAgreement(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptVerifySignature(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG);

1 0

Alistair Leslie-Hughes : bcrypt: Add BCryptDeriveKey stub.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: eb615ea0cbe46e156a7840ad072607c2e7609732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb615ea0cbe46e156a7840ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 03:32:57 2019 +0000 bcrypt: Add BCryptDeriveKey stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index dfe08e7..4946ee5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) @ stdcall BCryptDestroyHash(ptr) @ stdcall BCryptDestroyKey(ptr) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 18783f0..399626d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1596,6 +1596,13 @@ NTSTATUS WINAPI BCryptDestroySecret(BCRYPT_SECRET_HANDLE secret) return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE secret, LPCWSTR kdf, BCryptBufferDesc *parameter, + PUCHAR derived, ULONG derived_size, ULONG *result, ULONG flags) +{ + FIXME( "%p, %s, %p, %p, %d, %p, %08x\n", secret, debugstr_w(kdf), parameter, derived, derived_size, result, flags ); + return STATUS_INTERNAL_ERROR; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { switch (reason) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4a32ed..d35f8a9 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -7,7 +7,7 @@ @ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash @ stdcall BCryptDecrypt(ptr ptr long ptr ptr long ptr long ptr long) bcrypt.BCryptDecrypt @ stub BCryptDeleteContext -@ stub BCryptDeriveKey +@ stdcall BCryptDeriveKey(ptr wstr ptr ptr long ptr long) bcrypt.BCryptDeriveKey @ stub BCryptDeriveKeyCapi @ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2 @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash diff --git a/include/bcrypt.h b/include/bcrypt.h index f0185d1..b1799d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -204,6 +204,20 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER ULONG cbKeyData; } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER; +typedef struct _BCryptBuffer +{ + ULONG cbBuffer; + ULONG BufferType; + void *pvBuffer; +} BCryptBuffer, *PBCryptBuffer; + +typedef struct _BCryptBufferDesc +{ + ULONG ulVersion; + ULONG cBuffers; + PBCryptBuffer pBuffers; +} BCryptBufferDesc, *PBCryptBufferDesc; + #define BCRYPT_KEY_DATA_BLOB_MAGIC 0x4d42444b #define BCRYPT_KEY_DATA_BLOB_VERSION1 1 @@ -229,6 +243,7 @@ typedef PVOID BCRYPT_SECRET_HANDLE; NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE, ULONG); NTSTATUS WINAPI BCryptCreateHash(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDecrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); +NTSTATUS WINAPI BCryptDeriveKey(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc*, PUCHAR, ULONG, ULONG *, ULONG); NTSTATUS WINAPI BCryptDeriveKeyPBKDF2(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, ULONGLONG, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE); NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);

1 0

Hans Leidekker : advapi32: Improve the SaferComputeTokenFromLevel stub.
by Alexandre Julliard 28 May '19

28 May '19

Module: wine Branch: master Commit: 17110a0a890d2bacb5b348bd9bb3cef10d144e19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17110a0a890d2bacb5b348bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 09:34:10 2019 +0200 advapi32: Improve the SaferComputeTokenFromLevel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47274 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- include/winsafer.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4b2876d..8027434 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6172,7 +6172,7 @@ BOOL WINAPI SaferComputeTokenFromLevel(SAFER_LEVEL_HANDLE handle, HANDLE token, { FIXME("(%p, %p, %p, %x, %p) stub\n", handle, token, access_token, flags, reserved); - *access_token = (HANDLE)0xdeadbeef; + *access_token = (flags & SAFER_TOKEN_NULL_IF_EQUAL) ? NULL : (HANDLE)0xdeadbeef; return TRUE; } diff --git a/include/winsafer.h b/include/winsafer.h index 2565484..02150c5 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,11 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_TOKEN_NULL_IF_EQUAL 0x00000001 +#define SAFER_TOKEN_COMPARE_ONLY 0x00000002 +#define SAFER_TOKEN_MAKE_INERT 0x00000004 +#define SAFER_TOKEN_WANT_FLAGS 0x00000008 + #define SAFER_MAX_HASH_SIZE 64 #include <pshpack8.h>

1 0