Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 32258: Finsh ks.h header time to test it in trunk before it merges down
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 15:58:54 2008 New Revision: 32258 URL: http://svn.reactos.org/svn/reactos?rev=32258&view=rev Log: Finsh ks.h header time to test it in trunk before it merges down Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h (original) +++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 15:58:54 2008 @@ -3281,6 +3281,204 @@ KSDDKAPI KSOBJECTTYPE NTAPI KsGetObjectTypeFromFileObject(IN PFILE_OBJECT FileObject); + + KSDDKAPI PKSGATE NTAPI + KsFilterGetAndGate(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterAcquireProcessingMutex(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterReleaseProcessingMutex(IN PKSFILTER Filter); + + KSDDKAPI void NTAPI + KsFilterAttemptProcessing(IN PKSFILTER Filter, + IN BOOLEAN Asynchronous); + + KSDDKAPI PKSGATE NTAPI + KsPinGetAndGate(IN PKSPIN Pin); + + KSDDKAPI void NTAPI + KsPinAttachAndGate(IN PKSPIN Pin, + IN PKSGATE AndGate OPTIONAL); + + KSDDKAPI void NTAPI + KsPinAttachOrGate(IN PKSPIN Pin, + IN PKSGATE OrGate OPTIONAL); + + KSDDKAPI void NTAPI + KsPinAcquireProcessingMutex(IN PKSPIN Pin); + + KSDDKAPI void NTAPI + KsPinReleaseProcessingMutex(IN PKSPIN Pin); + + KSDDKAPI BOOLEAN NTAPI + KsProcessPinUpdate(IN PKSPROCESSPIN ProcessPin); + + KSDDKAPI void NTAPI + KsPinGetCopyRelationships(IN PKSPIN Pin, + OUT PKSPIN* CopySource, + OUT PKSPIN* DelegateBranch); + + KSDDKAPI void NTAPI + KsPinAttemptProcessing(IN PKSPIN Pin, + IN BOOLEAN Asynchronous); + + KSDDKAPI PVOID NTAPI + KsGetParent(IN PVOID Object); + + KSDDKAPI PKSFILTER NTAPI + KsPinGetParentFilter(IN PKSPIN Pin); + + KSDDKAPI PVOID NTAPI + KsGetFirstChild(IN PVOID Object); + + KSDDKAPI ULONG NTAPI + KsFilterGetChildPinCount(IN PKSFILTER Filter, + IN ULONG PinId); + + KSDDKAPI PKSPIN NTAPI + KsFilterGetFirstChildPin(IN PKSFILTER Filter, + IN ULONG PinId); + + KSDDKAPI PVOID NTAPI + KsGetNextSibling(IN PVOID Object); + + KSDDKAPI PKSPIN NTAPI + KsPinGetNextSiblingPin(IN PKSPIN Pin); + + KSDDKAPI PKSDEVICE NTAPI + KsGetDevice(IN PVOID Object); + + KSDDKAPI PKSFILTER NTAPI + KsGetFilterFromIrp(IN PIRP Irp); + + KSDDKAPI PKSPIN NTAPI + KsGetPinFromIrp(IN PIRP Irp); + + KSDDKAPI ULONG NTAPI + KsGetNodeIdFromIrp(IN PIRP Irp); + + KSDDKAPI void NTAPI + KsAcquireControl(IN PVOID Object); + + KSDDKAPI void NTAPI + KsReleaseControl(IN PVOID Object); + + KSDDKAPI NTSTATUS NTAPI + KsAddItemToObjectBag(IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL); + + KSDDKAPI ULONG NTAPI + KsRemoveItemFromObjectBag(IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN BOOLEAN Free); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateObjectBag(IN PKSDEVICE Device, + OUT KSOBJECT_BAG* ObjectBag); + + KSDDKAPI void NTAPI + KsFreeObjectBag(IN KSOBJECT_BAG ObjectBag); + + KSDDKAPI NTSTATUS NTAPI + KsCopyObjectBagItems(IN KSOBJECT_BAG ObjectBagDestination, + IN KSOBJECT_BAG ObjectBagSource); + + KSDDKAPI NTSTATUS NTAPI + _KsEdit(IN KSOBJECT_BAG ObjectBag, + IN OUT PVOID* PointerToPointerToItem, + IN ULONG NewSize, + IN ULONG OldSize, + IN ULONG Tag); + + KSDDKAPI NTSTATUS NTAPI + KsRegisterFilterWithNoKSPins(IN PDEVICE_OBJECT DeviceObject, + IN const GUID * InterfaceClassGUID, + IN ULONG PinCount, + IN BOOL * PinDirection, + IN KSPIN_MEDIUM * MediumList, + IN OPTIONAL GUID * CategoryList); + + KSDDKAPI NTSTATUS NTAPI + KsFilterCreatePinFactory (IN PKSFILTER Filter, + IN const KSPIN_DESCRIPTOR_EX *const PinDescriptor, + OUT PULONG PinID); + + KSDDKAPI NTSTATUS NTAPI + KsFilterCreateNode (IN PKSFILTER Filter, + IN const KSNODE_DESCRIPTOR *const NodeDescriptor, + OUT PULONG NodeID); + + KSDDKAPI NTSTATUS NTAPI + KsFilterAddTopologyConnections (IN PKSFILTER Filter, + IN ULONG NewConnectionsCount, + IN const KSTOPOLOGY_CONNECTION *const NewTopologyConnections); + + KSDDKAPI NTSTATUS NTAPI + KsPinGetConnectedPinInterface(IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface); + + KSDDKAPI PFILE_OBJECT NTAPI + KsPinGetConnectedPinFileObject(IN PKSPIN Pin); + + KSDDKAPI PDEVICE_OBJECT NTAPI + KsPinGetConnectedPinDeviceObject(IN PKSPIN Pin); + + KSDDKAPI NTSTATUS NTAPI + KsPinGetConnectedFilterInterface(IN PKSPIN Pin, + IN const GUID* InterfaceId, + OUT PVOID* Interface); + + KSDDKAPI VOID NTAPI + KsPinSetPinClockTime(IN PKSPIN Pin, + IN LONGLONG Time); + + KSDDKAPI NTSTATUS NTAPI + KsPinSubmitFrame(IN PKSPIN Pin, + IN PVOID Data OPTIONAL, + IN ULONG Size OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsPinSubmitFrameMdl(IN PKSPIN Pin, + IN PMDL Mdl OPTIONAL, + IN PKSSTREAM_HEADER StreamHeader OPTIONAL, + IN PVOID Context OPTIONAL); + + KSDDKAPI void NTAPI + KsPinRegisterFrameReturnCallback(IN PKSPIN Pin, + IN PFNKSPINFRAMERETURN FrameReturn); + + KSDDKAPI void NTAPI + KsPinRegisterIrpCompletionCallback(IN PKSPIN Pin, + IN PFNKSPINIRPCOMPLETION IrpCompletion); + + KSDDKAPI void NTAPI + KsPinRegisterHandshakeCallback(IN PKSPIN Pin, + IN PFNKSPINHANDSHAKE Handshake); + + KSDDKAPI void NTAPI + KsFilterRegisterPowerCallbacks(IN PKSFILTER Filter, + IN PFNKSFILTERPOWER Sleep OPTIONAL, + IN PFNKSFILTERPOWER Wake OPTIONAL); + + KSDDKAPI void NTAPI + KsPinRegisterPowerCallbacks(IN PKSPIN Pin, + IN PFNKSPINPOWER Sleep OPTIONAL, + IN PFNKSPINPOWER Wake OPTIONAL); + + #define KsDispatchFastWriteFailure KsDispatchFastReadFailure + #define KsDeleteFilterFactory(FilterFactory) KsFreeObjectCreateItemsByContext(\ + *(KSDEVICE_HEADER *)(KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension), FilterFactory) + + #define KsEdit(Object,PointerToPointer,Tag) _KsEdit((Object)->Bag, (PVOID*)(PointerToPointer), sizeof(**(PointerToPointer)), sizeof(**(PointerToPointer)), (Tag)) + #define KsEditSized(Object,PointerToPointer,NewSize,OldSize,Tag) _KsEdit((Object)->Bag,(PVOID*)(PointerToPointer),(NewSize),(OldSize),(Tag)) + + #define KsDiscard(Object,Pointer) KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE) void _inline KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) @@ -3306,18 +3504,160 @@ KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - - - - - - - - -#define KsDispatchFastWriteFailure KsDispatchFastReadFailure -#define KsDeleteFilterFactory(FilterFactory) KsFreeObjectCreateItemsByContext(\ - *(KSDEVICE_HEADER *)(KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension), FilterFactory) - + PKSFILTER __inline KsGetFilterFromFileObject(IN PFILE_OBJECT FileObject) + { + return (PKSFILTER) KsGetObjectFromFileObject(FileObject); + } + + PKSPIN __inline KsGetPinFromFileObject(IN PFILE_OBJECT FileObject) + { + return (PKSPIN) KsGetObjectFromFileObject(FileObject); + } + + PKSDEVICE __inline KsFilterFactoryGetParentDevice(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSDEVICE) KsGetParent((PVOID) FilterFactory); + } + + PKSFILTERFACTORY __inline KsFilterGetParentFilterFactory(IN PKSFILTER Filter) + { + return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter); + } + + PKSFILTERFACTORY __inline KsDeviceGetFirstChildFilterFactory(IN PKSDEVICE Device) + { + return (PKSFILTERFACTORY) KsGetFirstChild((PVOID) Device); + } + + PKSFILTER __inline KsFilterFactoryGetFirstChildFilter(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSFILTER) KsGetFirstChild((PVOID) FilterFactory); + } + + + PKSFILTERFACTORY __inline KsFilterFactoryGetNextSiblingFilterFactory(IN PKSFILTERFACTORY FilterFactory) + { + return (PKSFILTERFACTORY) KsGetNextSibling((PVOID) FilterFactory); + } + + PKSFILTER __inline KsFilterGetNextSiblingFilter(IN PKSFILTER Filter) + { + return (PKSFILTER) KsGetNextSibling((PVOID) Filter); + } + + PKSDEVICE __inline KsFilterFactoryGetDevice(IN PKSFILTERFACTORY FilterFactory) + { + return KsGetDevice((PVOID) FilterFactory); + } + + PKSDEVICE __inline KsFilterGetDevice(IN PKSFILTER Filter) + { + return KsGetDevice((PVOID) Filter); + } + + PKSDEVICE __inline KsPinGetDevice(IN PKSPIN Pin) + { + return KsGetDevice((PVOID) Pin); + } + + void __inline KsFilterAcquireControl(IN PKSFILTER Filter) + { + KsAcquireControl((PVOID) Filter); + } + + void __inline KsFilterReleaseControl(IN PKSFILTER Filter) + { + KsReleaseControl((PVOID) Filter); + } + + void __inline KsPinAcquireControl(IN PKSPIN Pin) + { + KsAcquireControl((PVOID) Pin); + } + + void __inline KsPinReleaseControl(IN PKSPIN Pin) + { + KsReleaseControl((PVOID) Pin); + } + + #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + + KSDDKAPI NTSTATUS NTAPI + KsPinGetReferenceClockInterface(IN PKSPIN Pin, + OUT PIKSREFERENCECLOCK* Interface); + + KSDDKAPI PUNKNOWN NTAPI + KsRegisterAggregatedClientUnknown(IN PVOID Object, + IN PUNKNOWN ClientUnknown); + + KSDDKAPI PUNKNOWN NTAPI + KsGetOuterUnknown(IN PVOID Object); + + PUNKNOWN __inline KsDeviceRegisterAggregatedClientUnknown(IN PKSDEVICE Device, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) Device,ClientUnknown); + } + + PUNKNOWN __inline KsDeviceGetOuterUnknown(IN PKSDEVICE Device) + { + return KsGetOuterUnknown((PVOID) Device); + } + + PUNKNOWN __inline KsFilterFactoryRegisterAggregatedClientUnknown(IN PKSFILTERFACTORY FilterFactory, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) FilterFactory,ClientUnknown); + } + + PUNKNOWN __inline KsFilterFactoryGetOuterUnknown(IN PKSFILTERFACTORY FilterFactory) + { + return KsGetOuterUnknown((PVOID) FilterFactory); + } + + PUNKNOWN __inline KsFilterRegisterAggregatedClientUnknown(IN PKSFILTER Filter, IN PUNKNOWN ClientUnknown) + { + return KsRegisterAggregatedClientUnknown((PVOID) Filter,ClientUnknown); + } + + PUNKNOWN __inline KsFilterGetOuterUnknown(IN PKSFILTER Filter) + { + return KsGetOuterUnknown((PVOID) Filter); + } + + PUNKNOWN __inline KsPinRegisterAggregatedClientUnknown(IN PKSPIN Pin, IN PUNKNOWN ClientUnknown ) + { + return KsRegisterAggregatedClientUnknown((PVOID) Pin,ClientUnknown); + } + + PUNKNOWN __inline KsPinGetOuterUnknown(IN PKSPIN Pin) + { + return KsGetOuterUnknown((PVOID) Pin); + } + #endif +#else + #if !defined( KS_NO_CREATE_FUNCTIONS ) + + KSDDKAPI DWORD WINAPI + KsCreateAllocator(IN HANDLE ConnectionHandle, + IN PKSALLOCATOR_FRAMING AllocatorFraming, + OUT PHANDLE AllocatorHandle); + + KSDDKAPI DWORD NTAPI + KsCreateClock(IN HANDLE ConnectionHandle, + IN PKSCLOCK_CREATE ClockCreate, + OUT PHANDLE ClockHandle); + + KSDDKAPI DWORD WINAPI + KsCreatePin(IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + + KSDDKAPI DWORD WINAPI + KsCreateTopologyNode(IN HANDLE ParentHandle, + IN PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle); + #endif #endif @@ -3327,4 +3667,8 @@ } #endif +#define DENY_USERMODE_ACCESS( pIrp, CompleteRequest ) if ( pIrp->RequestorMode != KernelMode ) { pIrp->IoStatus.Information = 0; \ + pIrp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; if ( CompleteRequest ) IoCompleteRequest ( pIrp, IO_NO_INCREMENT ); \ + return STATUS_INVALID_DEVICE_REQUEST; } + #endif // _KS_

1 0

[fireball] 32257: - Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 15:33:16 2008 New Revision: 32257 URL: http://svn.reactos.org/svn/reactos?rev=32257&view=rev Log: - Winesync to Wine-0.9.55. Modified: trunk/rostests/winetests/ole32/marshal.c trunk/rostests/winetests/ole32/moniker.c trunk/rostests/winetests/ole32/ole32.rbuild trunk/rostests/winetests/ole32/usrmarshal.c 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 (original) +++ trunk/rostests/winetests/ole32/marshal.c Sun Feb 10 15:33:16 2008 @@ -1831,15 +1831,19 @@ } } -static void test_message_reentrancy(void) +static void register_test_window(void) { WNDCLASS wndclass; - MSG msg; memset(&wndclass, 0, sizeof(wndclass)); wndclass.lpfnWndProc = window_proc; wndclass.lpszClassName = "WineCOMTest"; RegisterClass(&wndclass); +} + +static void test_message_reentrancy(void) +{ + MSG msg; hwnd_app = CreateWindow("WineCOMTest", NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, 0); ok(hwnd_app != NULL, "Window creation failed\n"); @@ -1852,6 +1856,7 @@ TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static HRESULT WINAPI TestMsg_IClassFactory_CreateInstance( @@ -1917,6 +1922,7 @@ TranslateMessage(&msg); DispatchMessage(&msg); } + DestroyWindow(hwnd_app); } static void test_WM_QUIT_handling(void) @@ -2569,7 +2575,7 @@ quit_event = CreateEvent(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event); - WaitForSingleObject(process, INFINITE); + winetest_wait_child_process( process ); CloseHandle(quit_event); CloseHandle(process); } @@ -2873,7 +2879,6 @@ START_TEST(marshal) { - WNDCLASS wndclass; HMODULE hOle32 = GetModuleHandle("ole32"); int argc; char **argv; @@ -2890,11 +2895,7 @@ return; } - /* register a window class used in several tests */ - memset(&wndclass, 0, sizeof(wndclass)); - wndclass.lpfnWndProc = window_proc; - wndclass.lpszClassName = "WineCOMTest"; - RegisterClass(&wndclass); + register_test_window(); test_cocreateinstance_proxy(); 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 (original) +++ trunk/rostests/winetests/ole32/moniker.c Sun Feb 10 15:33:16 2008 @@ -1311,7 +1311,7 @@ ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - ok_ole_success(hr, IMoniker_BindToStorage); + ok_ole_success(hr, IMoniker_BindToObject); IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); @@ -1589,6 +1589,113 @@ IMoniker_Release(moniker); } +static void test_pointer_moniker(void) +{ + HRESULT hr; + IMoniker *moniker; + DWORD moniker_type; + DWORD hash; + IBindCtx *bindctx; + FILETIME filetime; + IMoniker *inverse; + IUnknown *unknown; + IStream *stream; + IROTData *rotdata; + LPOLESTR display_name; + + cLocks = 0; + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); + ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + ok_ole_success(hr, CreatePointerMoniker); + if (!moniker) return; + + ok_more_than_one_lock(); + + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); + ok(hr == E_NOTIMPL, "IMoniker_GetDisplayName should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + hr = IMoniker_IsDirty(moniker); + ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); + + /* IROTData::GetComparisonData test */ + + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); + + /* Saving */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok_ole_success(hr, CreateStreamOnHGlobal); + + hr = IMoniker_Save(moniker, stream, TRUE); + ok(hr == E_NOTIMPL, "IMoniker_Save should have returned E_NOTIMPL instead of 0x%08x\n", hr); + + IStream_Release(stream); + + /* Hashing */ + hr = IMoniker_Hash(moniker, &hash); + ok_ole_success(hr, IMoniker_Hash); + ok(hash == (DWORD)&Test_ClassFactory, + "Hash value should have been 0x%08x, instead of 0x%08x\n", + (DWORD)&Test_ClassFactory, hash); + + /* IsSystemMoniker test */ + hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); + ok_ole_success(hr, IMoniker_IsSystemMoniker); + ok(moniker_type == MKSYS_POINTERMONIKER, + "dwMkSys != MKSYS_POINTERMONIKER, instead was 0x%08x\n", + moniker_type); + + hr = IMoniker_Inverse(moniker, &inverse); + ok_ole_success(hr, IMoniker_Inverse); + IMoniker_Release(inverse); + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + /* IsRunning test */ + hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); + ok(hr == S_OK, "IMoniker_IsRunning should return S_OK, not 0x%08x\n", hr); + + hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, NULL, &filetime); + ok(hr == E_NOTIMPL, "IMoniker_GetTimeOfLastChange should return E_NOTIMPL, not 0x%08x\n", hr); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToObject); + IUnknown_Release(unknown); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok_ole_success(hr, IMoniker_BindToStorage); + IUnknown_Release(unknown); + + IMoniker_Release(moniker); + + ok_no_locks(); + + hr = CreatePointerMoniker(NULL, &moniker); + ok_ole_success(hr, CreatePointerMoniker); + + hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToObject should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); + ok(hr == E_UNEXPECTED, "IMoniker_BindToStorage should have returned E_UNEXPECTED instead of 0x%08x\n", hr); + + IBindCtx_Release(bindctx); + + IMoniker_Release(moniker); +} + static void test_bind_context(void) { HRESULT hr; @@ -1700,6 +1807,7 @@ test_item_moniker(); test_anti_moniker(); test_generic_composite_moniker(); + test_pointer_moniker(); /* FIXME: test moniker creation funcs and parsing other moniker formats */ 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 (original) +++ trunk/rostests/winetests/ole32/ole32.rbuild Sun Feb 10 15:33:16 2008 @@ -1,18 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="ole32_winetest" type="win32cui" installbase="bin" installname="ole32_winetest.exe" allowwarnings="true" entrypoint="0"> <include base="ole32_winetest">.</include> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>oleaut32</library> - <library>ole32</library> - <library>user32</library> - <library>gdi32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>uuid</library> - <library>ntdll</library> <file>clipboard.c</file> <file>compobj.c</file> <file>dragdrop.c</file> @@ -26,4 +18,14 @@ <file>storage32.c</file> <file>usrmarshal.c</file> <file>testlist.c</file> + <library>wine</library> + <library>oleaut32</library> + <library>ole32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> </module> +</group> 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 (original) +++ trunk/rostests/winetests/ole32/usrmarshal.c Sun Feb 10 15:33:16 2008 @@ -441,31 +441,31 @@ unk = &Test_Unknown; size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); todo_wine - ok(size == 108, "size should be 108 bytes, not %d\n", size); + ok(size > 28, "size should be > 28 bytes, not %d\n", size); + trace("WdtpInterfacePointer_UserSize returned %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); wireip = buffer; if (size >= 28) { - ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x44, "wireip + 0x8 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0xc should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x1, "wireip + 0x10 should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - iid = (const IID *)buffer; - ok(!IsEqualIID(iid, &IID_IUnknown), - "wireip + 0x14 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0x8 should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x1, "wireip + 0xc should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + iid = (const IID *)wireip; + ok(IsEqualIID(iid, &IID_IUnknown), + "wireip + 0x10 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", iid->Data1, iid->Data2, iid->Data3, iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3], iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]); - ok(*(DWORD *)wireip == 0, "wireip + 0x14 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(IID); - ok(*(DWORD *)wireip == 0, "wireip + 0x20 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 5, "wireip + 0x24 should be 5 instead of %d\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == 0, "wireip + 0x1c should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 5, "wireip + 0x20 should be 5 instead of %d\n", *(DWORD *)wireip); wireip += sizeof(DWORD); /* the rest is dynamic so can't really be tested */ }

1 0

[fireball] 32256: Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 15:26:59 2008 New Revision: 32256 URL: http://svn.reactos.org/svn/reactos?rev=32256&view=rev Log: Winesync to Wine-0.9.55. Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/typelib16.c trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/variant.c Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c Sun Feb 10 15:26:59 2008 @@ -837,7 +837,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDll); - OLEAUT32_hModule = (HMODULE)hInstDll; + OLEAUT32_hModule = hInstDll; break; case DLL_PROCESS_DETACH: break; Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c Sun Feb 10 15:26:59 2008 @@ -1215,6 +1215,7 @@ return hres; } hres = ITypeLib_GetTypeInfoOfGuid(tl, &IID_IFontDisp, ppTInfo); + ITypeLib_Release(tl); if (FAILED(hres)) { FIXME("Did not IDispatch typeinfo from typelib, hres %x\n",hres); } Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c Sun Feb 10 15:26:59 2008 @@ -1237,6 +1237,7 @@ This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); + HeapFree(GetProcessHeap(),0,bmi); HeapFree(GetProcessHeap(),0,bytes); return S_OK; } @@ -1277,7 +1278,7 @@ jd.err = pjpeg_std_error(&jerr); /* jpeg_create_decompress is a macro that expands to jpeg_CreateDecompress - see jpeglib.h * jpeg_create_decompress(&jd); */ - pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, (size_t) sizeof(struct jpeg_decompress_struct)); + pjpeg_CreateDecompress(&jd, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); jd.src = &xjsm; ret=pjpeg_read_header(&jd,TRUE); jd.out_color_space = JCS_RGB; Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/safearray.c (original) +++ trunk/reactos/dll/win32/oleaut32/safearray.c Sun Feb 10 15:26:59 2008 @@ -805,7 +805,7 @@ if (!psa) return E_INVALIDARG; - if ((LONG)InterlockedDecrement( (LONG*) &psa->cLocks) < 0) + if (InterlockedDecrement( (LONG*) &psa->cLocks) < 0) { WARN("Unlocked but no lock held!\n"); InterlockedIncrement( (LONG*) &psa->cLocks); Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c Sun Feb 10 15:26:59 2008 @@ -1468,6 +1468,7 @@ hres = remoteresult; exit: + IRpcChannelBuffer_FreeBuffer(chanbuf,&msg); for (i = 0; i < nrofnames; i++) SysFreeString(names[i]); HeapFree(GetProcessHeap(),0,buf.base); Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c Sun Feb 10 15:26:59 2008 @@ -2587,7 +2587,7 @@ ITypeInfoImpl **ppTI = &(pTypeLibImpl->pTypeInfo); int i; - for(i = 0; i<(int)tlbHeader.nrtypeinfos; i++) + for(i = 0; i < tlbHeader.nrtypeinfos; i++) { *ppTI = MSFT_DoTypeInfo(&cx, i, pTypeLibImpl); @@ -6249,7 +6249,7 @@ if(ref_type->pImpTLInfo->pImpTypeLib) { TRACE("typeinfo in imported typelib that is already loaded\n"); pTLib = (ITypeLib*)ref_type->pImpTLInfo->pImpTypeLib; - ITypeLib2_AddRef((ITypeLib*) pTLib); + ITypeLib2_AddRef(pTLib); result = S_OK; } else { TRACE("typeinfo in imported typelib that isn't already loaded\n"); Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.h (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.h Sun Feb 10 15:26:59 2008 @@ -96,13 +96,13 @@ /*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */ /* (25 ints) */ /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ -/*3*/MSFT_pSeg pImpFiles; /* import libaries */ +/*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */ +/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */ +/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ /* purpose largely unknown */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ @@ -120,10 +120,10 @@ /* base type info data */ typedef struct tagMSFT_TypeInfoBase { /*000*/ INT typekind; /* it is the TKIND_xxx */ - /* some byte alignment stuf */ + /* some byte alignment stuff */ INT memoffset; /* points past the file, if no elements */ INT res2; /* zero if no element, N*0x40 */ - INT res3; /* -1 if no lement, (N-1)*0x38 */ + INT res3; /* -1 if no element, (N-1)*0x38 */ /*010*/ INT res4; /* always? 3 */ INT res5; /* always? zero */ INT cElement; /* counts elements, HI=cVars, LO=cFuncs */ Modified: trunk/reactos/dll/win32/oleaut32/typelib16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib16.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib16.c Sun Feb 10 15:26:59 2008 @@ -91,7 +91,7 @@ wMaj,wMin,lcid); } else { sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,(DWORD)lcid,path); + FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname); Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib2.c (original) +++ trunk/reactos/dll/win32/oleaut32/typelib2.c Sun Feb 10 15:26:59 2008 @@ -1225,7 +1225,7 @@ This->typeinfo->flags = uTypeFlags; - if (uTypeFlags & 0x1000) { + if (uTypeFlags & TYPEFLAG_FDISPATCHABLE) { MSFT_GuidEntry foo; int guidoffset; int fileoffset; Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c Sun Feb 10 15:26:59 2008 @@ -2654,7 +2654,7 @@ * left [I] First variant * right [I] Second variant * lcid [I] LCID (locale identifier) for the comparison - * flags [I] Flags to be used in the comparision: + * flags [I] Flags to be used in the comparison: * NORM_IGNORECASE, NORM_IGNORENONSPACE, NORM_IGNORESYMBOLS, * NORM_IGNOREWIDTH, NORM_IGNOREKANATYPE, NORM_IGNOREKASHIDA * @@ -2677,9 +2677,9 @@ * is not an EMPTY variant. All four VT_RESERVED combinations have a * different meaning: * - BSTR and other: BSTR is always greater than the other variant. - * - BSTR|VT_RESERVED and other: a string comparision is performed. + * - BSTR|VT_RESERVED and other: a string comparison is performed. * - BSTR and other|VT_RESERVED: If the BSTR is a number a numeric - * comparision will take place else the BSTR is always greater. + * comparison will take place else the BSTR is always greater. * - BSTR|VT_RESERVED and other|VT_RESERVED: It seems that the other * variant is ignored and the return value depends only on the sign * of the BSTR if it is a number else the BSTR is always greater. A @@ -2763,7 +2763,7 @@ /* No VT_RESERVED set ==> BSTR always greater */ rc = VARCMP_GT; else if (breserv && !nreserv) { - /* BSTR has VT_RESERVED set. Do a string comparision */ + /* BSTR has VT_RESERVED set. Do a string comparison */ rc = VariantChangeTypeEx(&rv,nonbv,lcid,0,VT_BSTR); if (FAILED(rc)) return rc; @@ -2780,7 +2780,7 @@ the BSTR number */ rc = (V_R8(&lv) >= 0) ? VARCMP_GT : VARCMP_LT; else - /* Numeric comparision, will be handled below. + /* Numeric comparison, will be handled below. VARCMP_NULL used only to break out. */ rc = VARCMP_NULL; VariantClear(&lv);

1 0

[fireball] 32255: Winesync to Wine-0.9.55.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 15:17:32 2008 New Revision: 32255 URL: http://svn.reactos.org/svn/reactos?rev=32255&view=rev Log: Winesync to Wine-0.9.55. Added: trunk/reactos/dll/win32/ole32/pointermoniker.c (with props) Modified: trunk/reactos/dll/win32/ole32/moniker.h trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c Modified: trunk/reactos/dll/win32/ole32/moniker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.h?… ============================================================================== --- trunk/reactos/dll/win32/ole32/moniker.h (original) +++ trunk/reactos/dll/win32/ole32/moniker.h Sun Feb 10 15:17:32 2008 @@ -28,12 +28,14 @@ DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv); +HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable); Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild Sun Feb 10 15:17:32 2008 @@ -44,6 +44,7 @@ <file>ole32_main.c</file> <file>oleobj.c</file> <file>oleproxy.c</file> + <file>pointermoniker.c</file> <file>regsvr.c</file> <file>rpc.c</file> <file>stg_bigblockfile.c</file> Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec Sun Feb 10 15:17:32 2008 @@ -92,7 +92,7 @@ @ stdcall CreateItemMoniker(wstr wstr ptr) @ stub CreateObjrefMoniker @ stdcall CreateOleAdviseHolder(ptr) -@ stub CreatePointerMoniker #@ stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) @ stdcall -private DllGetClassObject (ptr ptr ptr) Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/oleproxy.c (original) +++ trunk/reactos/dll/win32/ole32/oleproxy.c Sun Feb 10 15:17:32 2008 @@ -1030,6 +1030,8 @@ return CompositeMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return ClassMonikerCF_Create(iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) + return PointerMonikerCF_Create(iid, ppv); FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; Added: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… ============================================================================== --- trunk/reactos/dll/win32/ole32/pointermoniker.c (added) +++ trunk/reactos/dll/win32/ole32/pointermoniker.c Sun Feb 10 15:17:32 2008 @@ -1,0 +1,654 @@ +/* + * Pointer Moniker Implementation + * + * Copyright 1999 Noomen Hamza + * Copyright 2008 Robert Shearman (for CodeWeavers) + * + * 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 + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "objbase.h" +#include "oleidl.h" +#include "wine/debug.h" +#include "moniker.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +/* PointerMoniker data structure */ +typedef struct PointerMonikerImpl{ + + const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ + + LONG ref; /* reference counter for this object */ + + IUnknown *pObject; /* custom marshaler */ +} PointerMonikerImpl; + +static HRESULT WINAPI +PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p)\n",This,riid,ppvObject); + + /* Perform a sanity check on the parameters.*/ + if ( (This==0) || (ppvObject==0) ) + return E_INVALIDARG; + + /* Initialize the return parameter */ + *ppvObject = 0; + + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; + + /* Check that we obtained an interface.*/ + if ((*ppvObject)==0) + return E_NOINTERFACE; + + /* always increase the reference count by one when it is successful */ + IMoniker_AddRef(iface); + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_AddRef + ******************************************************************************/ +static ULONG WINAPI +PointerMonikerImpl_AddRef(IMoniker* iface) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p)\n",This); + + return InterlockedIncrement(&This->ref); +} + +/****************************************************************************** + * PointerMoniker_Release + ******************************************************************************/ +static ULONG WINAPI +PointerMonikerImpl_Release(IMoniker* iface) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + ULONG ref; + + TRACE("(%p)\n",This); + + ref = InterlockedDecrement(&This->ref); + + /* destroy the object if there's no more reference on it */ + if (ref == 0) + { + if (This->pObject) IUnknown_Release(This->pObject); + HeapFree(GetProcessHeap(),0,This); + } + + return ref; +} + +/****************************************************************************** + * PointerMoniker_GetClassID + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetClassID(IMoniker* iface,CLSID *pClassID) +{ + TRACE("(%p,%p)\n",iface,pClassID); + + if (pClassID==NULL) + return E_POINTER; + + *pClassID = CLSID_PointerMoniker; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsDirty + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsDirty(IMoniker* iface) +{ + /* Note that the OLE-provided implementations of the IPersistStream::IsDirty + method in the OLE-provided moniker interfaces always return S_FALSE because + their internal state never changes. */ + + TRACE("(%p)\n",iface); + + return S_FALSE; +} + +/****************************************************************************** + * PointerMoniker_Load + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Load(IMoniker* iface,IStream* pStm) +{ + TRACE("(%p)\n", pStm); + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_Save + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) +{ + TRACE("(%p, %d)\n", pStm, fClearDirty); + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_GetSizeMax + * + * PARAMS + * pcbSize [out] Pointer to size of stream needed to save object + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) +{ + TRACE("(%p,%p)\n",iface,pcbSize); + + if (!pcbSize) + return E_POINTER; + + pcbSize->u.LowPart = 0; + pcbSize->u.HighPart = 0; + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_BindToObject + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + + if (!This->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(This->pObject, riid, ppvResult); +} + +/****************************************************************************** + * PointerMoniker_BindToStorage + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + REFIID riid, VOID** ppvResult) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); + + if (!This->pObject) + return E_UNEXPECTED; + + return IUnknown_QueryInterface(This->pObject, riid, ppvResult); +} + +/****************************************************************************** + * PointerMoniker_Reduce + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, + IMoniker** ppmkToLeft, IMoniker** ppmkReduced) +{ + TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); + + if (ppmkReduced==NULL) + return E_POINTER; + + PointerMonikerImpl_AddRef(iface); + + *ppmkReduced=iface; + + return MK_S_REDUCED_TO_SELF; +} +/****************************************************************************** + * PointerMoniker_ComposeWith + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_ComposeWith(IMoniker* iface, IMoniker* pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) +{ + + HRESULT res=S_OK; + DWORD mkSys,mkSys2; + IEnumMoniker* penumMk=0; + IMoniker *pmostLeftMk=0; + IMoniker* tempMkComposite=0; + + TRACE("(%p,%d,%p)\n", pmkRight, fOnlyIfNotGeneric, ppmkComposite); + + if ((ppmkComposite==NULL)||(pmkRight==NULL)) + return E_POINTER; + + *ppmkComposite=0; + + IMoniker_IsSystemMoniker(pmkRight,&mkSys); + + /* If pmkRight is an anti-moniker, the returned moniker is NULL */ + if(mkSys==MKSYS_ANTIMONIKER) + return res; + + else + /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ + /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ + + if(mkSys==MKSYS_GENERICCOMPOSITE){ + + res=IMoniker_Enum(pmkRight,TRUE,&penumMk); + + if (FAILED(res)) + return res; + + res=IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL); + + IMoniker_IsSystemMoniker(pmostLeftMk,&mkSys2); + + if(mkSys2==MKSYS_ANTIMONIKER){ + + IMoniker_Release(pmostLeftMk); + + tempMkComposite=iface; + IMoniker_AddRef(iface); + + while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){ + + res=CreateGenericComposite(tempMkComposite,pmostLeftMk,ppmkComposite); + + IMoniker_Release(tempMkComposite); + IMoniker_Release(pmostLeftMk); + + tempMkComposite=*ppmkComposite; + IMoniker_AddRef(tempMkComposite); + } + return res; + } + else + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + } + /* If pmkRight is not an anti-moniker, the method combines the two monikers into a generic + composite if fOnlyIfNotGeneric is FALSE; if fOnlyIfNotGeneric is TRUE, the method returns + a NULL moniker and a return value of MK_E_NEEDGENERIC */ + else + if (!fOnlyIfNotGeneric) + return CreateGenericComposite(iface,pmkRight,ppmkComposite); + + else + return MK_E_NEEDGENERIC; +} + +/****************************************************************************** + * PointerMoniker_Enum + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) +{ + TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); + + if (ppenumMoniker == NULL) + return E_POINTER; + + *ppenumMoniker = NULL; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsEqual + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + DWORD mkSys; + + TRACE("(%p,%p)\n",iface,pmkOtherMoniker); + + if (pmkOtherMoniker==NULL) + return S_FALSE; + + IMoniker_IsSystemMoniker(pmkOtherMoniker,&mkSys); + + if (mkSys==MKSYS_POINTERMONIKER) + { + PointerMonikerImpl *pOtherMoniker = (PointerMonikerImpl *)pmkOtherMoniker; + return This->pObject == pOtherMoniker->pObject ? S_OK : S_FALSE; + } + else + return S_FALSE; +} + +/****************************************************************************** + * PointerMoniker_Hash + ******************************************************************************/ +static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + + if (pdwHash==NULL) + return E_POINTER; + + *pdwHash = (DWORD)This->pObject; + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_IsRunning + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, + IMoniker* pmkNewlyRunning) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); + + return S_OK; +} + +/****************************************************************************** + * PointerMoniker_GetTimeOfLastChange + ******************************************************************************/ +static HRESULT WINAPI PointerMonikerImpl_GetTimeOfLastChange(IMoniker* iface, + IBindCtx* pbc, + IMoniker* pmkToLeft, + FILETIME* pAntiTime) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pAntiTime); + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_Inverse + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) +{ + TRACE("(%p,%p)\n",iface,ppmk); + + return CreateAntiMoniker(ppmk); +} + +/****************************************************************************** + * PointerMoniker_CommonPrefixWith + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +{ + TRACE("(%p, %p)\n", pmkOther, ppmkPrefix); + + *ppmkPrefix = NULL; + + if (PointerMonikerImpl_IsEqual(iface, pmkOther)) + { + IMoniker_AddRef(iface); + + *ppmkPrefix=iface; + + return MK_S_US; + } + else + return MK_E_NOPREFIX; +} + +/****************************************************************************** + * PointerMoniker_RelativePathTo + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppmkRelPath) +{ + TRACE("(%p,%p,%p)\n",iface,pmOther,ppmkRelPath); + + if (ppmkRelPath==NULL) + return E_POINTER; + + *ppmkRelPath = NULL; + + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_GetDisplayName + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +{ + TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + + if (ppszDisplayName==NULL) + return E_POINTER; + + *ppszDisplayName = NULL; + return E_NOTIMPL; +} + +/****************************************************************************** + * PointerMoniker_ParseDisplayName + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, + IMoniker* pmkToLeft, LPOLESTR pszDisplayName, + ULONG* pchEaten, IMoniker** ppmkOut) +{ + PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + HRESULT hr; + IParseDisplayName *pPDN; + + TRACE("(%p,%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut); + + if (pmkToLeft) + return MK_E_SYNTAX; + + if (!This->pObject) + return E_UNEXPECTED; + + hr = IUnknown_QueryInterface(This->pObject, &IID_IParseDisplayName, (void **)&pPDN); + if (FAILED(hr)) + return hr; + + hr = IParseDisplayName_ParseDisplayName(pPDN, pbc, pszDisplayName, pchEaten, ppmkOut); + IParseDisplayName_Release(pPDN); + + return hr; +} + +/****************************************************************************** + * PointerMoniker_IsSystemMoniker + ******************************************************************************/ +static HRESULT WINAPI +PointerMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) +{ + TRACE("(%p,%p)\n",iface,pwdMksys); + + if (!pwdMksys) + return E_POINTER; + + *pwdMksys = MKSYS_POINTERMONIKER; + + return S_OK; +} + +/********************************************************************************/ +/* Virtual function table for the PointerMonikerImpl class which include IPersist,*/ +/* IPersistStream and IMoniker functions. */ +static const IMonikerVtbl VT_PointerMonikerImpl = +{ + PointerMonikerImpl_QueryInterface, + PointerMonikerImpl_AddRef, + PointerMonikerImpl_Release, + PointerMonikerImpl_GetClassID, + PointerMonikerImpl_IsDirty, + PointerMonikerImpl_Load, + PointerMonikerImpl_Save, + PointerMonikerImpl_GetSizeMax, + PointerMonikerImpl_BindToObject, + PointerMonikerImpl_BindToStorage, + PointerMonikerImpl_Reduce, + PointerMonikerImpl_ComposeWith, + PointerMonikerImpl_Enum, + PointerMonikerImpl_IsEqual, + PointerMonikerImpl_Hash, + PointerMonikerImpl_IsRunning, + PointerMonikerImpl_GetTimeOfLastChange, + PointerMonikerImpl_Inverse, + PointerMonikerImpl_CommonPrefixWith, + PointerMonikerImpl_RelativePathTo, + PointerMonikerImpl_GetDisplayName, + PointerMonikerImpl_ParseDisplayName, + PointerMonikerImpl_IsSystemMoniker +}; + +/****************************************************************************** + * PointerMoniker_Construct (local function) + *******************************************************************************/ +static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *punk) +{ + TRACE("(%p)\n",This); + + /* Initialize the virtual fgunction table. */ + This->lpvtbl = &VT_PointerMonikerImpl; + This->ref = 1; + if (punk) + IUnknown_AddRef(punk); + This->pObject = punk; +} + +/*********************************************************************** + * CreatePointerMoniker (OLE32.@) + * + * Creates a moniker which represents a pointer. + * + * PARAMS + * punk [I] Pointer to the object to represent. + * ppmk [O] Address that receives the pointer to the created moniker. + * + * RETURNS + * Success: S_OK. + * Failure: Any HRESULT code. + */ +HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) +{ + PointerMonikerImpl *This; + + FIXME("(%p, %p): stub\n", punk, ppmk); + + if (!ppmk) + return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + { + *ppmk = NULL; + return E_OUTOFMEMORY; + } + + PointerMonikerImpl_Construct(This, punk); + *ppmk = (IMoniker *)&This->lpvtbl; + return S_OK; +} + +static HRESULT WINAPI PointerMonikerCF_QueryInterface(LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI PointerMonikerCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI PointerMonikerCF_Release(LPCLASSFACTORY iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface, + LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +{ + IMoniker *pMoniker; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnk, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (pUnk) + return CLASS_E_NOAGGREGATION; + + hr = CreatePointerMoniker(NULL, &pMoniker); + if (FAILED(hr)) + return hr; + + hr = IMoniker_QueryInterface(pMoniker, riid, ppv); + + if (FAILED(hr)) + IMoniker_Release(pMoniker); + + return hr; +} + +static HRESULT WINAPI PointerMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl PointerMonikerCFVtbl = +{ + PointerMonikerCF_QueryInterface, + PointerMonikerCF_AddRef, + PointerMonikerCF_Release, + PointerMonikerCF_CreateInstance, + PointerMonikerCF_LockServer +}; +static const IClassFactoryVtbl *PointerMonikerCF = &PointerMonikerCFVtbl; + +HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&PointerMonikerCF, riid, ppv); +} Propchange: trunk/reactos/dll/win32/ole32/pointermoniker.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/regsvr.c (original) +++ trunk/reactos/dll/win32/ole32/regsvr.c Sun Feb 10 15:17:32 2008 @@ -402,9 +402,6 @@ */ static GUID const CLSID_StdOleLink = { 0x00000300, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -static GUID const CLSID_PointerMoniker = { - 0x00000306, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c (original) +++ trunk/reactos/dll/win32/ole32/rpc.c Sun Feb 10 15:17:32 2008 @@ -893,12 +893,8 @@ orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL; - /* for normal RPC calls, faults are returned in first 4 bytes of the - * buffer */ TRACE("RPC call status: 0x%lx\n", status); - if (status == RPC_S_CALL_FAILED) - hrFault = *(HRESULT *)olemsg->Buffer; - else if (status != RPC_S_OK) + if (status != RPC_S_OK) hr = HRESULT_FROM_WIN32(status); TRACE("hrFault = 0x%08x\n", hrFault);

1 0

[fireball] 32254: - Mark WIDL as updated.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 15:00:21 2008 New Revision: 32254 URL: http://svn.reactos.org/svn/reactos?rev=32254&view=rev Log: - Mark WIDL as updated. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Feb 10 15:00:21 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20071217 reactos/tools/wmc # Synced to Wine-20071201 reactos/tools/wrc # Synced to Wine-0_9_53 -reactos/tools/widl # Synced to Wine-20080105 +reactos/tools/widl # Synced to Wine-0_9_55 The following libraries are shared with Wine.

1 0

[fireball] 32252: Sync to Wine-0.9.55: - Rob Shearman <rob@codeweavers.com> Sun, 20 Jan 2008 widl: Write out code for initialising out-only client context handles. - Francois Gouget <fgouget@free.fr> Wed, 23 Jan 2008 Assorted spelling fixes. - Jacek Caban <jacek@codeweavers.com> Tue, 29 Jan 2008 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. - Rob Shearman <rob@codeweavers.com> Wed, 30 Jan 2008 widl: Don't search for a import file name with a path in the include directories for compatibility w
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 13:10:44 2008 New Revision: 32252 URL: http://svn.reactos.org/svn/reactos?rev=32252&view=rev Log: Sync to Wine-0.9.55: - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Jan 2008 widl: Write out code for initialising out-only client context handles. - Francois Gouget <fgouget(a)free.fr> Wed, 23 Jan 2008 Assorted spelling fixes. - Jacek Caban <jacek(a)codeweavers.com> Tue, 29 Jan 2008 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Jan 2008 widl: Don't search for a import file name with a path in the include directories for compatibility with MIDL. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Jan 2008 widl: Output code for initialising and freeing full pointer translation tables. - Colin Finck <mail(a)colinfinck.de> Thu, 7 Feb 2008 widl: Support Windows paths in dup_basename and make_token. - Colin Finck <mail(a)colinfinck.de> Thu, 7 Feb 2008 widl: Write the TLB file in binary mode, so the line endings won't be changed. Modified: trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/client.c (original) +++ trunk/reactos/tools/widl/client.c Sun Feb 10 13:10:44 2008 @@ -85,6 +85,7 @@ { const var_t *def = func->def; const var_t* explicit_handle_var; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -141,6 +142,9 @@ "_RetVal", "_RetVal"); } fprintf(client, "\n"); + + if (has_full_pointer) + write_full_pointer_init(client, indent, func, FALSE); /* check pointers */ check_pointers(func); @@ -244,6 +248,9 @@ /* FIXME: emit client finally code */ + + if (has_full_pointer) + write_full_pointer_free(client, indent, func); print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&_StubMsg);\n"); Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/header.c (original) +++ trunk/reactos/tools/widl/header.c Sun Feb 10 13:10:44 2008 @@ -578,23 +578,21 @@ var_t *def = cur->def; if (!is_callas(def->attrs)) { const var_t *arg; - int argc = 0; - int c; - - if (cur->args) LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) argc++; fprintf(header, "#define %s_", name); write_name(header,def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(p)->lpVtbl->"); + fprintf(header, "(This)->lpVtbl->"); write_name(header, def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ")\n"); } } Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=32… ============================================================================== --- trunk/reactos/tools/widl/parser.l (original) +++ trunk/reactos/tools/widl/parser.l Sun Feb 10 13:10:44 2008 @@ -414,7 +414,11 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, input_name ))) + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = strdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… ============================================================================== --- trunk/reactos/tools/widl/parser.yy.c (original) +++ trunk/reactos/tools/widl/parser.yy.c Sun Feb 10 13:10:44 2008 @@ -2117,7 +2117,11 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, input_name ))) + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = strdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=322… ============================================================================== --- trunk/reactos/tools/widl/proxy.c (original) +++ trunk/reactos/tools/widl/proxy.c Sun Feb 10 13:10:44 2008 @@ -254,6 +254,7 @@ { var_t *def = cur->def; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; write_type_decl_left(proxy, def->type); @@ -279,6 +280,9 @@ } print_proxy( "\n"); + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, FALSE); + /* FIXME: trace */ clear_output_vars( cur->args ); @@ -325,6 +329,8 @@ print_proxy( "RpcFinally\n" ); print_proxy( "{\n" ); indent++; + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); print_proxy( "NdrProxyFreeBuffer(This, &_StubMsg);\n" ); indent--; print_proxy( "}\n"); @@ -356,6 +362,7 @@ var_t *def = cur->def; const var_t *arg; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; print_proxy( "void __RPC_STUB %s_", iface->name); @@ -384,6 +391,8 @@ print_proxy("RpcTryFinally\n"); print_proxy("{\n"); indent++; + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, TRUE); print_proxy("if ((_pRpcMessage->DataRepresentation & 0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; print_proxy("NdrConvert( &_StubMsg, &__MIDL_ProcFormatString.Format[%u]);\n", proc_offset ); @@ -438,6 +447,9 @@ print_proxy("{\n"); write_remoting_arguments(proxy, indent+1, cur, PASS_OUT, PHASE_FREE); + + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); print_proxy("}\n"); print_proxy("RpcEndFinally\n"); Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/server.c (original) +++ trunk/reactos/tools/widl/server.c Sun Feb 10 13:10:44 2008 @@ -62,6 +62,7 @@ LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) { const var_t *def = func->def; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -125,6 +126,9 @@ print_server("RpcTryExcept\n"); print_server("{\n"); indent++; + + if (has_full_pointer) + write_full_pointer_init(server, indent, func, TRUE); if (func->args) { @@ -236,6 +240,9 @@ write_remoting_arguments(server, indent, func, PASS_OUT, PHASE_FREE); + if (has_full_pointer) + write_full_pointer_free(server, indent, func); + indent--; print_server("}\n"); print_server("RpcEndFinally\n"); Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c (original) +++ trunk/reactos/tools/widl/typegen.c Sun Feb 10 13:10:44 2008 @@ -186,6 +186,46 @@ if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { if (field->type && type_has_pointers(field->type)) + return TRUE; + } + } + + return FALSE; +} + +static int type_has_full_pointer(const type_t *type) +{ + if (is_user_type(type)) + return FALSE; + else if (type->type == RPC_FC_FP) + return TRUE; + else if (is_ptr(type)) + return FALSE; + else if (is_array(type)) + return type_has_full_pointer(type->ref); + else if (is_struct(type->type)) + { + const var_t *field; + if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) + { + if (type_has_full_pointer(field->type)) + return TRUE; + } + } + else if (is_union(type->type)) + { + var_list_t *fields; + const var_t *field; + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields), const var_t, entry); + fields = uv->type->fields; + } + else + fields = type->fields; + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if (field->type && type_has_full_pointer(field->type)) return TRUE; } } @@ -903,6 +943,32 @@ return size; } +int is_full_pointer_function(const func_t *func) +{ + const var_t *var; + if (type_has_full_pointer(func->def->type)) + return TRUE; + if (!func->args) + return FALSE; + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (type_has_full_pointer( var->type )) + return TRUE; + return FALSE; +} + +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server) +{ + print_file(file, indent, "_StubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,%s);\n", + is_server ? "XLAT_SERVER" : "XLAT_CLIENT"); + fprintf(file, "\n"); +} + +void write_full_pointer_free(FILE *file, int indent, const func_t *func) +{ + print_file(file, indent, "NdrFullPointerXlatFree(_StubMsg.FullPtrXlatTables);\n"); + fprintf(file, "\n"); +} + static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size_t offset) { short absoff = type->ref->typestring_offset; @@ -2126,7 +2192,7 @@ off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); ptr_type = get_attrv(var->attrs, ATTR_POINTERTYPE); /* Top level pointers to conformant arrays may be handled specially - since we can bypass the pointer, but if the array is burried + since we can bypass the pointer, but if the array is buried beneath another pointer (e.g., "[size_is(,n)] int **p" then we always need to write the pointer. */ if (!ptr_type && var->type != type) @@ -2724,6 +2790,8 @@ { if (pass == PASS_OUT) { + if (!in_attr) + print_file(file, indent, "*%s = 0;\n", var->name); print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name); Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.h (original) +++ trunk/reactos/tools/widl/typegen.h Sun Feb 10 13:10:44 2008 @@ -60,3 +60,6 @@ int get_padding(const var_list_t *fields); int is_user_type(const type_t *t); expr_t *get_size_is_expr(const type_t *t, const char *name); +int is_full_pointer_function(const func_t *func); +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server); +void write_full_pointer_free(FILE *file, int indent, const func_t *func); Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h (original) +++ trunk/reactos/tools/widl/typelib_struct.h Sun Feb 10 13:10:44 2008 @@ -92,16 +92,16 @@ /* layout of the main segment directory */ typedef struct tagMSFT_SegDir { -/*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */ +/*1*/MSFT_pSeg pTypeInfoTab; /* each typeinfo gets an entry of 0x64 bytes */ /* (25 ints) */ /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ -/*3*/MSFT_pSeg pImpFiles; /* import libaries */ +/*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */ +/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */ +/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ /* purpose largely unknown */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ @@ -119,10 +119,10 @@ /* base type info data */ typedef struct tagMSFT_TypeInfoBase { /*000*/ INT typekind; /* it is the TKIND_xxx */ - /* some byte alignment stuf */ + /* some byte alignment stuff */ INT memoffset; /* points past the file, if no elements */ INT res2; /* zero if no element, N*0x40 */ - INT res3; /* -1 if no lement, (N-1)*0x38 */ + INT res3; /* -1 if no element, (N-1)*0x38 */ /*010*/ INT res4; /* always? 3 */ INT res5; /* always? zero */ INT cElement; /* counts elements, HI=cVars, LO=cFuncs */ @@ -171,7 +171,7 @@ /* function description data */ typedef struct { -/* INT recsize; record size including some xtra stuff */ +/* INT recsize; record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -227,7 +227,7 @@ /* Variable description data */ typedef struct { -/* INT recsize; // record size including some xtra stuff */ +/* INT recsize; // record size including some extra stuff */ INT DataType; /* data type of the variable */ INT Flags; /* VarFlags (LOWORD) */ #ifdef WORDS_BIGENDIAN Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Sun Feb 10 13:10:44 2008 @@ -60,34 +60,6 @@ #include "widl.h" #include "utils.h" -Index: utils.c -=================================================================== ---- utils.c (revision 32187) -+++ utils.c (working copy) -@@ -136,6 +136,9 @@ - name = "widl.tab"; - - slash = strrchr(name, '/'); -+ if (!slash) -+ slash = strrchr(name, '\\'); -+ - if (slash) - name = slash + 1; - -Index: widl.c -=================================================================== ---- widl.c (revision 32187) -+++ widl.c (working copy) -@@ -166,6 +166,9 @@ - int i; - - slash = strrchr(name, '/'); -+ if(!slash) -+ slash = strrchr(name, '\\'); -+ - if (slash) name = slash + 1; - - token = xstrdup(name); Index: widltypes.h =================================================================== --- widltypes.h (revision 32187) @@ -123,12 +95,3 @@ #include "widltypes.h" #include "typelib.h" -@@ -2415,7 +2413,7 @@ - - retval = TYPE_E_IOERROR; - -- fd = creat(typelib->typelib->filename, 0666); -+ fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); - if (fd == -1) return retval; - - filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Sun Feb 10 13:10:44 2008 @@ -1839,6 +1839,9 @@ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; + case ATTR_LOCAL: + break; + case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ break;

1 0

[gbrunmar] 32251: Fixed a typo
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 12:08:50 2008 New Revision: 32251 URL: http://svn.reactos.org/svn/reactos?rev=32251&view=rev Log: Fixed a typo Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 12:08:50 2008 @@ -189,7 +189,7 @@ return D3DERR_INVALIDCALL; } - if (Format != D3DFMT_R5G6B5) + if (Format != D3DFMT_A2R10G10B10) { AdapterModeCount = GetDisplayFormatCount( Format, @@ -261,7 +261,7 @@ return D3DERR_INVALIDCALL; } - if (Format != D3DFMT_R5G6B5) + if (Format != D3DFMT_A2R10G10B10) { pMatchingDisplayFormat = FindDisplayFormat( Format,

1 0

[gbrunmar] 32250: * Fixed a comment typo
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 11:54:25 2008 New Revision: 32250 URL: http://svn.reactos.org/svn/reactos?rev=32250&view=rev Log: * Fixed a comment typo Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 11:54:25 2008 @@ -171,7 +171,7 @@ * The pixel format to search for * * @return HRESULT -* If the method is successfull it returns the number of display modes with the specified Format. +* If the method is successful it returns the number of display modes with the specified Format. * If Adapter is out of range, the return value will be 0. * */

1 0

[gbrunmar] 32249: Implemented IDirect3D9::GetAdapterModeCount() and IDirect3D9::EnumAdapterModes().
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 11:44:06 2008 New Revision: 32249 URL: http://svn.reactos.org/svn/reactos?rev=32249&view=rev Log: Implemented IDirect3D9::GetAdapterModeCount() and IDirect3D9::EnumAdapterModes(). Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_create.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Sun Feb 10 11:44:06 2008 @@ -10,6 +10,7 @@ #include <d3d9.h> #include <ddraw.h> #include <strsafe.h> +#include <debug.h> #include "adapter.h" typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); @@ -166,6 +167,8 @@ return TRUE; } + + static BOOL CALLBACK AdapterMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) { MONITORINFOEXA MonitorInfoEx; @@ -195,3 +198,49 @@ return AdapterMonitor.hMonitor; } + + + +UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes) +{ + UINT DisplayModeIndex; + UINT FormatIndex = 0; + + for (DisplayModeIndex = 0; DisplayModeIndex < NumDisplayModes; DisplayModeIndex++) + { + if (pSupportedDisplayModes[DisplayModeIndex].Format == Format) + { + ++FormatIndex; + } + } + + return FormatIndex; +} + +const D3DDISPLAYMODE* FindDisplayFormat(D3DFORMAT Format, UINT ModeIndex, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes) +{ + UINT DisplayModeIndex; + UINT FormatIndex = 0; + + for (DisplayModeIndex = 0; DisplayModeIndex < NumDisplayModes; DisplayModeIndex++) + { + if (pSupportedDisplayModes[DisplayModeIndex].Format == Format) + { + if (ModeIndex == FormatIndex) + return &pSupportedDisplayModes[DisplayModeIndex]; + + ++FormatIndex; + } + } + + if (FormatIndex == 0) + { + DPRINT1("No modes with the specified format found"); + } + else if (FormatIndex < ModeIndex) + { + DPRINT1("Invalid mode index"); + } + + return NULL; +} Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Sun Feb 10 11:44:06 2008 @@ -13,4 +13,7 @@ HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); +UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); +const D3DDISPLAYMODE* FindDisplayFormat(D3DFORMAT Format, UINT ModeIndex, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); + #endif Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h Sun Feb 10 11:44:06 2008 @@ -8,6 +8,8 @@ #ifndef _D3D9_CREATE_H_ #define _D3D9_CREATE_H_ +#include <windows.h> +#include <d3d9types.h> #include "d3d9_private.h" /* Creates a Direct3D9 object */ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 11:44:06 2008 @@ -135,6 +135,7 @@ if (IsBadWritePtr(pIdentifier, sizeof(D3DADAPTER_IDENTIFIER9))) { + DPRINT1("Invalid pIdentifier parameter specified"); UNLOCK_D3D9(); return D3DERR_INVALIDCALL; } @@ -152,17 +153,140 @@ return D3D_OK; } +/*++ +* @name IDirect3D9::GetAdapterModeCount +* @implemented +* +* The function IDirect3D9Impl_GetAdapterModeCount looks if the specified display adapter supports +* a specific pixel format and counts the available display modes for that format. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DFORMAT Format +* The pixel format to search for +* +* @return HRESULT +* If the method is successfull it returns the number of display modes with the specified Format. +* If Adapter is out of range, the return value will be 0. +* +*/ static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { - UNIMPLEMENTED - - return D3D_OK; -} - + UINT AdapterModeCount; + + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Format != D3DFMT_R5G6B5) + { + AdapterModeCount = GetDisplayFormatCount( + Format, + This->DisplayAdapters[Adapter].pSupportedD3DFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DFormats); + } + else + { + AdapterModeCount = GetDisplayFormatCount( + Format, + This->DisplayAdapters[Adapter].pSupportedD3DExtendedFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DExtendedFormats); + } + + UNLOCK_D3D9(); + return AdapterModeCount; +} + +/*++ +* @name IDirect3D9::EnumAdapterModes +* @implemented +* +* The function IDirect3D9Impl_EnumAdapterModes looks if the specified display adapter supports +* a specific pixel format and fills the pMode argument with the available display modes for that format. +* This function is often used in a loop to enumerate all the display modes the adapter supports. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DFORMAT Format +* The pixel format to search for +* +* @param UINT Mode +* Index within the pixel format to be returned. +* The maximym value for this is the value returned by IDirect3D9::GetAdapterModeCount(). +* +* @param D3DDISPLAYMODE* pMode +* Pointer to a D3DDISPLAYMODE structure to be filled with the display mode information +* for the specified format. +* +* @return HRESULT +* If the method successfully fills the pMode structure, the return value is D3D_OK. +* If Adapter is out of range, pMode is a bad pointer or, no modes for the specified +* format was found or the mode parameter was invalid - the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { - UNIMPLEMENTED + const D3DDISPLAYMODE* pMatchingDisplayFormat; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE))) + { + DPRINT1("Invalid pMode parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Format != D3DFMT_R5G6B5) + { + pMatchingDisplayFormat = FindDisplayFormat( + Format, + Mode, + This->DisplayAdapters[Adapter].pSupportedD3DFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DFormats); + } + else + { + pMatchingDisplayFormat = FindDisplayFormat( + Format, + Mode, + This->DisplayAdapters[Adapter].pSupportedD3DExtendedFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DExtendedFormats); + } + + if (pMatchingDisplayFormat != NULL) + { + *pMode = *pMatchingDisplayFormat; + } + UNLOCK_D3D9(); + + + if (pMatchingDisplayFormat == NULL) + return D3DERR_INVALIDCALL; return D3D_OK; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Feb 10 11:44:06 2008 @@ -21,10 +21,10 @@ /* 0x011c */ DWORD unknown000002; /* 0x0120 */ DWORD unknown000003; /* 0x0124 */ DWORD unknown000004; /* 0x00000001 */ -/* 0x0128 */ DWORD unknown000005; -/* 0x012c */ DWORD unknown000006; -/* 0x0130 */ DWORD unknown000007; -/* 0x0134 */ DWORD unknown000008; +/* 0x0128 */ DWORD NumSupportedD3DFormats; +/* 0x012c */ DWORD NumSupportedD3DExtendedFormats; +/* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; +/* 0x0134 */ D3DDISPLAYMODE* pSupportedD3DExtendedFormats; /* 0x0138 */ DWORD unknown000009; /* 0x013c */ DWORD unknown000010; /* D3D9_DRIVERCAPS? */ /* 0x0140 */ DWORD unknown000011;

1 0

[gbrunmar] 32248: * Made it possible to include both d3d9types.h and ddrawgdi.h at the same time
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 10:30:27 2008 New Revision: 32248 URL: http://svn.reactos.org/svn/reactos?rev=32248&view=rev Log: * Made it possible to include both d3d9types.h and ddrawgdi.h at the same time Modified: trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/psdk/ddrawgdi.h Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Feb 10 10:30:27 2008 @@ -9,7 +9,6 @@ */ #include "rosdraw.h" -#include "ddrawgdi.h" DDRAWI_DIRECTDRAW_GBL ddgbl; DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Feb 10 10:30:27 2008 @@ -15,6 +15,7 @@ #include <ddrawint.h> #include <ddrawgdi.h> #include <ntgdi.h> +#include <d3dhal.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c Sun Feb 10 10:30:27 2008 @@ -14,6 +14,7 @@ #include <ddrawint.h> #include <ddrawgdi.h> #include <ntgdi.h> +#include <d3dhal.h> /* * @implemented Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/d3dhal.h (original) +++ trunk/reactos/include/ddk/d3dhal.h Sun Feb 10 10:30:27 2008 @@ -59,7 +59,12 @@ DWORD dwNumClipVertices; DWORD dwNumTextureFormats; LPDDSURFACEDESC lpTextureFormats; -} D3DHAL_GLOBALDRIVERDATA,*LPD3DHAL_GLOBALDRIVERDATA; +} D3DHAL_GLOBALDRIVERDATA; + +#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED +typedef D3DHAL_GLOBALDRIVERDATA *LPD3DHAL_GLOBALDRIVERDATA; +#define D3DHAL_GLOBALDRIVERDATA_DEFINED +#endif typedef struct _D3DHAL_D3DEXTENDEDCAPS { DWORD dwSize; @@ -159,7 +164,12 @@ DWORD dwReserved7; DWORD dwReserved8; DWORD dwReserved9; -} D3DHAL_CALLBACKS,*LPD3DHAL_CALLBACKS; +} D3DHAL_CALLBACKS; + +#ifndef D3DHAL_CALLBACKS_DEFINED +typedef D3DHAL_CALLBACKS *LPD3DHAL_CALLBACKS; +#define D3DHAL_CALLBACKS_DEFINED +#endif typedef struct _D3DHAL_SETRENDERTARGETDATA *LPD3DHAL_SETRENDERTARGETDATA; typedef struct _D3DHAL_CLEARDATA *LPD3DHAL_CLEARDATA; Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawgdi.h (original) +++ trunk/reactos/include/psdk/ddrawgdi.h Sun Feb 10 10:30:27 2008 @@ -19,7 +19,6 @@ #ifndef _DDRAWGDI_ #define _DDRAWGDI_ -#include <d3dhal.h> /* Define the real export names */ #define DdCreateDirectDrawObject GdiEntry1 @@ -39,6 +38,15 @@ #define DdSetGammaRamp GdiEntry15 #define DdSwapTextureHandles GdiEntry16 +#ifndef D3DHAL_CALLBACKS_DEFINED +typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS; +#define D3DHAL_CALLBACKS_DEFINED +#endif + +#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED +typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA; +#define D3DHAL_GLOBALDRIVERDATA_DEFINED +#endif BOOL STDCALL

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs