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

Henri Verbeet : d3d9: Don't depend on specific display modes in test_reset( ).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 8a0fc70584e57f8f96eb04cad9810da0b14144f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0fc70584e57f8f96eb04cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 d3d9: Don't depend on specific display modes in test_reset(). --- dlls/d3d9/tests/device.c | 84 ++++++++++++++++++++++++++++++--------------- 1 files changed, 56 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 055885e..f254719 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -725,9 +725,14 @@ static void test_reset(void) IDirect3DSurface9 *surface; IDirect3DTexture9 *texture; IDirect3DVertexShader9 *shader; - BOOL support_800x600 = FALSE; - UINT i; + UINT i, adapter_mode_count; D3DLOCKED_RECT lockrect; + struct + { + UINT w; + UINT h; + } *modes = NULL; + UINT mode_count = 0; pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); @@ -736,23 +741,27 @@ static void test_reset(void) if (!pD3d || !hwnd) goto cleanup; IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); - ZeroMemory( &d3dpp, sizeof(d3dpp) ); - d3dpp.Windowed = FALSE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = 800; - d3dpp.BackBufferHeight = 600; - d3dpp.BackBufferFormat = d3ddm.Format; - d3dpp.EnableAutoDepthStencil = TRUE; - d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; - - for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { + adapter_mode_count = IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); + for(i = 0; i < adapter_mode_count; ++i) + { + int j; ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); ok(hr == D3D_OK, "IDirect3D9_EnumAdapterModes returned %#x\n", hr); - if(d3ddm2.Width == 800 && d3ddm2.Height == 600) { - support_800x600 = TRUE; + for (j = 0; j < mode_count; ++j) + { + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) + break; + } + if (j == mode_count) + { + modes[j].w = d3ddm2.Width; + modes[j].h = d3ddm2.Height; + ++mode_count; } + /* We use them as invalid modes */ if((d3ddm2.Width == 801 && d3ddm2.Height == 600) || (d3ddm2.Width == 32 && d3ddm2.Height == 32)) { @@ -761,11 +770,25 @@ static void test_reset(void) goto cleanup; } } - if(!support_800x600) { - skip("Mode 800x600 not supported, skipping mode tests\n"); + + if (mode_count < 2) + { + skip("Less than 2 modes supported, skipping mode tests\n"); goto cleanup; } + i = 0; + if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; + + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = FALSE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); @@ -779,8 +802,8 @@ static void test_reset(void) width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 800, "Screen width is %d\n", width); - ok(height == 600, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetViewport(pDevice, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); @@ -788,11 +811,13 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 800, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 600, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } + + i = 1; vp.X = 10; vp.Y = 20; vp.MinZ = 2; @@ -803,8 +828,8 @@ static void test_reset(void) ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; - d3dpp.BackBufferWidth = 640; - d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferWidth = modes[i].w; + d3dpp.BackBufferHeight = modes[i].h; d3dpp.BackBufferFormat = d3ddm.Format; hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); @@ -818,16 +843,16 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); - ok(vp.Width == 640, "D3DVIEWPORT->Width = %d\n", vp.Width); - ok(vp.Height == 480, "D3DVIEWPORT->Height = %d\n", vp.Height); + ok(vp.Width == modes[i].w, "D3DVIEWPORT->Width = %u, expected %u\n", vp.Width, modes[i].w); + ok(vp.Height == modes[i].h, "D3DVIEWPORT->Height = %u, expected %u\n", vp.Height, modes[i].h); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); } width = GetSystemMetrics(SM_CXSCREEN); height = GetSystemMetrics(SM_CYSCREEN); - ok(width == 640, "Screen width is %d\n", width); - ok(height == 480, "Screen height is %d\n", height); + ok(width == modes[i].w, "Screen width is %u, expected %u\n", width, modes[i].w); + ok(height == modes[i].h, "Screen height is %u, expected %u\n", height, modes[i].h); hr = IDirect3DDevice9_GetSwapChain(pDevice, 0, &pSwapchain); ok(hr == D3D_OK, "IDirect3DDevice9_GetSwapChain returned %08x\n", hr); @@ -838,8 +863,10 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DSwapChain9_GetPresentParameters returned %08x\n", hr); if(SUCCEEDED(hr)) { - ok(d3dpp.BackBufferWidth == 640, "Back buffer width is %d\n", d3dpp.BackBufferWidth); - ok(d3dpp.BackBufferHeight == 480, "Back buffer height is %d\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == modes[i].w, "Back buffer width is %u, expected %u\n", + d3dpp.BackBufferWidth, modes[i].w); + ok(d3dpp.BackBufferHeight == modes[i].h, "Back buffer height is %u, expected %u\n", + d3dpp.BackBufferHeight, modes[i].h); } IDirect3DSwapChain9_Release(pSwapchain); } @@ -1023,6 +1050,7 @@ static void test_reset(void) ok(hr == D3DERR_DEVICENOTRESET, "IDirect3DDevice9_TestCooperativeLevel after a failed reset returned %#x\n", hr); cleanup: + HeapFree(GetProcessHeap(), 0, modes); if(pD3d) IDirect3D9_Release(pD3d); if(pDevice) IDirect3D9_Release(pDevice); }

1 0

Henri Verbeet : wined3d: Remove unused attributes from WineDirect3DVertexStridedData.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 6afd97cc9f15e211f6cf81d15630ce3b450645cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afd97cc9f15e211f6cf81d15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:39 2009 +0100 wined3d: Remove unused attributes from WineDirect3DVertexStridedData. These are essentially unused, and mostly just complicate the code. --- dlls/wined3d/device.c | 8 ------ dlls/wined3d/drawprim.c | 56 ---------------------------------------------- dlls/wined3d/state.c | 22 ------------------ include/wine/wined3d.idl | 9 ------- 4 files changed, 0 insertions(+), 95 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9c7e6ca..73d1ac8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4703,14 +4703,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { FIXSRC(texCoords[i]); } - FIXSRC(position2); - FIXSRC(normal2); - FIXSRC(tangent); - FIXSRC(binormal); - FIXSRC(tessFactor); - FIXSRC(fog); - FIXSRC(depth); - FIXSRC(sample); #undef FIXSRC } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3f61b8a..e408696 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -57,22 +57,6 @@ static BOOL fixed_get_input( *regnum = 6; else if (usage == WINED3DDECLUSAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) *regnum = 7 + usage_idx; - else if ((usage == WINED3DDECLUSAGE_POSITION || usage == WINED3DDECLUSAGE_POSITIONT) && usage_idx == 1) - *regnum = 7 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_NORMAL && usage_idx == 1) - *regnum = 8 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TANGENT && usage_idx == 0) - *regnum = 9 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_BINORMAL && usage_idx == 0) - *regnum = 10 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_TESSFACTOR && usage_idx == 0) - *regnum = 11 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_FOG && usage_idx == 0) - *regnum = 12 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_DEPTH && usage_idx == 0) - *regnum = 13 + WINED3DDP_MAXTEXCOORD; - else if (usage == WINED3DDECLUSAGE_SAMPLE && usage_idx == 0) - *regnum = 14 + WINED3DDP_MAXTEXCOORD; if (*regnum == -1) { FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", @@ -742,46 +726,6 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStrid s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); } } - if(s->u.s.position2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position2.streamNo]; - s->u.s.position2.VBO = 0; - s->u.s.position2.lpData = (BYTE *) ((unsigned long) s->u.s.position2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal2.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal2.streamNo]; - s->u.s.normal2.VBO = 0; - s->u.s.normal2.lpData = (BYTE *) ((unsigned long) s->u.s.normal2.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tangent.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tangent.streamNo]; - s->u.s.tangent.VBO = 0; - s->u.s.tangent.lpData = (BYTE *) ((unsigned long) s->u.s.tangent.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.binormal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.binormal.streamNo]; - s->u.s.binormal.VBO = 0; - s->u.s.binormal.lpData = (BYTE *) ((unsigned long) s->u.s.binormal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.tessFactor.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.tessFactor.streamNo]; - s->u.s.tessFactor.VBO = 0; - s->u.s.tessFactor.lpData = (BYTE *) ((unsigned long) s->u.s.tessFactor.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.fog.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.fog.streamNo]; - s->u.s.fog.VBO = 0; - s->u.s.fog.lpData = (BYTE *) ((unsigned long) s->u.s.fog.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.depth.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.depth.streamNo]; - s->u.s.depth.VBO = 0; - s->u.s.depth.lpData = (BYTE *) ((unsigned long) s->u.s.depth.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.sample.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.sample.streamNo]; - s->u.s.sample.VBO = 0; - s->u.s.sample.lpData = (BYTE *) ((unsigned long) s->u.s.sample.lpData + (unsigned long) vb->resource.allocatedMemory); - } } /* Routine common to the draw primitive and draw indexed primitive routines */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 55f2ff4..6035c71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4243,14 +4243,6 @@ static inline void drawPrimitiveTraceDataLocations(const WineDirect3DVertexStrid TRACE_STRIDED((dataLocations), texCoords[5]); TRACE_STRIDED((dataLocations), texCoords[6]); TRACE_STRIDED((dataLocations), texCoords[7]); - TRACE_STRIDED((dataLocations), position2); - TRACE_STRIDED((dataLocations), normal2); - TRACE_STRIDED((dataLocations), tangent); - TRACE_STRIDED((dataLocations), binormal); - TRACE_STRIDED((dataLocations), tessFactor); - TRACE_STRIDED((dataLocations), fog); - TRACE_STRIDED((dataLocations), depth); - TRACE_STRIDED((dataLocations), sample); return; } @@ -4333,20 +4325,6 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo loadVertexData(stateblock, dataLocations); context->namedArraysLoaded = TRUE; } - -/* Generate some fixme's if unsupported functionality is being used */ -#define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData - /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { - FIXME("Tweening is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && BUFFER_OR_DATA(binormal)) { - FIXME("Binormal bump mapping is only valid with vertex shaders\n"); - } - if (!useVertexShaderFunction && (BUFFER_OR_DATA(tessFactor) || BUFFER_OR_DATA(fog) || BUFFER_OR_DATA(depth) || BUFFER_OR_DATA(sample))) { - FIXME("Extended attributes are only valid with vertex shaders\n"); - } -#undef BUFFER_OR_DATA } static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 5d502f1..4cf9159 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1945,15 +1945,6 @@ typedef struct WineDirect3DVertexStridedData WineDirect3DStridedData diffuse; WineDirect3DStridedData specular; WineDirect3DStridedData texCoords[WINED3DDP_MAXTEXCOORD]; - WineDirect3DStridedData position2; /* tween data */ - WineDirect3DStridedData normal2; /* tween data */ - WineDirect3DStridedData tangent; - WineDirect3DStridedData binormal; - WineDirect3DStridedData tessFactor; - WineDirect3DStridedData fog; - WineDirect3DStridedData depth; - WineDirect3DStridedData sample; - /* Add fields here */ } s; WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */

1 0

Henri Verbeet : wined3d: Simplify remove_vbos().
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: c1a42ff0243e70263e5d7f0d8f54e0988cb55a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a42ff0243e70263e5d7f0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify remove_vbos(). --- dlls/wined3d/drawprim.c | 51 ++++++++-------------------------------------- 1 files changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e408696..4718969 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -681,49 +681,16 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const WineDirect3 } static inline void remove_vbos(IWineD3DDeviceImpl *This, WineDirect3DVertexStridedData *s) { - unsigned char i; - struct wined3d_buffer *vb; + unsigned int i; - if(s->u.s.position.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.position.streamNo]; - s->u.s.position.VBO = 0; - s->u.s.position.lpData = (BYTE *) ((unsigned long) s->u.s.position.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendWeights.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendWeights.streamNo]; - s->u.s.blendWeights.VBO = 0; - s->u.s.blendWeights.lpData = (BYTE *) ((unsigned long) s->u.s.blendWeights.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.blendMatrixIndices.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.blendMatrixIndices.streamNo]; - s->u.s.blendMatrixIndices.VBO = 0; - s->u.s.blendMatrixIndices.lpData = (BYTE *) ((unsigned long) s->u.s.blendMatrixIndices.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.normal.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.normal.streamNo]; - s->u.s.normal.VBO = 0; - s->u.s.normal.lpData = (BYTE *) ((unsigned long) s->u.s.normal.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.pSize.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.pSize.streamNo]; - s->u.s.pSize.VBO = 0; - s->u.s.pSize.lpData = (BYTE *) ((unsigned long) s->u.s.pSize.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.diffuse.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.diffuse.streamNo]; - s->u.s.diffuse.VBO = 0; - s->u.s.diffuse.lpData = (BYTE *) ((unsigned long) s->u.s.diffuse.lpData + (unsigned long) vb->resource.allocatedMemory); - } - if(s->u.s.specular.VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.specular.streamNo]; - s->u.s.specular.VBO = 0; - s->u.s.specular.lpData = (BYTE *) ((unsigned long) s->u.s.specular.lpData + (unsigned long) vb->resource.allocatedMemory); - } - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - if(s->u.s.texCoords[i].VBO) { - vb = (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.s.texCoords[i].streamNo]; - s->u.s.texCoords[i].VBO = 0; - s->u.s.texCoords[i].lpData = (BYTE *) ((unsigned long) s->u.s.texCoords[i].lpData + (unsigned long) vb->resource.allocatedMemory); + for (i = 0; i < (sizeof(s->u.input) / sizeof(*s->u.input)); ++i) + { + if (s->u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[s->u.input[i].streamNo]; + s->u.input[i].VBO = 0; + s->u.input[i].lpData = (BYTE *)((unsigned long)s->u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); } } }

1 0

Alexandre Julliard : wininet/tests: Fix another instance of changed behavior on winehq.org.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 7e22055ee1a8b51ec6f152f4b7779e2b390d0f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e22055ee1a8b51ec6f152f4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 25 22:57:32 2009 +0100 wininet/tests: Fix another instance of changed behavior on winehq.org. --- dlls/wininet/tests/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 27e393b..044b96f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -568,8 +568,8 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_EXPECT2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_EXPECT2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -606,8 +606,8 @@ static void InternetReadFileExA_test(int flags) CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - todo_wine CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE);

1 0

Alexandre Julliard : configure: socketpair needs -lsocket on Solaris.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 98bec05ed7dbecf6d869f7b661b8b384cf672c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bec05ed7dbecf6d869f7b66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 26 11:07:28 2009 +0100 configure: socketpair needs -lsocket on Solaris. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ef84565..3bf72df 100755 --- a/configure +++ b/configure @@ -18166,7 +18166,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG" - for ac_func in \ _pclose \ _popen \ @@ -18220,7 +18219,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -18871,6 +18869,7 @@ fi + for ac_func in \ getaddrinfo \ getnameinfo \ @@ -18880,6 +18879,7 @@ for ac_func in \ getservbyport \ inet_network \ sendmsg \ + socketpair \ do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index fe40d1e..6a60c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1482,7 +1482,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - socketpair \ spawnvp \ statfs \ statvfs \ @@ -1536,6 +1535,7 @@ AC_CHECK_FUNCS(\ getservbyport \ inet_network \ sendmsg \ + socketpair \ ) dnl **** Check for OpenLDAP ***

1 0

Huw Davies : rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it' s only used for diagnostics.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: eaf4492c704da1190b3b3844e7340a275d71acbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4492c704da1190b3b3844e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 19 12:23:45 2009 +0000 rpcrt4: Dynamically allocate the buffer if the fixed size one isn't large enough. Don't return an inappropriate error if we fail to get the status text, it's only used for diagnostics. --- dlls/rpcrt4/rpc_transport.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 7de6230..9e4186c 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1597,8 +1597,8 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) DWORD status_code; DWORD size; DWORD index; - WCHAR status_text[32]; - + WCHAR buf[32]; + WCHAR *status_text = buf; TRACE("\n"); index = 0; @@ -1609,11 +1609,17 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) if (status_code < 400) return RPC_S_OK; index = 0; - size = sizeof(status_text); + size = sizeof(buf); ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); - if (!ret) - return GetLastError(); - ERR("server returned: %d %s\n", status_code, debugstr_w(status_text)); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + status_text = HeapAlloc(GetProcessHeap(), 0, size); + ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); + } + + ERR("server returned: %d %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>"); + if(status_text != buf) HeapFree(GetProcessHeap(), 0, status_text); + if (status_code == HTTP_STATUS_DENIED) return ERROR_ACCESS_DENIED; return RPC_S_SERVER_UNAVAILABLE;

1 0

Andrew Talbot : winedos: Initializations fix.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 46c8ab351af1b1897bdd6ecb96334a7bb496d7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c8ab351af1b1897bdd6ecb9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Mar 25 20:49:52 2009 +0000 winedos: Initializations fix. --- dlls/winedos/int21.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 0c7967f..cbce913 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2182,6 +2182,7 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, else { TRACE( "SET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -2207,8 +2208,8 @@ static BOOL INT21_FileAttributes( CONTEXT86 *context, INT_BARF( context, 0x21 ); else { - TRACE( "GET FILE CREATION DATE AND TIME, handle %d\n", - BX_reg(context) ); + TRACE( "GET FILE CREATION DATE AND TIME, file %s\n", fileA ); + MultiByteToWideChar(CP_OEMCP, 0, fileA, -1, fileW, MAX_PATH); handle = CreateFileW( fileW, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,

1 0

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_GetFilterGraph.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 8469689a71a02c21942f7caefe686de3d7505226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8469689a71a02c21942f7caef… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 25 22:55:03 2009 +0100 amstream: Implement IAMMultiMediaStreamImpl_GetFilterGraph. --- dlls/amstream/amstream.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 9e4d45a..6c544f6 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -238,9 +238,17 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilterGraph(IAMMultiMediaStream { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p) stub!\n", This, iface, ppGraphBuilder); + TRACE("(%p/%p)->(%p)\n", This, iface, ppGraphBuilder); - return E_NOTIMPL; + if (!ppGraphBuilder) + return E_POINTER; + + if (This->pFilterGraph) + return IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)ppGraphBuilder); + else + *ppGraphBuilder = NULL; + + return S_OK; } static HRESULT WINAPI IAMMultiMediaStreamImpl_GetFilter(IAMMultiMediaStream* iface, IMediaStreamFilter** ppFilter)

1 0

Michael Stefaniuc : msi: Remove redundant NULL check before msi_free ( Smatch).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 6fa69c3f2b667d860cb5654164417a20c8008143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fa69c3f2b667d860cb565416… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 23:02:37 2009 +0100 msi: Remove redundant NULL check before msi_free (Smatch). --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ec8495f..82de944 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -260,7 +260,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!check) { - if (file) msi_free(file); + msi_free(file); return NULL; }

1 0

Michael Stefaniuc : d3dxof: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 289dca2e0e5f132cb15917fa191a140487e15fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289dca2e0e5f132cb15917fa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 23:02:42 2009 +0100 d3dxof: Remove redundant NULL check before HeapFree (Smatch). --- dlls/d3dxof/d3dxof.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6f9b266..5d42d53 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1100,9 +1100,8 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: HeapFree(GetProcessHeap(), 0, This->buf.pxo_tab); + HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); HeapFree(GetProcessHeap(), 0, pstrings); - if (This->buf.pxo->pdata) - HeapFree(GetProcessHeap(), 0, This->buf.pxo->pdata); return hr; }

1 0