September 2010 - Wine-Commits

Hans Leidekker : msi: Always check the return value of msi_string2idW.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 2b2fa04ca4b89c221419ecd1c7a310f77ca93cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2fa04ca4b89c221419ecd1c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 29 09:58:02 2010 +0200 msi: Always check the return value of msi_string2idW. --- dlls/msi/join.c | 6 ++++-- dlls/msi/storages.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index f787c30..5e11577 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -225,10 +225,12 @@ static UINT JOIN_get_column_info( struct tagMSIVIEW *view, static UINT join_find_row( MSIJOINVIEW *jv, MSIRECORD *rec, UINT *row ) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString( rec, 1 ); - msi_string2idW( jv->db->strings, str, &id ); + r = msi_string2idW( jv->db->strings, str, &id ); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < jv->rows; i++) { diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 3e88874..56f252f 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -334,10 +334,12 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n, static UINT storages_find_row(MSISTORAGESVIEW *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); - msi_string2idW(sv->db->strings, str, &id); + r = msi_string2idW(sv->db->strings, str, &id); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < sv->num_rows; i++) {

1 0

Michael Stefaniuc : ole32: Allocate a small temp variable on the stack instead of the heap.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 620ca68d01b3952480172efb94b1612403967ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620ca68d01b3952480172efb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:43:50 2010 +0200 ole32: Allocate a small temp variable on the stack instead of the heap. --- dlls/ole32/ole2.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2b301e4..0829ca1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2530,19 +2530,17 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres2)) { DWORD dwConnection; - FORMATETC *pfe; if (renderopt == OLERENDER_DRAW && !pFormatEtc) { - pfe = HeapAlloc(GetProcessHeap(), 0, sizeof(FORMATETC)); - pfe->cfFormat = 0; - pfe->ptd = NULL; - pfe->dwAspect = DVASPECT_CONTENT; - pfe->lindex = -1; - pfe->tymed = TYMED_NULL; - }else - pfe = pFormatEtc; - hres = IOleCache_Cache(pOleCache, pfe, ADVF_PRIMEFIRST, &dwConnection); - if (!pFormatEtc && pfe) - HeapFree(GetProcessHeap(), 0, pfe); + FORMATETC pfe; + pfe.cfFormat = 0; + pfe.ptd = NULL; + pfe.dwAspect = DVASPECT_CONTENT; + pfe.lindex = -1; + pfe.tymed = TYMED_NULL; + hres = IOleCache_Cache(pOleCache, &pfe, ADVF_PRIMEFIRST, &dwConnection); + } + else + hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); IOleCache_Release(pOleCache); } }

1 0

Michael Stefaniuc : ddraw: Add missing unlock on an error path (Smatch).
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: ef104dc4653af81188edb32371b4eb5b902e2789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104dc4653af81188edb3237… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:14 2010 +0200 ddraw: Add missing unlock on an error path (Smatch). --- dlls/ddraw/ddraw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f3ebade..346c7c5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2947,6 +2947,7 @@ static HRESULT CreateSurface(IDirectDraw7 *iface, if((DDSD->ddsCaps.dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) == (DDSCAPS_BACKBUFFER | DDSCAPS_PRIMARYSURFACE)) { WARN("Application wanted to create back buffer primary surface\n"); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDCAPS; }

1 0

Michael Stefaniuc : user32: Simplify the error handling in BITMAP_Load().
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 5a2cc9410586b32aacdb9a878686b68d96e941ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2cc9410586b32aacdb9a878… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:45:21 2010 +0200 user32: Simplify the error handling in BITMAP_Load(). This fixes a memleak on an error path (Smatch). --- dlls/user32/cursoricon.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 29b9bd2..42bba6d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2291,7 +2291,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); - goto end_close; + goto end; } if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } @@ -2312,7 +2312,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bm_type == -1) { WARN("Invalid bitmap format!\n"); - goto end_close; + goto end; } if(desiredx != 0) @@ -2371,7 +2371,6 @@ end: if (screen_mem_dc) DeleteDC(screen_mem_dc); HeapFree(GetProcessHeap(), 0, scaled_info); HeapFree(GetProcessHeap(), 0, fix_info); -end_close: if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr ); return hbitmap;

1 0

Francois Gouget : ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs( ) static.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: d33ff209b3dd84150a28636b6341e32c835a0d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ff209b3dd84150a28636b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:39 2010 +0200 ws2_32: Make WS2_AcceptEx() and WS2_GetAcceptExSockaddrs() static. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b01b623..f605d0d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1846,7 +1846,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, /*********************************************************************** * AcceptEx */ -BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, +static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, LPOVERLAPPED overlapped) { @@ -1945,7 +1945,7 @@ BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD des /*********************************************************************** * GetAcceptExSockaddrs */ -void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, +static void WINAPI WS2_GetAcceptExSockaddrs(PVOID buffer, DWORD data_size, DWORD local_size, DWORD remote_size, struct WS_sockaddr **local_addr, LPINT local_addr_len, struct WS_sockaddr **remote_addr, LPINT remote_addr_len) {

1 0

Francois Gouget : ktmw32: The ktm debug channel is unused so remove it.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: c71e5e67058fb6732fd9501b0375d565ac40295f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71e5e67058fb6732fd9501b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:24 2010 +0200 ktmw32: The ktm debug channel is unused so remove it. --- dlls/ktmw32/ktmw32_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 960def2..738b11d 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -23,9 +23,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(ktm); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

Francois Gouget : gameux/tests: Make test_install_uninstall_game() and _isFileExists() static.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 0c7c1de8d77c8db6f5f6fb2da207b9954e9bb127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7c1de8d77c8db6f5f6fb2da… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:49 2010 +0200 gameux/tests: Make test_install_uninstall_game() and _isFileExists() static. --- dlls/gameux/tests/gameexplorer.c | 3 ++- dlls/gameux/tests/gamestatistics.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 9ce0e39..ba22256 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -607,7 +607,8 @@ static void test_add_remove_game(void) IGameExplorer_Release(ge); } } -void test_install_uninstall_game(void) + +static void test_install_uninstall_game(void) { static const GUID applicationId = { 0x17A6558E, 0x60BE, 0x4078, { 0xB6, 0x6F, 0x9C, 0x3A, 0xDA, 0x2A, 0x32, 0xE6 }}; diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 29bfcf3..eac4398 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -168,7 +168,7 @@ static HRESULT _buildStatisticsFilePath(LPCGUID guidApplicationId, LPWSTR *lpSta * TRUE file exists * FALSE file does not exist */ -BOOL _isFileExists(LPCWSTR lpFile) +static BOOL _isFileExists(LPCWSTR lpFile) { HANDLE hFile = CreateFileW(lpFile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);

1 0

Thomas Mullaly : urlmon: Improve IUri support for mk: URIs.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: da1ceb1154eb88ceff1868ec44a4e05e7f3f3d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1ceb1154eb88ceff1868ec4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Sep 27 18:00:21 2010 -0400 urlmon: Improve IUri support for mk: URIs. --- dlls/urlmon/tests/uri.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 ++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3e6f5a8..0453441 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4209,6 +4209,62 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_ABOUT,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + { "mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"@MSITStore:C:\\Program%20Files/AutoCAD%202008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:C:\\Program Files/AutoCAD 2008\\Help/acad_acg.chm::/WSfacf1429558a55de1a7524c1004e616f8b-322b.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + { "mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",0,S_OK,FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY| + Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + FALSE, + { + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"mk:@MSITStore:Z:\\home\\test\\chm\\silqhelp.chm::/thesilqquickstartguide.htm",S_OK,FALSE}, + {"mk",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_MK,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index ef66186..2aee38a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3081,6 +3081,11 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla if(!computeOnly) uri->canon_uri[uri->canon_len] = *ptr; ++uri->canon_len; + } else if(data->scheme_type == URL_SCHEME_MK && *ptr == '\\') { + /* MK URIs don't get '\\' percent encoded. */ + if(!computeOnly) + uri->canon_uri[uri->canon_len] = *ptr; + ++uri->canon_len; } else { if(!computeOnly) pct_encode_val(*ptr, uri->canon_uri+uri->canon_len);

1 0

Michael Stefaniuc : crypt32: Remove redundant NULL check before CryptMemFree (Smatch).
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: ef247562914f4d04debf776e0a360949710737ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef247562914f4d04debf776e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 28 22:44:02 2010 +0200 crypt32: Remove redundant NULL check before CryptMemFree (Smatch). --- dlls/crypt32/message.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index b57c407..51b874e 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -523,10 +523,9 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, } else ret = FALSE; - if (crlBlob) - CryptMemFree(crlBlob); - if (certBlob) - CryptMemFree(certBlob); + + CryptMemFree(crlBlob); + CryptMemFree(certBlob); if (freeProv) CryptReleaseContext(hCryptProv, 0); return ret;

1 0

Francois Gouget : taskkill: The taskkill debug channel is unused so remove it.
by Alexandre Julliard Sept. 29, 2010

Sept. 29, 2010

Module: wine Branch: master Commit: 3cbf7097a9d3f899f6bb18883506f8f110cf70fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbf7097a9d3f899f6bb18883… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 28 20:12:18 2010 +0200 taskkill: The taskkill debug channel is unused so remove it. --- programs/taskkill/taskkill.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index c3080e5..5508bfe 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -21,12 +21,10 @@ #include <windows.h> #include <psapi.h> -#include <wine/debug.h> #include <wine/unicode.h> #include "taskkill.h" -WINE_DEFAULT_DEBUG_CHANNEL(taskkill); int force_termination;

1 0