wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Vitaliy Margolen : dinput: Remove redundant stuff.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: aee42377984ab01c4aef0885780a707b606ec333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee42377984ab01c4aef08857… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:25 2009 -0600 dinput: Remove redundant stuff. --- dlls/dinput/joystick.c | 34 ---------------------------------- dlls/dinput/joystick_linux.c | 6 +++--- dlls/dinput/joystick_osx.c | 8 ++++---- dlls/dinput/joystick_private.h | 4 ---- 4 files changed, 7 insertions(+), 45 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index fbf05ec..d57ef7b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -32,40 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); /****************************************************************************** - * Acquire : gets exclusive control of the joystick - */ -HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; - - TRACE("(%p)\n",This); - - if (This->base.acquired) { - WARN("already acquired\n"); - return S_FALSE; - } - - This->base.acquired = 1; - - return DI_OK; -} - -/****************************************************************************** - * Unacquire : frees the joystick - */ -HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) -{ - JoystickGenericImpl *This = (JoystickGenericImpl *)iface; - HRESULT res; - - TRACE("(%p)\n",This); - - if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; - - return DI_OK; -} - -/****************************************************************************** * SetProperty : change input device properties */ HRESULT WINAPI JoystickAGenericImpl_SetProperty( diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index fcf1552..c7facab 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -611,7 +611,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(%p)\n",This); - res = JoystickAGenericImpl_Acquire(iface); + res = IDirectInputDevice2AImpl_Acquire(iface); if (res != DI_OK) return res; @@ -622,7 +622,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) This->joyfd=open(This->dev,O_RDONLY); if (This->joyfd==-1) { ERR("open(%s) failed: %s\n", This->dev, strerror(errno)); - JoystickAGenericImpl_Unacquire(iface); + IDirectInputDevice2AImpl_Unacquire(iface); return DIERR_NOTFOUND; } } @@ -640,7 +640,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) TRACE("(%p)\n",This); - res = JoystickAGenericImpl_Unacquire(iface); + res = IDirectInputDevice2AImpl_Unacquire(iface); if (res != DI_OK) return res; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 7305bb9..1446b6e 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -865,8 +865,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_EnumObjects, JoystickAGenericImpl_GetProperty, JoystickAGenericImpl_SetProperty, - JoystickAGenericImpl_Acquire, - JoystickAGenericImpl_Unacquire, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, IDirectInputDevice2AImpl_SetDataFormat, @@ -907,8 +907,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)JoystickAGenericImpl_GetProperty, XCAST(SetProperty)JoystickAGenericImpl_SetProperty, - XCAST(Acquire)JoystickAGenericImpl_Acquire, - XCAST(Unacquire)JoystickAGenericImpl_Unacquire, + XCAST(Acquire)IDirectInputDevice2AImpl_Acquire, + XCAST(Unacquire)IDirectInputDevice2AImpl_Unacquire, XCAST(GetDeviceState)JoystickAGenericImpl_GetDeviceState, XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 803e0dd..d1f1666 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -79,8 +79,4 @@ HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface); HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr); -HRESULT WINAPI JoystickAGenericImpl_Acquire(LPDIRECTINPUTDEVICE8A iface); - -HRESULT WINAPI JoystickAGenericImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface); - #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Vitaliy Margolen : dinput: Make EnumDevices and GetObjectInfo consistent about GUIDs.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: fc4f1607a6928e7fa36140bf6c753a69e96f92b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4f1607a6928e7fa36140bf6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 19 20:33:22 2009 -0600 dinput: Make EnumDevices and GetObjectInfo consistent about GUIDs. guidInstance should be the same from both places. --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 2 ++ dlls/dinput/joystick_osx.c | 2 ++ dlls/dinput/joystick_private.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e7e7ef..fbf05ec 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -332,7 +332,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceInfo( } /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; + pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; @@ -365,7 +365,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetDeviceInfo( } /* Return joystick */ - pdidi->guidInstance = GUID_Joystick; + pdidi->guidInstance = This->guidInstance; pdidi->guidProduct = This->guidProduct; /* we only support traditional joysticks for now */ pdidi->dwDevType = This->devcaps.dwDevType; diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index afabebe..fcf1552 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -379,6 +379,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di return DIERR_DEVICENOTREG; } + newDevice->generic.guidInstance = DInput_Wine_Joystick_GUID; + newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_Joystick_GUID; newDevice->generic.joy_polldev = joy_polldev; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index d5a5f17..7305bb9 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -650,6 +650,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->id = index; + newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.joy_polldev = poll_osx_device_state; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index b61406f..803e0dd 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -41,6 +41,7 @@ typedef struct JoystickGenericImpl DIDEVCAPS devcaps; DIJOYSTATE2 js; /* wine data */ GUID guidProduct; + GUID guidInstance; char *name; joy_polldev_handler *joy_polldev;

1 0

Paul Vriens : rpcrt4: Fix NdrDllCanUnloadNow.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 90d3163aba26936d5dfa4801659e744a0134916f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d3163aba26936d5dfa48016… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 20 11:58:45 2009 +0200 rpcrt4: Fix NdrDllCanUnloadNow. --- dlls/rpcrt4/cpsf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index a0d541d..9b91466 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -207,7 +207,7 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, */ HRESULT WINAPI NdrDllCanUnloadNow(CStdPSFactoryBuffer *pPSFactoryBuffer) { - return !(pPSFactoryBuffer->RefCount); + return pPSFactoryBuffer->RefCount != 0 ? S_FALSE : S_OK; }

1 0

Igor Tarasov : comctl32: Fix regression caused by 2d751ee56afced908d0788b936fa4aac1b29f1a1.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: c037b333c889729b5c1dd5150fdc6310d676cd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c037b333c889729b5c1dd5150… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Sat Apr 18 06:51:40 2009 +0500 comctl32: Fix regression caused by 2d751ee56afced908d0788b936fa4aac1b29f1a1. Fixing regression produced by "comctl32: Correct handling of toolbar separators size". As it came out, some applications DO rely on iBitmap value, but it can be received not with TB_GETBUTTONINFO, but with TB_GETBITMAP. --- dlls/comctl32/toolbar.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fe4c539..faac97c 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1331,7 +1331,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) /* horizontal separators are treated as buttons for width */ else if ((btnPtr[i].fsStyle & BTNS_SEP) && !(infoPtr->dwStyle & CCS_VERT)) - cx = SEPARATOR_WIDTH; + cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else cx = infoPtr->nButtonWidth; @@ -1683,11 +1683,12 @@ TOOLBAR_LayoutToolbar(HWND hwnd) if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { - cy = SEPARATOR_WIDTH; - cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; + cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nWidth; } else - cx = (btnPtr->cx > 0) ? btnPtr->cx : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : + (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; } else { @@ -1835,11 +1836,7 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto ZeroMemory(btnPtr, sizeof(*btnPtr)); - /* When inserting separator, iBitmap controls it's size */ - if (lpTbb[iButton].fsStyle & BTNS_SEP) { - btnPtr->cx = lpTbb[iButton].iBitmap; - } else - btnPtr->iBitmap = lpTbb[iButton].iBitmap; + btnPtr->iBitmap = lpTbb[iButton].iBitmap; btnPtr->idCommand = lpTbb[iButton].idCommand; btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle;

1 0

Huw Davies : winex11.drv: Fix typo so that emf -> mfpict synthesis works.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0b6d74c4282eeef61ae4b4e1be8db2cd919be5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6d74c4282eeef61ae4b4e1b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:49:29 2009 +0100 winex11.drv: Fix typo so that emf -> mfpict synthesis works. --- dlls/user32/tests/clipboard.c | 5 ++--- dlls/winex11.drv/clipboard.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 41561a4..51aa852 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -247,10 +247,9 @@ static void test_synthesized(void) ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); cf = EnumClipboardFormats(cf); - todo_wine ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); - if(cf == CF_METAFILEPICT) - cf = EnumClipboardFormats(cf); + ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + cf = EnumClipboardFormats(cf); ok(cf == 0, "cf %08x\n", cf); r = EmptyClipboard(); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 07d58a5..e7f4667 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2746,7 +2746,7 @@ static BOOL X11DRV_CLIPBOARD_SynthesizeData(UINT wFormatID) } else if (wFormatID == CF_METAFILEPICT) { - bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_METAFILEPICT)) && + bsyn = (lpSource = X11DRV_CLIPBOARD_LookupData(CF_ENHMETAFILE)) && ~lpSource->wFlags & CF_FLAG_SYNTHESIZED; } else if (wFormatID == CF_DIB)

1 0

Huw Davies : winex11.drv: Fix ordering of synthesized text formats.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0d4451a85dca44bc3fe154f6fb9281785df38938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4451a85dca44bc3fe154f6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:46:06 2009 +0100 winex11.drv: Fix ordering of synthesized text formats. --- dlls/user32/tests/clipboard.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/clipboard.c | 2 +- 2 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 30b1707..41561a4 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -21,6 +21,7 @@ #include "wine/test.h" #include "winbase.h" #include "winerror.h" +#include "wingdi.h" #include "winuser.h" static BOOL is_win9x = FALSE; @@ -190,6 +191,75 @@ todo_wine test_last_error(ERROR_CLIPBOARD_NOT_OPEN); } +static HGLOBAL create_text(void) +{ + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + char *p = GlobalLock(h); + strcpy(p, "test"); + GlobalUnlock(h); + return h; +} + +static HENHMETAFILE create_emf(void) +{ + const RECT rect = {0, 0, 100, 100}; + HDC hdc = CreateEnhMetaFileA(NULL, NULL, &rect, "HENHMETAFILE Ole Clipboard Test\0Test\0\0"); + ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); + return CloseEnhMetaFile(hdc); +} + +static void test_synthesized(void) +{ + HGLOBAL h, htext; + HENHMETAFILE emf; + BOOL r; + UINT cf; + + htext = create_text(); + emf = create_emf(); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + h = SetClipboardData(CF_TEXT, htext); + ok(h == htext, "got %p\n", h); + h = SetClipboardData(CF_ENHMETAFILE, emf); + ok(h == emf, "got %p\n", h); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + cf = EnumClipboardFormats(0); + ok(cf == CF_TEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + ok(cf == CF_ENHMETAFILE, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + todo_wine ok(cf == CF_LOCALE, "cf %08x\n", cf); + if(cf == CF_LOCALE) + cf = EnumClipboardFormats(cf); + ok(cf == CF_OEMTEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + todo_wine ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + if(cf == CF_METAFILEPICT) + cf = EnumClipboardFormats(cf); + + ok(cf == 0, "cf %08x\n", cf); + + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); +} + START_TEST(clipboard) { SetLastError(0xdeadbeef); @@ -198,4 +268,5 @@ START_TEST(clipboard) test_RegisterClipboardFormatA(); test_ClipboardOwner(); + test_synthesized(); } diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0b27a87..07d58a5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2778,9 +2778,9 @@ void CDECL X11DRV_EndClipboardUpdate(void) INT count = ClipDataCount; /* Do Unicode <-> Text <-> OEM mapping */ - X11DRV_CLIPBOARD_SynthesizeData(CF_UNICODETEXT); X11DRV_CLIPBOARD_SynthesizeData(CF_TEXT); X11DRV_CLIPBOARD_SynthesizeData(CF_OEMTEXT); + X11DRV_CLIPBOARD_SynthesizeData(CF_UNICODETEXT); /* Enhmetafile <-> MetafilePict mapping */ X11DRV_CLIPBOARD_SynthesizeData(CF_ENHMETAFILE);

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_arb_add_src_param().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: ea0b3b42eb43c3c79139dd97694753351263373c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0b3b42eb43c3c79139dd976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_arb_add_src_param(). --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 65ad8b2..0cf5831 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -551,20 +551,20 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } static void shader_arb_add_src_param(const struct wined3d_shader_instruction *ins, - DWORD param, char *str) + const struct wined3d_shader_src_param *wined3d_src, char *str) { char register_name[255]; char swizzle[6]; BOOL is_color; - if ((param & WINED3DSP_SRCMOD_MASK) == WINED3DSPSM_NEG) strcat(str, " -"); + if (wined3d_src->modifiers == WINED3DSPSM_NEG) strcat(str, " -"); else strcat(str, " "); - shader_arb_get_register_name(ins->ctx->shader, shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK, - param & WINED3DSHADER_ADDRMODE_RELATIVE, register_name, &is_color); + shader_arb_get_register_name(ins->ctx->shader, wined3d_src->register_type, + wined3d_src->register_idx, !!wined3d_src->rel_addr, register_name, &is_color); strcat(str, register_name); - shader_arb_get_swizzle(param, is_color, swizzle); + shader_arb_get_swizzle(wined3d_src->token, is_color, swizzle); strcat(str, swizzle); } @@ -1043,7 +1043,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ","); - shader_arb_add_src_param(ins, ins->src[i].token, arguments); + shader_arb_add_src_param(ins, &ins->src[i], arguments); } } shader_addline(buffer, "%s%s;\n", instruction, arguments); @@ -1068,7 +1068,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { - shader_arb_add_src_param(ins, ins->src[0].token, src0_param); + shader_arb_add_src_param(ins, &ins->src[0], src0_param); shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); shader_addline(buffer, "ARL A0.x, TMP.x;\n"); } @@ -1077,9 +1077,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) /* 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 = ins->src[0].token & ~(WINED3DSP_SWIZZLE_MASK); - parm |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); - shader_arb_add_src_param(ins, parm, src0_param); + struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.token &= ~WINED3DSP_SWIZZLE_MASK; + tmp_src.token |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) + * (0x55 << WINED3DSP_SWIZZLE_SHIFT); + shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } } @@ -1651,7 +1653,7 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) strcpy(tmpLine, instruction); shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ strcat(tmpLine, ","); - shader_arb_add_src_param(ins, ins->src[0].token, tmpLine); + shader_arb_add_src_param(ins, &ins->src[0], tmpLine); if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) == swizzle) { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used

1 0

Henri Verbeet : wined3d: Simplify replicating the . x swizzle in shader_hw_mov().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 1ae060be4afa083581ecab49743c07113c91fad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae060be4afa083581ecab497… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Simplify replicating the .x swizzle in shader_hw_mov(). It becomes even simpler once the swizzle shift and token field are eliminated. --- dlls/wined3d/arb_program_shader.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4be1a1f..65ad8b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1076,17 +1076,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { /* 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 = ins->src[0].token & ~(WINED3DVS_SWIZZLE_MASK); - if ((ins->src[0].token & WINED3DVS_X_W) == WINED3DVS_X_W) - parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W; - else if ((ins->src[0].token & WINED3DVS_X_Z) == WINED3DVS_X_Z) - parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z; - else if ((ins->src[0].token & WINED3DVS_X_Y) == WINED3DVS_X_Y) - parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; - else if ((ins->src[0].token & WINED3DVS_X_X) == WINED3DVS_X_X) - parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; + * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ + DWORD parm = ins->src[0].token & ~(WINED3DSP_SWIZZLE_MASK); + parm |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); shader_arb_add_src_param(ins, parm, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_add_src_param().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 48a096a6381cc706a52c645aaa95aff7812bd57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a096a6381cc706a52c645aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_add_src_param(). --- dlls/wined3d/glsl_shader.c | 183 +++++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48a096a6381cc706a52c6…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_register_name() for the relative addressing token.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: c7660c57a0961ead60c0217a272a12072d8b4565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7660c57a0961ead60c0217a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_register_name() for the relative addressing token. --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 429695b..79b95fc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1022,7 +1022,7 @@ static void shader_glsl_gen_modifier ( /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, - BOOL rel_addr, const DWORD addr_token, char *register_name, BOOL *is_color, + const struct wined3d_shader_src_param *rel_addr, char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ @@ -1051,7 +1051,7 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi if (rel_addr) { glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); + shader_glsl_add_src_param(ins, rel_addr->token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP * operation there @@ -1106,7 +1106,7 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi if (rel_addr) { glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); + shader_glsl_add_src_param(ins, rel_addr->token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); if (register_idx) sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); else @@ -1277,7 +1277,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i swizzle_str[0] = '\0'; shader_glsl_get_register_name(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK, - !!addr_param, addr_param ? addr_param->token : 0, src_param->reg_name, &is_color, ins); + addr_param, src_param->reg_name, &is_color, ins); shader_glsl_get_swizzle(param, is_color, mask, swizzle_str); shader_glsl_gen_modifier(param, src_param->reg_name, swizzle_str, src_param->param_str); @@ -1295,8 +1295,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(wined3d_dst->register_type, wined3d_dst->register_idx, - !!wined3d_dst->rel_addr, wined3d_dst->rel_addr ? wined3d_dst->rel_addr->token : 0, - glsl_dst->reg_name, &is_color, ins); + wined3d_dst->rel_addr, glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); }

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
67
Older →

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 April 2009