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
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
January 2012
----- 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
972 discussions
Start a n
N
ew thread
Francois Gouget : ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: daeb4d6d29ed5608fc7a0671f5d0789d9c57381e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=daeb4d6d29ed5608fc7a0671f…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:33:34 2012 +0100 ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b6beb6b..c54f878 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2649,7 +2649,7 @@ CreateAdditionalSurfaces(IDirectDrawImpl *This, return DD_OK; } -HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) +static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource) { return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 38541cd..c23007e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -200,7 +200,6 @@ struct IDirectDrawSurfaceImpl }; HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; -void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0caad37..0d6e398 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -429,7 +429,7 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) * This: Surface to free * *****************************************************************************/ -void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) +static void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) { TRACE("surface %p.\n", This);
1
0
0
0
Francois Gouget : jscript: Make some engine functions static.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: ee2111b5d5c12635b13374414eb5d87ffd8758e4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ee2111b5d5c12635b13374414…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:33:13 2012 +0100 jscript: Make some engine functions static. --- dlls/jscript/engine.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index af546ad..77fabe3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -641,7 +641,7 @@ static HRESULT interp_forin(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.10 */ -HRESULT interp_push_scope(exec_ctx_t *ctx) +static HRESULT interp_push_scope(exec_ctx_t *ctx) { IDispatch *disp; jsdisp_t *obj; @@ -669,7 +669,7 @@ HRESULT interp_push_scope(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.10 */ -HRESULT interp_pop_scope(exec_ctx_t *ctx) +static HRESULT interp_pop_scope(exec_ctx_t *ctx) { TRACE("\n"); @@ -678,7 +678,7 @@ HRESULT interp_pop_scope(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 12.12 */ -HRESULT interp_label(exec_ctx_t *ctx) +static HRESULT interp_label(exec_ctx_t *ctx) { FIXME("\n"); return E_NOTIMPL; @@ -1241,7 +1241,7 @@ static HRESULT interp_carray(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.5 */ -HRESULT interp_new_obj(exec_ctx_t *ctx) +static HRESULT interp_new_obj(exec_ctx_t *ctx) { jsdisp_t *obj; VARIANT v; @@ -1258,7 +1258,7 @@ HRESULT interp_new_obj(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.1.5 */ -HRESULT interp_obj_prop(exec_ctx_t *ctx) +static HRESULT interp_obj_prop(exec_ctx_t *ctx) { const BSTR name = ctx->parser->code->instrs[ctx->ip].arg1.bstr; jsdisp_t *obj;
1
0
0
0
Francois Gouget : wshom.ocx: Make debugstr_variant() static.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: 528c7bef6f6a5402990fbf67155ada46e6753ed3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=528c7bef6f6a5402990fbf671…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:50 2012 +0100 wshom.ocx: Make debugstr_variant() static. --- dlls/wshom.ocx/shell.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 4d0c266..204f91d 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wshom); -const char *debugstr_variant(const VARIANT *v) +static const char *debugstr_variant(const VARIANT *v) { if(!v) return "(null)";
1
0
0
0
Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: adcd8637ac81a02dcb4100ceaa64a01704c6eefa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=adcd8637ac81a02dcb4100cea…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:56 2012 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 12 ++++++------ dlls/ddraw/tests/ddraw7.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 68448d1..3f195b7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -566,12 +566,12 @@ static void test_clipper_blt(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d434c94..6075009 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -559,12 +559,12 @@ static void test_clipper_blt(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr);
1
0
0
0
Francois Gouget : oleview: Mark a couple of button labels as not needing translation.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: e799c1717d7f2e6af0f5176372abfd6bf973d066 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e799c1717d7f2e6af0f517637…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:45 2012 +0100 oleview: Mark a couple of button labels as not needing translation. They correspond to IPersistStream method names. --- po/ar.po | 8 -------- po/bg.po | 9 --------- po/ca.po | 8 -------- po/cs.po | 9 --------- po/da.po | 8 -------- po/de.po | 8 -------- po/el.po | 8 -------- po/en.po | 8 -------- po/en_US.po | 8 -------- po/eo.po | 9 --------- po/es.po | 9 --------- po/fa.po | 8 -------- po/fi.po | 9 --------- po/fr.po | 8 -------- po/he.po | 8 -------- po/hi.po | 8 -------- po/hu.po | 9 --------- po/it.po | 8 -------- po/ja.po | 8 -------- po/ko.po | 8 -------- po/lt.po | 8 -------- po/ml.po | 8 -------- po/nb_NO.po | 8 -------- po/nl.po | 8 -------- po/or.po | 8 -------- po/pa.po | 8 -------- po/pl.po | 8 -------- po/pt_BR.po | 8 -------- po/pt_PT.po | 8 -------- po/rm.po | 8 -------- po/ro.po | 8 -------- po/ru.po | 8 -------- po/sk.po | 9 --------- po/sl.po | 9 --------- po/sr_RS(a)cyrillic.po | 9 --------- po/sr_RS(a)latin.po | 9 --------- po/sv.po | 8 -------- po/te.po | 8 -------- po/th.po | 8 -------- po/tr.po | 9 --------- po/uk.po | 8 -------- po/wa.po | 9 --------- po/wine.pot | 8 -------- po/zh_CN.po | 8 -------- po/zh_TW.po | 8 -------- programs/oleview/oleview.rc | 4 ++-- 46 files changed, 2 insertions(+), 374 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e799c1717d7f2e6af0f51…
1
0
0
0
Francois Gouget : msvcp60: Add a trailing '\n' to a couple of TRACE() messages.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: 5ff7ecaae0fb4bb7ff1043f5737b5dc818f4acc6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5ff7ecaae0fb4bb7ff1043f57…
Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 9 09:27:32 2012 +0100 msvcp60: Add a trailing '\n' to a couple of TRACE() messages. --- dlls/msvcp60/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 5b9eeb5..96e7134 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -269,7 +269,7 @@ MSVCP_size_t __cdecl basic_string_char__Pdif(const char *i1, const char *i2) /* ?_Psum@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@CAPEBDPEBD_K@Z */ char* __cdecl basic_string_char__Psum(char *iter, MSVCP_size_t add) { - TRACE("(%p %lu)", iter, add); + TRACE("(%p %lu)\n", iter, add); return iter ? iter+add : iter; } @@ -1965,7 +1965,7 @@ MSVCP_size_t __cdecl basic_string_wchar__Pdif(const wchar_t *i1, const wchar_t * /* ?_Psum@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@CAPEBGPEBG_K@Z */ wchar_t* __cdecl basic_string_wchar__Psum(wchar_t *iter, MSVCP_size_t add) { - TRACE("(%p %lu)", iter, add); + TRACE("(%p %lu)\n", iter, add); return iter ? iter+add : iter; }
1
0
0
0
Nikolay Sivov : comctl32: Remove redundant parameter from a helper.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: e3688c2f9aef7b6e48aab5391db77af263ef9211 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3688c2f9aef7b6e48aab5391…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:39:14 2012 +0300 comctl32: Remove redundant parameter from a helper. --- dlls/comctl32/toolbar.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fa67eb8..bd35533 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -329,9 +329,9 @@ TOOLBAR_ButtonHasString(const TBUTTON_INFO *btnPtr) * function should be null. */ static void -TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr, DWORD dwStyle) +TOOLBAR_CheckStyle (const TOOLBAR_INFO *infoPtr) { - if (dwStyle & TBSTYLE_REGISTERDROP) + if (infoPtr->dwStyle & TBSTYLE_REGISTERDROP) FIXME("[%p] TBSTYLE_REGISTERDROP not implemented\n", infoPtr->hwndSelf); } @@ -5166,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData (hwnd, themeClass); - TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle); + TOOLBAR_CheckStyle (infoPtr); return 0; } @@ -6368,11 +6368,10 @@ TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpSty else infoPtr->dwDTFlags = DT_CENTER | DT_END_ELLIPSIS; - TOOLBAR_CheckStyle (infoPtr, lpStyle->styleNew); - TRACE("new style 0x%08x\n", lpStyle->styleNew); infoPtr->dwStyle = lpStyle->styleNew; + TOOLBAR_CheckStyle (infoPtr); if ((dwOldStyle ^ lpStyle->styleNew) & (TBSTYLE_WRAPABLE | CCS_VERT)) TOOLBAR_LayoutToolbar(infoPtr);
1
0
0
0
Nikolay Sivov : comctl32: Store style bits provided with WM_CREATE.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: 9188b58e4c29df998a8af83bba2254d34594c0c8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9188b58e4c29df998a8af83bb…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:36:12 2012 +0300 comctl32: Store style bits provided with WM_CREATE. --- dlls/comctl32/tests/toolbar.c | 1 - dlls/comctl32/toolbar.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 22ad75c..5049ef6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1658,7 +1658,6 @@ static void test_get_set_style(void) style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); style2 = GetWindowLongA(hToolbar, GWL_STYLE); -todo_wine ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); /* try to alter common window bits */ diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 3868967..fa67eb8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5151,12 +5151,11 @@ static LRESULT TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { TOOLBAR_INFO *infoPtr = (TOOLBAR_INFO *)GetWindowLongPtrW(hwnd, 0); - DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); LOGFONTW logFont; TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); - infoPtr->dwStyle = dwStyle; + infoPtr->dwStyle = lpcs->style; GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_REQUERY)); @@ -5167,7 +5166,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) OpenThemeData (hwnd, themeClass); - TOOLBAR_CheckStyle (infoPtr, dwStyle); + TOOLBAR_CheckStyle (infoPtr, infoPtr->dwStyle); return 0; }
1
0
0
0
Nikolay Sivov : comctl32: Fix TB_SETSTYLE behaviour and return value.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: 54b6c76720c502097cc63dad9a42fbf772ff83d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=54b6c76720c502097cc63dad9…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 7 21:27:38 2012 +0300 comctl32: Fix TB_SETSTYLE behaviour and return value. --- dlls/comctl32/tests/toolbar.c | 50 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 9 +++---- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 8850b11..22ad75c 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -164,6 +164,7 @@ static void basic_test(void) TBBUTTON buttons[9]; HWND hToolbar; int i; + for (i=0; i<9; i++) MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); @@ -1633,6 +1634,54 @@ static void test_tooltip(void) DestroyWindow(hToolbar); } +static void test_get_set_style(void) +{ + TBBUTTON buttons[9]; + DWORD style, style2, ret; + HWND hToolbar; + int i; + + for (i=0; i<9; i++) + MakeButton(buttons+i, 1000+i, TBSTYLE_CHECKGROUP, 0); + MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); + MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); + + hToolbar = CreateToolbarEx(hMainWnd, + WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | + WS_CHILD | TBSTYLE_LIST, + 100, + 0, NULL, 0, + buttons, sizeof(buttons)/sizeof(buttons[0]), + 0, 0, 20, 16, sizeof(TBBUTTON)); + ok(hToolbar != NULL, "Toolbar creation\n"); + SendMessage(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"test\000"); + + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + style2 = GetWindowLongA(hToolbar, GWL_STYLE); +todo_wine + ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); + + /* try to alter common window bits */ + style2 |= WS_BORDER; + ret = SendMessageA(hToolbar, TB_SETSTYLE, 0, style2); + ok(ret == 0, "got %d\n", ret); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + style2 = GetWindowLongA(hToolbar, GWL_STYLE); + ok((style != style2) && (style == (style2 | WS_BORDER)), + "got 0x%08x, expected 0x%08x\n", style, style2); + ok(style & WS_BORDER, "got 0x%08x\n", style); + + /* now styles are the same, alter window style */ + ret = SendMessageA(hToolbar, TB_SETSTYLE, 0, style2); + ok(ret == 0, "got %d\n", ret); + style2 |= WS_BORDER; + SetWindowLongA(hToolbar, GWL_STYLE, style2); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(style == style2, "got 0x%08x, expected 0x%08x\n", style, style2); + + DestroyWindow(hToolbar); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1672,6 +1721,7 @@ START_TEST(toolbar) test_setrows(); test_getstring(); test_tooltip(); + test_get_set_style(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fba9bce..3868967 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4908,11 +4908,10 @@ TOOLBAR_SetState (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) static LRESULT -TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, LPARAM lParam) +TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) { - SetWindowLongW(infoPtr->hwndSelf, GWL_STYLE, lParam); - - return TRUE; + infoPtr->dwStyle = style; + return 0; } @@ -5155,7 +5154,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); LOGFONTW logFont; - TRACE("hwnd = %p\n", hwnd); + TRACE("hwnd = %p, style=0x%08x\n", hwnd, lpcs->style); infoPtr->dwStyle = dwStyle; GetClientRect(hwnd, &infoPtr->client_rect);
1
0
0
0
Henri Verbeet : wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef.
by Alexandre Julliard
09 Jan '12
09 Jan '12
Module: wine Branch: master Commit: 9a8491045ee679bddb5d895a7f8531b3ed036daf URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a8491045ee679bddb5d895a7…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 8 21:15:00 2012 +0100 wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef. --- dlls/d3d10core/device.c | 4 +- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 3 +- dlls/d3d9/device.c | 4 +- dlls/ddraw/ddraw.c | 4 +- dlls/ddraw/surface.c | 2 +- dlls/dxgi/factory.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 6 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 53 +++++++++++++++++++-------------------- 17 files changed, 51 insertions(+), 51 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a8491045ee679bddb5d8…
1
0
0
0
← Newer
1
...
76
77
78
79
80
81
82
...
98
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
87
88
89
90
91
92
93
94
95
96
97
98
Results per page:
10
25
50
100
200