March 2008 - Wine-commits - list.winehq.org

Rob Shearman : services: Move LockServiceDatabase and UnlockServiceDatabase from advapi32. dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 7afd9a977a84e80a02109351faa8d46182504c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afd9a977a84e80a02109351f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:06:43 2008 +0000 services: Move LockServiceDatabase and UnlockServiceDatabase from advapi32.dll to services.exe. --- dlls/advapi32/service.c | 34 ++++++++++++++++++++-------- include/wine/svcctl.idl | 12 ++++++++++ programs/services/rpc.c | 50 ++++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 14 +++++++++++ programs/services/services.h | 3 ++ 5 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 20f7af5..0b29493 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -954,21 +954,26 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) */ SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) { - HANDLE ret; + struct sc_manager *hscm; + SC_RPC_LOCK hLock; + DWORD err; TRACE("%p\n",hSCManager); - ret = CreateSemaphoreW( NULL, 1, 1, szSCMLock ); - if( ret && GetLastError() == ERROR_ALREADY_EXISTS ) + hscm = sc_handle_get_handle_data( hSCManager, SC_HTYPE_MANAGER ); + if (!hscm) { - CloseHandle( ret ); - ret = NULL; - SetLastError( ERROR_SERVICE_DATABASE_LOCKED ); + SetLastError( ERROR_INVALID_HANDLE ); + return NULL; } - TRACE("returning %p\n", ret); - - return ret; + err = svcctl_LockServiceDatabase(hscm->hdr.server_handle, &hLock); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return NULL; + } + return hLock; } /****************************************************************************** @@ -976,9 +981,18 @@ SC_LOCK WINAPI LockServiceDatabase (SC_HANDLE hSCManager) */ BOOL WINAPI UnlockServiceDatabase (SC_LOCK ScLock) { + DWORD err; + SC_RPC_LOCK hRpcLock = ScLock; + TRACE("%p\n",ScLock); - return CloseHandle( ScLock ); + err = svcctl_UnlockServiceDatabase(&hRpcLock); + if (err != ERROR_SUCCESS) + { + SetLastError(err); + return FALSE; + } + return TRUE; } /****************************************************************************** diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index c0190e7..a629f6a 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -43,6 +43,7 @@ interface svcctl /* handle types */ typedef [handle] LPCWSTR MACHINE_HANDLEW; typedef [context_handle] void *SC_RPC_HANDLE; + typedef [context_handle] void *SC_RPC_LOCK; /* undocumented access rights */ cpp_quote("#define SERVICE_SET_STATUS 0x8000") @@ -86,12 +87,23 @@ cpp_quote("#endif") [in] SC_RPC_HANDLE hService ); + /* Compatible with Windows function 0x03 */ + DWORD svcctl_LockServiceDatabase( + [in] SC_RPC_HANDLE hSCManager, + [out] SC_RPC_LOCK *phLock + ); + /* Compatible with Windows function 0x07 */ DWORD svcctl_SetServiceStatus( [in] SC_RPC_HANDLE hServiceStatus, [in] LPSERVICE_STATUS lpServiceStatus ); + /* Compatible with Windows function 0x08 */ + DWORD svcctl_UnlockServiceDatabase( + [in,out] SC_RPC_LOCK *phLock + ); + /* Compatible with Windows function 0x0b */ DWORD svcctl_ChangeServiceConfigW( [in] SC_RPC_HANDLE hService, diff --git a/programs/services/rpc.c b/programs/services/rpc.c index f780f7e..0a59ed4 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -88,6 +88,11 @@ struct sc_service /* service handle */ struct service_entry *service_entry; }; +struct sc_lock +{ + char dummy; /* no state currently used */ +}; + /* Check if the given handle is of the required type and allows the requested access. */ static DWORD validate_context_handle(SC_RPC_HANDLE handle, DWORD type, DWORD needed_access, struct sc_handle **out_hdr) { @@ -654,6 +659,51 @@ DWORD svcctl_CloseServiceHandle( return ERROR_SUCCESS; } +static void SC_RPC_LOCK_destroy(SC_RPC_LOCK hLock) +{ + unlock_service_database(); + HeapFree(GetProcessHeap(), 0, hLock); +} + +void __RPC_USER SC_RPC_LOCK_rundown(SC_RPC_LOCK hLock) +{ + SC_RPC_LOCK_destroy(hLock); +} + +DWORD svcctl_LockServiceDatabase( + SC_RPC_HANDLE hSCManager, + SC_RPC_LOCK *phLock) +{ + struct sc_manager *manager; + DWORD err; + + WINE_TRACE("(%p, %p)\n", hSCManager, phLock); + + if ((err = validate_scm_handle(hSCManager, SC_MANAGER_LOCK, &manager)) != ERROR_SUCCESS) + return err; + + err = lock_service_database(); + if (err != ERROR_SUCCESS) + return err; + + *phLock = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sc_lock)); + if (!*phLock) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + return ERROR_SUCCESS; +} + +DWORD svcctl_UnlockServiceDatabase( + SC_RPC_LOCK *phLock) +{ + WINE_TRACE("(&%p)\n", *phLock); + + SC_RPC_LOCK_destroy(*phLock); + *phLock = NULL; + + return ERROR_SUCCESS; +} + DWORD RPC_MainLoop(void) { WCHAR transport[] = SVCCTL_TRANSPORT; diff --git a/programs/services/services.c b/programs/services/services.c index 2e22469..1962dc9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -274,6 +274,20 @@ BOOL validate_service_config(struct service_entry *entry) return TRUE; } +static LONG service_lock = FALSE; + +DWORD lock_service_database(void) +{ + if (InterlockedCompareExchange(&service_lock, TRUE, FALSE)) + return ERROR_SERVICE_DATABASE_LOCKED; + return ERROR_SUCCESS; +} + +void unlock_service_database(void) +{ + InterlockedCompareExchange(&service_lock, FALSE, TRUE); +} + void lock_services(void) { EnterCriticalSection(&services_list_cs); diff --git a/programs/services/services.h b/programs/services/services.h index 30b120e..4c7c656 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,6 +45,9 @@ DWORD save_service_config(struct service_entry *entry); void free_service_entry(struct service_entry *entry); void release_service(struct service_entry *service); +DWORD lock_service_database(void); +void unlock_service_database(void); + void lock_services(void); void unlock_services(void);

1 0

Rob Shearman : services: Move ControlService and StartServiceW from advapi32.dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 9a6fc01d84f65e6ac3ba2bffad796ac655e99564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6fc01d84f65e6ac3ba2bffa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:07:39 2008 +0000 services: Move ControlService and StartServiceW from advapi32.dll to services.exe. This also changes the architecture such that services.exe is the server end of the control pipe and the service is the client end. --- dlls/advapi32/service.c | 355 ++--------------------------------- include/wine/svcctl.idl | 27 +++ programs/services/rpc.c | 427 ++++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 4 + programs/services/services.h | 3 + 5 files changed, 477 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6fc01d84f65e6ac3ba2…

1 0

Rob Shearman : services: Introduce an scmdatabase object to store the root key of the services database .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 809d714f243be1259b8b1553ee183c592620a3a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809d714f243be1259b8b1553e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 28 17:08:12 2008 +0000 services: Introduce an scmdatabase object to store the root key of the services database. Make the functions that deal with the service database more object-oriented. Add a finer-grained locking architecture. --- programs/services/rpc.c | 190 ++++++++++++++++++++++-------------------- programs/services/services.c | 186 +++++++++++++++++++++++++---------------- programs/services/services.h | 41 +++++++-- 3 files changed, 243 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=809d714f243be1259b8b1…

1 0

Mikołaj Zalewski : services: Start a local RPC server.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 4275fbf603d69e70ea0133e4b9abea44086812d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4275fbf603d69e70ea0133e4b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Mar 28 16:56:00 2008 +0000 services: Start a local RPC server. --- .gitignore | 5 + dlls/advapi32/Makefile.in | 3 + dlls/advapi32/service.c | 151 +++++++++++++++++++++++++++++---- dlls/advapi32/svcctl.idl | 1 + dlls/advapi32/tests/service.c | 3 - include/Makefile.in | 1 + include/wine/svcctl.idl | 59 +++++++++++++ programs/services/Makefile.in | 5 +- programs/services/rpc.c | 188 +++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 8 ++- programs/services/svcctl.idl | 1 + 11 files changed, 401 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4275fbf603d69e70ea013…

1 0

Mikołaj Zalewski : services: Move CreateService, OpenService and DeleteService implementations from advapi32. dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: a2156fc348263c3fbd95c59b064746e8d74a21c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2156fc348263c3fbd95c59b0… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 15 16:42:38 2008 +0100 services: Move CreateService, OpenService and DeleteService implementations from advapi32.dll to services.exe. --- dlls/advapi32/service.c | 228 ++++++++++------------------------------- include/wine/svcctl.idl | 32 ++++++ programs/services/rpc.c | 220 ++++++++++++++++++++++++++++++++++++++++ programs/services/services.c | 198 ++++++++++++++++++++++++++++++++++++- programs/services/services.h | 25 +++++ programs/services/utils.c | 20 ++++- 6 files changed, 546 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2156fc348263c3fbd95c…

1 0

Mikołaj Zalewski : services: Move QueryServiceConfigW from advapi32.dll to services.exe.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: a363b9a066ab10e384f74fe5e9b438c3a1b36999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a363b9a066ab10e384f74fe5e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Mar 15 16:42:40 2008 +0100 services: Move QueryServiceConfigW from advapi32.dll to services.exe. --- dlls/advapi32/service.c | 207 ++++++++++++----------------------------------- include/wine/svcctl.idl | 22 +++++ programs/services/rpc.c | 27 ++++++ 3 files changed, 102 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a363b9a066ab10e384f74…

1 0

Roderick Colenbrander : wined3d: Also move the rendertarget capability to the formats table.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: c0be6047efaf0ee32ad03c0be436d3f8ce92336a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0be6047efaf0ee32ad03c0be… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Mar 29 00:10:52 2008 +0000 wined3d: Also move the rendertarget capability to the formats table. --- dlls/wined3d/directx.c | 24 ++++++++---------------- dlls/wined3d/utils.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private_types.h | 1 + 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e28b17..a30955c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1935,24 +1935,16 @@ static BOOL CheckFilterCapability(UINT Adapter, WINED3DFORMAT CheckFormat) static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORMAT CheckFormat) { UINT Adapter = 0; + const GlPixelFormatDesc *glDesc; + const StaticPixelFormatDesc *desc = getFormatDescEntry(CheckFormat, &GLINFO_LOCATION, &glDesc); - /* Filter out non-RT formats */ - switch(CheckFormat) - { - /* Don't offer 8bit, windows doesn't either although we could emulate it */ - case WINED3DFMT_A8P8: - case WINED3DFMT_P8: + /* Fail if we weren't able to get a description of the format */ + if(!desc || !glDesc) + return FALSE; - /* No DXTC render targets */ - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - return FALSE; - default: - break; - } + /* Filter out non-RT formats */ + if(!(glDesc->Flags & WINED3DFMT_FLAG_RENDERTARGET)) + return FALSE; if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f067540..95abe20 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -153,21 +153,21 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,0 }, /* IEEE formats */ {WINED3DFMT_R32F ,GL_RGB32F_ARB ,GL_RGB32F_ARB , 0, GL_RED ,GL_FLOAT - ,0 }, + ,WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_G32R32F ,0 ,0 , 0, 0 ,0 - ,0 }, + ,WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A32B32G32R32F ,GL_RGBA32F_ARB ,GL_RGBA32F_ARB , 0, GL_RGBA ,GL_FLOAT - ,0 }, + ,WINED3DFMT_FLAG_RENDERTARGET }, /* Hmm? */ {WINED3DFMT_CxV8U8 ,0 ,0 , 0, 0 ,0 ,0 }, /* Float */ {WINED3DFMT_R16F ,GL_RGB16F_ARB ,GL_RGB16F_ARB , 0, GL_RED ,GL_HALF_FLOAT_ARB - ,WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_G16R16F ,0 ,0 , 0, 0 ,0 - ,WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A16B16G16R16F ,GL_RGBA16F_ARB ,GL_RGBA16F_ARB , 0, GL_RGBA ,GL_HALF_FLOAT_ARB - ,WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, /* Palettized formats */ {WINED3DFMT_A8P8, 0 ,0 , 0, 0 ,0 ,0 }, @@ -175,13 +175,13 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,0 }, /* Standard ARGB formats */ {WINED3DFMT_R8G8B8 ,GL_RGB8 ,GL_RGB8 , 0, GL_BGR ,GL_UNSIGNED_BYTE - ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A8R8G8B8 ,GL_RGBA8 ,GL_SRGB8_ALPHA8_EXT , 0, GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV - ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_X8R8G8B8 ,GL_RGB8 ,GL_SRGB8_EXT , 0, GL_BGRA ,GL_UNSIGNED_INT_8_8_8_8_REV - ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_R5G6B5 ,GL_RGB5 ,GL_RGB5 , GL_RGB8, GL_RGB ,GL_UNSIGNED_SHORT_5_6_5 - ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_X1R5G5B5 ,GL_RGB5 ,GL_RGB5_A1 , 0, GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, {WINED3DFMT_A1R5G5B5 ,GL_RGB5_A1 ,GL_RGB5_A1 , 0, GL_BGRA ,GL_UNSIGNED_SHORT_1_5_5_5_REV @@ -207,7 +207,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A2R10G10B10 ,GL_RGBA ,GL_RGBA , 0, GL_BGRA ,GL_UNSIGNED_INT_2_10_10_10_REV ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, {WINED3DFMT_A16B16G16R16 ,GL_RGBA16_EXT ,GL_RGBA16_EXT , 0, GL_RGBA ,GL_UNSIGNED_SHORT - ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, /* Luminance */ {WINED3DFMT_L8 ,GL_LUMINANCE8 ,GL_SLUMINANCE8_EXT , 0, GL_LUMINANCE ,GL_UNSIGNED_BYTE ,WINED3DFMT_FLAG_FILTERING }, diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 5722679..950fa7e 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -35,6 +35,7 @@ typedef enum { #define WINED3DFMT_FLAG_FILTERING 0x2 #define WINED3DFMT_FLAG_DEPTH 0x4 #define WINED3DFMT_FLAG_STENCIL 0x8 +#define WINED3DFMT_FLAG_RENDERTARGET 0x10 /** DCL usage masks **/ #define WINED3DSP_DCL_USAGE_SHIFT 0

1 0

Andrew Talbot : dplayx: Assign to structs instead of using CopyMemory.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: 5423c35d3c23e5233106dc8b18d49dba0536ed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5423c35d3c23e5233106dc8b1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Mar 28 22:52:28 2008 +0000 dplayx: Assign to structs instead of using CopyMemory. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_global.c | 12 ++++++------ dlls/dplayx/dplobby.c | 17 ++++++----------- dlls/dplayx/name_server.c | 4 ++-- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index abb71b2..012f773 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2303,7 +2303,7 @@ static HRESULT WINAPI DP_IF_EnumSessions /* FIXME: need to kill the thread on object deletion */ lpData->lpSpData = &This->dp2->spData; - CopyMemory( &lpData->requestGuid, &lpsd->guidApplication, sizeof(GUID) ); + lpData->requestGuid = lpsd->guidApplication; lpData->dwEnumSessionFlags = dwFlags; lpData->dwTimeout = dwTimeout; diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 60ddd89..8833ceb 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -662,7 +662,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { BYTE* lpStartOfFreeSpace; - CopyMemory( dest, src, sizeof( DPLCONNECTION ) ); + *dest = *src; lpStartOfFreeSpace = ((BYTE*)dest) + sizeof( DPLCONNECTION ); @@ -671,7 +671,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { dest->lpSessionDesc = (LPDPSESSIONDESC2)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof( DPSESSIONDESC2 ); - CopyMemory( dest->lpSessionDesc, src->lpSessionDesc, sizeof( DPSESSIONDESC2 ) ); + *dest->lpSessionDesc = *src->lpSessionDesc; /* Session names may or may not exist */ if( src->lpSessionDesc->u1.lpszSessionNameA ) @@ -696,7 +696,7 @@ void DPLAYX_CopyConnStructA( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { dest->lpPlayerName = (LPDPNAME)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof( DPNAME ); - CopyMemory( dest->lpPlayerName, src->lpPlayerName, sizeof( DPNAME ) ); + *dest->lpPlayerName = *src->lpPlayerName; if( src->lpPlayerName->u1.lpszShortNameA ) { @@ -784,7 +784,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { BYTE* lpStartOfFreeSpace; - CopyMemory( dest, src, sizeof( DPLCONNECTION ) ); + *dest = *src; lpStartOfFreeSpace = ( (BYTE*)dest) + sizeof( DPLCONNECTION ); @@ -793,7 +793,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { dest->lpSessionDesc = (LPDPSESSIONDESC2)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof( DPSESSIONDESC2 ); - CopyMemory( dest->lpSessionDesc, src->lpSessionDesc, sizeof( DPSESSIONDESC2 ) ); + *dest->lpSessionDesc = *src->lpSessionDesc; /* Session names may or may not exist */ if( src->lpSessionDesc->u1.lpszSessionName ) @@ -818,7 +818,7 @@ void DPLAYX_CopyConnStructW( LPDPLCONNECTION dest, const DPLCONNECTION *src ) { dest->lpPlayerName = (LPDPNAME)lpStartOfFreeSpace; lpStartOfFreeSpace += sizeof( DPNAME ); - CopyMemory( dest->lpPlayerName, src->lpPlayerName, sizeof( DPNAME ) ); + *dest->lpPlayerName = *src->lpPlayerName; if( src->lpPlayerName->u1.lpszShortName ) { diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7a60602..4c59e83 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1574,7 +1574,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &DPAID_TotalSize, sizeof( GUID ) ); + lpdpAddress->guidDataType = DPAID_TotalSize; lpdpAddress->dwDataSize = sizeof( DWORD ); lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); @@ -1593,8 +1593,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &lpElements->guidDataType, - sizeof( GUID ) ); + lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = sizeof( GUID ); lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); @@ -1608,8 +1607,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &lpElements->guidDataType, - sizeof( GUID ) ); + lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); @@ -1625,8 +1623,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &lpElements->guidDataType, - sizeof( GUID ) ); + lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); @@ -1639,8 +1636,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &lpElements->guidDataType, - sizeof( GUID ) ); + lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); @@ -1651,8 +1647,7 @@ HRESULT DPL_CreateCompoundAddress { LPDPADDRESS lpdpAddress = (LPDPADDRESS)lpAddress; - CopyMemory( &lpdpAddress->guidDataType, &lpElements->guidDataType, - sizeof( GUID ) ); + lpdpAddress->guidDataType = lpElements->guidDataType; lpdpAddress->dwDataSize = lpElements->dwDataSize; lpAddress = (char *) lpAddress + sizeof( DPADDRESS ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 1fdfef6..ca73bd0 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -140,7 +140,7 @@ void NS_AddRemoteComputerAsNameServer( LPCVOID lpcNSAddrHdr return; } - CopyMemory( lpCacheNode->data, &lpcMsg->sd, sizeof( *lpCacheNode->data ) ); + *lpCacheNode->data = lpcMsg->sd; len = WideCharToMultiByte( CP_ACP, 0, (LPCWSTR)(lpcMsg+1), -1, NULL, 0, NULL, NULL ); if ((lpCacheNode->data->u1.lpszSessionNameA = HeapAlloc( GetProcessHeap(), 0, len ))) { @@ -240,7 +240,7 @@ HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, lpMsg->dwPasswordSize = 0; /* FIXME: If enumerating passwords..? */ lpMsg->dwFlags = dwFlags; - CopyMemory( &lpMsg->guidApplication, lpcGuid, sizeof( *lpcGuid ) ); + lpMsg->guidApplication = *lpcGuid; return (lpSpData->lpCB->EnumSessions)( &data ); }

1 0

Roderick Colenbrander : wined3d: Make the filtering capability of a format a flag in the formats table.
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: e1bf1cd6404c875628af49c13750d01cf80fb684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1bf1cd6404c875628af49c13… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 28 23:18:41 2008 +0000 wined3d: Make the filtering capability of a format a flag in the formats table. --- dlls/wined3d/directx.c | 29 +++--- dlls/wined3d/utils.c | 186 ++++++++++++++++++++++----------- dlls/wined3d/wined3d_private_types.h | 1 + 3 files changed, 140 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1bf1cd6404c875628af4…

1 0

Roderick Colenbrander : wined3d: Add a depthstencil flag to the formats table and make use of it in CheckDepthStencilCapability .
by Alexandre Julliard 29 Mar '08

29 Mar '08

Module: wine Branch: master Commit: ef73fe5d47548c1761e53749074dbb2b632036ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef73fe5d47548c1761e537490… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Mar 28 23:29:38 2008 +0000 wined3d: Add a depthstencil flag to the formats table and make use of it in CheckDepthStencilCapability. --- dlls/wined3d/directx.c | 26 +++++++++----------------- dlls/wined3d/utils.c | 18 +++++++++--------- dlls/wined3d/wined3d_private_types.h | 2 ++ 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 086c6f8..7e28b17 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1887,28 +1887,20 @@ static BOOL CheckBumpMapCapability(UINT Adapter, WINED3DFORMAT CheckFormat) } /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ -static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayFormat, -WINED3DFORMAT DepthStencilFormat) +static BOOL CheckDepthStencilCapability(UINT Adapter, WINED3DFORMAT DisplayFormat, WINED3DFORMAT DepthStencilFormat) { int it=0; WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + const GlPixelFormatDesc *glDesc; + const StaticPixelFormatDesc *desc = getFormatDescEntry(DepthStencilFormat, &GLINFO_LOCATION, &glDesc); - /* Only allow depth/stencil formats */ - switch (DepthStencilFormat) { - case WINED3DFMT_D16_LOCKABLE: - case WINED3DFMT_D16: - case WINED3DFMT_D15S1: - case WINED3DFMT_D24X8: - case WINED3DFMT_D24X4S4: - case WINED3DFMT_D24S8: - case WINED3DFMT_D24FS8: - case WINED3DFMT_D32: - case WINED3DFMT_D32F_LOCKABLE: - break; + /* Fail if we weren't able to get a description of the format */ + if(!desc || !glDesc) + return FALSE; - default: - return FALSE; - } + /* Only allow depth/stencil formats */ + if(!(glDesc->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) + return FALSE; /* Walk through all WGL pixel formats to find a match */ cfgs = Adapters[Adapter].cfgs; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cbe4dba..f067540 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -232,25 +232,25 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ,0 }, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_D32 ,GL_DEPTH_COMPONENT32_ARB ,GL_DEPTH_COMPONENT32_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_D15S1 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL }, {WINED3DFMT_D24S8 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT - ,WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL }, {WINED3DFMT_D24X8 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_D24X4S4 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_INT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL }, {WINED3DFMT_D16 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_UNSIGNED_SHORT - ,WINED3DFMT_FLAG_FILTERING }, + ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_L16 ,GL_LUMINANCE16_EXT ,GL_LUMINANCE16_EXT , 0, GL_LUMINANCE ,GL_UNSIGNED_SHORT ,WINED3DFMT_FLAG_FILTERING }, {WINED3DFMT_D32F_LOCKABLE ,GL_DEPTH_COMPONENT32_ARB ,GL_DEPTH_COMPONENT32_ARB , 0, GL_DEPTH_COMPONENT ,GL_FLOAT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH }, {WINED3DFMT_D24FS8 ,GL_DEPTH_COMPONENT24_ARB ,GL_DEPTH_COMPONENT24_ARB , 0, GL_DEPTH_COMPONENT ,GL_FLOAT - ,0 }, + ,WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, /* Is this a vertex buffer? */ {WINED3DFMT_VERTEXDATA ,0 ,0 , 0, 0 ,0 ,0 }, diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index ee67d9b..5722679 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -33,6 +33,8 @@ typedef enum { /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x1 #define WINED3DFMT_FLAG_FILTERING 0x2 +#define WINED3DFMT_FLAG_DEPTH 0x4 +#define WINED3DFMT_FLAG_STENCIL 0x8 /** DCL usage masks **/ #define WINED3DSP_DCL_USAGE_SHIFT 0

1 0