Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38570: sync oleaut32_winetest with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 13:19:05 2009 New Revision: 38570 URL: http://svn.reactos.org/svn/reactos?rev=38570&view=rev Log: sync oleaut32_winetest with wine 1.1.12 Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild trunk/rostests/winetests/oleaut32/olefont.c trunk/rostests/winetests/oleaut32/olepicture.c trunk/rostests/winetests/oleaut32/safearray.c trunk/rostests/winetests/oleaut32/tmarshal.c trunk/rostests/winetests/oleaut32/tmarshal.idl trunk/rostests/winetests/oleaut32/tmarshal.rc trunk/rostests/winetests/oleaut32/tmarshal_dispids.h trunk/rostests/winetests/oleaut32/typelib.c trunk/rostests/winetests/oleaut32/usrmarshal.c trunk/rostests/winetests/oleaut32/varformat.c trunk/rostests/winetests/oleaut32/vartest.c trunk/rostests/winetests/oleaut32/vartype.c Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/oleaut… ============================================================================== --- trunk/rostests/winetests/oleaut32/oleaut32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/oleaut32.rbuild [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -4,10 +4,11 @@ <module name="oleaut32_winetest" type="win32cui" installbase="bin" installname="oleaut32_winetest.exe" allowwarnings="true"> <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="oleaut32_winetest">.</include> + <include base="ReactOS">include/reactos/wine</include> + <include base="oleaut32_winetest" root="intermediate">.</include> <library>wine</library> <library>oleaut32</library> <library>ole32</library> - <library>shlwapi</library> <library>rpcrt4</library> <library>user32</library> <library>gdi32</library> @@ -26,5 +27,18 @@ <file>vartype.c</file> <file>tmarshal.rc</file> <file>testlist.c</file> + <dependency>tmarshal_header</dependency> + <dependency>tmarshal</dependency> + <dependency>test_tlb</dependency> + <dependency>stdole2.tlb</dependency> +</module> +<module name="tmarshal_header" type="idlheader"> + <file>tmarshal.idl</file> +</module> +<module name="test_tlb" type="embeddedtypelib" allowwarnings="true"> + <file>test_tlb.idl</file> +</module> +<module name="tmarshal" type="embeddedtypelib" allowwarnings="true"> + <file>tmarshal.idl</file> </module> </group> Modified: trunk/rostests/winetests/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olefon… ============================================================================== --- trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olefont.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -24,7 +24,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS @@ -36,9 +35,12 @@ #include <winnls.h> #include <winerror.h> #include <winnt.h> +#include <initguid.h> #include <wtypes.h> #include <olectl.h> #include <ocidl.h> + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static WCHAR MSSansSerif_font[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f',0}; static WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; @@ -135,13 +137,15 @@ /* Test if QueryInterface increments ref counter for IFONTs */ ret = IFont_AddRef(font); - ok(ret == 3, "IFont_QI expected ref value 3 but instead got %12u\n",ret); + ok(ret == 3 || + broken(ret == 1), /* win95 */ + "IFont_QI expected ref value 3 but instead got %d\n",ret); IFont_Release(font); ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08x\n", hres); ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n"); - /* Orignial ref and QueryInterface ref both have to be released */ + /* Original ref and QueryInterface ref both have to be released */ IFont_Release(font); IFont_Release(font); } @@ -171,6 +175,7 @@ ok(hres == S_OK, "GetNames returned 0x%08x instead of S_OK.\n", hres); ok(n == 1, "GetNames returned %d names instead of 1.\n", n); ok(!lstrcmpiW(names[0],name_Name), "DISPID_FONT_NAME doesn't get 'Names'.\n"); + SysFreeString(names[0]); ITypeInfo_Release(pTInfo); @@ -768,8 +773,9 @@ /* Decrement reference for destroyed hfnt1 */ hres = IFont_ReleaseHfont(ifnt2,hfnt1); - ok(hres == S_OK, - "IFont_AddRefHfont: (Release ref) Expected S_OK but got 0x%08x\n", + ok(hres == S_OK || + hres == S_FALSE, /* <= win2k */ + "IFont_AddRefHfont: (Release ref) Expected S_OK or S_FALSE but got 0x%08x\n", hres); /* Shows that releasing all IFONT's does clear the HFONT cache. */ @@ -811,13 +817,16 @@ /* Test various size operations and conversions. */ /* Add more as needed. */ - test_ifont_sizes(180000, 0, 72, 2540, -18, "default"); - test_ifont_sizes(180000, 0, 144, 2540, -36, "ratio1"); /* change ratio */ - test_ifont_sizes(180000, 0, 72, 1270, -36, "ratio2"); /* 2nd part of ratio */ - - /* These depend on details of how IFont rounds sizes internally. */ - test_ifont_sizes(0, 0, 72, 2540, 0, "zero size"); /* zero size */ - test_ifont_sizes(186000, 0, 72, 2540, -19, "rounding"); /* test rounding */ + if (0) /* FIXME: failing tests */ + { + test_ifont_sizes(180000, 0, 72, 2540, -18, "default"); + test_ifont_sizes(180000, 0, 144, 2540, -36, "ratio1"); /* change ratio */ + test_ifont_sizes(180000, 0, 72, 1270, -36, "ratio2"); /* 2nd part of ratio */ + + /* These depend on details of how IFont rounds sizes internally. */ + test_ifont_sizes(0, 0, 72, 2540, 0, "zero size"); /* zero size */ + test_ifont_sizes(186000, 0, 72, 2540, -19, "rounding"); /* test rounding */ + } test_font_events_disp(); test_GetIDsOfNames(); Modified: trunk/rostests/winetests/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/olepic… ============================================================================== --- trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/olepicture.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -23,9 +23,9 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS +#define NONAMELESSUNION #include "wine/test.h" #include <windef.h> @@ -121,6 +121,53 @@ 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00 }; +/* MF_TEXTOUT_ON_PATH_BITS from gdi32/tests/metafile.c */ +static const unsigned char metafile[] = { + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x19, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x32, 0x0a, + 0x16, 0x00, 0x0b, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x54, 0x65, 0x73, 0x74, 0x03, 0x00, 0x05, 0x00, + 0x08, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00 +}; + +/* EMF_TEXTOUT_ON_PATH_BITS from gdi32/tests/metafile.c */ +static const unsigned char enhmetafile[] = { + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe7, 0xff, 0xff, 0xff, 0xe9, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, + 0x80, 0xa9, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc8, 0x41, 0x00, 0x80, 0xbb, 0x41, + 0x0b, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x54, 0x00, 0x00, 0x00, + 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + + struct NoStatStreamImpl { const IStreamVtbl *lpVtbl; @@ -480,6 +527,124 @@ IStream_Release(stream); } +static void test_metafile(void) +{ + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + + hglob = GlobalAlloc (0, sizeof(metafile)); + data = GlobalLock(hglob); + memcpy(data, metafile, sizeof(metafile)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + /* Windows does not load simple metafiles */ + ole_expect(OleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); + + IStream_Release(stream); +} + +static void test_enhmetafile(void) +{ + OLE_HANDLE handle; + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + LONG cxy; + BOOL keep; + short type; + + hglob = GlobalAlloc (0, sizeof(enhmetafile)); + data = GlobalLock(hglob); + memcpy(data, enhmetafile, sizeof(enhmetafile)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + ole_check(OleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); + + ole_check(IPicture_get_Handle(pict, &handle)); + ok(handle != 0, "handle is null\n"); + + ole_check(IPicture_get_Type(pict, &type)); + expect_eq(type, PICTYPE_ENHMETAFILE, short, "%d"); + + ole_check(IPicture_get_Height(pict, &cxy)); + expect_eq(cxy, -23, LONG, "%d"); + + ole_check(IPicture_get_Width(pict, &cxy)); + expect_eq(cxy, -25, LONG, "%d"); + + ole_check(IPicture_get_KeepOriginalFormat(pict, &keep)); + todo_wine expect_eq(keep, FALSE, LONG, "%d"); + + IPicture_Release(pict); + IStream_Release(stream); +} + +static void test_Render(void) +{ + IPicture *pic; + HRESULT hres; + short type; + PICTDESC desc; + HDC hdc = GetDC(0); + + /* test IPicture::Render return code on uninitialized picture */ + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = IPicture_get_Type(pic, &type); + ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); + ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); + /* zero dimensions */ + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + /* nonzero dimensions, PICTYPE_UNINITIALIZED */ + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, S_OK); + IPicture_Release(pic); + + desc.cbSizeofstruct = sizeof(PICTDESC); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = LoadIcon(NULL, IDI_APPLICATION); + if(!desc.u.icon.hicon){ + win_skip("LoadIcon failed. Skipping...\n"); + ReleaseDC(NULL, hdc); + return; + } + + OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (VOID**)&pic); + /* zero dimensions, PICTYPE_ICON */ + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 10, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 10, 0, 0, 0, 0, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 10, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 10, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + hres = IPicture_Render(pic, hdc, 0, 0, 0, 0, 0, 0, 10, 10, NULL); + ole_expect(hres, CTL_E_INVALIDPROPERTYVALUE); + IPicture_Release(pic); + + ReleaseDC(NULL, hdc); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -501,9 +666,12 @@ test_empty_image(); test_empty_image_2(); test_apm(); + test_metafile(); + test_enhmetafile(); test_Invoke(); test_OleCreatePictureIndirect(); + test_Render(); } Modified: trunk/rostests/winetests/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear… ============================================================================== --- trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #define COBJMACROS #include "wine/test.h" @@ -355,14 +354,23 @@ SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); + bounds[0].cElements = 0; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); + + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); bounds[0].cElements = 1; bounds[0].lLbound = 1; bounds[1].cElements = 0; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); ok(a != NULL,"SAC(VT_INT32,2,...) with 0 element dim failed.\n"); + + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); bounds[0].cElements = 42; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; @@ -442,6 +450,9 @@ hres = SafeArrayUnaccessData(a); ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres); + + hres = SafeArrayDestroy(a); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { if ((i == VT_I8 || i == VT_UI8) && HAVE_OLEAUT32_I8) @@ -478,12 +489,8 @@ { hres = pSafeArrayGetVartype(a, &vt); ok(hres == S_OK, "SAGVT of arra y with vt %d failed with %x\n", vttypes[i].vt, hres); - if (vttypes[i].vt == VT_DISPATCH) { - /* Special case. Checked against Windows. */ - ok(vt == VT_UNKNOWN, "SAGVT of a rray with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); - } else { - ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); - } + /* Windows prior to Vista returns VT_UNKNOWN instead of VT_DISPATCH */ + ok(broken(vt == VT_UNKNOWN) || vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); } hres = SafeArrayCopy(a, &c); @@ -497,12 +504,8 @@ if (pSafeArrayGetVartype) { hres = pSafeArrayGetVartype(c, &vt); ok(hres == S_OK, "SAGVT of array with vt %d failed with %x\n", vttypes[i].vt, hres); - if (vttypes[i].vt == VT_DISPATCH) { - /* Special case. Checked against Windows. */ - ok(vt == VT_UNKNOWN, "SAGVT of array with VT_DISPATCH returned not VT_UNKNOWN, but %d\n", vt); - } else { - ok(vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); - } + /* Windows prior to Vista returns VT_UNKNOWN instead of VT_DISPATCH */ + ok(broken(vt == VT_UNKNOWN) || vt == vttypes[i].vt, "SAGVT of array with vt %d returned %d\n", vttypes[i].vt, vt); } if (pSafeArrayCopyData) { @@ -512,6 +515,9 @@ hres = SafeArrayDestroyData(c); ok(hres == S_OK,"SADD of copy of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); } + + hres = SafeArrayDestroy(c); + ok(hres == S_OK,"SAD faild with hres %x\n", hres); hres = SafeArrayDestroy(a); ok(hres == S_OK,"SAD of array with vt %d failed with hres %x\n", vttypes[i].vt, hres); @@ -531,6 +537,7 @@ ok(hres==S_OK, "CTE VT_ARRAY|VT_UI1 -> VT_BSTR failed with %x\n",hres); ok(V_VT(&v) == VT_BSTR,"CTE VT_ARRAY|VT_UI1 -> VT_BSTR did not return VT_BSTR, but %d.v\n",V_VT(&v)); ok(V_BSTR(&v)[0] == 0x6548,"First letter are not 'He', but %x\n", V_BSTR(&v)[0]); + VariantClear(&v); /* check locking functions */ a = SafeArrayCreate(VT_I4, 1, &bound); @@ -559,7 +566,6 @@ ok(a!=NULL,"SAC should not fail\n"); hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD with data in array failed with hres %x\n",hres); - /* IID functions */ /* init a small stack safearray */ @@ -574,6 +580,9 @@ ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); hres = pSafeArraySetIID(a,&iid); ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but %x\n",hres); + + hres = SafeArrayDestroyDescriptor(a); + ok(hres == S_OK,"SADD failed with hres %x\n",hres); } if (!pSafeArrayAllocDescriptorEx) @@ -692,6 +701,9 @@ hres = SafeArrayAllocData(sa); ok(hres == S_OK, "SafeArrayAllocData gave hres 0x%x\n", hres); + + hres = SafeArrayDestroy(sa); + ok(hres == S_OK,"SafeArrayDestroy failed with hres %x\n",hres); } static void test_SafeArrayCreateLockDestroy(void) @@ -808,7 +820,7 @@ ok(hres == S_OK, "Unlock VARTYPE %d (@%d dims) hres 0x%x\n", vt, dimension, hres); - hres = SafeArrayDestroyDescriptor(sa); + hres = SafeArrayDestroy(sa); ok(hres == S_OK, "destroy VARTYPE %d (@%d dims) hres 0x%x\n", vt, dimension, hres); } @@ -828,6 +840,9 @@ return; sa = pSafeArrayCreateVector(VT_UI1, 0, 0); ok(sa != NULL, "SACV with 0 elements failed.\n"); + + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "SafeArrayDestroy failed with hres %x\n",hres); /* Test all VARTYPES in different lengths */ for (element = 1; element <= 101; element += 10) @@ -861,7 +876,7 @@ ok(hres == S_OK, "Unlock VARTYPE %d (@%d elements) failed; hres 0x%x\n", vt, element, hres); - hres = SafeArrayDestroyDescriptor(sa); + hres = SafeArrayDestroy(sa); ok(hres == S_OK, "destroy VARTYPE %d (@%d elements) failed; hres 0x%x\n", vt, element, hres); } @@ -1085,6 +1100,8 @@ if (hres == S_OK) ok(SysStringLen(value) == SysStringLen(gotvalue), "Got len %d instead of %d\n", SysStringLen(gotvalue), SysStringLen(value)); SafeArrayDestroy(sa); + SysFreeString(value); + SysFreeString(gotvalue); } static int tunk_xref = 0; @@ -1603,6 +1620,7 @@ hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_BSTR); ok(hres != S_OK, "CTE VT_ARRAY|VT %d->BSTR succeeded\n", vt); VariantClear(&v2); + VariantClear(&v); } /* Can't change an array of one type into array of another type , even @@ -1630,6 +1648,7 @@ V_ARRAY(&v) = sa; hres = VariantChangeTypeEx(&v2, &v, 0, 0, VT_ARRAY|VT_UI1); ok(hres == S_OK, "CTE VT_ARRAY|VT_UI1->VT_ARRAY|VT_UI1 returned %x\n", hres); + SafeArrayDestroy(sa); } /* NULL/EMPTY */ Modified: trunk/rostests/winetests/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -18,17 +18,31 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <windows.h> #include <ocidl.h> #include <stdio.h> -#include <wine/test.h> +#include "wine/test.h" #include "tmarshal.h" #include "tmarshal_dispids.h" #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) + +/* ULL suffix is not portable */ +#define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) + +const MYSTRUCT MYSTRUCT_BYVAL = {0x12345678, ULL_CONST(0xdeadbeef, 0x98765432)}; +const MYSTRUCT MYSTRUCT_BYPTR = {0x91827364, ULL_CONST(0x88776655, 0x44332211)}; +const MYSTRUCT MYSTRUCT_ARRAY[5] = { + {0x1a1b1c1d, ULL_CONST(0x1e1f1011, 0x12131415)}, + {0x2a2b2c2d, ULL_CONST(0x2e2f2021, 0x22232425)}, + {0x3a3b3c3d, ULL_CONST(0x3e3f3031, 0x32333435)}, + {0x4a4b4c4d, ULL_CONST(0x4e4f4041, 0x42434445)}, + {0x5a5b5c5d, ULL_CONST(0x5e5f5051, 0x52535455)}, +}; /* Debugging functions from wine/libs/wine/debug.c */ @@ -210,6 +224,72 @@ CloseHandle(thread); } +static ItestDual TestDual, TestDualDisp; + +static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, void **ppvObject) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { + *ppvObject = &TestDualDisp; + return S_OK; + }else if(IsEqualGUID(riid, &IID_ItestDual)) { + *ppvObject = &TestDual; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TestDual_AddRef(ItestDual *iface) +{ + return 2; +} + +static ULONG WINAPI TestDual_Release(ItestDual *iface) +{ + return 1; +} + +static HRESULT WINAPI TestDual_GetTypeInfoCount(ItestDual *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_GetTypeInfo(ItestDual *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_GetIDsOfNames(ItestDual *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_Invoke(ItestDual *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ItestDualVtbl TestDualVtbl = { + TestDual_QueryInterface, + TestDual_AddRef, + TestDual_Release, + TestDual_GetTypeInfoCount, + TestDual_GetTypeInfo, + TestDual_GetIDsOfNames, + TestDual_Invoke +}; + +static ItestDual TestDual = { &TestDualVtbl }; +static ItestDual TestDualDisp = { &TestDualVtbl }; + typedef struct Widget { const IWidgetVtbl *lpVtbl; @@ -217,7 +297,7 @@ IUnknown *pDispatchUnknown; } Widget; -HRESULT WINAPI Widget_QueryInterface( +static HRESULT WINAPI Widget_QueryInterface( IWidget *iface, /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) @@ -235,7 +315,7 @@ } } -ULONG WINAPI Widget_AddRef( +static ULONG WINAPI Widget_AddRef( IWidget *iface) { Widget *This = (Widget *)iface; @@ -243,7 +323,7 @@ return InterlockedIncrement(&This->refs); } -ULONG WINAPI Widget_Release( +static ULONG WINAPI Widget_Release( IWidget *iface) { Widget *This = (Widget *)iface; @@ -259,7 +339,7 @@ return refs; } -HRESULT WINAPI Widget_GetTypeInfoCount( +static HRESULT WINAPI Widget_GetTypeInfoCount( IWidget *iface, /* [out] */ UINT __RPC_FAR *pctinfo) { @@ -274,7 +354,7 @@ return hr; } -HRESULT WINAPI Widget_GetTypeInfo( +static HRESULT WINAPI Widget_GetTypeInfo( IWidget __RPC_FAR * iface, /* [in] */ UINT iTInfo, /* [in] */ LCID lcid, @@ -291,7 +371,7 @@ return hr; } -HRESULT WINAPI Widget_GetIDsOfNames( +static HRESULT WINAPI Widget_GetIDsOfNames( IWidget __RPC_FAR * iface, /* [in] */ REFIID riid, /* [size_is][in] */ LPOLESTR __RPC_FAR *rgszNames, @@ -310,7 +390,7 @@ return hr; } -HRESULT WINAPI Widget_Invoke( +static HRESULT WINAPI Widget_Invoke( IWidget __RPC_FAR * iface, /* [in] */ DISPID dispIdMember, /* [in] */ REFIID riid, @@ -332,7 +412,7 @@ return hr; } -HRESULT WINAPI Widget_put_Name( +static HRESULT WINAPI Widget_put_Name( IWidget __RPC_FAR * iface, /* [in] */ BSTR name) { @@ -340,7 +420,7 @@ return S_OK; } -HRESULT WINAPI Widget_get_Name( +static HRESULT WINAPI Widget_get_Name( IWidget __RPC_FAR * iface, /* [out] */ BSTR __RPC_FAR *name) { @@ -350,7 +430,7 @@ return S_OK; } -HRESULT WINAPI Widget_DoSomething( +static HRESULT WINAPI Widget_DoSomething( IWidget __RPC_FAR * iface, /* [in] */ double number, /* [out] */ BSTR *str1, @@ -369,7 +449,7 @@ return S_FALSE; } -HRESULT WINAPI Widget_get_State( +static HRESULT WINAPI Widget_get_State( IWidget __RPC_FAR * iface, /* [retval][out] */ STATE __RPC_FAR *state) { @@ -378,7 +458,7 @@ return S_OK; } -HRESULT WINAPI Widget_put_State( +static HRESULT WINAPI Widget_put_State( IWidget __RPC_FAR * iface, /* [in] */ STATE state) { @@ -386,7 +466,7 @@ return S_OK; } -HRESULT WINAPI Widget_Map( +static HRESULT WINAPI Widget_Map( IWidget * iface, BSTR bstrId, BSTR *sValue) @@ -396,7 +476,7 @@ return S_OK; } -HRESULT WINAPI Widget_SetOleColor( +static HRESULT WINAPI Widget_SetOleColor( IWidget * iface, OLE_COLOR val) { @@ -404,7 +484,7 @@ return S_OK; } -HRESULT WINAPI Widget_GetOleColor( +static HRESULT WINAPI Widget_GetOleColor( IWidget * iface, OLE_COLOR *pVal) { @@ -413,7 +493,7 @@ return S_FALSE; } -HRESULT WINAPI Widget_Clone( +static HRESULT WINAPI Widget_Clone( IWidget *iface, IWidget **ppVal) { @@ -421,7 +501,7 @@ return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } -HRESULT WINAPI Widget_CloneDispatch( +static HRESULT WINAPI Widget_CloneDispatch( IWidget *iface, IDispatch **ppVal) { @@ -429,7 +509,7 @@ return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal); } -HRESULT WINAPI Widget_CloneCoclass( +static HRESULT WINAPI Widget_CloneCoclass( IWidget *iface, ApplicationObject2 **ppVal) { @@ -437,7 +517,7 @@ return S_OK; } -HRESULT WINAPI Widget_Value( +static HRESULT WINAPI Widget_Value( IWidget __RPC_FAR * iface, VARIANT *value, VARIANT *retval) @@ -450,7 +530,7 @@ return S_OK; } -HRESULT WINAPI Widget_Array( +static HRESULT WINAPI Widget_Array( IWidget * iface, SAFEARRAY * values) { @@ -458,7 +538,7 @@ return S_OK; } -HRESULT WINAPI Widget_VariantArrayPtr( +static HRESULT WINAPI Widget_VariantArrayPtr( IWidget * iface, SAFEARRAY ** values) { @@ -466,7 +546,7 @@ return S_OK; } -void WINAPI Widget_Variant( +static void WINAPI Widget_Variant( IWidget __RPC_FAR * iface, VARIANT var) { @@ -476,7 +556,7 @@ ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); } -void WINAPI Widget_VarArg( +static void WINAPI Widget_VarArg( IWidget * iface, int numexpect, SAFEARRAY * values) @@ -508,14 +588,26 @@ ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); } -HRESULT WINAPI Widget_Error( +static void WINAPI Widget_StructArgs( + IWidget * iface, + MYSTRUCT byval, + MYSTRUCT *byptr, + MYSTRUCT arr[5]) +{ + ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); + ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); + ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); +} + + +static HRESULT WINAPI Widget_Error( IWidget __RPC_FAR * iface) { trace("Error()\n"); return E_NOTIMPL; } -HRESULT WINAPI Widget_CloneInterface( +static HRESULT WINAPI Widget_CloneInterface( IWidget __RPC_FAR * iface, ISomethingFromDispatch **ppVal) { @@ -549,10 +641,82 @@ Widget_VariantArrayPtr, Widget_Variant, Widget_VarArg, + Widget_StructArgs, Widget_Error, Widget_CloneInterface }; +static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) +{ + if (IsEqualIID(riid, &IID_IStaticWidget) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) + { + IStaticWidget_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI StaticWidget_AddRef(IStaticWidget *iface) +{ + return 2; +} + +static ULONG WINAPI StaticWidget_Release(IStaticWidget *iface) +{ + return 1; +} + +static HRESULT WINAPI StaticWidget_GetTypeInfoCount(IStaticWidget *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_GetTypeInfo(IStaticWidget *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_GetIDsOfNames(IStaticWidget *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_Invoke(IStaticWidget *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_TestDual(IStaticWidget *iface, ItestDual *p) +{ + trace("TestDual()\n"); + todo_wine + ok(p == &TestDual, "wrong ItestDual\n"); + return S_OK; +} + +static const IStaticWidgetVtbl StaticWidgetVtbl = { + StaticWidget_QueryInterface, + StaticWidget_AddRef, + StaticWidget_Release, + StaticWidget_GetTypeInfoCount, + StaticWidget_GetTypeInfo, + StaticWidget_GetIDsOfNames, + StaticWidget_Invoke, + StaticWidget_TestDual +}; + +static IStaticWidget StaticWidget = { &StaticWidgetVtbl }; typedef struct KindaEnum { @@ -563,10 +727,12 @@ static HRESULT register_current_module_typelib(void) { WCHAR path[MAX_PATH]; + CHAR pathA[MAX_PATH]; HRESULT hr; ITypeLib *typelib; - GetModuleFileNameW(NULL, path, MAX_PATH); + GetModuleFileNameA(NULL, pathA, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); hr = LoadTypeLib(path, &typelib); if (SUCCEEDED(hr)) @@ -577,30 +743,44 @@ return hr; } +static ITypeInfo *get_type_info(REFIID riid) +{ + ITypeInfo *pTypeInfo; + ITypeLib *pTypeLib; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); + ok_ole_success(hr, LoadRegTypeLib); + if (FAILED(hr)) + return NULL; + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &pTypeInfo); + ITypeLib_Release(pTypeLib); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + if (FAILED(hr)) + return NULL; + + return pTypeInfo; +} + static IWidget *Widget_Create(void) { - Widget *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - HRESULT hr; - ITypeLib *pTypeLib; - + Widget *This; + ITypeInfo *pTypeInfo; + HRESULT hr = E_FAIL; + + pTypeInfo = get_type_info(&IID_IWidget); + if(!pTypeInfo) + return NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); This->lpVtbl = &Widget_VTable; This->refs = 1; - - hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - ok_ole_success(hr, LoadRegTypeLib); - if (SUCCEEDED(hr)) - { - ITypeInfo *pTypeInfo; - hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IWidget, &pTypeInfo); - ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); - if (SUCCEEDED(hr)) - { - This->pDispatchUnknown = NULL; - hr = CreateStdDispatch((IUnknown *)&This->lpVtbl, This, pTypeInfo, &This->pDispatchUnknown); - ok_ole_success(hr, CreateStdDispatch); - ITypeInfo_Release(pTypeInfo); - } - } + This->pDispatchUnknown = NULL; + + hr = CreateStdDispatch((IUnknown *)&This->lpVtbl, This, pTypeInfo, &This->pDispatchUnknown); + ok_ole_success(hr, CreateStdDispatch); + ITypeInfo_Release(pTypeInfo); if (SUCCEEDED(hr)) return (IWidget *)&This->lpVtbl; @@ -611,7 +791,7 @@ } } -HRESULT WINAPI KindaEnum_QueryInterface( +static HRESULT WINAPI KindaEnum_QueryInterface( IKindaEnumWidget *iface, /* [in] */ REFIID riid, /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject) @@ -629,7 +809,7 @@ } } -ULONG WINAPI KindaEnum_AddRef( +static ULONG WINAPI KindaEnum_AddRef( IKindaEnumWidget *iface) { KindaEnum *This = (KindaEnum *)iface; @@ -637,7 +817,7 @@ return InterlockedIncrement(&This->refs); } -ULONG WINAPI KindaEnum_Release( +static ULONG WINAPI KindaEnum_Release( IKindaEnumWidget *iface) { KindaEnum *This = (KindaEnum *)iface; @@ -652,7 +832,7 @@ return refs; } -HRESULT WINAPI KindaEnum_Next( +static HRESULT WINAPI KindaEnum_Next( IKindaEnumWidget *iface, /* [out] */ IWidget __RPC_FAR *__RPC_FAR *widget) { @@ -663,20 +843,20 @@ return E_OUTOFMEMORY; } -HRESULT WINAPI KindaEnum_Count( +static HRESULT WINAPI KindaEnum_Count( IKindaEnumWidget *iface, /* [out] */ unsigned long __RPC_FAR *count) { return E_NOTIMPL; } -HRESULT WINAPI KindaEnum_Reset( +static HRESULT WINAPI KindaEnum_Reset( IKindaEnumWidget *iface) { return E_NOTIMPL; } -HRESULT WINAPI KindaEnum_Clone( +static HRESULT WINAPI KindaEnum_Clone( IKindaEnumWidget *iface, /* [out] */ IKindaEnumWidget __RPC_FAR *__RPC_FAR *ppenum) { @@ -778,12 +958,15 @@ DWORD tid; BSTR bstr; ITypeInfo *pTypeInfo; + MYSTRUCT mystruct; + MYSTRUCT mystructArray[5]; ok(pKEW != NULL, "Widget creation failed\n"); hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); ok_ole_success(hr, CreateStreamOnHGlobal); tid = start_host_object(pStream, &IID_IKindaEnumWidget, (IUnknown *)pKEW, MSHLFLAGS_NORMAL, &thread); + IKindaEnumWidget_Release(pKEW); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); @@ -915,6 +1098,11 @@ hr = IDispatch_Invoke(pDispatch, DISPID_TM_GETOLECOLOR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); VariantClear(&varresult); + + /* call StructArgs (direct) */ + mystruct = MYSTRUCT_BYPTR; + memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); + IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); /* call Clone */ dispparams.cNamedArgs = 0; @@ -1160,6 +1348,37 @@ hr = DispCallFunc(pWidget, 36, CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); ok_ole_success(hr, DispCallFunc); VariantClear(&varresult); + VariantClear(&vararg[1]); + VariantClear(&vararg[2]); + IWidget_Release(pWidget); +} + +static void test_StaticWidget(void) +{ + ITypeInfo *type_info; + DISPPARAMS dispparams; + VARIANTARG vararg[4]; + EXCEPINFO excepinfo; + VARIANT varresult; + HRESULT hr; + + type_info = get_type_info(&IID_IStaticWidget); + + /* call TestDual */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + V_VT(vararg) = VT_DISPATCH; + V_DISPATCH(vararg) = (IDispatch*)&TestDualDisp; + VariantInit(&varresult); + hr = ITypeInfo_Invoke(type_info, &StaticWidget, DISPID_TM_TESTDUAL, DISPATCH_METHOD, + &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "vt %x\n", V_VT(&varresult)); + VariantClear(&varresult); + + ITypeInfo_Release(type_info); } START_TEST(tmarshal) @@ -1173,6 +1392,10 @@ test_typelibmarshal(); test_DispCallFunc(); + test_StaticWidget(); + + hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, 1); + ok_ole_success(hr, UnRegisterTypeLib); CoUninitialize(); } Modified: trunk/rostests/winetests/oleaut32/tmarshal.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -35,6 +35,12 @@ STATE_WIDGETIFIED } STATE; + typedef struct tagMYSTRUCT + { + INT field1; + ULONGLONG field2; + } MYSTRUCT; + coclass ApplicationObject2; [ @@ -44,6 +50,17 @@ interface ISomethingFromDispatch : IDispatch { HRESULT anotherfn(void); + } + + [ + odl, + oleautomation, + dual, + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7967) + ] + interface ItestDual : IDispatch + { + HRESULT test(); } [ @@ -100,12 +117,26 @@ [vararg, id(DISPID_TM_VARARG)] void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + [id(DISPID_TM_STRUCTARGS)] + void StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); + [id(DISPID_TM_ERROR)] HRESULT Error(); [propget, id(DISPID_TM_CLONEINTERFACE)] HRESULT CloneInterface([out, retval] ISomethingFromDispatch **ppVal); - + } + + [ + odl, + uuid(a1f8cae3-c947-3c5f-a57c-c88b9b6f3586), + oleautomation, + dual + ] + interface IStaticWidget : IDispatch + { + [id(DISPID_TM_TESTDUAL)] + HRESULT TestDual([in] ItestDual *p); } [ Modified: trunk/rostests/winetests/oleaut32/tmarshal.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal.rc [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -27,4 +27,8 @@ #include "wine/wine_common_ver.rc" +/* @makedep: tmarshal.tlb */ 1 TYPELIB LOADONCALL DISCARDABLE tmarshal.tlb + +/* @makedep: test_tlb.tlb */ +2 TYPELIB LOADONCALL DISCARDABLE test_tlb.tlb Modified: trunk/rostests/winetests/oleaut32/tmarshal_dispids.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh… ============================================================================== --- trunk/rostests/winetests/oleaut32/tmarshal_dispids.h [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/tmarshal_dispids.h [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -32,5 +32,7 @@ #define DISPID_TM_VARARG 13 #define DISPID_TM_ERROR 14 #define DISPID_TM_CLONEINTERFACE 15 +#define DISPID_TM_TESTDUAL 16 +#define DISPID_TM_STRUCTARGS 17 #define DISPID_NOA_BSTRRET 1 Modified: trunk/rostests/winetests/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli… ============================================================================== --- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -27,9 +27,11 @@ #include "windef.h" #include "winbase.h" + #include "oleauto.h" #include "ocidl.h" #include "shlwapi.h" +#include "initguid.h" #include "tmarshal.h" #define expect_eq(expr, value, type, format) { type _ret = (expr); ok((value) == _ret, #expr " expected " format " got " format "\n", value, _ret); } @@ -37,10 +39,10 @@ #define expect_hex(expr, value) expect_eq(expr, (int)value, int, "0x%x") #define expect_null(expr) expect_eq(expr, NULL, const void *, "%p") -#define expect_wstr_utf8val(expr, value) \ +#define expect_wstr_acpval(expr, value) \ { \ CHAR buf[260]; \ - expect_eq(!WideCharToMultiByte(CP_UTF8, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ + expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \ ok(lstrcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \ } @@ -513,6 +515,70 @@ ITypeLib_Release(pTypeLib); } +/* RegDeleteTreeW from dlls/advapi32/registry.c */ +static LSTATUS myRegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = myRegDeleteTreeW(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyW(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueW(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + if (lpszName != szNameBuf) + HeapFree(GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL remove) { static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; @@ -521,20 +587,29 @@ WCHAR buf[128]; HKEY hkey; BOOL ret = TRUE; + DWORD res; memcpy(buf, typelibW, sizeof(typelibW)); StringFromGUID2(uid, buf + lstrlenW(buf), 40); if (remove) { - ok(SHDeleteKeyW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); + ok(myRegDeleteTreeW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); return TRUE; } wsprintfW(buf + lstrlenW(buf), formatW, maj, min ); - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, - KEY_WRITE, NULL, &hkey, NULL) != ERROR_SUCCESS) + SetLastError(0xdeadbeef); + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, + KEY_WRITE, NULL, &hkey, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("W-calls are not implemented\n"); + return FALSE; + } + + if (res != ERROR_SUCCESS) { trace("RegCreateKeyExW failed\n"); return FALSE; @@ -576,7 +651,7 @@ BSTR path; status = UuidCreate(&uid); - ok(!status, "UuidCreate error %08lx\n", status); + ok(!status || status == RPC_S_UUID_LOCAL_ONLY, "UuidCreate error %08lx\n", status); StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ @@ -608,11 +683,13 @@ HREFTYPE href; FUNCDESC *pFD; WCHAR path[MAX_PATH]; + CHAR pathA[MAX_PATH]; static const WCHAR tl_path[] = {'.','\\','m','i','d','l','_','t','m','a','r','s','h','a','l','.','t','l','b',0}; BOOL use_midl_tlb = 0; - GetModuleFileNameW(NULL, path, MAX_PATH); + GetModuleFileNameA(NULL, pathA, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); if(use_midl_tlb) memcpy(path, tl_path, sizeof(tl_path)); @@ -1204,7 +1281,7 @@ int ifcount = sizeof(info)/sizeof(info[0]); int iface, func; - MultiByteToWideChar(CP_UTF8, 0, name, -1, wszName, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, name, -1, wszName, MAX_PATH); ole_check(LoadTypeLibEx(wszName, REGKIND_NONE, &typelib)); expect_eq(ITypeLib_GetTypeInfoCount(typelib), ifcount, UINT, "%d"); for (iface = 0; iface < ifcount; iface++) @@ -1217,7 +1294,7 @@ trace("Interface %s\n", if_info->name); ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo)); ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, NULL, NULL)); - expect_wstr_utf8val(bstrIfName, if_info->name); + expect_wstr_acpval(bstrIfName, if_info->name); SysFreeString(bstrIfName); ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); @@ -1250,7 +1327,7 @@ ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames)); for (i = 0; i < cNames; i++) { - expect_wstr_utf8val(namesTab[i], fn_info->names[i]); + expect_wstr_acpval(namesTab[i], fn_info->names[i]); SysFreeString(namesTab[i]); } expect_null(fn_info->names[cNames]); @@ -1273,13 +1350,41 @@ #endif +static const char *create_test_typelib(void) +{ + static char filename[MAX_PATH]; + HANDLE file; + HRSRC res; + void *ptr; + DWORD written; + + GetTempFileNameA( ".", "tlb", 0, filename ); + file = CreateFile( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + if (file == INVALID_HANDLE_VALUE) return NULL; + res = FindResource( GetModuleHandle(0), MAKEINTRESOURCE(2), "TYPELIB" ); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandle(0), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandle(0), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandle(0), res ), "couldn't write resource\n" ); + CloseHandle( file ); + return filename; +} + START_TEST(typelib) { + const char *filename; + ref_count_test(wszStdOle2); test_TypeComp(); test_CreateDispTypeInfo(); test_TypeInfo(); test_QueryPathOfRegTypeLib(); test_inheritance(); - test_dump_typelib("test_tlb.tlb"); -} + + if ((filename = create_test_typelib())) + { + test_dump_typelib( filename ); + DeleteFile( filename ); + } +} Modified: trunk/rostests/winetests/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/usrmar… ============================================================================== --- trunk/rostests/winetests/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/usrmarshal.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -208,6 +208,7 @@ LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /* test NULL safe array */ @@ -244,6 +245,7 @@ check_safearray(buffer, lpsa); HeapFree(GetProcessHeap(), 0, buffer); + lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /* VARTYPE-less arrays can be marshaled if cbElements is 1,2,4 or 8 as type SF_In */ @@ -526,6 +528,13 @@ V_VT(&v) = VT_I1; V_I1(&v) = 0x12; + /* check_variant_header tests wReserved[123], so initialize to unique values. + * (Could probably also do this by setting the variant to a known DECIMAL.) + */ + V_U2(&v).wReserved1 = 0x1234; + V_U2(&v).wReserved2 = 0x5678; + V_U2(&v).wReserved3 = 0x9abc; + /* Variants have an alignment of 8 */ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 1, &v); ok(stubMsg.BufferLength == 29, "size %d\n", stubMsg.BufferLength); @@ -607,11 +616,15 @@ ok(*(short*)wirev == s, "wv[6] %08x\n", *wirev); if (VARIANT_UNMARSHAL_WORKS) { - VariantInit(&v2); - stubMsg.Buffer = buffer; - next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); - ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); - ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + void *mem; + VariantInit(&v2); + V_VT(&v2) = VT_I2 | VT_BYREF; + V_BYREF(&v2) = mem = CoTaskMemAlloc(sizeof(V_I2(&v2))); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(V_BYREF(&v2) == mem, "didn't reuse existing memory\n"); ok(*V_I2REF(&v) == *V_I2REF(&v2), "got i2 ref %x expect ui4 ref %x\n", *V_I2REF(&v), *V_I2REF(&v2)); VARIANT_UserFree(&umcb.Flags, &v2); @@ -843,6 +856,7 @@ /*** DECIMAL ***/ VarDecFromI4(0x12345678, &dec); + dec.wReserved = 0xfedc; /* Also initialize reserved field, as we check it later */ VariantInit(&v); V_DECIMAL(&v) = dec; V_VT(&v) = VT_DECIMAL; @@ -900,6 +914,13 @@ if (VARIANT_UNMARSHAL_WORKS) { VariantInit(&v2); + /* check_variant_header tests wReserved[123], so initialize to unique values. + * (Could probably also do this by setting the variant to a known DECIMAL.) + */ + V_U2(&v2).wReserved1 = 0x0123; + V_U2(&v2).wReserved2 = 0x4567; + V_U2(&v2).wReserved3 = 0x89ab; + stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength); @@ -1037,7 +1058,6 @@ lpsa = SafeArrayCreate(VT_R8, 1, &sab); *(DWORD *)lpsa->pvData = 0xcafebabe; *((DWORD *)lpsa->pvData + 1) = 0xdeadbeef; - lpsa->cLocks = 7; VariantInit(&v); V_VT(&v) = VT_UI4 | VT_ARRAY; @@ -1209,9 +1229,7 @@ stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); - ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", - V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); - ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + ok(V_UNKNOWN(&v) == V_UNKNOWN(&v3), "got %p expect %p\n", V_UNKNOWN(&v), V_UNKNOWN(&v3)); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release((IUnknown *)heap_unknown); Modified: trunk/rostests/winetests/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/varfor… ============================================================================== --- trunk/rostests/winetests/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/varformat.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #include "windef.h" #include "winbase.h" @@ -42,6 +41,7 @@ static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); +static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); /* Have I8/UI8 data type? */ #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) @@ -63,9 +63,11 @@ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ - if (hres == S_OK) \ + if (hres == S_OK) { \ ok(str && strcmpW(str,szResult1) == 0, \ - "VarFormatNumber (vt %d): string different\n", vt) + "VarFormatNumber (vt %d): string different\n", vt); \ + SysFreeString(str); \ + } static void test_VarFormatNumber(void) { @@ -125,7 +127,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s', got 0x%08x, '%s'\n"; #define VARFMT(vt,v,val,fmt,ret,str) do { \ - if (out) SysFreeString(out); out = NULL; \ + out = NULL; \ V_VT(&in) = (vt); v(&in) = val; \ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, sizeof(buffW)/sizeof(WCHAR)); \ hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ @@ -134,6 +136,7 @@ ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ szVarFmtFail, \ (vt)&VT_TYPEMASK,(vt)&~VT_TYPEMASK,fmt?fmt:"<null>",ret,str,hres,buff); \ + SysFreeString(out); \ } while(0) typedef struct tagFMTRES @@ -320,9 +323,12 @@ VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001"); VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001"); VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001"); - todo_wine { VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000"); - } + VARFMT(VT_I4,V_I4,1,"0,000,000,000",S_OK,"0,000,000,001"); + VARFMT(VT_I4,V_I4,123456789,"#,#.#",S_OK,"123,456,789."); + VARFMT(VT_I4,V_I4,123456789,"###, ###, ###",S_OK,"123, 456, 789"); + VARFMT(VT_I4,V_I4,1,"#;-#",S_OK,"1"); + VARFMT(VT_I4,V_I4,-1,"#;-#",S_OK,"-1"); VARFMT(VT_R8,V_R8,1.23456789,"0#.0#0#0#0#0",S_OK,"01.234567890"); VARFMT(VT_R8,V_R8,1.2,"0#.0#0#0#0#0",S_OK,"01.200000000"); VARFMT(VT_R8,V_R8,9.87654321,"#0.#0#0#0#0#",S_OK,"9.87654321"); @@ -364,6 +370,10 @@ VARFMT(VT_R8,V_R8,1.0001e-27,"##00.0000e-0",S_OK,"1000.1000e-30"); VARFMT(VT_R8,V_R8,47.11,".0000E+0",S_OK,".4711E+2"); VARFMT(VT_R8,V_R8,3.0401e-13,"#####.####e-0%",S_OK,"30401.e-15%"); + VARFMT(VT_R8,V_R8,1.57,"0.00",S_OK,"1.57"); + VARFMT(VT_R8,V_R8,-1.57,"0.00",S_OK,"-1.57"); + VARFMT(VT_R8,V_R8,-1.57,"#.##",S_OK,"-1.57"); + VARFMT(VT_R8,V_R8,-0.1,".#",S_OK,"-.1"); /* 'out' is not cleared */ @@ -392,10 +402,120 @@ VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); } +static const char *szVarWdnFail = + "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; +#define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ +do { \ + hres = pVarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ + if (SUCCEEDED(hres)) { \ + WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff), 0, 0); \ + if (freeOut) SysFreeString(out); \ + } else { \ + buff[0] = '\0'; \ + } \ + ok(hres == ret, \ + szVarWdnFail, \ + iWeekday, fAbbrev, iFirstDay, dwFlags, &out, hres, ret \ + ); \ +} while(0) + +#define VARWDN_F(iWeekday, fAbbrev, iFirstDay, dwFlags, ret) \ + VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, 1) + +#define VARWDN_O(iWeekday, fAbbrev, iFirstDay, dwFlags) \ + VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, S_OK, buff, out, 0) + +static void test_VarWeekdayName(void) +{ + char buff[256]; + BSTR out = NULL; + HRESULT hres; + int iWeekday, fAbbrev, iFirstDay; + BSTR dayNames[7][2]; /* Monday-Sunday, full/abbr */ + DWORD defaultFirstDay; + int firstDay; + int day; + int size; + DWORD localeValue; + + CHECKPTR(VarWeekdayName); + + SetLastError(0xdeadbeef); + GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("GetLocaleInfoW is not implemented\n"); + return; + } + + /* Initialize days' names */ + for (day = 0; day <= 6; ++day) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + localeValue = fAbbrev ? LOCALE_SABBREVDAYNAME1 : LOCALE_SDAYNAME1; + localeValue += day; + size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); + dayNames[day][fAbbrev] = SysAllocStringLen(NULL, size - 1); + GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, + dayNames[day][fAbbrev], size); + } + } + + /* Get the user's first day of week. 0=Monday, .. */ + GetLocaleInfoW( + LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + (LPWSTR)&defaultFirstDay, sizeof(defaultFirstDay) / sizeof(WCHAR)); + + /* Check invalid arguments */ + VARWDN_F(0, 0, 4, 0, E_INVALIDARG); + VARWDN_F(8, 0, 4, 0, E_INVALIDARG); + VARWDN_F(4, 0, -1, 0, E_INVALIDARG); + VARWDN_F(4, 0, 8, 0, E_INVALIDARG); + + hres = pVarWeekdayName(1, 0, 0, 0, NULL); + ok(E_INVALIDARG == hres, + "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); + + /* Check all combinations */ + for (iWeekday = 1; iWeekday <= 7; ++iWeekday) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + /* 0 = Default, 1 = Sunday, 2 = Monday, .. */ + for (iFirstDay = 0; iFirstDay <= 7; ++iFirstDay) + { + VARWDN_O(iWeekday, fAbbrev, iFirstDay, 0); + if (iFirstDay == 0) + firstDay = defaultFirstDay; + else + /* Translate from 0=Sunday to 0=Monday in the modulo 7 space */ + firstDay = iFirstDay - 2; + day = (7 + iWeekday - 1 + firstDay) % 7; + ok(VARCMP_EQ == VarBstrCmp(out, dayNames[day][fAbbrev], + LOCALE_USER_DEFAULT, 0), + "VarWeekdayName(%d,%d,%d): got wrong dayname: '%s'\n", + iWeekday, fAbbrev, iFirstDay, buff); + SysFreeString(out); + } + } + } + + /* Cleanup */ + for (day = 0; day <= 6; ++day) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + SysFreeString(dayNames[day][fAbbrev]); + } + } +} + START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); test_VarFormatNumber(); test_VarFormat(); + test_VarWeekdayName(); } Modified: trunk/rostests/winetests/oleaut32/vartest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -23,7 +23,6 @@ #include <stdio.h> #include <math.h> #include <float.h> -#include <time.h> #include "windef.h" #include "winbase.h" @@ -298,6 +297,7 @@ "got %s expected %s\n", variantstr(&result), variantstr(expected) ); ok_(__FILE__,line)( is_expected_variant( arg, &old_arg ), "Modified argument %s / %s\n", variantstr(&old_arg), variantstr(arg)); + VariantClear( &result ); } static void test_var_call2( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT,LPVARIANT), @@ -317,6 +317,7 @@ variantstr(&old_left), variantstr(left)); ok_(__FILE__,line)( is_expected_variant( right, &old_right ), "Modified right argument %s / %s\n", variantstr(&old_right), variantstr(right)); + VariantClear( &result ); } @@ -621,9 +622,12 @@ "Copy(bad src): expected 0x%X, got 0x%X for src vt %d|0x%X\n", hExpected, hres, vt, ExtraFlags[i]); if (hres == S_OK) + { ok(V_VT(&vDst) == (vt|ExtraFlags[i]), "Copy(bad src): expected vt = %d, got %d\n", vt | ExtraFlags[i], V_VT(&vDst)); + VariantClear(&vDst); + } } } @@ -642,6 +646,7 @@ { ok(*V_BSTR(&vDst) == 0, "Copy(NULL BSTR): result not empty\n"); } + VariantClear(&vDst); } } @@ -813,6 +818,7 @@ vt, ExtraFlags[i] & ~VT_BYREF, V_VT(&vDst) & VT_TYPEMASK, V_VT(&vDst) & ~VT_TYPEMASK); } + VariantClear(&vDst); } } } @@ -1050,7 +1056,7 @@ EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); - /* Doesn't recognise hex in .asm sytax */ + /* Doesn't recognise hex in .asm syntax */ CONVERT("0h", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); @@ -1060,7 +1066,7 @@ EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); - /* Doesn't recognise hex format humbers at all! */ + /* Doesn't recognise hex format numbers at all! */ CONVERT("0x0", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,1,0,0); EXPECT2(0,FAILDIG); @@ -2078,7 +2084,12 @@ leftvt == VT_RECORD || rightvt == VT_RECORD) { if (leftvt == VT_RECORD && rightvt == VT_I8) - expectedhres = DISP_E_TYPEMISMATCH; + { + if (HAVE_OLEAUT32_I8) + expectedhres = DISP_E_TYPEMISMATCH; + else + expectedhres = DISP_E_BADVARTYPE; + } else if (leftvt < VT_UI1 && rightvt == VT_RECORD) expectedhres = DISP_E_TYPEMISMATCH; else if (leftvt >= VT_UI1 && rightvt == VT_RECORD) @@ -2726,6 +2737,9 @@ hres = pVarMod(&v1,&v2,&vDst); ok(hres == DISP_E_BADVARTYPE && V_VT(&vDst) == VT_EMPTY, "VarMod: expected 0x%x,%d, got 0x%X,%d\n", DISP_E_BADVARTYPE, VT_EMPTY, hres, V_VT(&vDst)); + + SysFreeString(strNum0); + SysFreeString(strNum1); } static HRESULT (WINAPI *pVarFix)(LPVARIANT,LPVARIANT); @@ -3104,8 +3118,8 @@ static void test_VarRound(void) { - static WCHAR szNumMin[] = {'-','1','.','4','5','\0' }; - static WCHAR szNum[] = {'1','.','4','5','\0' }; + static WCHAR szNumMin[] = {'-','1','.','4','4','9','\0' }; + static WCHAR szNum[] = {'1','.','4','5','1','\0' }; HRESULT hres; VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); @@ -3140,7 +3154,7 @@ /* floating point numbers aren't exactly equal and we can't just * compare the first few digits. */ VARROUND(DATE,1.451,1,DATE,1.5); - VARROUND(DATE,-1.45,1,DATE,-1.4); + VARROUND(DATE,-1.449,1,DATE,-1.4); /* replace the decimal separator */ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); @@ -3148,7 +3162,7 @@ szNumMin[2] = buff[0]; szNum[1] = buff[0]; VARROUND(BSTR,(BSTR)szNumMin,1,R8,-1.40); - if (0) { VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } + VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } else { skip("Skipping VarRound(BSTR) as decimal separator is '%s'\n", buff); } @@ -3381,9 +3395,11 @@ VARXOR(EMPTY,0,R8,1,I4,1); rbstr = SysAllocString(szFalse); VARXOR(EMPTY,0,BSTR,rbstr,I2,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(EMPTY,0,BSTR,rbstr,I2,-1); VARXORCY(EMPTY,0,10000,I4,1); + SysFreeString(rbstr); /* NULL OR 0 = NULL. NULL OR n = n */ VARXOR(NULL,0,NULL,0,NULL,0); @@ -3419,8 +3435,10 @@ VARXOR(NULL,0,R8,1,NULL,0); rbstr = SysAllocString(szFalse); VARXOR(NULL,0,BSTR,rbstr,NULL,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(NULL,0,BSTR,rbstr,NULL,0); + SysFreeString(rbstr); VARXORCY(NULL,0,10000,NULL,0); VARXORCY(NULL,0,0,NULL,0); @@ -3477,9 +3495,11 @@ rbstr = SysAllocString(szFalse); VARXOR(BOOL,VARIANT_FALSE,BSTR,rbstr,BOOL,VARIANT_FALSE); VARXOR(BOOL,VARIANT_TRUE,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(BOOL,VARIANT_FALSE,BSTR,rbstr,BOOL,VARIANT_TRUE); VARXOR(BOOL,VARIANT_TRUE,BSTR,rbstr,BOOL,VARIANT_FALSE); + SysFreeString(rbstr); VARXORCY(BOOL,VARIANT_TRUE,10000,I4,-2); VARXORCY(BOOL,VARIANT_TRUE,0,I4,-1); VARXORCY(BOOL,VARIANT_FALSE,0,I4,0); @@ -3528,9 +3548,11 @@ rbstr = SysAllocString(szFalse); VARXOR(I1,0,BSTR,rbstr,I4,0); VARXOR(I1,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(I1,0,BSTR,rbstr,I4,-1); VARXOR(I1,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(I1,-1,10000,I4,-2); VARXORCY(I1,-1,0,I4,-1); VARXORCY(I1,0,0,I4,0); @@ -3576,9 +3598,11 @@ rbstr = SysAllocString(szFalse); VARXOR(UI1,0,BSTR,rbstr,I2,0); VARXOR(UI1,255,BSTR,rbstr,I2,255); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(UI1,0,BSTR,rbstr,I2,-1); VARXOR(UI1,255,BSTR,rbstr,I2,-256); + SysFreeString(rbstr); VARXORCY(UI1,255,10000,I4,254); VARXORCY(UI1,255,0,I4,255); VARXORCY(UI1,0,0,I4,0); @@ -3621,9 +3645,11 @@ rbstr = SysAllocString(szFalse); VARXOR(I2,0,BSTR,rbstr,I2,0); VARXOR(I2,-1,BSTR,rbstr,I2,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(I2,0,BSTR,rbstr,I2,-1); VARXOR(I2,-1,BSTR,rbstr,I2,0); + SysFreeString(rbstr); VARXORCY(I2,-1,10000,I4,-2); VARXORCY(I2,-1,0,I4,-1); VARXORCY(I2,0,0,I4,0); @@ -3663,9 +3689,11 @@ rbstr = SysAllocString(szFalse); VARXOR(UI2,0,BSTR,rbstr,I4,0); VARXOR(UI2,65535,BSTR,rbstr,I4,65535); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(UI2,0,BSTR,rbstr,I4,-1); VARXOR(UI2,65535,BSTR,rbstr,I4,-65536); + SysFreeString(rbstr); VARXORCY(UI2,65535,10000,I4,65534); VARXORCY(UI2,65535,0,I4,65535); VARXORCY(UI2,0,0,I4,0); @@ -3702,9 +3730,11 @@ rbstr = SysAllocString(szFalse); VARXOR(I4,0,BSTR,rbstr,I4,0); VARXOR(I4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(I4,0,BSTR,rbstr,I4,-1); VARXOR(I4,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(I4,-1,10000,I4,-2); VARXORCY(I4,-1,0,I4,-1); VARXORCY(I4,0,0,I4,0); @@ -3738,9 +3768,11 @@ rbstr = SysAllocString(szFalse); VARXOR(UI4,0,BSTR,rbstr,I4,0); VARXOR(UI4,0xffffffff,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(UI4,0,BSTR,rbstr,I4,-1); VARXOR(UI4,0xffffffff,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(UI4,0xffffffff,10000,I4,-2); VARXORCY(UI4,0xffffffff,0,I4,-1); VARXORCY(UI4,0,0,I4,0); @@ -3771,9 +3803,11 @@ rbstr = SysAllocString(szFalse); VARXOR(R4,0,BSTR,rbstr,I4,0); VARXOR(R4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(R4,0,BSTR,rbstr,I4,-1); VARXOR(R4,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(R4,-1,10000,I4,-2); VARXORCY(R4,-1,0,I4,-1); VARXORCY(R4,0,0,I4,0); @@ -3801,9 +3835,11 @@ rbstr = SysAllocString(szFalse); VARXOR(R8,0,BSTR,rbstr,I4,0); VARXOR(R8,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(R8,0,BSTR,rbstr,I4,-1); VARXOR(R8,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(R8,-1,10000,I4,-2); VARXORCY(R8,-1,0,I4,-1); VARXORCY(R8,0,0,I4,0); @@ -3828,9 +3864,11 @@ rbstr = SysAllocString(szFalse); VARXOR(DATE,0,BSTR,rbstr,I4,0); VARXOR(DATE,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(DATE,0,BSTR,rbstr,I4,-1); VARXOR(DATE,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(DATE,-1,10000,I4,-2); VARXORCY(DATE,-1,0,I4,-1); VARXORCY(DATE,0,0,I4,0); @@ -3847,9 +3885,11 @@ rbstr = SysAllocString(szFalse); VARXOR(I8,0,BSTR,rbstr,I8,0); VARXOR(I8,-1,BSTR,rbstr,I8,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(I8,0,BSTR,rbstr,I8,-1); VARXOR(I8,-1,BSTR,rbstr,I8,0); + SysFreeString(rbstr); VARXORCY(I8,-1,10000,I8,-2); VARXORCY(I8,-1,0,I8,-1); VARXORCY(I8,0,0,I8,0); @@ -3866,9 +3906,11 @@ rbstr = SysAllocString(szFalse); VARXOR(UI8,0,BSTR,rbstr,I4,0); VARXOR(UI8,0xffff,BSTR,rbstr,I4,0xffff); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(UI8,0,BSTR,rbstr,I4,-1); VARXOR(UI8,0xffff,BSTR,rbstr,I4,-65536); + SysFreeString(rbstr); VARXORCY(UI8,0xffff,10000,I4,65534); VARXORCY(UI8,0xffff,0,I4,0xffff); VARXORCY(UI8,0,0,I4,0); @@ -3883,9 +3925,11 @@ rbstr = SysAllocString(szFalse); VARXOR(INT,0,BSTR,rbstr,I4,0); VARXOR(INT,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(INT,0,BSTR,rbstr,I4,-1); VARXOR(INT,-1,BSTR,rbstr,I4,0); + SysFreeString(rbstr); VARXORCY(INT,-1,10000,I4,-2); VARXORCY(INT,-1,0,I4,-1); VARXORCY(INT,0,0,I4,0); @@ -3896,9 +3940,11 @@ rbstr = SysAllocString(szFalse); VARXOR(UINT,0,BSTR,rbstr,I4,0); VARXOR(UINT,0xffff,BSTR,rbstr,I4,0xffff); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(UINT,0,BSTR,rbstr,I4,-1); VARXOR(UINT,0xffff,BSTR,rbstr,I4,-65536); + SysFreeString(rbstr); VARXORCY(UINT,0xffff,10000,I4,65534); VARXORCY(UINT,0xffff,0,I4,0xffff); VARXORCY(UINT,0,0,I4,0); @@ -3906,13 +3952,18 @@ lbstr = SysAllocString(szFalse); rbstr = SysAllocString(szFalse); VARXOR(BSTR,lbstr,BSTR,rbstr,BOOL,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VARXOR(BSTR,lbstr,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(lbstr); lbstr = SysAllocString(szTrue); VARXOR(BSTR,lbstr,BSTR,rbstr,BOOL,VARIANT_FALSE); VARXORCY(BSTR,lbstr,10000,I4,-2); + SysFreeString(lbstr); lbstr = SysAllocString(szFalse); VARXORCY(BSTR,lbstr,10000,I4,1); + SysFreeString(lbstr); + SysFreeString(rbstr); } static HRESULT (WINAPI *pVarOr)(LPVARIANT,LPVARIANT,LPVARIANT); @@ -4080,8 +4131,10 @@ VAROR(EMPTY,0,R8,1,I4,1); rbstr = SysAllocString(szFalse); VAROR(EMPTY,0,BSTR,rbstr,I2,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(EMPTY,0,BSTR,rbstr,I2,-1); + SysFreeString(rbstr); VARORCY(EMPTY,0,10000,I4,1); /* NULL OR 0 = NULL. NULL OR n = n */ @@ -4118,8 +4171,10 @@ VAROR(NULL,0,R8,1,I4,1); rbstr = SysAllocString(szFalse); VAROR(NULL,0,BSTR,rbstr,NULL,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(NULL,0,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(rbstr); VARORCY(NULL,0,10000,I4,1); VARORCY(NULL,0,0,NULL,0); @@ -4176,9 +4231,11 @@ rbstr = SysAllocString(szFalse); VAROR(BOOL,VARIANT_FALSE,BSTR,rbstr,BOOL,VARIANT_FALSE); VAROR(BOOL,VARIANT_TRUE,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(BOOL,VARIANT_FALSE,BSTR,rbstr,BOOL,VARIANT_TRUE); VAROR(BOOL,VARIANT_TRUE,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(rbstr); VARORCY(BOOL,VARIANT_TRUE,10000,I4,-1); VARORCY(BOOL,VARIANT_TRUE,0,I4,-1); VARORCY(BOOL,VARIANT_FALSE,0,I4,0); @@ -4227,9 +4284,11 @@ rbstr = SysAllocString(szFalse); VAROR(I1,0,BSTR,rbstr,I4,0); VAROR(I1,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(I1,0,BSTR,rbstr,I4,-1); VAROR(I1,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(I1,-1,10000,I4,-1); VARORCY(I1,-1,0,I4,-1); VARORCY(I1,0,0,I4,0); @@ -4275,9 +4334,11 @@ rbstr = SysAllocString(szFalse); VAROR(UI1,0,BSTR,rbstr,I2,0); VAROR(UI1,255,BSTR,rbstr,I2,255); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(UI1,0,BSTR,rbstr,I2,-1); VAROR(UI1,255,BSTR,rbstr,I2,-1); + SysFreeString(rbstr); VARORCY(UI1,255,10000,I4,255); VARORCY(UI1,255,0,I4,255); VARORCY(UI1,0,0,I4,0); @@ -4320,9 +4381,11 @@ rbstr = SysAllocString(szFalse); VAROR(I2,0,BSTR,rbstr,I2,0); VAROR(I2,-1,BSTR,rbstr,I2,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(I2,0,BSTR,rbstr,I2,-1); VAROR(I2,-1,BSTR,rbstr,I2,-1); + SysFreeString(rbstr); VARORCY(I2,-1,10000,I4,-1); VARORCY(I2,-1,0,I4,-1); VARORCY(I2,0,0,I4,0); @@ -4362,9 +4425,11 @@ rbstr = SysAllocString(szFalse); VAROR(UI2,0,BSTR,rbstr,I4,0); VAROR(UI2,65535,BSTR,rbstr,I4,65535); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(UI2,0,BSTR,rbstr,I4,-1); VAROR(UI2,65535,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(UI2,65535,10000,I4,65535); VARORCY(UI2,65535,0,I4,65535); VARORCY(UI2,0,0,I4,0); @@ -4401,9 +4466,11 @@ rbstr = SysAllocString(szFalse); VAROR(I4,0,BSTR,rbstr,I4,0); VAROR(I4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(I4,0,BSTR,rbstr,I4,-1); VAROR(I4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(I4,-1,10000,I4,-1); VARORCY(I4,-1,0,I4,-1); VARORCY(I4,0,0,I4,0); @@ -4437,9 +4504,11 @@ rbstr = SysAllocString(szFalse); VAROR(UI4,0,BSTR,rbstr,I4,0); VAROR(UI4,0xffffffff,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(UI4,0,BSTR,rbstr,I4,-1); VAROR(UI4,0xffffffff,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(UI4,0xffffffff,10000,I4,-1); VARORCY(UI4,0xffffffff,0,I4,-1); VARORCY(UI4,0,0,I4,0); @@ -4470,9 +4539,11 @@ rbstr = SysAllocString(szFalse); VAROR(R4,0,BSTR,rbstr,I4,0); VAROR(R4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(R4,0,BSTR,rbstr,I4,-1); VAROR(R4,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(R4,-1,10000,I4,-1); VARORCY(R4,-1,0,I4,-1); VARORCY(R4,0,0,I4,0); @@ -4500,9 +4571,11 @@ rbstr = SysAllocString(szFalse); VAROR(R8,0,BSTR,rbstr,I4,0); VAROR(R8,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(R8,0,BSTR,rbstr,I4,-1); VAROR(R8,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(R8,-1,10000,I4,-1); VARORCY(R8,-1,0,I4,-1); VARORCY(R8,0,0,I4,0); @@ -4527,9 +4600,11 @@ rbstr = SysAllocString(szFalse); VAROR(DATE,0,BSTR,rbstr,I4,0); VAROR(DATE,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(DATE,0,BSTR,rbstr,I4,-1); VAROR(DATE,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(DATE,-1,10000,I4,-1); VARORCY(DATE,-1,0,I4,-1); VARORCY(DATE,0,0,I4,0); @@ -4551,9 +4626,11 @@ rbstr = SysAllocString(szFalse); VAROR(I8,0,BSTR,rbstr,I8,0); VAROR(I8,-1,BSTR,rbstr,I8,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(I8,0,BSTR,rbstr,I8,-1); VAROR(I8,-1,BSTR,rbstr,I8,-1); + SysFreeString(rbstr); VARORCY(I8,-1,10000,I8,-1); VARORCY(I8,-1,0,I8,-1); VARORCY(I8,0,0,I8,0); @@ -4570,9 +4647,11 @@ rbstr = SysAllocString(szFalse); VAROR(UI8,0,BSTR,rbstr,I4,0); VAROR(UI8,0xffff,BSTR,rbstr,I4,0xffff); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(UI8,0,BSTR,rbstr,I4,-1); VAROR(UI8,0xffff,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(UI8,0xffff,10000,I4,0xffff); VARORCY(UI8,0xffff,0,I4,0xffff); VARORCY(UI8,0,0,I4,0); @@ -4587,9 +4666,11 @@ rbstr = SysAllocString(szFalse); VAROR(INT,0,BSTR,rbstr,I4,0); VAROR(INT,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(INT,0,BSTR,rbstr,I4,-1); VAROR(INT,-1,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(INT,-1,10000,I4,-1); VARORCY(INT,-1,0,I4,-1); VARORCY(INT,0,0,I4,0); @@ -4600,9 +4681,11 @@ rbstr = SysAllocString(szFalse); VAROR(UINT,0,BSTR,rbstr,I4,0); VAROR(UINT,0xffff,BSTR,rbstr,I4,0xffff); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(UINT,0,BSTR,rbstr,I4,-1); VAROR(UINT,0xffff,BSTR,rbstr,I4,-1); + SysFreeString(rbstr); VARORCY(UINT,0xffff,10000,I4,0xffff); VARORCY(UINT,0xffff,0,I4,0xffff); VARORCY(UINT,0,0,I4,0); @@ -4610,13 +4693,18 @@ lbstr = SysAllocString(szFalse); rbstr = SysAllocString(szFalse); VAROR(BSTR,lbstr,BSTR,rbstr,BOOL,0); + SysFreeString(rbstr); rbstr = SysAllocString(szTrue); VAROR(BSTR,lbstr,BSTR,rbstr,BOOL,VARIANT_TRUE); + SysFreeString(lbstr); lbstr = SysAllocString(szTrue); VAROR(BSTR,lbstr,BSTR,rbstr,BOOL,VARIANT_TRUE); VARORCY(BSTR,lbstr,10000,I4,-1); + SysFreeString(lbstr); lbstr = SysAllocString(szFalse); VARORCY(BSTR,lbstr,10000,I4,1); + SysFreeString(lbstr); + SysFreeString(rbstr); } static HRESULT (WINAPI *pVarEqv)(LPVARIANT,LPVARIANT,LPVARIANT); @@ -5049,6 +5137,8 @@ leftvt, ExtraFlags[i], rightvt, ExtraFlags[i], resvt, hres, V_VT(&result)); } + /* Note, we don't clear left/right deliberately here */ + VariantClear(&result); } } } @@ -5090,6 +5180,7 @@ ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); ok(hres == S_OK && EQ_DOUBLE(r, 1212), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ V_VT(&cy) = VT_CY; @@ -5114,6 +5205,7 @@ ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); + VariantClear(&result); SysFreeString(lbstr); SysFreeString(rbstr); @@ -5230,18 +5322,27 @@ V_VT(&left) = leftvt; V_VT(&right) = rightvt; - if (leftvt == VT_BSTR) - V_BSTR(&left) = SysAllocString(sz_empty); - if (rightvt == VT_BSTR) - V_BSTR(&right) = SysAllocString(sz_empty); - if (leftvt == VT_DATE) - V_DATE(&left) = 0.0; - if (rightvt == VT_DATE) - V_DATE(&right) = 0.0; - if (leftvt == VT_DECIMAL) - VarDecFromR8(0.0, &V_DECIMAL(&left)); - if (rightvt == VT_DECIMAL) - VarDecFromR8(0.0, &V_DECIMAL(&right)); + switch (leftvt) { + case VT_BSTR: + V_BSTR(&left) = SysAllocString(sz_empty); break; + case VT_DATE: + V_DATE(&left) = 0.0; break; + case VT_DECIMAL: + VarDecFromR8(0.0, &V_DECIMAL(&left)); break; + default: + V_I8(&left) = 0; + } + + switch (rightvt) { + case VT_BSTR: + V_BSTR(&right) = SysAllocString(sz_empty); break; + case VT_DATE: + V_DATE(&right) = 0.0; break; + case VT_DECIMAL: + VarDecFromR8(0.0, &V_DECIMAL(&right)); break; + default: + V_I8(&right) = 0; + } hres = VarCat(&left, &right, &result); @@ -5261,7 +5362,7 @@ } } - /* Runnning single comparison tests to compare outputs */ + /* Running single comparison tests to compare outputs */ /* Test concat strings */ V_VT(&left) = VT_BSTR; @@ -5314,8 +5415,9 @@ V_BSTR(&expected) = SysAllocString(sz12_true); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_INT concat with VT_BOOL (TRUE) returned incorrect result\n"); + hres = VarCmp(&result,&expected,lcid,0); + ok(hres == VARCMP_EQ || + broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right); @@ -5330,8 +5432,9 @@ V_BSTR(&expected) = SysAllocString(sz12_false); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_INT concat with VT_BOOL (FALSE) returned inncorrect result\n"); + hres = VarCmp(&result,&expected,lcid,0); + ok(hres == VARCMP_EQ || + broken(hres == VARCMP_GT), "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right); @@ -5380,6 +5483,7 @@ VariantClear(&left); VariantClear(&right); VariantClear(&result); + VariantClear(&expected); /* Test concat dates with strings */ V_VT(&left) = VT_BSTR; @@ -6273,7 +6377,7 @@ } } - /* VARCMP{,EX} run each 4 tests with a permutation of all posible + /* VARCMP{,EX} run each 4 tests with a permutation of all possible input variants with (1) and without (0) VT_RESERVED set. The order of the permutations is (0,0); (1,0); (0,1); (1,1) */ VARCMP(INT,4711,I2,4711,VARCMP_EQ); @@ -6859,11 +6963,20 @@ "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); hres = pVarPow(&cy, &right, &result); - ok(hres == S_OK && V_VT(&result) == VT_R8, - "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", - S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), - "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); + if (hres == S_OK) + { + ok(hres == S_OK && V_VT(&result) == VT_R8, + "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", + S_OK, hres, vtstr(V_VT(&result))); + ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + "VARPOW: CY value %f, expected %f\n", V_R8(&result), 4.0); + } + else + { + ok(hres == DISP_E_BADVARTYPE && V_VT(&result) == VT_EMPTY, + "VARPOW: expected coerced hres 0x%X type VT_EMPTY, got hres 0x%X type %s!\n", + DISP_E_BADVARTYPE, hres, vtstr(V_VT(&result))); + } hres = pVarPow(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, @@ -6887,11 +7000,20 @@ "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); hres = pVarPow(&dec, &right, &result); - ok(hres == S_OK && V_VT(&result) == VT_R8, - "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", - S_OK, hres, vtstr(V_VT(&result))); - ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), - "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); + if (hres == S_OK) + { + ok(hres == S_OK && V_VT(&result) == VT_R8, + "VARPOW: expected coerced hres 0x%X type VT_R8, got hres 0x%X type %s!\n", + S_OK, hres, vtstr(V_VT(&result))); + ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 4.0), + "VARPOW: DECIMAL value %f, expected %f\n", V_R8(&result), 4.0); + } + else + { + ok(hres == DISP_E_BADVARTYPE && V_VT(&result) == VT_EMPTY, + "VARPOW: expected coerced hres 0x%X type VT_EMPTY, got hres 0x%X type %s!\n", + DISP_E_BADVARTYPE, hres, vtstr(V_VT(&result))); + } SysFreeString(num2_str); SysFreeString(num3_str); Modified: trunk/rostests/winetests/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp… ============================================================================== --- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Sun Jan 4 13:19:05 2009 @@ -498,6 +498,7 @@ static HRESULT (WINAPI *pVarBstrFromR4)(FLOAT,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDate)(DATE,LCID,ULONG,BSTR*); +static HRESULT (WINAPI *pVarBstrFromCy)(CY,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); @@ -1097,7 +1098,7 @@ dispatch.vt = VT_UI1; dispatch.bFailInvoke = FALSE; - hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out); + hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out); trace("0x%08x\n", hres); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); @@ -1105,7 +1106,7 @@ dispatch.bFailInvoke = TRUE; - hres = VarUI1FromDisp((IDispatch*)&dispatch, in, &out); + hres = pVarUI1FromDisp((IDispatch*)&dispatch, in, &out); trace("0x%08x\n", hres); hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); @@ -3322,7 +3323,7 @@ CHECKPTR(VarDateFromStr); CHECKPTR(SystemTimeToVariantTime); - /* Some date formats are relative, so we need to find the cuurent year */ + /* Some date formats are relative, so we need to find the current year */ GetSystemTime(&st); st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; DFS(NULL); EXPECT_MISMATCH; @@ -4800,18 +4801,80 @@ BSTR_DATE(2958465.0, "12/31/9999"); } -#define BSTR_DEC(l, a, b, c, d, e) \ - SETDEC(l, a,b,c,d);\ - hres = VarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ +#define BSTR_CY(l, a, b, e) \ + S(l).Lo = b; S(l).Hi = a; \ + hres = pVarBstrFromCy(l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ ok(hres == S_OK, "got hres 0x%08x\n", hres);\ if (hres== S_OK && bstr)\ {\ ok(lstrcmpW(bstr, e) == 0, "invalid number (got %s)\n", wtoascii(bstr));\ } +static void test_VarBstrFromCy(void) +{ + LCID lcid; + HRESULT hres; + BSTR bstr = NULL; + CY l; + + static const WCHAR szZero[] = {'0', '\0'}; + static const WCHAR szOne[] = {'1', '\0'}; + static const WCHAR szOnePointFive[] = {'1','.','5','\0'}; + static const WCHAR szMinusOnePointFive[] = {'-','1','.','5','\0'}; + static const WCHAR szBigNum1[] = {'4','2','9','4','9','6','.','7','2','9','5','\0'}; /* (1 << 32) - 1 / 1000 */ + static const WCHAR szBigNum2[] = {'4','2','9','4','9','6','.','7','2','9','6','\0'}; /* (1 << 32) / 1000 */ + static const WCHAR szBigNum3[] = {'9','2','2','3','3','7','2','0','3','6','8','5','4','7','7','.','5','8','0','7','\0'}; /* ((1 << 63) - 1)/10000 */ + + static const WCHAR szSmallNumber_English[] = {'0','.','0','0','0','9','\0'}; + static const WCHAR szSmallNumber_Spanish[] = {'0',',','0','0','0','9','\0'}; + + CHECKPTR(VarBstrFromCy); + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + + /* check zero */ + BSTR_CY(l, 0,0, szZero); + + /* check one */ + BSTR_CY(l, 0, 10000, szOne); + + /* check one point five */ + BSTR_CY(l, 0, 15000, szOnePointFive); + + /* check minus one point five */ + BSTR_CY(l, 0xffffffff, ((15000)^0xffffffff)+1, szMinusOnePointFive); + + /* check bignum (1) */ + BSTR_CY(l, 0, 0xffffffff, szBigNum1); + + /* check bignum (2) */ + BSTR_CY(l, 1,0, szBigNum2); + + /* check bignum (3) */ + BSTR_CY(l, 0x7fffffff,0xffffffff, szBigNum3); + + /* check leading zeros and decimal sep. for English locale */ + BSTR_CY(l, 0,9, szSmallNumber_English); + + lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_DEFAULT), SORT_DEFAULT); + + /* check leading zeros and decimal sep. for Spanish locale */ + BSTR_CY(l, 0,9, szSmallNumber_Spanish); +} + +#undef BSTR_CY + +#define BSTR_DEC(l, a, b, c, d, e) \ + SETDEC(l, a,b,c,d);\ + hres = pVarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ + ok(hres == S_OK, "got hres 0x%08x\n", hres);\ + if (hres== S_OK && bstr)\ + {\ + ok(lstrcmpW(bstr, e) == 0, "invalid number (got %s)\n", wtoascii(bstr));\ + } + #define BSTR_DEC64(l, a, b, c, x, d, e) \ SETDEC64(l, a,b,c,x,d);\ - hres = VarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ + hres = pVarBstrFromDec(&l, lcid, LOCALE_NOUSEROVERRIDE, &bstr);\ ok(hres == S_OK, "got hres 0x%08x\n", hres);\ if (hres== S_OK && bstr)\ {\ @@ -4928,12 +4991,12 @@ bstr = SysAllocString(sz); bstrempty = SysAllocString(szempty); - /* NULL handling. Yepp, MSDN is totaly wrong here */ + /* NULL handling. Yepp, MSDN is totally wrong here */ VARBSTRCMP(NULL,NULL,0,VARCMP_EQ); VARBSTRCMP(bstr,NULL,0,VARCMP_GT); VARBSTRCMP(NULL,bstr,0,VARCMP_LT); - /* NULL and empty string comparisions */ + /* NULL and empty string comparisons */ VARBSTRCMP(bstrempty,NULL,0,VARCMP_EQ); VARBSTRCMP(NULL,bstrempty,0,VARCMP_EQ); @@ -5139,7 +5202,8 @@ changed = SysReAllocString(&str, szSmaller); ok (changed == 1, "Expected 1, got %d\n", changed); - ok (str == oldstr, "Created new string\n"); + /* Vista creates a new string, but older versions reuse the existing string. */ + /*ok (str == oldstr, "Created new string\n");*/ bstr = Get(str); ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n"); @@ -5178,7 +5242,8 @@ changed = SysReAllocStringLen(&str, szSmaller, 1); ok (changed == 1, "Expected 1, got %d\n", changed); - ok (str == oldstr, "Created new string\n"); + /* Vista creates a new string, but older versions reuse the existing string. */ + /*ok (str == oldstr, "Created new string\n");*/ bstr = Get(str); ok (bstr->dwLen == 2, "Expected 2, got %d\n", bstr->dwLen); ok (!lstrcmpW(bstr->szString, szSmaller), "String different\n"); @@ -5717,7 +5782,7 @@ * its memory, while Wine uses HeapAlloc(). Doing this ensures we allocate * using the correct function whether with native or builtin. */ - ci.prgCustData = (LPCUSTDATAITEM)SysAllocStringByteLen((LPCSTR)buff, sizeof(buff)); + ci.prgCustData = (LPCUSTDATAITEM)Get(SysAllocStringByteLen((LPCSTR)buff, sizeof(buff))); for (i = 0; i < NUM_CUST_ITEMS; i++) VariantInit(&ci.prgCustData[i].varValue); pClearCustData(&ci); @@ -5729,8 +5794,8 @@ VARIANT v1, v2; HRESULT hRes; - VariantClear(&v1); - VariantClear(&v2); + VariantInit(&v1); + VariantInit(&v2); V_VT(&v1) = VT_BYREF|VT_VARIANT; V_BYREF(&v1) = 0; @@ -5763,8 +5828,8 @@ HRESULT hres; bstr = SysAllocString(testW); - VariantClear(&v1); - VariantClear(&v2); + VariantInit(&v1); + VariantInit(&v2); V_VT(&v1) = VT_BSTR; V_BSTR(&v1) = bstr; hres = VariantChangeTypeEx(&v1, &v1, 0, 0, VT_INT); @@ -6042,6 +6107,7 @@ test_VarBstrFromR4(); test_VarBstrFromDate(); + test_VarBstrFromCy(); test_VarBstrFromDec(); test_VarBstrCmp(); test_SysStringLen();

1 0

[cwittich] 38569: sync ole32_winetest with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 11:52:22 2009 New Revision: 38569 URL: http://svn.reactos.org/svn/reactos?rev=38569&view=rev Log: sync ole32_winetest with wine 1.1.12 Added: trunk/rostests/winetests/ole32/defaulthandler.c (with props) Modified: trunk/rostests/winetests/ole32/clipboard.c trunk/rostests/winetests/ole32/compobj.c trunk/rostests/winetests/ole32/dragdrop.c trunk/rostests/winetests/ole32/hglobalstream.c trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole2.c trunk/rostests/winetests/ole32/ole32.rbuild trunk/rostests/winetests/ole32/stg_prop.c trunk/rostests/winetests/ole32/storage32.c trunk/rostests/winetests/ole32/testlist.c trunk/rostests/winetests/ole32/usrmarshal.c Modified: trunk/rostests/winetests/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/clipboard… ============================================================================== --- trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/clipboard.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -200,7 +200,7 @@ DataObjectImpl_GetData_calls++; if(pformatetc->lindex != -1) - return DV_E_LINDEX; + return DV_E_FORMATETC; if(!(pformatetc->tymed & TYMED_HGLOBAL)) return DV_E_TYMED; @@ -359,7 +359,10 @@ InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + ok(hr == DV_E_FORMATETC || broken(hr == S_OK), + "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if (hr == S_OK) + ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; @@ -397,8 +400,13 @@ InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine - ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if (hr == S_OK) + { + /* undo the unexpected success */ + DataObjectImpl_GetData_calls--; + ReleaseStgMedium(&stgmedium); + } InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; @@ -430,12 +438,10 @@ return; hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); CoInitialize(NULL); hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED || hr == CLIPBRD_E_CANT_SET, /* win9x */ "OleSetClipboard should have failed with " Modified: trunk/rostests/winetests/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/compobj.c… ============================================================================== --- trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/compobj.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -40,18 +40,13 @@ #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; -static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } }; -static WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; +static const CLSID CLSID_StdFont = { 0x0be35203, 0x8f91, 0x11ce, { 0x9d, 0xe3, 0x00, 0xaa, 0x00, 0x4b, 0xb8, 0x51 } }; +static WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; -static WCHAR wszCLSID_CDeviceMoniker[] = -{ - '{', - '4','3','1','5','d','4','3','7','-', - '5','b','8','c','-', - '1','1','d','0','-', - 'b','d','3','b','-', - '0','0','a','0','c','9','1','1','c','e','8','6', - '}',0 +static WCHAR wszCLSID_StdFont[] = +{ + '{','0','b','e','3','5','2','0','3','-','8','f','9','1','-','1','1','c','e','-', + '9','d','e','3','-','0','0','a','a','0','0','4','b','b','8','5','1','}',0 }; static const IID IID_IWineTest = @@ -143,11 +138,11 @@ static void test_ProgIDFromCLSID(void) { LPWSTR progid; - HRESULT hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, &progid); + HRESULT hr = ProgIDFromCLSID(&CLSID_StdFont, &progid); ok(hr == S_OK, "ProgIDFromCLSID failed with error 0x%08x\n", hr); if (hr == S_OK) { - ok(!lstrcmpiW(progid, devicedotone), "Didn't get expected prog ID\n"); + ok(!lstrcmpiW(progid, stdfont), "Didn't get expected prog ID\n"); CoTaskMemFree(progid); } @@ -156,20 +151,20 @@ ok(hr == REGDB_E_CLASSNOTREG, "ProgIDFromCLSID returned %08x\n", hr); ok(progid == NULL, "ProgIDFromCLSID returns with progid %p\n", progid); - hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, NULL); + hr = ProgIDFromCLSID(&CLSID_StdFont, NULL); ok(hr == E_INVALIDARG, "ProgIDFromCLSID should return E_INVALIDARG instead of 0x%08x\n", hr); } static void test_CLSIDFromProgID(void) { CLSID clsid; - HRESULT hr = CLSIDFromProgID(devicedotone, &clsid); + HRESULT hr = CLSIDFromProgID(stdfont, &clsid); ok(hr == S_OK, "CLSIDFromProgID failed with error 0x%08x\n", hr); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); - - hr = CLSIDFromString(devicedotone, &clsid); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); + + hr = CLSIDFromString(stdfont, &clsid); ok_ole_success(hr, "CLSIDFromString"); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); /* test some failure cases */ @@ -188,9 +183,9 @@ static void test_CLSIDFromString(void) { CLSID clsid; - HRESULT hr = CLSIDFromString(wszCLSID_CDeviceMoniker, &clsid); + HRESULT hr = CLSIDFromString(wszCLSID_StdFont, &clsid); ok_ole_success(hr, "CLSIDFromString"); - ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); hr = CLSIDFromString(NULL, &clsid); ok_ole_success(hr, "CLSIDFromString"); @@ -202,19 +197,19 @@ WCHAR str[50]; int len; /* Test corner cases for buffer size */ - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,50); + len = StringFromGUID2(&CLSID_StdFont,str,50); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n"); memset(str,0,sizeof str); - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,39); + len = StringFromGUID2(&CLSID_StdFont,str,39); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); - - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,38); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n"); + + len = StringFromGUID2(&CLSID_StdFont,str,38); ok(len == 0, "len: %d (expected 0)\n", len); - len = StringFromGUID2(&CLSID_CDeviceMoniker,str,30); + len = StringFromGUID2(&CLSID_StdFont,str,30); ok(len == 0, "len: %d (expected 0)\n", len); } Added: trunk/rostests/winetests/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/defaultha… ============================================================================== --- trunk/rostests/winetests/ole32/defaulthandler.c (added) +++ trunk/rostests/winetests/ole32/defaulthandler.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -1,0 +1,110 @@ +/* + * Default Handler Tests + * + * Copyright 2008 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/test.h" + + +static HRESULT create_storage(IStorage **stg) +{ + HRESULT hr; + ILockBytes *lock_bytes; + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &lock_bytes); + if(SUCCEEDED(hr)) + { + hr = StgCreateDocfileOnILockBytes(lock_bytes, + STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, stg); + ILockBytes_Release(lock_bytes); + } + return hr; +} + +typedef struct +{ + DWORD version; + DWORD flags; + DWORD link_update_opt; + DWORD res; + DWORD moniker_size; +} ole_stream_header_t; + +static void test_olestream(void) +{ + HRESULT hr; + const CLSID non_existent_class = {0xa5f1772f, 0x3772, 0x490f, {0x9e, 0xc6, 0x77, 0x13, 0xe8, 0xb3, 0x4b, 0x5d}}; + IOleObject *ole_obj; + IPersistStorage *persist; + IStorage *stg; + IStream *stm; + static const WCHAR olestream[] = {1,'O','l','e',0}; + ULONG read; + ole_stream_header_t header; + + hr = create_storage(&stg); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + ok(hr == STG_E_FILENOTFOUND, "got %08x\n", hr); + + hr = OleCreateDefaultHandler(&non_existent_class, 0, &IID_IOleObject, (void**)&ole_obj); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersistStorage, (void**)&persist); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IPersistStorage_InitNew(persist, stg); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IStorage_OpenStream(stg, olestream, NULL, STGM_SHARE_EXCLUSIVE | STGM_READ, 0, &stm); + ok(hr == S_OK, "got %08x\n", hr); + hr = IStream_Read(stm, &header, sizeof(header), &read); + ok(hr == S_OK, "got %08x\n", hr); + ok(read == sizeof(header), "read %d\n", read); + ok(header.version == 0x02000001, "got version %08x\n", header.version); + ok(header.flags == 0x0, "got flags %08x\n", header.flags); + ok(header.link_update_opt == 0x0, "got link update option %08x\n", header.link_update_opt); + ok(header.res == 0x0, "got reserved %08x\n", header.res); + ok(header.moniker_size == 0x0, "got moniker size %08x\n", header.moniker_size); + + IStream_Release(stm); + + IPersistStorage_Release(persist); + IOleObject_Release(ole_obj); + + IStorage_Release(stg); +} + +START_TEST(defaulthandler) +{ + OleInitialize(NULL); + + test_olestream(); + + OleUninitialize(); +} Propchange: trunk/rostests/winetests/ole32/defaulthandler.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… ============================================================================== --- trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -108,16 +108,42 @@ static IDropTarget DropTarget = { &DropTarget_VTbl }; +static ATOM register_dummy_class(void) +{ + WNDCLASS wc = + { + 0, + DefWindowProc, + 0, + 0, + GetModuleHandle(NULL), + NULL, + LoadCursor(NULL, IDC_ARROW), + (HBRUSH)(COLOR_BTNFACE+1), + NULL, + TEXT("WineOleTestClass"), + }; + + return RegisterClass(&wc); +} + START_TEST(dragdrop) { HRESULT hr; + HWND hwnd; - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); - ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + hwnd = CreateWindow(MAKEINTATOM(register_dummy_class()), "Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, + NULL, NULL, NULL); + + hr = RegisterDragDrop(hwnd, &DropTarget); + ok(hr == E_OUTOFMEMORY || + broken(hr == CO_E_NOTINITIALIZED), /* NT4 */ + "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); OleInitialize(NULL); - hr = RegisterDragDrop(GetDesktopWindow(), NULL); + hr = RegisterDragDrop(hwnd, NULL); ok(hr == E_INVALIDARG, "RegisterDragDrop with NULL IDropTarget * should return E_INVALIDARG instead of 0x%08x\n", hr); hr = RegisterDragDrop(NULL, &DropTarget); @@ -127,21 +153,25 @@ ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); - hr = RegisterDragDrop(GetDesktopWindow(), &DropTarget); + hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); OleUninitialize(); ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); - hr = RevokeDragDrop(GetDesktopWindow()); + hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_release_called == 1 || + broken(droptarget_release_called == 0), /* NT4 */ + "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); + + DestroyWindow(hwnd); } Modified: trunk/rostests/winetests/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/hglobalst… ============================================================================== --- trunk/rostests/winetests/ole32/hglobalstream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/hglobalstream.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -92,7 +92,8 @@ ull.u.HighPart = -1; ull.u.LowPart = -1; hr = IStream_SetSize(pStream, ull); - ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ + "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -261,18 +262,19 @@ static void test_freed_hglobal(void) { + static const char teststring[] = "this is a test string"; HRESULT hr; IStream *pStream; HGLOBAL hglobal; char *p; - char buffer[10]; + char buffer[sizeof(teststring) + 8]; ULARGE_INTEGER ull; ULONG read, written; - hglobal = GlobalAlloc(GMEM_DDESHARE|GMEM_NODISCARD|GMEM_MOVEABLE, strlen("Rob") + 1); + hglobal = GlobalAlloc(GMEM_DDESHARE|GMEM_NODISCARD|GMEM_MOVEABLE, strlen(teststring) + 1); ok(hglobal != NULL, "GlobalAlloc failed with error %d\n", GetLastError()); p = GlobalLock(hglobal); - strcpy(p, "Rob"); + strcpy(p, teststring); GlobalUnlock(hglobal); hr = CreateStreamOnHGlobal(hglobal, FALSE, &pStream); @@ -280,8 +282,10 @@ hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); ok_ole_success(hr, "IStream_Read"); - ok(!strcmp(buffer, "Rob"), "buffer data %s differs\n", buffer); - ok(read == strlen("Rob") + 1, "read should be 4 instead of %d\n", read); + ok(!strcmp(buffer, teststring), "buffer data %s differs\n", buffer); + ok(read == sizeof(teststring) || + broken(read == ((sizeof(teststring) + 3) & ~3)), /* win9x rounds the size */ + "read should be sizeof(teststring) instead of %d\n", read); GlobalFree(hglobal); Modified: trunk/rostests/winetests/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/marshal.c… ============================================================================== --- trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/marshal.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -2052,7 +2052,7 @@ size = GlobalSize(hglobal); - marshal_data = (char *)GlobalLock(hglobal); + marshal_data = GlobalLock(hglobal); if (mshctx == MSHCTX_INPROC) { Modified: trunk/rostests/winetests/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/moniker.c… ============================================================================== --- trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/moniker.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -364,7 +364,7 @@ { static const WCHAR wszDisplayName[] = {'*','*','G','e','m','m','a',0}; CHECK_EXPECTED_METHOD("Moniker_GetDisplayName"); - *ppszDisplayName = (LPOLESTR)CoTaskMemAlloc(sizeof(wszDisplayName)); + *ppszDisplayName = CoTaskMemAlloc(sizeof(wszDisplayName)); memcpy(*ppszDisplayName, wszDisplayName, sizeof(wszDisplayName)); return S_OK; } Modified: trunk/rostests/winetests/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole2.c?re… ============================================================================== --- trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole2.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -1481,7 +1481,7 @@ IOleObject_Release(pObject); } -void test_runnable(void) +static void test_runnable(void) { static const char *methods_query_runnable[] = { Modified: trunk/rostests/winetests/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/ole32.rbu… ============================================================================== --- trunk/rostests/winetests/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/ole32.rbuild [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -6,6 +6,7 @@ <include base="ole32_winetest">.</include> <file>clipboard.c</file> <file>compobj.c</file> + <file>defaulthandler.c</file> <file>dragdrop.c</file> <file>errorinfo.c</file> <file>hglobalstream.c</file> Modified: trunk/rostests/winetests/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/stg_prop.… ============================================================================== --- trunk/rostests/winetests/ole32/stg_prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/stg_prop.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -408,8 +408,7 @@ /* check code page before it's been explicitly set */ hr = IPropertyStorage_ReadMultiple(propertyStorage, 1, &spec, &var); ok(hr == S_OK, "ReadMultiple failed: 0x%08x\n", hr); - ok(var.vt == VT_I2 && U(var).iVal == 1252, - "Didn't get expected type or value for property\n"); + ok(var.vt == VT_I2, "Didn't get expected type for property (%u)\n", var.vt); /* Set code page to Unicode */ U(var).iVal = 1200; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); Modified: trunk/rostests/winetests/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/storage32… ============================================================================== --- trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/storage32.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -262,7 +262,8 @@ r = IStorage_CreateStream(stg, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, longname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); - ok(r==STG_E_INVALIDNAME, "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError()); + ok(r==STG_E_INVALIDNAME || broken(r==S_OK) /* nt4 */, + "IStorage->CreateStream wrong error, got %d GetLastError()=%d\n", r, GetLastError()); r = IStorage_CreateStream(stg, stmname, STGM_READWRITE, 0, 0, &stm ); ok(r==STG_E_INVALIDFLAG, "IStorage->CreateStream wrong error\n"); r = IStorage_CreateStream(stg, stmname, STGM_READ, 0, 0, &stm ); @@ -1003,65 +1004,66 @@ { BOOL gothandle; DWORD lasterr; + BOOL ignore; }; static const struct access_res create[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS } + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } }; static const struct access_res create_commit[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { FALSE, ERROR_SHARING_VIOLATION }, - { TRUE, ERROR_SUCCESS } + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } }; static const struct access_res create_close[16] = { - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, - { TRUE, ERROR_SUCCESS }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, { TRUE, ERROR_SUCCESS } }; @@ -1081,6 +1083,9 @@ for (j = 0; j < 4; j++) { + if (ares[idx].ignore) + continue; + if (j == 0) share = 0; if (j == 1) share = FILE_SHARE_READ; if (j == 2) share = FILE_SHARE_WRITE; @@ -1096,7 +1101,8 @@ line, idx, ares[idx].gothandle, (hfile != INVALID_HANDLE_VALUE)); - ok(lasterr == ares[idx].lasterr, + ok(lasterr == ares[idx].lasterr || + broken(lasterr == 0xdeadbeef) /* win9x */, "(%d, lasterr, %d): Expected %d, got %d\n", line, idx, ares[idx].lasterr, lasterr); Modified: trunk/rostests/winetests/ole32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/testlist.… ============================================================================== --- trunk/rostests/winetests/ole32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/testlist.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -8,6 +8,7 @@ extern void func_clipboard(void); extern void func_compobj(void); +extern void func_defaulthandler(void); extern void func_dragdrop(void); extern void func_errorinfo(void); extern void func_hglobalstream(void); @@ -23,6 +24,7 @@ { { "clipboard", func_clipboard }, { "compobj", func_compobj }, + { "defaulthandler", func_defaulthandler }, { "dragdrop", func_dragdrop }, { "errorinfo", func_errorinfo }, { "hglobalstream", func_hglobalstream }, Modified: trunk/rostests/winetests/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/usrmarsha… ============================================================================== --- trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c [iso-8859-1] Sun Jan 4 11:52:22 2009 @@ -158,9 +158,9 @@ static HENHMETAFILE create_emf(void) { - RECT rect = {0, 0, 100, 100}; + const RECT rect = {0, 0, 100, 100}; HDC hdc = CreateEnhMetaFile(NULL, NULL, &rect, "HENHMETAFILE Marshaling Test\0Test\0\0"); - ExtTextOut(hdc, 0, 0, ETO_OPAQUE, NULL, "Test String", strlen("Test String"), NULL); + ExtTextOut(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); return CloseEnhMetaFile(hdc); }

1 0

[sginsberg] 38568: - DbgkpSendApiMessage/DbgkpSendApiMessageLpc: Make sure the process is suspended before resuming it. Also, DbgkpSendApiMessage takes a BOOLEAN as 2nd parameter. - DbgkpWakeTarget: Correct a check for a Debug Event flag
by sginsberg＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: sginsberg Date: Sun Jan 4 11:33:47 2009 New Revision: 38568 URL: http://svn.reactos.org/svn/reactos?rev=38568&view=rev Log: - DbgkpSendApiMessage/DbgkpSendApiMessageLpc: Make sure the process is suspended before resuming it. Also, DbgkpSendApiMessage takes a BOOLEAN as 2nd parameter. - DbgkpWakeTarget: Correct a check for a Debug Event flag Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/include/internal/dbgk.h Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Jan 4 11:33:47 2009 @@ -209,10 +209,11 @@ { NTSTATUS Status; UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; + BOOLEAN Suspended = FALSE; PAGED_CODE(); /* Suspend process if required */ - if (SuspendProcess) DbgkpSuspendProcess(); + if (SuspendProcess) Suspended = DbgkpSuspendProcess(); /* Set return status */ Message->ReturnedStatus = STATUS_PENDING; @@ -232,21 +233,22 @@ if (NT_SUCCESS(Status)) RtlCopyMemory(Message, Buffer, sizeof(DBGKM_MSG)); /* Resume the process if it was suspended */ - if (SuspendProcess) DbgkpResumeProcess(); + if (Suspended) DbgkpResumeProcess(); return Status; } NTSTATUS NTAPI DbgkpSendApiMessage(IN OUT PDBGKM_MSG ApiMsg, - IN ULONG Flags) + IN BOOLEAN SuspendProcess) { NTSTATUS Status; + BOOLEAN Suspended = FALSE; PAGED_CODE(); - DBGKTRACE(DBGK_MESSAGE_DEBUG, "ApiMsg: %p Flags: %lx\n", ApiMsg, Flags); + DBGKTRACE(DBGK_MESSAGE_DEBUG, "ApiMsg: %p SuspendProcess: %lx\n", ApiMsg, SuspendProcess); /* Suspend process if required */ - if (Flags) DbgkpSuspendProcess(); + if (SuspendProcess) Suspended = DbgkpSuspendProcess(); /* Set return status */ ApiMsg->ReturnedStatus = STATUS_PENDING; @@ -265,7 +267,7 @@ ZwFlushInstructionCache(NtCurrentProcess(), NULL, 0); /* Resume the process if it was suspended */ - if (Flags) DbgkpResumeProcess(); + if (Suspended) DbgkpResumeProcess(); return Status; } @@ -426,7 +428,7 @@ DBGKTRACE(DBGK_OBJECT_DEBUG, "DebugEvent: %p\n", DebugEvent); /* Check if we have to wake the thread */ - if (DebugEvent->Flags & 20) PsResumeThread(Thread, NULL); + if (DebugEvent->Flags & 0x20) PsResumeThread(Thread, NULL); /* Check if we had locked the thread */ if (DebugEvent->Flags & 8) Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Sun Jan 4 11:33:47 2009 @@ -102,7 +102,7 @@ NTAPI DbgkpSendApiMessage( IN OUT PDBGKM_MSG ApiMsg, - IN ULONG Flags + IN BOOLEAN SuspendProcess ); HANDLE

1 0

[dchapyshev] 38567: - Change of names of variables - Move all variables declaration to top
by dchapyshev＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: dchapyshev Date: Sun Jan 4 10:57:58 2009 New Revision: 38567 URL: http://svn.reactos.org/svn/reactos?rev=38567&view=rev Log: - Change of names of variables - Move all variables declaration to top Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jan 4 10:57:58 2009 @@ -701,10 +701,16 @@ /* Class 5 - Process Information */ QSI_DEF(SystemProcessInformation) { - ULONG ovlSize = 0, nThreads; - PEPROCESS pr = NULL, syspr; - PUCHAR pCur; + PSYSTEM_PROCESS_INFORMATION SpiCurrent; + PSYSTEM_THREAD_INFORMATION ThreadInfo; + PEPROCESS Process = NULL, SystemProcess; + PETHREAD CurrentThread; + ANSI_STRING ImageName; + int CurrentSize, ImageNameLength = 32; // image name len in bytes + PLIST_ENTRY CurrentEntry; + ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; + PUCHAR Current; NTSTATUS Status = STATUS_SUCCESS; _SEH2_TRY @@ -722,133 +728,125 @@ } RtlZeroMemory(Spi, Size); - syspr = PsIdleProcess; - pr = syspr; - pCur = (unsigned char *)Spi; + SystemProcess = PsIdleProcess; + Process = SystemProcess; + Current = (PUCHAR) Spi; do { - PSYSTEM_PROCESS_INFORMATION SpiCur; - int curSize; - ANSI_STRING imgName; - int inLen = 32; // image name len in bytes - PLIST_ENTRY current_entry; - PETHREAD current; - PSYSTEM_THREAD_INFORMATION ThreadInfo; - - SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - - nThreads = 0; - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) + SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; + + ThreadsCount = 0; + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) { - nThreads++; - current_entry = current_entry->Flink; + ThreadsCount++; + CurrentEntry = CurrentEntry->Flink; } // size of the structure for every process - curSize = sizeof(SYSTEM_PROCESS_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads; - ovlSize += curSize+inLen; - - if (ovlSize > Size) + CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; + TotalSize += CurrentSize + ImageNameLength; + + if (TotalSize > Size) { - *ReqSize = ovlSize; - ObDereferenceObject(pr); + *ReqSize = TotalSize; + ObDereferenceObject(Process); _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } // fill system information - SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure - SpiCur->NumberOfThreads = nThreads; - SpiCur->CreateTime = pr->CreateTime; - SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = (USHORT)inLen; - SpiCur->ImageName.Buffer = (void*)(pCur+curSize); + SpiCurrent->NextEntryOffset = CurrentSize + ImageNameLength; // relative offset to the beginnnig of the next structure + SpiCurrent->NumberOfThreads = ThreadsCount; + SpiCurrent->CreateTime = Process->CreateTime; + SpiCurrent->ImageName.Length = strlen(Process->ImageFileName) * sizeof(WCHAR); + SpiCurrent->ImageName.MaximumLength = (USHORT)ImageNameLength; + SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); // copy name to the end of the struct - if(pr != PsIdleProcess) + if(Process != PsIdleProcess) { - RtlInitAnsiString(&imgName, pr->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); + RtlInitAnsiString(&ImageName, Process->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); } else { - RtlInitUnicodeString(&SpiCur->ImageName, NULL); + RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); } - SpiCur->BasePriority = pr->Pcb.BasePriority; - SpiCur->UniqueProcessId = pr->UniqueProcessId; - SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; - SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - SpiCur->PeakVirtualSize = pr->PeakVirtualSize; - SpiCur->VirtualSize = pr->VirtualSize; - SpiCur->PageFaultCount = pr->Vm.PageFaultCount; - SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; - SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; - SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; - SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; - SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; - SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; - SpiCur->PagefileUsage = pr->QuotaUsage[2]; - SpiCur->PeakPagefileUsage = pr->QuotaPeak[2]; - SpiCur->PrivatePageCount = pr->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); - - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) + SpiCurrent->BasePriority = Process->Pcb.BasePriority; + SpiCurrent->UniqueProcessId = Process->UniqueProcessId; + SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; + SpiCurrent->HandleCount = (Process->ObjectTable ? ObpGetHandleCountByHandleTable(Process->ObjectTable) : 0); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; + SpiCurrent->VirtualSize = Process->VirtualSize; + SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; + SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; + SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; + SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; + SpiCurrent->PrivatePageCount = Process->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); + + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) { - current = CONTAINING_RECORD(current_entry, ETHREAD, + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, ThreadListEntry); - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(current->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(current->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = current->CreateTime.QuadPart; - ThreadInfo->WaitTime = current->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) current->StartAddress; - ThreadInfo->ClientId = current->Cid; - ThreadInfo->Priority = current->Tcb.Priority; - ThreadInfo->BasePriority = current->Tcb.BasePriority; - ThreadInfo->ContextSwitches = current->Tcb.ContextSwitches; - ThreadInfo->ThreadState = current->Tcb.State; - ThreadInfo->WaitReason = current->Tcb.WaitReason; + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; + ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; + ThreadInfo->ClientId = CurrentThread->Cid; + ThreadInfo->Priority = CurrentThread->Tcb.Priority; + ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; + ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; + ThreadInfo->ThreadState = CurrentThread->Tcb.State; + ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; ThreadInfo++; - current_entry = current_entry->Flink; + CurrentEntry = CurrentEntry->Flink; } /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&pr->Pcb, &TotalUser); - SpiCur->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCur->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); + TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); + SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); /* Handle idle process entry */ - if (pr == PsIdleProcess) pr = NULL; - - pr = PsGetNextProcess(pr); - nThreads = 0; - if ((pr == syspr) || (pr == NULL)) + if (Process == PsIdleProcess) Process = NULL; + + Process = PsGetNextProcess(Process); + ThreadsCount = 0; + if ((Process == SystemProcess) || (Process == NULL)) { - SpiCur->NextEntryOffset = 0; + SpiCurrent->NextEntryOffset = 0; break; } else - pCur = pCur + curSize + inLen; - } while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - ObDereferenceObject(pr); + Current += CurrentSize + ImageNameLength; + } while ((Process != SystemProcess) && (Process != NULL)); + + if(Process != NULL) + ObDereferenceObject(Process); Status = STATUS_SUCCESS; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if(pr != NULL) - ObDereferenceObject(pr); + if(Process != NULL) + ObDereferenceObject(Process); Status = _SEH2_GetExceptionCode(); } _SEH2_END - *ReqSize = ovlSize; + *ReqSize = TotalSize; return Status; }

1 0

[dchapyshev] 38566: - Formatting fix. No code change
by dchapyshev＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: dchapyshev Date: Sun Jan 4 10:18:29 2009 New Revision: 38566 URL: http://svn.reactos.org/svn/reactos?rev=38566&view=rev Log: - Formatting fix. No code change Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jan 4 10:18:29 2009 @@ -157,18 +157,18 @@ NTAPI ExGetCurrentProcessorCpuUsage(PULONG CpuUsage) { - PKPRCB Prcb; - ULONG TotalTime; - ULONGLONG ScaledIdle; - - Prcb = KeGetCurrentPrcb(); - - ScaledIdle = Prcb->IdleThread->KernelTime * 100; - TotalTime = Prcb->KernelTime + Prcb->UserTime; - if (TotalTime != 0) - *CpuUsage = (ULONG)(100 - (ScaledIdle / TotalTime)); - else - *CpuUsage = 0; + PKPRCB Prcb; + ULONG TotalTime; + ULONGLONG ScaledIdle; + + Prcb = KeGetCurrentPrcb(); + + ScaledIdle = Prcb->IdleThread->KernelTime * 100; + TotalTime = Prcb->KernelTime + Prcb->UserTime; + if (TotalTime != 0) + *CpuUsage = (ULONG)(100 - (ScaledIdle / TotalTime)); + else + *CpuUsage = 0; } /* @@ -180,13 +180,13 @@ PULONG TotalCpuTime, PULONG ProcessorNumber) { - PKPRCB Prcb; - - Prcb = KeGetCurrentPrcb(); - - *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; - *TotalCpuTime = Prcb->CurrentThread->KernelTime; - *ProcessorNumber = KeGetCurrentProcessorNumber(); + PKPRCB Prcb; + + Prcb = KeGetCurrentPrcb(); + + *ThreadKernelTime = Prcb->KernelTime + Prcb->UserTime; + *TotalCpuTime = Prcb->CurrentThread->KernelTime; + *ProcessorNumber = KeGetCurrentProcessorNumber(); } /* @@ -216,221 +216,214 @@ NTSTATUS NTAPI -NtQuerySystemEnvironmentValue (IN PUNICODE_STRING VariableName, - OUT PWSTR ValueBuffer, - IN ULONG ValueBufferLength, - IN OUT PULONG ReturnLength OPTIONAL) -{ - ANSI_STRING AName; - UNICODE_STRING WName; - ARC_STATUS Result; - PCH Value; - ANSI_STRING AValue; - UNICODE_STRING WValue; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH2_TRY - { - ProbeForRead(VariableName, - sizeof(UNICODE_STRING), - sizeof(ULONG)); - ProbeForWrite(ValueBuffer, - ValueBufferLength, - sizeof(WCHAR)); - if(ReturnLength != NULL) - { - ProbeForWriteUlong(ReturnLength); - } - } - _SEH2_EXCEPT(ExSystemExceptionFilter()) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - /* - * Copy the name to kernel space if necessary and convert it to ANSI. - */ - Status = ProbeAndCaptureUnicodeString(&WName, - PreviousMode, - VariableName); - if(NT_SUCCESS(Status)) - { +NtQuerySystemEnvironmentValue(IN PUNICODE_STRING VariableName, + OUT PWSTR ValueBuffer, + IN ULONG ValueBufferLength, + IN OUT PULONG ReturnLength OPTIONAL) +{ + ANSI_STRING AName; + UNICODE_STRING WName; + ARC_STATUS Result; + PCH Value; + ANSI_STRING AValue; + UNICODE_STRING WValue; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForRead(VariableName, + sizeof(UNICODE_STRING), + sizeof(ULONG)); + + ProbeForWrite(ValueBuffer, + ValueBufferLength, + sizeof(WCHAR)); + + if (ReturnLength != NULL) ProbeForWriteUlong(ReturnLength); + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) return Status; + } + /* - * according to ntinternals the SeSystemEnvironmentName privilege is required! + * Copy the name to kernel space if necessary and convert it to ANSI. */ - if(!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, - PreviousMode)) - { - ReleaseCapturedUnicodeString(&WName, - PreviousMode); - DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } + Status = ProbeAndCaptureUnicodeString(&WName, + PreviousMode, + VariableName); + if (NT_SUCCESS(Status)) + { + /* + * according to ntinternals the SeSystemEnvironmentName privilege is required! + */ + if (!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, + PreviousMode)) + { + ReleaseCapturedUnicodeString(&WName, PreviousMode); + DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* + * convert the value name to ansi + */ + Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE); + ReleaseCapturedUnicodeString(&WName, PreviousMode); + + if (!NT_SUCCESS(Status)) return Status; + + /* + * Create a temporary buffer for the value + */ + Value = ExAllocatePool(NonPagedPool, ValueBufferLength); + if (Value == NULL) + { + RtlFreeAnsiString(&AName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* + * Get the environment variable + */ + Result = HalGetEnvironmentVariable(AName.Buffer, + (USHORT)ValueBufferLength, + Value); + if (!Result) + { + RtlFreeAnsiString(&AName); + ExFreePool(Value); + return STATUS_UNSUCCESSFUL; + } + + /* + * Convert the result to UNICODE, protect with SEH in case the value buffer + * isn't NULL-terminated! + */ + _SEH2_TRY + { + RtlInitAnsiString(&AValue, Value); + Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, TRUE); + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (NT_SUCCESS(Status)) + { + /* + * Copy the result back to the caller. + */ + _SEH2_TRY + { + RtlCopyMemory(ValueBuffer, WValue.Buffer, WValue.Length); + ValueBuffer[WValue.Length / sizeof(WCHAR)] = L'\0'; + if (ReturnLength != NULL) + { + *ReturnLength = WValue.Length + sizeof(WCHAR); + } + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + + /* + * Cleanup allocated resources. + */ + RtlFreeAnsiString(&AName); + ExFreePool(Value); + } + + return Status; +} + + +NTSTATUS +NTAPI +NtSetSystemEnvironmentValue(IN PUNICODE_STRING VariableName, + IN PUNICODE_STRING Value) +{ + UNICODE_STRING CapturedName, CapturedValue; + ANSI_STRING AName, AValue; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); /* - * convert the value name to ansi + * Copy the strings to kernel space if necessary */ - Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE); - ReleaseCapturedUnicodeString(&WName, - PreviousMode); - if(!NT_SUCCESS(Status)) - { - return Status; - } - - /* - * Create a temporary buffer for the value - */ - Value = ExAllocatePool(NonPagedPool, ValueBufferLength); - if (Value == NULL) - { - RtlFreeAnsiString(&AName); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* - * Get the environment variable - */ - Result = HalGetEnvironmentVariable(AName.Buffer, - (USHORT)ValueBufferLength, - Value); - if(!Result) - { - RtlFreeAnsiString(&AName); - ExFreePool(Value); - return STATUS_UNSUCCESSFUL; - } - - /* - * Convert the result to UNICODE, protect with SEH in case the value buffer - * isn't NULL-terminated! - */ - _SEH2_TRY - { - RtlInitAnsiString(&AValue, Value); - Status = RtlAnsiStringToUnicodeString(&WValue, &AValue, TRUE); - } - _SEH2_EXCEPT(ExSystemExceptionFilter()) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(NT_SUCCESS(Status)) - { - /* - * Copy the result back to the caller. - */ - _SEH2_TRY - { - RtlCopyMemory(ValueBuffer, WValue.Buffer, WValue.Length); - ValueBuffer[WValue.Length / sizeof(WCHAR)] = L'\0'; - if(ReturnLength != NULL) + Status = ProbeAndCaptureUnicodeString(&CapturedName, + PreviousMode, + VariableName); + if (NT_SUCCESS(Status)) + { + Status = ProbeAndCaptureUnicodeString(&CapturedValue, + PreviousMode, + Value); + if (NT_SUCCESS(Status)) { - *ReturnLength = WValue.Length + sizeof(WCHAR); + /* + * according to ntinternals the SeSystemEnvironmentName privilege is required! + */ + if (SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, + PreviousMode)) + { + /* + * convert the strings to ANSI + */ + Status = RtlUnicodeStringToAnsiString(&AName, + &CapturedName, + TRUE); + if (NT_SUCCESS(Status)) + { + Status = RtlUnicodeStringToAnsiString(&AValue, + &CapturedValue, + TRUE); + if (NT_SUCCESS(Status)) + { + ARC_STATUS Result = HalSetEnvironmentVariable(AName.Buffer, + AValue.Buffer); + + Status = (Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + } + } + } + else + { + DPRINT1("NtSetSystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + } + + ReleaseCapturedUnicodeString(&CapturedValue, + PreviousMode); } - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(ExSystemExceptionFilter()) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - } - - /* - * Cleanup allocated resources. - */ - RtlFreeAnsiString(&AName); - ExFreePool(Value); - } - - return Status; -} - - -NTSTATUS NTAPI -NtSetSystemEnvironmentValue (IN PUNICODE_STRING VariableName, - IN PUNICODE_STRING Value) -{ - UNICODE_STRING CapturedName, CapturedValue; - ANSI_STRING AName, AValue; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - /* - * Copy the strings to kernel space if necessary - */ - Status = ProbeAndCaptureUnicodeString(&CapturedName, - PreviousMode, - VariableName); - if(NT_SUCCESS(Status)) - { - Status = ProbeAndCaptureUnicodeString(&CapturedValue, - PreviousMode, - Value); - if(NT_SUCCESS(Status)) - { - /* - * according to ntinternals the SeSystemEnvironmentName privilege is required! - */ - if(SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, - PreviousMode)) - { - /* - * convert the strings to ANSI - */ - Status = RtlUnicodeStringToAnsiString(&AName, - &CapturedName, - TRUE); - if(NT_SUCCESS(Status)) - { - Status = RtlUnicodeStringToAnsiString(&AValue, - &CapturedValue, - TRUE); - if(NT_SUCCESS(Status)) - { - ARC_STATUS Result = HalSetEnvironmentVariable(AName.Buffer, - AValue.Buffer); - - Status = (Result ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); - } - } - } - else - { - DPRINT1("NtSetSystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); - Status = STATUS_PRIVILEGE_NOT_HELD; - } - - ReleaseCapturedUnicodeString(&CapturedValue, - PreviousMode); - } - - ReleaseCapturedUnicodeString(&CapturedName, - PreviousMode); - } - - return Status; + ReleaseCapturedUnicodeString(&CapturedName, + PreviousMode); + } + + return Status; } NTSTATUS @@ -482,418 +475,416 @@ /* Class 0 - Basic Information */ QSI_DEF(SystemBasicInformation) { - PSYSTEM_BASIC_INFORMATION Sbi - = (PSYSTEM_BASIC_INFORMATION) Buffer; - - *ReqSize = sizeof (SYSTEM_BASIC_INFORMATION); - /* - * Check user buffer's size - */ - if (Size != sizeof (SYSTEM_BASIC_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - RtlZeroMemory(Sbi, Size); - Sbi->Reserved = 0; - Sbi->TimerResolution = KeMaximumIncrement; - Sbi->PageSize = PAGE_SIZE; - Sbi->NumberOfPhysicalPages = MmStats.NrTotalPages; - Sbi->LowestPhysicalPageNumber = 0; /* FIXME */ - Sbi->HighestPhysicalPageNumber = MmStats.NrTotalPages; /* FIXME */ - Sbi->AllocationGranularity = MM_VIRTMEM_GRANULARITY; /* hard coded on Intel? */ - Sbi->MinimumUserModeAddress = 0x10000; /* Top of 64k */ - Sbi->MaximumUserModeAddress = (ULONG_PTR)MmHighestUserAddress; - Sbi->ActiveProcessorsAffinityMask = KeActiveProcessors; - Sbi->NumberOfProcessors = KeNumberProcessors; - return (STATUS_SUCCESS); + PSYSTEM_BASIC_INFORMATION Sbi + = (PSYSTEM_BASIC_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_BASIC_INFORMATION); + + /* Check user buffer's size */ + if (Size != sizeof(SYSTEM_BASIC_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + RtlZeroMemory(Sbi, Size); + Sbi->Reserved = 0; + Sbi->TimerResolution = KeMaximumIncrement; + Sbi->PageSize = PAGE_SIZE; + Sbi->NumberOfPhysicalPages = MmStats.NrTotalPages; + Sbi->LowestPhysicalPageNumber = 0; /* FIXME */ + Sbi->HighestPhysicalPageNumber = MmStats.NrTotalPages; /* FIXME */ + Sbi->AllocationGranularity = MM_VIRTMEM_GRANULARITY; /* hard coded on Intel? */ + Sbi->MinimumUserModeAddress = 0x10000; /* Top of 64k */ + Sbi->MaximumUserModeAddress = (ULONG_PTR)MmHighestUserAddress; + Sbi->ActiveProcessorsAffinityMask = KeActiveProcessors; + Sbi->NumberOfProcessors = KeNumberProcessors; + + return STATUS_SUCCESS; } /* Class 1 - Processor Information */ QSI_DEF(SystemProcessorInformation) { - PSYSTEM_PROCESSOR_INFORMATION Spi - = (PSYSTEM_PROCESSOR_INFORMATION) Buffer; - PKPRCB Prcb; - *ReqSize = sizeof (SYSTEM_PROCESSOR_INFORMATION); - /* - * Check user buffer's size - */ - if (Size < sizeof (SYSTEM_PROCESSOR_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - Prcb = KeGetCurrentPrcb(); - Spi->ProcessorArchitecture = KeProcessorArchitecture; - Spi->ProcessorLevel = KeProcessorLevel; - Spi->ProcessorRevision = KeProcessorRevision; - Spi->Reserved = 0; - Spi->ProcessorFeatureBits = KeFeatureBits; - - DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, - Spi->ProcessorLevel, Spi->ProcessorRevision); - - return (STATUS_SUCCESS); + PSYSTEM_PROCESSOR_INFORMATION Spi + = (PSYSTEM_PROCESSOR_INFORMATION) Buffer; + PKPRCB Prcb; + + *ReqSize = sizeof(SYSTEM_PROCESSOR_INFORMATION); + + /* Check user buffer's size */ + if (Size < sizeof(SYSTEM_PROCESSOR_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + Prcb = KeGetCurrentPrcb(); + Spi->ProcessorArchitecture = KeProcessorArchitecture; + Spi->ProcessorLevel = KeProcessorLevel; + Spi->ProcessorRevision = KeProcessorRevision; + Spi->Reserved = 0; + Spi->ProcessorFeatureBits = KeFeatureBits; + + DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, + Spi->ProcessorLevel, Spi->ProcessorRevision); + + return STATUS_SUCCESS; } /* Class 2 - Performance Information */ QSI_DEF(SystemPerformanceInformation) { - ULONG IdleUser, IdleKernel; - PSYSTEM_PERFORMANCE_INFORMATION Spi - = (PSYSTEM_PERFORMANCE_INFORMATION) Buffer; - - PEPROCESS TheIdleProcess; - - *ReqSize = sizeof (SYSTEM_PERFORMANCE_INFORMATION); - /* - * Check user buffer's size - */ - if (Size < sizeof (SYSTEM_PERFORMANCE_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - - TheIdleProcess = PsIdleProcess; - - IdleKernel = KeQueryRuntimeProcess(&TheIdleProcess->Pcb, &IdleUser); - Spi->IdleProcessTime.QuadPart = UInt32x32To64(IdleKernel, KeMaximumIncrement); - Spi->IoReadTransferCount = IoReadTransferCount; - Spi->IoWriteTransferCount = IoWriteTransferCount; - Spi->IoOtherTransferCount = IoOtherTransferCount; - Spi->IoReadOperationCount = IoReadOperationCount; - Spi->IoWriteOperationCount = IoWriteOperationCount; - Spi->IoOtherOperationCount = IoOtherOperationCount; - - Spi->AvailablePages = MmStats.NrFreePages; -/* - Add up all the used "Committed" memory + pagefile. - Not sure this is right. 8^\ - */ - Spi->CommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed + - MiMemoryConsumers[MC_NPPOOL].PagesUsed+ - MiMemoryConsumers[MC_CACHE].PagesUsed+ - MiMemoryConsumers[MC_USER].PagesUsed+ - MiUsedSwapPages; -/* - Add up the full system total + pagefile. - All this make Taskmgr happy but not sure it is the right numbers. - This too, fixes some of GlobalMemoryStatusEx numbers. -*/ - Spi->CommitLimit = MmStats.NrTotalPages + MiFreeSwapPages + - MiUsedSwapPages; - - Spi->PeakCommitment = 0; /* FIXME */ - Spi->PageFaultCount = 0; /* FIXME */ - Spi->CopyOnWriteCount = 0; /* FIXME */ - Spi->TransitionCount = 0; /* FIXME */ - Spi->CacheTransitionCount = 0; /* FIXME */ - Spi->DemandZeroCount = 0; /* FIXME */ - Spi->PageReadCount = 0; /* FIXME */ - Spi->PageReadIoCount = 0; /* FIXME */ - Spi->CacheReadCount = 0; /* FIXME */ - Spi->CacheIoCount = 0; /* FIXME */ + ULONG IdleUser, IdleKernel; + PSYSTEM_PERFORMANCE_INFORMATION Spi + = (PSYSTEM_PERFORMANCE_INFORMATION) Buffer; + + PEPROCESS TheIdleProcess; + + *ReqSize = sizeof(SYSTEM_PERFORMANCE_INFORMATION); + + /* Check user buffer's size */ + if (Size < sizeof(SYSTEM_PERFORMANCE_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + TheIdleProcess = PsIdleProcess; + + IdleKernel = KeQueryRuntimeProcess(&TheIdleProcess->Pcb, &IdleUser); + Spi->IdleProcessTime.QuadPart = UInt32x32To64(IdleKernel, KeMaximumIncrement); + Spi->IoReadTransferCount = IoReadTransferCount; + Spi->IoWriteTransferCount = IoWriteTransferCount; + Spi->IoOtherTransferCount = IoOtherTransferCount; + Spi->IoReadOperationCount = IoReadOperationCount; + Spi->IoWriteOperationCount = IoWriteOperationCount; + Spi->IoOtherOperationCount = IoOtherOperationCount; + + Spi->AvailablePages = MmStats.NrFreePages; + /* + * Add up all the used "Committed" memory + pagefile. + * Not sure this is right. 8^\ + */ + Spi->CommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed + + MiMemoryConsumers[MC_NPPOOL].PagesUsed + + MiMemoryConsumers[MC_CACHE].PagesUsed + + MiMemoryConsumers[MC_USER].PagesUsed + + MiUsedSwapPages; + /* + * Add up the full system total + pagefile. + * All this make Taskmgr happy but not sure it is the right numbers. + * This too, fixes some of GlobalMemoryStatusEx numbers. + */ + Spi->CommitLimit = MmStats.NrTotalPages + MiFreeSwapPages + MiUsedSwapPages; + + Spi->PeakCommitment = 0; /* FIXME */ + Spi->PageFaultCount = 0; /* FIXME */ + Spi->CopyOnWriteCount = 0; /* FIXME */ + Spi->TransitionCount = 0; /* FIXME */ + Spi->CacheTransitionCount = 0; /* FIXME */ + Spi->DemandZeroCount = 0; /* FIXME */ + Spi->PageReadCount = 0; /* FIXME */ + Spi->PageReadIoCount = 0; /* FIXME */ + Spi->CacheReadCount = 0; /* FIXME */ + Spi->CacheIoCount = 0; /* FIXME */ Spi->DirtyPagesWriteCount = 0; /* FIXME */ - Spi->DirtyWriteIoCount = 0; /* FIXME */ - Spi->MappedPagesWriteCount = 0; /* FIXME */ - Spi->MappedWriteIoCount = 0; /* FIXME */ - - Spi->PagedPoolPages = MiMemoryConsumers[MC_PPOOL].PagesUsed; - Spi->PagedPoolAllocs = 0; /* FIXME */ - Spi->PagedPoolFrees = 0; /* FIXME */ - Spi->NonPagedPoolPages = MiMemoryConsumers[MC_NPPOOL].PagesUsed; - Spi->NonPagedPoolAllocs = 0; /* FIXME */ - Spi->NonPagedPoolFrees = 0; /* FIXME */ - - Spi->FreeSystemPtes = 0; /* FIXME */ - - Spi->ResidentSystemCodePage = MmStats.NrSystemPages; /* FIXME */ - - Spi->TotalSystemDriverPages = 0; /* FIXME */ - Spi->TotalSystemCodePages = 0; /* FIXME */ - Spi->NonPagedPoolLookasideHits = 0; /* FIXME */ - Spi->PagedPoolLookasideHits = 0; /* FIXME */ - Spi->Spare3Count = 0; /* FIXME */ - - Spi->ResidentSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed; - Spi->ResidentPagedPoolPage = MmPagedPoolSize; /* FIXME */ - - Spi->ResidentSystemDriverPage = 0; /* FIXME */ - Spi->CcFastReadNoWait = 0; /* FIXME */ - Spi->CcFastReadWait = 0; /* FIXME */ - Spi->CcFastReadResourceMiss = 0; /* FIXME */ - Spi->CcFastReadNotPossible = 0; /* FIXME */ - - Spi->CcFastMdlReadNoWait = 0; /* FIXME */ - Spi->CcFastMdlReadWait = 0; /* FIXME */ - Spi->CcFastMdlReadResourceMiss = 0; /* FIXME */ - Spi->CcFastMdlReadNotPossible = 0; /* FIXME */ - - Spi->CcMapDataNoWait = 0; /* FIXME */ - Spi->CcMapDataWait = 0; /* FIXME */ - Spi->CcMapDataNoWaitMiss = 0; /* FIXME */ - Spi->CcMapDataWaitMiss = 0; /* FIXME */ - - Spi->CcPinMappedDataCount = 0; /* FIXME */ - Spi->CcPinReadNoWait = 0; /* FIXME */ - Spi->CcPinReadWait = 0; /* FIXME */ - Spi->CcPinReadNoWaitMiss = 0; /* FIXME */ - Spi->CcPinReadWaitMiss = 0; /* FIXME */ - Spi->CcCopyReadNoWait = 0; /* FIXME */ - Spi->CcCopyReadWait = 0; /* FIXME */ - Spi->CcCopyReadNoWaitMiss = 0; /* FIXME */ - Spi->CcCopyReadWaitMiss = 0; /* FIXME */ - - Spi->CcMdlReadNoWait = 0; /* FIXME */ - Spi->CcMdlReadWait = 0; /* FIXME */ - Spi->CcMdlReadNoWaitMiss = 0; /* FIXME */ - Spi->CcMdlReadWaitMiss = 0; /* FIXME */ - Spi->CcReadAheadIos = 0; /* FIXME */ - Spi->CcLazyWriteIos = 0; /* FIXME */ - Spi->CcLazyWritePages = 0; /* FIXME */ - Spi->CcDataFlushes = 0; /* FIXME */ - Spi->CcDataPages = 0; /* FIXME */ - Spi->ContextSwitches = 0; /* FIXME */ - Spi->FirstLevelTbFills = 0; /* FIXME */ - Spi->SecondLevelTbFills = 0; /* FIXME */ - Spi->SystemCalls = 0; /* FIXME */ - - return (STATUS_SUCCESS); + Spi->DirtyWriteIoCount = 0; /* FIXME */ + Spi->MappedPagesWriteCount = 0; /* FIXME */ + Spi->MappedWriteIoCount = 0; /* FIXME */ + + Spi->PagedPoolPages = MiMemoryConsumers[MC_PPOOL].PagesUsed; + Spi->PagedPoolAllocs = 0; /* FIXME */ + Spi->PagedPoolFrees = 0; /* FIXME */ + Spi->NonPagedPoolPages = MiMemoryConsumers[MC_NPPOOL].PagesUsed; + Spi->NonPagedPoolAllocs = 0; /* FIXME */ + Spi->NonPagedPoolFrees = 0; /* FIXME */ + + Spi->FreeSystemPtes = 0; /* FIXME */ + + Spi->ResidentSystemCodePage = MmStats.NrSystemPages; /* FIXME */ + + Spi->TotalSystemDriverPages = 0; /* FIXME */ + Spi->TotalSystemCodePages = 0; /* FIXME */ + Spi->NonPagedPoolLookasideHits = 0; /* FIXME */ + Spi->PagedPoolLookasideHits = 0; /* FIXME */ + Spi->Spare3Count = 0; /* FIXME */ + + Spi->ResidentSystemCachePage = MiMemoryConsumers[MC_CACHE].PagesUsed; + Spi->ResidentPagedPoolPage = MmPagedPoolSize; /* FIXME */ + + Spi->ResidentSystemDriverPage = 0; /* FIXME */ + Spi->CcFastReadNoWait = 0; /* FIXME */ + Spi->CcFastReadWait = 0; /* FIXME */ + Spi->CcFastReadResourceMiss = 0; /* FIXME */ + Spi->CcFastReadNotPossible = 0; /* FIXME */ + + Spi->CcFastMdlReadNoWait = 0; /* FIXME */ + Spi->CcFastMdlReadWait = 0; /* FIXME */ + Spi->CcFastMdlReadResourceMiss = 0; /* FIXME */ + Spi->CcFastMdlReadNotPossible = 0; /* FIXME */ + + Spi->CcMapDataNoWait = 0; /* FIXME */ + Spi->CcMapDataWait = 0; /* FIXME */ + Spi->CcMapDataNoWaitMiss = 0; /* FIXME */ + Spi->CcMapDataWaitMiss = 0; /* FIXME */ + + Spi->CcPinMappedDataCount = 0; /* FIXME */ + Spi->CcPinReadNoWait = 0; /* FIXME */ + Spi->CcPinReadWait = 0; /* FIXME */ + Spi->CcPinReadNoWaitMiss = 0; /* FIXME */ + Spi->CcPinReadWaitMiss = 0; /* FIXME */ + Spi->CcCopyReadNoWait = 0; /* FIXME */ + Spi->CcCopyReadWait = 0; /* FIXME */ + Spi->CcCopyReadNoWaitMiss = 0; /* FIXME */ + Spi->CcCopyReadWaitMiss = 0; /* FIXME */ + + Spi->CcMdlReadNoWait = 0; /* FIXME */ + Spi->CcMdlReadWait = 0; /* FIXME */ + Spi->CcMdlReadNoWaitMiss = 0; /* FIXME */ + Spi->CcMdlReadWaitMiss = 0; /* FIXME */ + Spi->CcReadAheadIos = 0; /* FIXME */ + Spi->CcLazyWriteIos = 0; /* FIXME */ + Spi->CcLazyWritePages = 0; /* FIXME */ + Spi->CcDataFlushes = 0; /* FIXME */ + Spi->CcDataPages = 0; /* FIXME */ + Spi->ContextSwitches = 0; /* FIXME */ + Spi->FirstLevelTbFills = 0; /* FIXME */ + Spi->SecondLevelTbFills = 0; /* FIXME */ + Spi->SystemCalls = 0; /* FIXME */ + + return STATUS_SUCCESS; } /* Class 3 - Time Of Day Information */ QSI_DEF(SystemTimeOfDayInformation) { - SYSTEM_TIMEOFDAY_INFORMATION Sti; - LARGE_INTEGER CurrentTime; - - /* Set amount of written information to 0 */ - *ReqSize = 0; - - /* Check user buffer's size */ - if (Size > sizeof(SYSTEM_TIMEOFDAY_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Get current time */ - KeQuerySystemTime(&CurrentTime); - - /* Zero local buffer */ - RtlZeroMemory(&Sti, sizeof(SYSTEM_TIMEOFDAY_INFORMATION)); - - /* Fill local time structure */ - Sti.BootTime= KeBootTime; - Sti.CurrentTime = CurrentTime; - Sti.TimeZoneBias.QuadPart = ExpTimeZoneBias.QuadPart; - Sti.TimeZoneId = ExpTimeZoneId; - Sti.Reserved = 0; - - /* Copy as much as requested by caller */ - RtlCopyMemory(Buffer, &Sti, Size); - - /* Set amount of information we copied */ - *ReqSize = Size; - - return STATUS_SUCCESS; + SYSTEM_TIMEOFDAY_INFORMATION Sti; + LARGE_INTEGER CurrentTime; + + /* Set amount of written information to 0 */ + *ReqSize = 0; + + /* Check user buffer's size */ + if (Size > sizeof(SYSTEM_TIMEOFDAY_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Get current time */ + KeQuerySystemTime(&CurrentTime); + + /* Zero local buffer */ + RtlZeroMemory(&Sti, sizeof(SYSTEM_TIMEOFDAY_INFORMATION)); + + /* Fill local time structure */ + Sti.BootTime= KeBootTime; + Sti.CurrentTime = CurrentTime; + Sti.TimeZoneBias.QuadPart = ExpTimeZoneBias.QuadPart; + Sti.TimeZoneId = ExpTimeZoneId; + Sti.Reserved = 0; + + /* Copy as much as requested by caller */ + RtlCopyMemory(Buffer, &Sti, Size); + + /* Set amount of information we copied */ + *ReqSize = Size; + + return STATUS_SUCCESS; } /* Class 4 - Path Information */ QSI_DEF(SystemPathInformation) { - /* FIXME: QSI returns STATUS_BREAKPOINT. Why? */ - DPRINT1("NtQuerySystemInformation - SystemPathInformation not implemented\n"); - - return (STATUS_BREAKPOINT); + /* FIXME: QSI returns STATUS_BREAKPOINT. Why? */ + DPRINT1("NtQuerySystemInformation - SystemPathInformation not implemented\n"); + + return STATUS_BREAKPOINT; } /* Class 5 - Process Information */ QSI_DEF(SystemProcessInformation) { - ULONG ovlSize = 0, nThreads; - PEPROCESS pr = NULL, syspr; - PUCHAR pCur; - ULONG TotalUser, TotalKernel; - NTSTATUS Status = STATUS_SUCCESS; - - _SEH2_TRY - { - /* scan the process list */ - - PSYSTEM_PROCESS_INFORMATION Spi - = (PSYSTEM_PROCESS_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); - - if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) - { - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - RtlZeroMemory(Spi, Size); - - syspr = PsIdleProcess; - pr = syspr; - pCur = (unsigned char *)Spi; - - do - { - PSYSTEM_PROCESS_INFORMATION SpiCur; - int curSize; - ANSI_STRING imgName; - int inLen=32; // image name len in bytes - PLIST_ENTRY current_entry; - PETHREAD current; - PSYSTEM_THREAD_INFORMATION ThreadInfo; - - SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; - - nThreads = 0; - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) - { - nThreads++; - current_entry = current_entry->Flink; - } - - // size of the structure for every process - curSize = sizeof(SYSTEM_PROCESS_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads; - ovlSize += curSize+inLen; - - if (ovlSize > Size) - { - *ReqSize = ovlSize; - ObDereferenceObject(pr); - - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - - // fill system information - SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure - SpiCur->NumberOfThreads = nThreads; - SpiCur->CreateTime = pr->CreateTime; - SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); - SpiCur->ImageName.MaximumLength = (USHORT)inLen; - SpiCur->ImageName.Buffer = (void*)(pCur+curSize); - - // copy name to the end of the struct - if(pr != PsIdleProcess) - { - RtlInitAnsiString(&imgName, pr->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); - } - else - { - RtlInitUnicodeString(&SpiCur->ImageName, NULL); - } - - SpiCur->BasePriority = pr->Pcb.BasePriority; - SpiCur->UniqueProcessId = pr->UniqueProcessId; - SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; - SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - SpiCur->PeakVirtualSize = pr->PeakVirtualSize; - SpiCur->VirtualSize = pr->VirtualSize; - SpiCur->PageFaultCount = pr->Vm.PageFaultCount; - SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; - SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; - SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; - SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; - SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; - SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; - SpiCur->PagefileUsage = pr->QuotaUsage[2]; - SpiCur->PeakPagefileUsage = pr->QuotaPeak[2]; - SpiCur->PrivatePageCount = pr->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); - - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) - { - current = CONTAINING_RECORD(current_entry, ETHREAD, - ThreadListEntry); - - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(current->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(current->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = current->CreateTime.QuadPart; - ThreadInfo->WaitTime = current->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) current->StartAddress; - ThreadInfo->ClientId = current->Cid; - ThreadInfo->Priority = current->Tcb.Priority; - ThreadInfo->BasePriority = current->Tcb.BasePriority; - ThreadInfo->ContextSwitches = current->Tcb.ContextSwitches; - ThreadInfo->ThreadState = current->Tcb.State; - ThreadInfo->WaitReason = current->Tcb.WaitReason; - - ThreadInfo++; - current_entry = current_entry->Flink; - } - - /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&pr->Pcb, &TotalUser); - SpiCur->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCur->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); - - /* Handle idle process entry */ - if (pr == PsIdleProcess) pr = NULL; - - pr = PsGetNextProcess(pr); - nThreads = 0; - if ((pr == syspr) || (pr == NULL)) - { - SpiCur->NextEntryOffset = 0; - break; - } - else - pCur = pCur + curSize + inLen; - } while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - ObDereferenceObject(pr); - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - if(pr != NULL) - ObDereferenceObject(pr); - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - *ReqSize = ovlSize; - return Status; + ULONG ovlSize = 0, nThreads; + PEPROCESS pr = NULL, syspr; + PUCHAR pCur; + ULONG TotalUser, TotalKernel; + NTSTATUS Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* scan the process list */ + + PSYSTEM_PROCESS_INFORMATION Spi + = (PSYSTEM_PROCESS_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); + + if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) + { + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } + RtlZeroMemory(Spi, Size); + + syspr = PsIdleProcess; + pr = syspr; + pCur = (unsigned char *)Spi; + + do + { + PSYSTEM_PROCESS_INFORMATION SpiCur; + int curSize; + ANSI_STRING imgName; + int inLen = 32; // image name len in bytes + PLIST_ENTRY current_entry; + PETHREAD current; + PSYSTEM_THREAD_INFORMATION ThreadInfo; + + SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; + + nThreads = 0; + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + nThreads++; + current_entry = current_entry->Flink; + } + + // size of the structure for every process + curSize = sizeof(SYSTEM_PROCESS_INFORMATION)+sizeof(SYSTEM_THREAD_INFORMATION)*nThreads; + ovlSize += curSize+inLen; + + if (ovlSize > Size) + { + *ReqSize = ovlSize; + ObDereferenceObject(pr); + + _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + } + + // fill system information + SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure + SpiCur->NumberOfThreads = nThreads; + SpiCur->CreateTime = pr->CreateTime; + SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); + SpiCur->ImageName.MaximumLength = (USHORT)inLen; + SpiCur->ImageName.Buffer = (void*)(pCur+curSize); + + // copy name to the end of the struct + if(pr != PsIdleProcess) + { + RtlInitAnsiString(&imgName, pr->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCur->ImageName, &imgName, FALSE); + } + else + { + RtlInitUnicodeString(&SpiCur->ImageName, NULL); + } + + SpiCur->BasePriority = pr->Pcb.BasePriority; + SpiCur->UniqueProcessId = pr->UniqueProcessId; + SpiCur->InheritedFromUniqueProcessId = pr->InheritedFromUniqueProcessId; + SpiCur->HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + SpiCur->PeakVirtualSize = pr->PeakVirtualSize; + SpiCur->VirtualSize = pr->VirtualSize; + SpiCur->PageFaultCount = pr->Vm.PageFaultCount; + SpiCur->PeakWorkingSetSize = pr->Vm.PeakWorkingSetSize; + SpiCur->WorkingSetSize = pr->Vm.WorkingSetSize; + SpiCur->QuotaPeakPagedPoolUsage = pr->QuotaPeak[0]; + SpiCur->QuotaPagedPoolUsage = pr->QuotaUsage[0]; + SpiCur->QuotaPeakNonPagedPoolUsage = pr->QuotaPeak[1]; + SpiCur->QuotaNonPagedPoolUsage = pr->QuotaUsage[1]; + SpiCur->PagefileUsage = pr->QuotaUsage[2]; + SpiCur->PeakPagefileUsage = pr->QuotaPeak[2]; + SpiCur->PrivatePageCount = pr->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); + + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) + { + current = CONTAINING_RECORD(current_entry, ETHREAD, + ThreadListEntry); + + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(current->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(current->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = current->CreateTime.QuadPart; + ThreadInfo->WaitTime = current->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) current->StartAddress; + ThreadInfo->ClientId = current->Cid; + ThreadInfo->Priority = current->Tcb.Priority; + ThreadInfo->BasePriority = current->Tcb.BasePriority; + ThreadInfo->ContextSwitches = current->Tcb.ContextSwitches; + ThreadInfo->ThreadState = current->Tcb.State; + ThreadInfo->WaitReason = current->Tcb.WaitReason; + + ThreadInfo++; + current_entry = current_entry->Flink; + } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&pr->Pcb, &TotalUser); + SpiCur->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCur->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); + + /* Handle idle process entry */ + if (pr == PsIdleProcess) pr = NULL; + + pr = PsGetNextProcess(pr); + nThreads = 0; + if ((pr == syspr) || (pr == NULL)) + { + SpiCur->NextEntryOffset = 0; + break; + } + else + pCur = pCur + curSize + inLen; + } while ((pr != syspr) && (pr != NULL)); + + if(pr != NULL) + ObDereferenceObject(pr); + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if(pr != NULL) + ObDereferenceObject(pr); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + *ReqSize = ovlSize; + return Status; } /* Class 6 - Call Count Information */ QSI_DEF(SystemCallCountInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemCallCountInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemCallCountInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 7 - Device Information */ QSI_DEF(SystemDeviceInformation) { - PSYSTEM_DEVICE_INFORMATION Sdi - = (PSYSTEM_DEVICE_INFORMATION) Buffer; - PCONFIGURATION_INFORMATION ConfigInfo; - - *ReqSize = sizeof (SYSTEM_DEVICE_INFORMATION); - /* - * Check user buffer's size - */ - if (Size < sizeof (SYSTEM_DEVICE_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - - ConfigInfo = IoGetConfigurationInformation (); - - Sdi->NumberOfDisks = ConfigInfo->DiskCount; - Sdi->NumberOfFloppies = ConfigInfo->FloppyCount; - Sdi->NumberOfCdRoms = ConfigInfo->CdRomCount; - Sdi->NumberOfTapes = ConfigInfo->TapeCount; - Sdi->NumberOfSerialPorts = ConfigInfo->SerialCount; - Sdi->NumberOfParallelPorts = ConfigInfo->ParallelCount; - - return (STATUS_SUCCESS); + PSYSTEM_DEVICE_INFORMATION Sdi + = (PSYSTEM_DEVICE_INFORMATION) Buffer; + PCONFIGURATION_INFORMATION ConfigInfo; + + *ReqSize = sizeof(SYSTEM_DEVICE_INFORMATION); + + /* Check user buffer's size */ + if (Size < sizeof(SYSTEM_DEVICE_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + ConfigInfo = IoGetConfigurationInformation(); + + Sdi->NumberOfDisks = ConfigInfo->DiskCount; + Sdi->NumberOfFloppies = ConfigInfo->FloppyCount; + Sdi->NumberOfCdRoms = ConfigInfo->CdRomCount; + Sdi->NumberOfTapes = ConfigInfo->TapeCount; + Sdi->NumberOfSerialPorts = ConfigInfo->SerialCount; + Sdi->NumberOfParallelPorts = ConfigInfo->ParallelCount; + + return STATUS_SUCCESS; } /* Class 8 - Processor Performance Information */ @@ -907,7 +898,7 @@ LARGE_INTEGER CurrentTime; PKPRCB Prcb; - *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); + *ReqSize = KeNumberProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); /* Check user buffer's size */ if (Size < *ReqSize) @@ -937,31 +928,31 @@ /* Class 9 - Flags Information */ QSI_DEF(SystemFlagsInformation) { - if (sizeof (SYSTEM_FLAGS_INFORMATION) != Size) - { - * ReqSize = sizeof (SYSTEM_FLAGS_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } - ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags = NtGlobalFlag; - return (STATUS_SUCCESS); + if (sizeof(SYSTEM_FLAGS_INFORMATION) != Size) + { + *ReqSize = sizeof(SYSTEM_FLAGS_INFORMATION); + return (STATUS_INFO_LENGTH_MISMATCH); + } + ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags = NtGlobalFlag; + return STATUS_SUCCESS; } SSI_DEF(SystemFlagsInformation) { - if (sizeof (SYSTEM_FLAGS_INFORMATION) != Size) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - NtGlobalFlag = ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags; - return (STATUS_SUCCESS); + if (sizeof(SYSTEM_FLAGS_INFORMATION) != Size) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + NtGlobalFlag = ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags; + return STATUS_SUCCESS; } /* Class 10 - Call Time Information */ QSI_DEF(SystemCallTimeInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemCallTimeInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemCallTimeInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 11 - Module Information */ @@ -978,307 +969,305 @@ /* Class 12 - Locks Information */ QSI_DEF(SystemLocksInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemLocksInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemLocksInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 13 - Stack Trace Information */ QSI_DEF(SystemStackTraceInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemStackTraceInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemStackTraceInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 14 - Paged Pool Information */ QSI_DEF(SystemPagedPoolInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemPagedPoolInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemPagedPoolInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 15 - Non Paged Pool Information */ QSI_DEF(SystemNonPagedPoolInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemNonPagedPoolInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemNonPagedPoolInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { - PEPROCESS pr, syspr; - ULONG curSize, i = 0; - ULONG hCount = 0; - - PSYSTEM_HANDLE_INFORMATION Shi = - (PSYSTEM_HANDLE_INFORMATION) Buffer; - - DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); - - if (Size < sizeof (SYSTEM_HANDLE_INFORMATION)) + PEPROCESS pr, syspr; + ULONG curSize, i = 0; + ULONG hCount = 0; + + PSYSTEM_HANDLE_INFORMATION Shi = + (PSYSTEM_HANDLE_INFORMATION) Buffer; + + DPRINT("NtQuerySystemInformation - SystemHandleInformation\n"); + + if (Size < sizeof(SYSTEM_HANDLE_INFORMATION)) + { + *ReqSize = sizeof(SYSTEM_HANDLE_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + DPRINT("SystemHandleInformation 1\n"); + + /* First Calc Size from Count. */ + syspr = PsGetNextProcess(NULL); + pr = syspr; + + do + { + hCount = hCount + (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + pr = PsGetNextProcess(pr); + + if ((pr == syspr) || (pr == NULL)) break; + } + while ((pr != syspr) && (pr != NULL)); + + if(pr != NULL) + { + ObDereferenceObject(pr); + } + + DPRINT("SystemHandleInformation 2\n"); + + curSize = sizeof(SYSTEM_HANDLE_INFORMATION) + + ((sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - + (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO))); + + Shi->NumberOfHandles = hCount; + + if (curSize > Size) + { + *ReqSize = curSize; + return (STATUS_INFO_LENGTH_MISMATCH); + } + + DPRINT("SystemHandleInformation 3\n"); + + /* Now get Handles from all processs. */ + syspr = PsGetNextProcess(NULL); + pr = syspr; + + do + { + int Count = 0, HandleCount; + + HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); + + for (Count = 0; HandleCount > 0 ; HandleCount--) { - * ReqSize = sizeof (SYSTEM_HANDLE_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } - - DPRINT("SystemHandleInformation 1\n"); - - /* First Calc Size from Count. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; - - do - { - hCount = hCount + (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) - break; - } while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - { - ObDereferenceObject(pr); - } - - DPRINT("SystemHandleInformation 2\n"); - - curSize = sizeof(SYSTEM_HANDLE_INFORMATION)+ - ( (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) )); - - Shi->NumberOfHandles = hCount; - - if (curSize > Size) - { - *ReqSize = curSize; - return (STATUS_INFO_LENGTH_MISMATCH); - } - - DPRINT("SystemHandleInformation 3\n"); - - /* Now get Handles from all processs. */ - syspr = PsGetNextProcess(NULL); - pr = syspr; - - do - { - int Count = 0, HandleCount; - - HandleCount = (pr->ObjectTable ? ObpGetHandleCountByHandleTable(pr->ObjectTable) : 0); - - for (Count = 0; HandleCount > 0 ; HandleCount--) - { - Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; - Count++; - i++; - } - - pr = PsGetNextProcess(pr); - - if ((pr == syspr) || (pr == NULL)) - break; - } while ((pr != syspr) && (pr != NULL)); - - if(pr != NULL) - { - ObDereferenceObject(pr); - } - - DPRINT("SystemHandleInformation 4\n"); - return (STATUS_SUCCESS); + Shi->Handles[i].UniqueProcessId = (USHORT)(ULONG)pr->UniqueProcessId; + Count++; + i++; + } + + pr = PsGetNextProcess(pr); + + if ((pr == syspr) || (pr == NULL)) break; + } + while ((pr != syspr) && (pr != NULL)); + + if(pr != NULL) ObDereferenceObject(pr); + + DPRINT("SystemHandleInformation 4\n"); + return STATUS_SUCCESS; } /* SSI_DEF(SystemHandleInformation) { - return (STATUS_SUCCESS); + return STATUS_SUCCESS; } */ /* Class 17 - Information */ QSI_DEF(SystemObjectInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemObjectInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemObjectInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 18 - Information */ QSI_DEF(SystemPageFileInformation) { - UNICODE_STRING FileName; /* FIXME */ - SYSTEM_PAGEFILE_INFORMATION *Spfi = (SYSTEM_PAGEFILE_INFORMATION *) Buffer; - - if (Size < sizeof (SYSTEM_PAGEFILE_INFORMATION)) - { - * ReqSize = sizeof (SYSTEM_PAGEFILE_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } - - RtlInitUnicodeString(&FileName, NULL); /* FIXME */ - - /* FIXME */ - Spfi->NextEntryOffset = 0; - - Spfi->TotalSize = MiFreeSwapPages + MiUsedSwapPages; - Spfi->TotalInUse = MiUsedSwapPages; - Spfi->PeakUsage = MiUsedSwapPages; /* FIXME */ - Spfi->PageFileName = FileName; - return (STATUS_SUCCESS); + UNICODE_STRING FileName; /* FIXME */ + SYSTEM_PAGEFILE_INFORMATION *Spfi = (SYSTEM_PAGEFILE_INFORMATION *) Buffer; + + if (Size < sizeof(SYSTEM_PAGEFILE_INFORMATION)) + { + * ReqSize = sizeof(SYSTEM_PAGEFILE_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + RtlInitUnicodeString(&FileName, NULL); /* FIXME */ + + /* FIXME */ + Spfi->NextEntryOffset = 0; + + Spfi->TotalSize = MiFreeSwapPages + MiUsedSwapPages; + Spfi->TotalInUse = MiUsedSwapPages; + Spfi->PeakUsage = MiUsedSwapPages; /* FIXME */ + Spfi->PageFileName = FileName; + return STATUS_SUCCESS; } /* Class 19 - Vdm Instemul Information */ QSI_DEF(SystemVdmInstemulInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemVdmInstemulInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemVdmInstemulInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 20 - Vdm Bop Information */ QSI_DEF(SystemVdmBopInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemVdmBopInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemVdmBopInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 21 - File Cache Information */ QSI_DEF(SystemFileCacheInformation) { - SYSTEM_FILECACHE_INFORMATION *Sci = (SYSTEM_FILECACHE_INFORMATION *) Buffer; - - if (Size < sizeof (SYSTEM_FILECACHE_INFORMATION)) - { - * ReqSize = sizeof (SYSTEM_FILECACHE_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } - - RtlZeroMemory(Sci, sizeof(SYSTEM_FILECACHE_INFORMATION)); - - /* Return the Byte size not the page size. */ - Sci->CurrentSize = - MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; - Sci->PeakSize = - MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; /* FIXME */ - /* Taskmgr multiplies this one by page size right away */ - Sci->CurrentSizeIncludingTransitionInPages = - MiMemoryConsumers[MC_CACHE].PagesUsed; /* FIXME: Should be */ - /* system working set and standby pages. */ - Sci->PageFaultCount = 0; /* FIXME */ - Sci->MinimumWorkingSet = 0; /* FIXME */ - Sci->MaximumWorkingSet = 0; /* FIXME */ - - return (STATUS_SUCCESS); + SYSTEM_FILECACHE_INFORMATION *Sci = (SYSTEM_FILECACHE_INFORMATION *) Buffer; + + if (Size < sizeof(SYSTEM_FILECACHE_INFORMATION)) + { + *ReqSize = sizeof(SYSTEM_FILECACHE_INFORMATION); + return STATUS_INFO_LENGTH_MISMATCH; + } + + RtlZeroMemory(Sci, sizeof(SYSTEM_FILECACHE_INFORMATION)); + + /* Return the Byte size not the page size. */ + Sci->CurrentSize = + MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; + Sci->PeakSize = + MiMemoryConsumers[MC_CACHE].PagesUsed * PAGE_SIZE; /* FIXME */ + /* Taskmgr multiplies this one by page size right away */ + Sci->CurrentSizeIncludingTransitionInPages = + MiMemoryConsumers[MC_CACHE].PagesUsed; /* FIXME: Should be */ + /* system working set and standby pages. */ + Sci->PageFaultCount = 0; /* FIXME */ + Sci->MinimumWorkingSet = 0; /* FIXME */ + Sci->MaximumWorkingSet = 0; /* FIXME */ + + return STATUS_SUCCESS; } SSI_DEF(SystemFileCacheInformation) { - if (Size < sizeof (SYSTEM_FILECACHE_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemFileCacheInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + if (Size < sizeof(SYSTEM_FILECACHE_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemFileCacheInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 22 - Pool Tag Information */ QSI_DEF(SystemPoolTagInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemPoolTagInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemPoolTagInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 23 - Interrupt Information for all processors */ QSI_DEF(SystemInterruptInformation) { - PKPRCB Prcb; - PKPCR Pcr; - LONG i; - ULONG ti; - PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer; - - if(Size < KeNumberProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - - ti = KeQueryTimeIncrement(); - - for (i = 0; i < KeNumberProcessors; i++) - { - Prcb = KiProcessorBlock[i]; - Pcr = CONTAINING_RECORD(Prcb, KPCR, Prcb); + PKPRCB Prcb; + PKPCR Pcr; + LONG i; + ULONG ti; + PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer; + + if(Size < KeNumberProcessors * sizeof(SYSTEM_INTERRUPT_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + ti = KeQueryTimeIncrement(); + + for (i = 0; i < KeNumberProcessors; i++) + { + Prcb = KiProcessorBlock[i]; + Pcr = CONTAINING_RECORD(Prcb, KPCR, Prcb); #ifdef _M_ARM // This code should probably be done differently - sii->ContextSwitches = Pcr->ContextSwitches; + sii->ContextSwitches = Pcr->ContextSwitches; #else - sii->ContextSwitches = ((PKIPCR)Pcr)->ContextSwitches; + sii->ContextSwitches = ((PKIPCR)Pcr)->ContextSwitches; #endif - sii->DpcCount = Prcb->DpcData[0].DpcCount; - sii->DpcRate = Prcb->DpcRequestRate; - sii->TimeIncrement = ti; - sii->DpcBypassCount = 0; - sii->ApcBypassCount = 0; - sii++; - } - - return STATUS_SUCCESS; + sii->DpcCount = Prcb->DpcData[0].DpcCount; + sii->DpcRate = Prcb->DpcRequestRate; + sii->TimeIncrement = ti; + sii->DpcBypassCount = 0; + sii->ApcBypassCount = 0; + sii++; + } + + return STATUS_SUCCESS; } /* Class 24 - DPC Behaviour Information */ QSI_DEF(SystemDpcBehaviourInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemDpcBehaviourInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemDpcBehaviourInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } SSI_DEF(SystemDpcBehaviourInformation) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemDpcBehaviourInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemDpcBehaviourInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 25 - Full Memory Information */ QSI_DEF(SystemFullMemoryInformation) { - PULONG Spi = (PULONG) Buffer; - - PEPROCESS TheIdleProcess; - - * ReqSize = sizeof (ULONG); - - if (sizeof (ULONG) != Size) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - DPRINT("SystemFullMemoryInformation\n"); - - TheIdleProcess = PsIdleProcess; - - DPRINT("PID: %d, KernelTime: %u PFFree: %d PFUsed: %d\n", - TheIdleProcess->UniqueProcessId, - TheIdleProcess->Pcb.KernelTime, - MiFreeSwapPages, - MiUsedSwapPages); + PULONG Spi = (PULONG) Buffer; + + PEPROCESS TheIdleProcess; + + *ReqSize = sizeof(ULONG); + + if (sizeof(ULONG) != Size) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + DPRINT("SystemFullMemoryInformation\n"); + + TheIdleProcess = PsIdleProcess; + + DPRINT("PID: %d, KernelTime: %u PFFree: %d PFUsed: %d\n", + TheIdleProcess->UniqueProcessId, + TheIdleProcess->Pcb.KernelTime, + MiFreeSwapPages, + MiUsedSwapPages); #ifndef NDEBUG - MmPrintMemoryStatistic(); + MmPrintMemoryStatistic(); #endif - *Spi = MiMemoryConsumers[MC_USER].PagesUsed; - - return (STATUS_SUCCESS); + *Spi = MiMemoryConsumers[MC_USER].PagesUsed; + + return STATUS_SUCCESS; } /* Class 26 - Load Image */ @@ -1419,100 +1408,100 @@ /* Class 29 - Summary Memory Information */ QSI_DEF(SystemSummaryMemoryInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemSummaryMemoryInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemSummaryMemoryInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 30 - Next Event Id Information */ QSI_DEF(SystemNextEventIdInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemNextEventIdInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemNextEventIdInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 31 - Event Ids Information */ QSI_DEF(SystemEventIdsInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemEventIdsInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemEventIdsInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 32 - Crash Dump Information */ QSI_DEF(SystemCrashDumpInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemCrashDumpInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemCrashDumpInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 33 - Exception Information */ QSI_DEF(SystemExceptionInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemExceptionInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemExceptionInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 34 - Crash Dump State Information */ QSI_DEF(SystemCrashDumpStateInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemCrashDumpStateInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemCrashDumpStateInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 35 - Kernel Debugger Information */ QSI_DEF(SystemKernelDebuggerInformation) { - PSYSTEM_KERNEL_DEBUGGER_INFORMATION skdi = (PSYSTEM_KERNEL_DEBUGGER_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); - if (Size < sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - skdi->KernelDebuggerEnabled = KD_DEBUGGER_ENABLED; - skdi->KernelDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; - - return STATUS_SUCCESS; + PSYSTEM_KERNEL_DEBUGGER_INFORMATION skdi = (PSYSTEM_KERNEL_DEBUGGER_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); + if (Size < sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + skdi->KernelDebuggerEnabled = KD_DEBUGGER_ENABLED; + skdi->KernelDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + + return STATUS_SUCCESS; } /* Class 36 - Context Switch Information */ QSI_DEF(SystemContextSwitchInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemContextSwitchInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemContextSwitchInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 37 - Registry Quota Information */ QSI_DEF(SystemRegistryQuotaInformation) { - PSYSTEM_REGISTRY_QUOTA_INFORMATION srqi = (PSYSTEM_REGISTRY_QUOTA_INFORMATION) Buffer; - - *ReqSize = sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION); - if (Size < sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - DPRINT1("Faking max registry size of 32 MB\n"); - srqi->RegistryQuotaAllowed = 0x2000000; - srqi->RegistryQuotaUsed = 0x200000; - srqi->PagedPoolSize = 0x200000; - - return STATUS_SUCCESS; + PSYSTEM_REGISTRY_QUOTA_INFORMATION srqi = (PSYSTEM_REGISTRY_QUOTA_INFORMATION) Buffer; + + *ReqSize = sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION); + if (Size < sizeof(SYSTEM_REGISTRY_QUOTA_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + DPRINT1("Faking max registry size of 32 MB\n"); + srqi->RegistryQuotaAllowed = 0x2000000; + srqi->RegistryQuotaUsed = 0x200000; + srqi->PagedPoolSize = 0x200000; + + return STATUS_SUCCESS; } SSI_DEF(SystemRegistryQuotaInformation) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemRegistryQuotaInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemRegistryQuotaInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 38 - Load And Call Image */ @@ -1593,160 +1582,160 @@ /* Class 39 - Priority Separation */ SSI_DEF(SystemPrioritySeperation) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemPrioritySeperation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemPrioritySeperation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 40 - Plug Play Bus Information */ QSI_DEF(SystemPlugPlayBusInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemPlugPlayBusInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemPlugPlayBusInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 41 - Dock Information */ QSI_DEF(SystemDockInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemDockInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemDockInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 42 - Power Information */ QSI_DEF(SystemPowerInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemPowerInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemPowerInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 43 - Processor Speed Information */ QSI_DEF(SystemProcessorSpeedInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemProcessorSpeedInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemProcessorSpeedInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 44 - Current Time Zone Information */ QSI_DEF(SystemCurrentTimeZoneInformation) { - * ReqSize = sizeof (TIME_ZONE_INFORMATION); - - if (sizeof (TIME_ZONE_INFORMATION) != Size) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* Copy the time zone information struct */ - memcpy(Buffer, - &ExpTimeZoneInfo, - sizeof(TIME_ZONE_INFORMATION)); - - return STATUS_SUCCESS; + *ReqSize = sizeof(TIME_ZONE_INFORMATION); + + if (sizeof(TIME_ZONE_INFORMATION) != Size) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Copy the time zone information struct */ + memcpy(Buffer, + &ExpTimeZoneInfo, + sizeof(TIME_ZONE_INFORMATION)); + + return STATUS_SUCCESS; } SSI_DEF(SystemCurrentTimeZoneInformation) { - /* Check user buffer's size */ - if (Size < sizeof (TIME_ZONE_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - - return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); + /* Check user buffer's size */ + if (Size < sizeof(TIME_ZONE_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + return ExpSetTimeZoneInformation((PTIME_ZONE_INFORMATION)Buffer); } /* Class 45 - Lookaside Information */ QSI_DEF(SystemLookasideInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemLookasideInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemLookasideInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 46 - Set time slip event */ SSI_DEF(SystemSetTimeSlipEvent) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemSetTimSlipEvent not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemSetTimSlipEvent not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 47 - Create a new session (TSE) */ SSI_DEF(SystemCreateSession) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemCreateSession not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemCreateSession not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 48 - Delete an existing session (TSE) */ SSI_DEF(SystemDeleteSession) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemDeleteSession not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemDeleteSession not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 49 - UNKNOWN */ QSI_DEF(SystemInvalidInfoClass4) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemInvalidInfoClass4 not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemInvalidInfoClass4 not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 50 - System range start address */ QSI_DEF(SystemRangeStartInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemRangeStartInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemRangeStartInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 51 - Driver verifier information */ QSI_DEF(SystemVerifierInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemVerifierInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemVerifierInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } SSI_DEF(SystemVerifierInformation) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemVerifierInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemVerifierInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 52 - Add a driver verifier */ SSI_DEF(SystemAddVerifier) { - /* FIXME */ - DPRINT1("NtSetSystemInformation - SystemAddVerifier not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemAddVerifier not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } /* Class 53 - A session's processes */ QSI_DEF(SystemSessionProcessesInformation) { - /* FIXME */ - DPRINT1("NtQuerySystemInformation - SystemSessionProcessInformation not implemented\n"); - return (STATUS_NOT_IMPLEMENTED); + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemSessionProcessInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; } @@ -1754,15 +1743,15 @@ typedef struct _QSSI_CALLS { - NTSTATUS (* Query) (PVOID,ULONG,PULONG); - NTSTATUS (* Set) (PVOID,ULONG); + NTSTATUS (* Query) (PVOID,ULONG,PULONG); + NTSTATUS (* Set) (PVOID,ULONG); } QSSI_CALLS; -// QS Query & Set -// QX Query -// XS Set -// XX unknown behaviour +// QS Query & Set +// QX Query +// XS Set +// XX unknown behaviour // #define SI_QS(n) {QSI_USE(n),SSI_USE(n)} #define SI_QX(n) {QSI_USE(n),NULL} @@ -1773,60 +1762,60 @@ QSSI_CALLS CallQS [] = { - SI_QX(SystemBasicInformation), - SI_QX(SystemProcessorInformation), - SI_QX(SystemPerformanceInformation), - SI_QX(SystemTimeOfDayInformation), - SI_QX(SystemPathInformation), /* should be SI_XX */ - SI_QX(SystemProcessInformation), - SI_QX(SystemCallCountInformation), - SI_QX(SystemDeviceInformation), - SI_QX(SystemProcessorPerformanceInformation), - SI_QS(SystemFlagsInformation), - SI_QX(SystemCallTimeInformation), /* should be SI_XX */ - SI_QX(SystemModuleInformation), - SI_QX(SystemLocksInformation), - SI_QX(SystemStackTraceInformation), /* should be SI_XX */ - SI_QX(SystemPagedPoolInformation), /* should be SI_XX */ - SI_QX(SystemNonPagedPoolInformation), /* should be SI_XX */ - SI_QX(SystemHandleInformation), - SI_QX(SystemObjectInformation), - SI_QX(SystemPageFileInformation), - SI_QX(SystemVdmInstemulInformation), - SI_QX(SystemVdmBopInformation), /* it should be SI_XX */ - SI_QS(SystemFileCacheInformation), - SI_QX(SystemPoolTagInformation), - SI_QX(SystemInterruptInformation), - SI_QS(SystemDpcBehaviourInformation), - SI_QX(SystemFullMemoryInformation), /* it should be SI_XX */ - SI_XS(SystemLoadGdiDriverInformation), - SI_XS(SystemUnloadGdiDriverInformation), - SI_QS(SystemTimeAdjustmentInformation), - SI_QX(SystemSummaryMemoryInformation), /* it should be SI_XX */ - SI_QX(SystemNextEventIdInformation), /* it should be SI_XX */ - SI_QX(SystemEventIdsInformation), /* it should be SI_XX */ - SI_QX(SystemCrashDumpInformation), - SI_QX(SystemExceptionInformation), - SI_QX(SystemCrashDumpStateInformation), - SI_QX(SystemKernelDebuggerInformation), - SI_QX(SystemContextSwitchInformation), - SI_QS(SystemRegistryQuotaInformation), - SI_XS(SystemExtendServiceTableInformation), - SI_XS(SystemPrioritySeperation), - SI_QX(SystemPlugPlayBusInformation), /* it should be SI_XX */ - SI_QX(SystemDockInformation), /* it should be SI_XX */ - SI_QX(SystemPowerInformation), /* it should be SI_XX */ - SI_QX(SystemProcessorSpeedInformation), /* it should be SI_XX */ - SI_QS(SystemCurrentTimeZoneInformation), /* it should be SI_QX */ - SI_QX(SystemLookasideInformation), - SI_XS(SystemSetTimeSlipEvent), - SI_XS(SystemCreateSession), - SI_XS(SystemDeleteSession), - SI_QX(SystemInvalidInfoClass4), /* it should be SI_XX */ - SI_QX(SystemRangeStartInformation), - SI_QS(SystemVerifierInformation), - SI_XS(SystemAddVerifier), - SI_QX(SystemSessionProcessesInformation) + SI_QX(SystemBasicInformation), + SI_QX(SystemProcessorInformation), + SI_QX(SystemPerformanceInformation), + SI_QX(SystemTimeOfDayInformation), + SI_QX(SystemPathInformation), /* should be SI_XX */ + SI_QX(SystemProcessInformation), + SI_QX(SystemCallCountInformation), + SI_QX(SystemDeviceInformation), + SI_QX(SystemProcessorPerformanceInformation), + SI_QS(SystemFlagsInformation), + SI_QX(SystemCallTimeInformation), /* should be SI_XX */ + SI_QX(SystemModuleInformation), + SI_QX(SystemLocksInformation), + SI_QX(SystemStackTraceInformation), /* should be SI_XX */ + SI_QX(SystemPagedPoolInformation), /* should be SI_XX */ + SI_QX(SystemNonPagedPoolInformation), /* should be SI_XX */ + SI_QX(SystemHandleInformation), + SI_QX(SystemObjectInformation), + SI_QX(SystemPageFileInformation), + SI_QX(SystemVdmInstemulInformation), + SI_QX(SystemVdmBopInformation), /* it should be SI_XX */ + SI_QS(SystemFileCacheInformation), + SI_QX(SystemPoolTagInformation), + SI_QX(SystemInterruptInformation), + SI_QS(SystemDpcBehaviourInformation), + SI_QX(SystemFullMemoryInformation), /* it should be SI_XX */ + SI_XS(SystemLoadGdiDriverInformation), + SI_XS(SystemUnloadGdiDriverInformation), + SI_QS(SystemTimeAdjustmentInformation), + SI_QX(SystemSummaryMemoryInformation), /* it should be SI_XX */ + SI_QX(SystemNextEventIdInformation), /* it should be SI_XX */ + SI_QX(SystemEventIdsInformation), /* it should be SI_XX */ + SI_QX(SystemCrashDumpInformation), + SI_QX(SystemExceptionInformation), + SI_QX(SystemCrashDumpStateInformation), + SI_QX(SystemKernelDebuggerInformation), + SI_QX(SystemContextSwitchInformation), + SI_QS(SystemRegistryQuotaInformation), + SI_XS(SystemExtendServiceTableInformation), + SI_XS(SystemPrioritySeperation), + SI_QX(SystemPlugPlayBusInformation), /* it should be SI_XX */ + SI_QX(SystemDockInformation), /* it should be SI_XX */ + SI_QX(SystemPowerInformation), /* it should be SI_XX */ + SI_QX(SystemProcessorSpeedInformation), /* it should be SI_XX */ + SI_QS(SystemCurrentTimeZoneInformation), /* it should be SI_QX */ + SI_QX(SystemLookasideInformation), + SI_XS(SystemSetTimeSlipEvent), + SI_XS(SystemCreateSession), + SI_XS(SystemDeleteSession), + SI_QX(SystemInvalidInfoClass4), /* it should be SI_XX */ + SI_QX(SystemRangeStartInformation), + SI_QS(SystemVerifierInformation), + SI_XS(SystemAddVerifier), + SI_QX(SystemSessionProcessesInformation) }; C_ASSERT(SystemBasicInformation == 0); @@ -1837,125 +1826,119 @@ * @implemented */ NTSTATUS NTAPI -NtQuerySystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG UnsafeResultLength) -{ - KPROCESSOR_MODE PreviousMode; - ULONG ResultLength; - NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - _SEH2_TRY - { - if (PreviousMode != KernelMode) +NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + OUT PVOID SystemInformation, + IN ULONG Length, + OUT PULONG UnsafeResultLength) +{ + KPROCESSOR_MODE PreviousMode; + ULONG ResultLength; + NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; + + PAGED_CODE(); + + PreviousMode = ExGetPreviousMode(); + + _SEH2_TRY + { + if (PreviousMode != KernelMode) { - /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ - ProbeForWrite(SystemInformation, Length, 1); - if (UnsafeResultLength != NULL) - ProbeForWriteUlong(UnsafeResultLength); + /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ + ProbeForWrite(SystemInformation, Length, 1); + if (UnsafeResultLength != NULL) + ProbeForWriteUlong(UnsafeResultLength); } - /* - * Check the request is valid. - */ - if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) + /* + * Check the request is valid. + */ + if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) { - _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); + _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } - if (NULL != CallQS [SystemInformationClass].Query) - { - /* - * Hand the request to a subhandler. - */ - FStatus = CallQS [SystemInformationClass].Query(SystemInformation, - Length, - &ResultLength); - if (UnsafeResultLength != NULL) - { - if (PreviousMode != KernelMode) + if (NULL != CallQS [SystemInformationClass].Query) + { + /* + * Hand the request to a subhandler. + */ + FStatus = CallQS [SystemInformationClass].Query(SystemInformation, + Length, + &ResultLength); + if (UnsafeResultLength != NULL) + { + if (PreviousMode != KernelMode) { - *UnsafeResultLength = ResultLength; + *UnsafeResultLength = ResultLength; } - else + else { - *UnsafeResultLength = ResultLength; + *UnsafeResultLength = ResultLength; } - } - } - } - _SEH2_EXCEPT(ExSystemExceptionFilter()) - { - FStatus = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - return (FStatus); + } + } + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + FStatus = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return FStatus; } NTSTATUS NTAPI -NtSetSystemInformation ( - IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - IN PVOID SystemInformation, - IN ULONG SystemInformationLength - ) -{ - PAGED_CODE(); - - /* - * If called from user mode, check - * possible unsafe arguments. - */ +NtSetSystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, + IN PVOID SystemInformation, + IN ULONG SystemInformationLength) +{ + PAGED_CODE(); + + /* + * If called from user mode, check + * possible unsafe arguments. + */ #if 0 - if (KernelMode != KeGetPreviousMode()) + if (KernelMode != KeGetPreviousMode()) + { + // Check arguments + //ProbeForWrite( + // SystemInformation, + // Length + // ); + //ProbeForWrite( + // ResultLength, + // sizeof (ULONG) + // ); + } +#endif + /* + * Check the request is valid. + */ + if ((SystemInformationClass >= MIN_SYSTEM_INFO_CLASS) && + (SystemInformationClass < MAX_SYSTEM_INFO_CLASS)) + { + if (NULL != CallQS [SystemInformationClass].Set) { - // Check arguments - //ProbeForWrite( - // SystemInformation, - // Length - // ); - //ProbeForWrite( - // ResultLength, - // sizeof (ULONG) - // ); + /* + * Hand the request to a subhandler. + */ + return CallQS [SystemInformationClass].Set(SystemInformation, + SystemInformationLength); } -#endif - /* - * Check the request is valid. - */ - if ( (SystemInformationClass >= MIN_SYSTEM_INFO_CLASS) - && (SystemInformationClass < MAX_SYSTEM_INFO_CLASS) - ) - { - if (NULL != CallQS [SystemInformationClass].Set) - { - /* - * Hand the request to a subhandler. - */ - return CallQS [SystemInformationClass].Set ( - SystemInformation, - SystemInformationLength - ); - } - } - return (STATUS_INVALID_INFO_CLASS); + } + + return STATUS_INVALID_INFO_CLASS; } NTSTATUS NTAPI -NtFlushInstructionCache ( - IN HANDLE ProcessHandle, - IN PVOID BaseAddress, - IN ULONG NumberOfBytesToFlush - ) +NtFlushInstructionCache(IN HANDLE ProcessHandle, + IN PVOID BaseAddress, + IN ULONG NumberOfBytesToFlush) { PAGED_CODE();

1 0

[fireball] 38565: - Rewrite SystemTimeOfDay QuerySystemInformation case. ReqSize is the amount of data copied to the user so use it accordingly. Also, fill up the buffer as much as the caller requested. Fixes 1 "ntdll_winetest.exe info". - Use a newer (5.0 and higher) version of SYSTEM_TIMEOFDAY_INFORMATION structure (consisting of two additional 64 bits fields: boot time bias and sleep time bias).
by fireball＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: fireball Date: Sun Jan 4 09:11:47 2009 New Revision: 38565 URL: http://svn.reactos.org/svn/reactos?rev=38565&view=rev Log: - Rewrite SystemTimeOfDay QuerySystemInformation case. ReqSize is the amount of data copied to the user so use it accordingly. Also, fill up the buffer as much as the caller requested. Fixes 1 "ntdll_winetest.exe info". - Use a newer (5.0 and higher) version of SYSTEM_TIMEOFDAY_INFORMATION structure (consisting of two additional 64 bits fields: boot time bias and sleep time bias). Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Jan 4 09:11:47 2009 @@ -817,6 +817,10 @@ LARGE_INTEGER TimeZoneBias; ULONG TimeZoneId; ULONG Reserved; +#if (NTDDI_VERSION >= NTDDI_WIN2K) + ULONGLONG BootTimeBias; + ULONGLONG SleepTimeBias; +#endif } SYSTEM_TIMEOFDAY_INFORMATION, *PSYSTEM_TIMEOFDAY_INFORMATION; // Class 4 Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jan 4 09:11:47 2009 @@ -663,25 +663,36 @@ /* Class 3 - Time Of Day Information */ QSI_DEF(SystemTimeOfDayInformation) { - PSYSTEM_TIMEOFDAY_INFORMATION Sti; + SYSTEM_TIMEOFDAY_INFORMATION Sti; LARGE_INTEGER CurrentTime; - Sti = (PSYSTEM_TIMEOFDAY_INFORMATION)Buffer; - *ReqSize = sizeof (SYSTEM_TIMEOFDAY_INFORMATION); + /* Set amount of written information to 0 */ + *ReqSize = 0; /* Check user buffer's size */ - if (Size != sizeof (SYSTEM_TIMEOFDAY_INFORMATION)) - { - return STATUS_INFO_LENGTH_MISMATCH; - } - + if (Size > sizeof(SYSTEM_TIMEOFDAY_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + /* Get current time */ KeQuerySystemTime(&CurrentTime); - Sti->BootTime= KeBootTime; - Sti->CurrentTime = CurrentTime; - Sti->TimeZoneBias.QuadPart = ExpTimeZoneBias.QuadPart; - Sti->TimeZoneId = ExpTimeZoneId; - Sti->Reserved = 0; + /* Zero local buffer */ + RtlZeroMemory(&Sti, sizeof(SYSTEM_TIMEOFDAY_INFORMATION)); + + /* Fill local time structure */ + Sti.BootTime= KeBootTime; + Sti.CurrentTime = CurrentTime; + Sti.TimeZoneBias.QuadPart = ExpTimeZoneBias.QuadPart; + Sti.TimeZoneId = ExpTimeZoneId; + Sti.Reserved = 0; + + /* Copy as much as requested by caller */ + RtlCopyMemory(Buffer, &Sti, Size); + + /* Set amount of information we copied */ + *ReqSize = Size; return STATUS_SUCCESS; }

1 0

[dgorbachev] 38564: Add type casts to RtlpCallQueryRegistryRoutine().
by dgorbachev＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: dgorbachev Date: Sun Jan 4 08:40:27 2009 New Revision: 38564 URL: http://svn.reactos.org/svn/reactos?rev=38564&view=rev Log: Add type casts to RtlpCallQueryRegistryRoutine(). Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=385… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Sun Jan 4 08:40:27 2009 @@ -157,7 +157,7 @@ } /* We can setup a default value... capture the defaults */ - Name = QueryTable->Name; + Name = (PWCHAR)QueryTable->Name; Type = QueryTable->DefaultType; Data = QueryTable->DefaultData; Length = QueryTable->DefaultLength; @@ -224,7 +224,7 @@ else { /* Just return the name */ - Name = QueryTable->Name; + Name = (PWCHAR)QueryTable->Name; } /* Capture key data */

1 0

[dgorbachev] 38563: Silence GCC 4.4.0 warnings.
by dgorbachev＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: dgorbachev Date: Sun Jan 4 08:27:04 2009 New Revision: 38563 URL: http://svn.reactos.org/svn/reactos?rev=38563&view=rev Log: Silence GCC 4.4.0 warnings. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -1067,8 +1067,8 @@ ULONG AtapiParseArgumentString( - IN PCHAR String, - IN PCHAR KeyWord + IN PCCH String, + IN PCCH KeyWord ); BOOLEAN @@ -1206,15 +1206,15 @@ IN PVOID HwDeviceExtension, IN ULONG chan, IN ULONG dev, - IN PWSTR Name, + IN PCWSTR Name, IN ULONG Default ); extern ULONG AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, - IN PWSTR PathSuffix, - IN PWSTR Name, + IN PCWSTR PathSuffix, + IN PCWSTR Name, IN ULONG Default ); @@ -1224,7 +1224,7 @@ VOID _cdecl _PrintNtConsole( - PCHAR DebugMessage, + PCCH DebugMessage, ... ); Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -482,7 +482,7 @@ { #idlo, 4, 0x##idlo, #idhi, 4, 0x##idhi, rev, mode, name, flags} #else #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ - { #idlo, 4, 0x##idlo, #idhi, 4, 0x##idhi, rev, mode, NULL, flags} + { (PCHAR) #idlo, 4, 0x##idlo, (PCHAR) #idhi, 4, 0x##idhi, rev, mode, NULL, flags} #endif #define BMLIST_TERMINATOR (0xffffffffL) Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -987,7 +987,7 @@ BOOLEAN opt_AtapiDmaRawRead; // default TRUE BOOLEAN opt_AtapiDmaReadWrite; // default TRUE - PCHAR FullDevName; + PCCH FullDevName; } HW_DEVICE_EXTENSION, *PHW_DEVICE_EXTENSION; @@ -1172,9 +1172,9 @@ IN ULONG DeviceNumber, IN ULONG lChannel, // logical channel, // is always 0 except simplex-only controllers - IN CHAR apiomode, - IN CHAR wdmamode, - IN CHAR udmamode + IN SCHAR apiomode, + IN SCHAR wdmamode, + IN SCHAR udmamode ); extern BOOLEAN NTAPI Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -2861,12 +2861,12 @@ --*/ ULONG AtapiParseArgumentString( - IN PCHAR String, - IN PCHAR KeyWord + IN PCCH String, + IN PCCH KeyWord ) { - PCHAR cptr; - PCHAR kptr; + PCCH cptr; + PCCH kptr; ULONG value; ULONG stringLength = 0; ULONG keyWordLength = 0; @@ -2879,24 +2879,15 @@ return 0; } - // Calculate the string length and lower case all characters. + // Calculate the string length. cptr = String; - while (*cptr) { - if (*cptr >= 'A' && *cptr <= 'Z') { - *cptr = *cptr + ('a' - 'A'); - } - cptr++; + while (*cptr++) { stringLength++; } - // Calculate the keyword length and lower case all characters. - cptr = KeyWord; - while (*cptr) { - - if (*cptr >= 'A' && *cptr <= 'Z') { - *cptr = *cptr + ('a' - 'A'); - } - cptr++; + // Calculate the keyword length. + kptr = KeyWord; + while (*kptr++) { keyWordLength++; } @@ -2922,18 +2913,21 @@ } kptr = KeyWord; - while (*cptr++ == *kptr++) { - - if (*(cptr - 1) == '\0') { + while ((*cptr == *kptr) || + (*cptr <= 'Z' && *cptr + ('a' - 'A') == *kptr) || + (*cptr >= 'a' && *cptr - ('a' - 'A') == *kptr)) { + cptr++; + kptr++; + + if (*cptr == '\0') { // end of string return 0; } } - if (*(kptr - 1) == '\0') { + if (*kptr == '\0') { // May have a match backup and check for blank or equals. - cptr--; while (*cptr == ' ' || *cptr == '\t') { cptr++; } @@ -2969,7 +2963,7 @@ } value = 0; - if ((*cptr == '0') && (*(cptr + 1) == 'x')) { + if ((*cptr == '0') && ((*(cptr + 1) == 'x') || (*(cptr + 1) == 'X'))) { // Value is in Hex. Skip the "0x" cptr += 2; for (index = 0; *(cptr + index); index++) { @@ -2985,6 +2979,8 @@ } else { if ((*(cptr + index) >= 'a') && (*(cptr + index) <= 'f')) { value = (16 * value) + (*(cptr + index) - 'a' + 10); + } else if ((*(cptr + index) >= 'A') && (*(cptr + index) <= 'F')) { + value = (16 * value) + (*(cptr + index) - 'A' + 10); } else { // Syntax error, return not found. return 0; @@ -8754,10 +8750,10 @@ ULONG AtapiRegCheckDevLunValue( IN PVOID HwDeviceExtension, - IN PWCHAR NamePrefix, + IN PCWCH NamePrefix, IN ULONG chan, IN ULONG dev, - IN PWSTR Name, + IN PCWSTR Name, IN ULONG Default ) { @@ -8824,7 +8820,7 @@ IN PVOID HwDeviceExtension, IN ULONG chan, IN ULONG dev, - IN PWSTR Name, + IN PCWSTR Name, IN ULONG Default ) { @@ -8942,8 +8938,8 @@ ULONG AtapiRegCheckParameterValue( IN PVOID HwDeviceExtension, - IN PWSTR PathSuffix, - IN PWSTR Name, + IN PCWSTR PathSuffix, + IN PCWSTR Name, IN ULONG Default ) { @@ -9110,7 +9106,7 @@ VOID _cdecl _PrintNtConsole( - PCHAR DebugMessage, + PCCH DebugMessage, ... ) { Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -281,7 +281,7 @@ if(!dma_count || ((LONG)(dma_base) == -1)) { KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = (ULONGLONG)NULL; + AtaReq->ahci_base64 = 0; return FALSE; } @@ -303,7 +303,7 @@ if (i >= max_entries) { KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = (ULONGLONG)NULL; + AtaReq->ahci_base64 = 0; return FALSE; } KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); @@ -321,7 +321,7 @@ } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = (ULONGLONG)NULL; + AtaReq->ahci_base64 = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } @@ -596,7 +596,7 @@ ) { PHW_LU_EXTENSION LunExt = &(deviceExtension->lun[ldev]); - CHAR apiomode; + SCHAR apiomode; apiomode = (CHAR)AtaPioMode(&(LunExt->IdentifyData)); @@ -754,9 +754,9 @@ IN ULONG DeviceNumber, IN ULONG lChannel, // logical channel, // is always 0 except simplex-only controllers - IN CHAR apiomode, - IN CHAR wdmamode, - IN CHAR udmamode + IN SCHAR apiomode, + IN SCHAR wdmamode, + IN SCHAR udmamode ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; @@ -1046,7 +1046,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); if((apiomode >= 0) && (ChipType != VIA133)) { - SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); + SetPciConfig1(reg-0x08, via_pio[apiomode]); } via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); @@ -1067,18 +1067,18 @@ apiomode = 4; for(i=udmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); return; } } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); return; } } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); return; } return; @@ -1113,7 +1113,7 @@ } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); - SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); + SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); return; } /* Use GENERIC PIO */ @@ -1413,7 +1413,7 @@ // 44 GetPciConfig4(0x44, reg44); reg44 = (reg44 & ~(0xff << bit_offset)) | - (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); + (sw_dma_modes[wdmamode] << bit_offset); SetPciConfig4(0x44, reg44); // 40 GetPciConfig4(0x40, reg40); @@ -1439,7 +1439,7 @@ // 40 GetPciConfig4(0x40, reg40); reg40 = (reg40 & ~(0xff << bit_offset)) | - (sw_pio_modes[(UCHAR)apiomode] << bit_offset); + (sw_pio_modes[apiomode] << bit_offset); SetPciConfig4(0x40, reg40); return; break; } @@ -1488,7 +1488,7 @@ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); SetPciConfig1(mreg, mode | (mask & 0x11)); - SetPciConfig2(ureg - 0x8, sil_pio_modes[i]); + SetPciConfig2(ureg - 0x8, sil_pio_modes[apiomode]); return; } else { @@ -1527,7 +1527,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); - SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); + SetPciConfig1(treg, cmd_pio_modes[apiomode]); ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); return; @@ -1731,8 +1731,8 @@ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); ChangePciConfig1(0x50, a | (1 << (dev + 3)) ); GetPciConfig1(0x54 + offset, reg54); - if(reg54 < chtiming[i]) { - SetPciConfig1(0x54 + offset, chtiming[i]); + if(reg54 < chtiming[apiomode]) { + SetPciConfig1(0x54 + offset, chtiming[apiomode]); } return; } Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -503,8 +503,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); + sprintf((PCHAR)vendorStrPtr, "%4.4lx", VendorID); + sprintf((PCHAR)deviceStrPtr, "%4.4lx", DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -1,15 +1,11 @@ #ifndef __NTDDK_EX__H__ #define __NTDDK_EX__H__ -#ifndef __REACTOS__ +#ifdef ASSERT #undef ASSERT -#define ASSERT -#else -#undef ASSERT -//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -#define ASSERT(x) // FIXME: WTF! -#endif //__REACTOS__ - +#define ASSERT(x) ((void)0) +// #define ASSERT(x) if (!(x)) { RtlAssert("#x",__FILE__,__LINE__, ""); } +#endif #ifndef FILE_CHARACTERISTIC_PNP_DEVICE // DDK 2003 Modified: trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff [iso-8859-1] Sun Jan 4 08:27:04 2009 @@ -1,8 +1,8 @@ -Index: atapi.h -=================================================================== ---- atapi.h (revision 38425) -+++ atapi.h (working copy) -@@ -138,6 +138,10 @@ +Index: atapi.h +=================================================================== +--- atapi.h (revision 38451) ++++ atapi.h (working copy) +@@ -138,6 +138,10 @@ #else // _DEBUG @@ -13,41 +13,96 @@ #define PRINT_PREFIX "UniATA: " //#define KdPrint3(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }} -Index: id_ata.cpp -=================================================================== ---- id_ata.cpp (revision 38425) -+++ id_ata.cpp (working copy) -@@ -1864,7 +1864,9 @@ - ULONG slotNumber = deviceExtension->slotNumber; - ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; - ULONG VendorID = deviceExtension->DevID & 0xffff; -+#ifdef _DEBUG - ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; -+#endif - //ULONG RevID = deviceExtension->RevID; - ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; - UCHAR tmp8; -Index: id_badblock.cpp -=================================================================== ---- id_badblock.cpp (revision 38425) -+++ id_badblock.cpp (working copy) -@@ -159,7 +159,11 @@ - L"UniATA\\Parameters\\BadBlocks", - QueryTable, 0, 0); - -+#ifdef _DEBUG - KdPrint(( "InitBadBlocks returned: %#x\n", status)); -+#else -+ UNREFERENCED_PARAMETER(status); -+#endif - } else { - - KdPrint(( "InitBadBlocks local\n")); -Index: id_dma.cpp -=================================================================== ---- id_dma.cpp (revision 38425) -+++ id_dma.cpp (working copy) -@@ -219,7 +219,7 @@ +@@ -1063,8 +1067,8 @@ + + ULONG + AtapiParseArgumentString( +- IN PCHAR String, +- IN PCHAR KeyWord ++ IN PCCH String, ++ IN PCCH KeyWord + ); + + BOOLEAN +@@ -1202,15 +1206,15 @@ + IN PVOID HwDeviceExtension, + IN ULONG chan, + IN ULONG dev, +- IN PWSTR Name, ++ IN PCWSTR Name, + IN ULONG Default + ); + + extern ULONG + AtapiRegCheckParameterValue( + IN PVOID HwDeviceExtension, +- IN PWSTR PathSuffix, +- IN PWSTR Name, ++ IN PCWSTR PathSuffix, ++ IN PCWSTR Name, + IN ULONG Default + ); + +@@ -1220,7 +1224,7 @@ + VOID + _cdecl + _PrintNtConsole( +- PCHAR DebugMessage, ++ PCCH DebugMessage, + ... + ); + +Index: id_sata.cpp +=================================================================== +--- id_sata.cpp (revision 38451) ++++ id_sata.cpp (working copy) +@@ -7,7 +7,7 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- ULONG Channel = deviceExtension->Channel + lChannel; ++ //ULONG Channel = deviceExtension->Channel + lChannel; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; + SATA_SSTATUS_REG SStatus; + ULONG i; +@@ -126,7 +126,7 @@ + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; +- ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; ++ //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + SATA_SSTATUS_REG SStatus; + SATA_SERROR_REG SError; + +Index: ntddk_ex.h +=================================================================== +--- ntddk_ex.h (revision 38451) ++++ ntddk_ex.h (working copy) +@@ -1,15 +1,12 @@ + #ifndef __NTDDK_EX__H__ + #define __NTDDK_EX__H__ + +-#ifndef __REACTOS__ ++#ifdef ASSERT + #undef ASSERT +-#define ASSERT +-#else +-#undef ASSERT +-#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +-#endif //__REACTOS__ ++#define ASSERT(x) ((void)0) ++// #define ASSERT(x) if (!(x)) { RtlAssert("#x",__FILE__,__LINE__, ""); } ++#endif + +- + #ifndef FILE_CHARACTERISTIC_PNP_DEVICE // DDK 2003 + + #define FILE_CHARACTERISTIC_PNP_DEVICE 0x00000800 +Index: id_dma.cpp +=================================================================== +--- id_dma.cpp (revision 38451) ++++ id_dma.cpp (working copy) +@@ -219,7 +219,7 @@ PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); BOOLEAN use_DB_IO = FALSE; @@ -56,34 +111,43 @@ ULONG orig_count = count; ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES; -@@ -281,7 +281,7 @@ +@@ -281,7 +281,7 @@ if(!dma_count || ((LONG)(dma_base) == -1)) { KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; -+ AtaReq->ahci_base64 = (ULONGLONG)NULL; ++ AtaReq->ahci_base64 = 0; return FALSE; } -@@ -303,7 +303,7 @@ +@@ -303,7 +303,7 @@ if (i >= max_entries) { KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; -+ AtaReq->ahci_base64 = (ULONGLONG)NULL; ++ AtaReq->ahci_base64 = 0; return FALSE; } KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); -@@ -321,7 +321,7 @@ +@@ -321,7 +321,7 @@ } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; -+ AtaReq->ahci_base64 = (ULONGLONG)NULL; ++ AtaReq->ahci_base64 = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } -@@ -612,7 +612,7 @@ +@@ -596,7 +596,7 @@ + ) + { + PHW_LU_EXTENSION LunExt = &(deviceExtension->lun[ldev]); +- CHAR apiomode; ++ SCHAR apiomode; + + apiomode = (CHAR)AtaPioMode(&(LunExt->IdentifyData)); + +@@ -612,7 +612,7 @@ } if((deviceExtension->HbaCtrlFlags & HBAFLAGS_DMA_DISABLED_LBA48) && @@ -92,7 +156,7 @@ (LunExt->TransferMode > ATA_PIO5) ) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d for LBA48\n", ldev & 1)); -@@ -623,7 +623,7 @@ +@@ -623,7 +623,7 @@ if(AtaReq->Flags & REQ_FLAG_FORCE_DOWNRATE) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d\n", ldev & 1)); @@ -101,74 +165,29 @@ limit_lba48: LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; limit_pio: -@@ -1046,7 +1046,7 @@ - /* set PIO mode timings */ - AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); - if((apiomode >= 0) && (ChipType != VIA133)) { -- SetPciConfig1(reg-0x08, via_pio[apiomode]); -+ SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); - } - via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); - AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); -@@ -1067,18 +1067,18 @@ - apiomode = 4; - for(i=udmamode; i>=0; i--) { - if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { -- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); -+ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); - return; - } - } - for(i=wdmamode; i>=0; i--) { - if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { -- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); -+ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); - return; - } - } - if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { -- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); -+ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); +@@ -754,9 +754,9 @@ + IN ULONG DeviceNumber, + IN ULONG lChannel, // logical channel, + // is always 0 except simplex-only controllers +- IN CHAR apiomode, +- IN CHAR wdmamode, +- IN CHAR udmamode ++ IN SCHAR apiomode, ++ IN SCHAR wdmamode, ++ IN SCHAR udmamode + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +@@ -1488,7 +1488,7 @@ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + + SetPciConfig1(mreg, mode | (mask & 0x11)); +- SetPciConfig2(ureg - 0x8, sil_pio_modes[i]); ++ SetPciConfig2(ureg - 0x8, sil_pio_modes[apiomode]); return; - } - return; -@@ -1113,7 +1113,7 @@ - } - if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { - ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); -- SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); -+ SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); - return; - } - /* Use GENERIC PIO */ -@@ -1413,7 +1413,7 @@ - // 44 - GetPciConfig4(0x44, reg44); - reg44 = (reg44 & ~(0xff << bit_offset)) | -- (sw_dma_modes[wdmamode] << bit_offset); -+ (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); - SetPciConfig4(0x44, reg44); - // 40 - GetPciConfig4(0x40, reg40); -@@ -1439,7 +1439,7 @@ - // 40 - GetPciConfig4(0x40, reg40); - reg40 = (reg40 & ~(0xff << bit_offset)) | -- (sw_pio_modes[apiomode] << bit_offset); -+ (sw_pio_modes[(UCHAR)apiomode] << bit_offset); - SetPciConfig4(0x40, reg40); - return; - break; } -@@ -1527,7 +1527,7 @@ - /* set PIO mode timings */ - AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); - -- SetPciConfig1(treg, cmd_pio_modes[apiomode]); -+ SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); - ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); - return; - -@@ -1538,7 +1538,7 @@ + + } else { +@@ -1538,7 +1538,7 @@ /*******/ /* SiS */ /*******/ @@ -177,7 +196,7 @@ static const ULONG sis_modes_new133[] = { 0x28269008, 0x0c266008, 0x04263008, 0x0c0a3008, 0x05093008, 0x22196008, 0x0c0a3008, 0x05093008, 0x050939fc, 0x050936ac, -@@ -1553,9 +1553,9 @@ +@@ -1553,9 +1553,9 @@ { 0x00cb, 0x0067, 0x0044, 0x0033, 0x0031, 0x0044, 0x0033, 0x0031, 0x8b31, 0x8731, 0x8531, 0x8431, 0x8231, 0x8131 }; @@ -189,7 +208,18 @@ ULONG offs; switch(ChipType) { -@@ -1901,7 +1901,7 @@ +@@ -1731,8 +1731,8 @@ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + ChangePciConfig1(0x50, a | (1 << (dev + 3)) ); + GetPciConfig1(0x54 + offset, reg54); +- if(reg54 < chtiming[i]) { +- SetPciConfig1(0x54 + offset, chtiming[i]); ++ if(reg54 < chtiming[apiomode]) { ++ SetPciConfig1(0x54 + offset, chtiming[apiomode]); + } + return; + } +@@ -1901,7 +1901,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; @@ -198,11 +228,27 @@ if(mode == ATA_PIO5) mode = ATA_PIO4; -Index: id_init.cpp -=================================================================== ---- id_init.cpp (revision 38425) -+++ id_init.cpp (working copy) -@@ -52,11 +52,11 @@ +Index: id_badblock.cpp +=================================================================== +--- id_badblock.cpp (revision 38451) ++++ id_badblock.cpp (working copy) +@@ -159,7 +159,11 @@ + L"UniATA\\Parameters\\BadBlocks", + QueryTable, 0, 0); + ++#ifdef _DEBUG + KdPrint(( "InitBadBlocks returned: %#x\n", status)); ++#else ++ UNREFERENCED_PARAMETER(status); ++#endif + } else { + + KdPrint(( "InitBadBlocks local\n")); +Index: id_init.cpp +=================================================================== +--- id_init.cpp (revision 38451) ++++ id_init.cpp (working copy) +@@ -52,11 +52,11 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; @@ -218,7 +264,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; -@@ -216,7 +216,7 @@ +@@ -216,7 +216,7 @@ PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), @@ -227,7 +273,7 @@ /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), -@@ -419,7 +419,7 @@ +@@ -419,7 +419,7 @@ BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); for(c=0; c<deviceExtension->NumberChannels; c++) { @@ -236,7 +282,7 @@ ULONG unit10 = (c & 2); chan = &deviceExtension->chan[c]; -@@ -987,7 +987,7 @@ +@@ -987,7 +987,7 @@ IN ULONG slotNumber ) { @@ -245,7 +291,7 @@ PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; -@@ -1039,7 +1039,7 @@ +@@ -1039,7 +1039,7 @@ IN ULONG c ) { @@ -254,7 +300,7 @@ PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; -@@ -1174,7 +1174,7 @@ +@@ -1174,7 +1174,7 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; @@ -263,7 +309,7 @@ PHW_CHANNEL chan; ULONG c; // logical channel (for Compatible Mode controllers) UCHAR tmp8; -@@ -1332,7 +1332,9 @@ +@@ -1332,7 +1332,9 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; @@ -273,11 +319,158 @@ ULONG RevID = deviceExtension->RevID; // ULONG i; // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; -Index: id_probe.cpp -=================================================================== ---- id_probe.cpp (revision 38425) -+++ id_probe.cpp (working copy) -@@ -76,7 +76,6 @@ +Index: id_ata.cpp +=================================================================== +--- id_ata.cpp (revision 38451) ++++ id_ata.cpp (working copy) +@@ -1864,7 +1864,9 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; ++#ifdef _DEBUG + ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++#endif + //ULONG RevID = deviceExtension->RevID; + ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + UCHAR tmp8; +@@ -2859,12 +2861,12 @@ + --*/ + ULONG + AtapiParseArgumentString( +- IN PCHAR String, +- IN PCHAR KeyWord ++ IN PCCH String, ++ IN PCCH KeyWord + ) + { +- PCHAR cptr; +- PCHAR kptr; ++ PCCH cptr; ++ PCCH kptr; + ULONG value; + ULONG stringLength = 0; + ULONG keyWordLength = 0; +@@ -2877,24 +2879,15 @@ + return 0; + } + +- // Calculate the string length and lower case all characters. ++ // Calculate the string length. + cptr = String; +- while (*cptr) { +- if (*cptr >= 'A' && *cptr <= 'Z') { +- *cptr = *cptr + ('a' - 'A'); +- } +- cptr++; ++ while (*cptr++) { + stringLength++; + } + +- // Calculate the keyword length and lower case all characters. +- cptr = KeyWord; +- while (*cptr) { +- +- if (*cptr >= 'A' && *cptr <= 'Z') { +- *cptr = *cptr + ('a' - 'A'); +- } +- cptr++; ++ // Calculate the keyword length. ++ kptr = KeyWord; ++ while (*kptr++) { + keyWordLength++; + } + +@@ -2920,18 +2913,21 @@ + } + + kptr = KeyWord; +- while (*cptr++ == *kptr++) { ++ while ((*cptr == *kptr) || ++ (*cptr <= 'Z' && *cptr + ('a' - 'A') == *kptr) || ++ (*cptr >= 'a' && *cptr - ('a' - 'A') == *kptr)) { ++ cptr++; ++ kptr++; + +- if (*(cptr - 1) == '\0') { ++ if (*cptr == '\0') { + // end of string + return 0; + } + } + +- if (*(kptr - 1) == '\0') { ++ if (*kptr == '\0') { + + // May have a match backup and check for blank or equals. +- cptr--; + while (*cptr == ' ' || *cptr == '\t') { + cptr++; + } +@@ -2967,7 +2963,7 @@ + } + + value = 0; +- if ((*cptr == '0') && (*(cptr + 1) == 'x')) { ++ if ((*cptr == '0') && ((*(cptr + 1) == 'x') || (*(cptr + 1) == 'X'))) { + // Value is in Hex. Skip the "0x" + cptr += 2; + for (index = 0; *(cptr + index); index++) { +@@ -2983,6 +2979,8 @@ + } else { + if ((*(cptr + index) >= 'a') && (*(cptr + index) <= 'f')) { + value = (16 * value) + (*(cptr + index) - 'a' + 10); ++ } else if ((*(cptr + index) >= 'A') && (*(cptr + index) <= 'F')) { ++ value = (16 * value) + (*(cptr + index) - 'A' + 10); + } else { + // Syntax error, return not found. + return 0; +@@ -8752,10 +8750,10 @@ + ULONG + AtapiRegCheckDevLunValue( + IN PVOID HwDeviceExtension, +- IN PWCHAR NamePrefix, ++ IN PCWCH NamePrefix, + IN ULONG chan, + IN ULONG dev, +- IN PWSTR Name, ++ IN PCWSTR Name, + IN ULONG Default + ) + { +@@ -8822,7 +8820,7 @@ + IN PVOID HwDeviceExtension, + IN ULONG chan, + IN ULONG dev, +- IN PWSTR Name, ++ IN PCWSTR Name, + IN ULONG Default + ) + { +@@ -8940,8 +8938,8 @@ + ULONG + AtapiRegCheckParameterValue( + IN PVOID HwDeviceExtension, +- IN PWSTR PathSuffix, +- IN PWSTR Name, ++ IN PCWSTR PathSuffix, ++ IN PCWSTR Name, + IN ULONG Default + ) + { +@@ -9108,7 +9106,7 @@ + VOID + _cdecl + _PrintNtConsole( +- PCHAR DebugMessage, ++ PCCH DebugMessage, + ... + ) + { +Index: id_probe.cpp +=================================================================== +--- id_probe.cpp (revision 38451) ++++ id_probe.cpp (working copy) +@@ -76,7 +76,6 @@ VOID AtapiDoNothing(VOID) { @@ -285,18 +478,18 @@ return; } // end AtapiDoNothing() -@@ -504,8 +503,8 @@ +@@ -504,8 +503,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); -+ sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); -+ sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); ++ sprintf((PCHAR)vendorStrPtr, "%4.4lx", VendorID); ++ sprintf((PCHAR)deviceStrPtr, "%4.4lx", DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); -@@ -874,7 +873,11 @@ +@@ -874,7 +873,11 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; @@ -308,7 +501,7 @@ BOOLEAN AltInit = FALSE; SCSI_PHYSICAL_ADDRESS IoBasePort1; -@@ -1712,7 +1715,7 @@ +@@ -1712,7 +1715,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; @@ -317,7 +510,7 @@ // this buffer must be global for UNIATA_CORE build PCI_COMMON_CONFIG pciData; -@@ -1743,8 +1746,8 @@ +@@ -1743,8 +1746,8 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; @@ -328,7 +521,7 @@ PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0 = NULL; -@@ -1797,7 +1800,7 @@ +@@ -1797,7 +1800,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); @@ -337,7 +530,7 @@ KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); goto exit_error; } -@@ -2207,7 +2210,7 @@ +@@ -2207,7 +2210,7 @@ PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan; PULONG adapterCount = (PULONG)Context; @@ -346,7 +539,7 @@ ULONG i; ULONG irq=0; ULONG portBase; -@@ -2217,7 +2220,7 @@ +@@ -2217,7 +2220,7 @@ BOOLEAN preConfig = FALSE; // PIDE_REGISTERS_1 BaseIoAddress1; @@ -355,39 +548,42 @@ // The following table specifies the ports to be checked when searching for // an IDE controller. A zero entry terminates the search. -Index: id_sata.cpp -=================================================================== ---- id_sata.cpp (revision 38425) -+++ id_sata.cpp (working copy) -@@ -7,7 +7,7 @@ - ) - { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; -- ULONG Channel = deviceExtension->Channel + lChannel; -+ //ULONG Channel = deviceExtension->Channel + lChannel; - PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; - SATA_SSTATUS_REG SStatus; - ULONG i; -@@ -126,7 +126,7 @@ - { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; -- ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; -+ //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; - SATA_SSTATUS_REG SStatus; - SATA_SERROR_REG SError; - -Index: ntddk_ex.h -=================================================================== ---- ntddk_ex.h (revision 38425) -+++ ntddk_ex.h (working copy) -@@ -6,7 +6,8 @@ - #define ASSERT +Index: bm_devs.h +=================================================================== +--- bm_devs.h (revision 38451) ++++ bm_devs.h (working copy) +@@ -482,7 +482,7 @@ + { #idlo, 4, 0x##idlo, #idhi, 4, 0x##idhi, rev, mode, name, flags} #else - #undef ASSERT --#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -+//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } -+#define ASSERT(x) // FIXME: WTF! - #endif //__REACTOS__ - - + #define PCI_DEV_HW_SPEC_BM(idhi, idlo, rev, mode, name, flags) \ +- { #idlo, 4, 0x##idlo, #idhi, 4, 0x##idhi, rev, mode, NULL, flags} ++ { (PCHAR) #idlo, 4, 0x##idlo, (PCHAR) #idhi, 4, 0x##idhi, rev, mode, NULL, flags} + #endif + + #define BMLIST_TERMINATOR (0xffffffffL) +Index: bsmaster.h +=================================================================== +--- bsmaster.h (revision 38451) ++++ bsmaster.h (working copy) +@@ -987,7 +987,7 @@ + BOOLEAN opt_AtapiDmaRawRead; // default TRUE + BOOLEAN opt_AtapiDmaReadWrite; // default TRUE + +- PCHAR FullDevName; ++ PCCH FullDevName; + + } HW_DEVICE_EXTENSION, *PHW_DEVICE_EXTENSION; + +@@ -1172,9 +1172,9 @@ + IN ULONG DeviceNumber, + IN ULONG lChannel, // logical channel, + // is always 0 except simplex-only controllers +- IN CHAR apiomode, +- IN CHAR wdmamode, +- IN CHAR udmamode ++ IN SCHAR apiomode, ++ IN SCHAR wdmamode, ++ IN SCHAR udmamode + ); + + extern BOOLEAN NTAPI

1 0

[dgorbachev] 38562: PWSTR -> PCWSTR
by dgorbachev＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: dgorbachev Date: Sun Jan 4 08:26:59 2009 New Revision: 38562 URL: http://svn.reactos.org/svn/reactos?rev=38562&view=rev Log: PWSTR -> PCWSTR Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Jan 4 08:26:59 2009 @@ -4541,7 +4541,7 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE { PRTL_QUERY_REGISTRY_ROUTINE QueryRoutine; ULONG Flags; - PWSTR Name; + PCWSTR Name; PVOID EntryContext; ULONG DefaultType; PVOID DefaultData; Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Jan 4 08:26:59 2009 @@ -689,7 +689,7 @@ { PRTL_QUERY_REGISTRY_ROUTINE QueryRoutine; ULONG Flags; - PWSTR Name; + PCWSTR Name; PVOID EntryContext; ULONG DefaultType; PVOID DefaultData;

1 0

[fireball] 38561: Dmitry Chapyshev - Add buffer length checks to NtQueryInformationThread.
by fireball＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: fireball Date: Sun Jan 4 07:43:08 2009 New Revision: 38561 URL: http://svn.reactos.org/svn/reactos?rev=38561&view=rev Log: Dmitry Chapyshev - Add buffer length checks to NtQueryInformationThread. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=38… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Jan 4 07:43:08 2009 @@ -1200,6 +1200,14 @@ /* Basic thread information */ case ThreadBasicInformation: + /* Set return length */ + Length = sizeof(THREAD_BASIC_INFORMATION); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH2_TRY { @@ -1210,9 +1218,6 @@ ThreadBasicInfo->AffinityMask = Thread->Tcb.Affinity; ThreadBasicInfo->Priority = Thread->Tcb.Priority; ThreadBasicInfo->BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); - - /* Set return length */ - Length = sizeof(THREAD_BASIC_INFORMATION); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1225,6 +1230,14 @@ /* Thread time information */ case ThreadTimes: + /* Set the return length */ + Length = sizeof(KERNEL_USER_TIMES); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH2_TRY { @@ -1235,9 +1248,6 @@ 100000LL; ThreadTime->CreateTime = Thread->CreateTime; ThreadTime->ExitTime = Thread->ExitTime; - - /* Set the return length */ - Length = sizeof(KERNEL_USER_TIMES); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1249,14 +1259,19 @@ case ThreadQuerySetWin32StartAddress: + /* Set the return length*/ + Length = sizeof(PVOID); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect write with SEH */ _SEH2_TRY { /* Return the Win32 Start Address */ *(PVOID*)ThreadInformation = Thread->Win32StartAddress; - - /* Set the return length*/ - Length = sizeof(PVOID); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1268,14 +1283,19 @@ case ThreadPerformanceCount: + /* Set the return length*/ + Length = sizeof(LARGE_INTEGER); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect write with SEH */ _SEH2_TRY { /* FIXME */ (*(PLARGE_INTEGER)ThreadInformation).QuadPart = 0; - - /* Set the return length*/ - Length = sizeof(LARGE_INTEGER); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1287,6 +1307,14 @@ case ThreadAmILastThread: + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect write with SEH */ _SEH2_TRY { @@ -1296,9 +1324,6 @@ &Thread->ThreadsProcess-> ThreadListHead) ? TRUE : FALSE); - - /* Set the return length*/ - Length = sizeof(ULONG); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1310,6 +1335,14 @@ case ThreadIsIoPending: + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ThreadInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Raise the IRQL to protect the IRP list */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -1318,9 +1351,6 @@ { /* Check if the IRP list is empty or not */ *(PULONG)ThreadInformation = !IsListEmpty(&Thread->IrpList); - - /* Set the return length*/ - Length = sizeof(ULONG); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009