June 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Present does not clear the depth stencil.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 078523f73e7b708dab06e888c24a1595bb5a63d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=078523f73e7b708dab06e888c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 14 11:18:03 2007 +0200 wined3d: Present does not clear the depth stencil. --- dlls/d3d8/tests/visual.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 18 ++------------ 3 files changed, 113 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f755679..e4178f2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -116,6 +116,8 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); ok(hr == D3D_OK, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString8(hr)); @@ -441,6 +443,58 @@ static void fog_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "Turning off fog calculations returned %s\n", DXGetErrorString8(hr)); } +static void present_test(IDirect3DDevice8 *device) +{ + struct vertex quad[] = + { + {-1.0f, -1.0f, 0.9f, 0xffff0000}, + {-1.0f, 1.0f, 0.9f, 0xffff0000}, + { 1.0f, -1.0f, 0.1f, 0xffff0000}, + { 1.0f, 1.0f, 0.1f, 0xffff0000}, + }; + HRESULT hr; + DWORD color; + + /* Does the Present clear the depth stencil? Clear the depth buffer with some value != 0, + * then call Present. Then clear the color buffer to make sure it has some defined content + * after the Present with D3DSWAPEFFECT_DISCARD. After that draw a plane that is somewhere cut + * by the depth value. + */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.75, 0); + ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_GREATER); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetFVF returned %s\n", DXGetErrorString8(hr)); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_BeginScene failed with %s\n", DXGetErrorString8(hr)); + if(hr == D3D_OK) + { + /* No lights are defined... That means, lit vertices should be entirely black */ + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2 /*PrimCount */, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice8_DrawIndexedPrimitiveUP failed with %s\n", DXGetErrorString8(hr)); + + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice8_EndScene failed with %s\n", DXGetErrorString8(hr)); + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %s\n", DXGetErrorString8(hr)); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + color = getPixelColor(device, 512, 240); + ok(color == 0x00ffffff, "Present failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + color = getPixelColor(device, 64, 240); + ok(color == 0x00ff0000, "Present failed: Got color 0x%08x, expected 0x00ff0000.\n", color); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -492,6 +546,7 @@ START_TEST(visual) lighting_test(device_ptr); clear_test(device_ptr); fog_test(device_ptr); + present_test(device_ptr); cleanup: if(device_ptr) IDirect3DDevice8_Release(device_ptr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d961d80..3ab45e1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -116,6 +116,8 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); ok(hr == D3D_OK, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString9(hr)); @@ -1114,6 +1116,58 @@ static void texbem_test(IDirect3DDevice9 *device) } } +static void present_test(IDirect3DDevice9 *device) +{ + struct vertex quad[] = + { + {-1.0f, -1.0f, 0.9f, 0xffff0000}, + {-1.0f, 1.0f, 0.9f, 0xffff0000}, + { 1.0f, -1.0f, 0.1f, 0xffff0000}, + { 1.0f, 1.0f, 0.1f, 0xffff0000}, + }; + HRESULT hr; + DWORD color; + + /* Does the Present clear the depth stencil? Clear the depth buffer with some value != 0, + * then call Present. Then clear the color buffer to make sure it has some defined content + * after the Present with D3DSWAPEFFECT_DISCARD. After that draw a plane that is somewhere cut + * by the depth value. + */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.75, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.4, 0); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_GREATER); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(hr == D3D_OK) + { + /* No lights are defined... That means, lit vertices should be entirely black */ + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2 /*PrimCount */, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawIndexedPrimitiveUP failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + color = getPixelColor(device, 512, 240); + ok(color == 0x00ffffff, "Present failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + color = getPixelColor(device, 64, 240); + ok(color == 0x00ff0000, "Present failed: Got color 0x%08x, expected 0x00ff0000.\n", color); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -1169,6 +1223,7 @@ START_TEST(visual) clear_test(device_ptr); fog_test(device_ptr); test_cube_wrap(device_ptr); + present_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e7a3173..b449856 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -148,7 +148,6 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - DWORD clear_flags = 0; unsigned int sync; int retval; @@ -298,22 +297,11 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO LEAVE_GL(); - if (This->wineD3DDevice->stencilBufferTarget) { - clear_flags |= WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER; - } - - /* Although this is not strictly required, a simple demo showed this does occur - on (at least non-debug) d3d */ if (This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { + TRACE("Clearing the color buffer with pink color\n"); - TRACE("Clearing\n"); - - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, clear_flags|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); - - } else if (clear_flags) { - TRACE("Clearing z/stencil buffer\n"); - - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, clear_flags, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, + WINED3DCLEAR_TARGET, 0xff00ffff, 1.0, 0); } if(((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_INSYSMEM ||

1 0

Alexandre Julliard : localspl: Make some functions static.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 0130a18434ddd90678656a403b53c4c33fcd5ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0130a18434ddd90678656a403… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 13:16:06 2007 +0200 localspl: Make some functions static. --- dlls/localspl/localmon.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 908ae04..aaf78a5 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -318,7 +318,7 @@ static DWORD get_type_from_name(LPCWSTR name) * Level 2 is documented on MSDN for Portmonitors, but not supported by the * "Local Port" Portmonitor (localspl.dll / localmon.dll) */ -BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonitorName) +static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonitorName) { PORT_INFO_1W * pi; HKEY hroot; @@ -382,8 +382,8 @@ BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWST * "HCU\Software\Wine\Spooler\<portname>" - redirection * */ -BOOL WINAPI localmon_EnumPortsW(LPWSTR pName, DWORD level, LPBYTE pPorts, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +static BOOL WINAPI localmon_EnumPortsW(LPWSTR pName, DWORD level, LPBYTE pPorts, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { BOOL res = FALSE; DWORD needed; @@ -428,7 +428,7 @@ cleanup: * Failure: FALSE * */ -BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) +static BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) { xcv_t * xcv = (xcv_t *) hXcv; @@ -469,8 +469,8 @@ BOOL WINAPI localmon_XcvClosePort(HANDLE hXcv) * * */ -DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, - PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, + PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) { WCHAR buffer[16]; /* buffer for a decimal number */ LPWSTR ptr; @@ -606,7 +606,7 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput * Failure: FALSE * */ -BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess, PHANDLE phXcv) +static BOOL WINAPI localmon_XcvOpenPort(LPCWSTR pName, ACCESS_MASK GrantedAccess, PHANDLE phXcv) { DWORD len; xcv_t * xcv;

1 0

Maarten Lankhorst : dsound: Use TIME_KILL_SYNCHRONOUS on sound timer.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 1081a9b14417a3d4fc7227c8dc515f1ef1cfe7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1081a9b14417a3d4fc7227c8d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 13 14:12:07 2007 +0200 dsound: Use TIME_KILL_SYNCHRONOUS on sound timer. --- dlls/dsound/dsound.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 2a72027..9680930 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1249,10 +1249,8 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) int i; timeKillEvent(device->timerID); timeEndPeriod(DS_TIME_RES); - /* wait for timer to expire */ - Sleep(DS_TIME_RES+1); - /* The sleep above should have allowed the timer process to expire + /* The kill event should have allowed the timer process to expire * but try to grab the lock just in case. Can't hold lock because * IDirectSoundBufferImpl_Destroy also grabs the lock */ RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); @@ -1521,7 +1519,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG DSOUND_renderer[device->drvdesc.dnDevNode] = device; timeBeginPeriod(DS_TIME_RES); DSOUND_renderer[device->drvdesc.dnDevNode]->timerID = timeSetEvent(DS_TIME_DEL, DS_TIME_RES, DSOUND_timer, - (DWORD_PTR)DSOUND_renderer[device->drvdesc.dnDevNode], TIME_PERIODIC | TIME_CALLBACK_FUNCTION); + (DWORD_PTR)DSOUND_renderer[device->drvdesc.dnDevNode], TIME_PERIODIC | TIME_CALLBACK_FUNCTION | TIME_KILL_SYNCHRONOUS); } else { WARN("DSOUND_PrimaryCreate failed\n"); }

1 0

Andrew Talbot : msi: Constify some variables.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: cf1e01eb0cd8e56fddd2cb7240e8b423b4d4b51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1e01eb0cd8e56fddd2cb724… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jun 13 22:36:31 2007 +0100 msi: Constify some variables. --- dlls/msi/msipriv.h | 4 ++-- dlls/msi/query.h | 2 +- dlls/msi/table.c | 19 ++++++++++--------- dlls/msi/update.c | 2 +- dlls/msi/where.c | 10 +++++----- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9e2f8ba..1f2677c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -570,7 +570,7 @@ extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname, extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, USHORT **pdata, UINT *psz ); extern UINT write_stream_data( IStorage *stg, LPCWSTR stname, - LPVOID data, UINT sz, BOOL bTable ); + LPCVOID data, UINT sz, BOOL bTable ); /* transform functions */ extern UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ); @@ -609,7 +609,7 @@ extern UINT MSI_RecordCopyField( MSIRECORD *, unsigned int, MSIRECORD *, unsigne extern UINT get_raw_stream( MSIHANDLE hdb, LPCWSTR stname, IStream **stm ); extern UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ); extern void enum_stream_names( IStorage *stg ); -extern BOOL decode_streamname(LPWSTR in, LPWSTR out); +extern BOOL decode_streamname(LPCWSTR in, LPWSTR out); extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in); /* database internals */ diff --git a/dlls/msi/query.h b/dlls/msi/query.h index e92b470..48a1823 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -114,7 +114,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, column_info *values, BOOL temp ); -UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **, LPWSTR table, +UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **, LPCWSTR table, column_info *list, struct expr *expr ); UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9c78743..c9b1572 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -206,7 +206,7 @@ static int mime2utf(int x) return '_'; } -BOOL decode_streamname(LPWSTR in, LPWSTR out) +BOOL decode_streamname(LPCWSTR in, LPWSTR out) { WCHAR ch; DWORD count = 0; @@ -408,7 +408,7 @@ end: } UINT write_stream_data( IStorage *stg, LPCWSTR stname, - LPVOID data, UINT sz, BOOL bTable ) + LPCVOID data, UINT sz, BOOL bTable ) { HRESULT r; UINT ret = ERROR_FUNCTION_FAILED; @@ -819,7 +819,7 @@ static UINT get_table( MSIDATABASE *db, LPCWSTR name, MSITABLE **table_ret ) return ERROR_SUCCESS; } -static UINT save_table( MSIDATABASE *db, MSITABLE *t ) +static UINT save_table( MSIDATABASE *db, const MSITABLE *t ) { BYTE *rawdata = NULL, *p; UINT rawsize, r, i, j, row_size; @@ -933,12 +933,12 @@ static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ) } } -static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid) +static LPWSTR msi_makestring( const MSIDATABASE *db, UINT stringid) { return strdupW(msi_string_lookup_id( db->strings, stringid )); } -static UINT read_table_int(BYTE **data, UINT row, UINT col, UINT bytes) +static UINT read_table_int(BYTE *const *data, UINT row, UINT col, UINT bytes) { UINT ret = 0, i; @@ -1720,7 +1720,8 @@ MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) return MSICONDITION_FALSE; } -static MSIRECORD *msi_get_transform_record( MSITABLEVIEW *tv, string_table *st, USHORT *rawdata ) +static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st, + const USHORT *rawdata ) { UINT i, val, ofs = 0; USHORT mask = *rawdata++; @@ -1793,7 +1794,7 @@ static void dump_record( MSIRECORD *rec ) } } -static void dump_table( string_table *st, USHORT *rawdata, UINT rawsize ) +static void dump_table( const string_table *st, const USHORT *rawdata, UINT rawsize ) { LPCWSTR sval; UINT i; @@ -1805,7 +1806,7 @@ static void dump_table( string_table *st, USHORT *rawdata, UINT rawsize ) } } -static UINT* msi_record_to_row( MSITABLEVIEW *tv, MSIRECORD *rec ) +static UINT* msi_record_to_row( const MSITABLEVIEW *tv, MSIRECORD *rec ) { LPCWSTR str; UINT i, r, *data; @@ -1845,7 +1846,7 @@ static UINT* msi_record_to_row( MSITABLEVIEW *tv, MSIRECORD *rec ) return data; } -static UINT msi_row_matches( MSITABLEVIEW *tv, UINT row, UINT *data ) +static UINT msi_row_matches( MSITABLEVIEW *tv, UINT row, const UINT *data ) { UINT i, r, x, ret = ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 8c291de..6b9b3cf 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -186,7 +186,7 @@ static const MSIVIEWOPS update_ops = UPDATE_find_matching_rows }; -UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, struct expr *expr ) { MSIUPDATEVIEW *uv = NULL; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index a30ebcb..78056e1 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -139,8 +139,8 @@ static INT INT_evaluate_unary( INT lval, UINT op ) return 0; } -static const WCHAR *STRING_evaluate( string_table *st, - MSIVIEW *table, UINT row, struct expr *expr, MSIRECORD *record ) +static const WCHAR *STRING_evaluate( const string_table *st, + MSIVIEW *table, UINT row, const struct expr *expr, const MSIRECORD *record ) { UINT val = 0, r; @@ -165,8 +165,8 @@ static const WCHAR *STRING_evaluate( string_table *st, return NULL; } -static UINT STRCMP_Evaluate( string_table *st, MSIVIEW *table, UINT row, - struct expr *cond, INT *val, MSIRECORD *record ) +static UINT STRCMP_Evaluate( const string_table *st, MSIVIEW *table, UINT row, + const struct expr *cond, INT *val, const MSIRECORD *record ) { int sr; const WCHAR *l_str, *r_str; @@ -190,7 +190,7 @@ static UINT STRCMP_Evaluate( string_table *st, MSIVIEW *table, UINT row, } static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, - struct expr *cond, INT *val, MSIRECORD *record ) + const struct expr *cond, INT *val, MSIRECORD *record ) { UINT r, tval; INT lval, rval;

1 0

James Hawkins : msi: Protect custom actions with a structured exception handler.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 9ed5c865e219d4d55ab1da32ccb8f7922343c092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed5c865e219d4d55ab1da32c… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jun 13 11:26:04 2007 -0700 msi: Protect custom actions with a structured exception handler. --- dlls/msi/Makefile.in | 2 +- dlls/msi/custom.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index e81dd4c..6edb45f 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msi.dll IMPORTLIB = libmsi.$(IMPLIBEXT) -IMPORTS = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 +IMPORTS = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = odbccp32 EXTRALIBS = -luuid diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index e516256..9170a7e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -25,10 +25,12 @@ #include "winbase.h" #include "winerror.h" #include "msidefs.h" -#include "msipriv.h" #include "winuser.h" + +#include "msipriv.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -583,7 +585,19 @@ static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { TRACE("calling %s\n", debugstr_w( info->target ) ); handle_msi_break( info->target ); - r = fn( hPackage ); + + __TRY + { + r = fn( hPackage ); + } + __EXCEPT_PAGE_FAULT + { + ERR("Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(info->source), debugstr_w(info->target), GetExceptionCode()); + r = ERROR_SUCCESS; + } + __ENDTRY; + MsiCloseHandle( hPackage ); } else

1 0

Michael Stefaniuc : wrc: Fix redundant checks for NULL before free(). Found by Smatch.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: cb2574722e4846dcfb87e10f2349d7fcfb17800e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2574722e4846dcfb87e10f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 13 23:52:17 2007 +0200 wrc: Fix redundant checks for NULL before free(). Found by Smatch. --- tools/wrc/parser.y | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 595042c..5806620 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -531,8 +531,7 @@ resource if(!win32) parser_warning("LANGUAGE not supported in 16-bit mode"); - if(currentlanguage) - free(currentlanguage); + free(currentlanguage); if (get_language_codepage($3, $5) == -1) parser_error( "Language %04x is not supported", ($5<<10) + $3); currentlanguage = new_language($3, $5); @@ -1460,11 +1459,8 @@ stringtable } /* Else were done */ } - if(tagstt_memopt) - { - free(tagstt_memopt); - tagstt_memopt = NULL; - } + free(tagstt_memopt); + tagstt_memopt = NULL; $$ = tagstt; } @@ -1477,8 +1473,7 @@ stt_head: tSTRINGTABLE loadmemopts opt_lvc { tagstt_memopt = $2; tagstt_version = $3->version; tagstt_characts = $3->characts; - if($3) - free($3); + free($3); } ;

1 0

Detlef Riekenberg : localspl: Implement AddPortEx.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 97f95d4c5a85f90376a0e74f1d515af0bc7aa3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f95d4c5a85f90376a0e74f1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 14 01:01:11 2007 +0200 localspl: Implement AddPortEx. --- dlls/localspl/localmon.c | 62 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 57cdd7a..908ae04 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -85,6 +85,7 @@ static const WCHAR cmd_SetDefaultCommConfigW[] = {'S','e','t', static const WCHAR dllnameuiW[] = {'l','o','c','a','l','u','i','.','d','l','l',0}; static const WCHAR emptyW[] = {0}; +static const WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static const WCHAR portname_LPT[] = {'L','P','T',0}; static const WCHAR portname_COM[] = {'C','O','M',0}; @@ -298,6 +299,63 @@ static DWORD get_type_from_name(LPCWSTR name) return PORT_IS_UNKNOWN; } +/****************************************************************************** + * localmon_AddPortExW [exported through MONITOREX] + * + * Add a Port, without presenting a user interface + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * level [I] Structure-Level (1) for pBuffer + * pBuffer [I] PTR to the Input-Data (PORT_INFO_1) + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Level 2 is documented on MSDN for Portmonitors, but not supported by the + * "Local Port" Portmonitor (localspl.dll / localmon.dll) + */ +BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR pMonitorName) +{ + PORT_INFO_1W * pi; + HKEY hroot; + DWORD res; + + pi = (PORT_INFO_1W *) pBuffer; + TRACE("(%s, %d, %p, %s) => %s\n", debugstr_w(pName), level, pBuffer, + debugstr_w(pMonitorName), debugstr_w(pi ? pi->pName : NULL)); + + + if ((pMonitorName == NULL) || (lstrcmpiW(pMonitorName, LocalPortW) != 0 ) || + (pi == NULL) || (pi->pName == NULL) || (pi->pName[0] == '\0') ) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (level != 1) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); + if (res == ERROR_SUCCESS) { + if (does_port_exist(pi->pName)) { + RegCloseKey(hroot); + TRACE("=> FALSE with %u\n", ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + res = RegSetValueExW(hroot, pi->pName, 0, REG_SZ, (const BYTE *) emptyW, sizeof(emptyW)); + RegCloseKey(hroot); + } + if (res != ERROR_SUCCESS) SetLastError(ERROR_INVALID_PARAMETER); + TRACE("=> %u with %u\n", (res == ERROR_SUCCESS), GetLastError()); + return (res == ERROR_SUCCESS); +} + /***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * @@ -607,8 +665,8 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) NULL, /* localmon_ReadPortW */ NULL, /* localmon_EndDocPortW */ NULL, /* localmon_ClosePortW */ - NULL, /* localmon_AddPortW */ - NULL, /* localmon_AddPortExW */ + NULL, /* Use AddPortUI in localui.dll */ + localmon_AddPortExW, NULL, /* Use ConfigurePortUI in localui.dll */ NULL, /* Use DeletePortUI in localui.dll */ NULL, /* localmon_GetPrinterDataFromPort */

1 0

Paul Vriens : crypt32/tests: Skip tests if we don't have enough rights.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: c44d22466c81f60e18bbc4983c6353551e639410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44d22466c81f60e18bbc4983… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jun 13 15:52:16 2007 +0200 crypt32/tests: Skip tests if we don't have enough rights. --- dlls/crypt32/tests/sip.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 9f775ef..22a7b9e 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -84,6 +84,11 @@ static void test_AddRemoveProvider(void) newprov.pwszRemoveFuncName = dummyfunction; SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Need admin rights\n"); + return; + } ok ( ret, "CryptSIPAddProvider should have succeeded\n"); /* Dummy provider will be deleted, but the function still fails because

1 0

Paul Vriens : crypt32/tests: Vista uses a different error code.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 74edf133e040a4ed9abd5be0b2ee17abd0c7bc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74edf133e040a4ed9abd5be0b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 14 08:32:31 2007 +0200 crypt32/tests: Vista uses a different error code. --- dlls/crypt32/tests/sip.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 22a7b9e..cce058e 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -210,8 +210,9 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_FILE_INVALID || - GetLastError() == S_OK /* Win98 */, - "Expected ERROR_FILE_INVALID or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ || + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); @@ -225,8 +226,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == S_OK /* Win98 */, - "Expected ERROR_INVALID_PARAMETER or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject)); @@ -240,8 +241,8 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN || - GetLastError() == S_OK /* Win98 */, - "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or S_OK, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* Win98 */, + "Expected TRUST_E_SUBJECT_FORM_UNKNOWN or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject));

1 0

Phil Costin : wined3d: Remove a duplication in device.c.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 72865b8ca2761931f2adcb44bb8fb0d08de162be URL: http://source.winehq.org/git/wine.git/?a=commit;h=72865b8ca2761931f2adcb44b… Author: Phil Costin <philcostin(a)hotmail.com> Date: Wed Jun 13 17:29:56 2007 +0000 wined3d: Remove a duplication in device.c. --- dlls/wined3d/device.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab38a7c..2703d7b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -140,8 +140,6 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 _basetexture.dirty = TRUE; \ _basetexture.is_srgb = FALSE; \ _basetexture.srgb_mode_change_count = 0; \ - _basetexture.is_srgb = FALSE; \ - _basetexture.srgb_mode_change_count = 0; \ } /**********************************************************

1 0