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
October 2006
----- 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
3 participants
1032 discussions
Start a n
N
ew thread
Stefan Dösinger : ddraw: Make the ddraw list a wine list.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 09e794aff87551b5a50a32121d350f2ad84a2423 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=09e794aff87551b5a50a32121…
Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 9 14:40:30 2006 +0200 ddraw: Make the ddraw list a wine list. --- dlls/ddraw/ddraw.c | 22 +--------------------- dlls/ddraw/ddraw_private.h | 7 ++++--- dlls/ddraw/main.c | 20 ++++++++++++++------ 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a2177d2..341d936 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -62,9 +62,6 @@ static const DDDEVICEIDENTIFIER2 devicei 0 }; -/* This is for cleanup if a broken app doesn't Release its objects */ -IDirectDrawImpl *ddraw_list; - /***************************************************************************** * IUnknown Methods *****************************************************************************/ @@ -244,8 +241,6 @@ IDirectDrawImpl_AddRef(IDirectDraw7 *ifa void IDirectDrawImpl_Destroy(IDirectDrawImpl *This) { - IDirectDrawImpl *prev; - /* Clear the cooplevel to restore window and display mode */ IDirectDraw7_SetCooperativeLevel(ICOM_INTERFACE(This, IDirectDraw7), NULL, @@ -262,22 +257,7 @@ IDirectDrawImpl_Destroy(IDirectDrawImpl /* Unregister the window class */ UnregisterClassA(This->classname, 0); - /* Unchain it from the ddraw list */ - if(ddraw_list == This) - { - ddraw_list = This->next; - /* No need to search for a predecessor here */ - } - else - { - for(prev = ddraw_list; prev; prev = prev->next) - if(prev->next == This) break; - - if(prev) - prev->next = This->next; - else - ERR("Didn't find the previous ddraw element in the list\n"); - } + remove_ddraw_object(This); /* Release the attached WineD3D stuff */ IWineD3DDevice_Release(This->wineD3DDevice); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5cf9312..f70da21 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -36,6 +36,7 @@ #include "d3d.h" #include "ddcomimpl.h" #include "wine/wined3d_interface.h" +#include "wine/list.h" /***************************************************************************** * IParent - a helper interface @@ -143,7 +144,7 @@ struct IDirectDrawImpl BOOL depthstencil; /* For the dll unload cleanup code */ - IDirectDrawImpl *next; + struct list ddraw_list_entry; LONG surfaces; }; @@ -182,8 +183,8 @@ HRESULT WINAPI IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, DDSURFACEDESC2 *desc, void *Context); -/* The cleanup list */ -extern IDirectDrawImpl *ddraw_list; +void +remove_ddraw_object(IDirectDrawImpl *ddraw); /* The default surface type */ extern WINED3DSURFTYPE DefaultSurfaceType; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 3813f14..9fbcf35 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -58,6 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; +static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); + /*********************************************************************** * * Helper function for DirectDrawCreate and friends @@ -302,9 +304,7 @@ #undef BLIT_CAPS #undef CKEY_CAPS #undef FX_CAPS - /* Add the object to the ddraw cleanup list */ - This->next = ddraw_list; - ddraw_list = This; + list_add_head(&global_ddraw_list, &This->ddraw_list_entry); /* Call QueryInterface to get the pointer to the requested interface. This also initializes * The required refcount @@ -860,16 +860,18 @@ DllMain(HINSTANCE hInstDLL, if(counter == 0) { - if(ddraw_list) + if(!list_empty(&global_ddraw_list)) { - IDirectDrawImpl *ddraw; + struct list *entry, *entry2; WARN("There are still existing DirectDraw interfaces. Wine bug or buggy application?\n"); - for(ddraw = ddraw_list; ddraw; ddraw = ddraw->next) + /* We remove elemets from this loop */ + LIST_FOR_EACH_SAFE(entry, entry2, &global_ddraw_list) { HRESULT hr; DDSURFACEDESC2 desc; int i; + IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); WARN("DDraw %p has a refcount of %ld\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1); @@ -923,3 +925,9 @@ DllMain(HINSTANCE hInstDLL, return TRUE; } + +void +remove_ddraw_object(IDirectDrawImpl *ddraw) +{ + list_remove(&ddraw->ddraw_list_entry); +}
1
0
0
0
Mike McCormack : riched20: Don't crash if a colour isn't found.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 9eda99c0bb064ead14ece835a75bd8df5f76e63d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9eda99c0bb064ead14ece835a…
Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Oct 9 20:11:32 2006 +0900 riched20: Don't crash if a colour isn't found. --- dlls/riched20/editor.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index e3383f2..e0ba4e9 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -377,7 +377,10 @@ static void ME_RTFCharAttrHook(RTF_Info else if (info->rtfParam != rtfNoParam) { RTFColor *c = RTFGetColor(info, info->rtfParam); - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + if (c) + fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + else + fmt.crTextColor = 0; } break; case rtfFontNum:
1
0
0
0
James Hawkins : advpack: Make internal functions static.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 8b9ad4d3bc04f126e40e679dcf3d58b3e35dcc05 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8b9ad4d3bc04f126e40e679dc…
Author: James Hawkins <truiken(a)gmail.com> Date: Mon Oct 9 00:04:08 2006 -0700 advpack: Make internal functions static. --- dlls/advpack/files.c | 8 ++++---- dlls/advpack/install.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 5e7691b..de39bba 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -165,14 +165,14 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWST /* FIXME: this is only for the local case, X:\ */ #define ROOT_LENGTH 3 -UINT CALLBACK pQuietQueueCallback(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK pQuietQueueCallback(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) { return 1; } -UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) { /* only be verbose for error notifications */ if (!Notification || diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 1662f1d..d63a959 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -425,8 +425,8 @@ static HRESULT get_working_dir(ADVInfo * } /* loads the INF file and performs checks on it */ -HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, - LPCWSTR working_dir, DWORD flags, ADVInfo *info) +static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, + LPCWSTR working_dir, DWORD flags, ADVInfo *info) { DWORD len; HRESULT hr; @@ -500,7 +500,7 @@ HRESULT install_init(LPCWSTR inf_filenam } /* release the install instance information */ -void install_release(ADVInfo *info) +static void install_release(ADVInfo *info) { if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile(info->hinf);
1
0
0
0
Ivan Gyurdiev : wined3d: Make the shader mode selections per device.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: e020eceddf2dac8afab87c8e47216cb9d1aac350 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e020eceddf2dac8afab87c8e4…
Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 23:25:01 2006 -0400 wined3d: Make the shader mode selections per device. --- dlls/wined3d/device.c | 8 ++++--- dlls/wined3d/directx.c | 45 +++++++++++++++++++++++----------------- dlls/wined3d/drawprim.c | 25 +++++++++++----------- dlls/wined3d/pixelshader.c | 5 +++- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_main.c | 2 -- dlls/wined3d/wined3d_private.h | 6 ++++- 7 files changed, 50 insertions(+), 43 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e020eceddf2dac8afab87…
1
0
0
0
Nick Burns : winegcc: __stdcall__ and __cdecl__ defined safely for Mac OSX.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 3ce4350e67ef2750a8c2fcbe54121bbde543c7c4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3ce4350e67ef2750a8c2fcbe5…
Author: Nick Burns <adger44(a)hotmail.com> Date: Sat Oct 7 14:57:25 2006 -0700 winegcc: __stdcall__ and __cdecl__ defined safely for Mac OSX. --- tools/winegcc/winegcc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ff38076..663a029 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -285,11 +285,19 @@ #endif if (gcc_defs) { +#ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */ + strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); + strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); + strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); + strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); +#else strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__))"); - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); +#endif + + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))");
1
0
0
0
Nick Burns : msvcrt/process.h: __stdcall__ defined safely for Mac OSX.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: a5f933541fa7f831f961389b19c297698ff3f969 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a5f933541fa7f831f961389b1…
Author: Nick Burns <adger44(a)hotmail.com> Date: Sat Oct 7 14:57:25 2006 -0700 msvcrt/process.h: __stdcall__ defined safely for Mac OSX. --- include/msvcrt/process.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 26107e5..0f7c0c6 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -31,7 +31,11 @@ #define _WAIT_GRANDCHILD 1 #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# define __stdcall __attribute__((__stdcall__)) +# ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */ +# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((__stdcall__)) +# endif # elif defined(_MSC_VER) /* Nothing needs to be done. __stdcall already exists */ # else
1
0
0
0
Ivan Gyurdiev : d3d9/tests: Printf format fixes for d3d9 tests.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 365852c0834292c2c65054091ba2ba5008c1cf06 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=365852c0834292c2c65054091…
Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:47:21 2006 -0400 d3d9/tests: Printf format fixes for d3d9 tests. --- dlls/d3d9/tests/Makefile.in | 1 dlls/d3d9/tests/device.c | 24 ++++----- dlls/d3d9/tests/shader.c | 26 +++++---- dlls/d3d9/tests/stateblock.c | 96 ++++++++++++++++++----------------- dlls/d3d9/tests/surface.c | 34 ++++++------ dlls/d3d9/tests/texture.c | 6 +- dlls/d3d9/tests/vertexdeclaration.c | 52 +++++++++---------- dlls/d3d9/tests/volume.c | 30 +++++------ 8 files changed, 134 insertions(+), 135 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=365852c0834292c2c6505…
1
0
0
0
Ivan Gyurdiev : d3d9/tests: Make d3d9 tests Wcast-qual compliant.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 1eea5c21196c80531a034d8219e779365ddd401f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1eea5c21196c80531a034d821…
Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:46:31 2006 -0400 d3d9/tests: Make d3d9 tests Wcast-qual compliant. --- dlls/d3d9/tests/stateblock.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 1d85e3f..bdc8ec1 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -494,7 +494,7 @@ typedef struct shader_constant_context { static void shader_constant_print_handler( const void* data) { - shader_constant_data* scdata = (shader_constant_data*) data; + const shader_constant_data* scdata = data; trace("Integer constant = { %#x, %#x, %#x, %#x }\n", scdata->int_constant[0], scdata->int_constant[1], @@ -513,8 +513,8 @@ static void shader_constant_set_handler( IDirect3DDevice9* device, const state_test* test, const void* data) { HRESULT hret; - shader_constant_data* scdata = (shader_constant_data*) data; - shader_constant_arg* scarg = (shader_constant_arg*) test->test_arg; + const shader_constant_data* scdata = data; + const shader_constant_arg* scarg = test->test_arg; unsigned int index = scarg->idx; if (!scarg->pshader) { @@ -540,7 +540,7 @@ static void shader_constant_get_handler( HRESULT hret; shader_constant_data* scdata = (shader_constant_data*) data; - shader_constant_arg* scarg = (shader_constant_arg*) test->test_arg; + const shader_constant_arg* scarg = test->test_arg; unsigned int index = scarg->idx; if (!scarg->pshader) { @@ -635,7 +635,7 @@ typedef struct light_context { static void light_print_handler( const void* data) { - light_data* ldata = (light_data*) data; + const light_data* ldata = data; trace("Get Light return value: %#lx\n", ldata->get_light_result); trace("Get Light enable return value: %#lx\n", ldata->get_enabled_result); @@ -668,8 +668,8 @@ static void light_set_handler( IDirect3DDevice9* device, const state_test* test, const void* data) { HRESULT hret; - light_data* ldata = (light_data*) data; - light_arg* larg = (light_arg*) test->test_arg; + const light_data* ldata = data; + const light_arg* larg = test->test_arg; unsigned int index = larg->idx; hret = IDirect3DDevice9_SetLight(device, index, &ldata->light); @@ -683,8 +683,8 @@ static void light_get_handler( IDirect3DDevice9* device, const state_test* test, void* data) { HRESULT hret; - light_data* ldata = (light_data*) data; - light_arg* larg = (light_arg*) test->test_arg; + light_data* ldata = data; + const light_arg* larg = test->test_arg; unsigned int index = larg->idx; hret = IDirect3DDevice9_GetLightEnable(device, index, &ldata->enabled); @@ -783,7 +783,7 @@ typedef struct transform_context { } transform_context; static inline void print_matrix( - const char* name, D3DMATRIX* matrix) { + const char* name, const D3DMATRIX* matrix) { trace("%s Matrix = {\n", name); trace(" %f %f %f %f\n", matrix->m[0][0], matrix->m[1][0], matrix->m[2][0], matrix->m[3][0]); @@ -796,7 +796,8 @@ static inline void print_matrix( static void transform_print_handler( const void* data) { - transform_data* tdata = (transform_data*) data; + const transform_data* tdata = data; + print_matrix("View", &tdata->view); print_matrix("Projection", &tdata->projection); print_matrix("Texture0", &tdata->texture0); @@ -809,7 +810,7 @@ static void transform_set_handler( IDirect3DDevice9* device, const state_test* test, const void* data) { HRESULT hret; - transform_data* tdata = (transform_data*) data; + const transform_data* tdata = data; hret = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &tdata->view); ok(hret == D3D_OK, "SetTransform returned %#lx.\n", hret); @@ -1072,7 +1073,7 @@ static void render_state_set_handler( IDirect3DDevice9* device, const state_test* test, const void* data) { HRESULT hret; - render_state_data* rsdata = (render_state_data*) data; + const render_state_data* rsdata = data; unsigned int i; for (i = 0; i < D3D9_RENDER_STATES; i++) { @@ -1097,7 +1098,8 @@ static void render_state_get_handler( static void render_state_print_handler( const void* data) { - render_state_data* rsdata = (render_state_data*) data; + const render_state_data* rsdata = data; + unsigned int i; for (i = 0; i < D3D9_RENDER_STATES; i++) trace("Index = %u, Value = %#lx\n", i, rsdata->states[i]); @@ -1343,7 +1345,7 @@ #endif static HRESULT render_state_setup_handler( state_test* test) { - render_state_arg* rsarg = (render_state_arg*) test->test_arg; + const render_state_arg* rsarg = test->test_arg; render_state_context *ctx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(render_state_context)); if (ctx == NULL) return E_FAIL;
1
0
0
0
Ivan Gyurdiev : d3d9/tests: Remove unused device parameter.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 8f21b6f682ef0bce19646e8770f310d1e5aff7da URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8f21b6f682ef0bce19646e877…
Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:45:19 2006 -0400 d3d9/tests: Remove unused device parameter. --- dlls/d3d9/tests/stateblock.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index a16eba7..1d85e3f 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -603,7 +603,6 @@ static void shader_constant_teardown_han } static void shader_constants_queue_test( - IDirect3DDevice9 *device, state_test* test, const shader_constant_arg* test_arg) { @@ -754,7 +753,6 @@ static void light_teardown_handler( } static void lights_queue_test( - IDirect3DDevice9 *device, state_test* test, const light_arg* test_arg) { @@ -932,7 +930,6 @@ static void transform_teardown_handler( } static void transform_queue_test( - IDirect3DDevice9 *device, state_test* test) { test->setup_handler = transform_setup_handler; @@ -1375,7 +1372,6 @@ static void render_state_teardown_handle } static void render_states_queue_test( - IDirect3DDevice9 *device, state_test* test, const render_state_arg* test_arg) { @@ -1423,26 +1419,26 @@ static void test_state_management( if (caps.VertexShaderVersion & 0xffff) { vshader_constant_arg.idx = 0; vshader_constant_arg.pshader = FALSE; - shader_constants_queue_test(device, &tests[tcount], &vshader_constant_arg); + shader_constants_queue_test(&tests[tcount], &vshader_constant_arg); tcount++; } if (caps.PixelShaderVersion & 0xffff) { pshader_constant_arg.idx = 0; pshader_constant_arg.pshader = TRUE; - shader_constants_queue_test(device, &tests[tcount], &pshader_constant_arg); + shader_constants_queue_test(&tests[tcount], &pshader_constant_arg); tcount++; } light_arg.idx = 0; - lights_queue_test(device, &tests[tcount], &light_arg); + lights_queue_test(&tests[tcount], &light_arg); tcount++; - transform_queue_test(device, &tests[tcount]); + transform_queue_test(&tests[tcount]); tcount++; render_state_arg.device_pparams = device_pparams; - render_states_queue_test(device, &tests[tcount], &render_state_arg); + render_states_queue_test(&tests[tcount], &render_state_arg); tcount++; execute_test_chain_all(device, tests, tcount);
1
0
0
0
Ivan Gyurdiev : d3d9/tests: Add init/teardown handlers for state tests.
by Alexandre Julliard
09 Oct '06
09 Oct '06
Module: wine Branch: master Commit: 401835fcb718af36f133d4b053e6f5f472056af9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=401835fcb718af36f133d4b05…
Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:44:13 2006 -0400 d3d9/tests: Add init/teardown handlers for state tests. --- dlls/d3d9/tests/stateblock.c | 235 ++++++++++++++++++++++++++++++------------ 1 files changed, 168 insertions(+), 67 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=401835fcb718af36f133d…
1
0
0
0
← Newer
1
...
65
66
67
68
69
70
71
...
104
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
99
100
101
102
103
104
Results per page:
10
25
50
100
200