May 2008 - Wine-Commits - list.winehq.org

Jeff Zaroyko : make the screenshot submission rules more noticeable
by Chris Morgan May 5, 2008

May 5, 2008

Module: appdb Branch: master Commit: e18e751706bee33a7dbb8efe0d59fd3af745b374 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e18e751706bee33a7dbb8efe… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue Apr 22 23:49:46 2008 +1000 make the screenshot submission rules more noticeable --- screenshots.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/screenshots.php b/screenshots.php index 2430e1a..b81c53d 100644 --- a/screenshots.php +++ b/screenshots.php @@ -133,9 +133,12 @@ if($hResult && query_num_rows($hResult)) // if the user is logged in if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) { - echo "When submitting screenshots please ensure that the focus is on the application running inside Wine."; - echo " This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop."; - echo " Do not upload screenshots of error messages, installers, game menus etc."; + echo ""; + echo "<table><tr><th>Please follow these simple rules</th></tr>"; + echo "<tr><td><ul>"; + echo "<li>Do not upload screenshots of error messages, installers, game menus etc.</li>"; + echo "<li>Crop the image so that only the application is shown and not your desktop.</li>"; + echo "</ul></td></tr></table>"; echo '<form enctype="multipart/form-data" action="screenshots.php" name="sImageForm" method="post">',"\n"; echo html_frame_start("Upload Screenshot","400","",0);

1 0

Jeff Zaroyko : Update the AppDB general help page, also make it valid html.
by Chris Morgan May 5, 2008

May 5, 2008

Module: appdb Branch: master Commit: 95a38adbdc8d9c0f6647db2720c3722653430061 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95a38adbdc8d9c0f6647db27… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Tue May 6 12:54:43 2008 +1000 Update the AppDB general help page, also make it valid html. --- help/generic.help | 55 +++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/help/generic.help b/help/generic.help index 160fda3..eb8e04b 100644 --- a/help/generic.help +++ b/help/generic.help @@ -1,34 +1,36 @@  -This is meant as generic instructions in case an AppDB entry -for a certain program doesn't exist. +<center>This is meant as a general guide in case an AppDB entry +for a certain program hasn't been created.</center> <ol> -<li> Make sure your Wine release is recent.</li> +<li> Make sure your Wine release is recent. <ul> - <li><a href="http://www.winehq.org/site/download"> Official WineHQ builds</a> - for Linux Red Hat, Mandrake, SuSE, Slackware and FreeBSD, hosted by + <li><a href="http://www.winehq.org/site/download"> Official WineHQ builds</a> + for all the popular platforms and distributions, hosted by <a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a>.</li> - <li><a href="http://www.winehq.org/site/cvs">Official WineHQ Source</a> for information on how to - build and install Wine via source read over the - <a href="http://www.winehq.org/site/howto"> Wine HowTo</a>.</li> - </ul> - + <li>Consult <a href="http://www.winehq.org/site/git">the git instructions</a> for information on obtaining the latest source. + For how to build and install Wine via source consult the README or for building Wine on a 64bit GNU/Linux read over the + <a href="http://wiki.winehq.org/WineOn64bit">WineOn64bit wiki entry</a>.</li> + </ul> +</li> +<li>Run your program by changing into the directory where it is located, and then type 'wine yourprogram.exe'. + Alternately your file manager should know to open .exe files with 'wine').</li> -<li> Run your program (something like ‘wine yourprogram.exe’, or tell your file manager to open .exe files with 'wine').</li> +<li>If there is an an error about missing files, or does not start at all, make sure you are in the directory where it was installed.</li> -<li> If it gives an error about missing files, or does not start at all, try running it from the directory where it was installed.</li> +<li> Many newer games contain copy protection, which is sometimes not supported in Wine. Third party applications may be able to circumvent this, + when this is required an application cannot be rated higher than Gold</li> -<li> Many newer games contain copy protection, which is often not supported in Wine. Cracks are available from sites such as <a href="http://www.megagames.com/trainers.html" target="_blank">MegaGames</a>.</li> - -<li> In case of failure, try different builtin, native DLL settings: -Run Wine with ‘WINEDEBUG=+loaddll wine yourprogram.exe’ to find out which +<li> In case of failure, try different builtin, native DLL settings: +Run Wine with 'WINEDEBUG=+loaddll wine yourprogram.exe' to find out which DLLs are loaded as native or builtin. -Then make sure appropriate native versions are in the -c:\windows\system32 directory as configured in Winecfg’s DLL overrides tab. There are four options you can choose from when setting -dll overrides.</li> + Then make sure appropriate native versions are in the +c:\windows\system32 directory as configured in winecfg's DLL overrides tab. + There are four options you can choose from when setting +dll overrides. <pre> (native, builtin) @@ -36,20 +38,19 @@ dll overrides.</li> (native) (builtin) </pre> +</li> +<li> For sound problems, run ‘winecfg’ and look at the audio tab.</li> -<li> For sound problems, run ‘winecfg’ and look at the audio tab.</li> - -<li> In case of persisting failure, you may want to read over the +<li> In case of persisting failure, you may want to read over the <a href="http://www.winehq.org/site/documentation">Wine Documentation</a> and you may also want to read the -<a href="http://www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li> +<a href="http://www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li> -<li> The Wine <a href="http://winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li> +<li> The Wine <a href="http://www.winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li> -<li> If you have more questions, please contact us -at <a href="mailto:appdb(a)winehq.org">appdb(a)winehq.org</a>.</li> +<li> If you have more questions, please contact us +at <a href="mailto:appdb(a)winehq.org">appdb(a)winehq.org</a>.</li> </ol>   -

1 0

Maarten Lankhorst : netapi32: Make the tests pass under XP that enforces a strict password policy.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: a2d53016b5ac4c214379b33663d8261311aeab89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d53016b5ac4c214379b3366… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 5 12:12:25 2008 -0700 netapi32: Make the tests pass under XP that enforces a strict password policy. --- dlls/netapi32/tests/access.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 7d5f55a..b1036a9 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -50,8 +50,8 @@ static WCHAR sTooLongPassword[] = {'a','b','c','d','e','f','g','h','a','b','c',' 'a', 0}; static WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; -static WCHAR sTestUserOldPass[] = {'o', 'l', 'd', 'p', 'a', 's', 's', 0}; -static WCHAR sTestUserNewPass[] = {'n', 'e', 'w', 'p', 'a', 's', 's', 0}; +static WCHAR sTestUserOldPass[] = {'O', 'l', 'd', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; +static WCHAR sTestUserNewPass[] = {'N', 'e', 'w', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0}; static const WCHAR sInvalidName[] = {'\\',0}; static const WCHAR sInvalidName2[] = {'\\','\\',0}; @@ -301,7 +301,10 @@ static void run_userhandling_tests(void) ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, sTestUserOldPass); - ok(ret == NERR_Success, + /* Apparently NERR_PasswordTooShort can be returned on windows xp if a + * strict password policy is enforced + */ + ok(ret == NERR_Success || ret == NERR_PasswordTooShort, "Changing old password to old password returned 0x%08x.\n", ret); ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass,

1 0

Dylan Smith : richedit: The wrong bits were cleared from wBorders in PARAFORMAT2.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 76029ee9ec73940b738f5c5cc6b6bc04120e7309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76029ee9ec73940b738f5c5cc… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 5 15:11:50 2008 -0400 richedit: The wrong bits were cleared from wBorders in PARAFORMAT2. --- dlls/riched20/editor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9e93091..1ae0e23 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -620,31 +620,31 @@ static void ME_RTFParAttrHook(RTF_Info *info) case rtfBorderSingle: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; + fmt.wBorders &= ~0x700; fmt.wBorders |= 1 << 8; break; case rtfBorderThick: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; + fmt.wBorders &= ~0x700; fmt.wBorders |= 2 << 8; break; case rtfBorderShadow: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; + fmt.wBorders &= ~0x700; fmt.wBorders |= 10 << 8; break; case rtfBorderDouble: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; + fmt.wBorders &= ~0x700; fmt.wBorders |= 7 << 8; break; case rtfBorderDot: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ - fmt.wBorders &= ~0x70; + fmt.wBorders &= ~0x700; fmt.wBorders |= 11 << 8; break; case rtfBorderWidth:

1 0

Dylan Smith : richedit: Removed useless code.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 6f11b1b354f6637f2cc730941e2daa04edb3c8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f11b1b354f6637f2cc730941… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 2 17:00:24 2008 -0400 richedit: Removed useless code. --- dlls/riched20/paint.c | 5 +---- dlls/riched20/wrap.c | 2 -- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2ec7fb9..91b71dc 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,8 +43,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * { BOOL bPaint = (rcUpdate == NULL); if (rcUpdate) - bPaint = c.pt.y<rcUpdate->bottom && - c.pt.y+item->member.para.nHeight>rcUpdate->top; + bPaint = c.pt.y<rcUpdate->bottom && ye>rcUpdate->top; if (bPaint) { ME_DrawParagraph(&c, item); @@ -85,8 +84,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * rc.bottom = ye; FillRect(hDC, &rc, c.editor->hbrBackground); } - if (ys == c.pt.y) /* don't overwrite the top bar */ - ys++; } if (editor->nTotalLength != editor->nLastTotalLength) ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4767074..da5fef7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -473,8 +473,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { int yStart = -1; ME_InitContext(&c, editor, GetDC(editor->hWnd)); - c.pt.x = 0; - c.pt.y = 0; editor->nHeight = 0; item = editor->pBuffer->pFirst->next; while(item != editor->pBuffer->pLast) {

1 0

Roderick Colenbrander : wined3d: Allow stencil support when it wasn' t requested on broken drivers.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 7b5561cbb8bd24d64aaa06f42876f4e4e1e3f3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5561cbb8bd24d64aaa06f42… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat May 3 14:37:09 2008 +0000 wined3d: Allow stencil support when it wasn't requested on broken drivers. --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/directx.c | 23 ++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3341555..14d8fce 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -169,8 +169,10 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF exactDepthMatch = FALSE; /* In all cases make sure the number of stencil bits matches our requirements - * even when we don't need stencil because it could affect performance */ - if(!(cfgs->stencilSize == stencilBits)) + * even when we don't need stencil because it could affect performance EXCEPT + * on cards which don't offer depth formats without stencil like the i915 drivers + * on Linux. */ + if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) continue; /* Check multisampling support */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ac6473..32f7323 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1706,7 +1706,9 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_Pixel if(!(cfg->depthSize == depthSize || (!lockable && cfg->depthSize > depthSize))) return FALSE; - if(cfg->stencilSize != stencilSize) + /* Some cards like Intel i915 ones only offer D24S8 but lots of games also need a format without stencil, so + * allow more stencil bits than requested. */ + if(cfg->stencilSize < stencilSize) return FALSE; return TRUE; @@ -3839,6 +3841,7 @@ BOOL InitAdapters(void) { int values[10]; int nAttribs = 0; int res; + int i; WineD3D_PixelFormat *cfgs; int attribute; DISPLAY_DEVICEW DisplayDevice; @@ -3953,6 +3956,24 @@ BOOL InitAdapters(void) { cfgs++; } + /* D16, D24X8 and D24S8 are common depth / depth+stencil formats. All drivers support them though this doesn't + * mean that the format is offered in hardware. For instance Geforce8 cards don't have offer D16 in hardware + * but just fake it using D24(X8?) which is fine. D3D also allows that. + * Some display drivers (i915 on Linux) only report mixed depth+stencil formats like D24S8. MSDN clearly mentions + * that only on lockable formats (e.g. D16_locked) the bit order is guaranteed and that on other formats the + * driver is allowed to consume more bits EXCEPT for stencil bits. + * + * Mark an adapter with this broken stencil behavior. + */ + Adapters[0].brokenStencil = TRUE; + for(i=0, cfgs=Adapters[0].cfgs; i<Adapters[0].nCfgs; i++) { + /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ + if(cfgs[i].depthSize && !cfgs[i].stencilSize) { + Adapters[0].brokenStencil = FALSE; + break; + } + } + fixup_extensions(&Adapters[0].gl_info); WineD3D_ReleaseFakeGLContext(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17a8fb0..083b0d8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -702,6 +702,7 @@ struct WineD3DAdapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ int nCfgs; WineD3D_PixelFormat *cfgs; + BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; };

1 0

Kai Blin : ws2_32: On Win98, SO_MAX_MSG_SIZE is 65527, not 65507.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 6b007698d2c2ff62188492c948d431e6f7811215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b007698d2c2ff62188492c94… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon May 5 20:17:57 2008 +0200 ws2_32: On Win98, SO_MAX_MSG_SIZE is 65527, not 65507. --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 939bdaa..f511dd2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1663,7 +1663,8 @@ static void test_extendedSocketOptions(void) ret = getsockopt(sock, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&optval, &optlen); ok(ret == 0, "getsockopt failed to query SO_MAX_MSG_SIZE, return value is 0x%08x\n", ret); - ok(optval == 65507, "SO_MAX_MSG_SIZE reported %d, expected 65507\n", optval); + ok((optval == 65507) || (optval == 65527), + "SO_MAX_MSG_SIZE reported %d, expected 65507 or 65507\n", optval); optlen = sizeof(LINGER); ret = getsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&linger_val, &optlen);

1 0

Alexandre Julliard : server: Don' t touch the users count when a system process switches desktops.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: a789375f8bffca8a92777d2b41f605b22f719872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a789375f8bffca8a92777d2b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 21:02:34 2008 +0200 server: Don't touch the users count when a system process switches desktops. --- server/winstation.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 817fe77..2ad4146 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -309,17 +309,18 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) if (!thread->desktop) thread->desktop = handle; - desktop->users++; - if (desktop->close_timeout) + if (!process->is_system) { - remove_timeout_user( desktop->close_timeout ); - desktop->close_timeout = NULL; - } - if (old_desktop) - { - old_desktop->users--; - release_object( old_desktop ); + desktop->users++; + if (desktop->close_timeout) + { + remove_timeout_user( desktop->close_timeout ); + desktop->close_timeout = NULL; + } + if (old_desktop) old_desktop->users--; } + + if (old_desktop) release_object( old_desktop ); } /* connect a process to its window station */

1 0

Kai Blin : secur32: Remove test for sft->Reserved8 field.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 2e04c18cf44c40648ab6610af71f732a8f6a8ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e04c18cf44c40648ab6610af… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon May 5 20:17:53 2008 +0200 secur32: Remove test for sft->Reserved8 field. This seems to be set on Win98. --- dlls/secur32/tests/secur32.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 99d5069..ceacae2 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -101,7 +101,6 @@ static void test_InitSecurityInterface(void) ok(sftA->Reserved3 != NULL, "Reserved3 should not be NULL in security function table\n"); todo_wine ok(sftA->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); - ok(!sftA->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftA->Reserved8); if (!pInitSecurityInterfaceW) { @@ -117,7 +116,6 @@ static void test_InitSecurityInterface(void) ok(sftW->Reserved3 != NULL, "Reserved3 should note be NULL in security function table\n"); todo_wine ok(sftW->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n"); - ok(!sftW->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftW->Reserved8); } START_TEST(secur32)

1 0

Alexander Dorofeyev : ddraw: Fix some texture blending modes.
by Alexandre Julliard May 5, 2008

May 5, 2008

Module: wine Branch: master Commit: 30221f7bcdc2a31cebfac227a20a3a4b0098404e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30221f7bcdc2a31cebfac227a… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon May 5 01:06:00 2008 +0300 ddraw: Fix some texture blending modes. --- dlls/ddraw/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a2030aa..70a3cf6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2710,6 +2710,14 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; } + case D3DTBLEND_ADD: + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_ADD); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); + break; + case D3DTBLEND_MODULATEALPHA: IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); @@ -2719,6 +2727,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; + case D3DTBLEND_COPY: case D3DTBLEND_DECAL: IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); @@ -2727,11 +2736,11 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; case D3DTBLEND_DECALALPHA: + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_BLENDTEXTUREALPHA); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG1, WINED3DTA_TEXTURE); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG1, WINED3DTA_TEXTURE); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLORARG2, WINED3DTA_CURRENT); + IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_SELECTARG2); IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAARG2, WINED3DTA_CURRENT); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_COLOROP, WINED3DTOP_SELECTARG1); - IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, 0, WINED3DTSS_ALPHAOP, WINED3DTOP_MODULATE); break; default:

1 0