November 2013 - Wine-commits

Ken Thomases : winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: de3fb34af7dbb4a8f73ac4489a02ec2225979d00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3fb34af7dbb4a8f73ac4489… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 16:54:53 2013 -0500 winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa. The Mac driver was already sending these events when the user resizes the window by dragging its corner/edges, but there are other occasions when the window frame changes. For example, when the user zooms the window. --- dlls/winemac.drv/cocoa_window.m | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 6 ++++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b81de72..51bcaea 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1718,6 +1718,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif event = macdrv_create_event(WINDOW_FRAME_CHANGED, self); event->window_frame_changed.frame = NSRectToCGRect(frame); event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0; + event->window_frame_changed.in_resize = [self inLiveResize]; [queue postEvent:event]; macdrv_release_event(event); diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index f714cc5..7bc021c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -275,6 +275,7 @@ typedef struct macdrv_event { struct { CGRect frame; int fullscreen; + int in_resize; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4e132fa..75fd523 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1718,7 +1718,13 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (event->window_frame_changed.fullscreen) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) + { + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); + if (!event->window_frame_changed.in_resize) + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); + } }

1 0

Ken Thomases : winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 83f6470c0e325f8e25062eeb21fa2ffc0dbaa50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f6470c0e325f8e25062eeb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:42 2013 -0500 winemac: Convert the QUERY_RESIZE_END query to an event, WINDOW_RESIZE_ENDED. Queries can be run out of order because the main thread is waiting on the response. The main thread didn't really need a response from QUERY_RESIZE_END. It was only a query for symmetry with QUERY_RESIZE_START. --- dlls/winemac.drv/cocoa_window.m | 9 +++------ dlls/winemac.drv/event.c | 9 +++++---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 25 ++++++++++++------------- 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 51bcaea..dbac40a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1639,12 +1639,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) windowDidEndLiveResize:(NSNotification *)notification { - macdrv_query* query = macdrv_create_query(); - query->type = QUERY_RESIZE_END; - query->window = (macdrv_window)[self retain]; - - [self.queue query:query timeout:0.3]; - macdrv_release_query(query); + macdrv_event* event = macdrv_create_event(WINDOW_RESIZE_ENDED, self); + [queue postEvent:event]; + macdrv_release_event(event); self.liveResizeDisplayTimer = nil; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 5803ac7..77df582 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -55,6 +55,7 @@ static const char *dbgstr_event(int type) "WINDOW_GOT_FOCUS", "WINDOW_LOST_FOCUS", "WINDOW_MINIMIZE_REQUESTED", + "WINDOW_RESIZE_ENDED", }; if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; @@ -114,6 +115,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) event_mask |= event_mask_for_type(RELEASE_CAPTURE); event_mask |= event_mask_for_type(WINDOW_BROUGHT_FORWARD); event_mask |= event_mask_for_type(WINDOW_MINIMIZE_REQUESTED); + event_mask |= event_mask_for_type(WINDOW_RESIZE_ENDED); } return event_mask; @@ -152,10 +154,6 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; - case QUERY_RESIZE_END: - TRACE("QUERY_RESIZE_END\n"); - success = query_resize_end(hwnd); - break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); @@ -257,6 +255,9 @@ void macdrv_handle_event(const macdrv_event *event) case WINDOW_MINIMIZE_REQUESTED: macdrv_window_minimize_requested(hwnd); break; + case WINDOW_RESIZE_ENDED: + macdrv_window_resize_ended(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 362d5ea..d49a3c0 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -165,7 +165,7 @@ extern void macdrv_app_quit_requested(const macdrv_event *event) DECLSPEC_HIDDEN extern void macdrv_window_minimize_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_brought_forward(HWND hwnd) DECLSPEC_HIDDEN; -extern BOOL query_resize_end(HWND hwnd) DECLSPEC_HIDDEN; +extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 7bc021c..e0c4f29 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -194,6 +194,7 @@ enum { WINDOW_GOT_FOCUS, WINDOW_LOST_FOCUS, WINDOW_MINIMIZE_REQUESTED, + WINDOW_RESIZE_ENDED, NUM_EVENT_TYPES }; @@ -290,7 +291,6 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, - QUERY_RESIZE_END, QUERY_RESIZE_START, QUERY_MIN_MAX_INFO, NUM_QUERY_TYPES diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 75fd523..feb4166 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1898,6 +1898,18 @@ void macdrv_window_brought_forward(HWND hwnd) } +/*********************************************************************** + * macdrv_window_resize_ended + * + * Handler for WINDOW_RESIZE_ENDED events. + */ +void macdrv_window_resize_ended(HWND hwnd) +{ + TRACE("hwnd %p\n", hwnd); + SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); +} + + struct quit_info { HWND *wins; UINT capacity; @@ -2082,19 +2094,6 @@ BOOL query_resize_start(HWND hwnd) /*********************************************************************** - * query_resize_end - * - * Handler for QUERY_RESIZE_END query. - */ -BOOL query_resize_end(HWND hwnd) -{ - TRACE("hwnd %p\n", hwnd); - SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); - return TRUE; -} - - -/*********************************************************************** * query_min_max_info * * Handler for QUERY_MIN_MAX_INFO query.

1 0

Ken Thomases : winemac: Trace flags of WINDOW_FRAME_CHANGED events.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 8e1fdb845e284f6aad436330bc1bb77506635e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1fdb845e284f6aad436330b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 31 19:16:44 2013 -0500 winemac: Trace flags of WINDOW_FRAME_CHANGED events. --- dlls/winemac.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index feb4166..3d92481 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1689,8 +1689,9 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) parent = GetAncestor(hwnd, GA_PARENT); - TRACE("win %p/%p new Cocoa frame %s\n", hwnd, data->cocoa_window, - wine_dbgstr_cgrect(event->window_frame_changed.frame)); + TRACE("win %p/%p new Cocoa frame %s fullscreen %d in_resize %d\n", hwnd, data->cocoa_window, + wine_dbgstr_cgrect(event->window_frame_changed.frame), + event->window_frame_changed.fullscreen, event->window_frame_changed.in_resize); rect = rect_from_cgrect(event->window_frame_changed.frame); macdrv_mac_to_window_rect(data, &rect);

1 0

Frédéric Delanoy : eject: Use BOOL type where appropriate.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 423d66195b29be310332154caf8d1e9523624e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423d66195b29be310332154ca… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:22 2013 +0100 eject: Use BOOL type where appropriate. --- programs/eject/eject.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 02ff4ba..483ac21 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -33,8 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(eject); /* options */ -static int unmount_only; -static int eject_all; +static BOOL unmount_only; +static BOOL eject_all; /* wrapper for GetDriveTypeW */ static DWORD get_drive_type( WCHAR drive ) @@ -134,8 +134,8 @@ static void parse_options( int *argc, char *argv[] ) } for (opt = argv[i] + 1; *opt; opt++) switch(*opt) { - case 'a': eject_all = 1; break; - case 'u': unmount_only = 1; break; + case 'a': eject_all = TRUE; break; + case 'u': unmount_only = TRUE; break; case 'h': usage(); break; default: WINE_MESSAGE( "Unknown option -%c\n", *opt );

1 0

Frédéric Delanoy : imm32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 45eff32ad0bf121771b9b4b57446244e3fb82d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45eff32ad0bf121771b9b4b57… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:23 2013 +0100 imm32/tests: Use BOOL type where appropriate. --- dlls/imm32/tests/imm32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a37190c..7275fe3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -797,7 +797,8 @@ static void test_ImmGetIMCLockCount(void) static void test_ImmGetIMCCLockCount(void) { HIMCC imcc; - DWORD count, g_count, ret, i; + DWORD count, g_count, i; + BOOL ret; VOID *p; imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO));

1 0

Frédéric Delanoy : ntdll: Use BOOL type where appropriate.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 7e63200672869e55d57eecbabd693fafd438851a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e63200672869e55d57eecbab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:24 2013 +0100 ntdll: Use BOOL type where appropriate. --- dlls/ntdll/file.c | 18 +++++++++--------- dlls/ntdll/rtlstr.c | 8 ++++---- dlls/ntdll/signal_i386.c | 4 ++-- dlls/ntdll/string.c | 4 ++-- dlls/ntdll/wcstring.c | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index bd9516d..1de2c61 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -115,7 +115,7 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT ULONG options, PVOID ea_buffer, ULONG ea_length ) { ANSI_STRING unix_name; - int created = FALSE; + BOOL created = FALSE; TRACE("handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p " "attr=%08x sharing=%08x disp=%d options=%08x ea=%p.0x%08x\n", @@ -586,14 +586,14 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, PIO_STATUS_BLOCK io_status, void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, timeout_init_done = 0; + int result, unix_handle, needs_close; unsigned int options; struct io_timeouts timeouts; NTSTATUS status; ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_read; + BOOL send_completion = FALSE, async_read, timeout_init_done = FALSE; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -733,7 +733,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (!timeout_init_done) { - timeout_init_done = 1; + timeout_init_done = TRUE; if ((status = get_io_timeouts( hFile, type, length, TRUE, &timeouts ))) goto err; if (hEvent) NtResetEvent( hEvent, NULL ); @@ -965,14 +965,14 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, const void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, timeout_init_done = 0; + int result, unix_handle, needs_close; unsigned int options; struct io_timeouts timeouts; NTSTATUS status; ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_write, append_write = FALSE; + BOOL send_completion = FALSE, async_write, append_write = FALSE, timeout_init_done = FALSE; LARGE_INTEGER offset_eof; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", @@ -1133,7 +1133,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (!timeout_init_done) { - timeout_init_done = 1; + timeout_init_done = TRUE; if ((status = get_io_timeouts( hFile, type, length, FALSE, &timeouts ))) goto err; if (hEvent) NtResetEvent( hEvent, NULL ); @@ -2498,13 +2498,13 @@ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, co } #endif -static inline int is_device_placeholder( int fd ) +static inline BOOL is_device_placeholder( int fd ) { static const char wine_placeholder[] = "Wine device placeholder"; char buffer[sizeof(wine_placeholder)-1]; if (pread( fd, buffer, sizeof(wine_placeholder) - 1, 0 ) != sizeof(wine_placeholder) - 1) - return 0; + return FALSE; return !memcmp( buffer, wine_placeholder, sizeof(wine_placeholder) - 1 ); } diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index b092772..01b4446 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1723,7 +1723,7 @@ NTSTATUS WINAPI RtlCharToInteger( CHAR chCurrent; int digit; ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (*str != '\0' && *str <= ' ') { str++; @@ -1732,7 +1732,7 @@ NTSTATUS WINAPI RtlCharToInteger( if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ @@ -1877,7 +1877,7 @@ NTSTATUS WINAPI RtlUnicodeStringToInteger( WCHAR wchCurrent; int digit; ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (CharsRemaining >= 1 && *lpwstr <= ' ') { lpwstr++; @@ -1889,7 +1889,7 @@ NTSTATUS WINAPI RtlUnicodeStringToInteger( lpwstr++; CharsRemaining--; } else if (*lpwstr == '-') { - bMinus = 1; + bMinus = TRUE; lpwstr++; CharsRemaining--; } /* if */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b29405b..fe6d517 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -448,7 +448,7 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -static int fpux_support; /* whether the CPU support extended fpu context */ +static BOOL fpux_support; /* whether the CPU supports extended fpu context */ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); @@ -1126,7 +1126,7 @@ static inline void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext, { context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); - fpux_support = 1; + fpux_support = TRUE; if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); } if (!fpu && !fpux) save_fpu( context ); diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e7a1a61..2a006f1 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -734,7 +734,7 @@ char * __cdecl _i64toa( LONGLONG __cdecl _atoi64( const char *str ) { ULONGLONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (*str == ' ' || (*str >= '\011' && *str <= '\015')) { str++; @@ -743,7 +743,7 @@ LONGLONG __cdecl _atoi64( const char *str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 7f0035d..acdb33a 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -640,7 +640,7 @@ LPWSTR __cdecl _i64tow( LONG __cdecl _wtol( LPCWSTR str ) { ULONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (isspaceW(*str)) { str++; @@ -649,7 +649,7 @@ LONG __cdecl _wtol( LPCWSTR str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */ @@ -703,7 +703,7 @@ int __cdecl _wtoi( LPCWSTR str ) LONGLONG __cdecl _wtoi64( LPCWSTR str ) { ULONGLONG RunningTotal = 0; - char bMinus = 0; + BOOL bMinus = FALSE; while (isspaceW(*str)) { str++; @@ -712,7 +712,7 @@ LONGLONG __cdecl _wtoi64( LPCWSTR str ) if (*str == '+') { str++; } else if (*str == '-') { - bMinus = 1; + bMinus = TRUE; str++; } /* if */

1 0

Frédéric Delanoy : imagehlp/tests: Use BOOL type where appropriate.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: abd0c343fcee21a36ffe0e6567b6e351b8fc65c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd0c343fcee21a36ffe0e656… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:25 2013 +0100 imagehlp/tests: Use BOOL type where appropriate. --- dlls/imagehlp/tests/integrity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index c29eea8..025e20f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -178,7 +178,8 @@ static void test_get_certificate(char *cert_data, int index) HANDLE hFile; LPWIN_CERTIFICATE cert; DWORD cert_len = 0; - DWORD err, ret; + DWORD err; + BOOL ret; hFile = CreateFileA(test_dll_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Frédéric Delanoy : msiexec: Use BOOL type where appropriate.
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: a24081a70382741e682c26e65c6fff51b69973bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24081a70382741e682c26e65… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 1 00:21:26 2013 +0100 msiexec: Use BOOL type where appropriate. --- programs/msiexec/msiexec.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 1b688a5..e76b526 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -422,11 +422,12 @@ static int chomp( WCHAR *str ) { enum chomp_state state = cs_token; WCHAR *p, *out; - int count = 1, ignore; + int count = 1; + BOOL ignore; for( p = str, out = str; *p; p++ ) { - ignore = 1; + ignore = TRUE; switch( state ) { case cs_whitespace: @@ -440,7 +441,7 @@ static int chomp( WCHAR *str ) break; default: count++; - ignore = 0; + ignore = FALSE; state = cs_token; } break; @@ -456,7 +457,7 @@ static int chomp( WCHAR *str ) *out++ = 0; break; default: - ignore = 0; + ignore = FALSE; } break; @@ -467,7 +468,7 @@ static int chomp( WCHAR *str ) state = cs_token; break; default: - ignore = 0; + ignore = FALSE; } break; }

1 0

Henri Verbeet : d3d8/tests: Use color_match() in p8_texture_test().
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 4eb3ce856856096de00fc1e309ccdea55d57973a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb3ce856856096de00fc1e30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:40:58 2013 +0100 d3d8/tests: Use color_match() in p8_texture_test(). --- dlls/d3d8/tests/visual.c | 34 ++++++---------------------------- 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index b76dca28..6f6b544 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2078,8 +2078,8 @@ static void p8_texture_test(IDirect3DDevice8 *device) IDirect3DTexture8 *texture = NULL, *texture2 = NULL; D3DLOCKED_RECT lr; unsigned char *data; - DWORD color, red, green, blue; PALETTEENTRY table[256]; + D3DCOLOR color; D3DCAPS8 caps; UINT i; float quad[] = { @@ -2193,18 +2193,9 @@ static void p8_texture_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0xff && blue == 0 && green == 0, - "got color %08x, expected 0x00ff0000\n", color); - + ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 32, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue == 0xff && green == 0, - "got color %08x, expected 0x000000ff\n", color); + ok(color_match(color, 0x000000ff, 0), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); @@ -2227,11 +2218,7 @@ static void p8_texture_test(IDirect3DDevice8 *device) color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue == 0xff && green == 0, - "got color %08x, expected 0x000000ff\n", color); + ok(color_match(color, 0x000000ff, 0), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); @@ -2290,18 +2277,9 @@ static void p8_texture_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 32, 32); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red >= 0x7e && red <= 0x81 && blue == 0 && green == 0, - "got color %08x, expected 0x00800000 or near\n", color); - + ok(color_match(color, 0x00800000, 1), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 32, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(red == 0 && blue >= 0x7e && blue <= 0x81 && green == 0, - "got color %08x, expected 0x00000080 or near\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr);

1 0

Henri Verbeet : d3d9/tests: Fix the expected value for the "blendindices" test in pretransformed_varying_test().
by Alexandre Julliard 01 Nov '13

01 Nov '13

Module: wine Branch: master Commit: 532f17bce0b8c47c07316e2d5d1557208ebd0d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=532f17bce0b8c47c07316e2d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 1 09:40:59 2013 +0100 d3d9/tests: Fix the expected value for the "blendindices" test in pretransformed_varying_test(). 0x00333333 makes much more sense than 0x00000000, and is what most of my hardware returns. Apparently at least some GF7 cards (still) return 0x00000000, so also accept that as broken(). --- dlls/d3d9/tests/visual.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 246dd07..44755ec 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6398,7 +6398,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) struct varying_test_struct tests[] = { {blendweight_code, NULL, 0x00000000, 0x00191919, "blendweight" , FALSE, TRUE }, - {blendindices_code, NULL, 0x00000000, 0x00000000, "blendindices" , FALSE, FALSE }, + {blendindices_code, NULL, 0x00000000, 0x00333333, "blendindices" , FALSE, TRUE }, {normal_code, NULL, 0x00000000, 0x004c4c4c, "normal" , FALSE, TRUE }, /* Why does dx not forward the texcoord? */ {texcoord0_code, NULL, 0x00000000, 0x00808c8c, "texcoord0" , FALSE, FALSE }, @@ -6526,7 +6526,9 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device) * Needs a replacement pipeline. */ color = getPixelColor(device, 360, 240); if (tests[i].todo_rhw) - todo_wine ok(color_match(color, tests[i].color_rhw, 1), + todo_wine ok(color_match(color, tests[i].color_rhw, 1) + || broken(color_match(color, 0x00000000, 1) + && tests[i].shader_code == blendindices_code), "Test %s returned color 0x%08x, expected 0x%08x (todo).\n", tests[i].name, color, tests[i].color_rhw); else

1 0