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 March 29, 2010

March 29, 2010

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 : advapi32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 0490131783475e2575b766a9a76157d9e78406a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0490131783475e2575b766a9a… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 21:50:51 2010 +0600 advapi32: Fix compiler warnings with flag -Wcast-qual. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7fea937..cce2af4 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -933,8 +933,8 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, { err = svcctl_CreateServiceW(hSCManager, lpServiceName, lpDisplayName, dwDesiredAccess, dwServiceType, dwStartType, dwErrorControl, - lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (LPBYTE)lpDependencies, - multisz_cb(lpDependencies), lpServiceStartName, (LPBYTE)lpPassword, passwdlen, + lpBinaryPathName, lpLoadOrderGroup, lpdwTagId, (const BYTE*)lpDependencies, + multisz_cb(lpDependencies), lpServiceStartName, (const BYTE*)lpPassword, passwdlen, (SC_RPC_HANDLE *)&handle); } __EXCEPT(rpc_filter)

1 0

Mikhail Maroukhine : appwiz.cpl: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 503563c950c94b305581bc9e8cf253960aacbcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=503563c950c94b305581bc9e8… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 22:17:28 2010 +0600 appwiz.cpl: Fix compiler warnings with flag -Wcast-qual. --- dlls/appwiz.cpl/appwiz.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index bafd319..98b1019 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -556,7 +556,7 @@ static void UninstallProgram(int id, DWORD button) * hWnd - handle of dialog box * iDlgItem - ID of label in dialog box */ -static void SetInfoDialogText(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpAltMessage, +static void SetInfoDialogText(HKEY hKey, LPCWSTR lpKeyName, LPCWSTR lpAltMessage, HWND hWnd, int iDlgItem) { WCHAR buf[MAX_STRING_LEN]; @@ -628,17 +628,17 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR IDC_INFO_VERSION); /* And now update the data for those items in the registry */ - SetInfoDialogText(hkey, (LPWSTR) ContactW, notfound, hWnd, + SetInfoDialogText(hkey, ContactW, notfound, hWnd, IDC_INFO_CONTACT); - SetInfoDialogText(hkey, (LPWSTR) HelpLinkW, notfound, hWnd, + SetInfoDialogText(hkey, HelpLinkW, notfound, hWnd, IDC_INFO_SUPPORT); - SetInfoDialogText(hkey, (LPWSTR) HelpTelephoneW, notfound, hWnd, + SetInfoDialogText(hkey, HelpTelephoneW, notfound, hWnd, IDC_INFO_PHONE); - SetInfoDialogText(hkey, (LPWSTR) ReadmeW, notfound, hWnd, + SetInfoDialogText(hkey, ReadmeW, notfound, hWnd, IDC_INFO_README); - SetInfoDialogText(hkey, (LPWSTR) URLUpdateInfoW, notfound, hWnd, + SetInfoDialogText(hkey, URLUpdateInfoW, notfound, hWnd, IDC_INFO_UPDATES); - SetInfoDialogText(hkey, (LPWSTR) CommentsW, notfound, hWnd, + SetInfoDialogText(hkey, CommentsW, notfound, hWnd, IDC_INFO_COMMENTS); /* Update the main label with the app name */

1 0

Mikhail Maroukhine : server: Fix compiler warning with flag -Wcast-qual.
by Alexandre Julliard March 29, 2010

March 29, 2010

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 March 29, 2010

March 29, 2010

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 : comctl32: Fix incorrect const type casting.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 3cad4a1d1623132beadec5164d4096062314c5f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cad4a1d1623132beadec5164… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 18:23:45 2010 +0600 comctl32: Fix incorrect const type casting. --- dlls/comctl32/status.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index d0675da..1b69ef2 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -728,7 +728,7 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) static BOOL STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, - LPCWSTR text, BOOL isW) + LPWSTR text, BOOL isW) { STATUSWINDOWPART *part=NULL; BOOL changed = FALSE; @@ -759,7 +759,7 @@ STATUSBAR_SetTextT (STATUS_INFO *infoPtr, INT nPart, WORD style, if (style & SBT_OWNERDRAW) { if (!(oldStyle & SBT_OWNERDRAW)) Free (part->text); - part->text = (LPWSTR)text; + part->text = text; } else { LPWSTR ntext; WCHAR *idx; @@ -1248,10 +1248,10 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) return STATUSBAR_SetParts (infoPtr, (INT)wParam, (LPINT)lParam); case SB_SETTEXTA: - return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, FALSE); + return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPWSTR)lParam, FALSE); case SB_SETTEXTW: - return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, TRUE); + return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPWSTR)lParam, TRUE); case SB_SETTIPTEXTA: return STATUSBAR_SetTipTextA (infoPtr, (INT)wParam, (LPSTR)lParam);

1 0

Mikhail Maroukhine : comctl32: Fix compiler warnings.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 6443d8754326db22ca79258d264b4b077d51232a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6443d8754326db22ca79258d2… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Fri Mar 26 20:49:09 2010 +0600 comctl32: Fix compiler warnings. --- dlls/comctl32/propsheet.c | 63 +++++++++++++++++++-------------------- dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4f197f6..25a9218 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1370,10 +1370,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, const PropSheetInfo * psInfo, LPCPROPSHEETPAGEW ppshpage) { - DLGTEMPLATE* pTemplate; + const DLGTEMPLATE* pTemplate; HWND hwndPage; DWORD resSize; - LPVOID temp = NULL; + DLGTEMPLATE* pTemplateCopy = NULL; TRACE("index %d\n", index); @@ -1384,7 +1384,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if (ppshpage->dwFlags & PSP_DLGINDIRECT) { - pTemplate = (DLGTEMPLATE*)ppshpage->u.pResource; + pTemplate = ppshpage->u.pResource; resSize = GetTemplateSize(pTemplate); } else if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) @@ -1431,39 +1431,38 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, * Make a copy of the dialog template to make it writable */ } - temp = Alloc(resSize); - if (!temp) + pTemplateCopy = Alloc(resSize); + if (!pTemplateCopy) return FALSE; - TRACE("copying pTemplate %p into temp %p (%d)\n", pTemplate, temp, resSize); - memcpy(temp, pTemplate, resSize); - pTemplate = temp; + TRACE("copying pTemplate %p into pTemplateCopy %p (%d)\n", pTemplate, pTemplateCopy, resSize); + memcpy(pTemplateCopy, pTemplate, resSize); - if (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF) + if (((MyDLGTEMPLATEEX*)pTemplateCopy)->signature == 0xFFFF) { - ((MyDLGTEMPLATEEX*)pTemplate)->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~DS_MODALFRAME; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_CAPTION; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_SYSMENU; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_POPUP; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_DISABLED; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_VISIBLE; - ((MyDLGTEMPLATEEX*)pTemplate)->style &= ~WS_THICKFRAME; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~DS_MODALFRAME; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_CAPTION; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_SYSMENU; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_POPUP; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_DISABLED; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_VISIBLE; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->style &= ~WS_THICKFRAME; - ((MyDLGTEMPLATEEX*)pTemplate)->exStyle |= WS_EX_CONTROLPARENT; + ((MyDLGTEMPLATEEX*)pTemplateCopy)->exStyle |= WS_EX_CONTROLPARENT; } else { - pTemplate->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; - pTemplate->style &= ~DS_MODALFRAME; - pTemplate->style &= ~WS_CAPTION; - pTemplate->style &= ~WS_SYSMENU; - pTemplate->style &= ~WS_POPUP; - pTemplate->style &= ~WS_DISABLED; - pTemplate->style &= ~WS_VISIBLE; - pTemplate->style &= ~WS_THICKFRAME; + pTemplateCopy->style |= WS_CHILD | WS_TABSTOP | DS_CONTROL; + pTemplateCopy->style &= ~DS_MODALFRAME; + pTemplateCopy->style &= ~WS_CAPTION; + pTemplateCopy->style &= ~WS_SYSMENU; + pTemplateCopy->style &= ~WS_POPUP; + pTemplateCopy->style &= ~WS_DISABLED; + pTemplateCopy->style &= ~WS_VISIBLE; + pTemplateCopy->style &= ~WS_THICKFRAME; - pTemplate->dwExtendedStyle |= WS_EX_CONTROLPARENT; + pTemplateCopy->dwExtendedStyle |= WS_EX_CONTROLPARENT; } if (psInfo->proppage[index].useCallback) @@ -1472,18 +1471,18 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, if(ppshpage->dwFlags & PSP_INTERNAL_UNICODE) hwndPage = CreateDialogIndirectParamW(ppshpage->hInstance, - pTemplate, + pTemplateCopy, hwndParent, ppshpage->pfnDlgProc, (LPARAM)ppshpage); else hwndPage = CreateDialogIndirectParamA(ppshpage->hInstance, - pTemplate, + pTemplateCopy, hwndParent, ppshpage->pfnDlgProc, (LPARAM)ppshpage); /* Free a no more needed copy */ - Free(temp); + Free(pTemplateCopy); psInfo->proppage[index].hwndPage = hwndPage; diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 5290788..9542e64 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -833,7 +833,7 @@ static void check_bitmap_data(const char *bm_data, ULONG bm_data_size, static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT max) { - ILHEAD *ilh = (ILHEAD *)ilh_data; + const ILHEAD *ilh = (const ILHEAD *)ilh_data; ok(ilh->usMagic == IMAGELIST_MAGIC, "wrong usMagic %4x (expected %02x)\n", ilh->usMagic, IMAGELIST_MAGIC); ok(ilh->usVersion == 0x101, "wrong usVersion %x (expected 0x101)\n", ilh->usVersion);

1 0

Michael Stefaniuc : wined3d: Remove superfluous cast of zero.
by Alexandre Julliard March 29, 2010

March 29, 2010

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

Michael Stefaniuc : winecoreaudio.drv: Remove superfluous casts of zero.
by Alexandre Julliard March 29, 2010

March 29, 2010

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

Nikolay Sivov : shlwapi: Fix SHCreateWorkerWindowW fallback to A-call condition.
by Alexandre Julliard March 29, 2010

March 29, 2010

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