Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed NONAMELESSUNION and NONAMELESSSTRUCT

Browse source 
svn path=/trunk/; revision=7457
This commit is contained in:
Martin Fuchs 2004-01-04 23:36:06 +00:00
parent 7bf39cb245
commit 83cc821fc7
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/lib/shell32/shfldr_mycomp.c
View file

@ -28,8 +28,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h" #include "winerror.h"
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
@ -533,7 +531,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 * iface,
if (SUCCEEDED (hr)) { if (SUCCEEDED (hr)) {
strRet->uType = STRRET_CSTR; strRet->uType = STRRET_CSTR;
lstrcpynA (strRet->u.cStr, szPath, MAX_PATH); lstrcpynA (strRet->cStr, szPath, MAX_PATH);
} }
TRACE ("-- (%p)->(%s)\n", This, szPath); TRACE ("-- (%p)->(%s)\n", This, szPath);
@ -614,33 +612,33 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDetailsOf (IShellFolder2 * iface, LPCI
psd->fmt = MyComputerSFHeader[iColumn].fmt; psd->fmt = MyComputerSFHeader[iColumn].fmt;
psd->cxChar = MyComputerSFHeader[iColumn].cxChar; psd->cxChar = MyComputerSFHeader[iColumn].cxChar;
psd->str.uType = STRRET_CSTR; psd->str.uType = STRRET_CSTR;
LoadStringA (shell32_hInstance, MyComputerSFHeader[iColumn].colnameid, psd->str.u.cStr, MAX_PATH); LoadStringA (shell32_hInstance, MyComputerSFHeader[iColumn].colnameid, psd->str.cStr, MAX_PATH);
return S_OK; return S_OK;
} else { } else {
char szPath[MAX_PATH]; char szPath[MAX_PATH];
ULARGE_INTEGER ulBytes; ULARGE_INTEGER ulBytes;
psd->str.u.cStr[0] = 0x00; psd->str.cStr[0] = 0x00;
psd->str.uType = STRRET_CSTR; psd->str.uType = STRRET_CSTR;
switch (iColumn) { switch (iColumn) {
case 0: /* name */ case 0: /* name */
hr = IShellFolder_GetDisplayNameOf (iface, pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); hr = IShellFolder_GetDisplayNameOf (iface, pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str);
break; break;
case 1: /* type */ case 1: /* type */
_ILGetFileType (pidl, psd->str.DUMMYUNIONNAME.cStr, MAX_PATH); _ILGetFileType (pidl, psd->str.cStr, MAX_PATH);
break; break;
case 2: /* total size */ case 2: /* total size */
if (_ILIsDrive (pidl)) { if (_ILIsDrive (pidl)) {
_ILSimpleGetText (pidl, szPath, MAX_PATH); _ILSimpleGetText (pidl, szPath, MAX_PATH);
GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL); GetDiskFreeSpaceExA (szPath, NULL, &ulBytes, NULL);
StrFormatByteSizeA (ulBytes.DUMMYUNIONNAME.LowPart, psd->str.u.cStr, MAX_PATH); StrFormatByteSizeA (ulBytes.LowPart, psd->str.cStr, MAX_PATH);
} }
break; break;
case 3: /* free size */ case 3: /* free size */
if (_ILIsDrive (pidl)) { if (_ILIsDrive (pidl)) {
_ILSimpleGetText (pidl, szPath, MAX_PATH); _ILSimpleGetText (pidl, szPath, MAX_PATH);
GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL); GetDiskFreeSpaceExA (szPath, &ulBytes, NULL, NULL);
StrFormatByteSizeA (ulBytes.DUMMYUNIONNAME.LowPart, psd->str.DUMMYUNIONNAME.cStr, MAX_PATH); StrFormatByteSizeA (ulBytes.LowPart, psd->str.cStr, MAX_PATH);
} }
break; break;
} }