winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2011
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
852 discussions
Start a n
N
ew thread
Frédéric Delanoy : wineboot: Make runkeys_names global variable static.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Frédéric Delanoy : ole32: Avoid hardcoding array lengths.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Frédéric Delanoy : comctl32: Avoid hardcoding array lengths.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Alexandre Julliard : comctl32/syslink: Wrap the link text on \n characters.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Henri Verbeet : wined3d: Get rid of the WINED3DMATRIX typedef.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Henri Verbeet : ddraw: We can't render to the desktop window either.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Henri Verbeet : wined3d: Recognize the SM4 deriv_rty opcode.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Henri Verbeet : wined3d: Recognize the SM4 deriv_rtx opcode.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Henri Verbeet : d3d10: Implement D3D10StateBlockMaskUnion().
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
Alexandre Julliard : winecfg: Convert dialogs to po files.
by Alexandre Julliard
18 Nov '11
18 Nov '11
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
0
0
← Newer
1
...
31
32
33
34
35
36
37
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200