November 2011 - Wine-Commits

Frédéric Delanoy : ole32: Avoid hardcoding array lengths.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 67181743a6a92ed16c35674489768450bb483b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67181743a6a92ed16c3567448… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 17 20:30:39 2011 +0100 ole32: Avoid hardcoding array lengths. --- dlls/ole32/comcat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 1874a8b..93e1f26 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -635,7 +635,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[24] = { '\\', 'I', 'm', 'p', 'l', 'e', 'm', 'e', + static const WCHAR postfix[] = { '\\', 'I', 'm', 'p', 'l', 'e', 'm', 'e', 'n', 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 }; @@ -657,7 +657,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( REFCLSID rclsid, LPENUMCATID *ppenumCATID) { - static const WCHAR postfix[21] = { '\\', 'R', 'e', 'q', 'u', 'i', 'r', 'e', + static const WCHAR postfix[] = { '\\', 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'd', ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', 'i', 'e', 's', 0 };

1 0

Henri Verbeet : ddraw: We can't render to the desktop window either.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 8e6f5c34a2c657fa714d3d59f7918953dc84d883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6f5c34a2c657fa714d3d59f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 20:11:40 2011 +0100 ddraw: We can't render to the desktop window either. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/surface.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9ca3473..8cb2596 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -452,7 +452,7 @@ void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) wined3d_device_uninit_gdi(ddraw->wined3d_device); } - ddraw->swapchain_window = NULL; + ddraw_set_swapchain_window(ddraw, NULL); TRACE("Swapchain destroyed.\n"); } @@ -2655,7 +2655,7 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface } if (SUCCEEDED(hr)) - ddraw->swapchain_window = ddraw->dest_window; + ddraw_set_swapchain_window(ddraw, ddraw->dest_window); return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0f2c6ab..f53c93f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -128,6 +128,13 @@ struct IDirectDrawImpl HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; +static inline void ddraw_set_swapchain_window(struct IDirectDrawImpl *ddraw, HWND window) +{ + if (window == GetDesktopWindow()) + window = NULL; + ddraw->swapchain_window = window; +} + /* Utility functions */ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 854ec3c..864b3ba 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3952,12 +3952,12 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, if (clipWindow) { wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, clipWindow); - This->ddraw->swapchain_window = clipWindow; + ddraw_set_swapchain_window(This->ddraw, clipWindow); } else { wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, This->ddraw->d3d_window); - This->ddraw->swapchain_window = This->ddraw->dest_window; + ddraw_set_swapchain_window(This->ddraw, This->ddraw->dest_window); } }

1 0

Alexandre Julliard : comctl32/syslink: Wrap the link text on \n characters.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 11c2150dd9e696a7fd2be629bf4af3ece0a7ed75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c2150dd9e696a7fd2be629b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 11:57:07 2011 +0100 comctl32/syslink: Wrap the link text on \n characters. --- dlls/comctl32/syslink.c | 64 ++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index b2dfdad..823c7ac 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -609,35 +609,26 @@ static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Cur static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, int nFit, LPSIZE Extent) { - WCHAR *Current; + int i; - if(nFit == *LineLen) - { - return FALSE; - } + for (i = 0; i < nFit; i++) if (Text[i] == '\n') break; - *LineLen = nFit; + if (i == *LineLen) return FALSE; - Current = Text + nFit; - /* check if we're in the middle of a word */ - if((*Current) != BreakChar) + if (Text[i] != '\n' && Text[i] != BreakChar) { /* search for the beginning of the word */ - while(Current > Text && (*(Current - 1)) != BreakChar) - { - Current--; - (*LineLen)--; - } - - if((*LineLen) == 0) + while (i && Text[i - 1] != BreakChar) i--; + + if (i == 0) { Extent->cx = 0; Extent->cy = 0; + i = max( nFit, 1 ); } - return TRUE; } - + *LineLen = i; return TRUE; } @@ -652,6 +643,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) HGDIOBJ hOldFont; int x, y, LineHeight; SIZE szDoc; + TEXTMETRICW tm; szDoc.cx = szDoc.cy = 0; @@ -668,8 +660,9 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) x = SL_LEFTMARGIN; y = SL_TOPMARGIN; - LineHeight = 0; - + GetTextMetricsW( hdc, &tm ); + LineHeight = tm.tmHeight + tm.tmExternalLeading; + for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) { int n, nBlocks; @@ -677,6 +670,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) PDOC_TEXTBLOCK bl, cbl; INT nFit; SIZE szDim; + int SkipChars = 0; if(Current->nText == 0) { @@ -702,11 +696,15 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) while(n > 0) { - int SkipChars = 0; - /* skip break characters unless they're the first of the doc item */ if(tx != Current->Text || x == SL_LEFTMARGIN) { + if (n && *tx == '\n') + { + tx++; + SkipChars++; + n--; + } while(n > 0 && (*tx) == infoPtr->BreakChar) { tx++; @@ -728,20 +726,10 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) if(LineLen == 0) { - if(x > SL_LEFTMARGIN) - { - /* move one line down, the word didn't fit into the line */ - x = SL_LEFTMARGIN; - y += LineHeight; - LineHeight = 0; - continue; - } - else - { - /* the word starts at the beginning of the line and doesn't - fit into the line, so break it at the last character that fits */ - LineLen = max(nFit, 1); - } + /* move one line down, the word didn't fit into the line */ + x = SL_LEFTMARGIN; + y += LineHeight; + continue; } if(LineLen != n) @@ -782,13 +770,10 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) if(LineLen != 0) { x += szDim.cx; - LineHeight = max(LineHeight, szDim.cy); - if(Wrap) { x = SL_LEFTMARGIN; y += LineHeight; - LineHeight = 0; } } } @@ -803,6 +788,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) } n -= LineLen; tx += LineLen; + SkipChars = 0; } else {

1 0

Frédéric Delanoy : wineboot: Make runkeys_names global variable static.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 52000a774870174e7fef53d0710f3ccf35c6df6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=52000a774870174e7fef53d07… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 18 01:11:36 2011 +0100 wineboot: Make runkeys_names global variable static. --- programs/wineboot/wineboot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 47a9bf1..d020f37 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -574,7 +574,7 @@ enum runkeys { RUNKEY_RUN, RUNKEY_RUNONCE, RUNKEY_RUNSERVICES, RUNKEY_RUNSERVICESONCE }; -const WCHAR runkeys_names[][30]= +static const WCHAR runkeys_names[][30]= { {'R','u','n',0}, {'R','u','n','O','n','c','e',0},

1 0

Frédéric Delanoy : comctl32: Avoid hardcoding array lengths.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: eae3c2ae27edb30211a259139660ed249653bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae3c2ae27edb30211a259139… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 17 20:30:37 2011 +0100 comctl32: Avoid hardcoding array lengths. --- dlls/comctl32/ipaddress.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index ee8a31d..e51ae08 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -79,8 +79,8 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) { - static const WCHAR zero[2] = {'0', 0}; - static const WCHAR dot[2] = {'.', 0}; + static const WCHAR zero[] = {'0', 0}; + static const WCHAR dot[] = {'.', 0}; WCHAR field[4]; WCHAR ip[16]; INT i;

1 0

Alexandre Julliard : winecfg: Convert dialogs to po files.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: f5e7de6bb9dafe3da98874a014a4c9f2b076ae1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e7de6bb9dafe3da98874a01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 14:23:04 2011 +0100 winecfg: Convert dialogs to po files. --- po/ar.po | 311 ++++++++++++++++++++++++++++-- po/bg.po | 325 +++++++++++++++++++++++++++++--- po/ca.po | 325 +++++++++++++++++++++++++++++--- po/cs.po | 321 +++++++++++++++++++++++++++++--- po/da.po | 324 +++++++++++++++++++++++++++++--- po/de.po | 316 +++++++++++++++++++++++++++++-- po/el.po | 311 ++++++++++++++++++++++++++++-- po/en.po | 309 ++++++++++++++++++++++++++++-- po/en_US.po | 315 +++++++++++++++++++++++++++++-- po/eo.po | 329 ++++++++++++++++++++++++++++++-- po/es.po | 328 +++++++++++++++++++++++++++++--- po/fa.po | 311 ++++++++++++++++++++++++++++-- po/fi.po | 335 +++++++++++++++++++++++++++++---- po/fr.po | 317 +++++++++++++++++++++++++++++-- po/he.po | 341 +++++++++++++++++++++++++++++++-- po/hi.po | 304 ++++++++++++++++++++++++++++-- po/hu.po | 330 +++++++++++++++++++++++++++++--- po/it.po | 316 +++++++++++++++++++++++++++++-- po/ja.po | 316 +++++++++++++++++++++++++++++-- po/ko.po | 313 +++++++++++++++++++++++++++++-- po/lt.po | 315 +++++++++++++++++++++++++++++-- po/ml.po | 304 ++++++++++++++++++++++++++++-- po/nb_NO.po | 325 +++++++++++++++++++++++++++++--- po/nl.po | 319 +++++++++++++++++++++++++++++-- po/or.po | 304 ++++++++++++++++++++++++++++-- po/pa.po | 304 ++++++++++++++++++++++++++++-- po/pl.po | 315 +++++++++++++++++++++++++++++-- po/pt_BR.po | 318 +++++++++++++++++++++++++++++-- po/pt_PT.po | 325 +++++++++++++++++++++++++++++--- po/rm.po | 312 ++++++++++++++++++++++++++++-- po/ro.po | 318 +++++++++++++++++++++++++++++-- po/ru.po | 314 +++++++++++++++++++++++++++++-- po/sk.po | 316 +++++++++++++++++++++++++++++-- po/sl.po | 319 +++++++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 339 +++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 336 +++++++++++++++++++++++++++++---- po/sv.po | 318 +++++++++++++++++++++++++++++-- po/te.po | 304 ++++++++++++++++++++++++++++-- po/th.po | 310 ++++++++++++++++++++++++++++-- po/tr.po | 332 +++++++++++++++++++++++++++++--- po/uk.po | 316 +++++++++++++++++++++++++++++-- po/wa.po | 312 ++++++++++++++++++++++++++++-- po/wine.pot | 303 ++++++++++++++++++++++++++++-- po/zh_CN.po | 321 +++++++++++++++++++++++++++++--- po/zh_TW.po | 331 +++++++++++++++++++++++++++++---- programs/winecfg/Bg.rc | 201 -------------------- programs/winecfg/Ca.rc | 203 -------------------- programs/winecfg/Cs.rc | 201 -------------------- programs/winecfg/Da.rc | 208 -------------------- programs/winecfg/De.rc | 207 -------------------- programs/winecfg/En.rc | 254 ------------------------- programs/winecfg/Es.rc | 206 -------------------- programs/winecfg/Fi.rc | 196 ------------------- programs/winecfg/Fr.rc | 209 -------------------- programs/winecfg/Hu.rc | 195 ------------------- programs/winecfg/It.rc | 209 -------------------- programs/winecfg/Ja.rc | 210 --------------------- programs/winecfg/Ko.rc | 211 --------------------- programs/winecfg/Lt.rc | 208 -------------------- programs/winecfg/Makefile.in | 30 +--- programs/winecfg/Nl.rc | 209 -------------------- programs/winecfg/No.rc | 208 -------------------- programs/winecfg/Pl.rc | 209 -------------------- programs/winecfg/Pt.rc | 429 ------------------------------------------ programs/winecfg/Ro.rc | 207 -------------------- programs/winecfg/Ru.rc | 212 --------------------- programs/winecfg/Si.rc | 207 -------------------- programs/winecfg/Sr.rc | 208 -------------------- programs/winecfg/Sv.rc | 205 -------------------- programs/winecfg/Tr.rc | 195 ------------------- programs/winecfg/Uk.rc | 211 --------------------- programs/winecfg/Zh.rc | 381 ------------------------------------- programs/winecfg/winecfg.rc | 179 ++++++++++++++++++ 73 files changed, 13513 insertions(+), 6822 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e7de6bb9dafe3da9887…

1 0

Henri Verbeet : wined3d: Recognize the SM4 deriv_rtx opcode.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 9ef669e80ad17e9df97e211342a8d1100ce68ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef669e80ad17e9df97e21134… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 20:11:38 2011 +0100 wined3d: Recognize the SM4 deriv_rtx opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f6c3ec1..25c5148 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -57,6 +57,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CUT = 0x09, + WINED3D_SM4_OP_DERIV_RTX = 0x0b, WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -138,6 +139,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, + {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, 1, 1}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, 1, 2}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2},

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskUnion().
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 989a6435878304f7f1e3b783ce3aca70e66f754e URL: http://source.winehq.org/git/wine.git/?a=commit;h=989a6435878304f7f1e3b783c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 20:11:37 2011 +0100 d3d10: Implement D3D10StateBlockMaskUnion(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 23 +++++++++++++++++++++++ dlls/d3d10/tests/device.c | 11 +++++++++++ include/d3d10effect.h | 2 ++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 42996a8..d1b2b98 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -26,4 +26,4 @@ @ stdcall D3D10StateBlockMaskEnableCapture(ptr long long long) @ stdcall D3D10StateBlockMaskGetSetting(ptr long long) @ stdcall D3D10StateBlockMaskIntersect(ptr ptr ptr) -@ stub D3D10StateBlockMaskUnion +@ stdcall D3D10StateBlockMaskUnion(ptr ptr ptr) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 67ccae7..ef6fe3f 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -508,3 +508,26 @@ HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x, return S_OK; } + +HRESULT WINAPI D3D10StateBlockMaskUnion(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result) +{ + UINT count = sizeof(*result) / sizeof(DWORD); + UINT i; + + TRACE("mask_x %p, mask_y %p, result %p.\n", mask_x, mask_y, result); + + if (!mask_x || !mask_y || !result) + return E_INVALIDARG; + + for (i = 0; i < count; ++i) + { + ((DWORD *)result)[i] = ((DWORD *)mask_x)[i] | ((DWORD *)mask_y)[i]; + } + for (i = count * sizeof(DWORD); i < sizeof(*result); ++i) + { + ((BYTE *)result)[i] = ((BYTE *)mask_x)[i] | ((BYTE *)mask_y)[i]; + } + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 2ce0b2a..9ad742f 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -128,6 +128,17 @@ static void test_stateblock_mask(void) hr = D3D10StateBlockMaskIntersect(&mask_x, &mask_y, NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, &result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskUnion failed, hr %#x.\n", hr); + ok(result.VS == 0x77, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0xbb, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskUnion(NULL, &mask_y, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskUnion(&mask_x, NULL, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskUnion(&mask_x, &mask_y, NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + memset(&result, 0xff, sizeof(result)); hr = D3D10StateBlockMaskDisableAll(&result); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 6db61d3..5dbf31b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -844,6 +844,8 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT idx); HRESULT WINAPI D3D10StateBlockMaskIntersect(D3D10_STATE_BLOCK_MASK *mask_x, D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); +HRESULT WINAPI D3D10StateBlockMaskUnion(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); #ifdef __cplusplus }

1 0

Henri Verbeet : wined3d: Recognize the SM4 deriv_rty opcode.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 8dd50e9a204fcfe4c2a9e566fe2eecbd5d7d9cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd50e9a204fcfe4c2a9e566f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 20:11:39 2011 +0100 wined3d: Recognize the SM4 deriv_rty opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 25c5148..0e81b4e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -58,6 +58,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DERIV_RTX = 0x0b, + WINED3D_SM4_OP_DERIV_RTY = 0x0c, WINED3D_SM4_OP_DIV = 0x0e, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -140,6 +141,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, 1, 1}, + {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, 1, 1}, {WINED3D_SM4_OP_DIV, WINED3DSIH_DIV, 1, 2}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2},

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DMATRIX typedef.
by Alexandre Julliard Nov. 18, 2011

Nov. 18, 2011

Module: wine Branch: master Commit: 37a0f7ad65c38a21bdacd2a909bee12add345a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a0f7ad65c38a21bdacd2a90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 17 20:11:41 2011 +0100 wined3d: Get rid of the WINED3DMATRIX typedef. --- dlls/d3d8/device.c | 12 ++++++------ dlls/d3d9/device.c | 12 ++++++------ dlls/ddraw/device.c | 21 ++++++++++++--------- dlls/ddraw/executebuffer.c | 8 ++++---- dlls/ddraw/viewport.c | 6 +++--- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/utils.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 5 +++-- include/wine/wined3d.h | 10 +++++----- 9 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37a0f7ad65c38a21bdacd…

1 0