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

ole32: Fix conformance test to compile with MSVC6.

This commit is contained in:
Mike McCormack 2006-07-12 14:53:57 +09:00 committed by Alexandre Julliard
parent a5b3479774
commit d323acc23b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ole32/tests/stg_prop.c
View File

@ -20,6 +20,10 @@
#include "objbase.h" #include "objbase.h"
#include "wine/test.h" #include "wine/test.h"
#ifndef PID_BEHAVIOR
#define PID_BEHAVIOR 0x80000003
#endif
static HRESULT (WINAPI *pFmtIdToPropStgName)(const FMTID *, LPOLESTR); static HRESULT (WINAPI *pFmtIdToPropStgName)(const FMTID *, LPOLESTR);
static HRESULT (WINAPI *pPropStgNameToFmtId)(const LPOLESTR, FMTID *); static HRESULT (WINAPI *pPropStgNameToFmtId)(const LPOLESTR, FMTID *);
static HRESULT (WINAPI *pStgCreatePropSetStg)(IStorage *, DWORD, IPropertySetStorage **); static HRESULT (WINAPI *pStgCreatePropSetStg)(IStorage *, DWORD, IPropertySetStorage **);
@ -391,7 +395,7 @@ static void testCodepage(void)
* obviously something about string conversion I don't understand. * obviously something about string conversion I don't understand.
*/ */
if(0) { if(0) {
static const char strVal[] = { 0x81, 0xff, 0x04, 0 }; static const unsigned char strVal[] = { 0x81, 0xff, 0x04, 0 };
/* Set code page to 950 (Traditional Chinese) */ /* Set code page to 950 (Traditional Chinese) */
U(var).iVal = 950; U(var).iVal = 950;
hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);
@ -408,7 +412,7 @@ static void testCodepage(void)
/* Check returned string */ /* Check returned string */
hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var);
ok(SUCCEEDED(hr), "ReadMultiple failed: 0x%08lx\n", hr); ok(SUCCEEDED(hr), "ReadMultiple failed: 0x%08lx\n", hr);
ok(var.vt == VT_LPSTR && !strcmp(U(var).pszVal, strVal), ok(var.vt == VT_LPSTR && !strcmp(U(var).pszVal, (LPCSTR)strVal),
"Didn't get expected type or value for property\n"); "Didn't get expected type or value for property\n");
} }

5
dlls/ole32/tests/storage32.c
View File

@ -22,10 +22,9 @@
#define COBJMACROS #define COBJMACROS
#include <windows.h>
#include "wine/test.h" #include "wine/test.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "ole2.h" #include "ole2.h"
#include "objidl.h" #include "objidl.h"
#include "initguid.h" #include "initguid.h"