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

Alexandre Julliard : configure: Fixed default dependencies to work properly in test dirs too.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: a4b6ee366c4e06c7a144995650276a71ca2a5bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b6ee366c4e06c7a14499565… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 13:20:12 2007 +0100 configure: Fixed default dependencies to work properly in test dirs too. --- configure | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4f911a8..c80aa80 100755 --- a/configure +++ b/configure @@ -20180,7 +20180,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 01b0224..3872bab 100644 --- a/configure.ac +++ b/configure.ac @@ -1474,7 +1474,7 @@ AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2 Makefile: dummy\\ -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ \\ -\$(ALL_OBJS): \$(IDL_GEN_HEADERS)\\ +\$(OBJS): \$(IDL_GEN_HEADERS)\\ \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], @@ -1485,7 +1485,7 @@ Makefile: dummy\\ Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]))

1 0

H. Verbeet : d3d8: Save the d3d8 vertex declaration.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 138826b8ccba20918f11139ed7863ddd1df309a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138826b8ccba20918f11139ed… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 8 01:15:46 2007 +0100 d3d8: Save the d3d8 vertex declaration. --- dlls/d3d8/d3d8_private.h | 5 ++++- dlls/d3d8/device.c | 14 +++++++++++++- dlls/d3d8/vertexdeclaration.c | 5 ++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index af67706..6ec3f18 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -515,6 +515,9 @@ typedef struct { const IDirect3DVertexDeclaration8Vtbl *lpVtbl; LONG ref_count; + DWORD *elements; + DWORD elements_size; /* Size of elements, in bytes */ + IWineD3DVertexDeclaration *wined3d_vertex_declaration; } IDirect3DVertexDeclaration8Impl; @@ -619,7 +622,7 @@ typedef struct IDirect3DPixelShader8Impl { * to see how not defined it here */ void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXELEMENT **wined3d_elements); +size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); /* Callbacks */ extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 95a1331..22ba77c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1214,13 +1214,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevi object->ref_count = 1; object->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; - wined3d_element_count = convert_to_wined3d_declaration(declaration, &wined3d_elements); + wined3d_element_count = convert_to_wined3d_declaration(declaration, &object->elements_size, &wined3d_elements); + object->elements = HeapAlloc(GetProcessHeap(), 0, object->elements_size); + if (!object->elements) { + ERR("Memory allocation failed\n"); + HeapFree(GetProcessHeap(), 0, wined3d_elements); + HeapFree(GetProcessHeap(), 0, object); + *decl_ptr = NULL; + return D3DERR_OUTOFVIDEOMEMORY; + } + + CopyMemory(object->elements, declaration, object->elements_size); + hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wined3d_vertex_declaration, (IUnknown *)object, wined3d_elements, wined3d_element_count); HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { ERR("(%p) : IWineD3DDevice_CreateVertexDeclaration call failed\n", This); + HeapFree(GetProcessHeap(), 0, object->elements); HeapFree(GetProcessHeap(), 0, object); } else { *decl_ptr = (IDirect3DVertexDeclaration8 *)object; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index afe9ff1..f2e5d57 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -62,6 +62,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDecla if (!ref_count) { IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration); + HeapFree(GetProcessHeap(), 0, This->elements); HeapFree(GetProcessHeap(), 0, This); } @@ -271,7 +272,7 @@ static const wined3d_usage_t wined3d_usage_lookup[] = { }; /* TODO: find out where rhw (or positionT) is for declaration8 */ -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXELEMENT **wined3d_elements) +size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) { const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element; @@ -326,6 +327,8 @@ size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXE element->Stream = 0xFF; element->Type = WINED3DDECLTYPE_UNUSED; + *d3d8_elements_size = (++token - d3d8_elements) * sizeof(DWORD); + return element_count; }

1 0

H. Verbeet : d3d8: Implement IDirect3DDevice8_GetVertexShaderDeclaration.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: b68c72faef7f416ca20d66f1369b1f5734d93a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68c72faef7f416ca20d66f13… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 8 01:15:57 2007 +0100 d3d8: Implement IDirect3DDevice8_GetVertexShaderDeclaration. --- dlls/d3d8/device.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 22ba77c..66d3a57 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1391,18 +1391,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEV return IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, (float *)pConstantData, ConstantCount); } -/* FIXME: There currently isn't a proper way to retrieve the declaration from - * the wined3d shader. However, rather than simply adding this, the relation - * between d3d8 and wined3d shaders should be fixed. A d3d8 vertex shader - * should contain both a wined3d vertex shader and a wined3d vertex - * declaration, and eg. SetVertexShader in d3d8 should set both of them in - * wined3d. This would also allow us to get rid of the vertexDeclaration field - * in IWineD3DVertexShaderImpl */ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3DDEVICE8 iface, DWORD pVertexShader, void* pData, DWORD* pSizeOfData) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + IDirect3DVertexDeclaration8Impl *declaration; IDirect3DVertexShader8Impl *shader = NULL; - TRACE("(%p) : pVertexShader %#x, pData %p, pSizeOfData %p\n", This, pVertexShader, pData, pSizeOfData); + TRACE("(%p) : pVertexShader 0x%08x, pData %p, *pSizeOfData %u\n", This, pVertexShader, pData, *pSizeOfData); if (pVertexShader <= VS_HIGHESTFIXEDFXF || This->allocated_shader_handles <= pVertexShader - (VS_HIGHESTFIXEDFXF + 1)) { ERR("Passed an invalid shader handle.\n"); @@ -1410,8 +1404,24 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D } shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)]; - FIXME("Unimplemented, returning D3DERR_INVALIDCALL\n"); - return D3DERR_INVALIDCALL; + declaration = (IDirect3DVertexDeclaration8Impl *)shader->vertex_declaration; + + /* If pData is NULL, we just return the required size of the buffer. */ + if (!pData) { + *pSizeOfData = declaration->elements_size; + return D3D_OK; + } + + /* MSDN claims that if *pSizeOfData is smaller than the required size + * we should write the required size and return D3DERR_MOREDATA. + * That's not actually true. */ + if (*pSizeOfData < declaration->elements_size) { + return D3DERR_INVALIDCALL; + } + + CopyMemory(pData, declaration->elements, declaration->elements_size); + + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD pVertexShader, void* pData, DWORD* pSizeOfData) {

1 0

H. Verbeet : wined3d: Fix IWineD3DPixelShader_GetFunction / IWineD3DVertexShader_GetFunction.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: fc5f36f037ec2f807cf748d3083432b0b600c14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc5f36f037ec2f807cf748d30… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 8 01:16:09 2007 +0100 wined3d: Fix IWineD3DPixelShader_GetFunction / IWineD3DVertexShader_GetFunction. --- dlls/wined3d/pixelshader.c | 6 ++++-- dlls/wined3d/vertexshader.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b49f6d1..dba2f34 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -127,8 +127,10 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_GetFunction(IWineD3DPixelShader* return WINED3D_OK; } if (*pSizeOfData < This->baseShader.functionLength) { - *pSizeOfData = This->baseShader.functionLength; - return WINED3DERR_MOREDATA; + /* MSDN claims (for d3d8 at least) that if *pSizeOfData is smaller + * than the required size we should write the required size and + * return D3DERR_MOREDATA. That's not actually true. */ + return WINED3DERR_INVALIDCALL; } if (NULL == This->baseShader.function) { /* no function defined */ TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f812306..5d3a506 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -521,8 +521,10 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_GetFunction(IWineD3DVertexShader* return WINED3D_OK; } if (*pSizeOfData < This->baseShader.functionLength) { - *pSizeOfData = This->baseShader.functionLength; - return WINED3DERR_MOREDATA; + /* MSDN claims (for d3d8 at least) that if *pSizeOfData is smaller + * than the required size we should write the required size and + * return D3DERR_MOREDATA. That's not actually true. */ + return WINED3DERR_INVALIDCALL; } if (NULL == This->baseShader.function) { /* no function defined */ TRACE("(%p) : GetFunction no User Function defined using NULL to %p\n", This, pData);

1 0

H. Verbeet : d3d8: Add tests for GetVertexShaderDeclaration, GetVertexShaderFunction and GetPixelShaderFunction.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 6bed8536beb92cee90f2add35db9bdbaaebc2242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bed8536beb92cee90f2add35… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 8 01:16:16 2007 +0100 d3d8: Add tests for GetVertexShaderDeclaration, GetVertexShaderFunction and GetPixelShaderFunction. --- dlls/d3d8/tests/device.c | 55 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c4f65d6..84b5f29 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -834,6 +834,8 @@ static void test_shader(void) DWORD hPixelShader = 0, hVertexShader = 0; DWORD hPixelShader2 = 0, hVertexShader2 = 0; DWORD hTempHandle; + DWORD data_size; + void *data; static DWORD dwVertexDecl[] = { @@ -841,6 +843,9 @@ static void test_shader(void) D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), D3DVSD_END() }; + const DWORD vertex_decl_size = sizeof(dwVertexDecl); + const DWORD simple_vs_size = sizeof(simple_vs); + const DWORD simple_ps_size = sizeof(simple_ps); pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); @@ -863,7 +868,7 @@ static void test_shader(void) if(!pDevice) goto cleanup; /* First create a vertex shader */ - hr = IDirect3DDevice8_CreateVertexShader(pDevice, dwVertexDecl, NULL, &hVertexShader, 0); + hr = IDirect3DDevice8_CreateVertexShader(pDevice, dwVertexDecl, simple_vs, &hVertexShader, 0); ok(hr == D3D_OK, "IDirect3DDevice8_CreateVertexShader returned %s\n", DXGetErrorString8(hr)); /* Msdn says that the new vertex shader is set immediately. This is wrong, apparently */ hr = IDirect3DDevice8_GetVertexShader(pDevice, &hTempHandle); @@ -875,6 +880,38 @@ static void test_shader(void) hr = IDirect3DDevice8_GetVertexShader(pDevice, &hTempHandle); ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShader returned %s\n", DXGetErrorString8(hr)); ok(hTempHandle == hVertexShader, "Vertex Shader %d is set, expected shader %d\n", hTempHandle, hVertexShader); + /* Verify that we can retrieve the declaration */ + hr = IDirect3DDevice8_GetVertexShaderDeclaration(pDevice, hVertexShader, NULL, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderDeclaration returned %s\n", DXGetErrorString8(hr)); + ok(data_size == vertex_decl_size, "Got data_size %u, expected %u\n", data_size, vertex_decl_size); + data = HeapAlloc(GetProcessHeap(), 0, vertex_decl_size); + data_size = 1; + hr = IDirect3DDevice8_GetVertexShaderDeclaration(pDevice, hVertexShader, data, &data_size); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_GetVertexShaderDeclaration returned %s (0x%#x), " + "expected D3DERR_INVALIDCALL\n", DXGetErrorString8(hr), hr); + ok(data_size == 1, "Got data_size %u, expected 1\n", data_size); + data_size = vertex_decl_size; + hr = IDirect3DDevice8_GetVertexShaderDeclaration(pDevice, hVertexShader, data, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderDeclaration returned %s\n", DXGetErrorString8(hr)); + ok(data_size == vertex_decl_size, "Got data_size %u, expected %u\n", data_size, vertex_decl_size); + ok(!memcmp(data, dwVertexDecl, vertex_decl_size), "data not equal to shader declaration\n"); + HeapFree(GetProcessHeap(), 0, data); + /* Verify that we can retrieve the shader function */ + hr = IDirect3DDevice8_GetVertexShaderFunction(pDevice, hVertexShader, NULL, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderFucntion returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_vs_size, "Got data_size %u, expected %u\n", data_size, simple_vs_size); + data = HeapAlloc(GetProcessHeap(), 0, simple_vs_size); + data_size = 1; + hr = IDirect3DDevice8_GetVertexShaderFunction(pDevice, hVertexShader, data, &data_size); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_GetVertexShaderFunction returned %s (0x%#x), " + "expected D3DERR_INVALIDCALL\n", DXGetErrorString8(hr), hr); + ok(data_size == 1, "Got data_size %u, expected 1\n", data_size); + data_size = simple_vs_size; + hr = IDirect3DDevice8_GetVertexShaderFunction(pDevice, hVertexShader, data, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetVertexShaderFunction returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_vs_size, "Got data_size %u, expected %u\n", data_size, simple_vs_size); + ok(!memcmp(data, simple_vs, simple_vs_size), "data not equal to shader function\n"); + HeapFree(GetProcessHeap(), 0, data); /* Delete the assigned shader. This is supposed to work */ hr = IDirect3DDevice8_DeleteVertexShader(pDevice, hVertexShader); ok(hr == D3D_OK, "IDirect3DDevice8_DeleteVertexShader returned %s\n", DXGetErrorString8(hr)); @@ -896,6 +933,22 @@ static void test_shader(void) hr = IDirect3DDevice8_GetPixelShader(pDevice, &hTempHandle); ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShader returned %s\n", DXGetErrorString8(hr)); ok(hTempHandle == hPixelShader, "Pixel Shader %d is set, expected shader %d\n", hTempHandle, hPixelShader); + /* Verify that we can retrieve the shader function */ + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, NULL, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFucntion returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); + data = HeapAlloc(GetProcessHeap(), 0, simple_ps_size); + data_size = 1; + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_GetPixelShaderFunction returned %s (0x%#x), " + "expected D3DERR_INVALIDCALL\n", DXGetErrorString8(hr), hr); + ok(data_size == 1, "Got data_size %u, expected 1\n", data_size); + data_size = simple_ps_size; + hr = IDirect3DDevice8_GetPixelShaderFunction(pDevice, hPixelShader, data, &data_size); + ok(hr == D3D_OK, "IDirect3DDevice8_GetPixelShaderFunction returned %s\n", DXGetErrorString8(hr)); + ok(data_size == simple_ps_size, "Got data_size %u, expected %u\n", data_size, simple_ps_size); + ok(!memcmp(data, simple_ps, simple_ps_size), "data not equal to shader function\n"); + HeapFree(GetProcessHeap(), 0, data); /* Delete the assigned shader. This is supposed to work */ hr = IDirect3DDevice8_DeletePixelShader(pDevice, hPixelShader); ok(hr == D3D_OK, "IDirect3DDevice8_DeletePixelShader returned %s\n", DXGetErrorString8(hr));

1 0

Michael Stefaniuc : comctl32: Remove redundant NULL checks before Free() ( found by Smatch).
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 22ecd7aa6769c411ffdf4e784bd31b508d279d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ecd7aa6769c411ffdf4e784… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 7 21:55:31 2007 +0100 comctl32: Remove redundant NULL checks before Free() (found by Smatch). --- dlls/comctl32/comboex.c | 6 ++---- dlls/comctl32/comctl32undoc.c | 12 ++++-------- dlls/comctl32/header.c | 4 ++-- dlls/comctl32/propsheet.c | 4 ++-- dlls/comctl32/rebar.c | 6 ++---- dlls/comctl32/status.c | 21 +++++++++------------ dlls/comctl32/string.c | 12 ++++-------- dlls/comctl32/syslink.c | 13 +++++-------- dlls/comctl32/tab.c | 7 ++----- dlls/comctl32/toolbar.c | 3 +-- dlls/comctl32/updown.c | 2 +- 11 files changed, 34 insertions(+), 56 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 8febea6..58bcb97 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1580,10 +1580,8 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->hwndCombo) DestroyWindow (infoPtr->hwndCombo); - if (infoPtr->edit) { - Free (infoPtr->edit); - infoPtr->edit = 0; - } + Free (infoPtr->edit); + infoPtr->edit = 0; if (infoPtr->items) { CBE_ITEMDATA *item, *next; diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index d18390e..7ef2c33 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -954,10 +954,8 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) *lppDest = ptr; } else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } + Free (*lppDest); + *lppDest = NULL; } return TRUE; @@ -994,10 +992,8 @@ BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) *lppDest = ptr; } else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } + Free (*lppDest); + *lppDest = NULL; } return TRUE; diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 2915389..4907fdf 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -957,12 +957,12 @@ HEADER_PrepareCallbackItems(HWND hwnd, INT iItem, INT reqMask) static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) { - if (lpItem->callbackMask&HDI_TEXT && lpItem->pszText != NULL) + if (lpItem->callbackMask&HDI_TEXT) { Free(lpItem->pszText); lpItem->pszText = NULL; } - + if (lpItem->callbackMask&HDI_IMAGE) lpItem->iImage = I_IMAGECALLBACK; } diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e9e4aff..06ce339 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2404,7 +2404,7 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, { PROPSHEETPAGEW* psp = (PROPSHEETPAGEW*)psInfo->proppage[index].hpage; - if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[index].pszText) + if (psp->dwFlags & PSP_USETITLE) Free ((LPVOID)psInfo->proppage[index].pszText); DestroyPropertySheetPage(psInfo->proppage[index].hpage); @@ -2719,7 +2719,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) if(psp) { - if ((psp->dwFlags & PSP_USETITLE) && psInfo->proppage[i].pszText) + if (psp->dwFlags & PSP_USETITLE) Free ((LPVOID)psInfo->proppage[i].pszText); DestroyPropertySheetPage(psInfo->proppage[i].hpage); diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 3ea8fe9..2972ab2 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2750,10 +2750,8 @@ REBAR_Destroy (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) lpBand = &infoPtr->bands[i]; /* delete text strings */ - if (lpBand->lpText) { - Free (lpBand->lpText); - lpBand->lpText = NULL; - } + Free (lpBand->lpText); + lpBand->lpText = NULL; /* destroy child window */ DestroyWindow (lpBand->hwndChild); } diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 719e545..82c784d 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -662,7 +662,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) infoPtr->numParts = count; if (oldNumParts > infoPtr->numParts) { for (i = infoPtr->numParts ; i < oldNumParts; i++) { - if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW)) + if (!(infoPtr->parts[i].style & SBT_OWNERDRAW)) Free (infoPtr->parts[i].text); } } else if (oldNumParts < infoPtr->numParts) { @@ -671,8 +671,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) for (i = 0; i < oldNumParts; i++) { tmp[i] = infoPtr->parts[i]; } - if (infoPtr->parts) - Free (infoPtr->parts); + Free (infoPtr->parts); infoPtr->parts = tmp; } if (oldNumParts == infoPtr->numParts) { @@ -751,10 +750,9 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, oldStyle = part->style; part->style = style; if (style & SBT_OWNERDRAW) { - if (!(oldStyle & SBT_OWNERDRAW)) { - if (part->text) - Free (part->text); - } else if (part->text == text) + if (!(oldStyle & SBT_OWNERDRAW)) + Free (part->text); + else if (part->text == text) return TRUE; part->text = (LPWSTR)text; } else { @@ -783,7 +781,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, return TRUE; } - if (part->text && !(oldStyle & SBT_OWNERDRAW)) + if (!(oldStyle & SBT_OWNERDRAW)) Free (part->text); part->text = ntext; } @@ -870,10 +868,10 @@ STATUSBAR_WMDestroy (STATUS_INFO *infoPtr) TRACE("\n"); for (i = 0; i < infoPtr->numParts; i++) { - if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW)) + if (!(infoPtr->parts[i].style & SBT_OWNERDRAW)) Free (infoPtr->parts[i].text); } - if (infoPtr->part0.text && !(infoPtr->part0.style & SBT_OWNERDRAW)) + if (!(infoPtr->part0.style & SBT_OWNERDRAW)) Free (infoPtr->part0.text); Free (infoPtr->parts); @@ -1138,8 +1136,7 @@ STATUSBAR_WMSetText (STATUS_INFO *infoPtr, LPCSTR text) part = &infoPtr->parts[0]; /* duplicate string */ - if (part->text) - Free (part->text); + Free (part->text); part->text = 0; if (infoPtr->bUnicode) { if (text && (len = strlenW((LPCWSTR)text))) { diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index c362081..33effbd 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -215,10 +215,8 @@ BOOL WINAPI Str_SetPtrA (LPSTR *lppDest, LPCSTR lpSrc) *lppDest = ptr; } else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } + Free (*lppDest); + *lppDest = NULL; } return TRUE; @@ -274,10 +272,8 @@ BOOL WINAPI Str_SetPtrW (LPWSTR *lppDest, LPCWSTR lpSrc) *lppDest = ptr; } else { - if (*lppDest) { - Free (*lppDest); - *lppDest = NULL; - } + Free (*lppDest); + *lppDest = NULL; } return TRUE; diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index d631244..fcf253d 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -675,23 +675,20 @@ static VOID SYSLINK_Render (SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) PDOC_TEXTBLOCK bl, cbl; INT nFit; SIZE szDim; - + if(Current->nText == 0) { continue; } - + tx = Current->Text; n = Current->nText; - if (Current->Blocks != NULL) - { - Free(Current->Blocks); - Current->Blocks = NULL; - } + Free(Current->Blocks); + Current->Blocks = NULL; bl = NULL; nBlocks = 0; - + if(Current->Type == slText) { SelectObject(hdc, infoPtr->Font); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index cbb4cdd..711c320 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2768,11 +2768,8 @@ TAB_SetItemT (TAB_INFO *infoPtr, INT iItem, LPTCITEMW tabItem, BOOL bUnicode) if (tabItem->mask & TCIF_TEXT) { - if (wineItem->pszText) - { - Free(wineItem->pszText); - wineItem->pszText = NULL; - } + Free(wineItem->pszText); + wineItem->pszText = NULL; if (bUnicode) Str_SetPtrW(&wineItem->pszText, tabItem->pszText); else diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a60bf09..86d3ffc 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5385,8 +5385,7 @@ TOOLBAR_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) Free (infoPtr->bitmaps); /* bitmaps list */ /* delete button data */ - if (infoPtr->buttons) - Free (infoPtr->buttons); + Free (infoPtr->buttons); /* delete strings */ if (infoPtr->strings) { diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 7fbe3c9..c5801a1 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -831,7 +831,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L break; case WM_DESTROY: - if(infoPtr->AccelVect) Free (infoPtr->AccelVect); + Free (infoPtr->AccelVect); if(infoPtr->Buddy) RemovePropW(infoPtr->Buddy, BUDDY_UPDOWN_HWND);

1 0

Michael Stefaniuc : janitorial: Remove two redundant checks for NULL.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 719a02856df021cd48d7315d7047a8eafb3cd5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=719a02856df021cd48d7315d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 7 22:16:48 2007 +0100 janitorial: Remove two redundant checks for NULL. --- dlls/shell32/pidl.c | 3 +-- dlls/wined3d/device.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 97cf051..af77eec 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -913,8 +913,7 @@ void WINAPI ILGlobalFree( LPITEMIDLIST pidl) { TRACE("%p\n", pidl); - if (pidl) - Free(pidl); + Free(pidl); } /************************************************************************* diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb4c17b..0998eec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1507,7 +1507,7 @@ error: FIXME("(%p) Something's still holding the front buffer\n",This); } } - if(object) HeapFree(GetProcessHeap(), 0, object); + HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Peter Oberndorfer : winedbg: Do not write over const char * parameter.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: e879efcc7453416f746b2bec55e769a705deba0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e879efcc7453416f746b2bec5… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Mar 7 22:04:21 2007 +0100 winedbg: Do not write over const char * parameter. Also pass the right string to SymEnumSymbols and check for _ in symbol name, instead of beginning of string. --- programs/winedbg/symbol.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 90508f4..15e7093 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -239,23 +239,27 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, SymSetOptions((opt = SymGetOptions()) | 0x40000000); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); - if (!sgv.num && (name[0] != '_')) + if (!sgv.num) { - char* ptr = strchr(name, '!'); - - if (ptr++) - { - memmove(ptr + 1, ptr, strlen(ptr)); - *ptr = '_'; - } - else + const char* ptr = strchr(name, '!'); + if ((ptr && ptr[1] != '_') || (!ptr && *name != '_')) { - buffer[0] = '*'; - buffer[1] = '!'; - buffer[2] = '_'; - strcpy(&buffer[3], name); + if (ptr) + { + int offset = ptr - name; + memcpy(buffer, name, offset + 1); + buffer[offset + 1] = '_'; + strcpy(&buffer[offset + 2], ptr + 1); + } + else + { + buffer[0] = '*'; + buffer[1] = '!'; + buffer[2] = '_'; + strcpy(&buffer[3], name); + } + SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); } - SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); } SymSetOptions(opt);

1 0

Andrew Talbot : mpr: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: c3e8298a3d2be37de90fb727349603fd1ac50a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e8298a3d2be37de90fb7273… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 7 20:31:43 2007 +0000 mpr: Replace const pointer parameters with correct pointers to const. --- dlls/mpr/wnet.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 3f57caf..f20e318 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -447,7 +447,7 @@ static PWNetEnumerator _createContextEnumerator(DWORD dwScope, DWORD dwType, * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, +static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -466,7 +466,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEW lpNet = lpNetArrayIn + i; + const NETRESOURCEW *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEA); if (lpNet->lpLocalName) @@ -488,7 +488,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, for (i = 0; i < numToThunk; i++) { LPNETRESOURCEA lpNetOut = (LPNETRESOURCEA)lpBuffer + i; - LPNETRESOURCEW lpNetIn = lpNetArrayIn + i; + const NETRESOURCEW *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEA)); /* lie about string lengths, we already verified how many @@ -532,7 +532,7 @@ static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, +static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -551,7 +551,7 @@ static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEA lpNet = lpNetArrayIn + i; + const NETRESOURCEA *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEW); if (lpNet->lpLocalName) @@ -573,7 +573,7 @@ static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, for (i = 0; i < numToThunk; i++) { LPNETRESOURCEW lpNetOut = (LPNETRESOURCEW)lpBuffer + i; - LPNETRESOURCEA lpNetIn = lpNetArrayIn + i; + const NETRESOURCEA *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEW)); /* lie about string lengths, we already verified how many

1 0

Andrew Talbot : winmm: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: bb9dea6b291a7e2e2ccd648c7d2259f017b3ab8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9dea6b291a7e2e2ccd648c7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 7 20:31:57 2007 +0000 winmm: Replace const pointer parameters with correct pointers to const. --- dlls/winmm/mmsystem.c | 4 ++-- include/wine/mmsystem16.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 83f63d4..b86c0c5 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -1241,7 +1241,7 @@ UINT16 WINAPI waveOutGetErrorText16(UINT16 uError, LPSTR lpText, UINT16 uSize) * waveOutOpen [MMSYSTEM.404] */ UINT16 WINAPI waveOutOpen16(HWAVEOUT16* lphWaveOut, UINT16 uDeviceID, - const LPWAVEFORMATEX lpFormat, DWORD dwCallback, + const WAVEFORMATEX *lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) { HANDLE hWaveOut; @@ -1532,7 +1532,7 @@ UINT16 WINAPI waveInGetDevCaps16(UINT16 uDeviceID, LPWAVEINCAPS16 lpCaps, * waveInOpen [MMSYSTEM.504] */ UINT16 WINAPI waveInOpen16(HWAVEIN16* lphWaveIn, UINT16 uDeviceID, - const LPWAVEFORMATEX lpFormat, DWORD dwCallback, + const WAVEFORMATEX *lpFormat, DWORD dwCallback, DWORD dwInstance, DWORD dwFlags) { HANDLE hWaveIn; diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index 2191fb0..ea997b3 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -116,7 +116,7 @@ UINT16 WINAPI waveOutGetDevCaps16(UINT16,LPWAVEOUTCAPS16,UINT16); UINT16 WINAPI waveOutGetVolume16(UINT16,DWORD*); UINT16 WINAPI waveOutSetVolume16(UINT16,DWORD); UINT16 WINAPI waveOutGetErrorText16(UINT16,LPSTR,UINT16); -UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const LPWAVEFORMATEX,DWORD,DWORD,DWORD); +UINT16 WINAPI waveOutOpen16(HWAVEOUT16*,UINT16,const WAVEFORMATEX *,DWORD,DWORD,DWORD); UINT16 WINAPI waveOutClose16(HWAVEOUT16); UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16,SEGPTR,UINT16); UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16,SEGPTR,UINT16); @@ -135,7 +135,7 @@ DWORD WINAPI waveOutMessage16(HWAVEOUT16,UINT16,DWORD,DWORD); UINT16 WINAPI waveInGetNumDevs16(void); UINT16 WINAPI waveInGetDevCaps16(UINT16,LPWAVEINCAPS16,UINT16); UINT16 WINAPI waveInGetErrorText16(UINT16,LPSTR,UINT16); -UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const LPWAVEFORMATEX,DWORD,DWORD,DWORD); +UINT16 WINAPI waveInOpen16(HWAVEIN16*,UINT16,const WAVEFORMATEX *,DWORD,DWORD,DWORD); UINT16 WINAPI waveInClose16(HWAVEIN16); UINT16 WINAPI waveInPrepareHeader16(HWAVEIN16,SEGPTR,UINT16); UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16,SEGPTR,UINT16);

1 0