Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[janderwald] 54837: [USB-BRINGUP] - Fix creating instance id - Print debug message - Sync msmouse with head and add hid installation - Needs input.inf written - HID stack starts to initializes and ...
by janderwald＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: janderwald Date: Thu Jan 5 01:24:11 2012 New Revision: 54837 URL: http://svn.reactos.org/svn/reactos?rev=54837&view=rev Log: [USB-BRINGUP] - Fix creating instance id - Print debug message - Sync msmouse with head and add hid installation - Needs input.inf written - HID stack starts to initializes and then fails the to enable the device interface (/drivers/hid/hidclass/pdo.c:511), Logs show that IoGetDeviceObjectPointer() fails with STATUS_UNSUCCESSFUL Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/media/inf/msmouse.inf Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Jan 5 01:24:11 2012 @@ -501,15 +501,16 @@ // now register the device interface // Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); + DPRINT1("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status); if (NT_SUCCESS(Status)) { // // enable device interface // Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); + DPRINT1("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status); } ASSERT(Status == STATUS_SUCCESS); - // // break // Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu Jan 5 01:24:11 2012 @@ -803,6 +803,7 @@ NTSTATUS Status; ULONG Index; PWCHAR BufferPtr; + WCHAR Buffer[100]; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; @@ -959,7 +960,7 @@ // // the device did not provide a serial number, lets create a pseudo instance id // - Index = swprintf(BufferPtr, L"USB\\Vid_%04x&Pid_%04x&1A0700BC\0", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; + Index = swprintf(Buffer, L"0&%04d", UsbChildExtension->PortNumber) + 1; UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); if (UsbChildExtension->usInstanceId.Buffer == NULL) { @@ -970,7 +971,7 @@ // // copy instance id // - RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, BufferPtr, wcslen(BufferPtr) * sizeof(WCHAR)); + RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, wcslen(Buffer) * sizeof(WCHAR)); UsbChildExtension->usInstanceId.Length = UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); Modified: branches/usb-bringup/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/media/inf/msmouse.i… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 54836: [USB-BRINGUP] - Create a pesudo random instance id - Fixes assert when plugin usb devices whose device descriptor don't provide a serial number
by janderwald＠svn.reactos.org 05 Jan '12

05 Jan '12

Author: janderwald Date: Thu Jan 5 00:13:50 2012 New Revision: 54836 URL: http://svn.reactos.org/svn/reactos?rev=54836&view=rev Log: [USB-BRINGUP] - Create a pesudo random instance id - Fixes assert when plugin usb devices whose device descriptor don't provide a serial number Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu Jan 5 00:13:50 2012 @@ -954,6 +954,28 @@ UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); } + else + { + // + // the device did not provide a serial number, lets create a pseudo instance id + // + Index = swprintf(BufferPtr, L"USB\\Vid_%04x&Pid_%04x&1A0700BC\0", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct) + 1; + UsbChildExtension->usInstanceId.Buffer = (LPWSTR)ExAllocatePool(NonPagedPool, Index * sizeof(WCHAR)); + if (UsbChildExtension->usInstanceId.Buffer == NULL) + { + DPRINT1("Error: failed to allocate %lu bytes\n", Index * sizeof(WCHAR)); + goto Cleanup; + } + + // + // copy instance id + // + RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, BufferPtr, wcslen(BufferPtr) * sizeof(WCHAR)); + UsbChildExtension->usInstanceId.Length = UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); + + DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); + } + return Status;

1 0

[janderwald] 54835: [USB-BRINGUP] - Fix build
by janderwald＠svn.reactos.org 04 Jan '12

04 Jan '12

Author: janderwald Date: Wed Jan 4 22:21:03 2012 New Revision: 54835 URL: http://svn.reactos.org/svn/reactos?rev=54835&view=rev Log: [USB-BRINGUP] - Fix build Modified: branches/usb-bringup/lib/drivers/hidparser/parser.h Modified: branches/usb-bringup/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/parser.h [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/parser.h [iso-8859-1] Wed Jan 4 22:21:03 2012 @@ -344,7 +344,7 @@ HIDPARSER_STATUS HidParser_GetUsagesWithReport( IN PHID_PARSER Parser, - IN HIDP_REPORT_TYPE ReportType, + IN ULONG ReportType, IN USAGE UsagePage, OUT USAGE *UsageList, IN OUT PULONG UsageLength, @@ -354,9 +354,9 @@ HIDPARSER_STATUS HidParser_GetScaledUsageValueWithReport( IN PHID_PARSER Parser, - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, + IN ULONG ReportType, + IN USAGE UsagePage, IN USAGE Usage, - OUT PLONG UsageValue, - IN PCHAR ReportDescriptor, - IN ULONG ReportDescriptorLength); + OUT PLONG UsageValue, + IN PCHAR ReportDescriptor, + IN ULONG ReportDescriptorLength);

1 0

[janderwald] 54834: [USB-BRINGUP] - Implement a HID parsing library, which is based on Haiku`s exellent HID Stack - Implement HidP_FreeCollection, HidP_GetCaps, HidP_GetCollectionDescription, HidP_...
by janderwald＠svn.reactos.org 04 Jan '12

04 Jan '12

Author: janderwald Date: Wed Jan 4 21:58:18 2012 New Revision: 54834 URL: http://svn.reactos.org/svn/reactos?rev=54834&view=rev Log: [USB-BRINGUP] - Implement a HID parsing library, which is based on Haiku`s exellent HID Stack - Implement HidP_FreeCollection, HidP_GetCaps, HidP_GetCollectionDescription, HidP_MaxUsageListLength, HidP_GetSpecificValueCaps, HidP_GetUsages, HidP_GetScaledUsageValue - hidparse driver is now implemented enough to support a hid mouse - Tested in VBox 4.1.4 + WinXP + ReactOS usbohci+ mouhid+ hidclass+ hidparse+hidusb Added: branches/usb-bringup/lib/drivers/hidparser/ (with props) branches/usb-bringup/lib/drivers/hidparser/CMakeLists.txt (with props) branches/usb-bringup/lib/drivers/hidparser/api.c (with props) branches/usb-bringup/lib/drivers/hidparser/hidparser.c (with props) branches/usb-bringup/lib/drivers/hidparser/hidparser.h (with props) branches/usb-bringup/lib/drivers/hidparser/parser.c (with props) branches/usb-bringup/lib/drivers/hidparser/parser.h (with props) Modified: branches/usb-bringup/drivers/hid/hidparse/CMakeLists.txt branches/usb-bringup/drivers/hid/hidparse/hidparse.c branches/usb-bringup/drivers/hid/hidparse/hidparse.h branches/usb-bringup/lib/drivers/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/usb-bringup/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidpars… Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidpars… Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidpars… Modified: branches/usb-bringup/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/CMakeLi… Added: branches/usb-bringup/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… Added: branches/usb-bringup/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… Added: branches/usb-bringup/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… Added: branches/usb-bringup/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… Added: branches/usb-bringup/lib/drivers/hidparser/parser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… Added: branches/usb-bringup/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars…

1 0

[fireball] 54833: [NTOS] - Cast to actually returned types not just PVOID.
by fireball＠svn.reactos.org 04 Jan '12

04 Jan '12

Author: fireball Date: Wed Jan 4 12:22:38 2012 New Revision: 54833 URL: http://svn.reactos.org/svn/reactos?rev=54833&view=rev Log: [NTOS] - Cast to actually returned types not just PVOID. Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h Modified: trunk/reactos/ntoskrnl/include/internal/lpc_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc_x.h [iso-8859-1] Wed Jan 4 12:22:38 2012 @@ -103,7 +103,7 @@ /* Allocate a message from the port zone while holding the lock */ KeAcquireGuardedMutex(&LpcpLock); - Message = ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); + Message = (PLPCP_MESSAGE)ExAllocateFromPagedLookasideList(&LpcpMessagesLookaside); if (!Message) { /* Fail, and let caller cleanup */ @@ -136,7 +136,7 @@ } /* Otherwise, this is a message. Return the pointer */ - return (PVOID)((ULONG_PTR)Thread->LpcReplyMessage & ~LPCP_THREAD_FLAGS); + return (PLPCP_MESSAGE)((ULONG_PTR)Thread->LpcReplyMessage & ~LPCP_THREAD_FLAGS); } FORCEINLINE @@ -147,7 +147,7 @@ if (((ULONG_PTR)Thread->LpcReplyMessage) & LPCP_THREAD_FLAG_IS_PORT) { /* The pointer is actually a port, return it */ - return (PVOID)((ULONG_PTR)Thread->LpcWaitingOnPort & + return (PLPCP_PORT_OBJECT)((ULONG_PTR)Thread->LpcWaitingOnPort & ~LPCP_THREAD_FLAGS); }

1 0

[fireball] 54832: [NDK] - Fix a typo ("add more underscores!") in a struct forward declaration.
by fireball＠svn.reactos.org 04 Jan '12

04 Jan '12

Author: fireball Date: Wed Jan 4 12:18:23 2012 New Revision: 54832 URL: http://svn.reactos.org/svn/reactos?rev=54832&view=rev Log: [NDK] - Fix a typo ("add more underscores!") in a struct forward declaration. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Wed Jan 4 12:18:23 2012 @@ -847,7 +847,7 @@ USHORT Size; PDEVICE_OBJECT DeviceObject; ULONG PowerFlags; - struct DEVICE_OBJECT_POWER_EXTENSION *Dope; + struct _DEVICE_OBJECT_POWER_EXTENSION *Dope; ULONG ExtensionFlags; struct _DEVICE_NODE *DeviceNode; PDEVICE_OBJECT AttachedTo;

1 0

[cgutman] 54831: [NDISUIO] - Build file fixes
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 21:13:43 2012 New Revision: 54831 URL: http://svn.reactos.org/svn/reactos?rev=54831&view=rev Log: [NDISUIO] - Build file fixes Modified: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild Modified: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] Tue Jan 3 21:13:43 2012 @@ -2,17 +2,16 @@ -DNDIS50 -D_NTDRIVER_) -spec2def(ndisuio.sys ndisuio.spec) - list(APPEND SOURCE - main.c - ndisuio.rc - ${CMAKE_CURRENT_BINARY_DIR}/ndisuio.def) + createclose.c + ioctl.c + main.c + misc.c + protocol.c + readwrite.c + ndisuio.rc) add_library(ndisuio SHARED ${SOURCE}) - -target_link_libraries(ndisuio - ${PSEH_LIB}) set_module_type(ndisuio kernelmodedriver) add_importlibs(ndisuio ndis ntoskrnl hal) Modified: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] Tue Jan 3 21:13:43 2012 @@ -5,10 +5,14 @@ <define name="NDIS50" /> <define name="_NTDRIVER_" /> <library>ndis</library> - <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> <pch>ndisuio.h</pch> + <file>createclose.c</file> + <file>ioctl.c</file> <file>main.c</file> + <file>misc.c</file> + <file>protocol.c</file> + <file>readwrite.c</file> <file>ndisuio.rc</file> </module>

1 0

[pschweitzer] 54830: [WININET] Fix handle leak Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/85e2b4d7df04387908eeb027731e0492e68fa506
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 20:45:28 2012 New Revision: 54830 URL: http://svn.reactos.org/svn/reactos?rev=54830&view=rev Log: [WININET] Fix handle leak Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/85e2b4d7df04387908eeb027731e04… Modified: trunk/reactos/dll/win32/wininet/http.c Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Tue Jan 3 20:45:28 2012 @@ -1900,6 +1900,8 @@ if(module) FreeLibrary(module); } + else + CloseHandle(thread); } return; }

1 0

[pschweitzer] 54829: [DPLAYX] Fix handle leak Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/2d14f89fea8fa7d7819e5c22ace94dbf41411601
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 20:44:42 2012 New Revision: 54829 URL: http://svn.reactos.org/svn/reactos?rev=54829&view=rev Log: [DPLAYX] Fix handle leak Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/2d14f89fea8fa7d7819e5c22ace94d… Modified: trunk/reactos/dll/directx/dplayx/dplayx_messages.c Modified: trunk/reactos/dll/directx/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx_… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx_messages.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx_messages.c [iso-8859-1] Tue Jan 3 20:44:42 2012 @@ -58,6 +58,7 @@ { DWORD dwMsgThreadId; LPMSGTHREADINFO lpThreadInfo; + HANDLE hThread; lpThreadInfo = HeapAlloc( GetProcessHeap(), 0, sizeof( *lpThreadInfo ) ); if( lpThreadInfo == NULL ) @@ -83,21 +84,20 @@ lpThreadInfo->hDeath = hDeath; lpThreadInfo->hSettingRead = hConnRead; - if( !CreateThread( NULL, /* Security attribs */ - 0, /* Stack */ - DPL_MSG_ThreadMain, /* Msg reception function */ - lpThreadInfo, /* Msg reception func parameter */ - 0, /* Flags */ - &dwMsgThreadId /* Updated with thread id */ - ) - ) + hThread = CreateThread( NULL, /* Security attribs */ + 0, /* Stack */ + DPL_MSG_ThreadMain, /* Msg reception function */ + lpThreadInfo, /* Msg reception func parameter */ + 0, /* Flags */ + &dwMsgThreadId /* Updated with thread id */ + ); + if ( hThread == NULL ) { ERR( "Unable to create msg thread\n" ); goto error; } - /* FIXME: Should I be closing the handle to the thread or does that - terminate the thread? */ + CloseHandle(hThread); return dwMsgThreadId;

1 0

[pschweitzer] 54828: [SHELL32_WINETEST] Get back previously commented out tests
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 20:41:32 2012 New Revision: 54828 URL: http://svn.reactos.org/svn/reactos?rev=54828&view=rev Log: [SHELL32_WINETEST] Get back previously commented out tests Modified: trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Tue Jan 3 20:41:32 2012 @@ -116,7 +116,6 @@ return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; } -#if 0 static BOOL file_has_content(const CHAR *name, const CHAR *content) { CHAR buf[MAX_PATH]; @@ -131,7 +130,6 @@ CloseHandle(file); return strcmp(buf, content)==0; } -#endif /* initializes the tests */ static void init_shfo_tests(void) @@ -813,7 +811,6 @@ } /* tests the FO_COPY action */ -#if 0 static void test_copy(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -1760,10 +1757,8 @@ ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } -#endif /* tests the FO_MOVE action */ -#if 0 static void test_move(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -2041,7 +2036,6 @@ ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } } -#endif static void test_sh_create_dir(void) { @@ -2402,7 +2396,6 @@ test_rename(); clean_after_shfo_tests(); -#if 0 init_shfo_tests(); test_copy(); clean_after_shfo_tests(); @@ -2410,7 +2403,6 @@ init_shfo_tests(); test_move(); clean_after_shfo_tests(); -#endif test_sh_create_dir(); clean_after_shfo_tests(); Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Tue Jan 3 20:41:32 2012 @@ -348,7 +348,6 @@ RemoveDirectoryA(".\\testdir"); } -#if 0 /* perform test */ static void test_EnumObjects(IShellFolder *iFolder) { @@ -434,7 +433,6 @@ for (i=0;i<5;i++) IMalloc_Free(ppM, idlArr[i]); } -#endif static void test_BindToObject(void) { @@ -1336,7 +1334,6 @@ ok(result, "SHGetPathFromIDListW failed\n"); } -#if 0 static void test_EnumObjects_and_CompareIDs(void) { ITEMIDLIST *newPIDL; @@ -1381,7 +1378,6 @@ IShellFolder_Release(IDesktopFolder); } -#endif /* A simple implementation of an IPropertyBag, which returns fixed values for * 'Target' and 'Attributes' properties. @@ -4591,9 +4587,7 @@ test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject(); -#if 0 test_EnumObjects_and_CompareIDs(); -#endif test_GetDisplayName(); test_GetAttributesOf(); test_SHGetPathFromIDList();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012