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

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