From 48960eef2c2875dea2c2c2521d8678d129f90fa8 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 30 Oct 2008 22:31:35 +0100 Subject: [PATCH] comdlg32: Don't cast the return value of GetProp() as it is a HANLE aka void pointer. --- dlls/comdlg32/colordlg.c | 33 +++++++++++--------- dlls/comdlg32/filedlg.c | 57 ++++++++++++++++------------------ dlls/comdlg32/filedlgbrowser.c | 14 ++++----- dlls/comdlg32/finddlg32.c | 2 +- dlls/comdlg32/fontdlg.c | 4 +-- dlls/comdlg32/printdlg.c | 10 +++--- dlls/comdlg32/printdlg16.c | 2 +- 7 files changed, 60 insertions(+), 62 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 1b4c0d59c3b..4baa2619f88 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -463,7 +463,7 @@ void CC_PaintTriangle( HWND hDlg, int y) RECT rect; HBRUSH hbr; HWND hwnd = GetDlgItem(hDlg, 0x2be); - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6))) /* if full size */ { @@ -509,7 +509,7 @@ void CC_PaintCross( HWND hDlg, int x, int y) int w = GetDialogBaseUnits() - 1; int wc = GetDialogBaseUnits() * 3 / 4; HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); RECT rect; POINT point, p; HPEN hPen; @@ -560,7 +560,7 @@ static void CC_PrepareColorGraph( HWND hDlg ) { int sdif, hdif, xdif, ydif, r, g, b, hue, sat; HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); HBRUSH hbrush; HDC hdc ; RECT rect, client; @@ -603,7 +603,7 @@ static void CC_PrepareColorGraph( HWND hDlg ) static void CC_PaintColorGraph( HWND hDlg ) { HWND hwnd = GetDlgItem( hDlg, 0x2c6 ); - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); HDC hDC; RECT rect; if (IsWindowVisible(hwnd)) /* if full size */ @@ -663,7 +663,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) void CC_EditSetRGB( HWND hDlg, COLORREF cr ) { char buffer[10]; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); int r = GetRValue(cr); int g = GetGValue(cr); int b = GetBValue(cr); @@ -686,7 +686,7 @@ void CC_EditSetRGB( HWND hDlg, COLORREF cr ) void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) { char buffer[10]; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ { @@ -708,7 +708,7 @@ void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) { int i; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); EnableWindow( GetDlgItem(hDlg, 0x2cf), FALSE); CC_PrepareColorGraph(hDlg); @@ -744,7 +744,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); dx = rect.right / cols; @@ -791,7 +791,7 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); @@ -961,7 +961,8 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, UINT cokmsg; HDC hdc; COLORREF *cr; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam); switch (LOWORD(wParam)) { @@ -1083,7 +1084,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) { PAINTSTRUCT ps; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); BeginPaint(hDlg, &ps); /* we have to paint dialog children except text and buttons */ @@ -1104,7 +1105,8 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) */ LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + if (lpp->capturedGraph) { lpp->capturedGraph = 0; @@ -1120,7 +1122,7 @@ LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ) */ LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); int r, g, b; if (lpp->capturedGraph) @@ -1158,7 +1160,7 @@ LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) */ LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); int r, g, b, i; i = 0; @@ -1217,7 +1219,8 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message, { int res; - LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); + LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + if (message != WM_INITDIALOG) { if (!lpp) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 65d73d2f307..5aa2da57500 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -822,8 +822,7 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) { LRESULT hook_result = 0; - - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwndParentDlg,FileOpenDlgInfosStr); TRACE("%p 0x%04x\n",hwndParentDlg, uCode); @@ -862,7 +861,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result { UINT len, total; WCHAR *p, *buffer; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("CDM_GETFILEPATH:\n"); @@ -902,7 +901,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result */ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); WCHAR lpstrPath[MAX_PATH]; INT_PTR retval; @@ -1107,7 +1106,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TBADDBITMAP tba[2]; RECT rectTB; RECT rectlook; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); tba[0].hInst = HINST_COMMCTRL; tba[0].nID = IDB_VIEW_SMALL_COLOR; @@ -1508,7 +1507,7 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) { WORD wNotifyCode = HIWORD(wParam); /* notification code */ WORD wID = LOWORD(wParam); /* item, control, or accelerator identifier */ - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); switch(wID) { @@ -1568,8 +1567,7 @@ static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) */ static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd) { - - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); @@ -1628,7 +1626,7 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo { WCHAR lpstrPathSpec[MAX_PATH] = {0}; UINT nCount, nSizePath; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); @@ -1756,7 +1754,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) WCHAR lpstrTemp[MAX_PATH]; LPSHELLFOLDER lpsf = NULL; int nOpenAction; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("hwnd=%p\n", hwnd); @@ -2222,7 +2220,7 @@ ret: */ static LRESULT FILEDLG95_SHELL_Init(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); @@ -2257,9 +2255,9 @@ static LRESULT FILEDLG95_SHELL_Init(HWND hwnd) */ static BOOL FILEDLG95_SHELL_ExecuteCommand(HWND hwnd, LPCSTR lpVerb) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); - + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); IContextMenu * pcm; + TRACE("(%p,%p)\n", hwnd, lpVerb); if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView, @@ -2288,7 +2286,7 @@ static BOOL FILEDLG95_SHELL_ExecuteCommand(HWND hwnd, LPCSTR lpVerb) */ static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); @@ -2310,7 +2308,7 @@ static BOOL FILEDLG95_SHELL_UpFolder(HWND hwnd) */ static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); LPITEMIDLIST pidl; HRESULT hres; @@ -2329,7 +2327,7 @@ static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd) */ static void FILEDLG95_SHELL_Clean(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); @@ -2354,7 +2352,7 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) */ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); int nFilters = 0; /* number of filters */ int nFilterIndexCB; @@ -2469,7 +2467,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) */ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); switch(wNotifyCode) { @@ -2535,7 +2533,7 @@ static int FILEDLG95_FILETYPE_SearchExt(HWND hwnd,LPCWSTR lpstrExt) */ static void FILEDLG95_FILETYPE_Clean(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); int iPos; int iCount = CBGetCount(fodInfos->DlgInfos.hwndFileTypeCB); @@ -2672,9 +2670,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) int iIndentation; TEXTMETRICW tm; LPSFOLDER tmpFolder; - - - LookInInfos *liInfos = (LookInInfos *)GetPropA(pDIStruct->hwndItem,LookInInfosStr); + LookInInfos *liInfos = GetPropA(pDIStruct->hwndItem,LookInInfosStr); TRACE("\n"); @@ -2778,7 +2774,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct) */ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("%p\n", fodInfos); @@ -2828,7 +2824,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) if(!pidl) return -1; - if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr))) + if(!(liInfos = GetPropA(hwnd,LookInInfosStr))) return -1; tmpFolder = MemAlloc(sizeof(SFOLDER)); @@ -2924,7 +2920,7 @@ int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) iItemPos = FILEDLG95_LOOKIN_SearchItem(hwnd,(WPARAM)pidl,SEARCH_PIDL); - liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr); + liInfos = GetPropA(hwnd,LookInInfosStr); if(iItemPos < 0) { @@ -2961,8 +2957,7 @@ int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd) { int iItemPos; - - LookInInfos *liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr); + LookInInfos *liInfos = GetPropA(hwnd,LookInInfosStr); TRACE("\n"); @@ -3019,7 +3014,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet */ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); int iPos; int iCount = CBGetCount(fodInfos->DlgInfos.hwndLookInCB); @@ -3055,7 +3050,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) LPWSTR lpstrAllFile, lpstrCurrFile; TRACE("\n"); - fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); /* Count how many files we have */ nFileSelected = GetNumSelected( fodInfos->Shell.FOIDataObject ); @@ -3170,7 +3165,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPI */ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed) { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); UINT nStrCharCount = 0; /* index in src buffer */ UINT nFileIndex = 0; /* index in dest buffer */ UINT nFileCount = 0; /* number of files */ @@ -3455,7 +3450,7 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl) static BOOL BrowseSelectedFolder(HWND hwnd) { BOOL bBrowseSelFolder = FALSE; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("\n"); diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 2015a4942f3..f933f1571ba 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -194,7 +194,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) { IShellBrowserImpl *sb; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndOwner,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(hwndOwner,FileOpenDlgInfosStr); sb=(IShellBrowserImpl*)COMDLG32_SHAlloc(sizeof(IShellBrowserImpl)); @@ -361,7 +361,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, TRACE("(%p)(pidl=%p,flags=0x%08x)\n", This, pidl, wFlags); COMDLG32_DumpSBSPFlags(wFlags); - fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); /* Format the pidl according to its parameter's category */ if(wFlags & SBSP_RELATIVE) @@ -569,7 +569,7 @@ static HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *ifac TRACE("(%p)\n", This); - fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); if(!(*ppshv = fodInfos->Shell.FOIShellView)) { @@ -773,7 +773,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl TRACE("(%p)\n", This); - fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); /* If the selected object is not a folder, send an IDOK command to parent window */ if((pidl = GetPidlFromDataObject(fodInfos->Shell.FOIDataObject, 1))) @@ -827,7 +827,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr break; case CDBOSC_KILLFOCUS: { - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + FileOpenDlgInfos *fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { WCHAR szSave[16]; @@ -862,7 +862,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr TRACE("(%p)\n", This); - fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); ulAttr = SFGAO_HIDDEN | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR | SFGAO_LINK; IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr); @@ -900,7 +900,7 @@ static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *if IShellBrowserImpl *This = impl_from_ICommDlgBrowser(iface); - fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr); + fodInfos = GetPropA(This->hwndOwner,FileOpenDlgInfosStr); TRACE("(%p do=%p view=%p)\n", This, fodInfos->Shell.FOIDataObject, fodInfos->Shell.FOIShellView); /* release old selections */ diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 353da908864..027a8b430f6 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -175,7 +175,7 @@ Replace: */ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom); + COMDLG32_FR_Data *pdata = GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom); INT_PTR retval = TRUE; if(iMsg == WM_INITDIALOG) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index b893282d0b1..470b7d3b664 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1146,7 +1146,7 @@ INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, int len; if (uMsg!=WM_INITDIALOG) { - lpcfw = (LPCHOOSEFONTW)GetPropW(hDlg, strWineFontData); + lpcfw = GetPropW(hDlg, strWineFontData); if (!lpcfw) return FALSE; if (CFn_HookCallChk32(lpcfw)) @@ -1209,7 +1209,7 @@ INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, if (uMsg!=WM_INITDIALOG) { - lpcf=(LPCHOOSEFONTW)GetPropW(hDlg, strWineFontData); + lpcf= GetPropW(hDlg, strWineFontData); if (!lpcf) return FALSE; if (CFn_HookCallChk32(lpcf)) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d8d208283e3..749f8e1720c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1854,7 +1854,7 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, INT_PTR res = FALSE; if (uMsg!=WM_INITDIALOG) { - PrintStructures = (PRINT_PTRA*)GetPropA(hDlg,"__WINE_PRINTDLGDATA"); + PrintStructures = GetPropA(hDlg,"__WINE_PRINTDLGDATA"); if (!PrintStructures) return FALSE; } else { @@ -1903,7 +1903,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, INT_PTR res = FALSE; if (uMsg!=WM_INITDIALOG) { - PrintStructures = (PRINT_PTRW*) GetPropW(hDlg, propW); + PrintStructures = GetPropW(hDlg, propW); if (!PrintStructures) return FALSE; } else { @@ -3215,7 +3215,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return CallWindowProcA(lpfnStaticWndProc, hWnd, uMsg, wParam, lParam); /* Processing WM_PAINT message */ - pda = (PageSetupDataA*)GetPropA(hWnd, "__WINE_PAGESETUPDLGDATA"); + pda = GetPropA(hWnd, "__WINE_PAGESETUPDLGDATA"); if (!pda) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; @@ -3404,7 +3404,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PRINTDLG_PS_ChangePaperPrev(pda); return TRUE; } else { - pda = (PageSetupDataA*)GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA"); + pda = GetPropA(hDlg,"__WINE_PAGESETUPDLGDATA"); if (!pda) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; @@ -3490,7 +3490,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) return TRUE; } else { - pdw = (PageSetupDataW*)GetPropW(hDlg, __WINE_PAGESETUPDLGDATA); + pdw = GetPropW(hDlg, __WINE_PAGESETUPDLGDATA); if (!pdw) { WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); return FALSE; diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index b23ef0ba4f2..9e867061241 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -527,7 +527,7 @@ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, BOOL16 res = FALSE; if (uMsg!=WM_INITDIALOG) { - PrintStructures = (PRINT_PTRA16*)GetPropA(hDlg,"__WINE_PRINTDLGDATA"); + PrintStructures = GetPropA(hDlg,"__WINE_PRINTDLGDATA"); if (!PrintStructures) return FALSE; } else {