Fixed tons of incomplete prototypes, assignment's of pointer with
different signedness, superflous ',' and ';' in structures, wrong
return-types, lose of digits and some small glitches.
diff --git a/ole/compobj.c b/ole/compobj.c
index 97e5331..d1264e7 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -739,7 +739,7 @@
HRESULT hres = E_UNEXPECTED;
char dllName[MAX_PATH+1];
- LONG dllNameLen = sizeof(dllName);
+ DWORD dllNameLen = sizeof(dllName);
HINSTANCE32 hLibrary;
typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid,
REFIID iid, LPVOID *ppv);
@@ -962,7 +962,7 @@
HRESULT ret = CoGetMalloc32(0,&lpmalloc);
if (ret) return;
- return lpmalloc->lpvtbl->fnFree(lpmalloc,ptr);
+ lpmalloc->lpvtbl->fnFree(lpmalloc,ptr);
}
/***********************************************************************
diff --git a/ole/ole2.c b/ole/ole2.c
index fe2a916..d0a4706 100644
--- a/ole/ole2.c
+++ b/ole/ole2.c
@@ -14,7 +14,7 @@
/******************************************************************************
* OleBuildVersion [OLE2.1]
*/
-DWORD WINAPI OleBuildVersion()
+DWORD WINAPI OleBuildVersion(void)
{
TRACE(ole,"(void)\n");
return (rmm<<16)+rup;
@@ -35,7 +35,7 @@
* NOTES
* Is DWORD really the correct return type for this function?
*/
-DWORD WINAPI CoGetCurrentProcess() {
+DWORD WINAPI CoGetCurrentProcess(void) {
return (DWORD)PROCESS_Current();
}
@@ -50,7 +50,7 @@
/***********************************************************************
* OleFlushClipboard [OLE2.76]
*/
-HRESULT WINAPI OleFlushClipboard()
+HRESULT WINAPI OleFlushClipboard(void)
{
return S_OK;
}
diff --git a/ole/ole2nls.c b/ole/ole2nls.c
index 73336d8..82059ed 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -788,7 +788,7 @@
}
i=0;
- while (languages[i].langid!=NULL)
+ while (languages[i].langid!=0)
{
LPWSTR cp;
char xbuffer[10];
@@ -830,7 +830,7 @@
return TRUE;
}
i=0;
- while (languages[i].langid!=NULL) {
+ while (languages[i].langid!=0) {
sprintf(buffer,"%08lx",(DWORD)languages[i].langid);
if (!lpfnLocaleEnum(buffer))
break;
@@ -2897,7 +2897,7 @@
LPCWSTR format,
LPWSTR date, INT32 datelen)
{
- short datearr[] = {'1','9','9','4','-','1','-','1',0};
+ unsigned short datearr[] = {'1','9','9','4','-','1','-','1',0};
FIXME(ole, "STUB (should call OLE_GetFormatW)\n");
lstrcpyn32W(date, datearr, datelen);
diff --git a/ole/storage.c b/ole/storage.c
index 6627383..83ce52e 100644
--- a/ole/storage.c
+++ b/ole/storage.c
@@ -1182,14 +1182,14 @@
IStream32_fnAddRef,
IStream32_fnRelease
},
- (void*)4,
- (void*)5,
- (void*)6,
- (void*)7,
- (void*)8,
- (void*)9,
- (void*)10,
- (void*)11,
+ (void*)0xdead0004,
+ (void*)0xdead0005,
+ (void*)0xdead0006,
+ (void*)0xdead0007,
+ (void*)0xdead0008,
+ (void*)0xdead0009,
+ (void*)0xdead0010,
+ (void*)0xdead0011
};
@@ -1644,19 +1644,19 @@
},
IStorage32_fnCreateStream,
IStorage32_fnOpenStream,
- (void*)6,
- (void*)7,
- (void*)8,
- (void*)9,
- (void*)10,
- (void*)11,
- (void*)12,
- (void*)13,
- (void*)14,
- (void*)15,
- (void*)16,
- (void*)17,
- (void*)18,
+ (void*)0xdead0006,
+ (void*)0xdead0007,
+ (void*)0xdead0008,
+ (void*)0xdead0009,
+ (void*)0xdead0010,
+ (void*)0xdead0011,
+ (void*)0xdead0012,
+ (void*)0xdead0013,
+ (void*)0xdead0014,
+ (void*)0xdead0015,
+ (void*)0xdead0016,
+ (void*)0xdead0017,
+ (void*)0xdead0018,
};
/******************************************************************************
diff --git a/ole/typelib.c b/ole/typelib.c
index 0f55378..913a839 100644
--- a/ole/typelib.c
+++ b/ole/typelib.c
@@ -108,7 +108,7 @@
OLECHAR32 *szFile, /* [in] Name of file to load from */
void * *pptLib) /* [out] Pointer to pointer to loaded type library */
{
- FIXME(ole, "('%s',%p): stub\n",debugstr_a(szFile),pptLib);
+ FIXME(ole, "('%s',%p): stub\n",debugstr_w((LPWSTR)szFile),pptLib);
return E_FAIL;
}
@@ -127,7 +127,7 @@
OLECHAR32 *szFile, /* [in] Name of file to load from */
void * *pptLib) /* [out] Pointer to pointer to loaded type library */
{
- FIXME(ole, "('%s',%p): stub\n",debugstr_a(szFile),pptLib);
+ FIXME(ole, "('%s',%p): stub\n",debugstr_w(szFile),pptLib);
(long *)pptLib=0x123;
return S_OK; /* fixme: pretend everything is OK*/
}
@@ -148,7 +148,7 @@
ITypeLib * ptlib, /*[in] Pointer to the library*/
OLECHAR32 * szFullPath, /*[in] full Path of the library*/
OLECHAR32 * szHelpDir) /*[in] dir to the helpfile for the library, may be NULL*/
-{ FIXME(ole, "(%p,%s,%s): stub\n",ptlib, szFullPath,szHelpDir);
+{ FIXME(ole, "(%p,%s,%s): stub\n",ptlib, debugstr_w(szFullPath),debugstr_w(szHelpDir));
return S_OK; /* FIXME: pretend everything is OK */
}
@@ -157,7 +157,7 @@
* RETURNS
* path of typelib
*/
-DWORD WINAPI OABuildVersion()
+DWORD WINAPI OABuildVersion(void)
{
WINDOWS_VERSION ver = VERSION_GetVersion();
