ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Documentation corrections/standardizations.

This commit is contained in:
Matthew Becker 1998-10-11 14:21:42 +00:00 committed by Alexandre Julliard
parent 5f2c7dc15d
commit b05264fe53
12 changed files with 287 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/ntdll.c
View File

@ -561,7 +561,7 @@ BOOL32 WINAPI RtlDosPathNameToNtPathName_U(
*/ */
DWORD WINAPI NtOpenFile(DWORD x1,DWORD flags,DWORD x3,DWORD x4,DWORD alignment,DWORD x6) DWORD WINAPI NtOpenFile(DWORD x1,DWORD flags,DWORD x3,DWORD x4,DWORD alignment,DWORD x6)
{ {
FIXME(ntdll,"(%08lx,%08lx,%08lx,%08lx,%08lx,%08lx): stub\n", FIXME(ntdll,"(%08lx,0x%08lx,%08lx,%08lx,%08lx,%08lx): stub\n",
x1,flags,x3,x4,alignment,x6); x1,flags,x3,x4,alignment,x6);
/* returns file io completion status */ /* returns file io completion status */
return 0; return 0;

10
misc/registry.c
View File

@ -177,7 +177,7 @@ static void add_handle( HKEY hkey, LPKEYSTRUCT lpkey, REGSAM accessmask )
{ {
int i; int i;
TRACE(reg,"(%x,%p,%lx)\n",hkey,lpkey,accessmask); TRACE(reg,"(0x%x,%p,0x%lx)\n",hkey,lpkey,accessmask);
/* Check for duplicates */ /* Check for duplicates */
for (i=0;i<nrofopenhandles;i++) { for (i=0;i<nrofopenhandles;i++) {
if (openhandles[i].lpkey==lpkey) { if (openhandles[i].lpkey==lpkey) {
@ -213,7 +213,7 @@ static LPKEYSTRUCT get_handle( HKEY hkey )
for (i=0; i<nrofopenhandles; i++) for (i=0; i<nrofopenhandles; i++)
if (openhandles[i].hkey == hkey) if (openhandles[i].hkey == hkey)
return openhandles[i].lpkey; return openhandles[i].lpkey;
WARN(reg, "Could not find handle %x\n",hkey); WARN(reg, "Could not find handle 0x%x\n",hkey);
return NULL; return NULL;
} }
@ -237,7 +237,7 @@ static DWORD remove_handle( HKEY hkey )
break; break;
if (i == nrofopenhandles) { if (i == nrofopenhandles) {
WARN(reg, "Could not find handle %x\n",hkey); WARN(reg, "Could not find handle 0x%x\n",hkey);
return ERROR_INVALID_HANDLE; return ERROR_INVALID_HANDLE;
} }
@ -1741,7 +1741,7 @@ DWORD WINAPI RegOpenKeyEx32W( HKEY hkey, LPCWSTR lpszSubKey, DWORD dwReserved,
LPWSTR *wps; LPWSTR *wps;
int wpc,i; int wpc,i;
TRACE(reg,"(%x,%s,%ld,%lx,%p)\n", hkey,debugstr_w(lpszSubKey),dwReserved, TRACE(reg,"(0x%x,%s,%ld,%lx,%p)\n", hkey,debugstr_w(lpszSubKey),dwReserved,
samDesired,retkey); samDesired,retkey);
lpNextKey = lookup_hkey( hkey ); lpNextKey = lookup_hkey( hkey );
@ -2123,7 +2123,7 @@ DWORD WINAPI RegQueryValueEx32W( HKEY hkey, LPWSTR lpValueName,
LPKEYSTRUCT lpkey; LPKEYSTRUCT lpkey;
int i; int i;
TRACE(reg,"(%x,%s,%p,%p,%p,%ld)\n", hkey, debugstr_w(lpValueName), TRACE(reg,"(0x%x,%s,%p,%p,%p,%ld)\n", hkey, debugstr_w(lpValueName),
lpdwReserved, lpdwType, lpbData, lpcbData?*lpcbData:0); lpdwReserved, lpdwType, lpbData, lpcbData?*lpcbData:0);
lpkey = lookup_hkey(hkey); lpkey = lookup_hkey(hkey);

80
ole/compobj.c
View File

@ -33,7 +33,7 @@ LPMALLOC32 currentMalloc32=NULL;
HTASK16 hETask = 0; HTASK16 hETask = 0;
WORD Table_ETask[62]; WORD Table_ETask[62];
/*********************************************************************** /******************************************************************************
* CoBuildVersion [COMPOBJ.1] * CoBuildVersion [COMPOBJ.1]
* *
* RETURNS * RETURNS
@ -45,8 +45,8 @@ DWORD WINAPI CoBuildVersion()
return (rmm<<16)+rup; return (rmm<<16)+rup;
} }
/*********************************************************************** /******************************************************************************
* CoInitialize [COMPOBJ.2] * CoInitialize16 [COMPOBJ.2]
* Set the win16 IMalloc used for memory management * Set the win16 IMalloc used for memory management
*/ */
HRESULT WINAPI CoInitialize16( HRESULT WINAPI CoInitialize16(
@ -56,8 +56,8 @@ HRESULT WINAPI CoInitialize16(
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CoInitialize (OLE32.26) * CoInitialize32 [OLE32.26]
* Set the win32 IMalloc used for memorymanagement * Set the win32 IMalloc used for memorymanagement
*/ */
HRESULT WINAPI CoInitialize32( HRESULT WINAPI CoInitialize32(
@ -91,8 +91,9 @@ HRESULT WINAPI CoGetMalloc16(
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CoGetMalloc32 [OLE32.4] * CoGetMalloc32 [OLE32.20]
*
* RETURNS * RETURNS
* The current win32 IMalloc * The current win32 IMalloc
*/ */
@ -118,8 +119,8 @@ OLESTATUS WINAPI CoCreateStandardMalloc16(DWORD dwMemContext,
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CoDisconnectObject * CoDisconnectObject [COMPOBJ.15]
*/ */
OLESTATUS WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) OLESTATUS WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
{ {
@ -140,16 +141,16 @@ BOOL16 WINAPI IsEqualGUID(
return !memcmp( g1, g2, sizeof(GUID) ); return !memcmp( g1, g2, sizeof(GUID) );
} }
/*********************************************************************** /******************************************************************************
* CLSIDFromString [COMPOBJ.20] * CLSIDFromString16 [COMPOBJ.20]
* Converts a unique identifier from it's string representation into * Converts a unique identifier from it's string representation into
* the GUID struct. * the GUID struct.
*
* Class id: DWORD-WORD-WORD-BYTES[2]-BYTES[6]
*
* RETURNS * RETURNS
* the converted GUID * the converted GUID
*/ */
/* Class id: DWORD-WORD-WORD-BYTES[2]-BYTES[6] */
OLESTATUS WINAPI CLSIDFromString16( OLESTATUS WINAPI CLSIDFromString16(
LPCOLESTR16 idstr, /* [in] string representation of guid */ LPCOLESTR16 idstr, /* [in] string representation of guid */
CLSID *id /* [out] GUID converted from string */ CLSID *id /* [out] GUID converted from string */
@ -216,8 +217,8 @@ OLESTATUS WINAPI CLSIDFromString16(
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CLSIDFromString (OLE32.3) * CLSIDFromString32 [OLE32.3]
* Converts a unique identifier from it's string representation into * Converts a unique identifier from it's string representation into
* the GUID struct. * the GUID struct.
* RETURNS * RETURNS
@ -234,8 +235,8 @@ OLESTATUS WINAPI CLSIDFromString32(
return ret; return ret;
} }
/*********************************************************************** /******************************************************************************
* WINE_StringFromCLSID [internal] * WINE_StringFromCLSID [???]
* Converts a GUID into the respective string representation. * Converts a GUID into the respective string representation.
* RETURNS * RETURNS
* the string representation and OLESTATUS * the string representation and OLESTATUS
@ -277,8 +278,8 @@ OLESTATUS WINAPI WINE_StringFromCLSID(
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* StringFromCLSID [COMPOBJ.19] * StringFromCLSID16 [COMPOBJ.19]
* Converts a GUID into the respective string representation. * Converts a GUID into the respective string representation.
* The target string is allocated using the OLE IMalloc. * The target string is allocated using the OLE IMalloc.
* RETURNS * RETURNS
@ -317,8 +318,8 @@ OLESTATUS WINAPI StringFromCLSID16(
return WINE_StringFromCLSID(id,PTR_SEG_TO_LIN(*idstr)); return WINE_StringFromCLSID(id,PTR_SEG_TO_LIN(*idstr));
} }
/*********************************************************************** /******************************************************************************
* StringFromCLSID [OLE32.151] * StringFromCLSID32 [OLE32.151]
* Converts a GUID into the respective string representation. * Converts a GUID into the respective string representation.
* The target string is allocated using the OLE IMalloc. * The target string is allocated using the OLE IMalloc.
* RETURNS * RETURNS
@ -343,8 +344,8 @@ OLESTATUS WINAPI StringFromCLSID32(
return ret; return ret;
} }
/*********************************************************************** /******************************************************************************
* StringFromGUID2 (OLE32.152) * StringFromGUID2 [COMPOBJ.76] [OLE32.152]
* *
* Converts a global unique identifier into a string of an API- * Converts a global unique identifier into a string of an API-
* specified fixed format. (The usual {.....} stuff.) * specified fixed format. (The usual {.....} stuff.)
@ -366,8 +367,8 @@ StringFromGUID2(REFGUID id, LPOLESTR32 str, INT32 cmax)
return strlen(xguid); return strlen(xguid);
} }
/*********************************************************************** /******************************************************************************
* CLSIDFromProgID [COMPOBJ.61] * CLSIDFromProgID16 [COMPOBJ.61]
* Converts a program id into the respective GUID. (By using a registry lookup) * Converts a program id into the respective GUID. (By using a registry lookup)
* RETURNS * RETURNS
* riid associated with the progid * riid associated with the progid
@ -397,8 +398,8 @@ OLESTATUS WINAPI CLSIDFromProgID16(
return CLSIDFromString16(buf2,riid); return CLSIDFromString16(buf2,riid);
} }
/*********************************************************************** /******************************************************************************
* CLSIDFromProgID (OLE32.2) * CLSIDFromProgID32 [OLE32.2]
* Converts a program id into the respective GUID. (By using a registry lookup) * Converts a program id into the respective GUID. (By using a registry lookup)
* RETURNS * RETURNS
* riid associated with the progid * riid associated with the progid
@ -442,8 +443,9 @@ OLESTATUS WINAPI CallObjectInWOW(LPVOID p1,LPVOID p2) {
return 0; return 0;
} }
/*********************************************************************** /******************************************************************************
* CoRegisterClassObject [COMPOBJ.5] * CoRegisterClassObject16 [COMPOBJ.5]
*
* Don't know where it registers it ... * Don't know where it registers it ...
*/ */
OLESTATUS WINAPI CoRegisterClassObject16( OLESTATUS WINAPI CoRegisterClassObject16(
@ -463,8 +465,9 @@ OLESTATUS WINAPI CoRegisterClassObject16(
return 0; return 0;
} }
/*********************************************************************** /******************************************************************************
* CoRegisterClassObject (OLE32.36) * CoRegisterClassObject32 [OLE32.36]
*
* Don't know where it registers it ... * Don't know where it registers it ...
*/ */
OLESTATUS WINAPI CoRegisterClassObject32( OLESTATUS WINAPI CoRegisterClassObject32(
@ -508,8 +511,8 @@ HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,
return hres; return hres;
} }
/*********************************************************************** /******************************************************************************
* CoRegisterMessageFilter [COMPOBJ.27] * CoRegisterMessageFilter16 [COMPOBJ.27]
*/ */
OLESTATUS WINAPI CoRegisterMessageFilter16( OLESTATUS WINAPI CoRegisterMessageFilter16(
LPMESSAGEFILTER lpMessageFilter, LPMESSAGEFILTER lpMessageFilter,
@ -611,8 +614,8 @@ HRESULT WINAPI CoInitializeWOW(DWORD x,DWORD y) {
return 0; return 0;
} }
/*********************************************************************** /******************************************************************************
* CoLockObjectExternal (COMPOBJ.63) * CoLockObjectExternal16 [COMPOBJ.63]
*/ */
HRESULT WINAPI CoLockObjectExternal16( HRESULT WINAPI CoLockObjectExternal16(
LPUNKNOWN pUnk, /* [in] object to be locked */ LPUNKNOWN pUnk, /* [in] object to be locked */
@ -622,8 +625,9 @@ HRESULT WINAPI CoLockObjectExternal16(
FIXME(ole,"(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases); FIXME(ole,"(%p,%d,%d),stub!\n",pUnk,fLock,fLastUnlockReleases);
return S_OK; return S_OK;
} }
/***********************************************************************
* CoLockObjectExternal (OLE32.31) /******************************************************************************
* CoLockObjectExternal32 [OLE32.31]
*/ */
HRESULT WINAPI CoLockObjectExternal32( HRESULT WINAPI CoLockObjectExternal32(
LPUNKNOWN pUnk, /* [in] object to be locked */ LPUNKNOWN pUnk, /* [in] object to be locked */

39
ole/ifs.c
View File

@ -20,9 +20,13 @@
#include "module.h" #include "module.h"
#include "debug.h" #include "debug.h"
/**************************************************************************** /*
* IUnknown * IUnknown
*/ */
/******************************************************************************
* IUnknown_AddRef [???]
*/
static ULONG WINAPI IUnknown_AddRef(LPUNKNOWN this) { static ULONG WINAPI IUnknown_AddRef(LPUNKNOWN this) {
TRACE(relay,"(%p)->AddRef()\n",this); TRACE(relay,"(%p)->AddRef()\n",this);
return ++(this->ref); return ++(this->ref);
@ -66,19 +70,29 @@ IUnknown_Constructor() {
return unk; return unk;
} }
/**************************************************************************** /*
* IMalloc16 * IMalloc
*/
/******************************************************************************
* IMalloc16_AddRef [COMPOBJ.501]
*/ */
ULONG WINAPI IMalloc16_AddRef(LPMALLOC16 this) { ULONG WINAPI IMalloc16_AddRef(LPMALLOC16 this) {
TRACE(relay,"(%p)->AddRef()\n",this); TRACE(relay,"(%p)->AddRef()\n",this);
return 1; /* cannot be freed */ return 1; /* cannot be freed */
} }
/******************************************************************************
* IMalloc16_Release [COMPOBJ.502]
*/
ULONG WINAPI IMalloc16_Release(LPMALLOC16 this) { ULONG WINAPI IMalloc16_Release(LPMALLOC16 this) {
TRACE(relay,"(%p)->Release()\n",this); TRACE(relay,"(%p)->Release()\n",this);
return 1; /* cannot be freed */ return 1; /* cannot be freed */
} }
/******************************************************************************
* IMalloc16_QueryInterface [COMPOBJ.500]
*/
HRESULT WINAPI IMalloc16_QueryInterface(LPMALLOC16 this,REFIID refiid,LPVOID *obj) { HRESULT WINAPI IMalloc16_QueryInterface(LPMALLOC16 this,REFIID refiid,LPVOID *obj) {
char xrefiid[50]; char xrefiid[50];
@ -167,19 +181,29 @@ IMalloc16_Constructor() {
return (LPMALLOC16)SEGPTR_GET(this); return (LPMALLOC16)SEGPTR_GET(this);
} }
/**************************************************************************** /*
* IMalloc32 * IMalloc32
*/ */
/******************************************************************************
* IMalloc32_AddRef [???]
*/
static ULONG WINAPI IMalloc32_AddRef(LPMALLOC32 this) { static ULONG WINAPI IMalloc32_AddRef(LPMALLOC32 this) {
TRACE(relay,"(%p)->AddRef()\n",this); TRACE(relay,"(%p)->AddRef()\n",this);
return 1; /* cannot be freed */ return 1; /* cannot be freed */
} }
/******************************************************************************
* IMalloc32_Release [???]
*/
static ULONG WINAPI IMalloc32_Release(LPMALLOC32 this) { static ULONG WINAPI IMalloc32_Release(LPMALLOC32 this) {
TRACE(relay,"(%p)->Release()\n",this); TRACE(relay,"(%p)->Release()\n",this);
return 1; /* cannot be freed */ return 1; /* cannot be freed */
} }
/******************************************************************************
* IMalloc32_QueryInterface [???]
*/
static HRESULT WINAPI IMalloc32_QueryInterface(LPMALLOC32 this,REFIID refiid,LPVOID *obj) { static HRESULT WINAPI IMalloc32_QueryInterface(LPMALLOC32 this,REFIID refiid,LPVOID *obj) {
char xrefiid[50]; char xrefiid[50];
@ -243,11 +267,14 @@ IMalloc32_Constructor() {
this->ref = 1; this->ref = 1;
return this; return this;
} }
/**************************************************************************** /****************************************************************************
* API Functions * API Functions
*/ */
/****************************************************************************
* IsValidInterface (OLE32.78) /******************************************************************************
* IsValidInterface32 [OLE32.78]
*
* RETURNS * RETURNS
* True, if the passed pointer is a valid interface * True, if the passed pointer is a valid interface
*/ */

9
ole/moniker.c
View File

@ -21,8 +21,8 @@
#include "module.h" #include "module.h"
#include "debug.h" #include "debug.h"
/**************************************************************************** /******************************************************************************
* CreateFileMoniker (OLE2.28) * CreateFileMoniker16 [OLE2.28]
*/ */
HRESULT WINAPI HRESULT WINAPI
CreateFileMoniker16( CreateFileMoniker16(
@ -32,8 +32,9 @@ CreateFileMoniker16(
FIXME(ole,"(%s,%p),stub!\n",lpszPathName,ppmk); FIXME(ole,"(%s,%p),stub!\n",lpszPathName,ppmk);
return E_FAIL; return E_FAIL;
} }
/****************************************************************************
* CreateFileMoniker (OLE32.55) /******************************************************************************
* CreateFileMoniker32 [OLE32.55]
*/ */
HRESULT WINAPI HRESULT WINAPI
CreateFileMoniker32( CreateFileMoniker32(

24
ole/ole2.c
View File

@ -10,8 +10,8 @@
#include "process.h" #include "process.h"
#include "debug.h" #include "debug.h"
/*********************************************************************** /******************************************************************************
* OleBuildVersion [OLE.1] * OleBuildVersion [OLE2.1]
*/ */
DWORD WINAPI OleBuildVersion() DWORD WINAPI OleBuildVersion()
{ {
@ -28,8 +28,8 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CoGetCurrentProcess [OLE2.2][OLE32.108] * CoGetCurrentProcess [COMPOBJ.34] [OLE2.2][OLE32.108]
* *
* NOTES * NOTES
* Is DWORD really the correct return type for this function? * Is DWORD really the correct return type for this function?
@ -38,8 +38,8 @@ DWORD WINAPI CoGetCurrentProcess() {
return (DWORD)PROCESS_Current(); return (DWORD)PROCESS_Current();
} }
/*********************************************************************** /******************************************************************************
* OleUnitialize (OLE2.3) (OLE32.131) * OleUninitialize [OLE2.3] [OLE32.131]
*/ */
void WINAPI OleUninitialize(void) void WINAPI OleUninitialize(void)
{ {
@ -54,8 +54,8 @@ HRESULT WINAPI OleFlushClipboard()
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* CoRegisterMessageFilter [OLE32.38] * CoRegisterMessageFilter32 [OLE32.38]
*/ */
HRESULT WINAPI CoRegisterMessageFilter32( HRESULT WINAPI CoRegisterMessageFilter32(
LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */ LPMESSAGEFILTER lpMessageFilter, /* Pointer to interface */
@ -68,16 +68,16 @@ HRESULT WINAPI CoRegisterMessageFilter32(
return S_OK; return S_OK;
} }
/*********************************************************************** /******************************************************************************
* OleInitializeWOW (OLE32.27) * OleInitializeWOW [OLE32.109]
*/ */
HRESULT WINAPI OleInitializeWOW(DWORD x) { HRESULT WINAPI OleInitializeWOW(DWORD x) {
FIXME(ole,"(0x%08lx),stub!\n",x); FIXME(ole,"(0x%08lx),stub!\n",x);
return 0; return 0;
} }
/*********************************************************************** /******************************************************************************
* GetRunningObjectTable (OLE2.30) * GetRunningObjectTable16 [OLE2.30]
*/ */
HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot) { HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPVOID *pprot) {
FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot); FIXME(ole,"(%ld,%p),stub!\n",reserved,pprot);

39
ole/ole2disp.c
View File

@ -17,6 +17,9 @@
represents BSTR as a 16:16 far pointer, and the strings represents BSTR as a 16:16 far pointer, and the strings
as ISO-8859 */ as ISO-8859 */
/******************************************************************************
* BSTR_AllocBytes [Internal]
*/
static BSTR16 BSTR_AllocBytes(int n) static BSTR16 BSTR_AllocBytes(int n)
{ {
void *ptr = SEGPTR_ALLOC(n); void *ptr = SEGPTR_ALLOC(n);
@ -33,8 +36,8 @@ static void* BSTR_GetAddr(BSTR16 in)
return in ? PTR_SEG_TO_LIN(in) : 0; return in ? PTR_SEG_TO_LIN(in) : 0;
} }
/*********************************************************************** /******************************************************************************
* SysAllocString [OLE2DISP.2] * SysAllocString16 [OLE2DISP.2]
*/ */
BSTR16 WINAPI SysAllocString16(LPOLESTR16 in) BSTR16 WINAPI SysAllocString16(LPOLESTR16 in)
{ {
@ -44,16 +47,16 @@ BSTR16 WINAPI SysAllocString16(LPOLESTR16 in)
return out; return out;
} }
/*********************************************************************** /******************************************************************************
* SysAllocString [OLEAUT32.2] * SysAllocString32 [OLEAUT32.2]
*/ */
BSTR32 WINAPI SysAllocString32(LPOLESTR32 in) BSTR32 WINAPI SysAllocString32(LPOLESTR32 in)
{ {
return HEAP_strdupW(GetProcessHeap(),0,in); return HEAP_strdupW(GetProcessHeap(),0,in);
} }
/*********************************************************************** /******************************************************************************
* SysReAllocString [OLE2DISP.3] * SysReAllocString16 [OLE2DISP.3]
*/ */
INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in) INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in)
{ {
@ -63,8 +66,8 @@ INT16 WINAPI SysReAllocString16(LPBSTR16 old,LPOLESTR16 in)
return 1; return 1;
} }
/*********************************************************************** /******************************************************************************
* SysReAllocString [OLEAUT32.3] * SysReAllocString32 [OLEAUT32.3]
*/ */
INT32 WINAPI SysReAllocString32(LPBSTR32 old,LPOLESTR32 in) INT32 WINAPI SysReAllocString32(LPBSTR32 old,LPOLESTR32 in)
{ {
@ -74,8 +77,8 @@ INT32 WINAPI SysReAllocString32(LPBSTR32 old,LPOLESTR32 in)
return 1; return 1;
} }
/*********************************************************************** /******************************************************************************
* SysAllocStringLen [OLE2DISP.4] * SysAllocStringLen16 [OLE2DISP.4]
*/ */
BSTR16 WINAPI SysAllocStringLen16(char *in, int len) BSTR16 WINAPI SysAllocStringLen16(char *in, int len)
{ {
@ -85,8 +88,8 @@ BSTR16 WINAPI SysAllocStringLen16(char *in, int len)
return out; return out;
} }
/*********************************************************************** /******************************************************************************
* SysReAllocStringLen [OLE2DISP.5] * SysReAllocStringLen16 [OLE2DISP.5]
*/ */
int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len) int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len)
{ {
@ -96,24 +99,24 @@ int WINAPI SysReAllocStringLen16(BSTR16 *old,char *in,int len)
return 1; return 1;
} }
/*********************************************************************** /******************************************************************************
* SysFreeString [OLE2DISP.6] * SysFreeString16 [OLE2DISP.6]
*/ */
void WINAPI SysFreeString16(BSTR16 in) void WINAPI SysFreeString16(BSTR16 in)
{ {
BSTR_Free(in); BSTR_Free(in);
} }
/*********************************************************************** /******************************************************************************
* SysFreeString [OLEAUT32.6] * SysFreeString32 [OLEAUT32.6]
*/ */
void WINAPI SysFreeString32(BSTR32 in) void WINAPI SysFreeString32(BSTR32 in)
{ {
HeapFree(GetProcessHeap(),0,in); HeapFree(GetProcessHeap(),0,in);
} }
/*********************************************************************** /******************************************************************************
* SysStringLen [OLE2DISP.7] * SysStringLen16 [OLE2DISP.7]
*/ */
int WINAPI SysStringLen16(BSTR16 str) int WINAPI SysStringLen16(BSTR16 str)
{ {

95
ole/ole2nls.c
View File

@ -401,8 +401,8 @@ LANGID WINAPI GetSystemDefaultLangID()
return GetUserDefaultLangID(); return GetUserDefaultLangID();
} }
/*********************************************************************** /******************************************************************************
* GetLocaleInfoA (OLE2NLS.5) * GetLocaleInfo16 [OLE2NLS.5]
* Is the last parameter really WORD for Win16? * Is the last parameter really WORD for Win16?
*/ */
INT16 WINAPI GetLocaleInfo16(LCID lcid,LCTYPE LCType,LPSTR buf,INT16 len) INT16 WINAPI GetLocaleInfo16(LCID lcid,LCTYPE LCType,LPSTR buf,INT16 len)
@ -555,8 +555,9 @@ INT32 WINAPI GetLocaleInfo32A(LCID lcid,LCTYPE LCType,LPSTR buf,INT32 len)
return strlen(retString)+1; return strlen(retString)+1;
} }
/*********************************************************************** /******************************************************************************
* GetLocaleInfo32W (KERNEL32.230) * GetLocaleInfo32W [KERNEL32.343]
*
* Is the last parameter really WORD for Win16? * Is the last parameter really WORD for Win16?
*/ */
INT32 WINAPI GetLocaleInfo32W(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT32 len) INT32 WINAPI GetLocaleInfo32W(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT32 len)
@ -570,8 +571,8 @@ INT32 WINAPI GetLocaleInfo32W(LCID lcid,LCTYPE LCType,LPWSTR wbuf,INT32 len)
return n; return n;
} }
/*********************************************************************** /******************************************************************************
* SetLocaleInfoA [KERNEL32.499] * SetLocaleInfoA [KERNEL32.656]
*/ */
BOOL16 WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data) BOOL16 WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data)
{ {
@ -579,8 +580,8 @@ BOOL16 WINAPI SetLocaleInfoA(DWORD lcid, DWORD lctype, LPCSTR data)
return TRUE; return TRUE;
} }
/*********************************************************************** /******************************************************************************
* IsValidLocale [KERNEL32.361] * IsValidLocale [KERNEL32.489]
*/ */
BOOL32 WINAPI IsValidLocale(LCID lcid,DWORD flags) BOOL32 WINAPI IsValidLocale(LCID lcid,DWORD flags)
{ {
@ -588,8 +589,8 @@ BOOL32 WINAPI IsValidLocale(LCID lcid,DWORD flags)
return TRUE; return TRUE;
} }
/*********************************************************************** /******************************************************************************
* EnumSystemLocales32W [KERNEL32.93] * EnumSystemLocales32W [KERNEL32.209]
*/ */
BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum, BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum,
DWORD flags ) DWORD flags )
@ -631,8 +632,8 @@ BOOL32 WINAPI EnumSystemLocales32W( LOCALE_ENUMPROC32W lpfnLocaleEnum,
return TRUE; return TRUE;
} }
/*********************************************************************** /******************************************************************************
* EnumSystemLocales32A [KERNEL32.92] * EnumSystemLocales32A [KERNEL32.208]
*/ */
BOOL32 WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A lpfnLocaleEnum, BOOL32 WINAPI EnumSystemLocales32A(LOCALE_ENUMPROC32A lpfnLocaleEnum,
DWORD flags) DWORD flags)
@ -1184,16 +1185,16 @@ static const WORD CT_CType3_LUT[] = {
0x8003 /* ÿ - 255 */ 0x8003 /* ÿ - 255 */
}; };
/*********************************************************************** /******************************************************************************
* GetStringTypeA [OLE2NLS.7] * GetStringType16 [OLE2NLS.7]
*/ */
BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src, BOOL16 WINAPI GetStringType16(LCID locale,DWORD dwInfoType,LPCSTR src,
INT16 cchSrc,LPWORD chartype) INT16 cchSrc,LPWORD chartype)
{ {
return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype); return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype);
} }
/*********************************************************************** /******************************************************************************
* GetStringTypeA [KERNEL32.277] * GetStringType32A [KERNEL32.396]
*/ */
BOOL32 WINAPI GetStringType32A(LCID locale,DWORD dwInfoType,LPCSTR src, BOOL32 WINAPI GetStringType32A(LCID locale,DWORD dwInfoType,LPCSTR src,
INT32 cchSrc,LPWORD chartype) INT32 cchSrc,LPWORD chartype)
@ -1201,8 +1202,8 @@ BOOL32 WINAPI GetStringType32A(LCID locale,DWORD dwInfoType,LPCSTR src,
return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype); return GetStringTypeEx32A(locale,dwInfoType,src,cchSrc,chartype);
} }
/*********************************************************************** /******************************************************************************
* GetStringTypeExA [KERNEL32.276] * GetStringTypeEx32A [KERNEL32.397]
* *
* FIXME: Ignores the locale. * FIXME: Ignores the locale.
*/ */
@ -1259,8 +1260,8 @@ BOOL32 WINAPI GetStringTypeEx32A(LCID locale,DWORD dwInfoType,LPCSTR src,
} }
} }
/********************************************************************* /******************************************************************************
* GetStringTypeW [KERNEL32.279] * GetStringType32W [KERNEL32.399]
* *
* NOTES * NOTES
* Yes, this is missing LCID locale. MS fault. * Yes, this is missing LCID locale. MS fault.
@ -1271,8 +1272,9 @@ BOOL32 WINAPI GetStringType32W(DWORD dwInfoType,LPCWSTR src,INT32 cchSrc,
return GetStringTypeEx32W(0/*defaultlocale*/,dwInfoType,src,cchSrc,chartype); return GetStringTypeEx32W(0/*defaultlocale*/,dwInfoType,src,cchSrc,chartype);
} }
/********************************************************************* /******************************************************************************
* GetStringTypeW [KERNEL32.278] * GetStringTypeEx32W [KERNEL32.398]
*
* FIXME: unicode chars are assumed chars * FIXME: unicode chars are assumed chars
*/ */
BOOL32 WINAPI GetStringTypeEx32W(LCID locale,DWORD dwInfoType,LPCWSTR src, BOOL32 WINAPI GetStringTypeEx32W(LCID locale,DWORD dwInfoType,LPCWSTR src,
@ -1782,6 +1784,9 @@ static int OLE2NLS_isPunctuation(unsigned char c)
return (LCM_Unicode_LUT[-2+2*c]==6); return (LCM_Unicode_LUT[-2+2*c]==6);
} }
/******************************************************************************
* identity [Internal]
*/
static int identity(int c) static int identity(int c)
{ {
return c; return c;
@ -2059,8 +2064,9 @@ UINT16 WINAPI CompareString16(DWORD lcid,DWORD fdwStyle,
return (UINT16)CompareString32A(lcid,fdwStyle,s1,l1,s2,l2); return (UINT16)CompareString32A(lcid,fdwStyle,s1,l1,s2,l2);
} }
/*********************************************************************** /******************************************************************************
* CompareString32A [KERNEL32.29] Compares two strings using locale * CompareString32A [KERNEL32.143]
* Compares two strings using locale
* *
* RETURNS * RETURNS
* *
@ -2138,8 +2144,8 @@ UINT32 WINAPI CompareString32A(
return 3; return 3;
} }
/*********************************************************************** /******************************************************************************
* CompareString32W (KERNEL32.30) * CompareString32W [KERNEL32.144]
* This implementation ignores the locale * This implementation ignores the locale
* FIXME : Does only string sort. Should * FIXME : Does only string sort. Should
* be reimplemented the same way as CompareString32A. * be reimplemented the same way as CompareString32A.
@ -2168,11 +2174,12 @@ UINT32 WINAPI CompareString32W(DWORD lcid, DWORD fdwStyle,
return (l1<l2)? 1 : 3; return (l1<l2)? 1 : 3;
} }
/***************************************************************** /******************************************************************************
* OLE_GetFormatA [Internal]
*
* FIXME
* Why is it WINAPI if internal?
* *
* OLE_GetFormatA() [internal]
This function implements stuff for GetDateFormat() and This function implements stuff for GetDateFormat() and
GetTimeFormat(). GetTimeFormat().
@ -2202,9 +2209,7 @@ UINT32 WINAPI CompareString32W(DWORD lcid, DWORD fdwStyle,
'' (within a quoted string) indicates a literal ' '' (within a quoted string) indicates a literal '
These functions REQUIRE valid locale, date, and format. These functions REQUIRE valid locale, date, and format.
*/ */
INT32 WINAPI OLE_GetFormatA(LCID locale, INT32 WINAPI OLE_GetFormatA(LCID locale,
DWORD flags, DWORD flags,
DWORD tflags, DWORD tflags,
@ -2615,8 +2620,9 @@ INT32 WINAPI OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
} }
/***************************************************************** /******************************************************************************
* GetDateFormat32A() [KERNEL32.310] Makes an ASCII string of the date * GetDateFormat32A [KERNEL32.310]
* Makes an ASCII string of the date
* *
* This function uses format to format the date, or, if format * This function uses format to format the date, or, if format
* is NULL, uses the default for the locale. format is a string * is NULL, uses the default for the locale. format is a string
@ -2636,7 +2642,6 @@ INT32 WINAPI OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
* - gg era string * - gg era string
* *
*/ */
INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags, INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
LPSYSTEMTIME xtime, LPSYSTEMTIME xtime,
LPCSTR format, LPSTR date,INT32 datelen) LPCSTR format, LPSTR date,INT32 datelen)
@ -2693,8 +2698,9 @@ INT32 WINAPI GetDateFormat32A(LCID locale,DWORD flags,
return ret; return ret;
} }
/* **************************************************************** /******************************************************************************
* GetDateFormat32W() [KERNEL32.311] Makes a Unicode string of the date * GetDateFormat32W [KERNEL32.311]
* Makes a Unicode string of the date
* *
* Acts the same as GetDateFormat32A(), except that it's Unicode. * Acts the same as GetDateFormat32A(), except that it's Unicode.
* Accepts & returns sizes as counts of Unicode characters. * Accepts & returns sizes as counts of Unicode characters.
@ -2825,9 +2831,9 @@ INT32 WINAPI GetNumberFormat32A(LCID locale, DWORD dwflags,
/***************************************************************** /******************************************************************************
* * GetTimeFormat32A [KERNEL32.422]
* GetTimeFormat32A() [KERNEL32.422] Makes an ASCII string of the time * Makes an ASCII string of the time
* *
* Formats date according to format, or locale default if format is * Formats date according to format, or locale default if format is
* NULL. The format consists of literal characters and fields as follows: * NULL. The format consists of literal characters and fields as follows:
@ -2844,7 +2850,6 @@ INT32 WINAPI GetNumberFormat32A(LCID locale, DWORD dwflags,
* tt time marker (AM, PM) * tt time marker (AM, PM)
* *
*/ */
INT32 WINAPI INT32 WINAPI
GetTimeFormat32A(LCID locale, /* in */ GetTimeFormat32A(LCID locale, /* in */
DWORD flags, /* in */ DWORD flags, /* in */
@ -2902,12 +2907,10 @@ GetTimeFormat32A(LCID locale, /* in */
} }
/* **************************************************************** /******************************************************************************
* GetTimeFormat32W() [KERNEL32.423] Makes a Unicode string of the time * GetTimeFormat32W [KERNEL32.423]
* * Makes a Unicode string of the time
*
*/ */
INT32 WINAPI INT32 WINAPI
GetTimeFormat32W(LCID locale,DWORD flags, GetTimeFormat32W(LCID locale,DWORD flags,
LPSYSTEMTIME xtime, LPSYSTEMTIME xtime,

56
ole/olecli.c
View File

@ -14,8 +14,8 @@
extern LONG OLE_current_handle; extern LONG OLE_current_handle;
/*********************************************************************** /******************************************************************************
* OleRegisterClientDoc * OleRegisterClientDoc16 [OLECLI.41]
*/ */
OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet ) LONG reserved, LHCLIENTDOC *hRet )
@ -25,8 +25,8 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname,
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRegisterClientDoc * OleRegisterClientDoc32 [OLECLI32.41]
*/ */
OLESTATUS WINAPI OleRegisterClientDoc32(LPCSTR classname, LPCSTR docname, OLESTATUS WINAPI OleRegisterClientDoc32(LPCSTR classname, LPCSTR docname,
LONG reserved, LHCLIENTDOC *hRet ) LONG reserved, LHCLIENTDOC *hRet )
@ -36,8 +36,8 @@ OLESTATUS WINAPI OleRegisterClientDoc32(LPCSTR classname, LPCSTR docname,
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRenameClientDoc * OleRenameClientDoc16 [OLECLI.43]
*/ */
OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
{ {
@ -45,8 +45,8 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRenameClientDoc * OleRenameClientDoc32 [OLECLI32.43]
*/ */
OLESTATUS WINAPI OleRenameClientDoc32(LHCLIENTDOC hDoc, LPCSTR newName) OLESTATUS WINAPI OleRenameClientDoc32(LHCLIENTDOC hDoc, LPCSTR newName)
{ {
@ -54,8 +54,8 @@ OLESTATUS WINAPI OleRenameClientDoc32(LHCLIENTDOC hDoc, LPCSTR newName)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRevokeClientDoc * OleRevokeClientDoc16 [OLECLI.42]
*/ */
OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
{ {
@ -63,8 +63,8 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRevokeClientDoc * OleRevokeClientDoc32 [OLECLI32.42]
*/ */
OLESTATUS WINAPI OleRevokeClientDoc32(LHCLIENTDOC hServerDoc) OLESTATUS WINAPI OleRevokeClientDoc32(LHCLIENTDOC hServerDoc)
{ {
@ -72,8 +72,8 @@ OLESTATUS WINAPI OleRevokeClientDoc32(LHCLIENTDOC hServerDoc)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleCreateLinkFromClip32 * OleCreateLinkFromClip32 [OLECLI32.11]
*/ */
OLESTATUS WINAPI OleCreateLinkFromClip32( OLESTATUS WINAPI OleCreateLinkFromClip32(
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,
@ -84,15 +84,15 @@ OLESTATUS WINAPI OleCreateLinkFromClip32(
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleQueryLinkFromClip32 * OleQueryLinkFromClip32 [OLECLI32.9]
*/ */
OLESTATUS WINAPI OleQueryLinkFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { OLESTATUS WINAPI OleQueryLinkFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat); FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleQueryCreateFromClip32 * OleQueryCreateFromClip32 [OLECLI32.10]
*/ */
OLESTATUS WINAPI OleQueryCreateFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { OLESTATUS WINAPI OleQueryCreateFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) {
FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat); FIXME(ole,"(%s,%d,%ld): stub!\n",name,render,clipformat);
@ -100,8 +100,8 @@ OLESTATUS WINAPI OleQueryCreateFromClip32(LPCSTR name,OLEOPT_RENDER render,OLECL
} }
/*********************************************************************** /******************************************************************************
* OleIsDcMeta16 * OleIsDcMeta16 [OLECLI.60]
*/ */
BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc) BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
{ {
@ -114,8 +114,8 @@ BOOL16 WINAPI OleIsDcMeta16(HDC16 hdc)
} }
/*********************************************************************** /******************************************************************************
* OleIsDcMeta32 * OleIsDcMeta32 [OLECLI32.60]
*/ */
BOOL32 WINAPI OleIsDcMeta32(HDC32 hdc) BOOL32 WINAPI OleIsDcMeta32(HDC32 hdc)
{ {
@ -128,16 +128,16 @@ BOOL32 WINAPI OleIsDcMeta32(HDC32 hdc)
} }
/*********************************************************************** /******************************************************************************
* OleSetHostNames * OleSetHostNames32 [OLECLI32.15]
*/ */
OLESTATUS WINAPI OleSetHostNames32(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) { OLESTATUS WINAPI OleSetHostNames32(LPOLEOBJECT oleob,LPCSTR name1,LPCSTR name2) {
FIXME(ole,"(%p,%s,%s): stub\n",oleob,name1,name2); FIXME(ole,"(%p,%s,%s): stub\n",oleob,name1,name2);
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleQueryType32 * OleQueryType32 [OLECLI32.14]
*/ */
OLESTATUS WINAPI OleQueryType32(LPOLEOBJECT oleob,LONG*xlong) { OLESTATUS WINAPI OleQueryType32(LPOLEOBJECT oleob,LONG*xlong) {
FIXME(ole,"(%p,%p): stub!\n",oleob,xlong); FIXME(ole,"(%p,%p): stub!\n",oleob,xlong);
@ -148,8 +148,8 @@ OLESTATUS WINAPI OleQueryType32(LPOLEOBJECT oleob,LONG*xlong) {
return oleob->lpvtbl->QueryType(oleob,xlong); return oleob->lpvtbl->QueryType(oleob,xlong);
} }
/*********************************************************************** /******************************************************************************
* OleCreateFromClip * OleCreateFromClip32 [OLECLI32.12]
*/ */
OLESTATUS WINAPI OleCreateFromClip32( OLESTATUS WINAPI OleCreateFromClip32(
LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname,

38
ole/olesvr.c
View File

@ -13,8 +13,8 @@
LONG OLE_current_handle; LONG OLE_current_handle;
/*********************************************************************** /******************************************************************************
* OleRegisterServer * OleRegisterServer16 [OLESVR.2]
*/ */
OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct, OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
LHSERVER *hRet, HINSTANCE16 hServer, LHSERVER *hRet, HINSTANCE16 hServer,
@ -26,8 +26,8 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct,
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleBlockServer * OleBlockServer16 [OLESVR.4]
*/ */
OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
{ {
@ -35,8 +35,8 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleBlockServer * OleBlockServer32 [OLESVR32.4]
*/ */
OLESTATUS WINAPI OleBlockServer32(LHSERVER hServer) OLESTATUS WINAPI OleBlockServer32(LHSERVER hServer)
{ {
@ -44,8 +44,8 @@ OLESTATUS WINAPI OleBlockServer32(LHSERVER hServer)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleUnblockServer * OleUnblockServer16 [OLESVR.5]
*/ */
OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
{ {
@ -55,8 +55,8 @@ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleUnblockServer * OleUnblockServer32 [OLESVR32.5]
*/ */
OLESTATUS WINAPI OleUnblockServer32(LHSERVER hServer, BOOL32 *block) OLESTATUS WINAPI OleUnblockServer32(LHSERVER hServer, BOOL32 *block)
{ {
@ -67,7 +67,7 @@ OLESTATUS WINAPI OleUnblockServer32(LHSERVER hServer, BOOL32 *block)
} }
/*********************************************************************** /***********************************************************************
* OleRegisterServerDoc * OleRegisterServerDoc16 [OLESVR.6]
*/ */
OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
LPOLESERVERDOC document, LPOLESERVERDOC document,
@ -78,8 +78,8 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname,
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRevokeServerDoc * OleRevokeServerDoc16 [OLESVR.7]
*/ */
OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
{ {
@ -87,8 +87,8 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRevokeServerDoc * OleRevokeServerDoc32 [OLESVR32.7]
*/ */
OLESTATUS WINAPI OleRevokeServerDoc32(LHSERVERDOC hServerDoc) OLESTATUS WINAPI OleRevokeServerDoc32(LHSERVERDOC hServerDoc)
{ {
@ -96,8 +96,8 @@ OLESTATUS WINAPI OleRevokeServerDoc32(LHSERVERDOC hServerDoc)
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRevokeServer * OleRevokeServer [OLESVR.3]
*/ */
OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer)
{ {
@ -120,8 +120,8 @@ OLESTATUS WINAPI OleRegisterServerDoc32( LHSERVER hServer, LPCSTR docname,
return OLE_OK; return OLE_OK;
} }
/*********************************************************************** /******************************************************************************
* OleRenameServerDoc32 * OleRenameServerDoc32 [OLESVR32.8]
* *
*/ */
OLESTATUS WINAPI OleRenameServerDoc32(LHSERVERDOC hDoc, LPCSTR newName) OLESTATUS WINAPI OleRenameServerDoc32(LHSERVERDOC hDoc, LPCSTR newName)

74
ole/storage.c
View File

@ -47,6 +47,8 @@ static void _create_istream16(LPSTREAM16 *str);
#define IMPLEMENTED 1 #define IMPLEMENTED 1
/****************************************************************************** /******************************************************************************
* STORAGE_get_big_block [Internal]
*
* Reading OLE compound storage * Reading OLE compound storage
*/ */
static BOOL32 static BOOL32
@ -119,7 +121,9 @@ STORAGE_get_nth_next_big_blocknr(HFILE32 hf,int blocknr,int nr) {
return blocknr; return blocknr;
} }
/******************************************************************************
* STORAGE_get_root_pps_entry [Internal]
*/
static BOOL32 static BOOL32
STORAGE_get_root_pps_entry(HFILE32 hf,struct storage_pps_entry *pstde) { STORAGE_get_root_pps_entry(HFILE32 hf,struct storage_pps_entry *pstde) {
int blocknr,i; int blocknr,i;
@ -238,6 +242,9 @@ STORAGE_get_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
return 1; return 1;
} }
/******************************************************************************
* STORAGE_put_pps_entry [Internal]
*/
static int static int
STORAGE_put_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) { STORAGE_put_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
int blocknr; int blocknr;
@ -256,6 +263,9 @@ STORAGE_put_pps_entry(HFILE32 hf,int n,struct storage_pps_entry *pstde) {
return 1; return 1;
} }
/******************************************************************************
* STORAGE_look_for_named_pps [Internal]
*/
static int static int
STORAGE_look_for_named_pps(HFILE32 hf,int n,LPOLESTR32 name) { STORAGE_look_for_named_pps(HFILE32 hf,int n,LPOLESTR32 name) {
struct storage_pps_entry stde; struct storage_pps_entry stde;
@ -281,7 +291,12 @@ STORAGE_look_for_named_pps(HFILE32 hf,int n,LPOLESTR32 name) {
return -1; return -1;
} }
/* FIXME: Function is unused */ /******************************************************************************
* STORAGE_dump_pps_entry [Internal]
*
* FIXME
* Function is unused
*/
void void
STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { STORAGE_dump_pps_entry(struct storage_pps_entry *stde) {
char name[33],xguid[50]; char name[33],xguid[50];
@ -350,6 +365,9 @@ STORAGE_init_storage(HFILE32 hf) {
return TRUE; return TRUE;
} }
/******************************************************************************
* STORAGE_set_big_chain [Internal]
*/
static BOOL32 static BOOL32
STORAGE_set_big_chain(HFILE32 hf,int blocknr,INT32 type) { STORAGE_set_big_chain(HFILE32 hf,int blocknr,INT32 type) {
BYTE block[BIGSIZE]; BYTE block[BIGSIZE];
@ -405,6 +423,9 @@ STORAGE_set_small_chain(HFILE32 hf,int blocknr,INT32 type) {
return TRUE; return TRUE;
} }
/******************************************************************************
* STORAGE_get_free_big_blocknr [Internal]
*/
static int static int
STORAGE_get_free_big_blocknr(HFILE32 hf) { STORAGE_get_free_big_blocknr(HFILE32 hf) {
BYTE block[BIGSIZE]; BYTE block[BIGSIZE];
@ -461,6 +482,9 @@ STORAGE_get_free_big_blocknr(HFILE32 hf) {
} }
/******************************************************************************
* STORAGE_get_free_small_blocknr [Internal]
*/
static int static int
STORAGE_get_free_small_blocknr(HFILE32 hf) { STORAGE_get_free_small_blocknr(HFILE32 hf) {
BYTE block[BIGSIZE]; BYTE block[BIGSIZE];
@ -540,6 +564,9 @@ STORAGE_get_free_small_blocknr(HFILE32 hf) {
return newblocknr; return newblocknr;
} }
/******************************************************************************
* STORAGE_get_free_pps_entry [Internal]
*/
static int static int
STORAGE_get_free_pps_entry(HFILE32 hf) { STORAGE_get_free_pps_entry(HFILE32 hf) {
int blocknr,i,curblock,lastblocknr; int blocknr,i,curblock,lastblocknr;
@ -577,7 +604,7 @@ STORAGE_get_free_pps_entry(HFILE32 hf) {
} }
/****************************************************************************** /******************************************************************************
* IStream * IStream16_QueryInterface [STORAGE.518]
*/ */
HRESULT WINAPI IStream16_QueryInterface( HRESULT WINAPI IStream16_QueryInterface(
LPSTREAM16 this,REFIID refiid,LPVOID *obj LPSTREAM16 this,REFIID refiid,LPVOID *obj
@ -609,7 +636,12 @@ ULONG WINAPI IStream16_Release(LPSTREAM16 this) {
return this->ref; return this->ref;
} }
/* FIXME: not handling 64 bit */ /******************************************************************************
* IStream16_Seek [STORAGE.523]
*
* FIXME
* Does not handle 64 bits
*/
HRESULT WINAPI IStream16_Seek( HRESULT WINAPI IStream16_Seek(
LPSTREAM16 this,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos LPSTREAM16 this,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos
) { ) {
@ -650,6 +682,9 @@ HRESULT WINAPI IStream16_Seek(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* IStream16_Read [STORAGE.521]
*/
HRESULT WINAPI IStream16_Read( HRESULT WINAPI IStream16_Read(
LPSTREAM16 this,void *pv,ULONG cb,ULONG *pcbRead LPSTREAM16 this,void *pv,ULONG cb,ULONG *pcbRead
) { ) {
@ -707,6 +742,9 @@ HRESULT WINAPI IStream16_Read(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* IStream16_Write [STORAGE.522]
*/
HRESULT WINAPI IStream16_Write( HRESULT WINAPI IStream16_Write(
LPSTREAM16 this,const void *pv,ULONG cb,ULONG *pcbWrite LPSTREAM16 this,const void *pv,ULONG cb,ULONG *pcbWrite
) { ) {
@ -965,6 +1003,9 @@ HRESULT WINAPI IStream16_Write(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* _create_istream16 [Internal]
*/
static void _create_istream16(LPSTREAM16 *str) { static void _create_istream16(LPSTREAM16 *str) {
LPSTREAM16 lpst; LPSTREAM16 lpst;
@ -1020,7 +1061,7 @@ static void _create_istream16(LPSTREAM16 *str) {
} }
/***************************************************************************** /*****************************************************************************
* IStream32 * IStream32_QueryInterface [???]
*/ */
HRESULT WINAPI IStream32_QueryInterface( HRESULT WINAPI IStream32_QueryInterface(
LPSTREAM32 this,REFIID refiid,LPVOID *obj LPSTREAM32 this,REFIID refiid,LPVOID *obj
@ -1066,8 +1107,9 @@ static IStream32_VTable strvt32 = {
(void*)11, (void*)11,
}; };
/****************************************************************************** /******************************************************************************
* IStorage * IStorage16_QueryInterface [STORAGE.500]
*/ */
HRESULT WINAPI IStorage16_QueryInterface( HRESULT WINAPI IStorage16_QueryInterface(
LPSTORAGE16 this,REFIID refiid,LPVOID *obj LPSTORAGE16 this,REFIID refiid,LPVOID *obj
@ -1116,6 +1158,9 @@ HRESULT WINAPI IStorage16_Stat(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* IStorage16_Commit [STORAGE.509]
*/
HRESULT WINAPI IStorage16_Commit( HRESULT WINAPI IStorage16_Commit(
LPSTORAGE16 this,DWORD commitflags LPSTORAGE16 this,DWORD commitflags
) { ) {
@ -1196,6 +1241,9 @@ HRESULT WINAPI IStorage16_CreateStorage(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* IStorage16_CreateStream [STORAGE.503]
*/
HRESULT WINAPI IStorage16_CreateStream( HRESULT WINAPI IStorage16_CreateStream(
LPSTORAGE16 this,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved1,DWORD reserved2, IStream16 **ppstm LPSTORAGE16 this,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved1,DWORD reserved2, IStream16 **ppstm
) { ) {
@ -1244,6 +1292,9 @@ HRESULT WINAPI IStorage16_CreateStream(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* IStorage16_OpenStorage [STORAGE.506]
*/
HRESULT WINAPI IStorage16_OpenStorage( HRESULT WINAPI IStorage16_OpenStorage(
LPSTORAGE16 this,LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg LPSTORAGE16 this,LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg
) { ) {
@ -1369,7 +1420,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) {
} }
/****************************************************************************** /******************************************************************************
* IStorage32 * IStorage32_QueryInterface [???]
*/ */
HRESULT WINAPI IStorage32_QueryInterface( HRESULT WINAPI IStorage32_QueryInterface(
LPSTORAGE32 this,REFIID refiid,LPVOID *obj LPSTORAGE32 this,REFIID refiid,LPVOID *obj
@ -1445,6 +1496,9 @@ static IStorage32_VTable stvt32 = {
* Storage API functions * Storage API functions
*/ */
/******************************************************************************
* StgCreateDocFile16 [STORAGE.1]
*/
OLESTATUS WINAPI StgCreateDocFile16( OLESTATUS WINAPI StgCreateDocFile16(
LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen
) { ) {
@ -1486,6 +1540,9 @@ OLESTATUS WINAPI StgCreateDocFile16(
return OLE_OK; return OLE_OK;
} }
/******************************************************************************
* StgCreateDocFile32 [OLE32.144]
*/
OLESTATUS WINAPI StgCreateDocFile32( OLESTATUS WINAPI StgCreateDocFile32(
LPCOLESTR32 pwcsName,DWORD grfMode,DWORD reserved,IStorage32 **ppstgOpen LPCOLESTR32 pwcsName,DWORD grfMode,DWORD reserved,IStorage32 **ppstgOpen
) { ) {
@ -1582,6 +1639,9 @@ OLESTATUS WINAPI StgOpenStorage16(
} }
/******************************************************************************
* StgOpenStorage32 [OLE32.148]
*/
OLESTATUS WINAPI StgOpenStorage32( OLESTATUS WINAPI StgOpenStorage32(
const OLECHAR32 * pwcsName,IStorage32 *pstgPriority,DWORD grfMode, const OLECHAR32 * pwcsName,IStorage32 *pstgPriority,DWORD grfMode,
SNB32 snbExclude,DWORD reserved, IStorage32 **ppstgOpen SNB32 snbExclude,DWORD reserved, IStorage32 **ppstgOpen

9
ole/typelib.c
View File

@ -19,7 +19,8 @@
#include "debug.h" #include "debug.h"
/**************************************************************************** /****************************************************************************
* QueryPathOfRegTypeLib (TYPELIB.14) * QueryPathOfRegTypeLib16 [TYPELIB.14]
*
* the path is "Classes\Typelib\<guid>\<major>.<minor>\<lcid>\win16\" * the path is "Classes\Typelib\<guid>\<major>.<minor>\<lcid>\win16\"
* RETURNS * RETURNS
* path of typelib * path of typelib
@ -56,7 +57,7 @@ QueryPathOfRegTypeLib16(
} }
/**************************************************************************** /****************************************************************************
* QueryPathOfRegTypeLib (OLEAUT32.164) * QueryPathOfRegTypeLib32 [OLEAUT32.164]
* RETURNS * RETURNS
* path of typelib * path of typelib
*/ */
@ -111,7 +112,7 @@ HRESULT WINAPI LoadTypeLib(
} }
/****************************************************************************** /******************************************************************************
* LoadTypeLib (OLEAUT32.161) * LoadTypeLib32 [OLEAUT32.161]
* Loads and registers a type library * Loads and registers a type library
* NOTES * NOTES
* Docs: OLECHAR FAR* szFile * Docs: OLECHAR FAR* szFile
@ -131,7 +132,7 @@ HRESULT WINAPI LoadTypeLib32(
} }
/****************************************************************************** /******************************************************************************
* RegisterTypeLib (OLEAUT32.163) * RegisterTypeLib32 [OLEAUT32.163]
* Adds information about a type library to the System Registry * Adds information about a type library to the System Registry
* NOTES * NOTES
* Docs: ITypeLib FAR * ptlib * Docs: ITypeLib FAR * ptlib