October 2006 - Wine-commits

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

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

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

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

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

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

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

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

Ivan Gyurdiev : d3d9/tests: Clean up get/set handler arguments.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: cbfc4090d40ee3d382930481c39cfcdcb04ba509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfc4090d40ee3d382930481c… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sat Oct 7 21:43:06 2006 -0400 d3d9/tests: Clean up get/set handler arguments. --- dlls/d3d9/tests/stateblock.c | 84 ++++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbfc4090d40ee3d382930…

1 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