November 2008 - Wine-commits

Lamaresh : lenny repository patch
by Jeremy Newman 19 Nov '08

19 Nov '08

Module: website Branch: master Commit: 2649b3cf4b8d73516612da0cc1a216821d64458d URL: http://source.winehq.org/git/website.git/?a=commit;h=2649b3cf4b8d73516612da… Author: Lamaresh <lamalennyrepo(a)altervista.org> Date: Tue Nov 18 18:35:44 2008 +0100 lenny repository patch in attachment Maurilio Genovese >From 82f1c6b8c4b5cdd1228760db5186600523dd01b4 Mon Sep 17 00:00:00 2001 From: Maurilio Genovese <lamalennyrepo(a)altervista.org> Date: Tue, 18 Nov 2008 13:02:18 +0100 Subject: Update for lenny repository modified: templates/en/download-deb.template new file: templates/en/download-deblenny.template modified: templates/en/download.template --- templates/en/download-deb.template | 10 ++++---- templates/en/download-deblenny.template | 37 +++++++++++++++++++++++++++++++ templates/en/download.template | 4 +- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index 4e227d4..fd03703 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -1,8 +1,8 @@  -<h1><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"> -Wine for Ubuntu, Debian, and Debian-based distributions -<img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> +<h1><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"></a> +Wine for Ubuntu, Debian Etch, and Debian-based distributions +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> <p>Ubuntu and other Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of @@ -36,8 +36,8 @@ version you are running.</p> <i>deb http://wine.budgetdedicated.com/apt intrepid main #WineHQ - Ubuntu 8.10 "Intrepid Ibex"</i></p> <p><b>For Ubuntu Hardy (8.04):</b><br> <i>deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron"</i></p> -<p><b>For Debian Lenny (5.0):</b><br> -<i>deb http://wine.budgetdedicated.com/apt lenny main #WineHQ - Debian 5.0 "Lenny"</i></p> +<p><b>For Debian Etch (4.0):</b><br> +<i>deb http://wine.budgetdedicated.com/apt etch main #WineHQ - Debian 4.0 "Etch"</i></p> <h2>Trusting the WineHQ APT Repository and installing Wine:</h2> diff --git a/templates/en/download-deblenny.template b/templates/en/download-deblenny.template new file mode 100644 index 0000000..f1893e3 --- /dev/null +++ b/templates/en/download-deblenny.template @@ -0,0 +1,37 @@ + + +<h1><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> +Wine for Debian Lenny +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> + +<p>Debian-based distributions utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software that include Wine, however we keep our own repository of the latest available beta packages here for download.</p> + +<p><b>Warning: These are beta packages</b><br> +<i>This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an update may break functionality in Wine. If the latest stable release of Wine (currently Wine 1.0.1) works for you, then you may not want to use these beta packages.</i></p> + +<p><b>WARNING:</b> for now there are only packages for i386 users, packages for AMD64 will be added as soon as possible.</p> + +<p>To install wine packages you can use two methods: add the repository or download a .deb package and manually install it, but first of all you have to remove older wine version. If you use the first method you'll have wine automatically upgraded by apt, otherwise you'll need to manually download and install every new version.</p> + +<h2>Remove old version</h2> +<div style="position:relative;left:20px">Open a terminal</div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> +<div style="position:relative;left:20px"><i>apt-get remove libwine wine</i> <font color="gray">#to remove outdated version of wine</font></div><p></p> +<h2>Method 1: Add the repository</h2> +<div style="position:relative;left:20px">Open a terminal</div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> +<div style="position:relative;left:20px"><i>gedit /etc/apt/sources.list</i> <font color="gray">#to open repository file with a text editor (you can use gedit or another)</font></div> +<div style="position:relative;left:20px">Add this line: <i>deb http://lamalennyrepo.altervista.org/apt lenny main</i></div> +<div style="position:relative;left:20px">Save and close sources.list</div> +<div style="position:relative;left:20px"><i>apt-get update</i> <font color="gray">#to update package list</font></div> +<div style="position:relative;left:20px"><i>apt-get install wine</i> <font color="gray">#to install latest wine version</font></div><p></p> +<h2>Method 2: Download .deb and manually install it</h2> +<div style="position:relative;left:20px">Chose a .deb package from <a href="http://www.lamalennyrepo.altervista.org/binary.php" target="_new">binary list</a> and save it in your home directory</div> +<div style="position:relative;left:20px">Open a terminal</div> +<div style="position:relative;left:20px"><i>cd ~</i> <font color="gray">#to go to your home directory</font></div> +<div style="position:relative;left:20px"><i>su</i> <font color="gray">#to log as root</font></div> +<div style="position:relative;left:20px"><i>dpkg -i wine_1.1.x_i386.deb</i> <font color="gray">#change x with your chosen version, this will install wine</font></div> + +<br><br><p style="font-size:12px;text-align:left;font-style: italic;">Manteiner: <a href="http://www.lamalennyrepo.altervista.org" target="_new">homepage</a>, <a href="mailto:lamalennyrepo(a)altervista.org">email</a></p> + + diff --git a/templates/en/download.template b/templates/en/download.template index 55fc963..9eb654e 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -40,10 +40,10 @@ for post-installation instructions.</b></p> </tr> <tr bgcolor="#ffffff"> - <td align=center><a href="http://forum.winehq.org/viewtopic.php?t=2716"> + <td align=center><a href="{$root}/site/download-deblenny"> <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> </td> - <td> <b><a href="http://forum.winehq.org/viewtopic.php?t=2716">Debian</a></b> + <td> <b><a href="{$root}/site/download-deblenny">Debian</a></b> binary and source .debs for Debian Lenny (5.0)</td> <td><a href="mailto:lamalennyreport(a)altervista.org">Maurilio Genovese</a></td> </tr>

1 0

Alexandre Julliard : make_makefiles: Add a target to build only the test directories.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 88154cf166a31030d6168f9e7e324a8815f8d249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88154cf166a31030d6168f9e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 19 15:31:44 2008 +0100 make_makefiles: Add a target to build only the test directories. --- dlls/Makefile.in | 4 +++- tools/make_makefiles | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a5fcd6f..794905a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -461,7 +461,9 @@ $(TESTSUBDIRS:%=%/__crosstest__): $(CROSS_IMPLIBS) implib: $(IMPORT_LIBS) -.PHONY: implib +testsubdirs: $(TESTSUBDIRS) + +.PHONY: implib testsubdirs activeds/libactiveds.def activeds/libactiveds.a: activeds/activeds.spec $(WINEBUILD) @cd activeds && $(MAKE) `basename $@` diff --git a/tools/make_makefiles b/tools/make_makefiles index bd0f255..ec65703 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -413,7 +413,8 @@ sub update_dlls(@) $text .= "\n\n"; $text .= "\$(TESTSUBDIRS:%=%/__crosstest__): \$(CROSS_IMPLIBS)\n\n"; $text .= "implib: \$(IMPORT_LIBS)\n\n"; - $text .= ".PHONY: implib\n\n"; + $text .= "testsubdirs: \$(TESTSUBDIRS)\n\n"; + $text .= ".PHONY: implib testsubdirs\n\n"; foreach my $mod (sort keys %importlibs) {

1 0

Florian Köberle : user32/tests: Test size and minmax of WS_THICKFRAME child.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: c6adf31841ea7180fc01229ae21e7251761ef174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6adf31841ea7180fc01229ae… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Wed Nov 19 11:07:00 2008 +0100 user32/tests: Test size and minmax of WS_THICKFRAME child. --- dlls/user32/tests/win.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 63eeb25..5884ce2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5121,6 +5121,139 @@ static void test_fullscreen(void) UnregisterClass("fullscreen_class", GetModuleHandle(0)); } +static BOOL test_thick_child_got_minmax; + +static int getExpectedThickChildInc(void) +{ + const int outer = 2; + int resizeBorder = GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME); + return (outer + resizeBorder); +} + +static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + MINMAXINFO* minmax; + int expectedMinTrack; + int actualMinTrackX; + int actualMinTrackY; + int expectedMaxTrackX; + int expectedMaxTrackY; + int actualMaxTrackX; + int actualMaxTrackY; + int expectedMaxSizeX; + int expectedMaxSizeY; + int actualMaxSizeX; + int actualMaxSizeY; + int expectedPosX; + int expectedPosY; + int actualPosX; + int actualPosY; + RECT rect; + switch (msg) + { + case WM_GETMINMAXINFO: + { + minmax = (MINMAXINFO *)lparam; + trace("hwnd %p, WM_GETMINMAXINFO, %08lx, %08lx\n", hwnd, wparam, lparam); + dump_minmax_info( minmax ); + + test_thick_child_got_minmax = TRUE; + + expectedMinTrack = 2* getExpectedThickChildInc(); + actualMinTrackX = minmax->ptMinTrackSize.x; + actualMinTrackY = minmax->ptMinTrackSize.y; + todo_wine + ok(actualMinTrackX == expectedMinTrack && actualMinTrackY == expectedMinTrack, + "expected minTrack %dx%d, actual minTrack %dx%d\n", + expectedMinTrack, expectedMinTrack, actualMinTrackX, actualMinTrackY); + + actualMaxTrackX = minmax->ptMaxTrackSize.x; + actualMaxTrackY = minmax->ptMaxTrackSize.y; + expectedMaxTrackX = GetSystemMetrics(SM_CXMAXTRACK); + expectedMaxTrackY = GetSystemMetrics(SM_CYMAXTRACK); + ok(actualMaxTrackX == expectedMaxTrackX && actualMaxTrackY == expectedMaxTrackY, + "expected maxTrack %dx%d, actual maxTrack %dx%d\n", + expectedMaxTrackX, expectedMaxTrackY, actualMaxTrackX, actualMaxTrackY); + + GetClientRect(GetAncestor(hwnd, GA_PARENT), &rect); + AdjustWindowRectEx(&rect, WS_CHILD | WS_VISIBLE | WS_THICKFRAME, FALSE, 0); + expectedMaxSizeX = rect.right - rect.left; + expectedMaxSizeY = rect.bottom - rect.top; + actualMaxSizeX = minmax->ptMaxSize.x; + actualMaxSizeY = minmax->ptMaxSize.y; + ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, + "expected maxTrack %dx%d, actual maxTrack %dx%d\n", + expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY); + + expectedPosX = - getExpectedThickChildInc(); + expectedPosY = expectedPosX; + actualPosX = minmax->ptMaxPosition.x; + actualPosY = minmax->ptMaxPosition.y; + todo_wine + ok(actualPosX == expectedPosX && actualPosY == expectedPosY, + "expected maxPosition (%d/%d), actual maxPosition (%d/%d)\n", + expectedPosX, expectedPosY, actualPosX, actualPosY); + break; + } + } + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static void test_thick_child_size(HWND parentWindow) +{ + BOOL success; + RECT childRect; + HWND childWindow; + LONG childWidth; + LONG childHeight; + WNDCLASSA cls; + LPCTSTR className = "THICK_CHILD_CLASS"; + LONG style = WS_CHILD | WS_VISIBLE | WS_THICKFRAME; + LONG exStyle = 0; + int expectedSize = 2*getExpectedThickChildInc(); + + + cls.style = 0; + cls.lpfnWndProc = test_thick_child_size_winproc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = className; + SetLastError(0xdeadbeef); + ok(RegisterClassA(&cls),"RegisterClassA failed, error: %u\n", GetLastError()); + + test_thick_child_got_minmax = FALSE; + + SetLastError(0xdeadbeef); + childWindow = CreateWindowEx( exStyle, className, "", style, 0, 0, 0, 0, parentWindow, 0, GetModuleHandleA(0), NULL ); + ok(childWindow != NULL, "Failed to create child window, error: %u\n", GetLastError()); + + ok(test_thick_child_got_minmax, "Got no WM_GETMINMAXINFO\n"); + + SetLastError(0xdeadbeef); + success = GetWindowRect(childWindow, &childRect); + ok(success,"GetWindowRect call failed, error: %u\n", GetLastError()); + childWidth = childRect.right - childRect.left; + childHeight = childRect.bottom - childRect.top; + + todo_wine + ok( (childWidth == expectedSize) && (childHeight == expectedSize), + "size of window with style WS_CHILD | WS_VISIBLE | WS_THICKFRAME is wrong: expected size %dx%d != actual size %dx%d\n", + expectedSize, expectedSize, childWidth, childHeight); + + + SetLastError(0xdeadbeef); + success = DestroyWindow(childWindow); + ok(success,"DestroyWindow call failed, error: %u\n", GetLastError()); + ok(UnregisterClass(className, GetModuleHandleA(0)),"UnregisterClass call failed\n"); +} + + START_TEST(win) { HMODULE user32 = GetModuleHandleA( "user32.dll" ); @@ -5153,6 +5286,7 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message(); test_nonclient_area(hwndMain);

1 0

Florian Köberle : user32/tests: Capture tests should not require no active window.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: b422c4b87485ad93dcfbb1beef1f1e79a71942fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b422c4b87485ad93dcfbb1bee… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Wed Nov 19 11:06:59 2008 +0100 user32/tests: Capture tests should not require no active window. --- dlls/user32/tests/win.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f0e143a..63eeb25 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2458,7 +2458,10 @@ static LRESULT WINAPI button_hook_proc(HWND button, UINT msg, WPARAM wparam, LPA static void test_capture_1(void) { - HWND button, capture; + HWND button, capture, oldFocus, oldActive; + + oldFocus = GetFocus(); + oldActive = GetActiveWindow(); capture = GetCapture(); ok(capture == 0, "GetCapture() = %p\n", capture); @@ -2476,14 +2479,16 @@ static void test_capture_1(void) check_wnd_state(button, 0, button, button); DestroyWindow(button); - check_wnd_state(0, 0, 0, 0); + check_wnd_state(oldActive, 0, oldFocus, 0); } static void test_capture_2(void) { - HWND button, hwnd, capture; + HWND button, hwnd, capture, oldFocus, oldActive; - check_wnd_state(0, 0, 0, 0); + oldFocus = GetFocus(); + oldActive = GetActiveWindow(); + check_wnd_state(oldActive, 0, oldFocus, 0); button = CreateWindowExA(0, "button", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); assert(button); @@ -2533,7 +2538,7 @@ static void test_capture_2(void) check_wnd_state(button, button, button, 0); DestroyWindow(button); - check_wnd_state(0, 0, 0, 0); + check_wnd_state(oldActive, 0, oldFocus, 0); } static void test_capture_3(HWND hwnd1, HWND hwnd2)

1 0

Henri Verbeet : wined3d: Avoid using a stack buffer in a few places in shader_hw_map2gl().
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 495fcc72a67849e17e265660072234394e7b8c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=495fcc72a67849e17e2656600… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 19 11:49:14 2008 +0100 wined3d: Avoid using a stack buffer in a few places in shader_hw_map2gl(). --- dlls/wined3d/arb_program_shader.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ec64c3e..47a03ca 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1089,8 +1089,7 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) SHADER_BUFFER* buffer = arg->buffer; DWORD dst = arg->dst; DWORD* src = arg->src; - - char tmpLine[256]; + char arguments[256]; unsigned int i; if (shader_is_pshader_version(shader->baseShader.hex_version)) @@ -1102,6 +1101,7 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) BOOL saturate = FALSE; BOOL centroid = FALSE; BOOL partialprecision = FALSE; + const char *modifier; DWORD shift; if (!curOpcode->num_params) @@ -1110,8 +1110,6 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) return; } - strcpy(tmpLine, curOpcode->glname); - /* Process modifiers */ if (dst & WINED3DSP_DSTMOD_MASK) { @@ -1128,6 +1126,7 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); } shift = (dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + modifier = (saturate && !shift) ? "_SAT" : ""; /* Generate input register names (with modifiers) */ for (i = 1; i < curOpcode->num_params; ++i) @@ -1139,33 +1138,31 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) shader_arb_get_write_mask(arg, dst, output_wmask); strcat(operands[0], output_wmask); - if (saturate && (shift == 0)) - strcat(tmpLine, "_SAT"); - strcat(tmpLine, " "); - strcat(tmpLine, operands[0]); + arguments[0] = '\0'; + strcat(arguments, operands[0]); for (i = 1; i < curOpcode->num_params; i++) { - strcat(tmpLine, ", "); - strcat(tmpLine, operands[i]); + strcat(arguments, ", "); + strcat(arguments, operands[i]); } - strcat(tmpLine,";\n"); - shader_addline(buffer, tmpLine); + shader_addline(buffer, "%s%s %s;\n", curOpcode->glname, modifier, arguments); /* A shift requires another line. */ if (shift) pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); } else { - strcpy(tmpLine, curOpcode->glname); + /* Note that vshader_program_add_param() adds spaces. */ + arguments[0] = '\0'; if (curOpcode->num_params > 0) { - vshader_program_add_param(arg, dst, FALSE, tmpLine); + vshader_program_add_param(arg, dst, FALSE, arguments); for (i = 1; i < curOpcode->num_params; ++i) { - strcat(tmpLine, ","); - vshader_program_add_param(arg, src[i-1], TRUE, tmpLine); + strcat(arguments, ","); + vshader_program_add_param(arg, src[i-1], TRUE, arguments); } } - shader_addline(buffer, "%s;\n", tmpLine); + shader_addline(buffer, "%s%s;\n", curOpcode->glname, arguments); } }

1 0

Henri Verbeet : wined3d: Give mov & mova their own handler.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 9b118cc345f0d6e2e84bd30059185b8f4ac98894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b118cc345f0d6e2e84bd3005… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 19 11:49:13 2008 +0100 wined3d: Give mov & mova their own handler. --- dlls/wined3d/arb_program_shader.c | 81 +++++++++++++++++++++++-------------- 1 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e5bd6bb..ec64c3e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1154,35 +1154,7 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) /* A shift requires another line. */ if (shift) pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); } else { - if ((curOpcode->opcode == WINED3DSIO_MOV && shader_get_regtype(dst) == WINED3DSPR_ADDR) - || curOpcode->opcode == WINED3DSIO_MOVA) { - memset(tmpLine, 0, sizeof(tmpLine)); - if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) - { - vshader_program_add_param(arg, src[0], TRUE, tmpLine); - shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", tmpLine); - shader_addline(buffer, "ARL A0.x, TMP.x;\n"); - } else { - /* Apple's ARB_vertex_program implementation does not accept an ARL source argument - * with more than one component. Thus replicate the first source argument over all - * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) - */ - DWORD parm = src[0] & ~(WINED3DVS_SWIZZLE_MASK); - if((src[0] & WINED3DVS_X_W) == WINED3DVS_X_W) { - parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W; - } else if((src[0] & WINED3DVS_X_Z) == WINED3DVS_X_Z) { - parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z; - } else if((src[0] & WINED3DVS_X_Y) == WINED3DVS_X_Y) { - parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; - } else if((src[0] & WINED3DVS_X_X) == WINED3DVS_X_X) { - parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; - } - vshader_program_add_param(arg, parm, TRUE, tmpLine); - shader_addline(buffer, "ARL A0.x, %s;\n", tmpLine); - } - return; - } else - strcpy(tmpLine, curOpcode->glname); + strcpy(tmpLine, curOpcode->glname); if (curOpcode->num_params > 0) { @@ -1197,6 +1169,53 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) } } +static void shader_hw_mov(SHADER_OPCODE_ARG *arg) +{ + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl*)arg->shader; + + if ((WINED3DSHADER_VERSION_MAJOR(shader->baseShader.hex_version) == 1 + && !shader_is_pshader_version(shader->baseShader.hex_version) + && shader_get_regtype(arg->dst) == WINED3DSPR_ADDR) + || arg->opcode->opcode == WINED3DSIO_MOVA) + { + SHADER_BUFFER *buffer = arg->buffer; + char src0_param[256]; + + if (arg->opcode->opcode == WINED3DSIO_MOVA) + FIXME("mova should round\n"); + + src0_param[0] = '\0'; + if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) + { + vshader_program_add_param(arg, arg->src[0], TRUE, src0_param); + shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); + shader_addline(buffer, "ARL A0.x, TMP.x;\n"); + } + else + { + /* Apple's ARB_vertex_program implementation does not accept an ARL source argument + * with more than one component. Thus replicate the first source argument over all + * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) + */ + DWORD parm = arg->src[0] & ~(WINED3DVS_SWIZZLE_MASK); + if((arg->src[0] & WINED3DVS_X_W) == WINED3DVS_X_W) + parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W; + else if((arg->src[0] & WINED3DVS_X_Z) == WINED3DVS_X_Z) + parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z; + else if((arg->src[0] & WINED3DVS_X_Y) == WINED3DVS_X_Y) + parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; + else if((arg->src[0] & WINED3DVS_X_X) == WINED3DVS_X_X) + parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; + vshader_program_add_param(arg, parm, TRUE, src0_param); + shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); + } + } + else + { + shader_hw_map2gl(arg); + } +} + static void pshader_hw_texkill(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; DWORD hex_version = This->baseShader.hex_version; @@ -2288,8 +2307,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MAD */ shader_hw_map2gl, /* WINED3DSIH_MAX */ shader_hw_map2gl, /* WINED3DSIH_MIN */ shader_hw_map2gl, - /* WINED3DSIH_MOV */ shader_hw_map2gl, - /* WINED3DSIH_MOVA */ shader_hw_map2gl, + /* WINED3DSIH_MOV */ shader_hw_mov, + /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_NOP */ shader_hw_map2gl, /* WINED3DSIH_NRM */ shader_hw_nrm,

1 0

Henri Verbeet : wined3d: Make it more obvious the pshader path in shader_hw_map2gl() doesn' t handle opcodes without parameters.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: bd427f58a001948dfa6070733269b193462f3871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd427f58a001948dfa6070733… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 19 11:49:13 2008 +0100 wined3d: Make it more obvious the pshader path in shader_hw_map2gl() doesn't handle opcodes without parameters. --- dlls/wined3d/arb_program_shader.c | 64 ++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 493c5d2..e5bd6bb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1095,11 +1095,21 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) if (shader_is_pshader_version(shader->baseShader.hex_version)) { + /* Output token related */ + char output_rname[256]; + char output_wmask[20]; + char operands[4][100]; BOOL saturate = FALSE; BOOL centroid = FALSE; BOOL partialprecision = FALSE; DWORD shift; + if (!curOpcode->num_params) + { + ERR("Opcode \"%s\" has no parameters\n", curOpcode->name); + return; + } + strcpy(tmpLine, curOpcode->glname); /* Process modifiers */ @@ -1119,40 +1129,30 @@ static void shader_hw_map2gl(SHADER_OPCODE_ARG* arg) } shift = (dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - /* Generate input and output registers */ - if (curOpcode->num_params > 0) + /* Generate input register names (with modifiers) */ + for (i = 1; i < curOpcode->num_params; ++i) + pshader_gen_input_modifier_line(arg->shader, buffer, src[i-1], i-1, operands[i]); + + /* Handle output register */ + pshader_get_register_name(arg->shader, dst, output_rname); + strcpy(operands[0], output_rname); + shader_arb_get_write_mask(arg, dst, output_wmask); + strcat(operands[0], output_wmask); + + if (saturate && (shift == 0)) + strcat(tmpLine, "_SAT"); + strcat(tmpLine, " "); + strcat(tmpLine, operands[0]); + for (i = 1; i < curOpcode->num_params; i++) { - /* Output token related */ - char output_rname[256]; - char output_wmask[20]; - char operands[4][100]; - - /* Generate input register names (with modifiers) */ - for (i = 1; i < curOpcode->num_params; ++i) - pshader_gen_input_modifier_line(arg->shader, buffer, src[i-1], i-1, operands[i]); - - /* Handle output register */ - pshader_get_register_name(arg->shader, dst, output_rname); - strcpy(operands[0], output_rname); - shader_arb_get_write_mask(arg, dst, output_wmask); - strcat(operands[0], output_wmask); - - if (saturate && (shift == 0)) - strcat(tmpLine, "_SAT"); - strcat(tmpLine, " "); - strcat(tmpLine, operands[0]); - for (i = 1; i < curOpcode->num_params; i++) - { - strcat(tmpLine, ", "); - strcat(tmpLine, operands[i]); - } - strcat(tmpLine,";\n"); - shader_addline(buffer, tmpLine); - - /* A shift requires another line. */ - if (shift != 0) - pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); + strcat(tmpLine, ", "); + strcat(tmpLine, operands[i]); } + strcat(tmpLine,";\n"); + shader_addline(buffer, tmpLine); + + /* A shift requires another line. */ + if (shift) pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); } else { if ((curOpcode->opcode == WINED3DSIO_MOV && shader_get_regtype(dst) == WINED3DSPR_ADDR) || curOpcode->opcode == WINED3DSIO_MOVA) {

1 0

Henri Verbeet : wined3d: Fix the cube map coordinates in surface_blt_to_drawable().
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 29f2fefc2bca6069d54076ac50d64349aab9d8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f2fefc2bca6069d54076ac5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 19 11:49:13 2008 +0100 wined3d: Fix the cube map coordinates in surface_blt_to_drawable(). I don't see how this can ever have worked properly. --- dlls/wined3d/surface.c | 71 +++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1fb27cc..1849b83 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4265,6 +4265,22 @@ struct coords { GLfloat x, y, z; }; +struct float_rect +{ + float l; + float t; + float r; + float b; +}; + +static inline void cube_coords_float(const RECT *r, UINT w, UINT h, struct float_rect *f) +{ + f->l = ((r->left * 2.0f) / w) - 1.0f; + f->t = ((r->top * 2.0f) / h) - 1.0f; + f->r = ((r->right * 2.0f) / w) - 1.0f; + f->b = ((r->bottom * 2.0f) / h) - 1.0f; +} + static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { struct coords coords[4]; RECT rect; @@ -4272,6 +4288,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT IWineD3DBaseTexture *texture; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; GLenum bind_target; + struct float_rect f; if(rect_in) { rect = *rect_in; @@ -4314,50 +4331,56 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT case GL_TEXTURE_CUBE_MAP_POSITIVE_X: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = 1; coords[0].y = -1; coords[0].z = 1; - coords[1].x = 1; coords[1].y = 1; coords[1].z = 1; - coords[2].x = 1; coords[2].y = 1; coords[2].z = -1; - coords[3].x = 1; coords[3].y = -1; coords[3].z = -1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = 1; coords[0].y = -f.t; coords[0].z = -f.l; + coords[1].x = 1; coords[1].y = -f.b; coords[1].z = -f.l; + coords[2].x = 1; coords[2].y = -f.b; coords[2].z = -f.r; + coords[3].x = 1; coords[3].y = -f.t; coords[3].z = -f.r; break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = -1; coords[0].y = -1; coords[0].z = 1; - coords[1].x = -1; coords[1].y = 1; coords[1].z = 1; - coords[2].x = -1; coords[2].y = 1; coords[2].z = -1; - coords[3].x = -1; coords[3].y = -1; coords[3].z = -1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = -1; coords[0].y = -f.t; coords[0].z = f.l; + coords[1].x = -1; coords[1].y = -f.b; coords[1].z = f.l; + coords[2].x = -1; coords[2].y = -f.b; coords[2].z = f.r; + coords[3].x = -1; coords[3].y = -f.t; coords[3].z = f.r; break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = -1; coords[0].y = 1; coords[0].z = 1; - coords[1].x = 1; coords[1].y = 1; coords[1].z = 1; - coords[2].x = 1; coords[2].y = 1; coords[2].z = -1; - coords[3].x = -1; coords[3].y = 1; coords[3].z = -1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = f.l; coords[0].y = 1; coords[0].z = f.t; + coords[1].x = f.l; coords[1].y = 1; coords[1].z = f.b; + coords[2].x = f.r; coords[2].y = 1; coords[2].z = f.b; + coords[3].x = f.r; coords[3].y = 1; coords[3].z = f.t; break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = -1; coords[0].y = -1; coords[0].z = 1; - coords[1].x = 1; coords[1].y = -1; coords[1].z = 1; - coords[2].x = 1; coords[2].y = -1; coords[2].z = -1; - coords[3].x = -1; coords[3].y = -1; coords[3].z = -1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = f.l; coords[0].y = -1; coords[0].z = -f.t; + coords[1].x = f.l; coords[1].y = -1; coords[1].z = -f.b; + coords[2].x = f.r; coords[2].y = -1; coords[2].z = -f.b; + coords[3].x = f.r; coords[3].y = -1; coords[3].z = -f.t; break; case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = -1; coords[0].y = -1; coords[0].z = 1; - coords[1].x = 1; coords[1].y = -1; coords[1].z = 1; - coords[2].x = 1; coords[2].y = -1; coords[2].z = 1; - coords[3].x = -1; coords[3].y = -1; coords[3].z = 1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = f.l; coords[0].y = -f.t; coords[0].z = 1; + coords[1].x = f.l; coords[1].y = -f.b; coords[1].z = 1; + coords[2].x = f.r; coords[2].y = -f.b; coords[2].z = 1; + coords[3].x = f.r; coords[3].y = -f.t; coords[3].z = 1; break; case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: bind_target = GL_TEXTURE_CUBE_MAP_ARB; - coords[0].x = -1; coords[0].y = -1; coords[0].z = -1; - coords[1].x = 1; coords[1].y = -1; coords[1].z = -1; - coords[2].x = 1; coords[2].y = -1; coords[2].z = -1; - coords[3].x = -1; coords[3].y = -1; coords[3].z = -1; + cube_coords_float(&rect, This->pow2Width, This->pow2Height, &f); + coords[0].x = -f.l; coords[0].y = -f.t; coords[0].z = -1; + coords[1].x = -f.l; coords[1].y = -f.b; coords[1].z = -1; + coords[2].x = -f.r; coords[2].y = -f.b; coords[2].z = -1; + coords[3].x = -f.r; coords[3].y = -f.t; coords[3].z = -1; break; default:

1 0

Juan Lang : netapi32: Fix dead stores.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 9f8ae26c13a32adaa85da17b71683438047a62ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8ae26c13a32adaa85da17b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 18 15:44:38 2008 -0800 netapi32: Fix dead stores. --- dlls/netapi32/nbt.c | 9 +++++---- dlls/netapi32/netbios.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index a47229c..8db87b4 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -415,10 +415,7 @@ static BOOL NetBTFindNameAnswerCallback(void *pVoid, WORD answerCount, if (queryData->cacheEntry) queryData->cacheEntry->numAddresses = 0; else - { - ret = FALSE; queryData->ret = NRC_OSRESNOTAV; - } } if (rLen == 6 && queryData->cacheEntry && queryData->cacheEntry->numAddresses < answerCount) @@ -850,8 +847,8 @@ static UCHAR NetBTAstat(void *adapt, PNCB ncb) astat->max_sess_pkt_size = 0xffff; astat->xmit_success = adapter->xmit_success; astat->recv_success = adapter->recv_success; + ret = NRC_GOODRET; } - ret = NRC_GOODRET; } else ret = NetBTAstatRemote(adapter, ncb); @@ -1183,6 +1180,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb) * message header. */ NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else if (buffer[0] != NBSS_MSG) { @@ -1190,6 +1188,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb) FIXME("Received unexpected session msg type %d\n", buffer[0]); NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else { @@ -1199,6 +1198,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb) FIXME("Received a message that's too long for my taste\n"); NetBIOSHangupSession(ncb); ret = NRC_SABORT; + goto error; } else { @@ -1226,6 +1226,7 @@ static UCHAR NetBTRecv(void *adapt, void *sess, PNCB ncb) adapter->recv_success++; } } +error: TRACE("returning 0x%02x\n", ret); return ret; } diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index a55f556..8d0de1f 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -637,7 +637,7 @@ static UCHAR nbInternalHangup(NetBIOSAdapter *adapter, NetBIOSSession *session) EnterCriticalSection(&adapter->cs); memset(session, 0, sizeof(NetBIOSSession)); LeaveCriticalSection(&adapter->cs); - return NRC_GOODRET; + return ret; } static UCHAR nbHangup(NetBIOSAdapter *adapter, const NCB *ncb)

1 0

Alexandre Julliard : winetest: Report an error when a test program completely fails to run.
by Alexandre Julliard 19 Nov '08

19 Nov '08

Module: wine Branch: master Commit: 6e336fe344c15e5a9307ee69e2e403532be66665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e336fe344c15e5a9307ee69e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 19 13:24:43 2008 +0100 winetest: Report an error when a test program completely fails to run. --- programs/winetest/main.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 30ed15b..9623039 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -349,15 +349,15 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) return status; } -static void +static DWORD get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) { char *cmd; HANDLE subfile; - DWORD total; + DWORD err, total; char buffer[8192], *index; static const char header[] = "Valid test names:"; - int allocated; + int status, allocated; char tmpdir[MAX_PATH], subname[MAX_PATH]; SECURITY_ATTRIBUTES sa; @@ -384,6 +384,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) &sa, CREATE_ALWAYS, 0, NULL ); } if (subfile == INVALID_HANDLE_VALUE) { + err = GetLastError(); report (R_ERROR, "Can't open subtests output of %s: %u", test->name, GetLastError()); goto quit; @@ -391,15 +392,23 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) extract_test (test, tempdir, res_name); cmd = strmake (NULL, "%s --list", test->exename); - run_ex (cmd, subfile, tempdir, 5000); + status = run_ex (cmd, subfile, tempdir, 5000); + err = GetLastError(); free (cmd); + if (status == -2) + { + report (R_ERROR, "Cannot run %s error %u", test->exename, err); + goto quit; + } + SetFilePointer( subfile, 0, NULL, FILE_BEGIN ); ReadFile( subfile, buffer, sizeof(buffer), &total, NULL ); CloseHandle( subfile ); if (sizeof buffer == total) { report (R_ERROR, "Subtest list of %s too big.", test->name, sizeof buffer); + err = ERROR_OUTOFMEMORY; goto quit; } buffer[total] = 0; @@ -408,6 +417,7 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) if (!index) { report (R_ERROR, "Can't parse subtests output of %s", test->name); + err = ERROR_INTERNAL_ERROR; goto quit; } index += sizeof header; @@ -427,10 +437,12 @@ get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) } test->subtests = xrealloc (test->subtests, test->subtest_count * sizeof(char*)); + err = 0; quit: if (!DeleteFileA (subname)) report (R_WARNING, "Can't delete file '%s': %u", subname, GetLastError()); + return err; } static void @@ -461,6 +473,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, const char *tempdir = (const char *)lParam; char dllname[MAX_PATH]; HMODULE dll; + DWORD err; if (test_filtered_out( lpszName, NULL )) return TRUE; @@ -476,11 +489,16 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, } FreeLibrary(dll); - xprintf (" %s=%s\n", dllname, get_file_version(dllname)); - - get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); - nr_of_tests += wine_tests[nr_of_files].subtest_count; - nr_of_files++; + if (!(err = get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ))) + { + xprintf (" %s=%s\n", dllname, get_file_version(dllname)); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + } + else + { + xprintf (" %s=load error %u\n", dllname, err); + } return TRUE; }

1 0