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

Jacek Caban : cscript: Share sources with wscript.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: e9aae93a6b16acd784126c86565aa8997185259c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9aae93a6b16acd784126c865… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 14 13:15:02 2014 +0200 cscript: Share sources with wscript. --- programs/cscript/Makefile.in | 7 +++++ programs/cscript/main.c | 61 ------------------------------------------ programs/wscript/host.c | 8 +++++- tools/make_makefiles | 1 + 4 files changed, 15 insertions(+), 62 deletions(-) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in index 9608ee6..0a47509 100644 --- a/programs/cscript/Makefile.in +++ b/programs/cscript/Makefile.in @@ -1,5 +1,12 @@ MODULE = cscript.exe APPMODE = -mwindows -municode +IMPORTS = uuid shell32 oleaut32 ole32 advapi32 +EXTRADEFS = -DCSCRIPT_BUILD +PARENTSRC = ../wscript C_SRCS = \ + arguments.c \ + host.c \ main.c + +IDL_SRCS = ihost.idl diff --git a/programs/cscript/main.c b/programs/cscript/main.c deleted file mode 100644 index 04ee272..0000000 --- a/programs/cscript/main.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * CSCRIPT Implementation - * - * Copyright 2011 André Hentschel - * - * 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 WIN32_LEAN_AND_MEAN -#include <stdio.h> -#include <windows.h> -#include <winbase.h> - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(cscript); - -int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) -{ - static const WCHAR wscriptW[] = {'\\','w','s','c','r','i','p','t','.','e','x','e',0}; - static const WCHAR parbW[] = {' ','/','B',' ',0}; - WCHAR app[MAX_PATH]; - WCHAR cmd[MAX_PATH]; - PROCESS_INFORMATION pi; - BOOL ret; - DWORD exitcode; - STARTUPINFOW si = { sizeof(si) }; - - WINE_FIXME("(%p %p %s %x) forwarding to wscript\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); - - GetSystemDirectoryW(app, MAX_PATH); - strcatW(app, wscriptW); - strcpyW(cmd, app); - strcatW(cmd, parbW); - strcatW(cmd, cmdline); - - if (!CreateProcessW(app, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return 1; - WaitForSingleObject( pi.hProcess, INFINITE ); - - ret = GetExitCodeProcess(pi.hProcess, &exitcode); - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - - if (ret) - return exitcode; - else - return 1; -} diff --git a/programs/wscript/host.c b/programs/wscript/host.c index b7b94a2..2a47ed8 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -34,7 +34,13 @@ static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; -VARIANT_BOOL wshInteractive = VARIANT_TRUE; + +VARIANT_BOOL wshInteractive = +#ifndef CSCRIPT_BUILD + VARIANT_TRUE; +#else + VARIANT_FALSE; +#endif WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/tools/make_makefiles b/tools/make_makefiles index 7643dd4..861023a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -448,6 +448,7 @@ sub assign_sources_to_makefiles(@) my $parent = get_parent_makefile( $file ); next unless $parent; preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); }

1 0

Akihiro Sagawa : ntdll: Add %gs support for NetBSD.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: e67f84122d113db4c2c734d392ed1f91b92fa7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67f84122d113db4c2c734d39… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 14 00:08:31 2014 +0900 ntdll: Add %gs support for NetBSD. --- dlls/ntdll/signal_x86_64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index dbef828..c6e9a9b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2519,6 +2519,8 @@ void signal_init_thread( TEB *teb ) arch_prctl( ARCH_SET_GS, teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); +#elif defined(__NetBSD__) + sysarch( X86_64_SET_GSBASE, &teb ); #else # error Please define setting %gs for your architecture #endif

1 0

Akihiro Sagawa : msvcrt: Add MBCS handling for _splitpath.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: ab5db46477dff9fc46773f1e2c5e497ef6a97743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5db46477dff9fc46773f1e2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 14 00:08:33 2014 +0900 msvcrt: Add MBCS handling for _splitpath. --- dlls/msvcrt/dir.c | 10 +++++++++- dlls/msvcrt/tests/dir.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index fa87ac1..d6dd661 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1059,7 +1059,15 @@ int CDECL _splitpath_s(const char* inpath, /* look for end of directory part */ end = NULL; - for (p = inpath; *p; p++) if (*p == '/' || *p == '\\') end = p + 1; + for (p = inpath; *p; p++) + { + if (_ismbblead((unsigned char)*p)) + { + p++; + continue; + } + if (*p == '/' || *p == '\\') end = p + 1; + } if (end) /* got a directory */ { diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index fa19e1e..aa273ea 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -25,6 +25,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <io.h> +#include <mbctype.h> #include <windef.h> #include <winbase.h> #include <winnls.h> @@ -390,6 +391,31 @@ static void test_fullpath(void) RemoveDirectoryA(level1); } +static void test_splitpath(void) +{ + const char* path = "c:\\\x83\x5c\x83\x74\x83\x67.bin"; + char drive[3], dir[MAX_PATH], fname[MAX_PATH], ext[MAX_PATH]; + int prev_cp = _getmbcp(); + + /* SBCS codepage */ + _setmbcp(1252); + _splitpath(path, drive, dir, fname, ext); + ok(!strcmp(drive, "c:"), "got %s\n", drive); + ok(!strcmp(dir, "\\\x83\x5c"), "got %s\n", dir); + ok(!strcmp(fname, "\x83\x74\x83\x67"), "got %s\n", fname); + ok(!strcmp(ext, ".bin"), "got %s\n", ext); + + /* MBCS (Japanese) codepage */ + _setmbcp(932); + _splitpath(path, drive, dir, fname, ext); + ok(!strcmp(drive, "c:"), "got %s\n", drive); + ok(!strcmp(dir, "\\"), "got %s\n", dir); + ok(!strcmp(fname, "\x83\x5c\x83\x74\x83\x67"), "got %s\n", fname); + ok(!strcmp(ext, ".bin"), "got %s\n", ext); + + _setmbcp(prev_cp); +} + START_TEST(dir) { init(); @@ -397,4 +423,5 @@ START_TEST(dir) test_fullpath(); test_makepath(); test_makepath_s(); + test_splitpath(); }

1 0

Dmitry Timoshkov : secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 8df047987012ff290a789911692a23d9a248dc56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df047987012ff290a7899116… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Apr 12 15:24:20 2014 +0900 secur32: Also recognize samba4 failure message if ntlm_auth could not connect to winbindd. --- dlls/secur32/ntlm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index fdd88c0..5914fbc 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1226,11 +1226,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( } else { - size_t ntlm_pipe_err_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v3_len = strlen("BH NT_STATUS_ACCESS_DENIED"); + size_t ntlm_pipe_err_v4_len = strlen("BH NT_STATUS_UNSUCCESSFUL"); - if( (buffer_len >= ntlm_pipe_err_len) && - (strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", - ntlm_pipe_err_len) == 0)) + if( (buffer_len >= ntlm_pipe_err_v3_len && + strncmp(buffer, "BH NT_STATUS_ACCESS_DENIED", ntlm_pipe_err_v3_len) == 0) || + (buffer_len >= ntlm_pipe_err_v4_len && + strncmp(buffer, "BH NT_STATUS_UNSUCCESSFUL", ntlm_pipe_err_v4_len) == 0) ) { TRACE("Connection to winbindd failed\n"); ret = SEC_E_LOGON_DENIED;

1 0

Vincent Povirk : gdiplus: Prevent NULL StringFormat in gdip_format_string.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 4def66c11c92fc229cb7e47781dbdadb3c8344ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4def66c11c92fc229cb7e4778… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 14 11:44:20 2014 -0500 gdiplus: Prevent NULL StringFormat in gdip_format_string. --- dlls/gdiplus/graphics.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 56d785e..861d160 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4392,12 +4392,24 @@ GpStatus gdip_format_string(HDC hdc, INT hotkeyprefix_count=0; INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; BOOL seen_prefix = FALSE; + GpStringFormat *dyn_format=NULL; if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; + if (!format) + { + stat = GdipStringFormatGetGenericDefault(&dyn_format); + if (stat != Ok) + { + GdipFree(stringdup); + return stat; + } + format = dyn_format; + } + nwidth = rect->Width; nheight = rect->Height; if (ignore_empty_clip) @@ -4406,10 +4418,7 @@ GpStatus gdip_format_string(HDC hdc, if (!nheight) nheight = INT_MAX; } - if (format) - hkprefix = format->hkprefix; - else - hkprefix = HotkeyPrefixNone; + hkprefix = format->hkprefix; if (hkprefix == HotkeyPrefixShow) { @@ -4450,8 +4459,7 @@ GpStatus gdip_format_string(HDC hdc, length = j; - if (format) halign = format->align; - else halign = StringAlignmentNear; + halign = format->align; while(sum < length){ GetTextExtentExPointW(hdc, stringdup + sum, length - sum, @@ -4544,13 +4552,13 @@ GpStatus gdip_format_string(HDC hdc, break; /* Stop if this was a linewrap (but not if it was a linebreak). */ - if ((lret == fitcpy) && format && - (format->attr & StringFormatFlagsNoWrap)) + if ((lret == fitcpy) && (format->attr & StringFormatFlagsNoWrap)) break; } GdipFree(stringdup); GdipFree(hotkeyprefix_offsets); + GdipDeleteStringFormat(dyn_format); return stat; }

1 0

Nikolay Sivov : winhttp: Use proper deallocator (Coverity).
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 2c880e52714bed424cbf44fd9d2e14776bfce9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c880e52714bed424cbf44fd9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 19:10:23 2014 +0400 winhttp: Use proper deallocator (Coverity). --- dlls/winhttp/session.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 97e763e..ebbec2e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1612,11 +1612,11 @@ done: heap_free( hdr ); if (!ret) { - heap_free( config->lpszAutoConfigUrl ); + GlobalFree( config->lpszAutoConfigUrl ); config->lpszAutoConfigUrl = NULL; - heap_free( config->lpszProxy ); + GlobalFree( config->lpszProxy ); config->lpszProxy = NULL; - heap_free( config->lpszProxyBypass ); + GlobalFree( config->lpszProxyBypass ); config->lpszProxyBypass = NULL; } return ret;

1 0

Alexandre Julliard : gdi32: Pass the full DC handle to the hook in DeleteDC.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 955676bc05aa59315ffc1daf8b1b446716089d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=955676bc05aa59315ffc1daf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 09:37:52 2014 +0200 gdi32: Pass the full DC handle to the hook in DeleteDC. --- dlls/gdi32/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9500de2..5146f5b 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -807,7 +807,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) } /* Call hook procedure to check whether is it OK to delete this DC */ - if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) + if (dc->hookProc && !dc->hookProc( dc->hSelf, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); return TRUE;

1 0

Ken Thomases : dinput: Rename identifiers to get rid of Hungarian notation and deceptive names in Mac code.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: d0535334444823db38c2eaaacf18dd5fcc8776c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0535334444823db38c2eaaac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:03 2014 -0500 dinput: Rename identifiers to get rid of Hungarian notation and deceptive names in Mac code. --- dlls/dinput/joystick_osx.c | 263 +++++++++++++++++++++----------------------- 1 file changed, 128 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0535334444823db38c2e…

1 0

Ken Thomases : dinput: Fix check of wrong result value due to copy/ paste error.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: 4637b607b2477f3c8b71724c3dbafe11e3decf17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4637b607b2477f3c8b71724c3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:08 2014 -0500 dinput: Fix check of wrong result value due to copy/paste error. --- dlls/dinput/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e26ee05..e5a6034 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -219,7 +219,7 @@ static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) } location_id = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDLocationIDKey)); - if(!matching){ + if(!location_id){ CFRelease(matching); WARN("IOHIDDeviceGetProperty failed, force feedback disabled\n"); return DIERR_DEVICENOTREG;

1 0

Ken Thomases : dinput: Use the proper mutable Core Foundation types for mutable collections and avoid casting.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Module: wine Branch: master Commit: bf938311a29eb66d158d4a365bfad54a3fc01e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf938311a29eb66d158d4a365… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 13 18:34:11 2014 -0500 dinput: Use the proper mutable Core Foundation types for mutable collections and avoid casting. --- dlls/dinput/joystick_osx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e5a6034..1d7e970 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -96,7 +96,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); static IOHIDManagerRef hid_manager = NULL; -static CFArrayRef device_main_elements = NULL; +static CFMutableArrayRef device_main_elements = NULL; typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; @@ -283,7 +283,7 @@ static CFMutableDictionaryRef create_osx_device_match(int usage) return result; } -static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_elements) +static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_elements) { CFArrayRef elements; CFIndex total = 0; @@ -310,7 +310,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_element if (usage_page == kHIDPage_GenericDesktop && (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad)) { - CFArrayAppendValue((CFMutableArrayRef)main_elements, element); + CFArrayAppendValue(main_elements, element); total++; } } @@ -319,7 +319,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFArrayRef main_element return total; } -static void get_element_children(IOHIDElementRef element, CFArrayRef all_children) +static void get_element_children(IOHIDElementRef element, CFMutableArrayRef all_children) { CFIndex idx, cnt; CFArrayRef element_children = IOHIDElementGetChildren(element); @@ -337,7 +337,7 @@ static void get_element_children(IOHIDElementRef element, CFArrayRef all_childre if (IOHIDElementGetType(child) == kIOHIDElementTypeCollection) get_element_children(child, all_children); else - CFArrayAppendValue((CFMutableArrayRef)all_children, child); + CFArrayAppendValue(all_children, child); } } @@ -345,7 +345,7 @@ static int find_osx_devices(void) { CFMutableDictionaryRef result; CFSetRef devset; - CFArrayRef matching; + CFMutableArrayRef matching; hid_manager = IOHIDManagerCreate( kCFAllocatorDefault, 0L ); if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) @@ -364,14 +364,14 @@ static int find_osx_devices(void) CFRelease(matching); return 0; } - CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); + CFArrayAppendValue( matching, result ); result = create_osx_device_match(kHIDUsage_GD_GamePad); if (!result) { CFRelease(matching); return 0; } - CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); + CFArrayAppendValue( matching, result ); IOHIDManagerSetDeviceMatchingMultiple( hid_manager, matching); devset = IOHIDManagerCopyDevices( hid_manager ); @@ -458,7 +458,7 @@ static void insert_sort_button(int header, IOHIDElementRef element, static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDElementRef device_main_element; - CFArrayRef elements; + CFMutableArrayRef elements; DWORD axes = 0; DWORD sliders = 0; DWORD buttons = 0;

1 0