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

Mikhail Maroukhine : objbase.h: CLSIDFromString: Add constness to the parameters declaration in accordance with MSDN.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: f930c87fd6d4bc968a8c0098f6508d28208012a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f930c87fd6d4bc968a8c0098f… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 23:59:50 2010 +0600 objbase.h: CLSIDFromString: Add constness to the parameters declaration in accordance with MSDN. --- dlls/atl/atl_ax.c | 2 +- dlls/msi/action.c | 4 ++-- dlls/msi/registry.c | 2 +- dlls/msi/tests/msi.c | 2 +- dlls/msi/tests/package.c | 2 +- dlls/msi/tests/source.c | 2 +- dlls/ole32/compobj.c | 4 ++-- dlls/shell32/shellole.c | 2 +- dlls/shlwapi/ordinal.c | 4 ++-- dlls/urlmon/tests/url.c | 2 +- include/objbase.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 2afc746..616713c 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -950,7 +950,7 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( (LPOLESTR) lpszName, &controlId ); + hRes = CLSIDFromString( lpszName, &controlId ); if ( FAILED(hRes) ) hRes = CLSIDFromProgID( lpszName, &controlId ); if ( SUCCEEDED( hRes ) ) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cf403e1..75bbc09 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3098,7 +3098,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) { LPCWSTR guid; guid = MSI_RecordGetString(row,1); - CLSIDFromString((LPWSTR)guid, &tl_struct.clsid); + CLSIDFromString((LPCWSTR)guid, &tl_struct.clsid); tl_struct.source = strdupW( file->TargetPath ); tl_struct.path = NULL; @@ -3199,7 +3199,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) ui_actiondata( package, szUnregisterTypeLibraries, row ); guid = MSI_RecordGetString( row, 1 ); - CLSIDFromString( (LPWSTR)guid, &libid ); + CLSIDFromString( (LPCWSTR)guid, &libid ); version = MSI_RecordGetInteger( row, 4 ); language = MSI_RecordGetInteger( row, 2 ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 903e841..3e03ecf 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -286,7 +286,7 @@ BOOL squash_guid(LPCWSTR in, LPWSTR out) out[0] = 0; - if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) + if (FAILED(CLSIDFromString((LPCOLESTR)in, &guid))) return FALSE; for(i=0; i<8; i++) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 428f4f5..4bc59ac 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -467,7 +467,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) DWORD i,n=1; GUID guid; - if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) + if (FAILED(CLSIDFromString((LPCOLESTR)in, &guid))) return FALSE; for(i=0; i<8; i++) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ddb3522..e2a95c0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -153,7 +153,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) DWORD i,n=1; GUID guid; - if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) + if (FAILED(CLSIDFromString((LPCOLESTR)in, &guid))) return FALSE; for(i=0; i<8; i++) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index fd983ae..1826f21 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -81,7 +81,7 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) DWORD i,n=1; GUID guid; - if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) + if (FAILED(CLSIDFromString((LPCOLESTR)in, &guid))) return FALSE; for(i=0; i<8; i++) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5e010b1..0fb074d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1506,7 +1506,7 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid) * SEE ALSO * StringFromCLSID */ -static HRESULT __CLSIDFromString(LPCWSTR s, CLSID *id) +static HRESULT __CLSIDFromString(LPCWSTR s, LPCLSID id) { int i; BYTE table[256]; @@ -1566,7 +1566,7 @@ static HRESULT __CLSIDFromString(LPCWSTR s, CLSID *id) /*****************************************************************************/ -HRESULT WINAPI CLSIDFromString(LPOLESTR idstr, CLSID *id ) +HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) { HRESULT ret; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 8d09d9c..dc4a3b3 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -252,7 +252,7 @@ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id) DWORD WINAPI SHCLSIDFromStringW (LPCWSTR clsid, CLSID *id) { TRACE("(%p(%s) %p)\n", clsid, debugstr_w(clsid), id); - return CLSIDFromString((LPWSTR)clsid, id); + return CLSIDFromString(clsid, id); } DWORD WINAPI SHCLSIDFromStringAW (LPCVOID clsid, CLSID *id) { diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8f3e29c..8209217 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2818,7 +2818,7 @@ BOOL WINAPI GUIDFromStringA(LPCSTR idstr, CLSID *id) */ BOOL WINAPI GUIDFromStringW(LPCWSTR idstr, CLSID *id) { - return SUCCEEDED(CLSIDFromString((LPOLESTR)idstr, id)); + return SUCCEEDED(CLSIDFromString((LPCOLESTR)idstr, id)); } /************************************************************************* @@ -3903,7 +3903,7 @@ DWORD WINAPI SHSendMessageBroadcastW(UINT uMsg, WPARAM wParam, LPARAM lParam) */ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) { - return CLSIDFromString((LPOLESTR)idstr, id); + return CLSIDFromString((LPCOLESTR)idstr, id); } /************************************************************************* diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d5b9d12..09cbb42 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1388,7 +1388,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); else todo_wine CHECK_EXPECT(Obj_OnProgress_CLASSIDAVAILABLE); - hr = CLSIDFromString((LPOLESTR)szStatusText, &clsid); + hr = CLSIDFromString((LPCOLESTR)szStatusText, &clsid); ok(hr == S_OK, "CLSIDFromString failed with error 0x%08x\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_HTMLDocument), "Expected clsid to be CLSID_HTMLDocument instead of %s\n", debugstr_guid(&clsid)); diff --git a/include/objbase.h b/include/objbase.h index b9f50ab..52c6b56 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -431,7 +431,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags,DWORD dwTimeout,ULONG cHan * GUID API */ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR*); -HRESULT WINAPI CLSIDFromString(LPOLESTR, CLSID *); +HRESULT WINAPI CLSIDFromString(LPCOLESTR, LPCLSID); HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid); HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID);

1 0

Mikhail Maroukhine : wininet: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6e5dfd1fb858e097aa6380646714e30d99eaceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5dfd1fb858e097aa6380646… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 01:25:22 2010 +0600 wininet: Fix compiler warnings with flag -Wcast-qual. --- dlls/wininet/urlcache.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 29d26ab..cb76884 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -986,9 +986,9 @@ static DWORD URLCache_CopyEntry( ZeroMemory((LPBYTE)lpCacheEntryInfo + dwRequiredSize, 4 - (dwRequiredSize % 4)); dwRequiredSize = DWORD_ALIGN(dwRequiredSize); if (bUnicode) - lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); + lenUrl = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, NULL, 0); else - lenUrl = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); + lenUrl = strlen((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); dwRequiredSize += (lenUrl + 1) * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); /* FIXME: is source url optional? */ @@ -998,9 +998,9 @@ static DWORD URLCache_CopyEntry( lpCacheEntryInfo->lpszSourceUrlName = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenUrlBytes; if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenUrl + 1); else - memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); + memcpy(lpCacheEntryInfo->lpszSourceUrlName, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lenUrlBytes); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1029,7 +1029,7 @@ static DWORD URLCache_CopyEntry( if (*lpdwBufferSize >= dwRequiredSize) { lpCacheEntryInfo->lpHeaderInfo = (LPBYTE)lpCacheEntryInfo + dwRequiredSize - pUrlEntry->dwHeaderInfoSize - 1; - memcpy(lpCacheEntryInfo->lpHeaderInfo, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize); + memcpy(lpCacheEntryInfo->lpHeaderInfo, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo, pUrlEntry->dwHeaderInfoSize); ((LPBYTE)lpCacheEntryInfo)[dwRequiredSize - 1] = '\0'; } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1041,18 +1041,18 @@ static DWORD URLCache_CopyEntry( int lenExtension; if (bUnicode) - lenExtension = MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, -1, NULL, 0); + lenExtension = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, -1, NULL, 0); else - lenExtension = strlen((LPSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension) + 1; + lenExtension = strlen((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension) + 1; dwRequiredSize += lenExtension * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); if (*lpdwBufferSize >= dwRequiredSize) { lpCacheEntryInfo->lpszFileExtension = (LPSTR)lpCacheEntryInfo + dwRequiredSize - lenExtension; if (bUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenExtension); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, -1, (LPWSTR)lpCacheEntryInfo->lpszSourceUrlName, lenExtension); else - memcpy(lpCacheEntryInfo->lpszFileExtension, (LPSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, lenExtension * sizeof(CHAR)); + memcpy(lpCacheEntryInfo->lpszFileExtension, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetFileExtension, lenExtension * sizeof(CHAR)); } if ((dwRequiredSize % 4) && (dwRequiredSize < *lpdwBufferSize)) @@ -1557,15 +1557,15 @@ BOOL WINAPI GetUrlCacheEntryInfoA( if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); if (pUrlEntry->dwOffsetHeaderInfo) - TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); if (lpdwCacheEntryInfoBufferSize) { @@ -1639,14 +1639,14 @@ BOOL WINAPI GetUrlCacheEntryInfoW(LPCWSTR lpszUrl, if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); - TRACE("Header info: %s\n", debugstr_a((LPSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); + TRACE("Found URL: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl)); + TRACE("Header info: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo)); if (lpdwCacheEntryInfoBufferSize) { @@ -3265,9 +3265,9 @@ BOOL WINAPI FindNextUrlCacheEntryA( if (pEntry->dwSignature != URL_SIGNATURE) continue; - pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; - TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); - TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); + pUrlEntry = (const URL_CACHEFILE_ENTRY *)pEntry; + TRACE("Found URL: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); + TRACE("Header info: %s\n", (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); error = URLCache_CopyEntry( pContainer, @@ -3563,7 +3563,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD dwFlags, FILETIME* pftLas if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -3625,7 +3625,7 @@ BOOL WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD dwFlags, FILETIME* pftLa if (pEntry->dwSignature != URL_SIGNATURE) { URLCacheContainer_UnlockIndex(pContainer, pHeader); - FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPSTR)&pEntry->dwSignature, sizeof(DWORD))); + FIXME("Trying to retrieve entry of unknown format %s\n", debugstr_an((LPCSTR)&pEntry->dwSignature, sizeof(DWORD))); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; }

1 0

Mikhail Maroukhine : server: Fix compiler warning with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 0d7fef63ea08f72489e17bbe64f7baa91d94f71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7fef63ea08f72489e17bbe6… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 12:31:19 2010 +0600 server: Fix compiler warning with flag -Wcast-qual. --- server/debugger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 533347c..f76b44c 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -647,7 +647,7 @@ DECL_HANDLER(queue_exception_event) if ((event = alloc_debug_event( current, EXCEPTION_DEBUG_EVENT, &data ))) { - const context_t *context = (const context_t *)((char *)get_req_data() + req->len); + const context_t *context = (const context_t *)((const char *)get_req_data() + req->len); data_size_t size = get_req_data_size() - req->len; memset( &event->context, 0, sizeof(event->context) );

1 0

Mikhail Maroukhine : cabinet: Fix compiler warning with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 09dca97fc3196d342b7afccb95dde576fac7dd82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dca97fc3196d342b7afccb9… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 13:48:58 2010 +0600 cabinet: Fix compiler warning with flag -Wcast-qual. --- dlls/cabinet/fdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index de64f02..b68ab15 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -77,7 +77,7 @@ THOSE_ZIP_CONSTS; struct fdi_file { struct fdi_file *next; /* next file in sequence */ - LPCSTR filename; /* output name of file */ + LPSTR filename; /* output name of file */ int fh; /* open file handle or NULL */ cab_ULONG length; /* uncompressed length of file */ cab_ULONG offset; /* uncompressed offset in folder */ @@ -2301,7 +2301,7 @@ static void free_decompression_mem(HFDI hfdi, } while (CAB(firstfile)) { file = CAB(firstfile); - if (file->filename) PFDI_FREE(hfdi, (void *)file->filename); + if (file->filename) PFDI_FREE(hfdi, file->filename); CAB(firstfile) = CAB(firstfile)->next; PFDI_FREE(hfdi, file); }

1 0

Mikhail Maroukhine : comdlg32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 48e71cb424d8d21022ba483385b6a5ab91a4e4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e71cb424d8d21022ba48338… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 14:12:28 2010 +0600 comdlg32: Fix compiler warnings with flag -Wcast-qual. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5f90fe1..64cb393 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -240,7 +240,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes; - LPCVOID template; + LPVOID template; HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr;

1 0

Nikolay Sivov : shlwapi: Fix SHCreateWorkerWindowW fallback to A-call condition.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: ade553823d70a1f841d5056cbe14f5c0f1fd9335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade553823d70a1f841d5056cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 27 23:50:42 2010 +0300 shlwapi: Fix SHCreateWorkerWindowW fallback to A-call condition. --- dlls/shlwapi/ordinal.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 51c7941..8f3e29c 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2895,16 +2895,19 @@ DWORD WINAPI WhichPlatform(void) HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG z) { - static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', '\0' }; + static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; TRACE("(0x%08x,%p,0x%08x,0x%08x,%p,0x%08x)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); - /* If our OS is natively ASCII, use the ASCII version */ - if (!(GetVersion() & 0x80000000)) /* NT */ + /* If our OS is natively ANSI, use the ANSI version */ + if (GetVersion() & 0x80000000) /* not NT */ + { + TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); + } /* Create Window class */ wc.style = 0;

1 0

Michael Stefaniuc : shell32: Use FAILED instead of !SUCCEEDED.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6a11b63a8023e9fe98998a7eab15d488e7645d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a11b63a8023e9fe98998a7ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 28 23:50:40 2010 +0200 shell32: Use FAILED instead of !SUCCEEDED. --- dlls/shell32/shellord.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 9e6425c..fac7a7a 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1808,7 +1808,7 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ } /* The CLSID is stored either in the key itself or in its default value. */ - if (!SUCCEEDED(lRet = SHCLSIDFromStringW(szHandler, &clsid))) + if (FAILED(lRet = SHCLSIDFromStringW(szHandler, &clsid))) { dwClsidSize = sizeof(szClsidHandler); if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS)

1 0

Michael Stefaniuc : kernel32/tests: Remove superfluous casts of integer constants.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 8f7372488ba08e27278a7dbff6ed735ad83932f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7372488ba08e27278a7dbff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 28 23:51:30 2010 +0200 kernel32/tests: Remove superfluous casts of integer constants. --- dlls/kernel32/tests/comm.c | 170 ++++++++++++++++++++++---------------------- 1 files changed, 85 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f7372488ba08e27278a7…

1 0

Michael Stefaniuc : winecoreaudio.drv: Remove superfluous casts of zero.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: bf00cd338059dc53615b0d19f2309bdcf1a7577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf00cd338059dc53615b0d19f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 28 23:51:48 2010 +0200 winecoreaudio.drv: Remove superfluous casts of zero. --- dlls/winecoreaudio.drv/audio.c | 4 ++-- dlls/winecoreaudio.drv/midi.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 306a9c8..3f5cece 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -341,8 +341,8 @@ static DWORD WINAPI messageThread(LPVOID p) { CFMessagePortRef port_ReceiveInMessageThread = (CFMessagePortRef) p; CFRunLoopSourceRef source; - - source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, port_ReceiveInMessageThread, (CFIndex)0); + + source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, port_ReceiveInMessageThread, 0); CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); CFRunLoopRun(); diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 56eff5a..5e6eeae 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -928,7 +928,7 @@ static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) local = CFMessagePortCreateLocal(kCFAllocatorDefault, MIDIInThreadPortName, &MIDIIn_MessageHandler, NULL, &info); - source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, (CFIndex)0); + source = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, local, 0); CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); CFRunLoopRun();

1 0

Michael Stefaniuc : wined3d: Remove superfluous cast of zero.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6997c8d70c91bc19d5678776878d01fcada4ec6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6997c8d70c91bc19d56787768… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Mar 28 23:51:07 2010 +0200 wined3d: Remove superfluous cast of zero. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 897681d..9b63dd0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3054,7 +3054,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetVertexShaderConstantI( TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); - if (dstData == NULL || ((signed int) MAX_CONST_I - (signed int) start) <= (signed int) 0) + if (dstData == NULL || ((signed int) MAX_CONST_I - (signed int) start) <= 0) return WINED3DERR_INVALIDCALL; memcpy(dstData, &This->stateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4);

1 0