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

Hans Leidekker : wldap32: Move support for init functions to the Unix library.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: b2ac9f4b751269c179f0f10ec9ec943590a403a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2ac9f4b751269c179f0f10e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:14 2021 +0200 wldap32: Move support for init functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 218 ++++++++++------------------------------- dlls/wldap32/libldap.c | 18 ++++ dlls/wldap32/libldap.h | 6 ++ dlls/wldap32/winldap_private.h | 4 + 4 files changed, 78 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2ac9f4b751269c179f0…

1 0

Hans Leidekker : wldap32: Move support for modify functions to the Unix library.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 512a51825fd753fa19cba4751adda2935c4d7a27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=512a51825fd753fa19cba475… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:15 2021 +0200 wldap32: Move support for modify functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 23 ++++- dlls/wldap32/libldap.h | 6 ++ dlls/wldap32/modify.c | 275 ++++++++++--------------------------------------- 3 files changed, 82 insertions(+), 222 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=512a51825fd753fa19cb…

1 0

Hans Leidekker : wldap32: Move support for modrdn functions to the Unix library.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: d48a9495ce2379e919dceab9e7085cd7946a11e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48a9495ce2379e919dceab9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:16 2021 +0200 wldap32: Move support for modrdn functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 16 ++++ dlls/wldap32/libldap.h | 7 ++ dlls/wldap32/modrdn.c | 199 +++++++++---------------------------------------- 3 files changed, 60 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d48a9495ce2379e919dc…

1 0

Hans Leidekker : wldap32: Move support for option functions to the Unix library.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: da4d701bb795233a971016d5bdc824b5738fc49b URL: https://source.winehq.org/git/wine.git/?a=commit;h=da4d701bb795233a971016d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:17 2021 +0200 wldap32: Move support for option functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 20 +++++ dlls/wldap32/libldap.h | 23 ++++++ dlls/wldap32/option.c | 170 +++++++++++++++-------------------------- dlls/wldap32/winldap_private.h | 7 ++ 4 files changed, 112 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da4d701bb795233a9710…

1 0

Hans Leidekker : wldap32: Move support for page functions to the Unix library.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 1c5b3f20015f379bbdfa9554fc4c9911062770ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5b3f20015f379bbdfa9554… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 16 09:59:18 2021 +0200 wldap32: Move support for page functions to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 2 +- dlls/wldap32/page.c | 281 ++++++++++++++--------------------------- dlls/wldap32/winldap_private.h | 76 +++++++++++ 3 files changed, 169 insertions(+), 190 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5b3f20015f379bbdfa…

1 0

Alexandre Julliard : uninstaller: Restart 64-bit version from the system32 directory.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: ba713a8cf0c6b0dda0c6828a191dcf7b7acd22e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba713a8cf0c6b0dda0c6828a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:06 2021 +0200 uninstaller: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 7236f1689e5..42aa53631f1 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -161,7 +161,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + wcscat( filename, L"\\uninstaller.exe" ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : wineboot: Restart 64-bit version from the system32 directory.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 59165212ca6afec1c2ab2fff727c4013e934fc2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=59165212ca6afec1c2ab2fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:22 2021 +0200 wineboot: Restart 64-bit version from the system32 directory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51006 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 9427448b612..3dfa39ad7c0 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -1624,7 +1624,8 @@ int __cdecl main( int argc, char *argv[] ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + wcscat( filename, L"\\wineboot.exe" ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : winecfg: Restart 64-bit version from the system32 directory.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: d30b39edbf4644dc330e4b381a00c69e030f2893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30b39edbf4644dc330e4b38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:33 2021 +0200 winecfg: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 9b30ed6e8e0..358b63c00a0 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -230,6 +230,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { + static const WCHAR winecfgW[] = {'\\','w','i','n','e','c','f','g','.','e','x','e',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR filename[MAX_PATH]; @@ -238,7 +239,8 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + lstrcatW( filename, winecfgW ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : winedbg: Restart 64-bit version from the system32 directory.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: 9dcdb90f42bc437b80169d913b07ef2cb730fef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dcdb90f42bc437b80169d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:39 2021 +0200 winedbg: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 838089e8628..5e433bbb699 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -640,6 +640,7 @@ static void restart_if_wow64(void) if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) { + static const WCHAR winedbgW[] = {'\\','w','i','n','e','d','b','g','.','e','x','e',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR filename[MAX_PATH]; @@ -648,7 +649,8 @@ static void restart_if_wow64(void) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetModuleFileNameW( 0, filename, MAX_PATH ); + GetSystemDirectoryW( filename, MAX_PATH ); + lstrcatW( filename, winedbgW ); Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))

1 0

Alexandre Julliard : wusa: Restart 64-bit version from the system32 directory.
by Alexandre Julliard 16 Apr '21

16 Apr '21

Module: wine Branch: master Commit: c5c610e3640b0613ffb7ea074b848380e88db909 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c610e3640b0613ffb7ea07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 16 11:11:44 2021 +0200 wusa: Restart 64-bit version from the system32 directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index 49e7dc75302..bcb795a80fa 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1023,7 +1023,8 @@ static void restart_as_x86_64(void) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - GetModuleFileNameW(0, filename, MAX_PATH); + GetSystemDirectoryW( filename, MAX_PATH ); + wcscat( filename, L"\\wusa.exe" ); Wow64DisableWow64FsRedirection(&redir); if (CreateProcessW(filename, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))

1 0