merged back Wine commits

svn path=/trunk/; revision=7767
This commit is contained in:
Martin Fuchs 2004-01-19 06:56:55 +00:00
parent 848b80b405
commit ebbc9105dd
2 changed files with 5 additions and 5 deletions

View file

@ -264,11 +264,11 @@ BOOL SIC_Initialize(void)
return(FALSE); return(FALSE);
} }
ShellSmallIconList = ImageList_Create(16,16,ILC_COLOR32|ILC_MASK,0,0x20); ShellSmallIconList = ImageList_Create(16,16,ILC_COLOR32|ILC_MASK,0,0x20);
ShellBigIconList = ImageList_Create(32,32,ILC_COLOR32|ILC_MASK,0,0x20); ShellBigIconList = ImageList_Create(32,32,ILC_COLOR32|ILC_MASK,0,0x20);
ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); ImageList_SetBkColor(ShellSmallIconList, CLR_NONE);
ImageList_SetBkColor(ShellBigIconList, CLR_NONE); ImageList_SetBkColor(ShellBigIconList, CLR_NONE);
for (index=1; index<39; index++) for (index=1; index<39; index++)
{ {

View file

@ -206,7 +206,7 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb
if( !pv ) if( !pv )
return STG_E_INVALIDPOINTER; return STG_E_INVALIDPOINTER;
/* WriteFile() doesn't allow to specify NULL as write count pointer. */ /* WriteFile() doesn't allow to specify NULL as write count pointer */
if (!pcbWritten) if (!pcbWritten)
pcbWritten = &dummy_count; pcbWritten = &dummy_count;