Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 39473: sync oleaur32_winetest with wine 1.1.14

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 8 02:55:17 2009 New Revision: 39473 URL: http://svn.reactos.org/svn/reactos?rev=39473&view=rev Log: sync oleaur32_winetest with wine 1.1.14 Modified: trunk/rostests/winetests/oleaut32/oleaut32.rbuild 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/typelib.c trunk/rostests/winetests/oleaut32/usrmarshal.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 Feb 8 02:55:17 2009 @@ -5,7 +5,7 @@ <include base="oleaut32_winetest">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="oleaut32_winetest" root="intermediate">.</include> - <define name="__ROS_LONG64__" /> + <define name="__ROS_LONG64__" /> <library>wine</library> <library>oleaut32</library> <library>ole32</library> @@ -16,6 +16,7 @@ <library>kernel32</library> <library>uuid</library> <library>ntdll</library> + <library>tmarshal_interface</library> <file>olefont.c</file> <file>olepicture.c</file> <file>safearray.c</file> @@ -35,6 +36,10 @@ <dependency>stdole2</dependency> <file>tmarshal.idl</file> </module> +<module name="tmarshal_interface" type="idlinterface"> + <dependency>stdole2</dependency> + <file>tmarshal.idl</file> +</module> <module name="test_tlb" type="embeddedtypelib" allowwarnings="true"> <dependency>stdole2</dependency> <file>test_tlb.idl</file> 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 Feb 8 02:55:17 2009 @@ -324,6 +324,7 @@ ULARGE_INTEGER newpos1; LARGE_INTEGER seekto; short type; + DWORD attr; /* Empty image. Happens occasionally in VB programs. */ hglob = GlobalAlloc (0, 8); @@ -346,6 +347,11 @@ hres = IPicture_get_Type (pic, &type); ok (hres == S_OK,"empty picture get type failed with hres 0x%08x\n", hres); ok (type == PICTYPE_NONE,"type is %d, but should be PICTYPE_NONE(0)\n", type); + + attr = 0xdeadbeef; + hres = IPicture_get_Attributes (pic, &attr); + ok (hres == S_OK,"empty picture get attributes failed with hres 0x%08x\n", hres); + ok (attr == 0,"attr is %d, but should be 0\n", attr); hres = IPicture_get_Handle (pic, &handle); ok (hres == S_OK,"empty picture get handle failed with hres 0x%08x\n", hres); @@ -489,7 +495,7 @@ IPicture_Release(pict); } -static void test_apm() +static void test_apm(void) { OLE_HANDLE handle; LPSTREAM stream; @@ -643,6 +649,55 @@ IPicture_Release(pic); ReleaseDC(NULL, hdc); +} + +static void test_get_Attributes(void) +{ + IPicture *pic; + HRESULT hres; + short type; + DWORD attr; + + 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); + + hres = IPicture_get_Attributes(pic, NULL); + ole_expect(hres, E_POINTER); + + attr = 0xdeadbeef; + hres = IPicture_get_Attributes(pic, &attr); + ole_expect(hres, S_OK); + ok(attr == 0, "IPicture_get_Attributes does not reset attr to zero, got %d\n", attr); + + IPicture_Release(pic); +} + +static void test_get_Handle(void) +{ + IPicture *pic; + HRESULT hres; + + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + + hres = IPicture_get_Handle(pic, NULL); + ole_expect(hres, E_POINTER); + + IPicture_Release(pic); +} + +static void test_get_Type(void) +{ + IPicture *pic; + HRESULT hres; + + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + + hres = IPicture_get_Type(pic, NULL); + ole_expect(hres, E_POINTER); + + IPicture_Release(pic); } START_TEST(olepicture) @@ -672,6 +727,9 @@ test_Invoke(); test_OleCreatePictureIndirect(); test_Render(); + test_get_Attributes(); + test_get_Handle(); + test_get_Type(); } @@ -702,11 +760,11 @@ *ppvObject = 0; if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) { - *ppvObject = (IStream*)This; + *ppvObject = This; } if ((*ppvObject)==0) 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 Feb 8 02:55:17 2009 @@ -275,7 +275,7 @@ static void test_safearray(void) { SAFEARRAY *a, b, *c; - unsigned int i; + unsigned int i, diff; LONG indices[2]; HRESULT hres; SAFEARRAYBOUND bound, bounds[2]; @@ -434,19 +434,22 @@ indices[1] = 23; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [1,23], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 8,"ptr difference is not 8, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 8,"ptr difference is not 8, but %d (%p vs %p)\n", diff, ptr2, ptr1); indices[0] = 3; indices[1] = 24; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [5,24], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 176,"ptr difference is not 176, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 176,"ptr difference is not 176, but %d (%p vs %p)\n", diff, ptr2, ptr1); indices[0] = 20; indices[1] = 23; hres = SafeArrayPtrOfIndex(a, indices, (void**)&ptr2); ok(S_OK == hres,"SAPOI failed [20,23], hres 0x%x\n",hres); - ok(ptr2 - ptr1 == 76,"ptr difference is not 76, but %d (%p vs %p)\n", ptr2-ptr1, ptr2, ptr1); + diff = ptr2 - ptr1; + ok(diff == 76,"ptr difference is not 76, but %d (%p vs %p)\n", diff, ptr2, ptr1); hres = SafeArrayUnaccessData(a); ok(S_OK == hres, "SAUAD failed with 0x%x\n", hres); @@ -1271,7 +1274,7 @@ /* Fill the source array with some data; it doesn't matter what */ for (dimension = 0; dimension < size; dimension++) { - int* data = (int*)sa->pvData; + int* data = sa->pvData; data[dimension] = dimension; } @@ -1417,7 +1420,7 @@ /* Win32 doesn't care if GetSize fails */ fail_GetSize = TRUE; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Fail Size) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); @@ -1434,7 +1437,7 @@ iRec->ref = START_REF_COUNT; iRec->sizeCalled = 0; iRec->clearCalled = 0; - sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, (LPVOID)iRec); + sa = pSafeArrayCreateEx(VT_RECORD, 1, sab, iRec); ok(sa != NULL, "CreateEx (Rec) failed\n"); ok(iRec->ref == START_REF_COUNT + 1, "Wrong iRec refcount %d\n", iRec->ref); ok(iRec->sizeCalled == 1, "GetSize called %d times\n", iRec->sizeCalled); 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 Feb 8 02:55:17 2009 @@ -135,7 +135,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) { - struct host_object_data *data = (struct host_object_data *)p; + struct host_object_data *data = p; HRESULT hr; MSG msg; @@ -546,7 +546,7 @@ return S_OK; } -static void WINAPI Widget_Variant( +static HRESULT WINAPI Widget_Variant( IWidget __RPC_FAR * iface, VARIANT var) { @@ -554,9 +554,10 @@ ok(V_VT(&var) == VT_CY, "V_VT(&var) was %d\n", V_VT(&var)); ok(S(V_CY(&var)).Hi == 0xdababe, "V_CY(&var).Hi was 0x%x\n", S(V_CY(&var)).Hi); ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); -} - -static void WINAPI Widget_VarArg( + return S_OK; +} + +static HRESULT WINAPI Widget_VarArg( IWidget * iface, int numexpect, SAFEARRAY * values) @@ -586,9 +587,11 @@ hr = SafeArrayUnaccessData(values); ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); -} - -static void WINAPI Widget_StructArgs( + + return S_OK; +} + +static HRESULT WINAPI Widget_StructArgs( IWidget * iface, MYSTRUCT byval, MYSTRUCT *byptr, @@ -597,6 +600,7 @@ 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"); + return S_OK; } @@ -1102,7 +1106,10 @@ /* call StructArgs (direct) */ mystruct = MYSTRUCT_BYPTR; memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); - IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + hr = IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + todo_wine { + ok_ole_success(hr, IWidget_StructArgs); + } /* call Clone */ dispparams.cNamedArgs = 0; 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 Feb 8 02:55:17 2009 @@ -112,13 +112,13 @@ HRESULT VariantArrayPtr([in] SAFEARRAY(VARIANT) *values); [id(DISPID_TM_VARIANT)] - void Variant([in] VARIANT var); + HRESULT Variant([in] VARIANT var); [vararg, id(DISPID_TM_VARARG)] - void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + HRESULT VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); [id(DISPID_TM_STRUCTARGS)] - void StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); + HRESULT StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); [id(DISPID_TM_ERROR)] HRESULT Error(); 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 Feb 8 02:55:17 2009 @@ -27,11 +27,9 @@ #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); } @@ -401,7 +399,7 @@ ok(pFuncDesc->invkind == methdata[1].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[1].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[1].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 4, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); @@ -412,7 +410,7 @@ ok(pFuncDesc->invkind == methdata[2].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[2].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[2].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 12, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == 3 * sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_HRESULT, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ok(pFuncDesc->lprgelemdescParam[0].tdesc.vt == VT_I4, "parm 0 vt %x\n", pFuncDesc->lprgelemdescParam[0].tdesc.vt); @@ -425,7 +423,7 @@ ok(pFuncDesc->invkind == methdata[3].wFlags, "invkind %d\n", pFuncDesc->invkind); ok(pFuncDesc->callconv == methdata[3].cc, "callconv %d\n", pFuncDesc->callconv); ok(pFuncDesc->cParams == methdata[3].cArgs, "cParams %d\n", pFuncDesc->cParams); - ok(pFuncDesc->oVft == 16, "oVft %d\n", pFuncDesc->oVft); + ok(pFuncDesc->oVft == 4 * sizeof(void *), "oVft %d\n", pFuncDesc->oVft); ok(pFuncDesc->wFuncFlags == 0, "oVft %d\n", pFuncDesc->wFuncFlags); ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); @@ -651,7 +649,7 @@ BSTR path; status = UuidCreate(&uid); - ok(!status || status == RPC_S_UUID_LOCAL_ONLY, "UuidCreate error %08lx\n", status); + ok(!status || status == RPC_S_UUID_LOCAL_ONLY, "UuidCreate error %08x\n", status); StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ @@ -705,7 +703,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 6, "cfuncs %d\n", pTA->cFuncs); @@ -727,7 +725,7 @@ hr = ITypeInfo_GetFuncDesc(pTI, 5, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 20, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -740,7 +738,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -770,7 +768,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); if(use_midl_tlb) { ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); } @@ -801,7 +799,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "typeflags %x\n", pTA->wTypeFlags); ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); @@ -829,7 +827,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 3, "cfuncs %d\n", pTA->cFuncs); @@ -853,7 +851,7 @@ hr = ITypeInfo_GetFuncDesc(pTI, 2, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60010000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 8, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 2 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -865,7 +863,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 28, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 10, "cfuncs %d\n", pTA->cFuncs); @@ -887,7 +885,7 @@ hr = ITypeInfo_GetFuncDesc(pTI, 9, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x1236, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 36, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 9 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); @@ -900,7 +898,7 @@ hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); ok(pTA->typekind == TKIND_INTERFACE, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 24, "sizevft %d\n", pTA->cbSizeVft); + ok(pTA->cbSizeVft == 6 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); ok(pTA->wTypeFlags == 0, "typeflags %x\n", pTA->wTypeFlags); if(use_midl_tlb) { ok(pTA->cFuncs == 1, "cfuncs %d\n", pTA->cFuncs); @@ -913,7 +911,7 @@ hr = ITypeInfo_GetFuncDesc(pTI, 0, &pFD); ok(hr == S_OK, "hr %08x\n", hr); ok(pFD->memid == 0x60020000, "memid %08x\n", pFD->memid); - ok(pFD->oVft == 20, "oVft %d\n", pFD->oVft); + ok(pFD->oVft == 5 * sizeof(void *), "oVft %d\n", pFD->oVft); ITypeInfo_ReleaseFuncDesc(pTI, pFD); } ITypeInfo_Release(pTI); 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 Feb 8 02:55:17 2009 @@ -154,7 +154,7 @@ { GUID guid; SafeArrayGetIID(lpsa, &guid); - ok(IsEqualGUID(&guid, (GUID*)wiresa), "guid mismatch\n"); + ok(IsEqualGUID(&guid, wiresa), "guid mismatch\n"); wiresa += sizeof(GUID); } ok(!memcmp(wiresa, lpsa->rgsabound, sizeof(lpsa->rgsabound[0]) * lpsa->cDims), "bounds mismatch\n"); @@ -444,7 +444,7 @@ if (IsEqualIID(riid, &IID_IUnknown)) { IUnknown_AddRef(iface); - *ppv = (LPVOID)iface; + *ppv = iface; return S_OK; } *ppv = NULL; 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 Feb 8 02:55:17 2009 @@ -2838,7 +2838,7 @@ S1(U1(*pdec)).Mid32 = 0; S1(U1(*pdec)).Lo32 = 1; hres = pVarFix(&v,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&v, &vDst, sizeof(v)), + ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&V_DECIMAL(&v), &V_DECIMAL(&vDst), sizeof(DECIMAL)), "VarFix: expected 0x0,%d,identical, got 0x%X,%d\n", VT_DECIMAL, hres, V_VT(&vDst)); @@ -2953,7 +2953,7 @@ S1(U1(*pdec)).Mid32 = 0; S1(U1(*pdec)).Lo32 = 1; hres = pVarInt(&v,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&v, &vDst, sizeof(v)), + ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && !memcmp(&V_DECIMAL(&v), &V_DECIMAL(&vDst), sizeof(DECIMAL)), "VarInt: expected 0x0,%d,identical, got 0x%X,%d\n", VT_DECIMAL, hres, V_VT(&vDst)); 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 Feb 8 02:55:17 2009 @@ -554,7 +554,7 @@ } if (*ppvObject) { - DummyDispatch_AddRef((IDispatch*)*ppvObject); + DummyDispatch_AddRef(*ppvObject); return S_OK; } } @@ -5060,7 +5060,7 @@ BSTR str = GetBSTR(&bstr); bstr.dwLen = 0; - ok (SysStringByteLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringLen(str)); + ok (SysStringByteLen(str) == 0, "Expected dwLen 0, got %d\n", SysStringByteLen(str)); bstr.dwLen = 2; ok (SysStringByteLen(str) == 2, "Expected dwLen 2, got %d\n", SysStringByteLen(str)); } @@ -5452,12 +5452,12 @@ /* =>IDispatch */ u.ref = 1; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); hres = VariantChangeTypeEx(&vDst, &vSrc, lcid, 0, VT_UNKNOWN); /* Note vSrc is not cleared, as final refcount is 2 */ ok(hres == S_OK && u.ref == 2 && - V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == (IUnknown*)pu, + V_VT(&vDst) == VT_UNKNOWN && V_UNKNOWN(&vDst) == pu, "change unk(src,dst): expected 0x%08x,%d,%d,%p, got 0x%08x,%d,%d,%p\n", S_OK, 2, VT_UNKNOWN, pu, hres, u.ref, V_VT(&vDst), V_UNKNOWN(&vDst)); @@ -5467,7 +5467,7 @@ HRESULT hExpected = DISP_E_BADVARTYPE; V_VT(&vSrc) = VT_UNKNOWN; - V_UNKNOWN(&vSrc) = (IUnknown*)pu; + V_UNKNOWN(&vSrc) = pu; VariantInit(&vDst); if (vt == VT_UNKNOWN || vt == VT_DISPATCH || vt == VT_EMPTY || vt == VT_NULL)

16 years, 5 months

[cwittich] 39472: add new module type IdlInterface

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 8 02:54:47 2009 New Revision: 39472 URL: http://svn.reactos.org/svn/reactos?rev=39472&view=rev Log: add new module type IdlInterface Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -58,6 +58,7 @@ { HostFalse, "", "", "-nostartfiles -nostdlib" }, // BootProgram { HostFalse, "", "", "" }, // Win32SCR { HostFalse, "", "", "" }, // IdlHeader + { HostFalse, "", "", "" }, // IdlInterface { HostFalse, "", "", "" }, // IsoRegTest { HostFalse, "", "", "" }, // LiveIsoRegTest { HostFalse, "", "", "" }, // EmbeddedTypeLib Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -173,6 +173,7 @@ case RpcProxy: case MessageHeader: case IdlHeader: + case IdlInterface: case EmbeddedTypeLib: case BootSector: handler = new MingwModuleHandler( module ); @@ -301,6 +302,8 @@ return true; if ( module.type == IdlHeader ) return true; + if ( module.type == IdlInterface ) + return true; if ( module.type == MessageHeader) return true; return false; @@ -428,6 +431,8 @@ newExtension = "_c.o"; else if ( module.type == RpcProxy ) newExtension = "_p.o"; + else if ( module.type == IdlInterface ) + newExtension = "_i.o"; else newExtension = ".h"; } @@ -1053,7 +1058,7 @@ "$(intermediate_path_noext).a", "$(intermediate_dir)$(SEP)", NULL ); Rule arRule2 ( "\t$(ECHO_AR)\n" - "\t${ar} -rc $@ $($(module_name)_OBJS)\n", + "\t${ar} -rc $@ $($(module_name)_OBJS) \n", NULL ); Rule arHostRule2 ( "\t$(ECHO_HOSTAR)\n" "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", @@ -1161,11 +1166,21 @@ "$(intermediate_path_unique).stubs.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext).h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext).h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext).h $(source)\n", "$(intermediate_path_noext).h", "$(intermediate_dir)$(SEP)", NULL ); +Rule widlInterfaceRule ( "$(source): ${$(module_name)_precondition}\n" + "$(intermediate_path_noext)_i.c: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "\t$(ECHO_WIDL)\n" + "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -u -U $(intermediate_path_noext)_i.c $(source)\n" + "$(intermediate_path_noext)_i.o: $(intermediate_path_noext)_i.c $(dependencies) | $(intermediate_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", + "$(intermediate_path_noext)_i.c", + "$(intermediate_path_noext)_i.o", + "$(intermediate_dir)$(SEP)", NULL ); Rule widlServerRule ( "$(source): ${$(module_name)_precondition}\n" "$(intermediate_path_noext)_s.c $(intermediate_path_noext)_s.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" @@ -1185,7 +1200,7 @@ "$(intermediate_path_noext)_s.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_c.c $(intermediate_path_noext)_c.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_c.h -c -C $(intermediate_path_noext)_c.c $(source)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1203,7 +1218,7 @@ "$(intermediate_path_noext)_c.o.d", "$(intermediate_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_p.h -p -P $(intermediate_path_noext)_p.c $(source)\n" "ifeq ($(ROS_BUILDDEPS),full)\n" @@ -1235,7 +1250,7 @@ "$(intermediate_path_noext).o", "$(intermediate_path_noext).o.d", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_dir)$(SEP)$(module_name).tlb: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" + "$(intermediate_dir)$(SEP)$(module_name).tlb: $(source) $(dependencies) $(WIDL_TARGET) | $(intermediate_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", "$(intermediate_dir)$(SEP)", NULL ); @@ -1251,7 +1266,7 @@ "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(intermediate_path_unique).o: $(source) $(dependencies) | $(intermediate_dir)\n" + "$(intermediate_path_unique).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_HOSTCC)\n" "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); @@ -1375,6 +1390,7 @@ { HostDontCare, RpcServer, ".idl", &widlServerRule }, { HostDontCare, RpcClient, ".idl", &widlClientRule }, { HostDontCare, RpcProxy, ".idl", &widlProxyRule }, + { HostDontCare, IdlInterface, ".idl", &widlInterfaceRule }, { HostDontCare, EmbeddedTypeLib, ".idl", &widlTlbRule }, { HostDontCare, TypeDontCare, ".idl", &widlHeaderRule }, { HostTrue, TypeDontCare, ".c", &gccHostRule }, Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -71,6 +71,7 @@ case RpcProxy: case Alias: case IdlHeader: + case IdlInterface: case MessageHeader: case EmbeddedTypeLib: case ElfExecutable: Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/include.cpp [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -121,7 +121,8 @@ ( module->type == RpcServer || module->type == RpcClient || module->type == RpcProxy || - module->type == IdlHeader) ) + module->type == IdlHeader || + module->type == IdlInterface) ) return IntermediateDirectory; else return SourceDirectory; Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -941,6 +941,8 @@ return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; + if ( attribute.value == "idlinterface" ) + return IdlInterface; if ( attribute.value == "embeddedtypelib" ) return EmbeddedTypeLib; if ( attribute.value == "elfexecutable" ) @@ -991,6 +993,7 @@ case RpcProxy: case Alias: case IdlHeader: + case IdlInterface: case MessageHeader: return IntermediateDirectory; case TypeDontCare: @@ -1047,6 +1050,7 @@ case RpcServer: case RpcClient: case RpcProxy: + case IdlInterface: return ".o"; case Alias: case ElfExecutable: @@ -1112,6 +1116,7 @@ case Alias: case BootProgram: case IdlHeader: + case IdlInterface: case MessageHeader: case ElfExecutable: case EmbeddedTypeLib: @@ -1164,6 +1169,7 @@ case Alias: case BootProgram: case IdlHeader: + case IdlInterface: case MessageHeader: case EmbeddedTypeLib: case Cabinet: @@ -1220,6 +1226,7 @@ case Alias: case BootProgram: case IdlHeader: + case IdlInterface: case MessageHeader: case EmbeddedTypeLib: case Cabinet: @@ -1276,6 +1283,7 @@ case RpcProxy: case Alias: case IdlHeader: + case IdlInterface: case MessageHeader: case EmbeddedTypeLib: case ElfExecutable: Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sun Feb 8 02:54:47 2009 @@ -298,6 +298,7 @@ BootProgram, Win32SCR, IdlHeader, + IdlInterface, IsoRegTest, LiveIsoRegTest, EmbeddedTypeLib,

16 years, 5 months

[tkreuzer] 39470: #if out some "strange" __ROS_LONG64__ definition for (U)INT_PTR, as it doesn't make sense and breaks other code. The whole __ROS_LONG64__ hack should be improved by ... being removed.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 21:40:38 2009 New Revision: 39470 URL: http://svn.reactos.org/svn/reactos?rev=39470&view=rev Log: #if out some "strange" __ROS_LONG64__ definition for (U)INT_PTR, as it doesn't make sense and breaks other code. The whole __ROS_LONG64__ hack should be improved by ... being removed. Modified: trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Sat Feb 7 21:40:38 2009 @@ -99,10 +99,10 @@ { return( (void*)(ULONG_PTR)ul ); } #endif /* !__midl */ #else /* !_WIN64 */ -#if !defined(__ROS_LONG64__) +#if 1// !defined(__ROS_LONG64__) typedef int INT_PTR, *PINT_PTR; typedef unsigned int UINT_PTR, *PUINT_PTR; -#else +#else // WTF??? HACK of break typedef long INT_PTR, *PINT_PTR; typedef unsigned long UINT_PTR, *PUINT_PTR; #endif

16 years, 5 months

[tkreuzer] 39469: According to msdn CryptReleaseContext returns 0 on error. but INVALID_HANDLE_VALUE is -1, go back to original code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 21:27:01 2009 New Revision: 39469 URL: http://svn.reactos.org/svn/reactos?rev=39469&view=rev Log: According to msdn CryptReleaseContext returns 0 on error. but INVALID_HANDLE_VALUE is -1, go back to original code Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sat Feb 7 21:27:01 2009 @@ -454,7 +454,7 @@ Service = ScLookupServiceByServiceName((LPWSTR)lpServiceName); if (Service == NULL) { - return INVALID_HANDLE_VALUE; + return (SERVICE_STATUS_HANDLE)NULL; } Service->HandlerFunction = lpHandlerProc;

16 years, 5 months

[tkreuzer] 39468: fix some definitions in mmsystem.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 21:10:23 2009 New Revision: 39468 URL: http://svn.reactos.org/svn/reactos?rev=39468&view=rev Log: fix some definitions in mmsystem.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Sat Feb 7 21:10:23 2009 @@ -951,7 +951,7 @@ DWORD dnDevNode; } DRVCONFIGINFOEX,*PDRVCONFIGINFOEX,*LPDRVCONFIGINFOEX; -typedef LONG(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LONG,LONG); +typedef LRESULT (CALLBACK* DRIVERPROC)(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD); typedef DRVCALLBACK *LPDRVCALLBACK; typedef DRVCALLBACK *PDRVCALLBACK; @@ -1642,7 +1642,7 @@ LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG); HMODULE WINAPI DrvGetModuleHandle(HDRVR); HMODULE WINAPI GetDriverModuleHandle(HDRVR); -LONG WINAPI DefDriverProc(DWORD,HDRVR,UINT,LONG,LONG); +LRESULT WINAPI DefDriverProc(DWORD_PTR,HDRVR,UINT,LPARAM,LPARAM); UINT WINAPI mmsystemGetVersion(void); #define OutputDebugStr OutputDebugString BOOL WINAPI sndPlaySoundA(LPCSTR,UINT); @@ -1671,7 +1671,13 @@ MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD); MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT); -DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR); +#if (WINVER >= 0x030a) +#ifdef _WIN32 +MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR); +#else +DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD); +#endif +#endif UINT WINAPI waveInGetNumDevs(void); MMRESULT WINAPI waveInGetDevCapsA(UINT_PTR,LPWAVEINCAPSA,UINT); MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT); @@ -1687,7 +1693,13 @@ MMRESULT WINAPI waveInReset(HWAVEIN); MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT); MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT); -DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR); +#if (WINVER >= 0x030a) +#ifdef _WIN32 +MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR); +#else +DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD); +#endif +#endif UINT WINAPI midiOutGetNumDevs(void); MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiStreamClose(HMIDISTRM); @@ -1715,7 +1727,13 @@ MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT); -DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR); +#if (WINVER >= 0x030a) +#ifdef _WIN32 +MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR); +#else +DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD); +#endif +#endif UINT WINAPI midiInGetNumDevs(void); MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR,LPMIDIINCAPSA,UINT); MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); @@ -1730,7 +1748,13 @@ MMRESULT WINAPI midiInStop(HMIDIIN); MMRESULT WINAPI midiInReset(HMIDIIN); MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT); -DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR); +#if (WINVER >= 0x030a) +#ifdef _WIN32 +MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR); +#else +DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD); +#endif +#endif UINT WINAPI auxGetNumDevs(void); MMRESULT WINAPI auxGetDevCapsA(UINT_PTR,LPAUXCAPSA,UINT); MMRESULT WINAPI auxGetDevCapsW(UINT_PTR,LPAUXCAPSW,UINT); @@ -1799,7 +1823,7 @@ BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT); BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT); BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); -HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID); +HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); typedef struct tagMCI_SEQ_SET_PARMS {

16 years, 5 months

[tkreuzer] 39467: Add InitializeSListHead and QueryDepthSList to winbase.h Remove QueryDepthSList from winddk.h Fix definion of ExQueryDepthSList in winddk.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Feb 7 17:46:56 2009 New Revision: 39467 URL: http://svn.reactos.org/svn/reactos?rev=39467&view=rev Log: Add InitializeSListHead and QueryDepthSList to winbase.h Remove QueryDepthSList from winddk.h Fix definion of ExQueryDepthSList in winddk.h Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/winbase.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] Sat Feb 7 17:46:56 2009 @@ -6510,14 +6510,6 @@ #endif -/* - * USHORT - * QueryDepthSList( - * IN PSLIST_HEADER SListHead) - */ -#define QueryDepthSList(_SListHead) \ - ((USHORT) ((_SListHead)->Alignment & 0xffff)) - #define InterlockedFlushSList(ListHead) ExInterlockedFlushSList(ListHead) NTSYSAPI @@ -7621,7 +7613,22 @@ IN PVOID P, IN ULONG Tag); -#define ExQueryDepthSList(ListHead) QueryDepthSList(ListHead) +#if defined (_WIN64) +#if defined(_NTDRIVER_) || defined(_NTDDK) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_) +NTKRNLAPI +USHORT +ExQueryDepthSList(IN PSLIST_HEADER Listhead); +#else +FORCEINLINE +USHORT +ExQueryDepthSList(IN PSLIST_HEADER Listhead) +{ + return (USHORT)(ListHead->Alignment & 0xffff); +} +#endif +#else +#define ExQueryDepthSList(listhead) (listhead)->Depth +#endif static __inline VOID ExFreeToNPagedLookasideList( Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Feb 7 17:46:56 2009 @@ -1772,6 +1772,9 @@ #endif // !(defined (_M_AMD64) || defined (_M_IA64)) +VOID WINAPI InitializeSListHead(PSLIST_HEADER); +USHORT WINAPI QueryDepthSList(PSLIST_HEADER); + #if !defined(InterlockedAnd) #define InterlockedAnd InterlockedAnd_Inline FORCEINLINE

16 years, 5 months

[mjmartin] 39466: - Default ExitStatus for a process is STATUS_PENDING aka STILL_ACTIVE. Fixes bug #3135.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Feb 7 16:48:51 2009 New Revision: 39466 URL: http://svn.reactos.org/svn/reactos?rev=39466&view=rev Log: - Default ExitStatus for a process is STATUS_PENDING aka STILL_ACTIVE. Fixes bug #3135. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Feb 7 16:48:51 2009 @@ -554,7 +554,7 @@ Process->SectionObject = SectionObject; /* Set default exit code */ - Process->ExitStatus = STATUS_TIMEOUT; + Process->ExitStatus = STATUS_PENDING; /* Check if this is the initial process being built */ if (Parent)

16 years, 5 months

[dgorbachev] 39465: Do not crash the kernel when accessing a guard page.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat Feb 7 13:29:39 2009 New Revision: 39465 URL: http://svn.reactos.org/svn/reactos?rev=39465&view=rev Log: Do not crash the kernel when accessing a guard page. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Feb 7 13:29:39 2009 @@ -287,10 +287,19 @@ Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.VirtualMemoryData.RegionListHead, Address, NULL); + if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) { return(STATUS_ACCESS_VIOLATION); } + + /* + * FIXME + */ + if (Region->Protect & PAGE_GUARD) + { + return(STATUS_GUARD_PAGE_VIOLATION); + } /* * Get or create a page operation

16 years, 5 months

[dchapyshev] 39464: - Implement SetupChangeLocale - Add stub for SetupChangeLocaleEx

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Feb 7 12:33:35 2009 New Revision: 39464 URL: http://svn.reactos.org/svn/reactos?rev=39464&view=rev Log: - Implement SetupChangeLocale - Add stub for SetupChangeLocaleEx Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/syssetup.def Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sat Feb 7 12:33:35 2009 @@ -997,3 +997,27 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/* + * @unimplemented + */ +DWORD WINAPI +SetupChangeLocaleEx(HWND hWnd, + LCID Lcid, + LPCWSTR lpSrcRootPath, + char Unknown, + DWORD dwUnused1, + DWORD dwUnused2) +{ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @implemented + */ +DWORD WINAPI +SetupChangeLocale(HWND hWnd, LCID Lcid) +{ + return SetupChangeLocaleEx(hWnd, Lcid, NULL, 0, 0, 0); +} Modified: trunk/reactos/dll/win32/syssetup/syssetup.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.def [iso-8859-1] Sat Feb 7 12:33:35 2009 @@ -19,7 +19,8 @@ ;ReportError ;ScsiClassInstaller SetupChangeFontSize@8 -;SetupChangeLocale +SetupChangeLocale@8 +SetupChangeLocaleEx@24 ;SetupCreateOptionalComponentsPage ;SetupInfObjectInstallActionW ;SetupSetLargeDialogFont

16 years, 5 months

[dchapyshev] 39463: - Stub implement DeleteProfileA/W

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Feb 7 12:31:01 2009 New Revision: 39463 URL: http://svn.reactos.org/svn/reactos?rev=39463&view=rev Log: - Stub implement DeleteProfileA/W Modified: trunk/reactos/dll/win32/userenv/profile.c trunk/reactos/dll/win32/userenv/userenv.def Modified: trunk/reactos/dll/win32/userenv/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/profile.… ============================================================================== --- trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/profile.c [iso-8859-1] Sat Feb 7 12:31:01 2009 @@ -1134,4 +1134,22 @@ return TRUE; } +BOOL WINAPI +DeleteProfileW(LPCWSTR lpSidString, + LPCWSTR lpProfilePath, + LPCWSTR lpComputerName) +{ + DPRINT1("DeleteProfileW() not implemented!\n"); + return FALSE; +} + +BOOL WINAPI +DeleteProfileA(LPCSTR lpSidString, + LPCSTR lpProfilePath, + LPCSTR lpComputerName) +{ + DPRINT1("DeleteProfileA() not implemented!\n"); + return FALSE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/userenv/userenv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.def [iso-8859-1] Sat Feb 7 12:31:01 2009 @@ -17,6 +17,8 @@ AddDesktopItemW@32 @114 NONAME DeleteDesktopItemA@8 @115 NONAME DeleteDesktopItemW@8 @116 NONAME +DeleteProfileW@12 +DeleteProfileA@12 CreateEnvironmentBlock@12 DestroyEnvironmentBlock@4 EnterCriticalPolicySection@4

16 years, 5 months

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