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

Marcus Meissner : user32: Remove useless NULL checks (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: f3aab0c0e92ddaf4f66ead936836bec5edd4b2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3aab0c0e92ddaf4f66ead936… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:21:56 2011 +0100 user32: Remove useless NULL checks (Coverity). --- dlls/user32/dde_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 0d62c49..a5b7430 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -72,7 +72,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL || pInstance->links == NULL) + if (pInstance == NULL) return FALSE; atom = WDML_MakeAtomFromHsz(hszItem);

1 0

Marcus Meissner : comdlg32: Removed useless NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 0bd55f9df1192220be564f259f87f913857ae948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd55f9df1192220be564f259… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:26:04 2011 +0100 comdlg32: Removed useless NULL check (Coverity). --- dlls/comdlg32/filedlg.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2fb0969..c65c1f7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3219,10 +3219,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) ILD_TRANSPARENT ); /* Draw the associated text */ - if(sfi.szDisplayName) - TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); - - + TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName)); return NOERROR; }

1 0

Marcus Meissner : comctl32: Removed array NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 2cd225b793d510fd67fc2864a342772743e30bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd225b793d510fd67fc2864a… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:37:02 2011 +0100 comctl32: Removed array NULL check (Coverity). --- dlls/comctl32/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index a2e58e0..2b29790 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2051,7 +2051,7 @@ TOOLTIPS_OnWMGetText (const TOOLTIPS_INFO *infoPtr, WPARAM size, LPWSTR pszText) { LRESULT res; - if(!infoPtr->szTipText || !size) + if(!size) return 0; res = min(strlenW(infoPtr->szTipText)+1, size);

1 0

Michael Stefaniuc : rpcrt4/tests: COM cleanup in cstub.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 64d18bc1f0fce5f9baa97cba96a828f221a88c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d18bc1f0fce5f9baa97cba9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 15 11:35:17 2011 +0100 rpcrt4/tests: COM cleanup in cstub.c. --- dlls/rpcrt4/tests/cstub.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 7517a6d..7882e20 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -691,10 +691,15 @@ static IUnknownVtbl create_stub_test_fail_vtbl = struct dummy_unknown { - const IUnknownVtbl *vtbl; + IUnknown IUnknown_iface; LONG ref; }; +static inline struct dummy_unknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct dummy_unknown, IUnknown_iface); +} + static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **ppv) { *ppv = NULL; @@ -703,13 +708,13 @@ static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **pp static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedIncrement( &this->ref ); } static ULONG WINAPI dummy_Release(LPUNKNOWN iface) { - struct dummy_unknown *this = (struct dummy_unknown *)iface; + struct dummy_unknown *this = impl_from_IUnknown(iface); return InterlockedDecrement( &this->ref ); } @@ -719,7 +724,7 @@ static IUnknownVtbl dummy_unknown_vtbl = dummy_AddRef, dummy_Release }; -static struct dummy_unknown dummy_unknown = { &dummy_unknown_vtbl, 0 }; +static struct dummy_unknown dummy_unknown = { { &dummy_unknown_vtbl }, 0 }; static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *expected_vtbl ) { @@ -737,7 +742,8 @@ static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *e ok( count == 0, "wrong refcount %u\n", count ); dummy_unknown.ref = 4; - r = IPSFactoryBuffer_CreateProxy(ppsf, (IUnknown *)&dummy_unknown, iid, &proxy, (void **)&iface); + r = IPSFactoryBuffer_CreateProxy(ppsf, &dummy_unknown.IUnknown_iface, iid, &proxy, + (void **)&iface); ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); ok( dummy_unknown.ref == 5, "wrong refcount %u\n", dummy_unknown.ref ); ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl );

1 0

Henri Verbeet : wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4a10bbc76d5e6b6654717d590dde7354eff5d396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a10bbc76d5e6b6654717d590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:59 2011 +0100 wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion(). --- dlls/d3d8/cubetexture.c | 22 ++++++++++++++++++---- dlls/d3d8/texture.c | 23 ++++++++++++++++++----- dlls/d3d8/volumetexture.c | 10 ++++++---- dlls/d3d9/cubetexture.c | 25 ++++++++++++++++++++----- dlls/d3d9/texture.c | 23 +++++++++++++++++++---- dlls/d3d9/volumetexture.c | 12 ++++++------ dlls/wined3d/cubetexture.c | 15 ++++++--------- dlls/wined3d/surface.c | 29 ++++++++++++++++++++++------- dlls/wined3d/texture.c | 12 ++++++------ dlls/wined3d/volumetexture.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 14 ++++---------- 12 files changed, 132 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a10bbc76d5e6b6654717…

1 0

Henri Verbeet : d3d9: Use IDirect3DVolume9_AddRef to increment the volume' s refcount.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e51f6b644d9d6ba9424d4b3e99e62aa582508226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51f6b644d9d6ba9424d4b3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:03:00 2011 +0100 d3d9: Use IDirect3DVolume9_AddRef to increment the volume's refcount. --- dlls/d3d9/volumetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index a423ff3..313e5cd 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -333,7 +333,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(IDirect3DVolume } *volume = wined3d_resource_get_parent(sub_resource); - IDirect3DVolumeTexture9_AddRef(*volume); + IDirect3DVolume9_AddRef(*volume); wined3d_mutex_unlock(); return D3D_OK;

1 0

Łukasz Wojniłowicz : inetcpl.cpl: Update Polish translation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 1d9354f6673c7222a0bfcc0cc2f70489a0cf62c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9354f6673c7222a0bfcc0cc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Mar 14 19:25:05 2011 +0100 inetcpl.cpl: Update Polish translation. --- dlls/inetcpl.cpl/cpl_Pl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc index cf33137..78fd221 100644 --- a/dlls/inetcpl.cpl/cpl_Pl.rc +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -37,11 +37,11 @@ BEGIN PUSHBUTTON "U�yj &bie��cej", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "U�yj d&omy�lnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "U�yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Historia przegl�dania ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Mo�esz usun�� przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "&Usu� pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "Usta&wienia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Michael Stefaniuc : d3d8: COM cleanup in shader.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: bc6786d0e540d162ad1cc5eb6b4d1ab8b65569f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6786d0e540d162ad1cc5eb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 23:29:09 2011 +0100 d3d8: COM cleanup in shader.c. --- dlls/d3d8/d3d8_private.h | 6 +++--- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/shader.c | 22 ++++++++++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 59b851a..b577ea5 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -484,8 +484,8 @@ DECLARE_INTERFACE_(IDirect3DPixelShader8,IUnknown) */ struct IDirect3DVertexShader8Impl { - const IDirect3DVertexShader8Vtbl *lpVtbl; - LONG ref; + IDirect3DVertexShader8 IDirect3DVertexShader8_iface; + LONG ref; IDirect3DVertexDeclaration8 *vertex_declaration; IWineD3DVertexShader *wineD3DVertexShader; @@ -500,7 +500,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DPixelShader8Impl { - const IDirect3DPixelShader8Vtbl *lpVtbl; + IDirect3DPixelShader8 IDirect3DPixelShader8_iface; LONG ref; DWORD handle; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9383173..bfc3f74 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2146,7 +2146,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(IDirect3DDevice8 wined3d_mutex_unlock(); - if (IUnknown_Release((IUnknown *)shader)) + if (IDirect3DVertexShader8_Release(&shader->IDirect3DVertexShader8_iface)) { ERR("Shader %p has references left, this shouldn't happen.\n", shader); } @@ -2471,7 +2471,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *i wined3d_mutex_unlock(); - if (IUnknown_Release((IUnknown *)shader)) + if (IDirect3DPixelShader8_Release(&shader->IDirect3DPixelShader8_iface)) { ERR("Shader %p has references left, this shouldn't happen.\n", shader); } diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index a59f10b..c0a9a35 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static inline IDirect3DVertexShader8Impl *impl_from_IDirect3DVertexShader8(IDirect3DVertexShader8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexShader8Impl, IDirect3DVertexShader8_iface); +} + static HRESULT WINAPI d3d8_vertexshader_QueryInterface(IDirect3DVertexShader8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -42,7 +47,7 @@ static HRESULT WINAPI d3d8_vertexshader_QueryInterface(IDirect3DVertexShader8 *i static ULONG WINAPI d3d8_vertexshader_AddRef(IDirect3DVertexShader8 *iface) { - IDirect3DVertexShader8Impl *shader = (IDirect3DVertexShader8Impl *)iface; + IDirect3DVertexShader8Impl *shader = impl_from_IDirect3DVertexShader8(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -66,7 +71,7 @@ static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *p static ULONG WINAPI d3d8_vertexshader_Release(IDirect3DVertexShader8 *iface) { - IDirect3DVertexShader8Impl *shader = (IDirect3DVertexShader8Impl *)iface; + IDirect3DVertexShader8Impl *shader = impl_from_IDirect3DVertexShader8(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -157,7 +162,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im } shader->ref = 1; - shader->lpVtbl = &d3d8_vertexshader_vtbl; + shader->IDirect3DVertexShader8_iface.lpVtbl = &d3d8_vertexshader_vtbl; hr = d3d8_vertexshader_create_vertexdeclaration(device, declaration, shader_handle, &shader->vertex_declaration); if (FAILED(hr)) @@ -187,6 +192,11 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im return D3D_OK; } +static inline IDirect3DPixelShader8Impl *impl_from_IDirect3DPixelShader8(IDirect3DPixelShader8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DPixelShader8Impl, IDirect3DPixelShader8_iface); +} + static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -207,7 +217,7 @@ static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *ifa static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) { - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)iface; + IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -224,7 +234,7 @@ static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) static ULONG WINAPI d3d8_pixelshader_Release(IDirect3DPixelShader8 *iface) { - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)iface; + IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -263,7 +273,7 @@ HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl HRESULT hr; shader->ref = 1; - shader->lpVtbl = &d3d8_pixelshader_vtbl; + shader->IDirect3DPixelShader8_iface.lpVtbl = &d3d8_pixelshader_vtbl; shader->handle = shader_handle; wined3d_mutex_lock();

1 0

Jacek Caban : wininet: Release gzip_buffer when opening new connection.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: ec9660488106e89b6674d13ff3227ca1915dcec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9660488106e89b6674d13ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 00:08:34 2011 +0100 wininet: Release gzip_buffer when opening new connection. --- dlls/wininet/http.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5ae3e4d..b027af9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -258,7 +258,7 @@ static void init_gzip_stream(http_request_t *req) gzip_stream_t *gzip_stream; int index, zres; - gzip_stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(gzip_stream_t)); + gzip_stream = heap_alloc_zero(sizeof(gzip_stream_t)); gzip_stream->zstream.zalloc = wininet_zalloc; gzip_stream->zstream.zfree = wininet_zfree; @@ -276,6 +276,14 @@ static void init_gzip_stream(http_request_t *req) HTTP_DeleteCustomHeader(req, index); } +static void release_gzip_stream(http_request_t *req) +{ + if(!req->gzip_stream->end_of_data) + inflateEnd(&req->gzip_stream->zstream); + heap_free(req->gzip_stream); + req->gzip_stream = NULL; +} + #else static void init_gzip_stream(http_request_t *req) @@ -283,6 +291,10 @@ static void init_gzip_stream(http_request_t *req) ERR("gzip stream not supported, missing zlib.\n"); } +static void release_gzip_stream(http_request_t *req) +{ +} + #endif /* set the request content length based on the headers */ @@ -1605,13 +1617,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, request->custHeaders[i].lpszValue); } -#ifdef HAVE_ZLIB - if(request->gzip_stream) { - if(!request->gzip_stream->end_of_data) - inflateEnd(&request->gzip_stream->zstream); - HeapFree(GetProcessHeap(), 0, request->gzip_stream); - } -#endif + if(request->gzip_stream) + release_gzip_stream(request); HeapFree(GetProcessHeap(), 0, request->custHeaders); } @@ -4997,6 +5004,8 @@ static DWORD HTTP_OpenConnection(http_request_t *request) lend: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; + if(request->gzip_stream) + release_gzip_stream(request); TRACE("%d <--\n", res); return res;

1 0

Jacek Caban : wininet: Update remaining HttpOpenRequest to use the new hello.html location.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 71265980ff9e17536cb8826e2098d92d4a9c4531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71265980ff9e17536cb8826e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 00:35:14 2011 +0100 wininet: Update remaining HttpOpenRequest to use the new hello.html location. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 980a809..477ae56 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1203,7 +1203,7 @@ static void test_http_cache(void) CloseHandle(file); /* Send the same request, requiring it to be retrieved from the cache */ - request = HttpOpenRequest(connect, "GET", "/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + request = HttpOpenRequest(connect, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n");

1 0