Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 35469: - Move LockBuffers - Remove a duplicate debug print
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Tue Aug 19 20:42:12 2008 New Revision: 35469 URL: http://svn.reactos.org/svn/reactos?rev=35469&view=rev Log: - Move LockBuffers - Remove a duplicate debug print Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 19 20:42:12 2008 @@ -264,30 +264,28 @@ return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied, NULL ); + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); + + if( !SendReq->BufferArray ) { + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + Irp, 0, NULL ); + } + AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else { AFD_DbgPrint(MID_TRACE,("Queuing request\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } - } - - AFD_DbgPrint(MID_TRACE,("We already have %d bytes waiting.\n", - FCB->Send.BytesUsed)); - - SendReq->BufferArray = LockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - NULL, NULL, - FALSE, FALSE ); - - if( !SendReq->BufferArray ) { - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL ); } AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n",

1 0

[cgutman] 35468: - Use FCB->Connection.Object instead of FCB->AddressFile.Object - Spotted by Arty
by cgutman＠svn.reactos.org 20 Aug '08

20 Aug '08

Author: cgutman Date: Tue Aug 19 20:10:13 2008 New Revision: 35468 URL: http://svn.reactos.org/svn/reactos?rev=35468&view=rev Log: - Use FCB->Connection.Object instead of FCB->AddressFile.Object - Spotted by Arty Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 20:10:13 2008 @@ -135,7 +135,7 @@ if( NT_SUCCESS(Status) ) { Status = TdiQueryInformation - ( FCB->AddressFile.Object, + ( FCB->Connection.Object, TDI_QUERY_CONNECTION_INFO, SysMdl ); }

1 0

[cgutman] 35467: - Fix a bug that resulted in the status getting changed if TdiQueryInformation failed
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 18:50:41 2008 New Revision: 35467 URL: http://svn.reactos.org/svn/reactos?rev=35467&view=rev Log: - Fix a bug that resulted in the status getting changed if TdiQueryInformation failed Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 18:50:41 2008 @@ -143,13 +143,13 @@ if( NT_SUCCESS(Status) ) { TransAddr = (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); - } - if( TransAddr ) - RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, - TaLengthOfTransportAddress - ( ConnInfo->RemoteAddress ) ); - else Status = STATUS_INSUFFICIENT_RESOURCES; + if( TransAddr ) + RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, + TaLengthOfTransportAddress + ( ConnInfo->RemoteAddress ) ); + else Status = STATUS_INSUFFICIENT_RESOURCES; + } if( ConnInfo ) ExFreePool( ConnInfo ); if( SysMdl ) IoFreeMdl( SysMdl );

1 0

[cgutman] 35466: - Use MmGetSystemAddressForMdlSafe instead of MmMapLockedPages - Noticed by Alex
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 18:44:11 2008 New Revision: 35466 URL: http://svn.reactos.org/svn/reactos?rev=35466&view=rev Log: - Use MmGetSystemAddressForMdlSafe instead of MmMapLockedPages - Noticed by Alex Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 18:44:11 2008 @@ -142,8 +142,7 @@ if( NT_SUCCESS(Status) ) { TransAddr = - (PTRANSPORT_ADDRESS)MmMapLockedPages - ( Mdl, Irp->RequestorMode ); + (PTRANSPORT_ADDRESS)MmGetSystemAddressForMdlSafe( Mdl, NormalPagePriority ); } if( TransAddr )

1 0

[janderwald] 35465: * The CLSID of a PropertySheet handler can either be present as subkey or as a default value. * Fixes WinRar file property sheet handler and etc...
by janderwald＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: janderwald Date: Tue Aug 19 17:40:05 2008 New Revision: 35465 URL: http://svn.reactos.org/svn/reactos?rev=35465&view=rev Log: * The CLSID of a PropertySheet handler can either be present as subkey or as a default value. * Fixes WinRar file property sheet handler and etc... Modified: trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Aug 19 17:40:05 2008 @@ -1662,6 +1662,7 @@ IShellPropSheetExt *pspsx; HKEY hkBase, hkPropSheetHandlers; PPSXA psxa = NULL; + HRESULT hr; TRACE("(%p,%s,%u)\n", hKey, debugstr_w(pszSubKey), max_iface); @@ -1699,38 +1700,41 @@ lRet = ERROR_SUCCESS; break; } - - dwClsidSize = sizeof(szClsidHandler); - if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) + szHandler[(sizeof(szHandler) / sizeof(szHandler[0])) - 1] = 0; + hr = SHCLSIDFromStringW(szHandler, &clsid); + if (FAILED(hr)) { - /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; - if (SUCCEEDED(SHCLSIDFromStringW(szClsidHandler, &clsid))) + dwClsidSize = sizeof(szClsidHandler); + if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { - /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. - Only if both interfaces are supported it's a real shell extension. - Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + hr = SHCLSIDFromStringW(szClsidHandler, &clsid); + } + } + if (SUCCEEDED(hr)) + { + /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. + Only if both interfaces are supported it's a real shell extension. + Then call IShellExtInit's Initialize method. */ + if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + { + if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) - { - /* Add the IShellPropSheetExt instance to the array */ - psxa->pspsx[psxa->uiCount++] = pspsx; - } - else - { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); - } + /* Add the IShellPropSheetExt instance to the array */ + psxa->pspsx[psxa->uiCount++] = pspsx; } else + { + psxi->lpVtbl->Release(psxi); pspsx->lpVtbl->Release(pspsx); + } } + else + pspsx->lpVtbl->Release(pspsx); } } - } while (psxa->uiCount != psxa->uiAllocated); } else

1 0

[dreimer] 35464: Last remnants of Bug 3649. Hopefully...
by dreimer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: dreimer Date: Tue Aug 19 16:45:56 2008 New Revision: 35464 URL: http://svn.reactos.org/svn/reactos?rev=35464&view=rev Log: Last remnants of Bug 3649. Hopefully... Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Aug 19 16:45:56 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 30-07-2008 + * LAST CHANGE: 16-08-2008 */ /* @@ -56,12 +56,12 @@ END MENUITEM "Zarovna ikony", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Obnovi", FCIDM_SHVIEW_REFRESH + MENUITEM "&Obnovi", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "&Prilepi", FCIDM_SHVIEW_INSERT MENUITEM "Prilepi od&kaz", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Vlastnosti", FCIDM_SHVIEW_PROPERTIES + MENUITEM "Vl&astnosti", FCIDM_SHVIEW_PROPERTIES END END @@ -571,14 +571,14 @@ CHKDSK_DLG DIALOGEX 50, 50, 194, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 +CAPTION "Kontrola disku" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Spusti", IDOK, 53, 100, 60, 14 + GROUPBOX "Monosti kontroly disku", -1, 7, 6, 179, 50 + PUSHBUTTON "Zrui", IDCANCEL, 118, 100, 60, 14 + AUTOCHECKBOX "&Automaticky opravi chyby v systýme súborov", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "Vy&h¾ada a pokúsi sa obnovi chybné sektory", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -612,14 +612,14 @@ IDS_SHV_COLUMN10 "Vlastník" IDS_SHV_COLUMN11 "Skupina" IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" + IDS_SHV_COLUMN13 "Kategória" IDS_SHV_COLUMN_DELFROM "Pôvod" //Pôvodné umiestnenie IDS_SHV_COLUMN_DELDATE "Odstránený" //Dátum zmazania IDS_SHV_COLUMN_FONTTYPE "Fonttype" IDS_SHV_COLUMN_WORKGROUP "Workgroup" IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" + IDS_SHV_COLUMN_DOCUMENTS "Dokumenty" + IDS_SHV_COLUMN_STATUS "Stav" IDS_SHV_COLUMN_COMMENTS "Comments" IDS_SHV_COLUMN_LOCATION "Location" IDS_SHV_COLUMN_MODEL "Model" @@ -629,7 +629,7 @@ IDS_MYCOMPUTER "Tento poèítaè" IDS_RECYCLEBIN_FOLDER_NAME "Kô" IDS_CONTROLPANEL "Ovládací panel" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Nástroje na správu" /* context menus */ IDS_VIEW_LARGE "&Ve¾ké ikony" @@ -637,13 +637,13 @@ IDS_VIEW_LIST "&Zoznam" IDS_VIEW_DETAILS "&Podrobnosti" IDS_SELECT "Vybra" - IDS_OPEN "Otvori" + IDS_OPEN "&Otvori" IDS_CREATELINK "Vytvori o&dkaz" - IDS_COPY "&Kopírova" - IDS_DELETE "&Odstráni" + IDS_COPY "&Kopírova" + IDS_DELETE "Odstráni" IDS_PROPERTIES "Vl&astnosti" IDS_CUT "&Vystrihnú" - IDS_RESTORE "Restore" + IDS_RESTORE "&Obnovi" IDS_FORMATDRIVE "Format..." IDS_RENAME "Rename" IDS_INSERT "Insert" @@ -729,7 +729,7 @@ IDS_CMD_FILE "ReactOS Command Script" IDS_COM_FILE "DOS aplikácia" IDS_CPL_FILE "Poloka ovládacieho panela" - IDS_CUR_FILE "Cursor" + IDS_CUR_FILE "Kurzor" IDS_DLL_FILE "Application Extension" IDS_DRV_FILE "Ovládaè zariadenia" IDS_EXE_FILE "Aplikácia" @@ -749,9 +749,9 @@ IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? IDS_FILE_FOLDER "súbory: %u, prieèinky: %u" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." - - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_PRINTERS "Tlaèiarne" + IDS_FONTS "Písma" + IDS_INSTALLNEWFONT "&Naintalova nové písmo..." + + IDS_DEFAULT_CLUSTER_SIZE "Predvolená alokaèná ve¾kos" //Default allocation size +END

1 0

[cgutman] 35463: - Fix a memory leak
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 16:45:08 2008 New Revision: 35463 URL: http://svn.reactos.org/svn/reactos?rev=35463&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 19 16:45:08 2008 @@ -362,6 +362,7 @@ if( SendReq->AfdFlags & AFD_IMMEDIATE ) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete ( FCB, STATUS_CANT_WAIT, Irp, 0, NULL ); } else {

1 0

[sginsberg] 35462: - Remove dead code
by sginsberg＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: sginsberg Date: Tue Aug 19 16:09:58 2008 New Revision: 35462 URL: http://svn.reactos.org/svn/reactos?rev=35462&view=rev Log: - Remove dead code Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Tue Aug 19 16:09:58 2008 @@ -557,30 +557,6 @@ return Entry; } -/* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */ -BOOLEAN FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType) -{ - ULONG Length; - - Length = (wcslen (Source) + 1) * sizeof(WCHAR); - UniDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG('U', 'S', 'T', 'R')); - if (UniDest->Buffer == NULL) - return FALSE; - - RtlCopyMemory (UniDest->Buffer, - Source, - Length); - - UniDest->MaximumLength = (USHORT)Length; - UniDest->Length = (USHORT)Length - sizeof (WCHAR); - - return TRUE; -} - /* * Ldr Resource support code */

1 0

[tkreuzer] 35461: - fix usage of InterlockedExchangePointer - fix ULONG -> pointer cast
by tkreuzer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: tkreuzer Date: Tue Aug 19 14:56:28 2008 New Revision: 35461 URL: http://svn.reactos.org/svn/reactos?rev=35461&view=rev Log: - fix usage of InterlockedExchangePointer - fix ULONG -> pointer cast Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 19 14:56:28 2008 @@ -177,7 +177,7 @@ do { /* Write magic value and return the next entry to process */ - NextEntry = InterlockedExchangePointer(&PspReaperListHead.Flink, + NextEntry = InterlockedExchangePointer((PVOID*)&PspReaperListHead.Flink, (PVOID)1); ASSERT((NextEntry != NULL) && (NextEntry != (PVOID)1)); @@ -200,9 +200,9 @@ } while ((NextEntry != NULL) && (NextEntry != (PVOID)1)); /* Remove magic value, keep looping if it got changed */ - } while (InterlockedCompareExchangePointer(&PspReaperListHead.Flink, - 0, - 1) != (PVOID)1); + } while (InterlockedCompareExchangePointer((PVOID*)&PspReaperListHead.Flink, + (PVOID)0, + (PVOID)1) != (PVOID)1); } VOID @@ -403,7 +403,7 @@ PEPROCESS CurrentProcess; PETHREAD Thread, OtherThread, PreviousThread = NULL; PVOID DeallocationStack; - ULONG Dummy; + ULONG_PTR Dummy; BOOLEAN Last = FALSE; PTERMINATION_PORT TerminationPort, NextPort; PLIST_ENTRY FirstEntry, CurrentEntry; @@ -880,7 +880,7 @@ if (Apc->SystemArgument2) { /* Free the APC */ - Status = (NTSTATUS)Apc->NormalContext; + Status = (NTSTATUS)(ULONG_PTR)Apc->NormalContext; PspExitApcRundown(Apc); /* Terminate the Thread */ @@ -985,7 +985,7 @@ PspExitApcRundown, PspExitNormalApc, KernelMode, - (PVOID)ExitStatus); + (PVOID)(ULONG_PTR)ExitStatus); /* Insert it into the APC Queue */ if (!KeInsertQueueApc(Apc, Apc, NULL, 2))

1 0

[tkreuzer] 35460: Update amd64 prototypes for KeGetCurrentIrql, KfRaiseIrql, KfLowerIrql, KeRaiseIrqlToDpcLevel, KeRaiseIrqlToSynchLevel, KeLowerIrql, KeRaiseIrql
by tkreuzer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: tkreuzer Date: Tue Aug 19 14:28:12 2008 New Revision: 35460 URL: http://svn.reactos.org/svn/reactos?rev=35460&view=rev Log: Update amd64 prototypes for KeGetCurrentIrql, KfRaiseIrql, KfLowerIrql, KeRaiseIrqlToDpcLevel, KeRaiseIrqlToSynchLevel, KeLowerIrql, KeRaiseIrql Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Tue Aug 19 14:28:12 2008 @@ -5581,12 +5581,6 @@ } KFLOATING_SAVE, *PKFLOATING_SAVE; NTKERNELAPI -KIRQL -KeGetCurrentIrql ( - VOID - ); - -NTKERNELAPI PRKTHREAD NTAPI KeGetCurrentThread( @@ -9966,6 +9960,41 @@ #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) +#elif defined(_M_AMD64) + +NTKERNELAPI +KIRQL +KeGetCurrentIrql( + VOID); + +NTKERNELAPI +VOID +KfLowerIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +KfRaiseIrql( + IN KIRQL NewIrql); + +NTKERNELAPI +KIRQL +KeRaiseIrqlToDpcLevel( + VOID); + +NTKERNELAPI +KIRQL +KeRaiseIrqlToSynchLevel( + VOID); + +NTKERNELAPI +VOID +KeLowerIrql( + IN KIRQL NewIrql); + +#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) + + #elif defined(__PowerPC__) NTHALAPI

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