April 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Use Windows paths to read Wine font directories.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 0a12f258690b46f996b4890837ffdb4cea94ba70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a12f258690b46f996b48908… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 12:39:15 2020 +0200 gdi32: Use Windows paths to read Wine font directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 70 +++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 403e1377d2..31ad56706a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -100,7 +100,6 @@ #include "winreg.h" #include "wingdi.h" #include "gdi_private.h" -#include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/list.h" @@ -2775,6 +2774,16 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) return TRUE; } +static void read_font_dir( const WCHAR *dirname, BOOL external_fonts ) +{ + char *unixname = wine_get_unix_file_name( dirname ); + if (unixname) + { + ReadFontDir( unixname, external_fonts ); + HeapFree( GetProcessHeap(), 0, unixname ); + } +} + #ifdef SONAME_LIBFONTCONFIG static BOOL fontconfig_enabled; @@ -3024,43 +3033,33 @@ static void load_mac_fonts(void) #endif -static char *get_font_dir(void) +static void get_font_dir( WCHAR *path ) { - const char *build_dir, *data_dir; - char *name = NULL; + static const WCHAR slashW[] = {'\\',0}; + static const WCHAR fontsW[] = {'\\','f','o','n','t','s',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; - if ((data_dir = wine_get_data_dir())) + if (GetEnvironmentVariableW( winedatadirW, path, MAX_PATH )) { - if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + 1 + sizeof(WINE_FONT_DIR) ))) - return NULL; - strcpy( name, data_dir ); - strcat( name, "/" ); - strcat( name, WINE_FONT_DIR ); + const char fontdir[] = WINE_FONT_DIR; + strcatW( path, slashW ); + MultiByteToWideChar( CP_ACP, 0, fontdir, -1, path + strlenW(path), MAX_PATH - strlenW(path) ); } - else if ((build_dir = wine_get_build_dir())) + else if (GetEnvironmentVariableW( winebuilddirW, path, MAX_PATH )) { - if (!(name = HeapAlloc( GetProcessHeap(), 0, strlen(build_dir) + sizeof("/fonts") ))) - return NULL; - strcpy( name, build_dir ); - strcat( name, "/fonts" ); + strcatW( path, fontsW ); } - return name; + path[1] = '\\'; /* change \??\ to \\?\ */ } static void get_data_dir_path( LPCWSTR file, WCHAR *path ) { static const WCHAR slashW[] = {'\\','\0'}; - char *font_dir = get_font_dir(); - if (font_dir) - { - WCHAR *dirW = wine_get_dos_file_name( font_dir ); - strcpyW( path, dirW ); - strcatW( path, slashW ); - strcatW( path, file ); - HeapFree( GetProcessHeap(), 0, dirW ); - HeapFree( GetProcessHeap(), 0, font_dir ); - } + get_font_dir( path ); + strcatW( path, slashW ); + strcatW( path, file ); } static void get_winfonts_dir_path(LPCWSTR file, WCHAR *path) @@ -4216,7 +4215,7 @@ static void init_font_list(void) static const WCHAR pathW[] = {'P','a','t','h',0}; HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; - WCHAR windowsdir[MAX_PATH]; + WCHAR path[MAX_PATH]; char *unixname; delete_external_font_keys(); @@ -4225,20 +4224,13 @@ static void init_font_list(void) load_system_fonts(); /* load in the fonts from %WINDOWSDIR%\\Fonts first of all */ - GetWindowsDirectoryW(windowsdir, ARRAY_SIZE(windowsdir)); - strcatW(windowsdir, fontsW); - if((unixname = wine_get_unix_file_name(windowsdir))) - { - ReadFontDir(unixname, FALSE); - HeapFree(GetProcessHeap(), 0, unixname); - } + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + strcatW(path, fontsW); + read_font_dir( path, FALSE ); /* load the wine fonts */ - if ((unixname = get_font_dir())) - { - ReadFontDir(unixname, TRUE); - HeapFree(GetProcessHeap(), 0, unixname); - } + get_font_dir( path ); + read_font_dir( path, TRUE ); /* now look under HKLM\Software\Microsoft\Windows[ NT]\CurrentVersion\Fonts for any fonts not installed in %WINDOWSDIR%\Fonts. They will have their

1 0

Alexandre Julliard : winemenubuilder: Avoid using wine_get_config_dir().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 43e80d235e76e3f991e365c24822935873a037ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=43e80d235e76e3f991e365c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 12:46:06 2020 +0200 winemenubuilder: Avoid using wine_get_config_dir(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fa700f8c19..d6fc9e2923 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -93,7 +93,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/rbtree.h" @@ -1452,6 +1451,8 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con const char *workdir, const char *icon, const char *wmclass) { FILE *file; + const char *prefix = getenv("WINEPREFIX"); + const char *home = getenv("HOME"); WINE_TRACE("(%s,%s,%s,%s,%s,%s,%s,%s,%s)\n", wine_dbgstr_a(unix_link), wine_dbgstr_a(location), wine_dbgstr_a(linkname), wine_dbgstr_a(path), wine_dbgstr_a(args), @@ -1464,8 +1465,12 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con fprintf(file, "[Desktop Entry]\n"); fprintf(file, "Name=%s\n", linkname); - fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n", - wine_get_config_dir(), path, args); + if (prefix) + fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n", prefix, path, args); + else if (home) + fprintf(file, "Exec=env WINEPREFIX=\"%s/.wine\" wine %s %s\n", home, path, args); + else + fprintf(file, "Exec=wine %s %s\n", path, args); fprintf(file, "Type=Application\n"); fprintf(file, "StartupNotify=true\n"); if (descr && *descr) @@ -2493,6 +2498,8 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c { BOOL ret = FALSE; FILE *desktop; + const char *prefix = getenv("WINEPREFIX"); + const char *home = getenv("HOME"); WINE_TRACE("writing association for file type %s, friendlyAppName=%s, MIME type %s, progID=%s, icon=%s to file %s\n", wine_dbgstr_a(dot_extension), wine_dbgstr_a(friendlyAppName), wine_dbgstr_a(mimeType), @@ -2505,7 +2512,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); fprintf(desktop, "MimeType=%s;\n", mimeType); - fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId); + if (prefix) + fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", prefix, progId); + else if (home) + fprintf(desktop, "Exec=env WINEPREFIX=\"%s/.wine\" wine start /ProgIDOpen %s %%f\n", home, progId); + else + fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); if (openWithIcon)

1 0

Alexandre Julliard : winevdm: Avoid using wine_get_config_dir().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: a094f5173aefba96429624eb493b755b6d37bb60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a094f5173aefba96429624eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 12:50:23 2020 +0200 winevdm: Avoid using wine_get_config_dir(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/winevdm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 64750db135..bfc47b8853 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -31,7 +31,6 @@ #include "winuser.h" #include "wincon.h" #include "wine/unicode.h" -#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -150,11 +149,12 @@ static char *find_dosbox(void) static void start_dosbox( const char *appname, const char *args ) { static const WCHAR cfgW[] = {'c','f','g',0}; - const char *config_dir = wine_get_config_dir(); + const char *home = getenv( "HOME" ); + const char *prefix = getenv( "WINEPREFIX" ); WCHAR path[MAX_PATH], config[MAX_PATH]; HANDLE file; char *p, *buffer, app[MAX_PATH]; - int i; + int i, len; int ret = 1; DWORD written, drives = GetLogicalDrives(); char *dosbox = find_dosbox(); @@ -168,9 +168,10 @@ static void start_dosbox( const char *appname, const char *args ) file = CreateFileW( config, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); if (file == INVALID_HANDLE_VALUE) return; + len = prefix ? strlen(prefix) : strlen(home) + strlen("/.wine"); buffer = HeapAlloc( GetProcessHeap(), 0, sizeof("[autoexec]") + sizeof("mount -z c") + sizeof("config -securemode") + - 25 * (strlen(config_dir) + sizeof("mount c /dosdevices/c:")) + + 25 * (len + sizeof("mount c /dosdevices/c:")) + 4 * strlenW( path ) + 6 + strlen( app ) + strlen( args ) + 20 ); p = buffer; @@ -182,8 +183,13 @@ static void start_dosbox( const char *appname, const char *args ) break; } for (i = 0; i <= 25; i++) - if (drives & (1 << i)) - p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, config_dir, 'a' + i ); + { + if (!(drives & (1 << i))) continue; + if (prefix) + p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, prefix, 'a' + i ); + else + p += sprintf( p, "mount %c %s/.wine/dosdevices/%c:\n", 'a' + i, home, 'a' + i ); + } p += sprintf( p, "%c:\ncd ", path[0] ); p += WideCharToMultiByte( CP_UNIXCP, 0, path + 2, -1, p, 4 * strlenW(path), NULL, NULL ) - 1; p += sprintf( p, "\nconfig -securemode\n" );

1 0

Alexandre Julliard : mountmgr.sys: Avoid using wine_get_config_dir().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 77bb698b325045d6d96b7e78a57e4aeb12dc5d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77bb698b325045d6d96b7e78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 13:18:55 2020 +0200 mountmgr.sys: Avoid using wine_get_config_dir(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index f68ab4de9b..a6794fa6ac 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -38,7 +38,6 @@ #include "winuser.h" #include "dbt.h" -#include "wine/library.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -131,12 +130,19 @@ static CRITICAL_SECTION device_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static char *get_dosdevices_path( char **device ) { - const char *config_dir = wine_get_config_dir(); - size_t len = strlen(config_dir) + sizeof("/dosdevices/com256"); + const char *home = getenv( "HOME" ); + const char *prefix = getenv( "WINEPREFIX" ); + size_t len = (prefix ? strlen(prefix) : strlen(home) + strlen("/.wine")) + sizeof("/dosdevices/com256"); char *path = HeapAlloc( GetProcessHeap(), 0, len ); + if (path) { - strcpy( path, config_dir ); + if (prefix) strcpy( path, prefix ); + else + { + strcpy( path, home ); + strcat( path, "/.wine" ); + } strcat( path, "/dosdevices/a::" ); *device = path + len - sizeof("com256"); } @@ -254,13 +260,20 @@ static int open_volume_file( const struct volume *volume, const char *file ) } else { - const char *config_dir = wine_get_config_dir(); + const char *home = getenv( "HOME" ); + const char *prefix = getenv( "WINEPREFIX" ); + size_t len = prefix ? strlen(prefix) : strlen(home) + strlen("/.wine"); - if (!(path = HeapAlloc( GetProcessHeap(), 0, strlen( config_dir ) - + strlen("/dosdevices/") + strlen(unix_mount) + 1 + strlen( file ) + 1 ))) + if (!(path = HeapAlloc( GetProcessHeap(), 0, len + strlen("/dosdevices/") + + strlen(unix_mount) + 1 + strlen( file ) + 1 ))) return -1; - strcpy( path, config_dir ); + if (prefix) strcpy( path, prefix ); + else + { + strcpy( path, home ); + strcat( path, "/.wine" ); + } strcat( path, "/dosdevices/" ); strcat( path, unix_mount ); }

1 0

Alexandre Julliard : libport: Remove the Windows libwine stubs.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: c56e5695a735ddec3d3c7de47d9d0e66b05a616f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56e5695a735ddec3d3c7de4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 17 14:15:04 2020 +0200 libport: Remove the Windows libwine stubs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/port/stubs.c | 59 --------------------------------------------------- 2 files changed, 60 deletions(-) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 08e143d26d..0099fd7ddd 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ statvfs.c \ string.c \ strnlen.c \ - stubs.c \ symlink.c \ usleep.c \ wctype.c diff --git a/libs/port/stubs.c b/libs/port/stubs.c deleted file mode 100644 index 1a2de3204b..0000000000 --- a/libs/port/stubs.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Win32 libwine stubs - * - * Copyright 2019 Alexandre Julliard - * - * 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 - */ - -#ifdef _WIN32 - -#include "config.h" - -#include <stdlib.h> -#include "windef.h" - -int __wine_main_argc = 0; -char **__wine_main_argv = NULL; -WCHAR **__wine_main_wargv = NULL; - -const char *wine_get_config_dir(void) -{ - const char *ret = getenv( "WINEPREFIX" ); - if (!ret) ret = getenv( "USERPROFILE" ); - return ret; -} - -const char *wine_get_data_dir(void) -{ - return NULL; -} - -const char *wine_get_build_dir(void) -{ - return NULL; -} - -const char *wine_get_user_name(void) -{ - return getenv( "USERNAME" ); -} - -const char *wine_dll_enum_load_path( unsigned int index ) -{ - return NULL; -} - -#endif /* _WIN32 */

1 0

Nikolay Sivov : ole32: Fix IMalloc::DidAlloc() return value to reflect block validity.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 08f4b6ee0a05fe27e56cb9777dce845dcf1072f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f4b6ee0a05fe27e56cb977… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 16 22:01:48 2020 +0300 ole32: Fix IMalloc::DidAlloc() return value to reflect block validity. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 59 +++++++++++++++++++++++++++++----------------- dlls/ole32/tests/compobj.c | 21 +++++++++++++++++ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 9c7cb0977f..e747cfc0fe 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -114,6 +114,20 @@ static BOOL AddMemoryLocation(LPVOID * pMem) return TRUE; } +static void** mallocspy_is_allocation_spyed(const void *mem) +{ + void **current = Malloc32.SpyedBlocks; + + while (*current != mem) + { + current++; + if (current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) + return NULL; + } + + return current; +} + static BOOL RemoveMemoryLocation(LPCVOID pMem) { LPVOID * Current; @@ -122,14 +136,8 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) return FALSE; - Current = Malloc32.SpyedBlocks; - - /* find the location */ - while (*Current != pMem) { - Current++; - if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) - return FALSE; /* not found */ - } + if (!(Current = mallocspy_is_allocation_spyed(pMem))) + return FALSE; /* location found */ Malloc32.SpyedAllocationsLeft--; @@ -313,25 +321,32 @@ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - int didAlloc; + BOOL spyed_block = FALSE; + int did_alloc; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreDidAlloc(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return -1; + + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); + } - didAlloc = -1; + did_alloc = HeapValidate(GetProcessHeap(), 0, mem); - if(Malloc32.pSpy) { - didAlloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, pv, fSpyed, didAlloc); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - return didAlloc; + if (Malloc32.pSpy) + { + did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + + return did_alloc; } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index cc2737bdd1..b0a6ba1ea7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3069,6 +3069,8 @@ static void test_CoGetMalloc(void) { IMalloc *imalloc; HRESULT hr; + char *ptr; + int ret; if (0) /* crashes on native */ hr = CoGetMalloc(0, NULL); @@ -3102,6 +3104,25 @@ static void test_CoGetMalloc(void) hr = CoGetMalloc(MEMCTX_TASK, &imalloc); ok(hr == S_OK, "got 0x%08x\n", hr); ok(imalloc != NULL, "got %p\n", imalloc); + + /* DidAlloc() */ + ptr = IMalloc_Alloc(imalloc, 16); + ok(!!ptr, "Failed to allocate block.\n"); + + ret = IMalloc_DidAlloc(imalloc, ptr); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, NULL); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, (void *)0x1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, ptr + 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + IMalloc_Free(imalloc, ptr); + IMalloc_Release(imalloc); }

1 0

Nikolay Sivov : ole32: Improve thread safety in DidAlloc().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 1e3bc9f3a61a197e794cca07a59c9497b237af62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e3bc9f3a61a197e794cca07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 16 22:01:49 2020 +0300 ole32: Improve thread safety in DidAlloc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index e747cfc0fe..410691b2a8 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -323,7 +323,7 @@ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) */ static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { - BOOL spyed_block = FALSE; + BOOL spyed_block = FALSE, spy_active = FALSE; int did_alloc; TRACE("(%p)\n", mem); @@ -335,12 +335,13 @@ static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { EnterCriticalSection(&IMalloc32_SpyCS); spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); } did_alloc = HeapValidate(GetProcessHeap(), 0, mem); - if (Malloc32.pSpy) + if (spy_active) { did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); LeaveCriticalSection(&IMalloc32_SpyCS);

1 0

Nikolay Sivov : ole32: Fix spy callback arguments for IMalloc::GetSize().
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 06d36b1adf1ae7b73a200d6a35a143f6b3fd91c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06d36b1adf1ae7b73a200d6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 16 22:01:50 2020 +0300 ole32: Fix spy callback arguments for IMalloc::GetSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 35 +++++++++++++++++++++-------------- dlls/ole32/tests/compobj.c | 8 ++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 410691b2a8..1b19be424c 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -296,26 +296,33 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) * win95: size allocated (4 byte boundaries) * win2k: size originally requested !!! (allocated on 8 byte boundaries) */ -static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *mem) { - SIZE_T cb; - BOOL fSpyed = FALSE; + BOOL spyed_block = FALSE, spy_active = FALSE; + SIZE_T size; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreGetSize(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return (SIZE_T)-1; + + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + spy_active = TRUE; + mem = IMallocSpy_PreGetSize(Malloc32.pSpy, mem, spyed_block); + } - cb = HeapSize(GetProcessHeap(),0,pv); + size = HeapSize(GetProcessHeap(), 0, mem); - if(Malloc32.pSpy) { - cb = IMallocSpy_PostGetSize(Malloc32.pSpy, cb, fSpyed); - LeaveCriticalSection(&IMalloc32_SpyCS); - } + if (spy_active) + { + size = IMallocSpy_PostGetSize(Malloc32.pSpy, size, spyed_block); + LeaveCriticalSection(&IMalloc32_SpyCS); + } - return cb; + return size; } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b0a6ba1ea7..d6ccbc5882 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3068,6 +3068,7 @@ static void test_CoWaitForMultipleHandles(void) static void test_CoGetMalloc(void) { IMalloc *imalloc; + SIZE_T size; HRESULT hr; char *ptr; int ret; @@ -3121,6 +3122,13 @@ static void test_CoGetMalloc(void) ret = IMalloc_DidAlloc(imalloc, ptr + 4); ok(ret == 0, "Unexpected return value %d.\n", ret); + /* GetSize() */ + size = IMalloc_GetSize(imalloc, NULL); + ok(size == (SIZE_T)-1, "Unexpected return value.\n"); + + size = IMalloc_GetSize(imalloc, ptr); + ok(size == 16, "Unexpected return value.\n"); + IMalloc_Free(imalloc, ptr); IMalloc_Release(imalloc);

1 0

Dmitry Timoshkov : wldap32: Implement ldap_search_init_pageW.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: 6e459129e7680156d3821539ce48acca1e1d95d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e459129e7680156d3821539… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 17 17:11:54 2020 +0800 wldap32: Implement ldap_search_init_pageW. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 11 ++++++- dlls/wldap32/wldap32.h | 70 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..d2d86e34af 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -281,7 +281,67 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); +#ifdef HAVE_LDAP + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (dn) + { + search->dn = strdupW( dn ); + if (!search->dn) goto fail; + } + if (filter) + { + search->filter = strdupW( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarraydupW( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controldupW( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarraydupW( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..6903505096 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + WCHAR *dn, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControlW **serverctrls; + LDAPControlW **clientctrls; + struct l_timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index c329a5b76b..537de67a87 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -241,6 +241,26 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) return strarrayW; } +static inline LPWSTR *strarraydupW( LPWSTR *strarray ) +{ + LPWSTR *strarrayW = NULL; + DWORD size; + + if (strarray) + { + size = sizeof(WCHAR*) * (strarraylenW( strarray ) + 1); + if ((strarrayW = heap_alloc( size ))) + { + LPWSTR *p = strarray; + LPWSTR *q = strarrayW; + + while (*p) *q++ = strdupW( *p++ ); + *q = NULL; + } + } + return strarrayW; +} + static inline void strarrayfreeA( LPSTR *strarray ) { if (strarray) @@ -546,8 +566,34 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) } controlW->ldctl_oid = strUtoW( control->ldctl_oid ); - controlW->ldctl_value.bv_len = len; - controlW->ldctl_value.bv_val = val; + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + + return controlW; +} + +static inline LDAPControlW *controldupW( LDAPControlW *control ) +{ + LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + if (!(val = heap_alloc( len ))) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } + + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) + { + heap_free( val ); + return NULL; + } + + controlW->ldctl_oid = strdupW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; return controlW; @@ -684,6 +730,26 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) return controlarrayW; } +static inline LDAPControlW **controlarraydupW( LDAPControlW **controlarray ) +{ + LDAPControlW **controlarrayW = NULL; + DWORD size; + + if (controlarray) + { + size = sizeof(LDAPControlW*) * (controlarraylenW( controlarray ) + 1); + if ((controlarrayW = heap_alloc( size ))) + { + LDAPControlW **p = controlarray; + LDAPControlW **q = controlarrayW; + + while (*p) *q++ = controldupW( *p++ ); + *q = NULL; + } + } + return controlarrayW; +} + static inline void controlarrayfreeA( LDAPControlA **controlarray ) { if (controlarray)

1 0

Zebediah Figura : wineusb.inf: Add new INF file.
by Alexandre Julliard 17 Apr '20

17 Apr '20

Module: wine Branch: master Commit: dc62d848284de0c3506279747f6ca504efb53a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc62d848284de0c350627974… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 16 19:58:18 2020 -0500 wineusb.inf: Add new INF file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/Makefile.in | 3 ++- loader/wine.inf.in | 1 + loader/wineusb.inf.in | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index f9b2fa9293..f76b7c6d64 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -10,7 +10,8 @@ SOURCES = \ wine.pl.UTF-8.man.in \ wine_info.plist.in \ winebus.inf.in \ - winehid.inf.in + winehid.inf.in \ + wineusb.inf.in PROGRAMS = $(WINELOADER_PROGRAMS) INSTALL_LIB = $(WINELOADER_PROGRAMS) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e1546713db..91eb68e6d5 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3851,6 +3851,7 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [InfFiles] winebus.inf winehid.inf +wineusb.inf [NlsFiles] c_037.nls diff --git a/loader/wineusb.inf.in b/loader/wineusb.inf.in new file mode 100644 index 0000000000..be01f00296 --- /dev/null +++ b/loader/wineusb.inf.in @@ -0,0 +1,22 @@ +[Version] +Signature="$CHICAGO$" +ClassGuid={4d36e97d-e325-11ce-bfc1-08002be10318} +Class=System + +[Manufacturer] +Wine=mfg_section + +[mfg_section] +Wine USB bus driver=device_section,root\wineusb + +[device_section.Services] +AddService = wineusb,0x2,svc_section + +[svc_section] +Description="Wine USB bus driver" +DisplayName="Wine USB bus" +ServiceBinary="%12%\wineusb.sys" +LoadOrderGroup="WinePlugPlay" +ServiceType=1 +StartType=3 +ErrorControl=1

1 0