March 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Add support for "query" events which wait for synchronous responses.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 69e631e04e75e7596f58d2d16ba674b343886877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e631e04e75e7596f58d2d16… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:26 2013 -0500 winemac: Add support for "query" events which wait for synchronous responses. --- dlls/winemac.drv/cocoa_app.h | 7 ++- dlls/winemac.drv/cocoa_app.m | 86 ++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 1 + dlls/winemac.drv/cocoa_event.h | 7 ++ dlls/winemac.drv/cocoa_event.m | 169 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_opengl.m | 2 +- dlls/winemac.drv/event.c | 32 +++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 26 ++++++- dlls/winemac.drv/macdrv_main.c | 2 +- 10 files changed, 314 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e631e04e75e7596f58d…

1 0

Jacek Caban : jscript: Use BSTR also for pure IDispatch call in Object. hasOwnProperty.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 52fc8b3d94853e66d7c854bc33095759008245d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fc8b3d94853e66d7c854bc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 11 16:05:27 2013 +0100 jscript: Use BSTR also for pure IDispatch call in Object.hasOwnProperty. --- dlls/jscript/object.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8047d3f..1139f3c 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -113,6 +113,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl { jsstr_t *name; DISPID id; + BSTR bstr; HRESULT hres; TRACE("\n"); @@ -131,6 +132,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl BOOL result; hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name->str, &result); + jsstr_release(name); if(FAILED(hres)) return hres; @@ -139,22 +141,20 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return S_OK; } - if(is_dispex(jsthis)) { - BSTR bstr; - bstr = SysAllocStringLen(name->str, jsstr_length(name)); - if(!bstr) - return E_OUTOFMEMORY; + bstr = SysAllocStringLen(NULL, jsstr_length(name)); + if(bstr) + jsstr_flush(name, bstr); + jsstr_release(name); + if(!bstr) + return E_OUTOFMEMORY; - hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, - make_grfdex(ctx, fdexNameCaseSensitive), &id); - SysFreeString(bstr); - } else { - OLECHAR *names = name->str; - hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, - &names, 1, ctx->lcid, &id); - } + if(is_dispex(jsthis)) + hres = IDispatchEx_GetDispID(jsthis->u.dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive), &id); + else + hres = IDispatch_GetIDsOfNames(jsthis->u.disp, &IID_NULL, &bstr, 1, ctx->lcid, &id); + SysFreeString(bstr); if(r) *r = jsval_bool(SUCCEEDED(hres)); return S_OK;

1 0

André Hentschel : winebuild: Remove get_asm_short_keyword.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4f1beed10628c17b087f9162b3762995060b837e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1beed10628c17b087f9162b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:37:05 2013 +0100 winebuild: Remove get_asm_short_keyword. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 2 +- tools/winebuild/res16.c | 12 ++-- tools/winebuild/res32.c | 9 ++-- tools/winebuild/spec16.c | 130 ++++++++++++++++++++-------------------------- tools/winebuild/spec32.c | 40 ++++++-------- tools/winebuild/utils.c | 8 --- 7 files changed, 85 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1beed10628c17b087f9…

1 0

André Hentschel : ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6e8be236eec5b532d0f1715b376fea07b9bc3e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8be236eec5b532d0f1715b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 15:43:12 2013 +0100 ntdll: Unify the usage of internal SIGCONTEXT type on ARM and ARM64. --- dlls/ntdll/signal_arm.c | 8 ++++---- dlls/ntdll/signal_arm64.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index bf94b17..ce6a6b6 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -124,7 +124,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(x) context->R##x = REGn_sig(x,sigcontext) /* Save normal registers */ @@ -146,7 +146,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(x) REGn_sig(x,sigcontext) = context->R##x /* Restore normal registers */ @@ -167,7 +167,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } @@ -178,7 +178,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME("not implemented\n"); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 01af577..018d84f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -115,7 +115,7 @@ static inline BOOL is_valid_frame( void *frame ) * * Set the register values from a sigcontext. */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { #define C(n) context->X##n = REGn_sig(n,sigcontext) /* Save normal registers */ @@ -136,7 +136,7 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) * * Build a sigcontext from the register values. */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { #define C(n) REGn_sig(n,sigcontext) = context->X##n /* Restore normal registers */ @@ -156,7 +156,7 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) * * Set the FPU context from a sigcontext. */ -static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); } @@ -167,7 +167,7 @@ static inline void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) +static inline void restore_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { FIXME( "Not implemented on ARM64\n" ); }

1 0

André Hentschel : winecrt0: Android NDK doesn' t have _init and _fini.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e0f3e6bcf2045c6a0ff00af631a508dabd13420f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f3e6bcf2045c6a0ff00af63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 10 12:04:00 2013 +0100 winecrt0: Android NDK doesn't have _init and _fini. --- dlls/winecrt0/crt0_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/crt0_private.h b/dlls/winecrt0/crt0_private.h index 05cf75d..b2c902e 100644 --- a/dlls/winecrt0/crt0_private.h +++ b/dlls/winecrt0/crt0_private.h @@ -21,7 +21,7 @@ #ifndef __WINE_CRT0_PRIVATE_H__ #define __WINE_CRT0_PRIVATE_H__ -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__ANDROID__) static inline void _init(int argc, char **argv, char **envp ) { /* nothing */ } static inline void _fini(void) { /* nothing */ } #else

1 0

Ken Thomases : winemac: Implement setting of clipboard data with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: bf824ed38c62f90c0fe66b1b61f7fedc8c377900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf824ed38c62f90c0fe66b1b6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:21 2013 -0500 winemac: Implement setting of clipboard data with support for text formats. --- dlls/winemac.drv/clipboard.c | 372 ++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/cocoa_clipboard.m | 77 ++++++++ dlls/winemac.drv/macdrv_cocoa.h | 3 + dlls/winemac.drv/winemac.drv.spec | 4 + 4 files changed, 444 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf824ed38c62f90c0fe66…

1 0

Ken Thomases : winemac: Implement GetClipboardData() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 764a8edb0991b2aaca225923e00f4a1cb8d92e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764a8edb0991b2aaca225923e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:18 2013 -0500 winemac: Implement GetClipboardData() with support for text formats. --- dlls/winemac.drv/clipboard.c | 67 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_clipboard.m | 28 +++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2c07fc8..9ae9e9c 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -738,6 +738,73 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) /************************************************************************** + * GetClipboardData (MACDRV.@) + */ +HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("desired_format %s\n", debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * IsClipboardFormatAvailable (MACDRV.@) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index f9f9c6a..753a497 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -50,3 +50,31 @@ CFArrayRef macdrv_copy_pasteboard_types(void) [pool release]; return ret; } + + +/*********************************************************************** + * macdrv_copy_pasteboard_data + * + * Returns the pasteboard data for a specified type, or NULL on error or + * if there's no such type on the pasteboard. The caller is responsible + * for releasing the returned data object with CFRelease(). + */ +CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +{ + __block NSData* ret = nil; + + OnMainThread(^{ + @try + { + NSPasteboard* pb = [NSPasteboard generalPasteboard]; + if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[pb dataForType:(NSString*)type] copy]; + } + @catch (id e) + { + ERR(@"Exception discarded while copying pasteboard types: %@\n", e); + } + }); + + return (CFDataRef)ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 3bb03d6..e36c301 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -275,6 +275,7 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; /* opengl */ diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 3bbaac2..d1195f1 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -16,6 +16,7 @@ @ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx +@ cdecl GetClipboardData(long) macdrv_GetClipboardData @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos @ cdecl GetKeyboardLayout(long) macdrv_GetKeyboardLayout @ cdecl GetKeyboardLayoutName(ptr) macdrv_GetKeyboardLayoutName

1 0

Ken Thomases : winemac: Implement EnumClipboardFormats() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 7cf3e0596f556030f9caa6d497c827c2de0c99c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf3e0596f556030f9caa6d49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:12 2013 -0500 winemac: Implement EnumClipboardFormats() with support for text formats. --- dlls/winemac.drv/clipboard.c | 91 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3f15a37..2c07fc8 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -647,6 +647,97 @@ INT CDECL macdrv_CountClipboardFormats(void) /************************************************************************** + * EnumClipboardFormats (MACDRV.@) + */ +UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + UINT ret; + + TRACE("prev_format %s\n", debugstr_format(prev_format)); + + types = macdrv_copy_pasteboard_types(); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return 0; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + if (!count) + { + CFRelease(types); + return 0; + } + + if (prev_format) + { + CFMutableArrayRef formats = CFArrayCreateMutable(NULL, 0, NULL); + if (!formats) + { + WARN("Failed to allocate array to track formats\n"); + CFRelease(types); + return 0; + } + + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while ((format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + + if (format->synthesized) + { + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + CFArrayAppendValue(formats, (void*)format->format_id); + } + else + { + /* If the type was already in the array, it must have been synthesized + because this one's real. Remove the synthesized entry in favor of + this one. */ + CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), + (void*)format->format_id); + if (index != kCFNotFound) + CFArrayRemoveValueAtIndex(formats, index); + CFArrayAppendValue(formats, (void*)format->format_id); + } + } + } + + count = CFArrayGetCount(formats); + i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); + if (i == kCFNotFound || i + 1 >= count) + ret = 0; + else + ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); + + CFRelease(formats); + } + else + { + CFStringRef type = CFArrayGetValueAtIndex(types, 0); + WINE_CLIPFORMAT *format = format_for_type(NULL, type); + + ret = format ? format->format_id : 0; + } + + CFRelease(types); + TRACE(" -> %u\n", ret); + return ret; +} + + +/************************************************************************** * IsClipboardFormatAvailable (MACDRV.@) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index f5d1f15..3bbaac2 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -13,6 +13,7 @@ @ cdecl CreateWindow(long) macdrv_CreateWindow @ cdecl DestroyCursorIcon(long) macdrv_DestroyCursorIcon @ cdecl DestroyWindow(long) macdrv_DestroyWindow +@ cdecl EnumClipboardFormats(long) macdrv_EnumClipboardFormats @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) macdrv_EnumDisplaySettingsEx @ cdecl GetCursorPos(ptr) macdrv_GetCursorPos

1 0

Ken Thomases : winemac: Implement CountClipboardFormats() with support for text formats.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 6b2b3e69f734afcfe02571eb248cd0bf74109d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2b3e69f734afcfe02571eb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 22:58:03 2013 -0500 winemac: Implement CountClipboardFormats() with support for text formats. --- dlls/winemac.drv/Makefile.in | 2 + dlls/winemac.drv/clipboard.c | 673 ++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/cocoa_clipboard.m | 52 +++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/macdrv_main.c | 2 + dlls/winemac.drv/winemac.drv.spec | 1 + 7 files changed, 736 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2b3e69f734afcfe0257…

1 0

André Hentschel : include: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 41658157b1fce998a485c9996104e91092ed054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41658157b1fce998a485c9996… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:33:37 2013 +0100 include: Remove SPARC support. --- include/cvconst.h | 13 -------- include/winnt.h | 86 ----------------------------------------------------- 2 files changed, 0 insertions(+), 99 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 8b48f78..9ad6324 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -666,19 +666,6 @@ enum CV_HREG_e CV_AMD64_R15 = 343, /* Wine extension */ - CV_SPARC_NOREG = CV_REG_NONE, - CV_SPARC_G0 = 10, /* includes g0 to g7 */ - CV_SPARC_O0 = 18, /* includes o0 to o7 */ - CV_SPARC_L0 = 26, /* includes l0 to l7 */ - CV_SPARC_I0 = 34, /* includes i0 to i7 */ - CV_SPARC_PSR = 42, - CV_SPARC_PC = 43, - CV_SPARC_NPC = 44, - CV_SPARC_Y = 45, - CV_SPARC_WIM = 46, - CV_SPARC_TBR = 47, - - /* Wine extension */ CV_ARM64_NOREG = CV_REG_NONE, CV_ARM64_X0 = 10, /* this includes X0 to X30 */ CV_ARM64_SP = 41, diff --git a/include/winnt.h b/include/winnt.h index 711cda8..0dac8b1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -649,9 +649,6 @@ typedef DWORD FLONG; #define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF -/* Wine extension */ -#define PROCESSOR_ARCHITECTURE_SPARC 20 - /* dwProcessorType */ #define PROCESSOR_INTEL_386 386 #define PROCESSOR_INTEL_486 486 @@ -2013,88 +2010,6 @@ typedef struct _STACK_FRAME_HEADER #endif /* __powerpc__ */ -#ifdef __sparc__ - -/* - * FIXME: - * - * There is no official CONTEXT structure defined for the SPARC - * architecture, so I just made one up. - * - * This structure is valid only for 32-bit SPARC architectures, - * not for 64-bit SPARC. - * - * Note that this structure contains only the 'top-level' registers; - * the rest of the register window chain is not visible. - * - * The layout follows the Solaris 'prgregset_t' structure. - * - */ - -#define CONTEXT_SPARC 0x10000000 - -#define CONTEXT_CONTROL (CONTEXT_SPARC | 0x00000001) -#define CONTEXT_FLOATING_POINT (CONTEXT_SPARC | 0x00000002) -#define CONTEXT_INTEGER (CONTEXT_SPARC | 0x00000004) - -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER) - -#define EXCEPTION_READ_FAULT 0 -#define EXCEPTION_WRITE_FAULT 1 -#define EXCEPTION_EXECUTE_FAULT 8 - -typedef struct _CONTEXT -{ - DWORD ContextFlags; - - /* These are selected by CONTEXT_INTEGER */ - DWORD g0; - DWORD g1; - DWORD g2; - DWORD g3; - DWORD g4; - DWORD g5; - DWORD g6; - DWORD g7; - DWORD o0; - DWORD o1; - DWORD o2; - DWORD o3; - DWORD o4; - DWORD o5; - DWORD o6; - DWORD o7; - DWORD l0; - DWORD l1; - DWORD l2; - DWORD l3; - DWORD l4; - DWORD l5; - DWORD l6; - DWORD l7; - DWORD i0; - DWORD i1; - DWORD i2; - DWORD i3; - DWORD i4; - DWORD i5; - DWORD i6; - DWORD i7; - - /* These are selected by CONTEXT_CONTROL */ - DWORD psr; - DWORD pc; - DWORD npc; - DWORD y; - DWORD wim; - DWORD tbr; - - /* FIXME: floating point registers missing */ - -} CONTEXT; - -#endif /* __sparc__ */ - #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) #error You need to define a CONTEXT for your CPU #endif @@ -2556,7 +2471,6 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_CEE 0xc0ee /* Wine extension */ -#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_FILE_MACHINE_ARM64 0x01c5 #define IMAGE_SIZEOF_FILE_HEADER 20

1 0

Andrew Eikum : winmm/tests: Add tests for non-block-aligned fragment sizes.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: dd0751ae83529d8229325e1d0b790d3b33ba781a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0751ae83529d8229325e1d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 11 06:42:25 2013 -0500 winmm/tests: Add tests for non-block-aligned fragment sizes. --- dlls/winmm/tests/wave.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index eb619cd..09c7c89 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1508,9 +1508,88 @@ static void test_sndPlaySound(void) ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); } +static void test_fragmentsize(void) +{ + MMRESULT rc; + WAVEHDR hdr[2]; + HWAVEOUT wout; + WAVEFORMATEX fmt; + MMTIME mmtime; + DWORD wait; + HANDLE hevent; + + if(waveOutGetNumDevs() == 0) + return; + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 44100; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = sizeof(WAVEFORMATEX); + + hevent = CreateEvent(NULL, FALSE, FALSE, NULL); + g_tid = GetCurrentThreadId(); + + rc = waveOutOpen(&wout, WAVE_MAPPER, &fmt, (DWORD_PTR)callback_func, + (DWORD_PTR)hevent, CALLBACK_FUNCTION); + ok(rc == MMSYSERR_NOERROR || rc == WAVERR_BADFORMAT || + rc == MMSYSERR_INVALFLAG || rc == MMSYSERR_INVALPARAM, + "waveOutOpen(%s) failed: %s\n", dev_name(WAVE_MAPPER), wave_out_error(rc)); + if(rc != MMSYSERR_NOERROR){ + CloseHandle(hevent); + return; + } + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "wave open callback missed\n"); + + memset(hdr, 0, sizeof(hdr)); + hdr[0].dwBufferLength = (fmt.nSamplesPerSec * fmt.nBlockAlign / 4) + 1; + hdr[1].dwBufferLength = hdr[0].dwBufferLength - 2; + hdr[1].lpData = hdr[0].lpData = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, hdr[0].dwBufferLength); + + rc = waveOutPrepareHeader(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + rc = waveOutPrepareHeader(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutPrepareHeader failed: %s\n", wave_out_error(rc)); + + trace("writing %u bytes then %u bytes\n", hdr[0].dwBufferLength, hdr[1].dwBufferLength); + rc = waveOutWrite(wout, &hdr[0], sizeof(hdr[0])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + rc = waveOutWrite(wout, &hdr[1], sizeof(hdr[1])); + ok(rc == MMSYSERR_NOERROR, "waveOutWrite failed: %s\n", wave_out_error(rc)); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 1 callback missed\n"); + + wait = WaitForSingleObject(hevent, 1000); + ok(wait == WAIT_OBJECT_0, "header 2 callback missed\n"); + + memset(&mmtime, 0, sizeof(mmtime)); + mmtime.wType = TIME_BYTES; + + rc = waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); + ok(rc == MMSYSERR_NOERROR, "waveOutGetPosition failed: %s\n", wave_out_error(rc)); + + /* windows behavior is inconsistent */ + ok(mmtime.u.cb == 88200 || + mmtime.u.cb == 88196, "after position: %u\n", mmtime.u.cb); + + rc = waveOutClose(wout); + ok(rc == MMSYSERR_NOERROR, "waveOutClose failed: %s\n", wave_out_error(rc)); + + CloseHandle(hevent); +} + START_TEST(wave) { test_multiple_waveopens(); wave_out_tests(); test_sndPlaySound(); + test_fragmentsize(); }

1 0

André Hentschel : winebuild: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 0ee8e2b5b1f633d51cbcc55d46cfe968665b683e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ee8e2b5b1f633d51cbcc55d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:35:13 2013 +0100 winebuild: Remove SPARC support. --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 34 ---------------------------------- tools/winebuild/main.c | 2 -- tools/winebuild/spec32.c | 11 +---------- tools/winebuild/utils.c | 4 ---- 5 files changed, 2 insertions(+), 51 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 359428f..fd56c8c 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -140,7 +140,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64 }; enum target_platform diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 81325e9..fab4158 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -648,28 +648,6 @@ static void output_import_thunk( const char *name, const char *table, int pos ) case CPU_x86_64: output( "\tjmpq *%s+%d(%%rip)\n", table, pos ); break; - case CPU_SPARC: - if ( !UsePIC ) - { - output( "\tsethi %%hi(%s+%d), %%g1\n", table, pos ); - output( "\tld [%%g1+%%lo(%s+%d)], %%g1\n", table, pos ); - output( "\tjmp %%g1\n" ); - output( "\tnop\n" ); - } - else - { - /* Hmpf. Stupid sparc assembler always interprets global variable - names as GOT offsets, so we have to do it the long way ... */ - output( "\tsave %%sp, -96, %%sp\n" ); - output( "0:\tcall 1f\n" ); - output( "\tnop\n" ); - output( "1:\tsethi %%hi(%s+%d-0b), %%g1\n", table, pos ); - output( "\tor %%g1, %%lo(%s+%d-0b), %%g1\n", table, pos ); - output( "\tld [%%g1+%%o7], %%g1\n" ); - output( "\tjmp %%g1\n" ); - output( "\trestore\n" ); - } - break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); output( "\tldr PC,[IP,#%d]\n", pos); @@ -987,13 +965,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -88" ); output( "\tjmp *%%rax\n" ); break; - case CPU_SPARC: - output( "\tsave %%sp, -96, %%sp\n" ); - output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmov %%g1, %%o0\n" ); - output( "\tjmp %%o0\n" ); - output( "\trestore\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r4-r10,FP,LR}\n" ); output( "\tmov LR,PC\n"); @@ -1094,11 +1065,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; - case CPU_SPARC: - output( "\tset %d, %%g1\n", (idx << 16) | j ); - output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" ); output( "\tmov r0, #%d\n", idx ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 39dbe62..16b4165 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -52,8 +52,6 @@ int unwind_tables = 0; enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; -#elif defined(__sparc__) -enum target_cpu target_cpu = CPU_SPARC; #elif defined(__powerpc__) enum target_cpu target_cpu = CPU_POWERPC; #elif defined(__arm__) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f6c8cd2..ab69797 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -38,7 +38,6 @@ #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01C4 /* Wine extension */ -#define IMAGE_FILE_MACHINE_SPARC 0x2000 #define IMAGE_FILE_MACHINE_ARM64 0x01C5 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 @@ -439,11 +438,6 @@ static void output_asm_constructor( const char *constructor ) output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; - case CPU_SPARC: - output( "\n\t.section \".init\",\"ax\"\n" ); - output( "\tcall %s\n", asm_name(constructor) ); - output( "\tnop\n" ); - break; case CPU_ARM: output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); @@ -488,7 +482,6 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; @@ -520,10 +513,9 @@ void output_module( DLLSPEC *spec ) { case CPU_x86: machine = IMAGE_FILE_MACHINE_I386; break; case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; + case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; - case CPU_POWERPC: machine = IMAGE_FILE_MACHINE_POWERPC; break; - case CPU_SPARC: machine = IMAGE_FILE_MACHINE_SPARC; break; } output( "\t%s 0x%04x\n", /* Machine */ get_asm_short_keyword(), machine ); @@ -709,7 +701,6 @@ void output_fake_module( DLLSPEC *spec ) case CPU_x86: put_word( IMAGE_FILE_MACHINE_I386 ); break; case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_POWERPC: put_word( IMAGE_FILE_MACHINE_POWERPC ); break; - case CPU_SPARC: put_word( IMAGE_FILE_MACHINE_SPARC ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index bab2b85..44bd92d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -56,7 +56,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "arm64", CPU_ARM64 }, @@ -892,7 +891,6 @@ unsigned int get_alignment(unsigned int align) { case CPU_x86: case CPU_x86_64: - case CPU_SPARC: if (target_platform != PLATFORM_APPLE) return align; /* fall through */ case CPU_POWERPC: @@ -917,7 +915,6 @@ unsigned int get_page_size(void) case CPU_POWERPC: return 4096; case CPU_ARM: return 4096; case CPU_ARM64: return 4096; - case CPU_SPARC: return 8192; } /* unreached */ assert(0); @@ -931,7 +928,6 @@ unsigned int get_ptr_size(void) { case CPU_x86: case CPU_POWERPC: - case CPU_SPARC: case CPU_ARM: return 4; case CPU_x86_64:

1 0

André Hentschel : winegcc: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: ee7ffdcb53e6541a1000fdc92958a84f465714ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ffdcb53e6541a1000fdc92… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:34:33 2013 +0100 winegcc: Remove SPARC support. --- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index a75b3cc..7d20c62 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -37,7 +37,7 @@ enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_POWERPC, CPU_ARM, CPU_ARM64 + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; enum target_platform diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7d528e0..06aa200 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -158,7 +158,6 @@ static const struct { "i786", CPU_x86 }, { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, { "powerpc", CPU_POWERPC }, { "arm", CPU_ARM }, { "aarch64", CPU_ARM64 } @@ -218,8 +217,6 @@ struct options static const enum target_cpu build_cpu = CPU_x86; #elif defined(__x86_64__) static const enum target_cpu build_cpu = CPU_x86_64; -#elif defined(__sparc__) -static const enum target_cpu build_cpu = CPU_SPARC; #elif defined(__powerpc__) static const enum target_cpu build_cpu = CPU_POWERPC; #elif defined(__arm__)

1 0

André Hentschel : winedump: Remove SPARC support.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 1948f3253be105736ba14e9e5d692df842ae4f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1948f3253be105736ba14e9e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 8 21:39:12 2013 +0100 winedump: Remove SPARC support. --- tools/winedump/pe.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4cf0b40..b6c8a34 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -64,7 +64,6 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_ARM: return "ARM"; case IMAGE_FILE_MACHINE_ARMNT: return "ARMNT"; case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; - case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; } return "???"; }

1 0

Ken Thomases : winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 4d51a688e37d070d6345587d63facbc630a43a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d51a688e37d070d6345587d6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:30 2013 -0500 winemac: Override -[NSOpenGLContext clearDrawable] to not hide the GL surface. This fixes a problem with flickering when repeatedly attaching and detaching a GL context from a window, such as for each WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5879b4d..f67ea89 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -38,6 +38,31 @@ [super dealloc]; } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the + undesirable side effect of ordering the view's GL surface off-screen. This isn't + done when just changing the context's view to a different view (which I would + think would be analogous, since the old view and surface end up without a + context attached). So, we finesse things by first setting the context's view to + a different view (the content view of an off-screen window) and then letting the + original implementation proceed. */ + - (void) clearDrawable + { + static NSWindow* dummyWindow; + static dispatch_once_t once; + + dispatch_once(&once, ^{ + OnMainThread(^{ + dummyWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) + styleMask:NSBorderlessWindowMask + backing:NSBackingStoreBuffered + defer:NO]; + }); + }); + + [self setView:[dummyWindow contentView]]; + [super clearDrawable]; + } + @end

1 0

Ken Thomases : winemac: Don' t defer attaching OpenGL context to view if it is backed by a window device .
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 89a4e5a6d1c77646fd397e3419a91a08533bbfb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a4e5a6d1c77646fd397e341… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 10 17:38:25 2013 -0500 winemac: Don't defer attaching OpenGL context to view if it is backed by a window device. This fixes a problem with certain OpenGL programs which create a context very briefly before destroying it, like while handling WM_PAINT. --- dlls/winemac.drv/cocoa_opengl.m | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 66eec63..5879b4d 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -21,6 +21,7 @@ #import "cocoa_opengl.h" #include "macdrv_cocoa.h" +#include "cocoa_app.h" @interface WineOpenGLContext () @@ -97,8 +98,21 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { + __block BOOL windowHasDevice; + macdrv_add_view_opengl_context(v, c); - [context setLatentView:view]; + + OnMainThread(^{ + windowHasDevice = [[view window] windowNumber] > 0; + }); + if (windowHasDevice) + { + [context setView:view]; + [context setLatentView:nil]; + } + else + [context setLatentView:view]; + [context makeCurrentContext]; } else

1 0

Andrew Talbot : msvcp60: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 956219b5d9801189fa18be8243dd6277410e5a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956219b5d9801189fa18be824… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 9 21:48:53 2013 +0000 msvcp60: Avoid signed-unsigned integer comparisons. --- dlls/msvcp60/ios.c | 2 +- dlls/msvcp60/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f68bcde..64b3271 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2456,7 +2456,7 @@ static FILE* _Fiopen_wchar(const wchar_t *name, int mode, int prot) }; int real_mode = mode & ~(OPENMODE_ate|OPENMODE__Nocreate|OPENMODE__Noreplace|OPENMODE_binary); - int mode_idx; + unsigned int mode_idx; FILE *f = NULL; TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 98eb9cf..a54fd28 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -80,7 +80,7 @@ unsigned short __cdecl wctype(const char *property) { "upper", _UPPER }, { "xdigit", _HEX } }; - int i; + unsigned int i; for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) if(!strcmp(property, properties[i].name))

1 0

Akihiro Sagawa : msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 0010ee021a6c79eb766b805f5fa1485f13bb51f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0010ee021a6c79eb766b805f5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:40 2013 +0900 msvcrt: Fix incorrect casts in _wcstoi64_l and _wcstoui64_l. --- dlls/msvcrt/tests/string.c | 8 ++++---- dlls/msvcrt/wcs.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 98d79c4..31314fd 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2491,8 +2491,8 @@ static void test__wcstoi64(void) res = p_wcstoi64(digit, NULL, 10); ok(res == 9, "res != 9\n"); res = p_wcstoi64(stock, &endpos, 10); - todo_wine ok(res == 0, "res != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(res == 0, "res != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); res = p_wcstoi64(tamil, &endpos, 10); ok(res == 0, "res != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); @@ -2506,8 +2506,8 @@ static void test__wcstoi64(void) ures = p_wcstoui64(digit, NULL, 10); ok(ures == 9, "ures != 9\n"); ures = p_wcstoui64(stock, &endpos, 10); - todo_wine ok(ures == 0, "ures != 0\n"); - todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ok(ures == 0, "ures != 0\n"); + ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); ures = p_wcstoui64(tamil, &endpos, 10); ok(ures == 0, "ures != 0\n"); ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a0b1cb6..ba53084 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1395,7 +1395,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; if(isdigitW(cur)) { @@ -1493,10 +1493,10 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } while(*nptr) { - char cur = tolowerW(*nptr); + MSVCRT_wchar_t cur = tolowerW(*nptr); int v; - if(isdigit(cur)) { + if(isdigitW(cur)) { if(cur >= '0'+base) break; v = *nptr-'0';

1 0

Akihiro Sagawa : msvcrt/tests: Add _wcstoi64/_wcstoui64 tests.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 564b68244702031299d99d5354e7b573620f40e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564b68244702031299d99d535… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 9 16:56:38 2013 +0900 msvcrt/tests: Add _wcstoi64/_wcstoui64 tests. --- dlls/msvcrt/tests/string.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 43fe7c5..98d79c4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -71,6 +71,8 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); +static __int64 (__cdecl *p_wcstoi64)(const wchar_t *, wchar_t **, int); +static unsigned __int64 (__cdecl *p_wcstoui64)(const wchar_t *, wchar_t **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); @@ -2468,6 +2470,57 @@ static void test__stricmp(void) setlocale(LC_ALL, "C"); } +static void test__wcstoi64(void) +{ + static const WCHAR digit[] = { '9', 0 }; + static const WCHAR stock[] = { 0x3231, 0 }; /* PARENTHESIZED IDEOGRAPH STOCK */ + static const WCHAR tamil[] = { 0x0bef, 0 }; /* TAMIL DIGIT NINE */ + static const WCHAR thai[] = { 0x0e59, 0 }; /* THAI DIGIT NINE */ + static const WCHAR fullwidth[] = { 0xff19, 0 }; /* FULLWIDTH DIGIT NINE */ + static const WCHAR hex[] = { 0xff19, 'f', 0x0e59, 0xff46, 0 }; + + __int64 res; + unsigned __int64 ures; + WCHAR *endpos; + + if (!p_wcstoi64 || !p_wcstoui64) { + win_skip("_wcstoi64 or _wcstoui64 not found\n"); + return; + } + + res = p_wcstoi64(digit, NULL, 10); + ok(res == 9, "res != 9\n"); + res = p_wcstoi64(stock, &endpos, 10); + todo_wine ok(res == 0, "res != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + res = p_wcstoi64(tamil, &endpos, 10); + ok(res == 0, "res != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + res = p_wcstoi64(thai, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(fullwidth, NULL, 10); + todo_wine ok(res == 9, "res != 9\n"); + res = p_wcstoi64(hex, NULL, 16); + todo_wine ok(res == 0x9f9, "res != 0x9f9\n"); + + ures = p_wcstoui64(digit, NULL, 10); + ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(stock, &endpos, 10); + todo_wine ok(ures == 0, "ures != 0\n"); + todo_wine ok(endpos == stock, "Incorrect endpos (%p-%p)\n", stock, endpos); + ures = p_wcstoui64(tamil, &endpos, 10); + ok(ures == 0, "ures != 0\n"); + ok(endpos == tamil, "Incorrect endpos (%p-%p)\n", tamil, endpos); + ures = p_wcstoui64(thai, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(fullwidth, NULL, 10); + todo_wine ok(ures == 9, "ures != 9\n"); + ures = p_wcstoui64(hex, NULL, 16); + todo_wine ok(ures == 0x9f9, "ures != 0x9f9\n"); + + return; +} + START_TEST(string) { char mem[100]; @@ -2495,6 +2548,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *)GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *)GetProcAddress(hMsvcrt, "_strtoui64"); + p_wcstoi64 = (void *)GetProcAddress(hMsvcrt, "_wcstoi64"); + p_wcstoui64 = (void *)GetProcAddress(hMsvcrt, "_wcstoui64"); pmbstowcs_s = (void *)GetProcAddress(hMsvcrt, "mbstowcs_s"); pwcstombs_s = (void *)GetProcAddress(hMsvcrt, "wcstombs_s"); pwcsrtombs = (void *)GetProcAddress(hMsvcrt, "wcsrtombs"); @@ -2564,4 +2619,5 @@ START_TEST(string) test_tolower(); test__atodbl(); test__stricmp(); + test__wcstoi64(); }

1 0

Dmitry Timoshkov : gdiplus: Print a passed in rectangle in GdipCombineRegionRect.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 65bd8f2b262075938324ec2689e667aca96350cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bd8f2b262075938324ec268… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 11 17:31:52 2013 +0900 gdiplus: Print a passed in rectangle in GdipCombineRegionRect. --- dlls/gdiplus/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 5583514..99c5d35 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -282,7 +282,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRect(GpRegion *region, region_element *left, *right = NULL; GpStatus stat; - TRACE("%p %p %d\n", region, rect, mode); + TRACE("%p %s %d\n", region, debugstr_rectf(rect), mode); if (!(region && rect)) return InvalidParameter;

1 0

Nikolay Sivov : xmllite: Fix a test failure on Windows 8.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: e5a48b2d75bd9669ae6c78f4090fc385e36937b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a48b2d75bd9669ae6c78f40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:49:28 2013 +0400 xmllite: Fix a test failure on Windows 8. --- dlls/xmllite/reader.c | 2 ++ dlls/xmllite/tests/reader.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 16734d4..92ab215 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2246,6 +2246,8 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT TRACE("(%p)->(%p %p)\n", This, value, len); + *value = NULL; + if ((This->nodetype == XmlNodeType_Comment && !This->strvalues[StringValue_Value].str) || is_reader_pending(This)) { diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7373a69..b0a14d3 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1238,16 +1238,16 @@ static void test_read_pending(void) int c; hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(hr == S_OK, "S_OK, got 0x%08x\n", hr); hr = IXmlReader_SetInput(reader, (IUnknown*)&teststream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); /* first read call returns incomplete node, second attempt fails with E_PENDING */ stream_readcall = 0; type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK || broken(hr == E_PENDING), "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); @@ -1257,8 +1257,8 @@ static void test_read_pending(void) c = stream_readcall; value = (void*)0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, NULL); - ok(hr == E_PENDING, "Expected E_PENDING, got %08x\n", hr); - ok(value == (void*)0xdeadbeef, "got %p\n", value); + ok(hr == E_PENDING, "got 0x%08x\n", hr); + ok(value == NULL || broken(value == (void*)0xdeadbeef) /* Win8 sets it to NULL */, "got %p\n", value); ok(c < stream_readcall || broken(c == stream_readcall), "got %d, expected %d\n", stream_readcall, c+1); IXmlReader_Release(reader);

1 0

Nikolay Sivov : xmllite: Make another read attempt if we don' t have enough data initially.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 88d7b66be2716e8c8374d7a45bd823f7e6430026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d7b66be2716e8c8374d7a45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 08:45:53 2013 +0400 xmllite: Make another read attempt if we don't have enough data initially. --- dlls/xmllite/reader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 688497c..16734d4 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -610,7 +610,12 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod *enc = XmlEncoding_Unknown; - if (buffer->written <= 3) return MX_E_INPUTEND; + if (buffer->written <= 3) + { + HRESULT hr = readerinput_growraw(readerinput); + if (FAILED(hr)) return hr; + if (buffer->written <= 3) return MX_E_INPUTEND; + } /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */

1 0

Nikolay Sivov : xmllite: Actually resume comment and PI parsing while on Misc part.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: c38c471b644d571c038fbee6fcdd1ed1772edb81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c471b644d571c038fbee6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 15:45:38 2013 +0400 xmllite: Actually resume comment and PI parsing while on Misc part. --- dlls/xmllite/reader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 489d346..9216127 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -63,6 +63,7 @@ typedef enum XmlReadResumeState_Initial, XmlReadResumeState_PITarget, XmlReadResumeState_PIBody, + XmlReadResumeState_Comment, XmlReadResumeState_STag } XmlReaderResumeState; @@ -1064,6 +1065,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; + reader->resumestate = XmlReadResumeState_Comment; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1088,6 +1090,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = NULL; + reader->resumestate = XmlReadResumeState_Initial; return S_OK; } else @@ -1354,14 +1357,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) { HRESULT hr = S_FALSE; - if (is_reader_pending(reader)) + if (reader->resumestate != XmlReadResumeState_Initial) { hr = reader_more(reader); if (FAILED(hr)) return hr; /* finish current node */ - if (reader->nodetype == XmlNodeType_Comment) + switch (reader->resumestate) + { + case XmlReadResumeState_PITarget: + case XmlReadResumeState_PIBody: + return reader_parse_pi(reader); + case XmlReadResumeState_Comment: return reader_parse_comment(reader); + default: + ERR("unknown resume state %d\n", reader->resumestate); + } } while (1)

1 0

Detlef Riekenberg : kernel32/tests: Fix failures with virtual Drives ( AppVirt Client).
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 3826193f33fbbf726dd02d4a2187f3117f0bd0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826193f33fbbf726dd02d4a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 11 00:11:22 2013 +0100 kernel32/tests: Fix failures with virtual Drives (AppVirt Client). --- dlls/kernel32/tests/drive.c | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index 14c0cf2..ca6cb44 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -114,16 +114,12 @@ static void test_GetDiskFreeSpaceA(void) drive, ret, GetLastError()); else { - ok(ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_INVALID_DRIVE || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", - drive, ret, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceA(%s) failed with %d\n", drive, GetLastError()); + if( GetVersion() & 0x80000000) /* win3.0 through winME */ ok( total_clusters <= 65535, @@ -135,14 +131,12 @@ static void test_GetDiskFreeSpaceA(void) tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_NETNAME_DELETED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); + + if (!ret) + /* GetDiskFreeSpaceExA() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceExA(%s) failed with %d\n", drive, GetLastError()); + ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, "GetDiskFreeSpaceA should report at least as much bytes on disk %s as GetDiskFreeSpaceExA\n", drive); @@ -196,15 +190,10 @@ static void test_GetDiskFreeSpaceW(void) ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", drive[0], ret, GetLastError()); - else - ok( ret || - GetLastError() == ERROR_NOT_READY || - GetLastError() == ERROR_INVALID_FUNCTION || - GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_REQUEST_ABORTED || - GetLastError() == ERROR_UNRECOGNIZED_VOLUME, - "GetDiskFreeSpaceW(%c): ret=%d GetLastError=%d\n", - drive[0], ret, GetLastError()); + else if (!ret) + /* GetDiskFreeSpaceW() should succeed, but it can fail with too many + different GetLastError() results to be usable for a ok() */ + trace("GetDiskFreeSpaceW(%c) failed with %d\n", drive[0], GetLastError()); } logical_drives >>= 1; }

1 0

Vincent Povirk : gdiplus: Fix GdipCreateBitmapFromGraphics implementation.
by Alexandre Julliard March 11, 2013

March 11, 2013

Module: wine Branch: master Commit: 636e60b6e020a8e37e6dac03481bedcb20f3edca URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e60b6e020a8e37e6dac034… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 9 12:08:27 2013 -0600 gdiplus: Fix GdipCreateBitmapFromGraphics implementation. --- dlls/gdiplus/image.c | 14 +++++----- dlls/gdiplus/tests/graphics.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ff27334..98c0bd0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1595,12 +1595,9 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, return NotImplemented; } -/* FIXME: this should create a bitmap in the given size with the attributes - * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, GpGraphics* target, GpBitmap** bitmap) { - static int calls; GpStatus ret; TRACE("(%d, %d, %p, %p)\n", width, height, target, bitmap); @@ -1608,12 +1605,15 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, if(!target || !bitmap) return InvalidParameter; - if(!(calls++)) - FIXME("hacked stub\n"); - - ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, bitmap); + if (ret == Ok) + { + GdipGetDpiX(target, &(*bitmap)->image.xres); + GdipGetDpiY(target, &(*bitmap)->image.yres); + } + return ret; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 08b2465..e41751a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4282,6 +4282,58 @@ static void test_alpha_hdc(void) DeleteDC(hdc); } +static void test_bitmapfromgraphics(void) +{ + GpStatus stat; + GpGraphics *graphics = NULL; + HDC hdc = GetDC( hwnd ); + GpBitmap *bitmap = NULL; + PixelFormat format; + REAL imageres, graphicsres; + UINT width, height; + + stat = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, NULL, &bitmap); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, NULL); + expect(InvalidParameter, stat); + + stat = GdipCreateBitmapFromGraphics(12, 13, graphics, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); + expect(Ok, stat); + expect(PixelFormat32bppPARGB, format); + + stat = GdipGetDpiX(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetDpiY(graphics, &graphicsres); + expect(Ok, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &imageres); + expect(Ok, stat); + expectf(graphicsres, imageres); + + stat = GdipGetImageWidth((GpImage*)bitmap, &width); + expect(Ok, stat); + expect(12, width); + + stat = GdipGetImageHeight((GpImage*)bitmap, &height); + expect(Ok, stat); + expect(13, height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4349,6 +4401,7 @@ START_TEST(graphics) test_get_set_textrenderinghint(); test_getdc_scaled(); test_alpha_hdc(); + test_bitmapfromgraphics(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0