Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sedwards] 16716: fix line ending I hope
by sedwards＠svn.reactos.com 24 Jul '05

24 Jul '05

fix line ending I hope Modified: trunk/rosapps/tests/directory.xml _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-07-24 18:32:34 UTC (rev 16715) +++ trunk/rosapps/tests/directory.xml 2005-07-24 21:17:54 UTC (rev 16716) @@ -1,271 +1,271 @@ <directory name="accelerator"> <xi:include href="accelerator/accelerator.xml" /> -</directory> +</directory> <directory name="alive"> <xi:include href="alive/alive.xml" /> -</directory> +</directory> <directory name="alphablend"> <xi:include href="alphablend/alphablend.xml" /> -</directory> +</directory> <directory name="apc"> <xi:include href="apc/apc.xml" /> -</directory> +</directory> <directory name="apc2"> <xi:include href="apc2/apc2.xml" /> -</directory> +</directory> <directory name="args"> <xi:include href="args/args.xml" /> -</directory> +</directory> <directory name="atomtest"> <xi:include href="atomtest/atomtest.xml" /> -</directory> +</directory> <directory name="bench"> <xi:include href="bench/bench.xml" /> -</directory> +</directory> <directory name="bitblt"> <xi:include href="bitblt/bitblt.xml" /> -</directory> +</directory> <directory name="button"> <xi:include href="button/button.xml" /> -</directory> +</directory> <directory name="button2"> <xi:include href="button2/button2.xml" /> -</directory> +</directory> <directory name="capclock"> <xi:include href="capclock/capclock.xml" /> -</directory> +</directory> <directory name="carets"> <xi:include href="carets/carets.xml" /> -</directory> +</directory> <directory name="combo"> <xi:include href="combo/combo.xml" /> -</directory> +</directory> <directory name="consume"> <xi:include href="consume/consume.xml" /> -</directory> +</directory> <directory name="copymove"> <xi:include href="copymove/copymove.xml" /> -</directory> +</directory> <directory name="count"> <xi:include href="count/count.xml" /> -</directory> +</directory> <directory name="create-links"> <xi:include href="create-links/create-links.xml" /> -</directory> +</directory> <directory name="dibtest"> <xi:include href="dibtest/dibtest.xml" /> -</directory> +</directory> <directory name="dirdlg"> <xi:include href="dirdlg/dirdlg.xml" /> -</directory> +</directory> <directory name="diskspeed"> <xi:include href="diskspeed/diskspeed.xml" /> -</directory> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> -</directory> +</directory> <directory name="dnsquery"> <xi:include href="dnsquery/dnsquery.xml" /> -</directory> +</directory> <directory name="dump_shared_data"> <xi:include href="dump_shared_data/dump_shared_data.xml" /> -</directory> +</directory> <directory name="edit"> <xi:include href="edit/edit.xml" /> -</directory> +</directory> <directory name="enhmetafile"> <xi:include href="enhmetafile/enhmetafile.xml" /> -</directory> +</directory> <directory name="enumfonts"> <xi:include href="enumfonts/enumfonts.xml" /> -</directory> +</directory> <directory name="enumwnd"> <xi:include href="enumwnd/enumwnd.xml" /> -</directory> +</directory> <directory name="enumws"> <xi:include href="enumws/enumws.xml" /> -</directory> +</directory> <directory name="event"> <xi:include href="event/event.xml" /> -</directory> +</directory> <directory name="eventpair"> <xi:include href="eventpair/eventpair.xml" /> -</directory> +</directory> <directory name="fiber"> <xi:include href="fiber/fiber.xml" /> -</directory> +</directory> <directory name="gethostbyname"> <xi:include href="gethostbyname/gethostbyname.xml" /> -</directory> +</directory> <directory name="global_mem"> <xi:include href="global_mem/global_mem.xml" /> -</directory> +</directory> <directory name="gradient"> <xi:include href="gradient/gradient.xml" /> -</directory> +</directory> <directory name="guithreadinfo"> <xi:include href="guithreadinfo/guithreadinfo.xml" /> -</directory> +</directory> <directory name="hello"> <xi:include href="hello/hello.xml" /> -</directory> +</directory> <directory name="hivetest"> <xi:include href="hivetest/hivetest.xml" /> -</directory> +</directory> <directory name="icontest"> <xi:include href="icontest/icontest.xml" /> -</directory> +</directory> <directory name="iptest"> <xi:include href="iptest/iptest.xml" /> -</directory> +</directory> <directory name="isotest"> <xi:include href="isotest/isotest.xml" /> -</directory> +</directory> <directory name="lan"> <xi:include href="lan/lan.xml" /> -</directory> +</directory> <directory name="lineclip"> <xi:include href="lineclip/lineclip.xml" /> -</directory> +</directory> <directory name="linetest"> <xi:include href="linetest/linetest.xml" /> -</directory> +</directory> <directory name="lpc"> <xi:include href="lpc/lpc.xml" /> -</directory> +</directory> <directory name="map_dup_inherit"> <xi:include href="map_dup_inherit/map_dup_inherit.xml" /> -</directory> +</directory> <directory name="mdi"> <xi:include href="mdi/mdi.xml" /> -</directory> +</directory> <directory name="miditest"> <xi:include href="miditest/miditest.xml" /> -</directory> +</directory> <directory name="mktime"> <xi:include href="mktime/mktime.xml" /> -</directory> +</directory> <directory name="moztest"> <xi:include href="moztest/moztest.xml" /> -</directory> +</directory> <directory name="mstest"> <xi:include href="mstest/mstest.xml" /> -</directory> +</directory> <directory name="multithrdwin"> <xi:include href="multithrdwin/multithrdwin.xml" /> -</directory> +</directory> <directory name="multiwin"> <xi:include href="multiwin/multiwin.xml" /> -</directory> +</directory> <directory name="mutex"> <xi:include href="mutex/mutex.xml" /> -</directory> +</directory> <directory name="nameserverlist"> <xi:include href="nameserverlist/nameserverlist.xml" /> -</directory> +</directory> <directory name="noexecute"> <xi:include href="noexecute/noexecute.xml" /> -</directory> +</directory> <directory name="nptest"> <xi:include href="nptest/nptest.xml" /> -</directory> +</directory> <directory name="oskittcp"> <xi:include href="oskittcp/oskittcp.xml" /> -</directory> +</directory> <directory name="palbitblt"> <xi:include href="palbitblt/palbitblt.xml" /> -</directory> +</directory> <directory name="patblt"> <xi:include href="patblt/patblt.xml" /> -</directory> +</directory> <directory name="p_dup_handle"> <xi:include href="p_dup_handle/p_dup_handle.xml" /> -</directory> +</directory> <directory name="polytest"> <xi:include href="polytest.xml" /> -</directory> +</directory> <directory name="popupmenu"> <xi:include href="popupmenu/popupmenu.xml" /> -</directory> +</directory> <directory name="primitives"> <xi:include href="primitives/primitives.xml" /> -</directory> +</directory> <directory name="pteb"> <xi:include href="pteb/pteb.xml" /> -</directory> +</directory> <directory name="regdump"> <xi:include href="regdump/regdump.xml" /> -</directory> +</directory> <directory name="regqueryvalue"> <xi:include href="regqueryvalue/regqueryvalue.xml" /> -</directory> +</directory> <directory name="regtest"> <xi:include href="regtest/regtest.xml" /> -</directory> +</directory> <directory name="sectest"> <xi:include href="sectest/sectest.xml" /> -</directory> +</directory> <directory name="sertest"> <xi:include href="sertest/sertest.xml" /> -</directory> +</directory> <directory name="shaptest"> <xi:include href="shaptest/shaptest.xml" /> -</directory> +</directory> <directory name="shm"> <xi:include href="shm/shm.xml" /> -</directory> +</directory> <directory name="statst"> <xi:include href="statst/statst.xml" /> -</directory> +</directory> <directory name="statst2"> <xi:include href="statst2/statst2.xml" /> -</directory> +</directory> <directory name="stretchblt"> <xi:include href="stretchblt/stretchblt.xml" /> -</directory> +</directory> <directory name="subclass"> <xi:include href="subclass/subclass.xml" /> -</directory> +</directory> <directory name="suspend"> <xi:include href="suspend/suspend.xml" /> -</directory> +</directory> <directory name="tcpsvr"> <xi:include href="tcpsvr/tcpsvr.xml" /> -</directory> +</directory> <directory name="terminate"> <xi:include href="terminate/terminate.xml" /> -</directory> +</directory> <directory name="thread"> <xi:include href="thread/thread.xml" /> -</directory> +</directory> <directory name="thread_msg"> <xi:include href="thread_msg/thread_msg.xml" /> -</directory> +</directory> <directory name="threadwait"> <xi:include href="threadwait/threadwait.xml" /> -</directory> +</directory> <directory name="tmrqueue"> <xi:include href="tmrqueue/tmrqueue.xml" /> -</directory> +</directory> <directory name="tokentest"> <xi:include href="tokentest/tokentest.xml" /> -</directory> +</directory> <directory name="txtscale"> <xi:include href="txtscale/txtscale.xml" /> -</directory> +</directory> <directory name="vmtest"> <xi:include href="vmtest/vmtest.xml" /> -</directory> +</directory> <directory name="winhello"> <xi:include href="winhello/winhello.xml" /> -</directory> +</directory> <directory name="wm_erasebkgnd"> <xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" /> -</directory> +</directory> <directory name="wm_paint"> <xi:include href="wm_paint/wm_paint.xml" /> -</directory> +</directory> <directory name="zwcontinue"> <xi:include href="zwcontinue/zwcontinue.xml" /> -</directory> - +</directory> +

1 0

[sedwards] 16715: added directory.xml for tests
by sedwards＠svn.reactos.com 24 Jul '05

24 Jul '05

added directory.xml for tests Added: trunk/rosapps/tests/directory.xml _____ Added: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-07-24 17:48:52 UTC (rev 16714) +++ trunk/rosapps/tests/directory.xml 2005-07-24 18:32:34 UTC (rev 16715) @@ -0,0 +1,271 @@ +<directory name="accelerator"> + <xi:include href="accelerator/accelerator.xml" /> +</directory> +<directory name="alive"> + <xi:include href="alive/alive.xml" /> +</directory> +<directory name="alphablend"> + <xi:include href="alphablend/alphablend.xml" /> +</directory> +<directory name="apc"> + <xi:include href="apc/apc.xml" /> +</directory> +<directory name="apc2"> + <xi:include href="apc2/apc2.xml" /> +</directory> +<directory name="args"> + <xi:include href="args/args.xml" /> +</directory> +<directory name="atomtest"> + <xi:include href="atomtest/atomtest.xml" /> +</directory> +<directory name="bench"> + <xi:include href="bench/bench.xml" /> +</directory> +<directory name="bitblt"> + <xi:include href="bitblt/bitblt.xml" /> +</directory> +<directory name="button"> + <xi:include href="button/button.xml" /> +</directory> +<directory name="button2"> + <xi:include href="button2/button2.xml" /> +</directory> +<directory name="capclock"> + <xi:include href="capclock/capclock.xml" /> +</directory> +<directory name="carets"> + <xi:include href="carets/carets.xml" /> +</directory> +<directory name="combo"> + <xi:include href="combo/combo.xml" /> +</directory> +<directory name="consume"> + <xi:include href="consume/consume.xml" /> +</directory> +<directory name="copymove"> + <xi:include href="copymove/copymove.xml" /> +</directory> +<directory name="count"> + <xi:include href="count/count.xml" /> +</directory> +<directory name="create-links"> + <xi:include href="create-links/create-links.xml" /> +</directory> +<directory name="dibtest"> + <xi:include href="dibtest/dibtest.xml" /> +</directory> +<directory name="dirdlg"> + <xi:include href="dirdlg/dirdlg.xml" /> +</directory> +<directory name="diskspeed"> + <xi:include href="diskspeed/diskspeed.xml" /> +</directory> +<directory name="dnsapi"> + <xi:include href="dnsapi/dnsapi.xml" /> +</directory> +<directory name="dnsquery"> + <xi:include href="dnsquery/dnsquery.xml" /> +</directory> +<directory name="dump_shared_data"> + <xi:include href="dump_shared_data/dump_shared_data.xml" /> +</directory> +<directory name="edit"> + <xi:include href="edit/edit.xml" /> +</directory> +<directory name="enhmetafile"> + <xi:include href="enhmetafile/enhmetafile.xml" /> +</directory> +<directory name="enumfonts"> + <xi:include href="enumfonts/enumfonts.xml" /> +</directory> +<directory name="enumwnd"> + <xi:include href="enumwnd/enumwnd.xml" /> +</directory> +<directory name="enumws"> + <xi:include href="enumws/enumws.xml" /> +</directory> +<directory name="event"> + <xi:include href="event/event.xml" /> +</directory> +<directory name="eventpair"> + <xi:include href="eventpair/eventpair.xml" /> +</directory> +<directory name="fiber"> + <xi:include href="fiber/fiber.xml" /> +</directory> +<directory name="gethostbyname"> + <xi:include href="gethostbyname/gethostbyname.xml" /> +</directory> +<directory name="global_mem"> + <xi:include href="global_mem/global_mem.xml" /> +</directory> +<directory name="gradient"> + <xi:include href="gradient/gradient.xml" /> +</directory> +<directory name="guithreadinfo"> + <xi:include href="guithreadinfo/guithreadinfo.xml" /> +</directory> +<directory name="hello"> + <xi:include href="hello/hello.xml" /> +</directory> +<directory name="hivetest"> + <xi:include href="hivetest/hivetest.xml" /> +</directory> +<directory name="icontest"> + <xi:include href="icontest/icontest.xml" /> +</directory> +<directory name="iptest"> + <xi:include href="iptest/iptest.xml" /> +</directory> +<directory name="isotest"> + <xi:include href="isotest/isotest.xml" /> +</directory> +<directory name="lan"> + <xi:include href="lan/lan.xml" /> +</directory> +<directory name="lineclip"> + <xi:include href="lineclip/lineclip.xml" /> +</directory> +<directory name="linetest"> + <xi:include href="linetest/linetest.xml" /> +</directory> +<directory name="lpc"> + <xi:include href="lpc/lpc.xml" /> +</directory> +<directory name="map_dup_inherit"> + <xi:include href="map_dup_inherit/map_dup_inherit.xml" /> +</directory> +<directory name="mdi"> + <xi:include href="mdi/mdi.xml" /> +</directory> +<directory name="miditest"> + <xi:include href="miditest/miditest.xml" /> +</directory> +<directory name="mktime"> + <xi:include href="mktime/mktime.xml" /> +</directory> +<directory name="moztest"> + <xi:include href="moztest/moztest.xml" /> +</directory> +<directory name="mstest"> + <xi:include href="mstest/mstest.xml" /> +</directory> +<directory name="multithrdwin"> + <xi:include href="multithrdwin/multithrdwin.xml" /> +</directory> +<directory name="multiwin"> + <xi:include href="multiwin/multiwin.xml" /> +</directory> +<directory name="mutex"> + <xi:include href="mutex/mutex.xml" /> +</directory> +<directory name="nameserverlist"> + <xi:include href="nameserverlist/nameserverlist.xml" /> +</directory> +<directory name="noexecute"> + <xi:include href="noexecute/noexecute.xml" /> +</directory> +<directory name="nptest"> + <xi:include href="nptest/nptest.xml" /> +</directory> +<directory name="oskittcp"> + <xi:include href="oskittcp/oskittcp.xml" /> +</directory> +<directory name="palbitblt"> + <xi:include href="palbitblt/palbitblt.xml" /> +</directory> +<directory name="patblt"> + <xi:include href="patblt/patblt.xml" /> +</directory> +<directory name="p_dup_handle"> + <xi:include href="p_dup_handle/p_dup_handle.xml" /> +</directory> +<directory name="polytest"> + <xi:include href="polytest.xml" /> +</directory> +<directory name="popupmenu"> + <xi:include href="popupmenu/popupmenu.xml" /> +</directory> +<directory name="primitives"> + <xi:include href="primitives/primitives.xml" /> +</directory> +<directory name="pteb"> + <xi:include href="pteb/pteb.xml" /> +</directory> +<directory name="regdump"> + <xi:include href="regdump/regdump.xml" /> +</directory> +<directory name="regqueryvalue"> + <xi:include href="regqueryvalue/regqueryvalue.xml" /> +</directory> +<directory name="regtest"> + <xi:include href="regtest/regtest.xml" /> +</directory> +<directory name="sectest"> + <xi:include href="sectest/sectest.xml" /> +</directory> +<directory name="sertest"> + <xi:include href="sertest/sertest.xml" /> +</directory> +<directory name="shaptest"> + <xi:include href="shaptest/shaptest.xml" /> +</directory> +<directory name="shm"> + <xi:include href="shm/shm.xml" /> +</directory> +<directory name="statst"> + <xi:include href="statst/statst.xml" /> +</directory> +<directory name="statst2"> + <xi:include href="statst2/statst2.xml" /> +</directory> +<directory name="stretchblt"> + <xi:include href="stretchblt/stretchblt.xml" /> +</directory> +<directory name="subclass"> + <xi:include href="subclass/subclass.xml" /> +</directory> +<directory name="suspend"> + <xi:include href="suspend/suspend.xml" /> +</directory> +<directory name="tcpsvr"> + <xi:include href="tcpsvr/tcpsvr.xml" /> +</directory> +<directory name="terminate"> + <xi:include href="terminate/terminate.xml" /> +</directory> +<directory name="thread"> + <xi:include href="thread/thread.xml" /> +</directory> +<directory name="thread_msg"> + <xi:include href="thread_msg/thread_msg.xml" /> +</directory> +<directory name="threadwait"> + <xi:include href="threadwait/threadwait.xml" /> +</directory> +<directory name="tmrqueue"> + <xi:include href="tmrqueue/tmrqueue.xml" /> +</directory> +<directory name="tokentest"> + <xi:include href="tokentest/tokentest.xml" /> +</directory> +<directory name="txtscale"> + <xi:include href="txtscale/txtscale.xml" /> +</directory> +<directory name="vmtest"> + <xi:include href="vmtest/vmtest.xml" /> +</directory> +<directory name="winhello"> + <xi:include href="winhello/winhello.xml" /> +</directory> +<directory name="wm_erasebkgnd"> + <xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" /> +</directory> +<directory name="wm_paint"> + <xi:include href="wm_paint/wm_paint.xml" /> +</directory> +<directory name="zwcontinue"> + <xi:include href="zwcontinue/zwcontinue.xml" /> +</directory> +

1 0

[hbirr] 16714: - Removed R_EXTRA_STACK because R_EXTRA_STACK and R_STACK must have the same size.
by hbirr＠svn.reactos.com 24 Jul '05

24 Jul '05

- Removed R_EXTRA_STACK because R_EXTRA_STACK and R_STACK must have the same size. - Initialized an allocated block completely before release the lock. Modified: trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h _____ Modified: trunk/reactos/ntoskrnl/mm/ppool.c --- trunk/reactos/ntoskrnl/mm/ppool.c 2005-07-24 17:21:26 UTC (rev 16713) +++ trunk/reactos/ntoskrnl/mm/ppool.c 2005-07-24 17:48:52 UTC (rev 16714) @@ -30,7 +30,6 @@ #define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) #define R_PANIC() KeBugCheck(0) #define R_DEBUG DbgPrint -#define R_EXTRA_STACK_UP 2 #define R_GET_STACK_FRAMES(ptr,cnt) KeRosGetStackFrames(ptr,cnt) #include "rpoolmgr.h" _____ Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-24 17:21:26 UTC (rev 16713) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-07-24 17:48:52 UTC (rev 16714) @@ -50,7 +50,13 @@ #ifndef R_STACK // R_STACK is the number of stack entries to store in blocks for debug purposes -#define R_STACK 3 +#define R_STACK 6 +#else // R_STACK +#if R_STACK > 0 && R_STACK < 6 +/* Increase the frame depth to get a reasonable back trace */ +#undef R_STACK +#define R_STACK 6 +#endif // R_STACK > 0 && R_STACK < 6 #endif//R_STACK #ifndef R_TAG @@ -257,10 +263,10 @@ RFreeFillStack ( PR_FREE free ) { int i; - ULONG stack[R_EXTRA_STACK_UP+3]; // need to skip 3 known levels of stack trace + ULONG stack[R_STACK+3]; // need to skip 3 known levels of stack trace memset ( stack, 0xCD, sizeof(stack) ); - R_GET_STACK_FRAMES ( stack, R_EXTRA_STACK_UP+3 ); - for ( i = 0; i < R_EXTRA_STACK_UP; i++ ) + R_GET_STACK_FRAMES ( stack, R_STACK+3 ); + for ( i = 0; i < R_STACK; i++ ) free->LastOwnerStack[i] = stack[i+3]; } @@ -268,10 +274,10 @@ RUsedFillStack ( PR_USED used ) { int i; - ULONG stack[R_EXTRA_STACK_UP+2]; // need to skip 2 known levels of stack trace + ULONG stack[R_STACK+2]; // need to skip 2 known levels of stack trace memset ( stack, 0xCD, sizeof(stack) ); - R_GET_STACK_FRAMES ( stack, R_EXTRA_STACK_UP+2 ); - for ( i = 0; i < R_EXTRA_STACK_UP; i++ ) + R_GET_STACK_FRAMES ( stack, R_STACK+2 ); + for ( i = 0; i < R_STACK; i++ ) used->LastOwnerStack[i] = stack[i+2]; } #endif @@ -719,9 +725,9 @@ { if ( (NewBlock = RQueRemove ( &pool->Que[que][align] )) ) { - R_RELEASE_MUTEX(pool); RiUsedInit ( NewBlock, Tag ); RiUsedInitRedZone ( NewBlock, NumberOfBytes ); + R_RELEASE_MUTEX(pool); return RHdrToBody(NewBlock); } queBytes = 16 << que; @@ -865,11 +871,10 @@ NewBlock = (PR_USED)BestBlock; RiUsedInit ( NewBlock, Tag ); - R_RELEASE_MUTEX(pool); - /* RtlZeroMemory(RHdrToBody(NewBlock), NumberOfBytes);*/ RiUsedInitRedZone ( NewBlock, NumberOfBytes ); + R_RELEASE_MUTEX(pool); return RHdrToBody(NewBlock); }

1 0

[hpoussin] 16713: Don't compare GUID strings with wcsicmp, but compare GUID* with IsEqualIID
by hpoussin＠svn.reactos.com 24 Jul '05

24 Jul '05

Don't compare GUID strings with wcsicmp, but compare GUID* with IsEqualIID Directly use HKEY_LOCAL_MACHINE instead of RegOpenKey(HKEY_LOCAL_MACHINE, NULL, ...). Remove use of UNICODE_NULL Replace #ifdef __WINE__ by #ifdef __WINESRC__ Fix SetupDiCallClassInstaller prototype (DWORD -> DI_FUNCTION) Thanks Usurp for your testing on Wine! This file works now unmodified in Wine. A patch would be soon sent to wine-patches ML. Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-24 14:08:20 UTC (rev 16712) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-24 17:21:26 UTC (rev 16713) @@ -91,7 +91,7 @@ { GUID InterfaceGuid; GUID ClassGuid; -#ifndef __WINE__ +#ifndef __WINESRC__ /* Pointer into Data field. Contains something like */ /* "ACPI\PNP0501\4&2658d0a0&0" */ PWSTR pInstancePath; @@ -670,15 +670,20 @@ list->hWnd = hwndParent; list->numberOfEntries = 0; if (MachineName) + { rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + HeapFree(GetProcessHeap(), 0, list); + return (HDEVINFO)INVALID_HANDLE_VALUE; + } + } else - rc = RegOpenKey(HKEY_LOCAL_MACHINE, NULL, &list->HKLM); - if (rc != ERROR_SUCCESS) { - SetLastError(rc); - HeapFree(GetProcessHeap(), 0, list); - return (HDEVINFO)INVALID_HANDLE_VALUE; + list->HKLM = HKEY_LOCAL_MACHINE; } + memcpy( &list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, @@ -1090,7 +1095,6 @@ static LONG SETUP_CreateDevListFromEnumerator( DeviceInfoList* list, LPCGUID pClassGuid OPTIONAL, - LPCWSTR pClassGuidW OPTIONAL, /* pClassGuid in string form */ LPCWSTR Enumerator, HKEY hEnumeratorKey) /* handle to Enumerator registry key */ { @@ -1146,16 +1150,16 @@ RegCloseKey(hDeviceIdKey); return rc; } - *pEndOfInstancePath = UNICODE_NULL; + *pEndOfInstancePath = '\0'; wcscat(InstancePath, KeyBuffer); /* Read ClassGUID value */ - dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + dwLength = sizeof(KeyBuffer) - sizeof(WCHAR); rc = RegQueryValueExW(hInstanceIdKey, ClassGUID, NULL, &dwRegType, (LPBYTE)KeyBuffer, &dwLength); RegCloseKey(hInstanceIdKey); if (rc == ERROR_FILE_NOT_FOUND) { - if (pClassGuidW) + if (pClassGuid) /* Skip this bad entry as we can't verify it */ continue; } @@ -1169,15 +1173,21 @@ RegCloseKey(hDeviceIdKey); return ERROR_GEN_FAILURE; } - else if (pClassGuidW) + else if (pClassGuid) { - if (wcsicmp(KeyBuffer, pClassGuidW) != 0) + GUID KeyGuid; + if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) + { + RegCloseKey(hDeviceIdKey); + return GetLastError(); + } + if (!IsEqualIID(&KeyGuid, pClassGuid)) /* Skip this entry as it is not the right device class */ continue; } /* Add the entry to the list */ - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.InstancePath) + wcslen(InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Device.InstancePath) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); if (!deviceInfo) { RegCloseKey(hDeviceIdKey); @@ -1202,28 +1212,13 @@ PCWSTR Enumerator OPTIONAL) { HKEY HKLM, hEnumKey, hEnumeratorKey; - WCHAR szGuidString[MAX_GUID_STRING_LEN + 3]; WCHAR KeyBuffer[MAX_PATH]; DWORD i; DWORD dwLength; DWORD rc; - /* Create szGuidString */ - if (class && !IsEqualIID(&class, &GUID_NULL)) - { - LPWSTR lpGuidString; - if (UuidToStringW((UUID *)class, &lpGuidString) != RPC_S_OK) - return ERROR_GEN_FAILURE; - wcscpy(szGuidString, L"{"); - wcscat(szGuidString, lpGuidString); - wcscat(szGuidString, L"}"); - RpcStringFreeW(&lpGuidString); - } - else - { + if (IsEqualIID(class, &GUID_NULL)) class = NULL; - szGuidString[0] = UNICODE_NULL; - } /* Open Enum key */ if (MachineName != NULL) @@ -1259,7 +1254,7 @@ RegCloseKey(hEnumKey); if (rc != ERROR_SUCCESS) return rc; - rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, Enumerator, hEnumeratorKey); + rc = SETUP_CreateDevListFromEnumerator(list, class, Enumerator, hEnumeratorKey); RegCloseKey(hEnumeratorKey); return rc; } @@ -1289,7 +1284,7 @@ } /* Call SETUP_CreateDevListFromEnumerator */ - rc = SETUP_CreateDevListFromEnumerator(list, class, *szGuidString ? szGuidString : NULL, KeyBuffer, hEnumeratorKey); + rc = SETUP_CreateDevListFromEnumerator(list, class, KeyBuffer, hEnumeratorKey); RegCloseKey(hEnumeratorKey); if (rc != ERROR_SUCCESS) { @@ -1302,7 +1297,7 @@ } } -#ifdef __WINE__ +#ifdef __WINESRC__ static LONG SETUP_CreateSerialDeviceList( DeviceInfoList *list, PCWSTR MachineName, @@ -1336,7 +1331,7 @@ devices = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); if (!devices) return ERROR_NO_SYSTEM_RESOURCES; - *devices = UNICODE_NULL; + *devices = '\0'; } else { @@ -1354,7 +1349,7 @@ /* We have found a device */ TRACE("Adding %s to list\n", debugstr_w(ptr)); deviceInfo = HeapAlloc(GetProcessHeap(), 0, - FIELD_OFFSET(DeviceInfo, Interface.Data) + strlenW(ptr) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + FIELD_OFFSET(DeviceInfo, Interface.Data) + (strlenW(ptr) + 1) * sizeof(WCHAR)); if (!deviceInfo) { if (devices != buf) @@ -1374,7 +1369,7 @@ return ERROR_SUCCESS; } -#else /* __WINE__ */ +#else /* __WINESRC__ */ static LONG SETUP_CreateInterfaceList( DeviceInfoList *list, @@ -1438,7 +1433,7 @@ RegCloseKey(hInterfaceKey); return ERROR_GEN_FAILURE; } - InstancePath = HeapAlloc(GetProcessHeap(), 0, dwInstancePathLength + sizeof(UNICODE_NULL)); + InstancePath = HeapAlloc(GetProcessHeap(), 0, dwInstancePathLength + sizeof(WCHAR)); if (!InstancePath) { RegCloseKey(hDeviceInstanceKey); @@ -1453,7 +1448,7 @@ RegCloseKey(hInterfaceKey); return rc; } - InstancePath[dwInstancePathLength / sizeof(WCHAR)] = UNICODE_NULL; + InstancePath[dwInstancePathLength / sizeof(WCHAR)] = '\0'; TRACE("DeviceInstance %s\n", debugstr_w(InstancePath)); if (DeviceInstanceW) @@ -1495,7 +1490,7 @@ RegCloseKey(hInterfaceKey); return rc; } - dwLength = sizeof(KeyBuffer) - sizeof(UNICODE_NULL); + dwLength = sizeof(KeyBuffer) - sizeof(WCHAR); rc = RegQueryValueExW(hKey, ClassGUID, NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); RegCloseKey(hKey); if (rc != ERROR_SUCCESS) @@ -1505,8 +1500,8 @@ RegCloseKey(hInterfaceKey); return rc; } - KeyBuffer[dwLength / sizeof(WCHAR)] = UNICODE_NULL; - KeyBuffer[37] = UNICODE_NULL; /* Replace the } by a NULL character */ + KeyBuffer[dwLength / sizeof(WCHAR)] = '\0'; + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ if (UuidFromStringW(&KeyBuffer[1], &ClassGuid) != RPC_S_OK) { HeapFree(GetProcessHeap(), 0, InstancePath); @@ -1569,7 +1564,7 @@ RegCloseKey(hInterfaceKey); return ERROR_GEN_FAILURE; } - deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.Data) + dwInstancePathLength + sizeof(UNICODE_NULL) + dwLength + sizeof(UNICODE_NULL)); + deviceInfo = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DeviceInfo, Interface.Data) + dwInstancePathLength + dwLength + 2 * sizeof(WCHAR)); if (!deviceInfo) { RegCloseKey(hReferenceKey); @@ -1588,7 +1583,7 @@ RegCloseKey(hInterfaceKey); return rc; } - deviceInfo->Interface.pSymbolicLink[dwLength / sizeof(WCHAR)] = UNICODE_NULL; + deviceInfo->Interface.pSymbolicLink[dwLength / sizeof(WCHAR)] = '\0'; TRACE("Symbolic link %s\n", debugstr_w(deviceInfo->Interface.pSymbolicLink)); /* Add this entry to the list */ @@ -1607,7 +1602,7 @@ RegCloseKey(hInterfaceKey); return ERROR_SUCCESS; } -#endif /* __WINE__ */ +#endif /* __WINESRC__ */ /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) @@ -1682,7 +1677,7 @@ return INVALID_HANDLE_VALUE; } -#ifdef __WINE__ +#ifdef __WINESRC__ /* Special case: find serial ports by calling QueryDosDevice */ if (IsEqualIID(class, &GUID_DEVINTERFACE_COMPORT)) rc = SETUP_CreateSerialDeviceList(list, machine, (LPGUID)class, enumstr); @@ -1693,9 +1688,9 @@ ERR("Wine can only enumerate serial devices at the moment!\n"); rc = ERROR_INVALID_PARAMETER; } -#else /* __WINE__ */ +#else /* __WINESRC__ */ rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr); -#endif /* __WINE__ */ +#endif /* __WINESRC__ */ if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -1804,7 +1799,8 @@ ListEntry = RemoveHeadList(&list->ListHead); HeapFree(GetProcessHeap(), 0, ListEntry); } - RegCloseKey(list->HKLM); + if (list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); HeapFree(GetProcessHeap(), 0, list); ret = TRUE; } @@ -1917,7 +1913,7 @@ SetLastError(ERROR_INVALID_USER_BUFFER); else if (DeviceInterfaceDetailData == NULL && DeviceInterfaceDetailDataSize != 0) SetLastError(ERROR_INVALID_PARAMETER); - else if (DeviceInterfaceDetailData != NULL && DeviceInterfaceDetailDataSize < FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(UNICODE_NULL)) + else if (DeviceInterfaceDetailData != NULL && DeviceInterfaceDetailDataSize < FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR)) SetLastError(ERROR_INVALID_PARAMETER); else { @@ -2175,7 +2171,7 @@ case SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: { - DWORD required = wcslen(DevInfo->Device.InstancePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + DWORD required = (wcslen(DevInfo->Device.InstancePath) + 1) * sizeof(WCHAR); if (PropertyRegDataType) *PropertyRegDataType = REG_SZ; @@ -2531,7 +2527,7 @@ lpFullGuidString[0] = '{'; memcpy(&lpFullGuidString[1], lpGuidString, dwLength * sizeof(WCHAR)); lpFullGuidString[dwLength + 1] = '}'; - lpFullGuidString[dwLength + 2] = UNICODE_NULL; + lpFullGuidString[dwLength + 2] = '\0'; RpcStringFreeW(&lpGuidString); rc = RegOpenKeyExW(hClassesKey, @@ -2599,7 +2595,7 @@ * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( - DWORD InstallFunction, + DI_FUNCTION InstallFunction, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) {

1 0

[hbirr] 16712: Fixed the memory allocation in EngCreateEvent.
by hbirr＠svn.reactos.com 24 Jul '05

24 Jul '05

Fixed the memory allocation in EngCreateEvent. Modified: trunk/reactos/subsys/win32k/eng/event.c _____ Modified: trunk/reactos/subsys/win32k/eng/event.c --- trunk/reactos/subsys/win32k/eng/event.c 2005-07-24 11:59:28 UTC (rev 16711) +++ trunk/reactos/subsys/win32k/eng/event.c 2005-07-24 14:08:20 UTC (rev 16712) @@ -36,7 +36,7 @@ STDCALL EngCreateEvent ( OUT PEVENT *Event ) { - (*Event) = ExAllocatePool(NonPagedPool, sizeof(TAG_DRIVER)); + (*Event) = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); if ((*Event) == NULL) { return FALSE;

1 0

[hpoussin] 16711: Patch by Andrey Korotaev <unC0Rr@inbox.ru>: Fix scrolling with mouse
by hpoussin＠svn.reactos.com 24 Jul '05

24 Jul '05

Patch by Andrey Korotaev <unC0Rr(a)inbox.ru>: Fix scrolling with mouse This multiplication was deleted when replacing old psaux driver by i8042prt Fixes bug #652 Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/mouse.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-07-24 11:48:08 UTC (rev 16710) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-07-24 11:59:28 UTC (rev 16711) @@ -46,6 +46,8 @@ #define KEYBOARD_NUM_LOCK_ON 0x02 #define KEYBOARD_CAPS_LOCK_ON 0x04 +#define WHEEL_DELTA 120 + /*----------------------------------------------------- * DeviceExtension * --------------------------------------------------*/ _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-07-24 11:48:08 UTC (rev 16710) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-07-24 11:59:28 UTC (rev 16711) @@ -489,7 +489,7 @@ if (Scroll) { MouseInput->RawButtons |= MOUSE_WHEEL; - MouseInput->ButtonData = (USHORT) Scroll; + MouseInput->ButtonData = (USHORT)(Scroll * -WHEEL_DELTA); } if (DevExt->MouseType == IntellimouseExplorer) {

1 0

[ros-diffs] [ekohl] 16710: Implement CM_Get_Device_ID_List_Size_ExA, CM_Get_Device_ID_ExA and CM_Get_Device_ID_List_ExA.
by ekohl＠svn.reactos.com 24 Jul '05

24 Jul '05

Implement CM_Get_Device_ID_List_Size_ExA, CM_Get_Device_ID_ExA and CM_Get_Device_ID_List_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-24 09:20:43 UTC (rev 16709) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-24 11:48:08 UTC (rev 16710) @@ -373,6 +373,72 @@ /*********************************************************************** + * CM_Get_DevNode_Status [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_DevNode_Status( + PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags) +{ + TRACE("%p %p %lx %lx\n", + pulStatus, pulProblemNumber, dnDevInst, ulFlags); + return CM_Get_DevNode_Status_Ex(pulStatus, pulProblemNumber, dnDevInst, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_DevNode_Status_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI +CM_Get_DevNode_Status_Ex( + PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, + ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + + TRACE("%p %p %lx %lx %lx\n", + pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine); + + if (pulStatus == NULL || pulProblemNumber == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_GetDeviceStatus(BindingHandle, + lpDevInst, + pulStatus, + pulProblemNumber, + ulFlags); +} + + +/********************************************************************** * * CM_Get_Device_IDA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Device_IDA( @@ -403,10 +469,34 @@ DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { + WCHAR szBufferW[MAX_DEVICE_ID_LEN]; + CONFIGRET ret = CR_SUCCESS; + FIXME("%lx %p %ld %ld %lx\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); - return CR_FAILURE; + if (Buffer == NULL) + return CR_INVALID_POINTER; + + ret = CM_Get_Device_ID_ExW(dnDevInst, + szBufferW, + MAX_DEVICE_ID_LEN, + ulFlags, + hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + szBufferW, + lstrlenW(szBufferW) + 1, + Buffer, + BufferLen, + NULL, + NULL) == 0) + ret = CR_FAILURE; + } + + return ret; } @@ -484,10 +574,56 @@ PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { + LPWSTR BufferW = NULL; + LPWSTR pszFilterW = NULL; + CONFIGRET ret = CR_SUCCESS; + FIXME("%p %p %ld %ld %lx\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); - memset(Buffer,0,2); - return CR_SUCCESS; + + BufferW = MyMalloc(BufferLen * sizeof(WCHAR)); + if (BufferW == NULL) + return CR_OUT_OF_MEMORY; + + if (pszFilter == NULL) + { + ret = CM_Get_Device_ID_List_ExW(NULL, + BufferW, + BufferLen, + ulFlags, + hMachine); + } + else + { + if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW)) + { + ret = CR_INVALID_DEVICE_ID; + goto Done; + } + + ret = CM_Get_Device_ID_List_ExW(pszFilterW, + BufferW, + BufferLen, + ulFlags, + hMachine); + + MyFree(pszFilterW); + } + + if (WideCharToMultiByte(CP_ACP, + 0, + BufferW, + lstrlenW(BufferW) + 1, + Buffer, + BufferLen, + NULL, + NULL) == 0) + ret = CR_FAILURE; + +Done: + MyFree(BufferW); + + return ret; } @@ -533,9 +669,32 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %s %ld %lx\n", pulLen, pszFilter, ulFlags, hMachine); - *pulLen = 2; - return CR_SUCCESS; + LPWSTR pszFilterW = NULL; + CONFIGRET ret = CR_SUCCESS; + + FIXME("%p %s %lx %lx\n", pulLen, pszFilter, ulFlags, hMachine); + + if (pszFilter == NULL) + { + ret = CM_Get_Device_ID_List_Size_ExW(pulLen, + NULL, + ulFlags, + hMachine); + } + else + { + if (CaptureAndConvertAnsiArg(pszFilter, &pszFilterW)) + return CR_INVALID_DEVICE_ID; + + ret = CM_Get_Device_ID_List_Size_ExW(pulLen, + pszFilterW, + ulFlags, + hMachine); + + MyFree(pszFilterW); + } + + return ret; } @@ -608,72 +767,6 @@ /*********************************************************************** - * CM_Get_DevNode_Status [SETUPAPI.@] - */ -CONFIGRET WINAPI CM_Get_DevNode_Status( - PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, - ULONG ulFlags) -{ - TRACE("%p %p %lx %lx\n", - pulStatus, pulProblemNumber, dnDevInst, ulFlags); - return CM_Get_DevNode_Status_Ex(pulStatus, pulProblemNumber, dnDevInst, - ulFlags, NULL); -} - - -/********************************************************************** * - * CM_Get_DevNode_Status_Ex [SETUPAPI.@] - */ -CONFIGRET WINAPI -CM_Get_DevNode_Status_Ex( - PULONG pulStatus, PULONG pulProblemNumber, DEVINST dnDevInst, - ULONG ulFlags, HMACHINE hMachine) -{ - RPC_BINDING_HANDLE BindingHandle = NULL; - HSTRING_TABLE StringTable = NULL; - LPWSTR lpDevInst; - - TRACE("%p %p %lx %lx %lx\n", - pulStatus, pulProblemNumber, dnDevInst, ulFlags, hMachine); - - if (pulStatus == NULL || pulProblemNumber == NULL) - return CR_INVALID_POINTER; - - if (dnDevInst == 0) - return CR_INVALID_DEVINST; - - if (ulFlags != 0) - return CR_INVALID_FLAG; - - if (hMachine != NULL) - { - BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; - if (BindingHandle == NULL) - return CR_FAILURE; - - StringTable = ((PMACHINE_INFO)hMachine)->StringTable; - if (StringTable == 0) - return CR_FAILURE; - } - else - { - if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) - return CR_FAILURE; - } - - lpDevInst = StringTableStringFromId(StringTable, dnDevInst); - if (lpDevInst == NULL) - return CR_INVALID_DEVNODE; - - return PNP_GetDeviceStatus(BindingHandle, - lpDevInst, - pulStatus, - pulProblemNumber, - ulFlags); -} - - -/********************************************************************** * * CM_Get_Global_State [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Global_State( @@ -940,7 +1033,7 @@ PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine) { DEVINSTID_W pDevIdW = NULL; - CONFIGRET rc = CR_SUCCESS; + CONFIGRET ret = CR_SUCCESS; TRACE("%p %s %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); @@ -950,12 +1043,12 @@ return CR_INVALID_DEVICE_ID; } - rc = CM_Locate_DevNode_ExW(pdnDevInst, pDevIdW, ulFlags, hMachine); + ret = CM_Locate_DevNode_ExW(pdnDevInst, pDevIdW, ulFlags, hMachine); if (pDevIdW != NULL) MyFree(pDevIdW); - return rc; + return ret; } @@ -968,7 +1061,7 @@ WCHAR DeviceIdBuffer[MAX_DEVICE_ID_LEN]; RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; - CONFIGRET rc = CR_SUCCESS; + CONFIGRET ret = CR_SUCCESS; TRACE("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); @@ -1001,26 +1094,26 @@ else { /* Get the root device ID */ - rc = PNP_GetRootDeviceInstance(BindingHandle, - DeviceIdBuffer, - MAX_DEVICE_ID_LEN); - if (rc != CR_SUCCESS) + ret = PNP_GetRootDeviceInstance(BindingHandle, + DeviceIdBuffer, + MAX_DEVICE_ID_LEN); + if (ret != CR_SUCCESS) return CR_FAILURE; } TRACE("DeviceIdBuffer: %s\n", debugstr_w(DeviceIdBuffer)); /* Validate the device ID */ - rc = PNP_ValidateDeviceInstance(BindingHandle, - DeviceIdBuffer, - ulFlags); - if (rc == CR_SUCCESS) + ret = PNP_ValidateDeviceInstance(BindingHandle, + DeviceIdBuffer, + ulFlags); + if (ret == CR_SUCCESS) { *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1); if (*pdnDevInst == -1) - rc = CR_FAILURE; + ret = CR_FAILURE; } - return rc; + return ret; } @@ -1044,7 +1137,6 @@ RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; - CONFIGRET rc = CR_SUCCESS; TRACE("%lx %lx %lx %lx\n", dnDevInst, ulProblem, ulFlags, hMachine);

1 0

[weiden] 16709: use ZwQueryInformationFile instead of NtQueryInformationFile in IntGdiAddFontResource because we're passing kernel pointers in UserMode
by weiden＠svn.reactos.com 24 Jul '05

24 Jul '05

use ZwQueryInformationFile instead of NtQueryInformationFile in IntGdiAddFontResource because we're passing kernel pointers in UserMode Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-07-24 09:11:30 UTC (rev 16708) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-07-24 09:20:43 UTC (rev 16709) @@ -282,7 +282,7 @@ /* Get the size of the file */ - Status = NtQueryInformationFile( + Status = ZwQueryInformationFile( FileHandle, &Iosb, &FileStdInfo,

1 0

[weiden] 16708: use ZwQueryInformationFile and ZwSetInformationFile instead of the Nt version since we're passing kernel pointers to them which cause a probe failure in UserMode. This should fix the 1st stage setup
by weiden＠svn.reactos.com 24 Jul '05

24 Jul '05

use ZwQueryInformationFile and ZwSetInformationFile instead of the Nt version since we're passing kernel pointers to them which cause a probe failure in UserMode. This should fix the 1st stage setup Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-07-23 17:47:28 UTC (rev 16707) +++ trunk/reactos/ntoskrnl/io/file.c 2005-07-24 09:11:30 UTC (rev 16708) @@ -3039,7 +3039,15 @@ PreviousMode, FileObject->Flags & FO_ALERTABLE_IO, NULL); - Status = IoStatusBlock->Status; + _SEH_TRY + { + Status = IoStatusBlock->Status; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } else { @@ -3048,7 +3056,15 @@ PreviousMode, FileObject->Flags & FO_ALERTABLE_IO, NULL); - Status = FileObject->FinalStatus; + _SEH_TRY + { + Status = FileObject->FinalStatus; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } } _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-07-23 17:47:28 UTC (rev 16707) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-07-24 09:11:30 UTC (rev 16708) @@ -2308,7 +2308,7 @@ * (as in case of the EXT2FS driver by Manoj Paul Joseph where the * standard file information is filled on first request). */ - Status = NtQueryInformationFile(FileHandle, + Status = ZwQueryInformationFile(FileHandle, &Iosb, &FileInfo, sizeof(FILE_STANDARD_INFORMATION), @@ -2342,7 +2342,7 @@ if (MaximumSize.QuadPart > FileInfo.EndOfFile.QuadPart) { - Status = NtSetInformationFile(FileHandle, + Status = ZwSetInformationFile(FileHandle, &Iosb, &MaximumSize, sizeof(LARGE_INTEGER),

1 0

[sedwards] 16707: dont try to buid font.c as its a empty file for now
by sedwards＠svn.reactos.com 23 Jul '05

23 Jul '05

dont try to buid font.c as its a empty file for now Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-07-23 17:45:41 UTC (rev 16706) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-07-23 17:47:28 UTC (rev 16707) @@ -107,7 +107,6 @@ <file>dc.c</file> <file>dib.c</file> <file>fillshap.c</file> - <file>font.c</file> <file>gdiobj.c</file> <file>icm.c</file> <file>line.c</file>

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