November 2020 - Wine-commits

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFace5::Equals().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 4b439db446be1ac03a46a0f4ec8d4be705ce1420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b439db446be1ac03a46a0f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 21 15:39:27 2020 +0300 dwrite: Add partial implementation for IDWriteFontFace5::Equals(). Issue with missing method spotted by Brendan Shanks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab94abb14f74fe863ae40dafc7a8301db22792fc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 17 +++++++++++++++++ dlls/dwrite/tests/font.c | 11 ++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9f3e005236e..9099ed42a5c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1471,6 +1471,22 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); } +static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface), *other_face; + + TRACE("%p, %p.\n", iface, other); + + if (!(other_face = unsafe_impl_from_IDWriteFontFace(other))) + return FALSE; + + /* TODO: add variations support */ + + return fontface->index == other_face->index && + fontface->simulations == other_face->simulations && + is_same_fontfile(fontface->files[0], other_face->files[0]); +} + static const IDWriteFontFace5Vtbl dwritefontfacevtbl = { dwritefontface_QueryInterface, @@ -1530,6 +1546,7 @@ static const IDWriteFontFace5Vtbl dwritefontfacevtbl = dwritefontface5_GetFontAxisValues, dwritefontface5_HasVariations, dwritefontface5_GetFontResource, + dwritefontface5_Equals, }; static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 **fontface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b2892b8e854..23630a73bf6 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1779,13 +1779,14 @@ static void test_CreateFontFace(void) IDWriteFontCollection *collection; DWRITE_FONT_FILE_TYPE file_type; DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFace5 *fontface5; IDWriteGdiInterop *interop; IDWriteFont *font, *font2; IDWriteFontFamily *family; IDWriteFactory *factory; IDWriteFontFile *file; + BOOL supported, ret; LOGFONTW logfont; - BOOL supported; UINT32 count; WCHAR *path; HRESULT hr; @@ -1870,6 +1871,14 @@ static void test_CreateFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); + /* Trivial equality test */ + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) + { + ret = IDWriteFontFace5_Equals(fontface5, fontface2); + ok(ret, "Unexpected result %d.\n", ret); + IDWriteFontFace5_Release(fontface5); + } + IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface2); IDWriteFont_Release(font2);

1 0

Zebediah Figura : winecfg: Set the Current{Major, Minor}VersionNumber registry values.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cec56576f8b7d1aa11be5aef5647b9615a4ca7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=cec56576f8b7d1aa11be5aef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 18 12:50:29 2020 -0500 winecfg: Set the Current{Major, Minor}VersionNumber registry values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7458092ec329fede4f64835769e214f72ffb3efc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/appdefaults.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 050b0e029d3..21b56efa441 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -416,6 +416,8 @@ static void set_winver(const struct win_version *version) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMajorVersionNumber", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMinorVersionNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); @@ -429,6 +431,8 @@ static void set_winver(const struct win_version *version) snprintf(Buffer, sizeof(Buffer), "%d.%d", version->dwMajorVersion, version->dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); + set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMajorVersionNumber", version->dwMajorVersion); + set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentMinorVersionNumber", version->dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", version->szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", version->dwBuildNumber); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer);

1 0

Paul Gofman : ws2_32: Optimize interface_bind_check() by caching adapter addresses.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 897707777f5a13668928a98e10ccba42ec580c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=897707777f5a13668928a98e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 10 21:22:51 2020 +0300 ws2_32: Optimize interface_bind_check() by caching adapter addresses. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48668 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 60c8c78015b12493eb3984feef29103724a758af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 65 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fbfef0aad52..1ca750764a9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -276,6 +276,17 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +static in_addr_t *if_addr_cache; +static unsigned int if_addr_cache_size; +static CRITICAL_SECTION cs_if_addr_cache; +static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = +{ + 0, 0, &cs_if_addr_cache, + { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } +}; +static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + union generic_unix_sockaddr { struct sockaddr addr; @@ -3346,6 +3357,33 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " "receiving broadcast packets will not work on socket %04lx.\n", s); #endif + if (ret) + { + EnterCriticalSection(&cs_if_addr_cache); + if (if_addr_cache_size <= adapter->Index) + { + unsigned int new_size; + in_addr_t *new; + + new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) + { + ERR("No memory.\n"); + ret = FALSE; + LeaveCriticalSection(&cs_if_addr_cache); + break; + } + memset(new + if_addr_cache_size, 0, sizeof(*if_addr_cache) + * (new_size - if_addr_cache_size)); + if_addr_cache = new; + if_addr_cache_size = new_size; + } + if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) + WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + + if_addr_cache[adapter->Index] = adapter_addr; + LeaveCriticalSection(&cs_if_addr_cache); + } break; } } @@ -3750,27 +3788,12 @@ static void interface_bind_check(int fd, struct sockaddr_in *addr) #endif if (!ret) { - PIP_ADAPTER_INFO adapters, adapter; - DWORD adap_size; - - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - return; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters && GetAdaptersInfo(adapters, &adap_size) == NO_ERROR) - { - /* Search the IPv4 adapter list for the appropriate bound interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr; - if (adapter->Index != ifindex) continue; - - adapter_addr = inet_addr(adapter->IpAddressList.IpAddress.String); - addr->sin_addr.s_addr = adapter_addr; - TRACE("reporting interface address from adapter %d\n", ifindex); - break; - } - } - HeapFree(GetProcessHeap(), 0, adapters); + EnterCriticalSection(&cs_if_addr_cache); + if (ifindex < if_addr_cache_size) + addr->sin_addr.s_addr = if_addr_cache[ifindex]; + else + ERR("No cache entry for ifindex %u.\n", ifindex); + LeaveCriticalSection(&cs_if_addr_cache); } #endif }

1 0

Paul Gofman : winebuild: Correct hotpatching prologue in import thunks for x86_64.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 302350d888607d17f320cccd25f79cd8b6aa48e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=302350d888607d17f320cccd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 26 12:42:39 2020 +0300 winebuild: Correct hotpatching prologue in import thunks for x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48938 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19aa67d1704a7060c81f345524660ae76f5a7696) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ecfe4c50113..7abeb08140a 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -576,7 +576,7 @@ void output_exports( DLLSPEC *spec ) else output( "\tjmp *__imp_%s\n", asm_name( get_link_name( odp ))); break; case CPU_x86_64: - output( "\t.byte 0x48\n" ); /* hotpatch prolog */ + output( "\t.byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n" ); /* hotpatch prolog */ output( "\tjmp *__imp_%s(%%rip)\n", asm_name( get_link_name( odp ))); break; default:

1 0

Dmitry Kislyuk : vbscript: Parse empty CASE ELSE clause.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 70299c76d16da9dec74a1bbfb305e737344b5bea URL: https://source.winehq.org/git/wine.git/?a=commit;h=70299c76d16da9dec74a1bbf… Author: Dmitry Kislyuk <dimaki(a)rocketmail.com> Date: Thu Jun 25 00:50:46 2020 -0500 vbscript: Parse empty CASE ELSE clause. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49439 Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18e7e07a77a754c4b48c6c9bde225ad5c7295944) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index df2c72da959..e5f436bf6db 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -300,7 +300,7 @@ Else_opt CaseClausules : /* empty */ { $$ = NULL; } - | tCASE tELSE StSep StatementsNl { $$ = new_case_clausule(ctx, NULL, $4, NULL); } + | tCASE tELSE StSep StatementsNl_opt { $$ = new_case_clausule(ctx, NULL, $4, NULL); } | tCASE ExpressionList StSep StatementsNl_opt CaseClausules { $$ = new_case_clausule(ctx, $2, $4, $5); } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index fb9f96e4277..eeab0bc5787 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -673,6 +673,14 @@ select case 1 : end select Call ok(x, "wrong case") +select case 0 + case 1 + case else + 'empty else with comment test +end select + +select case 0 : case 1 : case else : end select + if false then Sub testsub x = true

1 0

Brendan Shanks : whoami: Add semi-stub application to display username.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 1177517eceae1c11962cd30883dd43930569addc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1177517eceae1c11962cd308… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 9 11:09:52 2020 -0700 whoami: Add semi-stub application to display username. Fixes GTA V hang experienced by some users. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b36a10596a868e690e32c70f4487c3dc6b9bda7c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 + configure.ac | 1 + programs/whoami/Makefile.in | 7 ++++ programs/whoami/main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+) diff --git a/configure b/configure index 05194a51d2f..454cf7b4d35 100755 --- a/configure +++ b/configure @@ -1785,6 +1785,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_whoami enable_wineboot enable_winebrowser enable_winecfg @@ -21148,6 +21149,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser wine_fn_config_makefile programs/winecfg enable_winecfg diff --git a/configure.ac b/configure.ac index 95730668e92..abcaaa50f78 100644 --- a/configure.ac +++ b/configure.ac @@ -3959,6 +3959,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) WINE_CONFIG_MAKEFILE(programs/winecfg) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in new file mode 100644 index 00000000000..a003b0afaa7 --- /dev/null +++ b/programs/whoami/Makefile.in @@ -0,0 +1,7 @@ +MODULE = whoami.exe +IMPORTS = secur32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/whoami/main.c b/programs/whoami/main.c new file mode 100644 index 00000000000..297f12c9a91 --- /dev/null +++ b/programs/whoami/main.c @@ -0,0 +1,95 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * 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 SECURITY_WIN32 +#include <windows.h> +#include <security.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(whoami); + +static int output_write(const WCHAR* str, int len) +{ + DWORD ret, count; + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); + if (!ret) + { + DWORD lenA; + char* strA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (!strA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } + return count; +} + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WCHAR *buf = NULL; + ULONG size = 0; + BOOL result; + + if (argc > 1) + { + int i; + + WINE_FIXME("unsupported arguments:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + } + + result = GetUserNameExW(NameSamCompatible, NULL, &size); + if (result || GetLastError() != ERROR_MORE_DATA) + { + WINE_ERR("GetUserNameExW failed, result %d, error %d\n", result, GetLastError()); + return 1; + } + + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!buf) + { + WINE_ERR("Memory allocation failed\n"); + return 1; + } + + result = GetUserNameExW(NameSamCompatible, buf, &size); + if (result) + { + output_write(buf, size); + output_write(L"\r\n", 2); + } + else + WINE_ERR("GetUserNameExW failed, error %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buf); + return 0; +}

1 0

Derek Lesho : msctf: Always provide a context when from GetBase/Top.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: fb0f0068f86118986f40dade9dbc667cfb8cac4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb0f0068f86118986f40dade… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 4 15:47:41 2020 -0600 msctf: Always provide a context when from GetBase/Top. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c09634eceb8e18d2578020fe9399ad35ac49398) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632b..37d55557f55 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f8ec492f7f0..e0bc4158bcb 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); }

1 0

Gijs Vermeulen : d3dx9: Implement ID3DXSkinInfo_Clone().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: a1267b3e321163b36575b080da9bbb65abf773ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1267b3e321163b36575b080… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Jun 17 17:27:32 2020 +0200 d3dx9: Implement ID3DXSkinInfo_Clone(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48779 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35a4093eff75e5bf7fee0dc8d2a708d960b03768) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/skin.c | 28 ++++++++++++++++++-- dlls/d3dx9_36/tests/mesh.c | 64 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 82 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 2c10260e2ab..ffc89f0bad9 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -298,9 +298,33 @@ static D3DXMATRIX * WINAPI d3dx9_skin_info_GetBoneOffsetMatrix(ID3DXSkinInfo *if static HRESULT WINAPI d3dx9_skin_info_Clone(ID3DXSkinInfo *iface, ID3DXSkinInfo **skin_info) { - FIXME("iface %p, skin_info %p stub!\n", iface, skin_info); + struct d3dx9_skin_info *skin = impl_from_ID3DXSkinInfo(iface); + unsigned int i; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, skin_info %p.\n", iface, skin_info); + + if (FAILED(hr = D3DXCreateSkinInfo(skin->num_vertices, skin->vertex_declaration, skin->num_bones, skin_info))) + return hr; + + for (i = 0; i < skin->num_bones; ++i) + { + struct bone *current_bone = &skin->bones[i]; + + if (current_bone->name && FAILED(hr = (*skin_info)->lpVtbl->SetBoneName(*skin_info, i, current_bone->name))) + break; + if (FAILED(hr = (*skin_info)->lpVtbl->SetBoneOffsetMatrix(*skin_info, i, &current_bone->transform))) + break; + if (current_bone->vertices && current_bone->weights + && FAILED(hr = (*skin_info)->lpVtbl->SetBoneInfluence(*skin_info, i, current_bone->num_influences, + current_bone->vertices, current_bone->weights))) + break; + } + + if (FAILED(hr)) + (*skin_info)->lpVtbl->Release(*skin_info); + + return hr; } static HRESULT WINAPI d3dx9_skin_info_Remap(ID3DXSkinInfo *iface, DWORD num_vertices, DWORD *vertex_remap) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index ae7c5f2010c..ded63f1b7fc 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4966,14 +4966,20 @@ cleanup: static void test_create_skin_info(void) { - HRESULT hr; - ID3DXSkinInfo *skininfo = NULL; D3DVERTEXELEMENT9 empty_declaration[] = { D3DDECL_END() }; D3DVERTEXELEMENT9 declaration_out[MAX_FVF_DECL_SIZE]; const D3DVERTEXELEMENT9 declaration_with_nonzero_stream[] = { {1, 0, D3DDECLTYPE_FLOAT3, 0, D3DDECLUSAGE_POSITION, 0}, D3DDECL_END() }; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE]; + DWORD exp_vertices[2], vertices[2]; + float exp_weights[2], weights[2]; + const char *exp_string, *string; + ID3DXSkinInfo *skininfo = NULL; + DWORD exp_fvf, fvf; + unsigned int i; + HRESULT hr; hr = D3DXCreateSkinInfo(0, empty_declaration, 0, &skininfo); ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); @@ -4990,6 +4996,7 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); if (skininfo) { + ID3DXSkinInfo *clone = NULL; DWORD dword_result; float flt_result; const char *string_result; @@ -5023,6 +5030,10 @@ static void test_create_skin_info(void) transform = skininfo->lpVtbl->GetBoneOffsetMatrix(skininfo, -1); ok(transform == NULL, "Expected NULL, got %p\n", transform); + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); + IUnknown_Release(clone); + { /* test [GS]etBoneOffsetMatrix */ hr = skininfo->lpVtbl->SetBoneOffsetMatrix(skininfo, 1, &identity_matrix); @@ -5066,12 +5077,7 @@ static void test_create_skin_info(void) { /* test [GS]etBoneInfluence */ - DWORD vertices[2]; - FLOAT weights[2]; - int i; DWORD num_influences; - DWORD exp_vertices[2]; - FLOAT exp_weights[2]; /* vertex and weight arrays untouched when num_influences is 0 */ vertices[0] = 0xdeadbeef; @@ -5139,14 +5145,17 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); ok(vertices[0] == 0xdeadbeef, "expected vertex 0xdeadbeef, got %u\n", vertices[0]); ok(weights[0] == FLT_MAX, "expected weight %g, got %g\n", FLT_MAX, weights[0]); + + hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 0, num_influences, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); } { /* test [GS]etFVF and [GS]etDeclaration */ D3DVERTEXELEMENT9 declaration_in[MAX_FVF_DECL_SIZE]; - DWORD fvf = D3DFVF_XYZ; DWORD got_fvf; + fvf = D3DFVF_XYZ; hr = skininfo->lpVtbl->SetDeclaration(skininfo, NULL); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr); @@ -5182,6 +5191,45 @@ static void test_create_skin_info(void) ok(hr == D3D_OK, "Expected D3D_OK, got %#x\n", hr); compare_elements(declaration_out, declaration_in, __LINE__, 0); } + + /* Test Clone() */ + hr = skininfo->lpVtbl->Clone(skininfo, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + clone = NULL; + hr = skininfo->lpVtbl->Clone(skininfo, &clone); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = clone->lpVtbl->GetDeclaration(clone, declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + compare_elements(declaration, declaration_out, __LINE__, 0); + + hr = D3DXFVFFromDeclarator(declaration_out, &exp_fvf); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + fvf = clone->lpVtbl->GetFVF(clone); + ok(fvf == exp_fvf, "Got unexpected fvf %#x.\n", fvf); + + exp_string = skininfo->lpVtbl->GetBoneName(skininfo, 0); + string = clone->lpVtbl->GetBoneName(clone, 0); + ok(!strcmp(string, exp_string), "Got unexpected bone 0 name %s.\n", debugstr_a(string)); + + transform = clone->lpVtbl->GetBoneOffsetMatrix(clone, 0); + check_matrix(transform, &identity_matrix); + + hr = skininfo->lpVtbl->GetBoneInfluence(skininfo, 0, exp_vertices, exp_weights); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = clone->lpVtbl->GetBoneInfluence(clone, 0, vertices, weights); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + { + ok(vertices[i] == exp_vertices[i], "influence[%u]: got unexpected vertex %u, expected %u.\n", + i, vertices[i], exp_vertices[i]); + ok(((DWORD *)weights)[i] == ((DWORD *)exp_weights)[i], + "influence[%u]: got unexpected weight %.8e, expected %.8e.\n", i, weights[i], exp_weights[i]); + } + + IUnknown_Release(clone); } if (skininfo) IUnknown_Release(skininfo); skininfo = NULL;

1 0

Piotr Caban : msasn1: Fix buffer allocations.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cc8142f91a1c2bf315162648af6750df83f72857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8142f91a1c2bf315162648… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 18 14:30:23 2020 +0200 msasn1: Fix buffer allocations. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d101fdb4499e174498c6378d1e47950113795009) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msasn1/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index d1513629057..fc867e7b815 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -56,7 +56,7 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, if (!encoder || !decoder || !freemem || !size) return module; - module = heap_alloc(sizeof(module)); + module = heap_alloc(sizeof(*module)); if (module) { module->nModuleName = magic; @@ -103,7 +103,7 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod if (!module || !encoder) return ASN1_ERR_BADARGS; - enc = heap_alloc(sizeof(enc)); + enc = heap_alloc(sizeof(*enc)); if (!enc) { return ASN1_ERR_MEMORY; @@ -153,7 +153,7 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod if (!module || !decoder) return ASN1_ERR_BADARGS; - dec = heap_alloc(sizeof(dec)); + dec = heap_alloc(sizeof(*dec)); if (!dec) { return ASN1_ERR_MEMORY;

1 0

Paul Gofman : ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 7d53600e4d162bff81f6d5fdeb1848cb880c8e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d53600e4d162bff81f6d5fd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:05 2020 +0300 ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1cad86fced2b8eb32dcc1e2d58858f45e8135ea3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25ace4f1a39..ec0f376d6cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2054,7 +2054,7 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, { FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; }

1 0