January 2013 - Wine-Commits

Marcus Meissner : msvcrt: read_utf8: free readbuf on return (Coverity).
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: a8b076d67f358b9b03c39360e3c5343a7d006487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b076d67f358b9b03c39360e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 13:17:09 2013 +0100 msvcrt: read_utf8: free readbuf on return (Coverity). --- dlls/msvcrt/file.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0df6a86..8a63b51 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2226,13 +2226,16 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) num_read = 0; }else if(GetLastError() == ERROR_BROKEN_PIPE) { fdinfo->wxflag |= WX_ATEOF; + if (readbuf != min_buf) MSVCRT_free(readbuf); return 0; }else { msvcrt_set_errno(GetLastError()); + if (readbuf != min_buf) MSVCRT_free(readbuf); return -1; } }else if(!pos && !num_read) { fdinfo->wxflag |= WX_ATEOF; + if (readbuf != min_buf) MSVCRT_free(readbuf); return 0; } @@ -2291,9 +2294,11 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(!(num_read = MultiByteToWideChar(CP_UTF8, 0, readbuf, pos, buf, count))) { msvcrt_set_errno(GetLastError()); + if (readbuf != min_buf) MSVCRT_free(readbuf); return -1; } + if (readbuf != min_buf) MSVCRT_free(readbuf); return num_read*2; }

1 0

Ken Thomases : winemac: Make each Mac driver window track the HWND it' s associated with.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 177b67e6bd456d69cce687245e5773015ac3fee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177b67e6bd456d69cce687245… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:03 2013 -0600 winemac: Make each Mac driver window track the HWND it's associated with. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e1e59f4..1f81cc6 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -32,6 +32,7 @@ BOOL floating; WineWindow* latentParentWindow; + void* hwnd; WineEventQueue* queue; void* surface; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4ca7a09..e647cd0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -66,6 +66,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow; +(a)property (nonatomic) void* hwnd; @property (retain, nonatomic) WineEventQueue* queue; @property (nonatomic) void* surface; @@ -162,7 +163,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate, floating, latentParentWindow, queue; + @synthesize disabled, noActivate, floating, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @@ -170,6 +171,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame + hwnd:(void*)hwnd queue:(WineEventQueue*)queue { WineWindow* window; @@ -195,6 +197,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [window setHasShadow:wf->shadow]; [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; + window.hwnd = hwnd; window.queue = queue; contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; @@ -447,13 +450,14 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) * title bar, close box, etc.). */ macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, - CGRect frame, macdrv_event_queue queue) + CGRect frame, void* hwnd, macdrv_event_queue queue) { __block WineWindow* window; OnMainThread(^{ window = [[WineWindow createWindowWithFeatures:wf windowFrame:NSRectFromCGRect(frame) + hwnd:hwnd queue:(WineEventQueue*)queue] retain]; }); @@ -478,6 +482,17 @@ void macdrv_destroy_cocoa_window(macdrv_window w) } /*********************************************************************** + * macdrv_get_window_hwnd + * + * Get the hwnd that was set for the window at creation. + */ +void* macdrv_get_window_hwnd(macdrv_window w) +{ + WineWindow* window = (WineWindow*)w; + return window.hwnd; +} + +/*********************************************************************** * macdrv_set_cocoa_window_features * * Update a Cocoa window's features. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71b4c32..31bbb2d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -161,7 +161,7 @@ struct macdrv_window_state { }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, - CGRect frame, macdrv_event_queue queue) DECLSPEC_HIDDEN; + CGRect frame, void* hwnd, macdrv_event_queue queue) DECLSPEC_HIDDEN; extern void macdrv_destroy_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern void* macdrv_get_window_hwnd(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_features(macdrv_window w, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 26dedf4..cd7be9e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -511,7 +511,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); - data->cocoa_window = macdrv_create_cocoa_window(&wf, frame, thread_data->queue); + data->cocoa_window = macdrv_create_cocoa_window(&wf, frame, data->hwnd, thread_data->queue); if (!data->cocoa_window) goto done; set_cocoa_window_properties(data);

1 0

Ken Thomases : winemac: Implement MsgWaitForMultipleObjectsEx and infrastructure for processing events .
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 4e83d2fca0861906f40eae8c4ed7afe8513833a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e83d2fca0861906f40eae8c4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:08 2013 -0600 winemac: Implement MsgWaitForMultipleObjectsEx and infrastructure for processing events. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/event.c | 125 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 0dfcbc4..1de19ef 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -4,6 +4,7 @@ EXTRALIBS = -framework AppKit C_SRCS = \ display.c \ + event.c \ gdi.c \ macdrv_main.c \ surface.c \ diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c new file mode 100644 index 0000000..fcef550 --- /dev/null +++ b/dlls/winemac.drv/event.c @@ -0,0 +1,125 @@ +/* + * MACDRV event driver + * + * Copyright 1993 Alexandre Julliard + * 1999 Noel Borthwick + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * 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 "config.h" + +#include "macdrv.h" +#include "winuser.h" + +WINE_DEFAULT_DEBUG_CHANNEL(event); + + +/* return the name of an Mac event */ +static const char *dbgstr_event(int type) +{ + return wine_dbg_sprintf("Unknown event %d", type); +} + + +/*********************************************************************** + * get_event_mask + */ +static macdrv_event_mask get_event_mask(DWORD mask) +{ + if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; + return 0; +} + + +/*********************************************************************** + * macdrv_handle_event + */ +void macdrv_handle_event(macdrv_event *event) +{ + HWND hwnd = macdrv_get_window_hwnd(event->window); + const macdrv_event *prev; + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + + TRACE("%s for hwnd/window %p/%p\n", dbgstr_event(event->type), hwnd, + event->window); + + prev = thread_data->current_event; + thread_data->current_event = event; + + switch (event->type) + { + default: + TRACE(" ignoring\n"); + break; + } + + thread_data->current_event = prev; +} + + +/*********************************************************************** + * process_events + */ +static int process_events(macdrv_event_queue queue, macdrv_event_mask mask) +{ + macdrv_event event; + int count = 0; + + while (macdrv_get_event_from_queue(queue, mask, &event)) + { + count++; + macdrv_handle_event(&event); + macdrv_cleanup_event(&event); + } + if (count) TRACE("processed %d events\n", count); + return count; +} + + +/*********************************************************************** + * MsgWaitForMultipleObjectsEx (MACDRV.@) + */ +DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags) +{ + DWORD ret; + struct macdrv_thread_data *data = macdrv_thread_data(); + macdrv_event_mask event_mask = get_event_mask(mask); + + TRACE("count %d, handles %p, timeout %u, mask %x, flags %x\n", count, + handles, timeout, mask, flags); + + if (!data) + { + if (!count && !timeout) return WAIT_TIMEOUT; + return WaitForMultipleObjectsEx(count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE); + } + + if (data->current_event) event_mask = 0; /* don't process nested events */ + + if (process_events(data->queue, event_mask)) ret = count - 1; + else if (count || timeout) + { + ret = WaitForMultipleObjectsEx(count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE); + if (ret == count - 1) process_events(data->queue, event_mask); + } + else ret = WAIT_TIMEOUT; + + return ret; +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index dee2fd8..7fe4109 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -83,6 +83,7 @@ enum macdrv_window_messages struct macdrv_thread_data { macdrv_event_queue queue; + const macdrv_event *current_event; }; extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 53b9785..f2ffffc 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -9,6 +9,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent @ cdecl SetWindowRgn(long long long) macdrv_SetWindowRgn

1 0

Ken Thomases : winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: ed367c504df4703677abfa42dc7620cc58a55d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed367c504df4703677abfa42d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:12 2013 -0600 winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows. --- dlls/winemac.drv/cocoa_window.m | 4 +++ dlls/winemac.drv/event.c | 16 ++++++++++++- dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 5 ++++ dlls/winemac.drv/macdrv_main.c | 2 + dlls/winemac.drv/window.c | 49 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e647cd0..36bd600 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -437,6 +437,10 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) */ - (BOOL)windowShouldClose:(id)sender { + macdrv_event event; + event.type = WINDOW_CLOSE_REQUESTED; + event.window = (macdrv_window)[self retain]; + [queue postEvent:&event]; return NO; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index fcef550..effaa92 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -31,6 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); /* return the name of an Mac event */ static const char *dbgstr_event(int type) { + static const char * const event_names[] = { + "WINDOW_CLOSE_REQUESTED", + }; + + if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; return wine_dbg_sprintf("Unknown event %d", type); } @@ -40,8 +45,14 @@ static const char *dbgstr_event(int type) */ static macdrv_event_mask get_event_mask(DWORD mask) { + macdrv_event_mask event_mask = 0; + if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; - return 0; + + if (mask & QS_POSTMESSAGE) + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); + + return event_mask; } @@ -62,6 +73,9 @@ void macdrv_handle_event(macdrv_event *event) switch (event->type) { + case WINDOW_CLOSE_REQUESTED: + macdrv_window_close_requested(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 7fe4109..524408f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -117,4 +117,6 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; +extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 31bbb2d..f7f2f1d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -121,6 +121,11 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ +enum { + WINDOW_CLOSE_REQUESTED, + NUM_EVENT_TYPES +}; + typedef uint32_t macdrv_event_mask; typedef struct macdrv_event { diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4776dd3..2a9e0ac 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -35,6 +35,8 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; */ static BOOL process_attach(void) { + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index cd7be9e..e22a155 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1230,3 +1230,52 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, done: release_win_data(data); } + + +/*********************************************************************** + * macdrv_window_close_requested + * + * Handler for WINDOW_CLOSE_REQUESTED events. + */ +void macdrv_window_close_requested(HWND hwnd) +{ + /* Ignore the delete window request if the window has been disabled. This + * is to disallow applications from being closed while in a modal state. + */ + if (IsWindowEnabled(hwnd)) + { + HMENU hSysMenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; + hSysMenu = GetSystemMenu(hwnd, FALSE); + if (hSysMenu) + { + UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) + return; + } + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, + (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); + switch(ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); + break; + } + } + + PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } +}

1 0

André Hentschel : include: Make sure interlocked_cmpxchg128 is defined on ARM64.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: cf195437c66bc81481f395b4d006bcf95b3e346a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf195437c66bc81481f395b4d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 18 18:05:42 2013 +0100 include: Make sure interlocked_cmpxchg128 is defined on ARM64. --- include/wine/port.h | 2 +- libs/port/interlocked.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index bd6f513..d6904c0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -435,7 +435,7 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); extern int interlocked_xchg_add( int *dest, int incr ); -#ifdef _WIN64 +#if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) extern unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ); #endif diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index 576714a..f5e405c 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -343,9 +343,9 @@ int interlocked_xchg_add( int *dest, int incr ) return retv; } -int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +unsigned char interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) { - int retv; + unsigned char retv; pthread_mutex_lock( &interlocked_mutex ); if (dest[0] == compare[0] && dest[1] == compare[1]) {

1 0

Ken Thomases : winemac: Add a simple ERR() logging macro that can be used from Cocoa code.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: b6d902ee4611e648fff592c0e4c8834f48590690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d902ee4611e648fff592c0e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:07:47 2013 -0600 winemac: Add a simple ERR() logging macro that can be used from Cocoa code. --- dlls/winemac.drv/cocoa_app.h | 6 ++++++ dlls/winemac.drv/cocoa_app.m | 24 ++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 1 + 4 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index bdaadf5..88da00c 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -23,6 +23,9 @@ #include "macdrv_cocoa.h" +#define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) + + @interface WineApplication : NSApplication <NSApplicationDelegate> - (void) transformProcessToForeground; @@ -31,3 +34,6 @@ void OnMainThread(dispatch_block_t block); void OnMainThreadAsync(dispatch_block_t block); + +void LogError(const char* func, NSString* format, ...); +void LogErrorv(const char* func, NSString* format, va_list args); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d869a05..45991f0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -21,6 +21,9 @@ #import "cocoa_app.h" +int macdrv_err_on; + + @implementation WineApplication - (void) transformProcessToForeground @@ -87,3 +90,24 @@ void OnMainThreadAsync(dispatch_block_t block) { dispatch_async(dispatch_get_main_queue(), block); } + +/*********************************************************************** + * LogError + */ +void LogError(const char* func, NSString* format, ...) +{ + va_list args; + va_start(args, format); + LogErrorv(func, format, args); + va_end(args); +} + +/*********************************************************************** + * LogErrorv + */ +void LogErrorv(const char* func, NSString* format, va_list args) +{ + NSString* message = [[NSString alloc] initWithFormat:format arguments:args]; + fprintf(stderr, "err:%s:%s", func, [message UTF8String]); + [message release]; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b5f3a14..a7df9ca 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -109,6 +109,8 @@ struct macdrv_display { /* main */ +extern int macdrv_err_on; + extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 9ee249d..e209f3d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -36,6 +36,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: + macdrv_err_on = ERR_ON(macdrv); if (macdrv_start_cocoa_app()) { ERR("Failed to start Cocoa app main loop\n");

1 0

Alexandre Julliard : Wine release 1.5.22
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: website Branch: master Commit: 362d469bb84b2b6c5121c63565c0d66f815a9dbe URL: http://source.winehq.org/git/website.git/?a=commit;h=362d469bb84b2b6c5121c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:55:52 2013 +0100 Wine release 1.5.22 --- news/en/2013011801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013011801.xml b/news/en/2013011801.xml new file mode 100644 index 0000000..6d1efdf --- /dev/null +++ b/news/en/2013011801.xml @@ -0,0 +1,16 @@ +<news> +<date>January 18, 2013</date> +<title>Wine 1.5.22 Released</title> +<body> + The Wine development release 1.5.22 is now available. + <a href="{$root}/announce/1.5.22">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine.</li> + <li>Beginnings of the Mac graphics driver.</li> + <li>Support for ARM64 platforms.</li> + <li>Fixes for RTL text in Uniscribe.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.22.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 9f18a03b14a3405fb04da73cb87f421576825cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f18a03b14a3405fb04da73cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:53 2013 +0100 Release 1.5.22. --- ANNOUNCE | 695 +++++++++++++++++++++++++++++++++++++++++-------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 482 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f18a03b14a3405fb04da…

1 0

Tag wine-1.5.22 : Alexandre Julliard : Release 1.5.22
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: refs/tags/wine-1.5.22 Tag: 322899b46ce3f3b988a1a3a3875a61092784a511 URL: http://source.winehq.org/git/wine.git/?a=tag;h=322899b46ce3f3b988a1a3a3875a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:55 2013 +0100 Release 1.5.22

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: a78b2b2e1f0c89ec247eccce410ff45a4a034c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78b2b2e1f0c89ec247eccce4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 18 17:06:38 2013 +0100 po: Update French translation. --- po/fr.po | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/po/fr.po b/po/fr.po index 91cab2c..4b18035 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8316,17 +8316,13 @@ msgid "Don't install" msgstr "Ne pas installer" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Lorsqu'il est installé, ActiveX a un accès complet à votre ordinateur. Ne " -"cliquez pas sur le bouton d'installation à moins d'avoir une confiance " -"absolue dans la source ci-dessus." +"Lorsqu'il est installé, un composant ActiveX a un accès complet à votre " +"ordinateur. Ne cliquez pas sur le bouton d'installation à moins d'avoir une " +"confiance absolue dans la source ci-dessus." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10316,10 +10312,8 @@ msgid "Connection-specific DNS suffix" msgstr "Suffixe DNS propre à la connexion" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "Adresse IP" +msgstr "Adresse IPv4" #: ipconfig.rc:34 msgid "Hostname" @@ -10362,10 +10356,8 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "Adresse IP" +msgstr "Adresse IPv6" #: net.rc:27 msgid "" @@ -10518,50 +10510,40 @@ msgid "State" msgstr "État" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Interfaces" +msgstr "Statistiques de l'interface" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Envoyés" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Reçus" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "octets" +msgstr "Octets" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Paquets monodiffusion" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Paquets non monodiffusion" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Avis de non-responsabilité" +msgstr "Rejets" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "Erreur" +msgstr "Erreurs" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Port inconnu.\n" +msgstr "Protocoles inconnus" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0