Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32]

Browse source 
Fix 64 bit MSVC build, fix some warnings

svn path=/trunk/; revision=55498
This commit is contained in:
Timo Kreuzer 2012-02-08 21:38:53 +00:00
parent b6d994d577
commit 9e03b92631
3 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/shell32/drvdefext.cpp
View file

@ -44,7 +44,8 @@ UINT SH_FormatByteSize(LONGLONG cbSize, LPWSTR pwszResult, UINT cchResultMax);
static VOID static VOID
GetDriveNameWithLetter(LPWSTR pwszText, UINT cchTextMax, LPCWSTR pwszDrive) GetDriveNameWithLetter(LPWSTR pwszText, UINT cchTextMax, LPCWSTR pwszDrive)
{ {
DWORD dwMaxComp, dwFileSys, cchText = 0; DWORD dwMaxComp, dwFileSys;
SIZE_T cchText = 0;
if (GetVolumeInformationW(pwszDrive, pwszText, cchTextMax, NULL, &dwMaxComp, &dwFileSys, NULL, 0)) if (GetVolumeInformationW(pwszDrive, pwszText, cchTextMax, NULL, &dwMaxComp, &dwFileSys, NULL, 0))
{ {
@ -219,8 +220,8 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem)
TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f, cx); TRACE("FreeSpace %u a %f cx %d\n", m_FreeSpacePerc, M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f, cx);
HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush); HBRUSH hbrOld = (HBRUSH)SelectObject(pDrawItem->hDC, hMagBrush);
INT xRadial = xCenter + (INT)(cosf(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cx/2); INT xRadial = xCenter + (INT)(cos(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cx/2);
INT yRadial = yCenter - (INT)(sinf(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cy/2); INT yRadial = yCenter - (INT)(sin(M_PI+m_FreeSpacePerc/100.0f*M_PI*2.0f)*cy/2);
Pie(pDrawItem->hDC, Pie(pDrawItem->hDC,
pDrawItem->rcItem.left, pDrawItem->rcItem.top, pDrawItem->rcItem.left, pDrawItem->rcItem.top,
pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10, pDrawItem->rcItem.right, pDrawItem->rcItem.bottom - 10,
@ -241,8 +242,8 @@ CDrvDefExt::PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT pDrawItem)
if (m_FreeSpacePerc < 50 && x == xRadial) if (m_FreeSpacePerc < 50 && x == xRadial)
SelectObject(pDrawItem->hDC, hDarkMagPen); SelectObject(pDrawItem->hDC, hDarkMagPen);
float cos_val = (x - xCenter)*2.0f/cx; double cos_val = (x - xCenter)*2.0f/cx;
INT y = yCenter+sinf(acosf(cos_val))*cy/2; INT y = yCenter+(INT)sin(acos(cos_val))*cy/2;
MoveToEx(pDrawItem->hDC, x, y, NULL); MoveToEx(pDrawItem->hDC, x, y, NULL);
LineTo(pDrawItem->hDC, x, y + 10); LineTo(pDrawItem->hDC, x, y + 10);
} }
@ -390,7 +391,7 @@ CDrvDefExt::GeneralPageProc(
{ {
/* Property Sheet */ /* Property Sheet */
LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam; LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
if (lppsn->hdr.code == PSN_APPLY) if (lppsn->hdr.code == PSN_APPLY)
{ {
CDrvDefExt *pDrvDefExt = (CDrvDefExt*)GetWindowLongPtr(hwndDlg, DWLP_USER); CDrvDefExt *pDrvDefExt = (CDrvDefExt*)GetWindowLongPtr(hwndDlg, DWLP_USER);
@ -505,7 +506,7 @@ CDrvDefExt::CDrvDefExt()
CDrvDefExt::~CDrvDefExt() CDrvDefExt::~CDrvDefExt()
{ {
} }
HRESULT WINAPI HRESULT WINAPI

40
reactos/dll/win32/shell32/shellole.cpp
View file

@ -248,7 +248,7 @@ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal)
* SEE ALSO * SEE ALSO
* CoTaskMemAlloc, SHLoadOLE * CoTaskMemAlloc, SHLoadOLE
*/ */
LPVOID WINAPI SHAlloc(DWORD len) LPVOID WINAPI SHAlloc(SIZE_T len)
{ {
LPVOID ret; LPVOID ret;
@ -596,7 +596,7 @@ EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmt
grfFlags, grfMode, dwDisposition, ppstg, puCodePage); grfFlags, grfMode, dwDisposition, ppstg, puCodePage);
hres = psstg->Open(fmtid, grfMode, ppstg); hres = psstg->Open(fmtid, grfMode, ppstg);
switch (dwDisposition) switch (dwDisposition)
{ {
case CREATE_ALWAYS: case CREATE_ALWAYS:
@ -608,16 +608,16 @@ EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmt
return hres; return hres;
hres = E_FAIL; hres = E_FAIL;
} }
case OPEN_ALWAYS: case OPEN_ALWAYS:
case CREATE_NEW: case CREATE_NEW:
if (FAILED(hres)) if (FAILED(hres))
hres = psstg->Create(fmtid, pclsid, grfFlags, grfMode, ppstg); hres = psstg->Create(fmtid, pclsid, grfFlags, grfMode, ppstg);
case OPEN_EXISTING: case OPEN_EXISTING:
if (FAILED(hres)) if (FAILED(hres))
return hres; return hres;
if (puCodePage) if (puCodePage)
{ {
prop.ulKind = PRSPEC_PROPID; prop.ulKind = PRSPEC_PROPID;
@ -629,7 +629,7 @@ EXTERN_C HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmt
*puCodePage = ret.iVal; *puCodePage = ret.iVal;
} }
} }
return S_OK; return S_OK;
} }
@ -641,32 +641,32 @@ EXTERN_C HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodeP
{ {
STATPROPSETSTG stat; STATPROPSETSTG stat;
HRESULT hres; HRESULT hres;
FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar);
memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); memset(rgvar, 0, cpspec*sizeof(PROPVARIANT));
hres = pps->ReadMultiple(cpspec, rgpspec, rgvar); hres = pps->ReadMultiple(cpspec, rgpspec, rgvar);
if (FAILED(hres)) if (FAILED(hres))
return hres; return hres;
if (!uCodePage) if (!uCodePage)
{ {
PROPSPEC prop; PROPSPEC prop;
PROPVARIANT ret; PROPVARIANT ret;
prop.ulKind = PRSPEC_PROPID; prop.ulKind = PRSPEC_PROPID;
prop.propid = PID_CODEPAGE; prop.propid = PID_CODEPAGE;
hres = pps->ReadMultiple(1, &prop, &ret); hres = pps->ReadMultiple(1, &prop, &ret);
if(FAILED(hres) || ret.vt!=VT_I2) if(FAILED(hres) || ret.vt!=VT_I2)
return S_OK; return S_OK;
uCodePage = ret.iVal; uCodePage = ret.iVal;
} }
hres = pps->Stat(&stat); hres = pps->Stat(&stat);
if (FAILED(hres)) if (FAILED(hres))
return S_OK; return S_OK;
/* TODO: do something with codepage and stat */ /* TODO: do something with codepage and stat */
return S_OK; return S_OK;
} }
@ -680,20 +680,20 @@ EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCod
STATPROPSETSTG stat; STATPROPSETSTG stat;
UINT codepage; UINT codepage;
HRESULT hres; HRESULT hres;
FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst);
hres = pps->Stat(&stat); hres = pps->Stat(&stat);
if (FAILED(hres)) if (FAILED(hres))
return hres; return hres;
if (uCodePage && *uCodePage) if (uCodePage && *uCodePage)
codepage = *uCodePage; codepage = *uCodePage;
else else
{ {
PROPSPEC prop; PROPSPEC prop;
PROPVARIANT ret; PROPVARIANT ret;
prop.ulKind = PRSPEC_PROPID; prop.ulKind = PRSPEC_PROPID;
prop.propid = PID_CODEPAGE; prop.propid = PID_CODEPAGE;
hres = pps->ReadMultiple(1, &prop, &ret); hres = pps->ReadMultiple(1, &prop, &ret);
@ -701,14 +701,14 @@ EXTERN_C HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCod
return hres; return hres;
if (ret.vt!=VT_I2 || !ret.iVal) if (ret.vt!=VT_I2 || !ret.iVal)
return E_FAIL; return E_FAIL;
codepage = ret.iVal; codepage = ret.iVal;
if (uCodePage) if (uCodePage)
*uCodePage = codepage; *uCodePage = codepage;
} }
/* TODO: do something with codepage and stat */ /* TODO: do something with codepage and stat */
hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst);
return hres; return hres;
} }

18
reactos/include/psdk/shlobj.h
View file

@ -82,7 +82,7 @@ DECLARE_HANDLE(HPSXA);
#endif #endif
UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM);
LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); LPVOID WINAPI SHAlloc(SIZE_T) __WINE_ALLOC_SIZE(1);
HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*);
HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT); HPSXA WINAPI SHCreatePropSheetExtArray(HKEY,LPCWSTR,UINT);
HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*);
@ -1812,7 +1812,7 @@ HRESULT WINAPI CIDLData_CreateFromIDArray(
* SHOpenWithDialog * SHOpenWithDialog
*/ */
enum tagOPEN_AS_INFO_FLAGS enum tagOPEN_AS_INFO_FLAGS
{ {
OAIF_ALLOW_REGISTRATION = 1, OAIF_ALLOW_REGISTRATION = 1,
OAIF_REGISTER_EXT = 2, OAIF_REGISTER_EXT = 2,
@ -1871,14 +1871,14 @@ DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown)
* Travel log * Travel log
*/ */
#define TLOG_BACK -1 #define TLOG_BACK -1
#define TLOG_FORE 1 #define TLOG_FORE 1
#define TLMENUF_INCLUDECURRENT 0x00000001 #define TLMENUF_INCLUDECURRENT 0x00000001
#define TLMENUF_CHECKCURRENT (TLMENUF_INCLUDECURRENT | 0x00000002) #define TLMENUF_CHECKCURRENT (TLMENUF_INCLUDECURRENT | 0x00000002)
#define TLMENUF_BACK 0x00000010 // Default #define TLMENUF_BACK 0x00000010 // Default
#define TLMENUF_FORE 0x00000020 #define TLMENUF_FORE 0x00000020
#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT) #define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)
/***************************************************************************** /*****************************************************************************
* IDockingWindowSite interface * IDockingWindowSite interface