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

Stefan Dösinger : ddraw: Do not fail if D3D is not available.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 4066c2e2fdf70dbdd63e2663b6ecd7ad2ee24901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4066c2e2fdf70dbdd63e2663b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:09:26 2008 +0100 ddraw: Do not fail if D3D is not available. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f8c1a9b..eb020a6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -949,8 +949,8 @@ static BOOL D3D1_createObjects(void) ddsd.dwWidth = 256; ddsd.dwHeight = 256; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &Surface1, NULL); - ok(hr==DD_OK, "CreateSurface returned: %x\n", hr); if (!Surface1) { + skip("DDSCAPS_3DDEVICE surface not available\n"); return FALSE; }

1 0

Maarten Lankhorst : winemp3: Replace fprintf with wine debugging facilities .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 0faee4af8504eef86a5b86b279a0afca4a1b32c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faee4af8504eef86a5b86b27… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 31 11:19:58 2008 -0700 winemp3: Replace fprintf with wine debugging facilities. --- dlls/winemp3.acm/common.c | 19 +++++++++++-------- dlls/winemp3.acm/interface.c | 2 ++ dlls/winemp3.acm/layer3.c | 22 ++++++++++++---------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/winemp3.acm/common.c b/dlls/winemp3.acm/common.c index de329f1..5a02c13 100644 --- a/dlls/winemp3.acm/common.c +++ b/dlls/winemp3.acm/common.c @@ -28,6 +28,9 @@ #include <fcntl.h> #include "mpg123.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); const struct parameter param = { 1 , 1 , 0 , 0 }; @@ -109,7 +112,7 @@ int decode_header(struct frame *fr,unsigned long newhead) if(!fr->bitrate_index) { - fprintf(stderr,"Free format not supported.\n"); + FIXME("Free format not supported.\n"); return (0); } @@ -125,7 +128,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize /= freqs[fr->sampling_frequency]; fr->framesize = ((fr->framesize+fr->padding)<<2)-4; #else - fprintf(stderr,"Not supported!\n"); + FIXME("Layer 1 not supported!\n"); #endif break; case 2: @@ -138,7 +141,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize /= freqs[fr->sampling_frequency]; fr->framesize += fr->padding - 4; #else - fprintf(stderr,"Not supported!\n"); + FIXME("Layer 2 not supported!\n"); #endif break; case 3: @@ -159,7 +162,7 @@ int decode_header(struct frame *fr,unsigned long newhead) fr->framesize = fr->framesize + fr->padding - 4; break; default: - fprintf(stderr,"Sorry, unknown layer type.\n"); + FIXME("Unknown layer type: %d\n", fr->lay); return (0); } return 1; @@ -171,15 +174,15 @@ void print_header(struct frame *fr) static const char * const modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" }; static const char * const layers[4] = { "Unknown" , "I", "II", "III" }; - fprintf(stderr,"MPEG %s, Layer: %s, Freq: %ld, mode: %s, modext: %d, BPF : %d\n", + FIXME("MPEG %s, Layer: %s, Freq: %ld, mode: %s, modext: %d, BPF : %d\n", fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"), layers[fr->lay],freqs[fr->sampling_frequency], modes[fr->mode],fr->mode_ext,fr->framesize+4); - fprintf(stderr,"Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d.\n", + FIXME("Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d.\n", fr->stereo,fr->copyright?"Yes":"No", fr->original?"Yes":"No",fr->error_protection?"Yes":"No", fr->emphasis); - fprintf(stderr,"Bitrate: %d Kbits/s, Extension value: %d\n", + FIXME("Bitrate: %d Kbits/s, Extension value: %d\n", tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index],fr->extension); } @@ -188,7 +191,7 @@ void print_header_compact(struct frame *fr) static const char * const modes[4] = { "stereo", "joint-stereo", "dual-channel", "mono" }; static const char * const layers[4] = { "Unknown" , "I", "II", "III" }; - fprintf(stderr,"MPEG %s layer %s, %d kbit/s, %ld Hz %s\n", + FIXME("MPEG %s layer %s, %d kbit/s, %ld Hz %s\n", fr->mpeg25 ? "2.5" : (fr->lsf ? "2.0" : "1.0"), layers[fr->lay], tabsel_123[fr->lsf][fr->lay-1][fr->bitrate_index], diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 6ed8562..775c001 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -16,9 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdlib.h> #include <stdio.h> +#include "wine/debug.h" #include "mpg123.h" #include "mpglib.h" diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index abee543..963fc96 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -20,13 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdlib.h> +#include "wine/debug.h" #include "mpg123.h" #include "mpglib.h" #include "huffman.h" #define MPEG1 - +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); static real ispow[8207]; static real aa_ca[8],aa_cs[8]; @@ -333,7 +335,7 @@ static int III_get_side_info_1(struct III_sideinfo *si,int stereo, gr_info->part2_3_length = getbits(12); gr_info->big_values = getbits_fast(9); if(gr_info->big_values > 288) { - fprintf(stderr,"big_values too large!\n"); + FIXME("big_values (%d) too large!\n", gr_info->big_values); gr_info->big_values = 288; } gr_info->pow2gain = gainpow2+256 - getbits_fast(8) + powdiff; @@ -357,7 +359,7 @@ static int III_get_side_info_1(struct III_sideinfo *si,int stereo, gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(3)<<3); if(gr_info->block_type == 0) { - fprintf(stderr,"Blocktype == 0 and window-switching == 1 not allowed.\n"); + FIXME("Blocktype == 0 and window-switching == 1 not allowed.\n"); return 0; } /* region_count/start parameters are implicit in this case. */ @@ -407,7 +409,7 @@ static int III_get_side_info_2(struct III_sideinfo *si,int stereo, gr_info->part2_3_length = getbits(12); gr_info->big_values = getbits_fast(9); if(gr_info->big_values > 288) { - fprintf(stderr,"big_values too large!\n"); + FIXME("big_values(%d) too large!\n", gr_info->big_values); gr_info->big_values = 288; } gr_info->pow2gain = gainpow2+256 - getbits_fast(8) + powdiff; @@ -431,7 +433,7 @@ static int III_get_side_info_2(struct III_sideinfo *si,int stereo, gr_info->full_gain[i] = gr_info->pow2gain + (getbits_fast(3)<<3); if(gr_info->block_type == 0) { - fprintf(stderr,"Blocktype == 0 and window-switching == 1 not allowed.\n"); + FIXME("Blocktype == 0 and window-switching == 1 not allowed.\n"); return 0; } /* region_count/start parameters are implicit in this case. */ @@ -968,7 +970,7 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf, if(part2remain > 0) getbits(part2remain); else if(part2remain < 0) { - fprintf(stderr,"mpg123: Can't rewind stream by %d bits!\n",-part2remain); + FIXME("mpg123: Can't rewind stream by %d bits!\n",-part2remain); return 1; /* -> error */ } return 0; @@ -1379,7 +1381,7 @@ static int III_dequantize_sample_ms(real xr[2][SBLIMIT][SSLIMIT],int *scf, if(part2remain > 0 ) getbits(part2remain); else if(part2remain < 0) { - fprintf(stderr,"mpg123_ms: Can't rewind stream by %d bits!\n",-part2remain); + FIXME("mpg123_ms: Can't rewind stream by %d bits!\n",-part2remain); return 1; /* -> error */ } return 0; @@ -1917,7 +1919,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) if(!III_get_side_info_1(&sideinfo,stereo,ms_stereo,sfreq,single)) return -1; #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif } @@ -1938,7 +1940,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) #ifdef MPEG1 part2bits = III_get_scale_factors_1(scalefacs[0],gr_info); #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif } if(III_dequantize_sample(hybridIn[0], scalefacs[0],gr_info,sfreq,part2bits)) @@ -1953,7 +1955,7 @@ int do_layer3(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) #ifdef MPEG1 part2bits = III_get_scale_factors_1(scalefacs[1],gr_info); #else - fprintf(stderr,"Not supported\n"); + FIXME("Not supported\n"); #endif }

1 0

Rob Shearman : rpcrt4: Add a reference to the binding object in I_RpcNegotiateTransferSyntax and release the reference in I_RpcFreeBuffer .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8aeb2858e44627c2002b9a20483a2a9c78a2aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeb2858e44627c2002b9a204… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:15 2008 +0100 rpcrt4: Add a reference to the binding object in I_RpcNegotiateTransferSyntax and release the reference in I_RpcFreeBuffer. This is needed because a context binding handle could be released on unmarshall, but it still needs to stay valid until the binding handle is no longer being used. Re-use the previously unused RPCRT4_ExportBinding function as RPCRT4_AddRefBinding and rename RPCRT4_DestroyBinding to RPCRT4_ReleaseBinding to show that it's purpose is to release a reference count and destroy if necessary, not always destroy. --- dlls/rpcrt4/rpc_binding.c | 14 ++++++-------- dlls/rpcrt4/rpc_binding.h | 4 ++-- dlls/rpcrt4/rpc_message.c | 4 ++++ dlls/rpcrt4/rpc_transport.c | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 7293032..d670a88 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -249,14 +249,12 @@ RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection) return RPC_S_OK; } -RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding) +void RPCRT4_AddRefBinding(RpcBinding* Binding) { - InterlockedIncrement(&OldBinding->refs); - *Binding = OldBinding; - return RPC_S_OK; + InterlockedIncrement(&Binding->refs); } -RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding) +RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding) { if (InterlockedDecrement(&Binding->refs)) return RPC_S_OK; @@ -661,7 +659,7 @@ RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); - status = RPCRT4_DestroyBinding(*Binding); + status = RPCRT4_ReleaseBinding(*Binding); if (status == RPC_S_OK) *Binding = 0; return status; } @@ -741,7 +739,7 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) *Binding = (RPC_BINDING_HANDLE)bind; else - RPCRT4_DestroyBinding(bind); + RPCRT4_ReleaseBinding(bind); return ret; } @@ -780,7 +778,7 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) *Binding = (RPC_BINDING_HANDLE)bind; else - RPCRT4_DestroyBinding(bind); + RPCRT4_ReleaseBinding(bind); return ret; } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index e169a65..3251df2 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -145,8 +145,8 @@ RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* Old RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint); RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid); RPC_STATUS RPCRT4_MakeBinding(RpcBinding** Binding, RpcConnection* Connection); -RPC_STATUS RPCRT4_ExportBinding(RpcBinding** Binding, RpcBinding* OldBinding); -RPC_STATUS RPCRT4_DestroyBinding(RpcBinding* Binding); +void RPCRT4_AddRefBinding(RpcBinding* Binding); +RPC_STATUS RPCRT4_ReleaseBinding(RpcBinding* Binding); RPC_STATUS RPCRT4_OpenBinding(RpcBinding* Binding, RpcConnection** Connection, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, const RPC_SYNTAX_IDENTIFIER *InterfaceId); RPC_STATUS RPCRT4_CloseBinding(RpcBinding* Binding, RpcConnection* Connection); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index bc33c87..3b1e68d 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1017,7 +1017,10 @@ RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) &cif->InterfaceId); if (status == RPC_S_OK) + { pMsg->ReservedForRuntime = conn; + RPCRT4_AddRefBinding(bind); + } } return status; @@ -1114,6 +1117,7 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { RpcConnection *conn = pMsg->ReservedForRuntime; RPCRT4_CloseBinding(bind, conn); + RPCRT4_ReleaseBinding(bind); pMsg->ReservedForRuntime = NULL; } I_RpcFree(pMsg->Buffer); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 822807b..8bca0fe 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1551,7 +1551,7 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); /* server-only */ - if (Connection->server_binding) RPCRT4_DestroyBinding(Connection->server_binding); + if (Connection->server_binding) RPCRT4_ReleaseBinding(Connection->server_binding); HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK;

1 0

Rob Shearman : services: Fix memory leak of some data in the service record .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 0b7a37acdcb883eaaf83073aef01834261d14e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7a37acdcb883eaaf83073ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:28 2008 +0100 services: Fix memory leak of some data in the service record. --- programs/services/services.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 80a0a2d..0177076 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -83,6 +83,8 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->config.lpServiceStartName); HeapFree(GetProcessHeap(), 0, entry->config.lpDisplayName); HeapFree(GetProcessHeap(), 0, entry->description); + HeapFree(GetProcessHeap(), 0, entry->dependOnServices); + HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); CloseHandle(entry->status_changed_event);

1 0

Rob Shearman : advapi32: Remove some unused services functions.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 9d834fc180df2d126334a98bc1f4ea245434ebae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d834fc180df2d126334a98bc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:48:34 2008 +0100 advapi32: Remove some unused services functions. --- dlls/advapi32/service.c | 79 ----------------------------------------------- 1 files changed, 0 insertions(+), 79 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 0d13442..c95fcd9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -340,85 +340,6 @@ void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) } /****************************************************************************** - * registry access functions and data - */ -static const WCHAR szDisplayName[] = { - 'D','i','s','p','l','a','y','N','a','m','e', 0 }; -static const WCHAR szType[] = {'T','y','p','e',0}; -static const WCHAR szStart[] = {'S','t','a','r','t',0}; -static const WCHAR szError[] = { - 'E','r','r','o','r','C','o','n','t','r','o','l', 0}; -static const WCHAR szImagePath[] = {'I','m','a','g','e','P','a','t','h',0}; -static const WCHAR szGroup[] = {'G','r','o','u','p',0}; -static const WCHAR szDependencies[] = { - 'D','e','p','e','n','d','e','n','c','i','e','s',0}; -static const WCHAR szDependOnService[] = { - 'D','e','p','e','n','d','O','n','S','e','r','v','i','c','e',0}; -static const WCHAR szObjectName[] = { - 'O','b','j','e','c','t','N','a','m','e',0}; -static const WCHAR szTag[] = { - 'T','a','g',0}; - -struct reg_value { - DWORD type; - DWORD size; - LPCWSTR name; - LPCVOID data; -}; - -static inline void service_set_value( struct reg_value *val, - DWORD type, LPCWSTR name, LPCVOID data, DWORD size ) -{ - val->name = name; - val->type = type; - val->data = data; - val->size = size; -} - -static inline void service_set_dword( struct reg_value *val, - LPCWSTR name, const DWORD *data ) -{ - service_set_value( val, REG_DWORD, name, data, sizeof (DWORD)); -} - -static inline void service_set_string( struct reg_value *val, - LPCWSTR name, LPCWSTR string ) -{ - DWORD len = (lstrlenW(string)+1) * sizeof (WCHAR); - service_set_value( val, REG_SZ, name, string, len ); -} - -static inline void service_set_multi_string( struct reg_value *val, - LPCWSTR name, LPCWSTR string ) -{ - DWORD len = 0; - - /* determine the length of a double null terminated multi string */ - do { - len += (lstrlenW( &string[ len ] )+1); - } while ( string[ len++ ] ); - - len *= sizeof (WCHAR); - service_set_value( val, REG_MULTI_SZ, name, string, len ); -} - -static inline LONG service_write_values( HKEY hKey, - const struct reg_value *val, int n ) -{ - LONG r = ERROR_SUCCESS; - int i; - - for( i=0; i<n; i++ ) - { - r = RegSetValueExW(hKey, val[i].name, 0, val[i].type, - (const BYTE*)val[i].data, val[i].size ); - if( r != ERROR_SUCCESS ) - break; - } - return r; -} - -/****************************************************************************** * Service IPC functions */ static LPWSTR service_get_pipe_name(void)

1 0

Stefan Dösinger : wined3d: Create a fake non-gl adapter.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 9e831a873300e30340e8fb9446060be9ad55d6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e831a873300e30340e8fb944… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:17 2008 +0100 wined3d: Create a fake non-gl adapter. --- dlls/wined3d/directx.c | 38 +++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a30955c..6baf8d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3676,7 +3676,7 @@ BOOL InitAdapters(void) { /* No need to hold any lock. The calling library makes sure only one thread calls * wined3d simultaneously */ - if(numAdapters > 0) return TRUE; + if(numAdapters > 0) return Adapters[0].opengl; TRACE("Initializing adapters\n"); @@ -3686,7 +3686,7 @@ BOOL InitAdapters(void) { mod_gl = LoadLibraryA("opengl32.dll"); if(!mod_gl) { ERR("Can't load opengl32.dll!\n"); - return FALSE; + goto nogl_adapter; } #else #define USE_GL_FUNC(pfn) pfn = (void*)pwglGetProcAddress(#pfn); @@ -3702,7 +3702,7 @@ BOOL InitAdapters(void) { if(!pwglGetProcAddress) { ERR("Unable to load wglGetProcAddress!\n"); - return FALSE; + goto nogl_adapter; } /* Dynamically load all GL core functions */ @@ -3728,32 +3728,28 @@ BOOL InitAdapters(void) { if (!WineD3D_CreateFakeGLContext()) { ERR("Failed to get a gl context for default adapter\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } ret = IWineD3DImpl_FillGLCaps(&Adapters[0].gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } ret = initPixelFormats(&Adapters[0].gl_info); if(!ret) { ERR("Failed to init gl formats\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } hdc = pwglGetCurrentDC(); if(!hdc) { ERR("Failed to get gl HDC\n"); - HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext(); - return FALSE; + goto nogl_adapter; } Adapters[0].driver = "Display"; @@ -3826,11 +3822,31 @@ attributes. */ select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); fillGLAttribFuncs(&Adapters[0].gl_info); init_type_lookup(&Adapters[0].gl_info); + Adapters[0].opengl = TRUE; } numAdapters = 1; TRACE("%d adapters successfully initialized\n", numAdapters); return TRUE; + +nogl_adapter: + /* Initialize an adapter for ddraw-only memory counting */ + memset(Adapters, 0, sizeof(Adapters)); + Adapters[0].num = 0; + Adapters[0].opengl = FALSE; + Adapters[0].monitorPoint.x = -1; + Adapters[0].monitorPoint.y = -1; + + Adapters[0].driver = "Display"; + Adapters[0].description = "WineD3D DirectDraw Emulation"; + if(wined3d_settings.emulated_textureram) { + Adapters[0].TextureRam = wined3d_settings.emulated_textureram; + } else { + Adapters[0].TextureRam = 8 * 1024 * 1024; /* This is plenty for a DDraw-only card */ + } + + numAdapters = 1; + return FALSE; } #undef PUSH1 #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0abeb1d..c3f4910 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -682,6 +682,7 @@ typedef struct GLPixelFormatDesc GLPixelFormatDesc; struct WineD3DAdapter { UINT num; + BOOL opengl; POINT monitorPoint; WineD3D_GL_Info gl_info; const char *driver;

1 0

Stefan Dösinger : wined3d: Return a fake pixel format if gl is not loaded.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8673be0bd7579eb6440fc2d0b1c60c93f3067c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8673be0bd7579eb6440fc2d0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:34 2008 +0100 wined3d: Return a fake pixel format if gl is not loaded. --- dlls/wined3d/utils.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95abe20..d0285df 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -437,11 +437,16 @@ const StaticPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, WineD3D_GL_In idx = getFmtIdx(WINED3DFMT_UNKNOWN); } if(glDesc) { - if(!gl_info) { - ERR("OpenGL pixel format information was requested, but no gl info structure passed\n"); - return NULL; + if(!gl_info->gl_formats) { + /* If we do not have gl format information, provide a dummy NULL format. This is an easy way to make + * all gl caps check return "unsupported" than catching the lack of gl all over the code. ANSI C requires + * static variables to be initialized to 0. + */ + static const GlPixelFormatDesc dummyFmt; + *glDesc = &dummyFmt; + } else { + *glDesc = &gl_info->gl_formats[idx]; } - *glDesc = &gl_info->gl_formats[idx]; } return &formats[idx]; }

1 0

Stefan Dösinger : wined3d: Refuse 3D initialization without opengl.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: a29a22932434c0c3768a5eb595ef50cd0f59b110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29a22932434c0c3768a5eb59… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 28 23:04:52 2008 +0100 wined3d: Refuse 3D initialization without opengl. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee27abf..57b6045 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2010,6 +2010,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); if(This->d3d_initialized) return WINED3DERR_INVALIDCALL; + if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; /* TODO: Test if OpenGL is compiled in and loaded */

1 0

Alexandre Julliard : ntdll: Add a guard page at the bottom of the stack and raise a stack overflow exception when hit .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: cc33f6c8a5df21589efa7ce26f8b13715e698008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc33f6c8a5df21589efa7ce26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 17:40:37 2008 +0200 ntdll: Add a guard page at the bottom of the stack and raise a stack overflow exception when hit. --- dlls/ntdll/signal_i386.c | 46 ++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/virtual.c | 4 +++- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7920d0a..d9c6aba 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1026,6 +1026,7 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s DWORD ebp; DWORD eip; } *stack = stack_ptr; + DWORD exception_code = 0; /* stack sanity checks */ @@ -1040,22 +1041,37 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s } if (stack - 1 > stack || /* check for overflow in subtraction */ - (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit || + (char *)stack <= (char *)NtCurrentTeb()->DeallocationStack || (char *)stack > (char *)NtCurrentTeb()->Tib.StackBase) { - UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)stack; - if (diff < 4096) + WARN( "exception outside of stack limits in thread %04x eip %08x esp %08x stack %p-%p\n", + GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, + NtCurrentTeb()->Tib.StackBase ); + } + else if ((char *)(stack - 1) < (char *)NtCurrentTeb()->DeallocationStack + 4096) + { + /* stack overflow on last page, unrecoverable */ + UINT diff = (char *)NtCurrentTeb()->DeallocationStack + 4096 - (char *)(stack - 1); + WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p-%p\n", + diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + server_abort_thread(1); + } + else if ((char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit) + { + /* stack access below stack limit, may be recoverable */ + if (virtual_handle_stack_fault( stack - 1 )) exception_code = EXCEPTION_STACK_OVERFLOW; + else { - WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p\n", + UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)(stack - 1); + WINE_ERR( "stack overflow %u bytes in thread %04x eip %08x esp %08x stack %p-%p-%p\n", diff, GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); + (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->DeallocationStack, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); server_abort_thread(1); } - else WARN( "exception outside of stack limits in thread %04x eip %08x esp %08x stack %p-%p\n", - GetCurrentThreadId(), (unsigned int) EIP_sig(sigcontext), - (unsigned int) ESP_sig(sigcontext), NtCurrentTeb()->Tib.StackLimit, - NtCurrentTeb()->Tib.StackBase ); } stack--; /* push the stack_layout structure */ @@ -1069,6 +1085,7 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s stack->context_ptr = &stack->context; stack->rec.ExceptionRecord = NULL; + stack->rec.ExceptionCode = exception_code; stack->rec.ExceptionFlags = EXCEPTION_CONTINUABLE; stack->rec.ExceptionAddress = (LPVOID)EIP_sig(sigcontext); stack->rec.NumberParameters = 0; @@ -1280,9 +1297,18 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (char *)siginfo->si_addr >= (char *)NtCurrentTeb()->DeallocationStack && (char *)siginfo->si_addr < (char *)NtCurrentTeb()->Tib.StackBase && virtual_handle_stack_fault( siginfo->si_addr )) + { + /* check if this was the last guard page */ + if ((char *)siginfo->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) + { + rec = setup_exception_record( context, stack, fs, gs, raise_segv_exception ); + rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; + } return; + } rec = setup_exception_record( context, stack, fs, gs, raise_segv_exception ); + if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(get_trap_code(context)) { diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5e4327b..a5b299d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1303,11 +1303,13 @@ NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size ) /* setup no access guard page */ VIRTUAL_SetProt( view, view->base, page_size, VPROT_COMMITTED ); + VIRTUAL_SetProt( view, (char *)view->base + page_size, page_size, + VPROT_READ | VPROT_WRITE | VPROT_COMMITTED | VPROT_GUARD ); /* note: limit is lower than base since the stack grows down */ NtCurrentTeb()->DeallocationStack = view->base; NtCurrentTeb()->Tib.StackBase = (char *)view->base + view->size; - NtCurrentTeb()->Tib.StackLimit = (char *)view->base + page_size; + NtCurrentTeb()->Tib.StackLimit = (char *)view->base + 2 * page_size; done: server_leave_uninterrupted_section( &csVirtual, &sigset );

1 0

Rob Shearman : widl: Be more strict about where semicolons can appear in IDL files.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 772f3af9f0ac5a28fde31641c497fb02dbab110c URL: http://source.winehq.org/git/wine.git/?a=commit;h=772f3af9f0ac5a28fde31641c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 1 12:47:56 2008 +0100 widl: Be more strict about where semicolons can appear in IDL files. In particular, don't allow them after cpp_quote and without a statement. Update the rules for importlib, library definition, dispinterface definition, interface definition, coclass definition and module definition to optionally allow a semicolon postfix. Call pop_import from the parser instead of the lexer to ensure that pop_import is only called after the last statement in the imported file has been parsed. --- tools/widl/parser.h | 1 + tools/widl/parser.l | 8 ++------ tools/widl/parser.y | 37 +++++++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index c46364a..71f08dc 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -39,6 +39,7 @@ int parser_lex(void); extern int import_stack_ptr; int do_import(char *fname); void abort_import(void); +void pop_import(void); #define parse_only import_stack_ptr diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 94eec0d..3bcdc26 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -79,8 +79,6 @@ struct { } import_stack[MAX_IMPORT_DEPTH]; int import_stack_ptr = 0; -static void pop_import(void); - UUID *parse_uuid(const char *u) { UUID* uuid = xmalloc(sizeof(UUID)); @@ -166,10 +164,8 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\>\> return SHR; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) { - pop_import(); + if (import_stack_ptr) return aEOF; - } else yyterminate(); } %% @@ -367,7 +363,7 @@ static char *get_buffered_cstring(void) return xstrdup(cbuffer); } -static void pop_import(void) +void pop_import(void) { int ptr = import_stack_ptr-1; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7ddae74..dd02ab6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -267,6 +267,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <num> pointer_type version %type <str> libraryhdr %type <uuid> uuid_string +%type <num> import_start %left ',' %right '?' ':' @@ -328,8 +329,11 @@ int_statements: { $$ = NULL; } | int_statements statement { $$ = $1; } ; -statement: ';' {} - | constdef ';' { if (!parse_only && do_header) { write_constdef($1); } } +semicolon_opt: + | ';' + ; + +statement: constdef ';' { if (!parse_only && do_header) { write_constdef($1); } } | cppquote {} | enumdef ';' { if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); @@ -354,12 +358,17 @@ statement: ';' {} cppquote: tCPPQUOTE '(' aSTRING ')' { if (!parse_only && do_header) fprintf(header, "%s\n", $3); } ; import_start: tIMPORT aSTRING ';' { assert(yychar == YYEMPTY); - if (!do_import($2)) yychar = aEOF; } + $$ = do_import($2); + if (!$$) yychar = aEOF; + } ; -import: import_start imp_statements aEOF {} + +import: import_start imp_statements aEOF + { if ($1) pop_import(); } ; -importlib: tIMPORTLIB '(' aSTRING ')' { if(!parse_only) add_importlib($3); } +importlib: tIMPORTLIB '(' aSTRING ')' + semicolon_opt { if(!parse_only) add_importlib($3); } ; libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } @@ -369,7 +378,8 @@ library_start: attributes libraryhdr '{' { if (!parse_only) start_typelib($2, $1 if (!parse_only && do_idfile) write_libid($2, $1); } ; -librarydef: library_start imp_statements '}' { if (!parse_only) end_typelib(); } +librarydef: library_start imp_statements '}' + semicolon_opt { if (!parse_only) end_typelib(); } ; m_args: { $$ = NULL; } @@ -726,7 +736,8 @@ coclasshdr: attributes coclass { $$ = $2; } ; -coclassdef: coclasshdr '{' coclass_ints '}' { $$ = $1; +coclassdef: coclasshdr '{' coclass_ints '}' semicolon_opt + { $$ = $1; $$->ifaces = $3; $$->defined = TRUE; } @@ -774,7 +785,7 @@ dispinterfacedef: dispinterfacehdr '{' if (!parse_only && do_idfile) write_diid($$); } | dispinterfacehdr - '{' interface ';' '}' { $$ = $1; + '{' interface ';' '}' { $$ = $1; $$->fields = $3->fields; $$->funcs = $3->funcs; if (!parse_only && do_header) write_dispinterface($$); @@ -802,7 +813,7 @@ interfacehdr: attributes interface { $$.interface = $2; ; interfacedef: interfacehdr inherit - '{' int_statements '}' { $$ = $1.interface; + '{' int_statements '}' semicolon_opt { $$ = $1.interface; $$->ref = $2; $$->funcs = $4; compute_method_indexes($$); @@ -814,7 +825,8 @@ interfacedef: interfacehdr inherit /* MIDL is able to import the definition of a base class from inside the * definition of a derived class, I'll try to support it with this rule */ | interfacehdr ':' aIDENTIFIER - '{' import int_statements '}' { $$ = $1.interface; + '{' import int_statements '}' + semicolon_opt { $$ = $1.interface; $$->ref = find_type2($3, 0); if (!$$->ref) error_loc("base class '%s' not found in import\n", $3); $$->funcs = $6; @@ -824,7 +836,7 @@ interfacedef: interfacehdr inherit if (!parse_only && do_idfile) write_iid($$); pointer_default = $1.old_pointer_default; } - | dispinterfacedef { $$ = $1; } + | dispinterfacedef semicolon_opt { $$ = $1; } ; interfacedec: @@ -841,7 +853,8 @@ modulehdr: attributes module { $$ = $2; } ; -moduledef: modulehdr '{' int_statements '}' { $$ = $1; +moduledef: modulehdr '{' int_statements '}' + semicolon_opt { $$ = $1; $$->funcs = $3; /* FIXME: if (!parse_only && do_header) write_module($$); */ }

1 0