November 2020 - Wine-Commits

Alexandre Julliard : gdi32: Move the font cache out of freetype.c.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 19d13d0004db90e311cdb68c8d8026629f82a482 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19d13d0004db90e311cdb68c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 3 11:26:39 2020 +0100 gdi32: Move the font cache out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 293 ++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/freetype.c | 336 +---------------------------------------------- dlls/gdi32/gdi_private.h | 3 + 3 files changed, 300 insertions(+), 332 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19d13d0004db90e311cd…

1 0

Daniel Lehman : msvcr120/tests: Add _Context::_CurrentContext tests.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 782d4bc5357af0f917ec9dad91aea9e51ec339f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=782d4bc5357af0f917ec9dad… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 2 20:12:09 2020 -0800 msvcr120/tests: Add _Context::_CurrentContext tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a055feeac91..52531ddad72 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -157,6 +157,16 @@ typedef struct double i; } _Dcomplex; +typedef void (*vtable_ptr)(void); + +typedef struct { + const vtable_ptr *vtable; +} Context; + +typedef struct { + Context *ctx; +} _Context; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -208,6 +218,9 @@ static MSVCRT_bool (__thiscall *p__Condition_variable_wait_for)(_Condition_varia static void (__thiscall *p__Condition_variable_notify_one)(_Condition_variable*); static void (__thiscall *p__Condition_variable_notify_all)(_Condition_variable*); +static Context* (__cdecl *p_Context_CurrentContext)(void); +static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -250,6 +263,7 @@ static BOOL init(void) SET(p_nexttowardl, "nexttowardl"); SET(p_wctrans, "wctrans"); SET(p_towctrans, "towctrans"); + SET(p__Context__CurrentContext, "?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -281,6 +295,8 @@ static BOOL init(void) "?notify_one(a)_Condition_variable@details(a)Concurrency@@QEAAXXZ"); SET(p__Condition_variable_notify_all, "?notify_all(a)_Condition_variable@details(a)Concurrency@@QEAAXXZ"); + SET(p_Context_CurrentContext, + "?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ"); } else { #ifdef __arm__ SET(p_critical_section_ctor, @@ -345,6 +361,8 @@ static BOOL init(void) SET(p__Condition_variable_notify_all, "?notify_all(a)_Condition_variable@details(a)Concurrency@@QAEXXZ"); #endif + SET(p_Context_CurrentContext, + "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); } init_thiscall_thunk(); @@ -1065,6 +1083,20 @@ static void test_towctrans(void) ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); } +static void test_CurrentContext(void) +{ + _Context _ctx, *ret; + Context *ctx; + + ctx = p_Context_CurrentContext(); + ok(!!ctx, "got NULL\n"); + + memset(&_ctx, 0xcc, sizeof(_ctx)); + ret = p__Context__CurrentContext(&_ctx); + ok(_ctx.ctx == ctx, "expected %p, got %p\n", ctx, _ctx.ctx); + ok(ret == &_ctx, "expected %p, got %p\n", &_ctx, ret); +} + START_TEST(msvcr120) { if (!init()) return; @@ -1086,4 +1118,5 @@ START_TEST(msvcr120) test__Cbuild(); test_nexttoward(); test_towctrans(); + test_CurrentContext(); }

1 0

Daniel Lehman : concrt140/tests: Add _Context::_CurrentContext tests.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: c56bddf94e737565d9165d4261960e18c07c9e2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56bddf94e737565d9165d42… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 2 20:12:10 2020 -0800 concrt140/tests: Add _Context::_CurrentContext tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/concrt140/tests/Makefile.in | 4 ++ dlls/concrt140/tests/concrt140.c | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/configure b/configure index ac6a7985cc7..4e76dbf9d02 100755 --- a/configure +++ b/configure @@ -20363,6 +20363,7 @@ wine_fn_config_makefile dlls/compstui enable_compstui wine_fn_config_makefile dlls/comsvcs enable_comsvcs wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 +wine_fn_config_makefile dlls/concrt140/tests enable_tests wine_fn_config_makefile dlls/connect enable_connect wine_fn_config_makefile dlls/credui enable_credui wine_fn_config_makefile dlls/credui/tests enable_tests diff --git a/configure.ac b/configure.ac index 2f81fd22610..06031352866 100644 --- a/configure.ac +++ b/configure.ac @@ -3106,6 +3106,7 @@ WINE_CONFIG_MAKEFILE(dlls/compstui) WINE_CONFIG_MAKEFILE(dlls/comsvcs) WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) +WINE_CONFIG_MAKEFILE(dlls/concrt140/tests) WINE_CONFIG_MAKEFILE(dlls/connect) WINE_CONFIG_MAKEFILE(dlls/credui) WINE_CONFIG_MAKEFILE(dlls/credui/tests) diff --git a/dlls/concrt140/tests/Makefile.in b/dlls/concrt140/tests/Makefile.in new file mode 100644 index 00000000000..e36fc37eb86 --- /dev/null +++ b/dlls/concrt140/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = concrt140.dll + +C_SRCS = \ + concrt140.c diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c new file mode 100644 index 00000000000..03e0b2850f2 --- /dev/null +++ b/dlls/concrt140/tests/concrt140.c @@ -0,0 +1,79 @@ +/* + * Copyright 2020 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" + +typedef void (*vtable_ptr)(void); + +typedef struct { + const vtable_ptr *vtable; +} Context; + +typedef struct { + Context *ctx; +} _Context; + +static Context* (__cdecl *p_Context_CurrentContext)(void); +static _Context* (__cdecl *p__Context__CurrentContext)(_Context*); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) + +static BOOL init(void) +{ + HMODULE module; + + module = LoadLibraryA("concrt140.dll"); + if (!module) + { + win_skip("concrt140.dll not installed\n"); + return FALSE; + } + + SET(p__Context__CurrentContext, + "?_CurrentContext(a)_Context@details(a)Concurrency@@SA?AV123(a)XZ"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(p_Context_CurrentContext, + "?CurrentContext(a)Context@Concurrency@@SAPEAV12(a)XZ"); + } else { + SET(p_Context_CurrentContext, + "?CurrentContext(a)Context@Concurrency@@SAPAV12(a)XZ"); + } + + return TRUE; +} + +static void test_CurrentContext(void) +{ + _Context _ctx, *ret; + Context *ctx; + + ctx = p_Context_CurrentContext(); + ok(!!ctx, "got NULL\n"); + + memset(&_ctx, 0xcc, sizeof(_ctx)); + ret = p__Context__CurrentContext(&_ctx); + ok(_ctx.ctx == ctx, "expected %p, got %p\n", ctx, _ctx.ctx); + ok(ret == &_ctx, "expected %p, got %p\n", &_ctx, ret); +} + +START_TEST(concrt140) +{ + if (!init()) return; + test_CurrentContext(); +}

1 0

Michael Stefaniuc : serialui: Use wide-char string literals.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: b8ebbbee67afeba8e269cad16a6a980949d88641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ebbbee67afeba8e269cad1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 3 01:32:38 2020 +0100 serialui: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/confdlg.c | 26 +++++++------------------- dlls/serialui/tests/confdlg.c | 18 +++++++----------- 2 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 45419edb421..23c9eb68c2a 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); static HMODULE SERIALUI_hModule; -static const WCHAR comW[] = {'c','o','m',0 }; - /*********************************************************************** * DllMain [Internal] Initializes the internal 'SERIALUI.DLL'. * @@ -463,13 +461,7 @@ DWORD WINAPI drvCommConfigDialogA(LPCSTR lpszName, HWND hWndParent, LPCOMMCONFIG return r; } -static const WCHAR lpszCommKey[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'S','e','r','v','i','c','e','s','\\', - 'C','l','a','s','s','\\','P','o','r','t','s',0 -}; -static const WCHAR lpszDCB[] = {'D','C','B',0}; +static const WCHAR lpszCommKey[] = L"System\\CurrentControlSet\\Services\\Class\\Ports"; /*********************************************************************** * drvSetDefaultCommConfigW (SERIALUI.@) @@ -484,7 +476,6 @@ BOOL WINAPI drvSetDefaultCommConfigW( HKEY hKeyReg=0, hKeyPort=0; WCHAR szKeyName[100]; DWORD r,dwDCBSize; - static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize); @@ -498,13 +489,12 @@ BOOL WINAPI drvSetDefaultCommConfigW( if(r != ERROR_SUCCESS) return FALSE; - swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), L"%s\\%s", lpszCommKey, lpszDevice); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { dwDCBSize = sizeof (DCB); - r = RegSetValueExW( hKeyPort, lpszDCB, 0, REG_BINARY, - (LPBYTE)&lpCommConfig->dcb,dwDCBSize); + r = RegSetValueExW(hKeyPort, L"DCB", 0, REG_BINARY, (BYTE *)&lpCommConfig->dcb, dwDCBSize); TRACE("write key r=%d\n",r); RegCloseKey(hKeyPort); } @@ -539,7 +529,6 @@ DWORD WINAPI drvGetDefaultCommConfigW( HKEY hKeyReg, hKeyPort; WCHAR szKeyName[100]; DWORD r,dwSize,dwType; - static const WCHAR fmt[] = {'%','s','\\','%','s',0 }; TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); @@ -553,11 +542,11 @@ DWORD WINAPI drvGetDefaultCommConfigW( } /* only "com1" - "com9" is allowed */ - r = ARRAY_SIZE(comW); /* len of "com\0" */ + r = ARRAY_SIZE(L"com"); lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ r--; - if( lstrcmpiW(szKeyName, comW) || + if (lstrcmpiW(szKeyName, L"com") || (lpszDevice[r] < '1') || (lpszDevice[r] > '9') || lpszDevice[r+1]) { return ERROR_BADKEY; } @@ -571,14 +560,13 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r; - swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), L"%s\\%s", lpszCommKey, lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { dwSize = sizeof (DCB); dwType = 0; - r = RegQueryValueExW( hKeyPort, lpszDCB, NULL, - &dwType, (LPBYTE)&lpCommConfig->dcb, &dwSize); + r = RegQueryValueExW(hKeyPort, L"DCB", NULL, &dwType, (BYTE *)&lpCommConfig->dcb, &dwSize); RegCloseKey(hKeyPort); if ((r!=ERROR_SUCCESS) || (dwType != REG_BINARY) || (dwSize != sizeof(DCB))) { diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index bd541cda2b9..31669085d47 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -42,10 +42,6 @@ static const CHAR emptyA[] = ""; static const CHAR fmt_comA[] = "com%d"; static const CHAR str_colonA[] = ":"; -static const WCHAR com1W[] = {'c','o','m','1',0}; -static const WCHAR emptyW[] = {0}; -static const WCHAR str_colonW[] = {':',0}; - /* ################# */ static LPCSTR load_functions(void) @@ -202,7 +198,7 @@ static void test_drvCommConfigDialogW(void) ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pCommConfigDialogW(emptyW, NULL, pCC); + res = pCommConfigDialogW(L"", NULL, pCC); ok( res == ERROR_INSUFFICIENT_BUFFER, "returned %u with %u (expected ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); @@ -211,7 +207,7 @@ static void test_drvCommConfigDialogW(void) ZeroMemory(pCC, sizeof(pCC)); pCC[0].dwSize = sizeof(COMMCONFIG); SetLastError(0xdeadbeef); - res = pCommConfigDialogW(emptyW, NULL, pCC); + res = pCommConfigDialogW(L"", NULL, pCC); ok( res == ERROR_BADKEY, "returned %u with %u (expected ERROR_BADKEY)\n", res, GetLastError()); @@ -334,7 +330,7 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(COMMCONFIG) -1; ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, pCC, &len); + res = pGetDefaultCommConfigW(L"com1", pCC, &len); if (res == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("*W not implemented\n"); return; @@ -366,7 +362,7 @@ static void test_drvGetDefaultCommConfigW(void) /* a name with a colon is invalid */ if (res == ERROR_SUCCESS) { lstrcatA(bufferA, str_colonA); - lstrcatW(bufferW, str_colonW); + lstrcatW(bufferW, L":"); len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); res = pGetDefaultCommConfigW(bufferW, pCC, &len); @@ -380,7 +376,7 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(pCC); ZeroMemory(pCC, sizeof(pCC)); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(emptyW, pCC, &len); + res = pGetDefaultCommConfigW(L"", pCC, &len); ok( res == ERROR_BADKEY, "returned %u with %u and %u for %s (expected ERROR_BADKEY)\n", res, GetLastError(), len, emptyA); @@ -397,14 +393,14 @@ static void test_drvGetDefaultCommConfigW(void) len = sizeof(pCC); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, NULL, &len); + res = pGetDefaultCommConfigW(L"com1", NULL, &len); ok( res == ERROR_INVALID_PARAMETER, "returned %u with %u and %u (expected ERROR_INVALID_PARAMETER)\n", res, GetLastError(), len); SetLastError(0xdeadbeef); - res = pGetDefaultCommConfigW(com1W, pCC, NULL); + res = pGetDefaultCommConfigW(L"com1", pCC, NULL); ok( res == ERROR_INVALID_PARAMETER, "returned %u with %u (expected ERROR_INVALID_PARAMETER)\n", res, GetLastError());

1 0

Alistair Leslie-Hughes : srvcli: Add stub dll.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 8f81123f4f17f2afa31417db72c9b2db95ef6323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f81123f4f17f2afa31417db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 2 19:19:27 2020 +0100 srvcli: Add stub dll. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/srvcli/Makefile.in | 5 ++++ dlls/srvcli/main.c | 41 +++++++++++++++++++++++++++++++++ dlls/srvcli/srvcli.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 111 insertions(+) diff --git a/configure b/configure index 4e76dbf9d02..a372aae0b21 100755 --- a/configure +++ b/configure @@ -1593,6 +1593,7 @@ enable_snmpapi enable_softpub enable_spoolss enable_srclient +enable_srvcli enable_sspicli enable_stdole2_tlb enable_stdole32_tlb @@ -20981,6 +20982,7 @@ wine_fn_config_makefile dlls/sound.drv16 enable_win16 wine_fn_config_makefile dlls/spoolss enable_spoolss wine_fn_config_makefile dlls/spoolss/tests enable_tests wine_fn_config_makefile dlls/srclient enable_srclient +wine_fn_config_makefile dlls/srvcli enable_srvcli wine_fn_config_makefile dlls/sspicli enable_sspicli wine_fn_config_makefile dlls/stdole2.tlb enable_stdole2_tlb wine_fn_config_makefile dlls/stdole32.tlb enable_stdole32_tlb diff --git a/configure.ac b/configure.ac index 06031352866..18f47abaac1 100644 --- a/configure.ac +++ b/configure.ac @@ -3724,6 +3724,7 @@ WINE_CONFIG_MAKEFILE(dlls/sound.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/spoolss) WINE_CONFIG_MAKEFILE(dlls/spoolss/tests) WINE_CONFIG_MAKEFILE(dlls/srclient) +WINE_CONFIG_MAKEFILE(dlls/srvcli) WINE_CONFIG_MAKEFILE(dlls/sspicli) WINE_CONFIG_MAKEFILE(dlls/stdole2.tlb) WINE_CONFIG_MAKEFILE(dlls/stdole32.tlb) diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in new file mode 100644 index 00000000000..716cc1b3867 --- /dev/null +++ b/dlls/srvcli/Makefile.in @@ -0,0 +1,5 @@ +MODULE = srvcli.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = main.c diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c new file mode 100644 index 00000000000..0df8e00d0fa --- /dev/null +++ b/dlls/srvcli/main.c @@ -0,0 +1,41 @@ +/* + * + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srvcli); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/srvcli/srvcli.spec b/dlls/srvcli/srvcli.spec new file mode 100644 index 00000000000..821724a7d4d --- /dev/null +++ b/dlls/srvcli/srvcli.spec @@ -0,0 +1,61 @@ +@ stub I_NetDfsGetVersion +@ stub I_NetServerSetServiceBits +@ stub I_NetServerSetServiceBitsEx +@ stub LocalAliasGet +@ stub LocalFileClose +@ stub LocalFileEnum +@ stub LocalFileEnumEx +@ stub LocalFileGetInfo +@ stub LocalFileGetInfoEx +@ stub LocalServerCertificateMappingAdd +@ stub LocalServerCertificateMappingEnum +@ stub LocalServerCertificateMappingGet +@ stub LocalServerCertificateMappingRemove +@ stub LocalSessionDel +@ stub LocalSessionEnum +@ stub LocalSessionEnumEx +@ stub LocalSessionGetInfo +@ stub LocalSessionGetInfoEx +@ stub LocalShareAdd +@ stub LocalShareDelEx +@ stub LocalShareEnum +@ stub LocalShareEnumEx +@ stub LocalShareGetInfo +@ stub LocalShareGetInfoEx +@ stub LocalShareSetInfo +@ stub NetConnectionEnum +@ stub NetFileClose +@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetFileEnum +@ stub NetFileGetInfo +@ stub NetRemoteTOD +@ stub NetServerAliasAdd +@ stub NetServerAliasDel +@ stub NetServerAliasEnum +@ stub NetServerComputerNameAdd +@ stub NetServerComputerNameDel +@ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) netapi32.NetServerDiskEnum +@ stdcall NetServerGetInfo(wstr long ptr) netapi32.NetServerGetInfo +@ stub NetServerSetInfo +@ stub NetServerStatisticsGet +@ stub NetServerTransportAdd +@ stub NetServerTransportAddEx +@ stub NetServerTransportDel +@ stub NetServerTransportEnum +@ stub NetSessionDel +@ stdcall NetSessionEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetSessionEnum +@ stub NetSessionGetInfo +@ stdcall NetShareAdd(wstr long ptr ptr) netapi32.NetShareAdd +@ stub NetShareCheck +@ stdcall NetShareDel(wstr wstr long) netapi32.NetShareDel +@ stub NetShareDelEx +@ stub NetShareDelSticky +@ stdcall NetShareEnum(wstr long ptr long ptr ptr ptr) netapi32.NetShareEnum +@ stub NetShareEnumSticky +@ stdcall NetShareGetInfo(wstr wstr long ptr) netapi32.NetShareGetInfo +@ stub NetShareSetInfo +@ stub NetpsNameCanonicalize +@ stub NetpsNameCompare +@ stub NetpsNameValidate +@ stub NetpsPathCanonicalize +@ stub NetpsPathCompare +@ stub NetpsPathType diff --git a/tools/make_specfiles b/tools/make_specfiles index efb873e2532..e7a706dad42 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -177,6 +177,7 @@ my @dll_groups = [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", + "srvcli", ], [ "ntdll",

1 0

Alistair Leslie-Hughes : netutils: Add stub dll.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 5575072e7281eaf865c46f9c0f0ab13f83fdbfb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5575072e7281eaf865c46f9c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 2 19:19:28 2020 +0100 netutils: Add stub dll. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/netutils/Makefile.in | 5 +++++ dlls/netutils/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/netutils/netutils.spec | 22 ++++++++++++++++++++++ 5 files changed, 71 insertions(+) diff --git a/configure b/configure index a372aae0b21..26caf6703e5 100755 --- a/configure +++ b/configure @@ -1503,6 +1503,7 @@ enable_netapi32 enable_netcfgx enable_netio_sys enable_netprofm +enable_netutils enable_newdev enable_ninput enable_normaliz @@ -20833,6 +20834,7 @@ wine_fn_config_makefile dlls/netcfgx/tests enable_tests wine_fn_config_makefile dlls/netio.sys enable_netio_sys wine_fn_config_makefile dlls/netprofm enable_netprofm wine_fn_config_makefile dlls/netprofm/tests enable_tests +wine_fn_config_makefile dlls/netutils enable_netutils wine_fn_config_makefile dlls/newdev enable_newdev wine_fn_config_makefile dlls/ninput enable_ninput wine_fn_config_makefile dlls/ninput/tests enable_tests diff --git a/configure.ac b/configure.ac index 18f47abaac1..923d5e3b0f3 100644 --- a/configure.ac +++ b/configure.ac @@ -3575,6 +3575,7 @@ WINE_CONFIG_MAKEFILE(dlls/netcfgx/tests) WINE_CONFIG_MAKEFILE(dlls/netio.sys) WINE_CONFIG_MAKEFILE(dlls/netprofm) WINE_CONFIG_MAKEFILE(dlls/netprofm/tests) +WINE_CONFIG_MAKEFILE(dlls/netutils) WINE_CONFIG_MAKEFILE(dlls/newdev) WINE_CONFIG_MAKEFILE(dlls/ninput) WINE_CONFIG_MAKEFILE(dlls/ninput/tests) diff --git a/dlls/netutils/Makefile.in b/dlls/netutils/Makefile.in new file mode 100644 index 00000000000..21589e07b8b --- /dev/null +++ b/dlls/netutils/Makefile.in @@ -0,0 +1,5 @@ +MODULE = netutils.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = main.c diff --git a/dlls/netutils/main.c b/dlls/netutils/main.c new file mode 100644 index 00000000000..503e0ef7bfb --- /dev/null +++ b/dlls/netutils/main.c @@ -0,0 +1,41 @@ +/* + * + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netutils); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/netutils/netutils.spec b/dlls/netutils/netutils.spec new file mode 100644 index 00000000000..ff022af2c57 --- /dev/null +++ b/dlls/netutils/netutils.spec @@ -0,0 +1,22 @@ +@ stub NetApiBufferAllocate +@ stub NetApiBufferFree +@ stub NetApiBufferReallocate +@ stub NetApiBufferSize +@ stub NetRemoteComputerSupports +@ stub NetapipBufferAllocate +@ stub NetpIsComputerNameValid +@ stub NetpIsDomainNameValid +@ stub NetpIsGroupNameValid +@ stub NetpIsRemote +@ stub NetpIsRemoteNameValid +@ stub NetpIsShareNameValid +@ stub NetpIsUncComputerNameValid +@ stub NetpIsUserNameValid +@ stub NetpwListCanonicalize +@ stub NetpwListTraverse +@ stub NetpwNameCanonicalize +@ stub NetpwNameCompare +@ stub NetpwNameValidate +@ stub NetpwPathCanonicalize +@ stub NetpwPathCompare +@ stub NetpwPathType

1 0

Daniel Lehman : msvcr110/tests: Use macro to get function address.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: b698da22985b576618ef8c779121cbe79c349ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b698da22985b576618ef8c77… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Nov 2 20:12:07 2020 -0800 msvcr110/tests: Use macro to get function address. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..364dd26aa82 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -39,6 +39,9 @@ static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(v static unsigned int (CDECL *p_CurrentScheduler_Id)(void); static unsigned int (CDECL *p__CurrentScheduler__Id)(void); +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) + static BOOL init(void) { HMODULE module; @@ -50,12 +53,12 @@ static BOOL init(void) return FALSE; } - p_setlocale = (void*)GetProcAddress(module, "setlocale"); - p___strncnt = (void*)GetProcAddress(module, "__strncnt"); - p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); - p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); - p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); - p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + SET(p_setlocale, "setlocale"); + SET(p___strncnt, "__strncnt"); + SET(p_CurrentScheduler_GetNumberOfVirtualProcessors, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); + SET(p__CurrentScheduler__GetNumberOfVirtualProcessors, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + SET(p_CurrentScheduler_Id, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); + SET(p__CurrentScheduler__Id, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); return TRUE; }

1 0

Huw Davies : riched20: Use run ptrs in the text retrieval function.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: 27f8e16bde4a42b96a9ccceaeedba39e21e50aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=27f8e16bde4a42b96a9cccea… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 08:44:41 2020 +0000 riched20: Use run ptrs in the text retrieval function. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2bb1fbbe1e9..168dc51d827 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5160,7 +5160,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, const ME_Cursor *start, int srcChars, BOOL bCRLF, BOOL bEOP) { - ME_DisplayItem *pRun, *pNextRun; + ME_Run *run, *next_run; const WCHAR *pStart = buffer; const WCHAR cr_lf[] = {'\r', '\n', 0}; const WCHAR *str; @@ -5169,18 +5169,15 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, /* bCRLF flag is only honored in 2.0 and up. 1.0 must always return text verbatim */ if (editor->bEmulateVersion10) bCRLF = FALSE; - pRun = start->pRun; - assert(pRun); - pNextRun = ME_FindItemFwd(pRun, diRun); + run = &start->pRun->member.run; + next_run = run_next_all_paras( run ); - nLen = pRun->member.run.len - start->nOffset; - str = get_text( &pRun->member.run, start->nOffset ); + nLen = run->len - start->nOffset; + str = get_text( run, start->nOffset ); - while (srcChars && buflen && pNextRun) + while (srcChars && buflen && next_run) { - int nFlags = pRun->member.run.nFlags; - - if (bCRLF && nFlags & MERF_ENDPARA && ~nFlags & MERF_ENDCELL) + if (bCRLF && run->nFlags & MERF_ENDPARA && ~run->nFlags & MERF_ENDCELL) { if (buflen == 1) break; /* FIXME: native fails to reduce srcChars here for WM_GETTEXT or @@ -5189,7 +5186,9 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, srcChars -= min(nLen, srcChars); nLen = 2; str = cr_lf; - } else { + } + else + { nLen = min(nLen, srcChars); srcChars -= nLen; } @@ -5201,14 +5200,14 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, buffer += nLen; - pRun = pNextRun; - pNextRun = ME_FindItemFwd(pRun, diRun); + run = next_run; + next_run = run_next_all_paras( run ); - nLen = pRun->member.run.len; - str = get_text( &pRun->member.run, 0 ); + nLen = run->len; + str = get_text( run, 0 ); } /* append '\r' to the last paragraph. */ - if (pRun->next->type == diTextEnd && bEOP) + if (run == para_end_run( para_prev( editor_end_para( editor ) ) ) && bEOP) { *buffer = '\r'; buffer ++;

1 0

Esme Povirk : avifil32: Only add the first stream reference to the parent.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: bfa143a203de882c0f2eda9617b29146e3a42955 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa143a203de882c0f2eda96… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Nov 2 15:38:17 2020 -0600 avifil32: Only add the first stream reference to the parent. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/avifile.c | 4 ++-- dlls/avifil32/tests/api.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b1654daa690..8f5c5e64562 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -699,7 +699,7 @@ static ULONG WINAPI IAVIStream_fnAddRef(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); /* also add ref to parent, so that it doesn't kill us */ - if (This->paf != NULL) + if (This->paf != NULL && ref == 1) IAVIFile_AddRef(&This->paf->IAVIFile_iface); return ref; @@ -712,7 +712,7 @@ static ULONG WINAPI IAVIStream_fnRelease(IAVIStream *iface) TRACE("(%p) ref=%d\n", This, ref); - if (This->paf != NULL) + if (This->paf != NULL && ref == 0) IAVIFile_Release(&This->paf->IAVIFile_iface); return ref; diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 66ba2051a06..23c845cb328 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -352,6 +352,12 @@ static void create_avi_file(const COMMON_AVI_HEADERS *cah, char *filename) CloseHandle(hFile); } +static ULONG get_file_refcount(PAVIFILE file) +{ + AVIFileAddRef(file); + return AVIFileRelease(file); +} + static void test_default_data(void) { COMMON_AVI_HEADERS cah; @@ -363,6 +369,7 @@ static void test_default_data(void) PAVISTREAM pStream1; AVISTREAMINFOA asi0, asi1; WAVEFORMATEX wfx; + ULONG refcount; GetTempPathA(MAX_PATH, filename); strcpy(filename+strlen(filename), testfilename); @@ -443,9 +450,34 @@ static void test_default_data(void) ok(wfx.nAvgBytesPerSec == 22050, "got %u (expected 22050)\n",wfx.nAvgBytesPerSec); ok(wfx.nBlockAlign == 2, "got %u (expected 2)\n",wfx.nBlockAlign); + refcount = get_file_refcount(pFile); + ok(refcount == 3, "got %u (expected 3)\n", refcount); + AVIStreamRelease(pStream0); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + + AVIStreamAddRef(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 2, "got %u (expected 2)\n", refcount); + AVIStreamRelease(pStream1); - AVIFileRelease(pFile); + AVIStreamRelease(pStream1); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIStreamRelease(pStream1); + ok(refcount == (ULONG)-1, "got %u (expected 4294967295)\n", refcount); + + refcount = get_file_refcount(pFile); + ok(refcount == 1, "got %u (expected 1)\n", refcount); + + refcount = AVIFileRelease(pFile); + ok(refcount == 0, "got %u (expected 0)\n", refcount); + ok(DeleteFileA(filename) !=0, "Deleting file %s failed\n", filename); }

1 0

Huw Davies : riched20: Use row ptrs in the EM_GETLINELENGTH handler.
by Alexandre Julliard Nov. 3, 2020

Nov. 3, 2020

Module: wine Branch: master Commit: cfdfe51785733e1e8c8f8ce9f65099a2cd053058 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfdfe51785733e1e8c8f8ce9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 3 08:44:40 2020 +0000 riched20: Use row ptrs in the EM_GETLINELENGTH handler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 66f6bd5e114..2bb1fbbe1e9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4341,8 +4341,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_LINELENGTH: { - ME_DisplayItem *item, *item_end; - int nChars = 0, nThisLineOfs = 0, nNextLineOfs = 0; + ME_Row *row; + int start_ofs, end_ofs; ME_Cursor cursor; if (wParam > ME_GetTextLength(editor)) @@ -4353,20 +4353,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; } cursor_from_char_ofs( editor, wParam, &cursor ); - item = ME_RowStart( cursor.pRun ); - nThisLineOfs = run_char_ofs( &ME_FindItemFwd( item, diRun )->member.run, 0 ); - item_end = ME_FindItemFwd(item, diStartRowOrParagraphOrEnd); - if (item_end->type == diStartRow) - nNextLineOfs = run_char_ofs( &ME_FindItemFwd( item_end, diRun )->member.run, 0 ); - else - { - ME_DisplayItem *endRun = ME_FindItemBack(item_end, diRun); - assert(endRun && endRun->member.run.nFlags & MERF_ENDPARA); - nNextLineOfs = run_char_ofs( &endRun->member.run, 0 ); - } - nChars = nNextLineOfs - nThisLineOfs; - TRACE("EM_LINELENGTH(%ld)==%d\n", wParam, nChars); - return nChars; + row = row_from_cursor( &cursor ); + row_first_cursor( row, &cursor ); + start_ofs = ME_GetCursorOfs( &cursor ); + row_end_cursor( row, &cursor, FALSE ); + end_ofs = ME_GetCursorOfs( &cursor ); + TRACE( "EM_LINELENGTH(%ld)==%d\n", wParam, end_ofs - start_ofs ); + return end_ofs - start_ofs; } case EM_EXLIMITTEXT: {

1 0