wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

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

21 Jan '13

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: Make each Mac driver window track the HWND it' s associated with.
by Alexandre Julliard 21 Jan '13

21 Jan '13

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; +@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: Associate an event queue with each thread that creates windows and with each window .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 207c4d193f88b62bd951da8123a523130c49fe95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207c4d193f88b62bd951da812… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:07:58 2013 -0600 winemac: Associate an event queue with each thread that creates windows and with each window. --- dlls/winemac.drv/cocoa_window.h | 5 ++ dlls/winemac.drv/cocoa_window.m | 14 ++++- dlls/winemac.drv/macdrv.h | 15 +++++ dlls/winemac.drv/macdrv_cocoa.h | 3 +- dlls/winemac.drv/macdrv_main.c | 111 ++++++++++++++++++++++++++++++++++---- dlls/winemac.drv/window.c | 6 ++- 6 files changed, 137 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=207c4d193f88b62bd951d…

1 0

Ken Thomases : winemac: Add WineEventQueue class for conveying events from Cocoa to Wine threads.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 3c995bb682966aa07728a3174b137076e8da12bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c995bb682966aa07728a3174… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:07:51 2013 -0600 winemac: Add WineEventQueue class for conveying events from Cocoa to Wine threads. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 10 ++ dlls/winemac.drv/cocoa_app.m | 39 ++++++ dlls/winemac.drv/cocoa_event.h | 36 +++++ dlls/winemac.drv/cocoa_event.m | 283 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 23 +++ 6 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c995bb682966aa07728a…

1 0

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

21 Jan '13

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

Andrew Talbot : gdi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: f98f70fb418dff1cd0c906ed9bcd2232fba47a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98f70fb418dff1cd0c906ed9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 23:12:49 2013 +0000 gdi32: Avoid signed-unsigned integer comparisons. --- dlls/gdi32/bidi.c | 5 +++-- dlls/gdi32/dib.c | 2 +- dlls/gdi32/font.c | 7 ++++--- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/painting.c | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 00dce45..1d6be53 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -358,7 +358,8 @@ BOOL BIDI_Reorder( { WORD *chartype; BYTE *levels; - unsigned i, done, glyph_i; + INT i, done; + unsigned glyph_i; BOOL is_complex; int maxItems; @@ -501,7 +502,7 @@ BOOL BIDI_Reorder( glyph_i = 0; while (done < uCount) { - unsigned j; + INT j; classify(lpString + done, chartype, uCount - done); /* limit text to first block */ i = resolveParagraphs(chartype, uCount - done); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index e5361c1..ad2a4dc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -305,7 +305,7 @@ static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) { - int i = 0; + DWORD i = 0; int left, right; int x, y, width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; HRGN run = NULL; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fdd16e3..68559f1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1734,7 +1734,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, { static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; UINT indices[3] = {0, 0, 0x20}; - int i; + unsigned int i; DWORD ret, size; int stride; @@ -1775,7 +1775,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) { - int i; + UINT i; RECT rect, bounds; reset_bounds( &bounds ); @@ -1814,7 +1814,8 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS const struct gdi_image_bits *image, const RECT *clip ) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; - UINT x, y, i, count, max_count; + UINT i, count, max_count; + LONG x, y; BYTE *ptr = image->ptr; int stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); POINT *pts; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 639fb63..40cf080 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5316,7 +5316,7 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; DWORD type = 0; - int i; + DWORD i; GetEnumStructs(face, face->family->FamilyName, &elf, &ntm, &type); for(i = 0; i < list->total; i++) { diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 354bea9..f978001 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -140,7 +140,8 @@ BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; - INT i, num_pts, num_bzr_pts, space, size; + DWORD i; + INT num_pts, num_bzr_pts, space, size; /* check for valid point types */ for (i = 0; i < count; i++)

1 0

Alexandre Julliard : winapi: Add arm64 architecture.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: dadcacf99a6d6dfb5fcb3e90644f39d85a77b64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadcacf99a6d6dfb5fcb3e906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 12:26:11 2013 +0100 winapi: Add arm64 architecture. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 2ce998f..2eac716 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64"; + my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64|arm64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

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

21 Jan '13

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

Marcus Meissner : dmusic: Actually return the allocated interface (Coverity ).
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: dfa88a21c95c55f0bf7ca659f852315b08499647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa88a21c95c55f0bf7ca659f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 13:09:41 2013 +0100 dmusic: Actually return the allocated interface (Coverity). --- dlls/dmusic/download.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index b306513..cc2b024 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -101,6 +101,6 @@ HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; - + *ret_iface = download; return S_OK; }

1 0

André Hentschel : ntdll: Implement IMAGE_REL_BASED_THUMB_MOV32 relocation on ARM.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0993f8bb7b138063d6202e2ce4a4a61e4b9fc537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0993f8bb7b138063d6202e2ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 20 18:02:10 2013 +0100 ntdll: Implement IMAGE_REL_BASED_THUMB_MOV32 relocation on ARM. --- dlls/ntdll/loader.c | 38 ++++++++++++++++++++++++++++++++++++++ include/winnt.h | 2 ++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fd63e08..28ed9f4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2175,6 +2175,44 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_DIR64: *(INT_PTR *)((char *)page + offset) += delta; break; +#elif defined(__arm__) + case IMAGE_REL_BASED_THUMB_MOV32: + { + DWORD inst = *(INT_PTR *)((char *)page + offset); + DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + + if ((inst & 0x8000fbf0) != 0x0000f240) + ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); + + imm16 += LOWORD(delta); + if (imm16 > 0xffff) + ERR("resulting immediate value won't fit: %08x\n", imm16); + *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + + ((imm16 >> 12) & 0x000f) + + ((imm16 << 20) & 0x70000000) + + ((imm16 << 16) & 0x0f0000); + + if (delta > 0xffff) + { + inst = *(INT_PTR *)((char *)page + offset + 4); + imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + + if ((inst & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); + + imm16 += HIWORD(delta); + if (imm16 > 0xffff) + ERR("resulting immediate value won't fit: %08x\n", imm16); + *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + + ((imm16 >> 1) & 0x0400) + + ((imm16 >> 12) & 0x000f) + + ((imm16 << 20) & 0x70000000) + + ((imm16 << 16) & 0x0f0000); + } + } + break; #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type); diff --git a/include/winnt.h b/include/winnt.h index f2bf990..d4e5cb4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3101,9 +3101,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_BASED_HIGHADJ 4 #define IMAGE_REL_BASED_MIPS_JMPADDR 5 #define IMAGE_REL_BASED_ARM_MOV32A 5 /* yes, 5 too */ +#define IMAGE_REL_BASED_ARM_MOV32 5 /* yes, 5 too */ #define IMAGE_REL_BASED_SECTION 6 #define IMAGE_REL_BASED_REL 7 #define IMAGE_REL_BASED_ARM_MOV32T 7 /* yes, 7 too */ +#define IMAGE_REL_BASED_THUMB_MOV32 7 /* yes, 7 too */ #define IMAGE_REL_BASED_MIPS_JMPADDR16 9 #define IMAGE_REL_BASED_IA64_IMM64 9 /* yes, 9 too */ #define IMAGE_REL_BASED_DIR64 10

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013