wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Nikolay Sivov : comctl32/listview: Remove wrong TODO entry.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: ebeabf11d39903bbecbcfbbcc6ce1479071832de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeabf11d39903bbecbcfbbcc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 1 16:26:21 2009 +0400 comctl32/listview: Remove wrong TODO entry. --- dlls/comctl32/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 169c242..28dce02 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -142,7 +142,6 @@ * -- ListView_GetHoverTime, ListView_SetHoverTime * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas - * -- ListView_GetOrigin * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas *

1 0

Vincent Povirk : winex11.drv: Convert image/bmp X selections to Windows DIB .
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 272e2d2251c705ebed38692e888e84d0153613a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272e2d2251c705ebed38692e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 24 17:19:38 2009 -0500 winex11.drv: Convert image/bmp X selections to Windows DIB. --- dlls/winex11.drv/clipboard.c | 53 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bb29b82..5a042f6 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -151,6 +151,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom pr static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *d, Window w, Atom prop); +static HANDLE X11DRV_CLIPBOARD_ImportImageBmp(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *d, Window w, Atom prop); @@ -192,6 +193,7 @@ static const WCHAR wszCF_DIF[] = {'W','C','F','_','D','I','F',0}; static const WCHAR wszCF_TIFF[] = {'W','C','F','_','T','I','F','F',0}; static const WCHAR wszCF_OEMTEXT[] = {'W','C','F','_','O','E','M','T','E','X','T',0}; static const WCHAR wszCF_DIB[] = {'W','C','F','_','D','I','B',0}; +static const WCHAR wszIMAGEBMP[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszCF_PALETTE[] = {'W','C','F','_','P','A','L','E','T','T','E',0}; static const WCHAR wszCF_PENDATA[] = {'W','C','F','_','P','E','N','D','A','T','A',0}; static const WCHAR wszCF_RIFF[] = {'W','C','F','_','R','I','F','F',0}; @@ -278,7 +280,10 @@ static WINE_CLIPFORMAT ClipFormats[] = X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[20], &ClipFormats[22]}, { CF_DSPENHMETAFILE, wszCF_DSPENHMETAFILE, 0, CF_FLAG_BUILTINFMT, X11DRV_CLIPBOARD_ImportClipboardData, - X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[21], NULL} + X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[21], &ClipFormats[23]}, + + { CF_DIB, wszIMAGEBMP, 0, CF_FLAG_BUILTINFMT, X11DRV_CLIPBOARD_ImportImageBmp, + NULL, &ClipFormats[22], NULL}, }; #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) @@ -1318,6 +1323,52 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p /************************************************************************** + * X11DRV_CLIPBOARD_ImportImageBmp + * + * Import image/bmp, converting the image to CF_DIB. + */ +static HANDLE X11DRV_CLIPBOARD_ImportImageBmp(Display *display, Window w, Atom prop) +{ + LPBYTE lpdata; + unsigned long cbytes; + HANDLE hClipData = 0; + + if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) + { + BITMAPFILEHEADER *bfh = (BITMAPFILEHEADER*)lpdata; + + if (cbytes >= sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER) && + bfh->bfType == 0x4d42 /* "BM" */) + { + BITMAPINFO *bmi = (BITMAPINFO*)(bfh+1); + HBITMAP hbmp; + HDC hdc; + + hdc = GetDC(0); + hbmp = CreateDIBitmap( + hdc, + &(bmi->bmiHeader), + CBM_INIT, + lpdata+bfh->bfOffBits, + bmi, + DIB_RGB_COLORS + ); + + hClipData = X11DRV_DIB_CreateDIBFromBitmap(hdc, hbmp); + + DeleteObject(hbmp); + ReleaseDC(0, hdc); + } + + /* Free the retrieved property data */ + HeapFree(GetProcessHeap(), 0, lpdata); + } + + return hClipData; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_ImportMetaFilePict * * Import MetaFilePict.

1 0

Rein Klazes : user32/tests: Fix a test in edit. c that was not testing what it was supposed to test.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 3e7f22698549515cdff8c40e77054b28bbd06121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7f22698549515cdff8c40e7… Author: Rein Klazes <wijn(a)online.nl> Date: Fri May 1 10:57:32 2009 +0200 user32/tests: Fix a test in edit.c that was not testing what it was supposed to test. --- dlls/user32/tests/edit.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index ecc50ab..8bcd634 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1177,9 +1177,13 @@ static void test_edit_control_4(void) static void test_edit_control_5(void) { static const char *str = "test\r\ntest"; + HWND parentWnd; HWND hWnd; int len; + RECT rc1 = { 10, 10, 11, 11}; + RECT rc; + /* first show that a non-child won't do for this test */ hWnd = CreateWindowEx(0, "EDIT", str, @@ -1187,19 +1191,48 @@ static void test_edit_control_5(void) 10, 10, 1, 1, NULL, NULL, NULL, NULL); assert(hWnd); - + /* size of non-child edit control is (much) bigger then requested */ + GetWindowRect( hWnd, &rc); + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller then expected\n", + rc.right - rc.left); + DestroyWindow(hWnd); + /* so create a parent, and give it edit controls children to test with */ + parentWnd = CreateWindowEx(0, + szEditTextPositionClass, + "Edit Test", WS_VISIBLE | + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 250, 250, + NULL, NULL, hinst, NULL); + assert(parentWnd); + ShowWindow( parentWnd, SW_SHOW); + /* single line */ + hWnd = CreateWindowEx(0, + "EDIT", + str, WS_VISIBLE | WS_BORDER | + WS_CHILD, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size (%d,%d,%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom); len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd); - + /* multi line */ hWnd = CreateWindowEx(0, "EDIT", str, - ES_MULTILINE, - 10, 10, 1, 1, - NULL, NULL, NULL, NULL); + WS_CHILD | ES_MULTILINE, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); assert(hWnd); - + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size (%d,%d,%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom); len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd);

1 0

André Hentschel : winemaker: Remove unnecessary quote filtering.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 925b1448bcd866977b7a3571d1c890618dfbe98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=925b1448bcd866977b7a3571d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 1 11:37:13 2009 +0200 winemaker: Remove unnecessary quote filtering. --- tools/winemaker | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 55fc6f1..8170720 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1118,10 +1118,9 @@ sub source_scan_workspace_file($) s/\r\n$/\n/; # catch a project definition - if (/^Project:\s\"(.*)\"=\"?(.*)\s-/) { + if (/^Project:\s\"(.*)\"=(.*)\s-/) { $prj_name=$1; $prj_path=$2; - $prj_path=~s/\"$//; @components=split /[\/\\]+/, $prj_path; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n";

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

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

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

Henri Verbeet : wined3d: Introduce shader_sm1_read_comment() to read shader comments.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: a605fcd2fd54358a3615b071229935f224f69c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a605fcd2fd54358a3615b0712… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Introduce shader_sm1_read_comment() to read shader comments. --- dlls/wined3d/baseshader.c | 48 +++++++++++++++++++++++--------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7efed39..c56b3cf 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -296,6 +296,20 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se shader_parse_dst_param(dst_token, NULL, &semantic->reg); } +static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) +{ + DWORD token = **ptr; + + if ((token & WINED3DSI_OPCODE_MASK) != WINED3DSIO_COMMENT) + { + *comment = NULL; + return; + } + + *comment = (const char *)++(*ptr); + *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -465,11 +479,6 @@ static inline DWORD shader_get_writemask(DWORD param) return param & WINED3DSP_WRITEMASK_ALL; } -static inline BOOL shader_is_comment(DWORD token) -{ - return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK); -} - /* 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) @@ -608,16 +617,12 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m while (WINED3DVS_END() != *pToken) { struct wined3d_shader_instruction ins; + const char *comment; UINT param_size; /* Skip comments */ - if (shader_is_comment(*pToken)) - { - DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - pToken += comment_len; - continue; - } + shader_sm1_read_comment(&pToken, &comment); + if (comment) continue; /* Fetch opcode */ shader_sm1_read_opcode(&pToken, &ins, &param_size, shader_ins, shader_version); @@ -1132,15 +1137,12 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, while (WINED3DPS_END() != *pToken) { + const char *comment; UINT param_size; /* Skip comment tokens */ - if (shader_is_comment(*pToken)) - { - pToken += (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - continue; - } + shader_sm1_read_comment(&pToken, &comment); + if (comment) continue; /* Read opcode */ shader_sm1_read_opcode(&pToken, &ins, &param_size, opcode_table, shader_version); @@ -1245,14 +1247,14 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table while (WINED3DVS_END() != *pToken) { struct wined3d_shader_instruction ins; + const char *comment; UINT param_size; - if (shader_is_comment(*pToken)) /* comment */ + /* comment */ + shader_sm1_read_comment(&pToken, &comment); + if (comment) { - DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; - ++pToken; - TRACE("//%s\n", (const char*)pToken); - pToken += comment_len; + TRACE("//%s\n", comment); continue; }

1 0

Henri Verbeet : wined3d: Merge wined3d_private_types.h into wined3d_private .h.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 7420a96736b5328b83890bfbc387612cc7649efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7420a96736b5328b83890bfbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Merge wined3d_private_types.h into wined3d_private.h. --- dlls/wined3d/wined3d_private.h | 212 ++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private_types.h | 228 ---------------------------------- 2 files changed, 201 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7420a96736b5328b83890…

1 0

Henri Verbeet : wined3d: Use the shader_sm1_read_*() functions in shader_trace_init().
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 59705b9c2099327990f6472b5410e41508e32037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59705b9c2099327990f6472b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Use the shader_sm1_read_*() functions in shader_trace_init(). --- dlls/wined3d/baseshader.c | 49 +++++++++++++------------------------------- 1 files changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index cc7bf88..7efed39 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1304,19 +1304,22 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else { - DWORD param, addr_token = 0; - int tokens_read; + struct wined3d_shader_src_param dst_rel_addr, src_rel_addr; + struct wined3d_shader_dst_param dst_param; + struct wined3d_shader_src_param src_param; + + if (ins.dst_count) + { + shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version); + } /* Print out predication source token first - it follows * the destination token. */ if (ins.predicate) { - struct wined3d_shader_src_param pred; - - shader_parse_src_param(*(pToken + 2), NULL, &pred); - + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); TRACE("("); - shader_dump_src_param(&pred, shader_version); + shader_dump_src_param(&src_param, shader_version); TRACE(") "); } @@ -1346,42 +1349,20 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table TRACE("p"); } - /* Destination token */ + /* We already read the destination token, print it. */ if (ins.dst_count) { - struct wined3d_shader_dst_param dst; - struct wined3d_shader_src_param rel_addr; - - shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); - - shader_dump_ins_modifiers(&dst); + shader_dump_ins_modifiers(&dst_param); TRACE(" "); - shader_dump_dst_param(&dst, shader_version); + shader_dump_dst_param(&dst_param, shader_version); } - /* Predication token - already printed out, just skip it */ - if (ins.predicate) ++pToken; - /* Other source tokens */ for (i = ins.dst_count; i < (ins.dst_count + ins.src_count); ++i) { - struct wined3d_shader_src_param src, rel_addr; - - tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); - pToken += tokens_read; - - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_token, NULL, &rel_addr); - shader_parse_src_param(param, &rel_addr, &src); - } - else - { - shader_parse_src_param(param, NULL, &src); - } - + shader_sm1_read_src_param(&pToken, &src_param, &src_rel_addr, shader_version); TRACE(!i ? " " : ", "); - shader_dump_src_param(&src, shader_version); + shader_dump_src_param(&src_param, shader_version); } } TRACE("\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009