May 2009 - Wine-commits - list.winehq.org

Nicolas Le Cam : user32/tests: Fix VK_RMENU input tests on localized Windows.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 321b2f00f3b33e4546951fdfa950909bb0d39ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321b2f00f3b33e4546951fdfa… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat May 2 02:11:38 2009 +0200 user32/tests: Fix VK_RMENU input tests on localized Windows. --- dlls/user32/tests/input.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 0a92f26..2ad3eae 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -573,6 +573,7 @@ struct sendinput_test_s { {{VK_MENU, 0x00}, {VK_LMENU, 0x00}, {VK_CONTROL, 0x00, 1}, {VK_LCONTROL, 0x01, 1}, {0}}, {{WM_SYSKEYDOWN, hook|wparam|optional, VK_LCONTROL}, {WM_SYSKEYDOWN, hook|wparam, VK_RMENU}, + {WM_KEYDOWN, wparam|lparam|optional, VK_CONTROL, 0}, {WM_SYSKEYDOWN, wparam|lparam, VK_MENU, 0}, {0}}}, {VK_RMENU, KEYEVENTF_KEYUP, 1, {{VK_MENU, 0x80}, {VK_LMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, @@ -580,7 +581,7 @@ struct sendinput_test_s { {WM_KEYUP, hook|wparam, VK_RMENU}, {WM_SYSKEYUP, wparam|lparam|optional, VK_CONTROL, KF_UP}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP}, - {WM_SYSCOMMAND}, {0}}}, + {WM_SYSCOMMAND, optional}, {0}}}, /* LMENU | KEYEVENTF_EXTENDEDKEY == RMENU */ /* 40 */ {VK_LMENU, KEYEVENTF_EXTENDEDKEY, 0, @@ -598,6 +599,7 @@ struct sendinput_test_s { {{VK_MENU, 0x00}, {VK_RMENU, 0x00}, {VK_CONTROL, 0x00, 1}, {VK_LCONTROL, 0x01, 1}, {0}}, {{WM_SYSKEYDOWN, hook|wparam|lparam|optional, VK_LCONTROL, 0}, {WM_SYSKEYDOWN, hook|wparam|lparam, VK_RMENU, LLKHF_EXTENDED}, + {WM_KEYDOWN, wparam|lparam|optional, VK_CONTROL, 0}, {WM_SYSKEYDOWN, wparam|lparam, VK_MENU, KF_EXTENDED}, {0}}}, {VK_RMENU, KEYEVENTF_KEYUP | KEYEVENTF_EXTENDEDKEY, 1, {{VK_MENU, 0x80}, {VK_RMENU, 0x80}, {VK_CONTROL, 0x81, 1}, {VK_LCONTROL, 0x80, 1}, {0}}, @@ -605,7 +607,7 @@ struct sendinput_test_s { {WM_KEYUP, hook|wparam|lparam, VK_RMENU, LLKHF_UP|LLKHF_EXTENDED}, {WM_SYSKEYUP, wparam|lparam|optional, VK_CONTROL, KF_UP}, {WM_SYSKEYUP, wparam|lparam, VK_MENU, KF_UP|KF_EXTENDED}, - {WM_SYSCOMMAND}, {0}}}, + {WM_SYSCOMMAND, optional}, {0}}}, /* MENU == LMENU */ /* 44 */ {VK_MENU, 0, 0, @@ -747,14 +749,6 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes expected++; continue; } - else if (test->_todo_wine) - { - failcount++; - todo_wine - ok(FALSE, - "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n", - id, test->wVk, test->dwFlags, expected->message, actual->message); - } /* NT4 doesn't send SYSKEYDOWN/UP to hooks, only KEYDOWN/UP */ else if ((expected->flags & hook) && (expected->message == WM_SYSKEYDOWN || expected->message == WM_SYSKEYUP) && @@ -764,6 +758,24 @@ static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct sendinput_tes "%2d (%x/%x): the msg 0x%04x should have been sent by a hook\n", id, test->wVk, test->dwFlags, expected->message); } + /* For VK_RMENU, at least localized Win2k/XP sends KEYDOWN/UP + * instead of SYSKEYDOWN/UP to the WNDPROC */ + else if (test->wVk == VK_RMENU && !(expected->flags & hook) && + (expected->message == WM_SYSKEYDOWN || expected->message == WM_SYSKEYUP) && + (actual->message == expected->message - 4)) + { + ok(expected->wParam == actual->wParam && expected->lParam == actual->lParam, + "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n", + id, test->wVk, test->dwFlags, expected->message, actual->message); + } + else if (test->_todo_wine) + { + failcount++; + todo_wine + ok(FALSE, + "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n", + id, test->wVk, test->dwFlags, expected->message, actual->message); + } else ok(FALSE, "%2d (%x/%x): the msg 0x%04x was expected, but got msg 0x%04x instead\n",

1 0

Alexandre Julliard : ntdll: Use standard siginfo signal handlers on all platforms.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 9968d84973982187a44a4b0dd7634c99434c18ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=9968d84973982187a44a4b0dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 17:57:29 2009 +0200 ntdll: Use standard siginfo signal handlers on all platforms. --- dlls/ntdll/signal_powerpc.c | 256 +++++++++++++++++++------------------------ dlls/ntdll/signal_sparc.c | 83 +++++++------- dlls/ntdll/signal_x86_64.c | 130 ++++++++++------------- 3 files changed, 210 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9968d84973982187a44a4…

1 0

Alexandre Julliard : ntdll: Save all segment registers on x86_64. Implement set_cpu_context.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: a950910eecfdc17b96c75b5fa107d7118f1809c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a950910eecfdc17b96c75b5fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 18:01:51 2009 +0200 ntdll: Save all segment registers on x86_64. Implement set_cpu_context. --- dlls/ntdll/signal_x86_64.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8e9b8c4..15785e5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -195,9 +195,21 @@ static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) context->SegFs = FS_sig(sigcontext); context->SegGs = GS_sig(sigcontext); context->EFlags = EFL_sig(sigcontext); - context->SegDs = 0; /* FIXME */ - context->SegEs = 0; /* FIXME */ - context->SegSs = 0; /* FIXME */ +#ifdef DS_sig + context->SegDs = DS_sig(sigcontext); +#else + __asm__("movw %%ds,%0" : "=m" (context->SegDs)); +#endif +#ifdef ES_sig + context->SegEs = ES_sig(sigcontext); +#else + __asm__("movw %%es,%0" : "=m" (context->SegEs)); +#endif +#ifdef SS_sig + context->SegSs = SS_sig(sigcontext); +#else + __asm__("movw %%ss,%0" : "=m" (context->SegSs)); +#endif context->MxCsr = 0; /* FIXME */ if (FPU_sig(sigcontext)) { @@ -235,6 +247,15 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) FS_sig(sigcontext) = context->SegFs; GS_sig(sigcontext) = context->SegGs; EFL_sig(sigcontext) = context->EFlags; +#ifdef DS_sig + DS_sig(sigcontext) = context->SegDs; +#endif +#ifdef ES_sig + ES_sig(sigcontext) = context->SegEs; +#endif +#ifdef SS_sig + SS_sig(sigcontext) = context->SegSs; +#endif if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; } @@ -256,7 +277,8 @@ DEFINE_REGS_ENTRYPOINT( RtlCaptureContext, 1 ) */ void set_cpu_context( const CONTEXT *context ) { - FIXME("not implemented\n"); + extern void CDECL __wine_restore_regs( const CONTEXT * ) DECLSPEC_NORETURN; + __wine_restore_regs( context ); }

1 0

Alexandre Julliard : winebuild: Use iretq on x86_64 to restore more system registers and flags.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 880d00fb43de924a3543b0ad53b5aaf0ad63d0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=880d00fb43de924a3543b0ad5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 18:03:23 2009 +0200 winebuild: Use iretq on x86_64 to restore more system registers and flags. --- tools/winebuild/relay.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 50b47d9..ddc8051 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -1111,19 +1111,17 @@ static void build_call_from_regs_x86_64(void) output( "\tfxrstor 0x100(%%rbx)\n" ); output( "\tldmxcsr 0x34(%%rbx)\n" ); - output( "\tmovl 0x44(%%rbx),%%eax\n" ); - output( "\tpushq %%rax\n" ); - output( "\tpopfq\n" ); - - output( "\tmovq 0x98(%%rbx),%%rax\n" ); /* stack pointer */ - output( "\tpushq 0xf8(%%rbx)\n" ); /* return address */ - output( "\tpopq -8(%%rax)\n" ); - output( "\tpushq 0x78(%%rbx)\n" ); /* rax */ - output( "\tpopq -16(%%rax)\n" ); - output( "\tmovq 0x90(%%rbx),%%rbx\n" ); - output( "\tleaq -16(%%rax),%%rsp\n" ); - output( "\tpopq %%rax\n" ); - output( "\tret\n" ); + output( "\tmovq 0xf8(%%rbx),%%rax\n" ); /* rip */ + output( "\tmovq %%rax,0(%%rsp)\n" ); + output( "\tmovw 0x38(%%rbx),%%ax\n" ); /* cs */ + output( "\tmovq %%rax,0x8(%%rsp)\n" ); + output( "\tmovl 0x44(%%rbx),%%eax\n" ); /* flags */ + output( "\tmovq %%rax,0x10(%%rsp)\n" ); + output( "\tmovq 0x98(%%rbx),%%rax\n" ); /* rsp */ + output( "\tmovq %%rax,0x18(%%rsp)\n" ); + output( "\tmovw 0x42(%%rbx),%%ax\n" ); /* ss */ + output( "\tmovq %%rax,0x20(%%rsp)\n" ); + output( "\tiretq\n" ); output_function_size( "__wine_call_from_regs" );

1 0

Alexandre Julliard : winedbg: Fix formatting of the flag register bits.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: b26ae69fcb81e2b579fae118a68dc25b20f5548e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26ae69fcb81e2b579fae118a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 18:28:49 2009 +0200 winedbg: Fix formatting of the flag register bits. --- programs/winedbg/be_i386.c | 30 +++++++----------------------- programs/winedbg/be_x86_64.c | 31 ++++++++----------------------- 2 files changed, 15 insertions(+), 46 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3638463..ce2076c 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -197,8 +197,9 @@ static void be_i386_all_print_context(HANDLE hThread, const CONTEXT* ctx) static void be_i386_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char flags[] = "aVR-N--ODITSZ-A-P-C"; + int i; char buf[33]; - char* pt; dbg_printf("Register dump:\n"); @@ -208,28 +209,11 @@ static void be_i386_print_context(HANDLE hThread, const CONTEXT* ctx, int all_re (WORD)ctx->SegDs, (WORD)ctx->SegEs, (WORD)ctx->SegFs, (WORD)ctx->SegGs); - strcpy(buf, " - 00 - - - "); - pt = buf + strlen(buf) - 1; - if (ctx->EFlags & 0x00000001) *pt-- = 'C'; /* Carry Flag */ - if (ctx->EFlags & 0x00000002) *pt-- = '1'; - if (ctx->EFlags & 0x00000004) *pt-- = 'P'; /* Parity Flag */ - if (ctx->EFlags & 0x00000008) *pt-- = '-'; - if (ctx->EFlags & 0x00000010) *pt-- = 'A'; /* Auxiliary Carry Flag */ - if (ctx->EFlags & 0x00000020) *pt-- = '-'; - if (ctx->EFlags & 0x00000040) *pt-- = 'Z'; /* Zero Flag */ - if (ctx->EFlags & 0x00000080) *pt-- = 'S'; /* Sign Flag */ - if (ctx->EFlags & 0x00000100) *pt-- = 'T'; /* Trap/Trace Flag */ - if (ctx->EFlags & 0x00000200) *pt-- = 'I'; /* Interrupt Enable Flag */ - if (ctx->EFlags & 0x00000400) *pt-- = 'D'; /* Direction Indicator */ - if (ctx->EFlags & 0x00000800) *pt-- = 'O'; /* Overflow flags */ - if (ctx->EFlags & 0x00001000) *pt-- = '1'; /* I/O Privilege Level */ - if (ctx->EFlags & 0x00002000) *pt-- = '1'; /* I/O Privilege Level */ - if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ - if (ctx->EFlags & 0x00008000) *pt-- = '-'; - if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ - if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Virtual Mode Flag */ - if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ - + strcpy(buf, flags); + for (i = 0; buf[i]; i++) + if (buf[i] != '-' && !(ctx->EFlags & (1 << (sizeof(flags) - 2 - i)))) + buf[i] = ' '; + switch (get_selector_type(hThread, ctx, ctx->SegCs)) { case AddrMode1616: diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index e822012..6f4bf7e 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -66,31 +66,16 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { - char *pt, buf[33]; + static const char flags[] = "aVR-N--ODITSZ-A-P-C"; + char buf[33]; + int i; - dbg_printf("Register dump:\n"); - strcpy(buf, " - 00 - - - "); - pt = buf + strlen(buf) - 1; - if (ctx->EFlags & 0x00000001) *pt-- = 'C'; /* Carry Flag */ - if (ctx->EFlags & 0x00000002) *pt-- = '1'; - if (ctx->EFlags & 0x00000004) *pt-- = 'P'; /* Parity Flag */ - if (ctx->EFlags & 0x00000008) *pt-- = '-'; - if (ctx->EFlags & 0x00000010) *pt-- = 'A'; /* Auxiliary Carry Flag */ - if (ctx->EFlags & 0x00000020) *pt-- = '-'; - if (ctx->EFlags & 0x00000040) *pt-- = 'Z'; /* Zero Flag */ - if (ctx->EFlags & 0x00000080) *pt-- = 'S'; /* Sign Flag */ - if (ctx->EFlags & 0x00000100) *pt-- = 'T'; /* Trap/Trace Flag */ - if (ctx->EFlags & 0x00000200) *pt-- = 'I'; /* Interrupt Enable Flag */ - if (ctx->EFlags & 0x00000400) *pt-- = 'D'; /* Direction Indicator */ - if (ctx->EFlags & 0x00000800) *pt-- = 'O'; /* Overflow flags */ - if (ctx->EFlags & 0x00001000) *pt-- = '1'; /* I/O Privilege Level */ - if (ctx->EFlags & 0x00002000) *pt-- = '1'; /* I/O Privilege Level */ - if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ - if (ctx->EFlags & 0x00008000) *pt-- = '-'; - if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ - if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Virtual Mode Flag */ - if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ + strcpy(buf, flags); + for (i = 0; buf[i]; i++) + if (buf[i] != '-' && !(ctx->EFlags & (1 << (sizeof(flags) - 2 - i)))) + buf[i] = ' '; + dbg_printf("Register dump:\n"); dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n", ctx->Rip, ctx->Rsp, ctx->Rbp, ctx->EFlags, buf); dbg_printf(" rax:%016lx rbx:%016lx rcx:%016lx rdx:%016lx\n",

1 0

Alexandre Julliard : winedbg: Implement single step for x86_64.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 8b3b328319b0e737d73b35942fd8f09b54cd9743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3b328319b0e737d73b35942… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 18:29:10 2009 +0200 winedbg: Implement single step for x86_64. --- programs/winedbg/be_x86_64.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 6f4bf7e..56af50f 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -22,6 +22,8 @@ #if defined(__x86_64__) +#define STEP_FLAG 0x00000100 /* single step flag */ + static unsigned be_x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum be_cpu_addr bca, ADDRESS64* addr) { @@ -60,7 +62,8 @@ static unsigned be_x86_64_get_register_info(int regno, enum be_cpu_addr* kind) static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("not done single_step\n"); + if (enable) ctx->EFlags |= STEP_FLAG; + else ctx->EFlags &= ~STEP_FLAG; } static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx,

1 0

Vincent Povirk : winex11.drv: Export copied images as image/bmp.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 56a3e788eacee60c255b1b38a19d738ba4b5fe3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a3e788eacee60c255b1b38a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 30 14:40:29 2009 -0500 winex11.drv: Export copied images as image/bmp. --- dlls/winex11.drv/clipboard.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 5a042f6..f14a84c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -161,6 +161,8 @@ static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); +static HANDLE X11DRV_CLIPBOARD_ExportImageBmp(Display *display, Window requestor, Atom aTarget, + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes); static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, @@ -283,7 +285,7 @@ static WINE_CLIPFORMAT ClipFormats[] = X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[21], &ClipFormats[23]}, { CF_DIB, wszIMAGEBMP, 0, CF_FLAG_BUILTINFMT, X11DRV_CLIPBOARD_ImportImageBmp, - NULL, &ClipFormats[22], NULL}, + X11DRV_CLIPBOARD_ExportImageBmp, &ClipFormats[22], NULL}, }; #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) @@ -1709,6 +1711,75 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor /************************************************************************** + * X11DRV_CLIPBOARD_ExportImageBmp + * + * Export CF_DIB to image/bmp. + */ +static HANDLE X11DRV_CLIPBOARD_ExportImageBmp(Display *display, Window requestor, Atom aTarget, Atom rprop, + LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) +{ + HANDLE hpackeddib; + LPBYTE dibdata; + UINT bmpsize; + HANDLE hbmpdata; + LPBYTE bmpdata; + BITMAPFILEHEADER *bfh; + + *lpBytes = 0; + + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) + { + ERR("Failed to export %04x format\n", lpdata->wFormatID); + return 0; + } + + hpackeddib = lpdata->hData32; + + dibdata = GlobalLock(hpackeddib); + if (!dibdata) + { + ERR("Failed to lock packed DIB\n"); + return 0; + } + + bmpsize = sizeof(BITMAPFILEHEADER) + GlobalSize(hpackeddib); + + hbmpdata = GlobalAlloc(0, bmpsize); + + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + + if (!bmpdata) + { + GlobalFree(hbmpdata); + GlobalUnlock(hpackeddib); + return 0; + } + + /* bitmap file header */ + bfh = (BITMAPFILEHEADER*)bmpdata; + bfh->bfType = 0x4d42; /* "BM" */ + bfh->bfSize = bmpsize; + bfh->bfReserved1 = 0; + bfh->bfReserved2 = 0; + bfh->bfOffBits = sizeof(BITMAPFILEHEADER) + bitmap_info_size((BITMAPINFO*)dibdata, DIB_RGB_COLORS); + + /* rest of bitmap is the same as the packed dib */ + memcpy(bfh+1, dibdata, bmpsize-sizeof(BITMAPFILEHEADER)); + + *lpBytes = bmpsize; + + GlobalUnlock(hbmpdata); + } + + GlobalUnlock(hpackeddib); + + return hbmpdata; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_ExportMetaFilePict * * Export MetaFilePict.

1 0

Henri Verbeet : wined3d: Avoid using WINED3DSP_REGNUM_MASK in the def/defi/ defb handlers.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 5e072395b40499190e33e5d13e9942fc9ed3d699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e072395b40499190e33e5d13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Avoid using WINED3DSP_REGNUM_MASK in the def/defi/defb handlers. --- dlls/wined3d/baseshader.c | 86 +++++++++++++++++++++++++++----------------- 1 files changed, 53 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c56b3cf..9bdad17 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -468,17 +468,6 @@ void shader_init(struct IWineD3DBaseShaderClass *shader, list_init(&shader->linked_programs); } -static inline WINED3DSHADER_PARAM_REGISTER_TYPE shader_get_regtype(DWORD param) -{ - return ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) - | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); -} - -static inline DWORD shader_get_writemask(DWORD param) -{ - return param & WINED3DSP_WRITEMASK_ALL; -} - /* Convert floating point offset relative * to a register file to an absolute offset for float constants */ static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) @@ -671,10 +660,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } else if (ins.handler_idx == WINED3DSIH_DEF) { + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; - lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(lconst->value, pToken + 1, 4 * sizeof(DWORD)); + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); + lconst->idx = dst.register_idx; + + memcpy(lconst->value, pToken, 4 * sizeof(DWORD)); + pToken += 4; /* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */ if (WINED3DSHADER_VERSION_MAJOR(shader_version) == 1 && pshader) @@ -691,25 +687,38 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } list_add_head(&This->baseShader.constantsF, &lconst->entry); - pToken += param_size; } else if (ins.handler_idx == WINED3DSIH_DEFI) { + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; - lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(lconst->value, pToken + 1, 4 * sizeof(DWORD)); + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); + lconst->idx = dst.register_idx; + + memcpy(lconst->value, pToken, 4 * sizeof(DWORD)); + pToken += 4; + list_add_head(&This->baseShader.constantsI, &lconst->entry); - pToken += param_size; } else if (ins.handler_idx == WINED3DSIH_DEFB) { + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; - lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; - memcpy(lconst->value, pToken + 1, 1 * sizeof(DWORD)); + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); + lconst->idx = dst.register_idx; + + memcpy(lconst->value, pToken, sizeof(DWORD)); + ++pToken; + list_add_head(&This->baseShader.constantsB, &lconst->entry); - pToken += param_size; } /* If there's a loop in the shader */ else if (ins.handler_idx == WINED3DSIH_LOOP @@ -1279,30 +1288,41 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else if (ins.handler_idx == WINED3DSIH_DEF) { - unsigned int offset = shader_get_float_offset(shader_get_regtype(*pToken), - *pToken & WINED3DSP_REGNUM_MASK); + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); - TRACE("def c%u = %f, %f, %f, %f", offset, + TRACE("def c%u = %f, %f, %f, %f", shader_get_float_offset(dst.register_type, dst.register_idx), + *(const float *)(pToken), *(const float *)(pToken + 1), *(const float *)(pToken + 2), - *(const float *)(pToken + 3), - *(const float *)(pToken + 4)); - pToken += 5; + *(const float *)(pToken + 3)); + pToken += 4; } else if (ins.handler_idx == WINED3DSIH_DEFI) { - TRACE("defi i%u = %d, %d, %d, %d", *pToken & WINED3DSP_REGNUM_MASK, + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); + + TRACE("defi i%u = %d, %d, %d, %d", dst.register_idx, + *(pToken), *(pToken + 1), *(pToken + 2), - *(pToken + 3), - *(pToken + 4)); - pToken += 5; + *(pToken + 3)); + pToken += 4; } else if (ins.handler_idx == WINED3DSIH_DEFB) { - TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK, - *(pToken + 1)? "true": "false"); - pToken += 2; + struct wined3d_shader_dst_param dst; + struct wined3d_shader_src_param rel_addr; + + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); + + TRACE("defb b%u = %s", dst.register_idx, *pToken ? "true" : "false"); + ++pToken; } else {

1 0

André Hentschel : winemaker: Make winemaker 64-bit ready.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 2100cb6196657110338340a3c5fca179f7c340c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2100cb6196657110338340a3c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 1 11:37:01 2009 +0200 winemaker: Make winemaker 64-bit ready. --- tools/winemaker | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 5300e15..55fc6f1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.0"; +my $version="0.7.1"; use Cwd; use File::Basename; @@ -64,6 +64,17 @@ my $OPT_ASK_YES=1; my $OPT_ASK_SKIP=-1; +# The following constants define the architecture + +## +# 32-Bit Target +my $OPT_ARCH_32=32; + +## +# 64-Bit Target +my $OPT_ARCH_64=64; + + # General options ## @@ -113,6 +124,10 @@ my $opt_target_type; my $opt_flags; ## +# Contains 32 for 32-Bit-Targets and 64 for 64-Bit-Targets +my $opt_arch; + +## # If true then winemaker should ask questions to the user as it goes # along. my $opt_is_interactive; @@ -974,7 +989,7 @@ sub source_scan_project_file($$$) } if ((@$target[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$target[$T_LDFLAGS]},"-mno-cygwin"; - push @{@$target[$T_LDFLAGS]},"-m32"; + push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; } push @{@$project[$P_TARGETS]},$target; @@ -1467,7 +1482,7 @@ sub source_scan_directory($$$$) } if ((@$target[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$target[$T_LDFLAGS]},"-mno-cygwin"; - push @{@$target[$T_LDFLAGS]},"-m32"; + push @{@$target[$T_LDFLAGS]},"-m$opt_arch"; } push @{@$project[$P_TARGETS]},$target; @@ -2456,6 +2471,7 @@ $opt_work_dir=undef; $opt_single_target=undef; $opt_target_type=$TT_GUIEXE; $opt_flags=0; +$opt_arch=$OPT_ARCH_32; $opt_is_interactive=$OPT_ASK_NO; $opt_ask_project_options=$OPT_ASK_NO; $opt_ask_target_options=$OPT_ASK_NO; @@ -2489,6 +2505,7 @@ sub usage() print STDERR " [-Dmacro[=defn]] [-Idir] [-Pdir] [-idll] [-Ldir] [-llibrary]\n"; print STDERR " [--nodlls] [--nomsvcrt] [--interactive] [--single-target name]\n"; print STDERR " [--generated-files|--nogenerated-files]\n"; + print STDERR " [--wine64]\n"; print STDERR " work_directory|project_file|workspace_file\n"; print STDERR "\nWinemaker is designed to recursively convert all the Windows sources found in\n"; print STDERR "the specified directory so that they can be compiled with Winelib. During this\n"; @@ -2526,6 +2543,8 @@ while (@ARGV>0) { $opt_no_generated_files=0; } elsif ($arg eq "--nogenerated-files") { $opt_no_generated_files=1; + } elsif ($arg eq "--wine64") { + $opt_arch=$OPT_ARCH_64; } elsif ($arg =~ /^-D/) { push @{$global_settings[$T_DEFINES]},$arg; } elsif ($arg =~ /^-I/) {

1 0

André Hentschel : winemaker: Update manpage.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 5b4b4955bee9bb7e2117270856382a935a540bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4b4955bee9bb7e211727085… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 1 11:37:06 2009 +0200 winemaker: Update manpage. --- tools/winemaker.man.in | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index e8afb2d..9ae2874 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "February 2009" "@PACKAGE_STRING@" "Wine Developers Manual" +.TH WINEMAKER 1 "May 2009" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winemaker \- generate a build infrastructure for compiling Windows programs on Unix .SH SYNOPSIS @@ -30,6 +30,10 @@ winemaker \- generate a build infrastructure for compiling Windows programs on U .br [ .IR "--generated-files " "] [ " "--nogenerated-files " "] +] +.br + [ +.IR "--wine64 " "] .br .IR "work_directory" "| " "project_file" "| " "workspace_file" @@ -167,6 +171,9 @@ Tells winemaker to generate the build the Makefile. This is the default. .TP .I --nogenerated-files Tells winemaker not to generate the Makefile. +.TP +.I --wine64 +Tells winemaker to generate a 64-bit Makefile. .SH EXAMPLES .PP

1 0