Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[hbelusca] 71708: [KERNEL32]: Don't hardcode flag values for NtOpenKey.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 30 20:34:10 2016 New Revision: 71708 URL: http://svn.reactos.org/svn/reactos?rev=71708&view=rev Log: [KERNEL32]: Don't hardcode flag values for NtOpenKey. Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c Modified: trunk/reactos/dll/win32/kernel32/client/appcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/appcache.c [iso-8859-1] Thu Jun 30 20:34:10 2016 @@ -44,7 +44,7 @@ if (g_ShimsEnabled == -1) { /* Open the safe mode key */ - Status = NtOpenKey(&KeyHandle, 1, &OptionKeyAttributes); + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &OptionKeyAttributes); if (NT_SUCCESS(Status)) { /* Check if this is safemode */ @@ -66,7 +66,7 @@ else { /* Open the app compatibility engine settings key */ - Status = NtOpenKey(&KeyHandle, 1, &AppCompatKeyAttributes); + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); if (NT_SUCCESS(Status)) { /* Check if the app compat engine is turned off */ @@ -88,7 +88,7 @@ else { /* Finally, open the app compatibility policy key */ - Status = NtOpenKey(&KeyHandle, 1, &PolicyKeyAttributes); + Status = NtOpenKey(&KeyHandle, KEY_QUERY_VALUE, &PolicyKeyAttributes); if (NT_SUCCESS(Status)) { /* Check if the system policy disables app compat */

8 years, 2 months

[jimtabor] 71707: [Win32SS] - Remove unused flag and set old menu type back, based on wine.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 30 17:01:14 2016 New Revision: 71707 URL: http://svn.reactos.org/svn/reactos?rev=71707&view=rev Log: [Win32SS] - Remove unused flag and set old menu type back, based on wine. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jun 30 17:01:14 2016 @@ -1336,7 +1336,7 @@ if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (MenuItem->fState & MFS_DISABLED )) return -1; /* search rekursiv when needed */ - if ( (MenuItem->fType & MF_POPUP) && (gmdiFlags & GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu) + if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu ) { UINT ret; (*gismc)++; Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Thu Jun 30 17:01:14 2016 @@ -162,7 +162,7 @@ if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (Item->fState & MFS_DISABLED )) return -1; /* search rekursiv when needed */ - if ( (Item->fType & MF_POPUP) && (gmdiFlags & GMDI_GOINTOPOPUPS) && Item->spSubMenu) + if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && Item->spSubMenu ) { UINT ret; (*gismc)++; @@ -509,6 +509,7 @@ return NULL; } mii.fMask |= MIIM_SUBMENU; + mii.fType |= MF_POPUP; } else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR)) {

8 years, 2 months

[gedmurphy] 71706: - Revert the revert, we're now back to the latest config file. - Turn off SERVER_BASED_SEARCH in the hope that it fixes the search issues.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 30 16:52:44 2016 New Revision: 71706 URL: http://svn.reactos.org/svn/reactos?rev=71706&view=rev Log: - Revert the revert, we're now back to the latest config file. - Turn off SERVER_BASED_SEARCH in the hope that it fixes the search issues. Modified: trunk/reactos/Doxyfile [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=71706&r1=7170…

8 years, 2 months

[apriyadarshi] 71705: - Completed Interrupt Handler Routine - Added Inquiry Completion Routine Check Notes.txt

by apriyadarshi＠svn.reactos.org

Author: apriyadarshi Date: Thu Jun 30 16:04:50 2016 New Revision: 71705 URL: http://svn.reactos.org/svn/reactos?rev=71705&view=rev Log: - Completed Interrupt Handler Routine - Added Inquiry Completion Routine Check Notes.txt Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/Notes.txt [iso-8859-1] Thu Jun 30 16:04:50 2016 @@ -153,3 +153,16 @@ TESTED Comment NONE + +AhciCompleteIssuedSrb + Flags + IMPLEMENTED + FULLY_SUPPORTED + Comment + NONE + +InquiryCompletion + Flags + NOT_IMPLEMENTED + Comment + NONE Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Thu Jun 30 16:04:50 2016 @@ -216,6 +216,67 @@ return TRUE; }// -- AhciHwInitialize(); + +/** + * @name AhciCompleteIssuedSrb + * @implemented + * + * Complete issued Srbs + * + * @param PortExtension + * + */ +VOID +AhciCompleteIssuedSrb ( + __in PAHCI_PORT_EXTENSION PortExtension, + __in ULONG CommandsToComplete + ) +{ + ULONG NCS, i; + PSCSI_REQUEST_BLOCK Srb; + PAHCI_SRB_EXTENSION SrbExtension; + PAHCI_ADAPTER_EXTENSION AdapterExtension; + PAHCI_COMPLETION_ROUTINE CompletionRoutine; + + DebugPrint("AhciCompleteIssuedSrb()\n"); + + NT_ASSERT(CommandsToComplete != 0); + + DebugPrint("\tCompleted Commands: %d\n", CommandsToComplete); + + AdapterExtension = PortExtension->AdapterExtension; + NCS = AHCI_Global_Port_CAP_NCS(AdapterExtension->CAP); + + for (i = 0; i < NCS; i++) + { + if (((1 << i) & CommandsToComplete) != 0) + { + Srb = &PortExtension->Slot[i]; + NT_ASSERT(Srb != NULL); + + if (Srb->SrbStatus == SRB_STATUS_PENDING) + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + } + + SrbExtension = GetSrbExtension(Srb); + CompletionRoutine = SrbExtension->CompletionRoutine; + + if (CompletionRoutine != NULL) + { + // now it's completion routine responsibility to set SrbStatus + CompletionRoutine(AdapterExtension, PortExtension, Srb); + } + else + { + Srb->SrbStatus = SRB_STATUS_SUCCESS; + StorPortNotification(RequestComplete, AdapterExtension, Srb); + } + } + } + + return; +}// -- AhciCompleteIssuedSrb(); /** * @name AhciInterruptHandler @@ -304,7 +365,7 @@ outstanding = ci | sact; // NOTE: Including both non-NCQ and NCQ based commands if ((PortExtension->CommandIssuedSlots & (~outstanding)) != 0) { - DebugPrint("\tCompleted Commands: %d\n", (PortExtension->CommandIssuedSlots & (~outstanding))); + AhciCompleteIssuedSrb(PortExtension, (PortExtension->CommandIssuedSlots & (~outstanding))); PortExtension->CommandIssuedSlots &= outstanding; } @@ -981,6 +1042,7 @@ } // mark this slot + PortExtension->Slot[SlotIndex] = Srb; PortExtension->QueueSlots |= SlotIndex; return; }// -- AhciProcessSrb(); @@ -1026,8 +1088,10 @@ slotToActivate = (QueueSlots & (~tmp)); // mark that bit off in QueueSlots + // so we can know we it is really needed to activate port or not PortExtension->QueueSlots &= ~slotToActivate; // mark this CommandIssuedSlots + // to validate in completeIssuedCommand PortExtension->CommandIssuedSlots |= slotToActivate; // tell the HBA to issue this Command Slot to the given port @@ -1119,6 +1183,59 @@ }// -- AhciProcessIO(); /** + * @name InquiryCompletion + * @not_implemented + * + * InquiryCompletion routine should be called after device signals + * for device inquiry request is completed (through interrupt) + * + * @param PortExtension + * @param Srb + * + */ +VOID +InquiryCompletion ( + __in PAHCI_ADAPTER_EXTENSION AdapterExtension, + __in PAHCI_PORT_EXTENSION PortExtension, + __in PSCSI_REQUEST_BLOCK Srb + ) +{ + ULONG SrbStatus; + PAHCI_SRB_EXTENSION SrbExtension; + + DebugPrint("InquiryCompletion()\n"); + + NT_ASSERT(PortExtension != NULL); + NT_ASSERT(Srb != NULL); + + SrbStatus = Srb->SrbStatus; + SrbExtension = GetSrbExtension(Srb); + + if (SrbStatus == SRB_STATUS_SUCCESS) + { + if (SrbExtension->CommandReg == IDE_COMMAND_IDENTIFY) + { + AdapterExtension->DeviceParams.DeviceType = AHCI_DEVICE_TYPE_ATA; + } + else + { + AdapterExtension->DeviceParams.DeviceType = AHCI_DEVICE_TYPE_ATAPI; + } + // TODO: Set Device Paramters + } + else if (SrbStatus == SRB_STATUS_NO_DEVICE) + { + AdapterExtension->DeviceParams.DeviceType = AHCI_DEVICE_TYPE_NODEVICE; + } + else + { + return; + } + + return; +}// -- InquiryCompletion(); + +/** * @name DeviceInquiryRequest * @implemented * @@ -1162,8 +1279,10 @@ SrbExtension->AtaFunction = ATA_FUNCTION_ATA_IDENTIFY; SrbExtension->Flags |= ATA_FLAGS_DATA_IN; + SrbExtension->CompletionRoutine = InquiryCompletion; SrbExtension->CommandReg = IDE_COMMAND_NOT_VALID; + // TODO: Should use AhciZeroMemory SrbExtension->FeaturesLow = 0; SrbExtension->LBA0 = 0; SrbExtension->LBA1 = 0; Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.h [iso-8859-1] Thu Jun 30 16:04:50 2016 @@ -13,8 +13,14 @@ #define MAXIMUM_AHCI_PORT_COUNT 25 #define MAXIMUM_AHCI_PRDT_ENTRIES 32 +#define MAXIMUM_AHCI_PORT_NCS 30 #define MAXIMUM_QUEUE_BUFFER_SIZE 255 #define MAXIMUM_TRANSFER_LENGTH (128*1024) // 128 KB + +// device type (DeviceParams) +#define AHCI_DEVICE_TYPE_ATA 1 +#define AHCI_DEVICE_TYPE_ATAPI 2 +#define AHCI_DEVICE_TYPE_NODEVICE 3 // section 3.1.2 #define AHCI_Global_HBA_CONTROL_HR (1 << 0) @@ -61,6 +67,14 @@ #if DEBUG #define DebugPrint(format, ...) StorPortDebugPrint(0, format, __VA_ARGS__) #endif + +typedef +VOID +(*PAHCI_COMPLETION_ROUTINE) ( + __in PVOID AdapterExtension, + __in PVOID PortExtension, + __in PVOID Srb + ); ////////////////////////////////////////////////////////////// // ---- Support Structures --- // @@ -312,11 +326,12 @@ typedef struct _AHCI_PORT_EXTENSION { ULONG PortNumber; - ULONG QueueSlots; // slots to which we have already assigned task - ULONG CommandIssuedSlots; + ULONG QueueSlots; // slots which we have already assigned task (Slot) + ULONG CommandIssuedSlots; // slots which has been programmed BOOLEAN IsActive; PAHCI_PORT Port; // AHCI Port Infomation - AHCI_QUEUE SrbQueue; + AHCI_QUEUE SrbQueue; // pending Srbs + PSCSI_REQUEST_BLOCK Slot[MAXIMUM_AHCI_PORT_NCS]; // Srbs which has been alloted a port PAHCI_RECEIVED_FIS ReceivedFIS; PAHCI_COMMAND_HEADER CommandList; STOR_DEVICE_POWER_STATE DevicePowerState; // Device Power State @@ -345,7 +360,12 @@ ULONG LastInterruptPort; ULONG CurrentCommandSlot; - PVOID NonCachedExtension;// holds virtual address to noncached buffer allocated for Port Extension + PVOID NonCachedExtension; // holds virtual address to noncached buffer allocated for Port Extension + + struct + { + UCHAR DeviceType; + } DeviceParams; struct { @@ -388,6 +408,7 @@ ULONG SlotIndex; LOCAL_SCATTER_GATHER_LIST Sgl; + PAHCI_COMPLETION_ROUTINE CompletionRoutine; } AHCI_SRB_EXTENSION, *PAHCI_SRB_EXTENSION; //////////////////////////////////////////////////////////////

8 years, 2 months

[jimtabor] 71704: [NtUser] - Use internal function to validate menu handle. See CORE-11479 for more information.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 30 15:48:20 2016 New Revision: 71704 URL: http://svn.reactos.org/svn/reactos?rev=71704&view=rev Log: [NtUser] - Use internal function to validate menu handle. See CORE-11479 for more information. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/window.h Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jun 30 15:48:20 2016 @@ -241,6 +241,15 @@ EngSetLastError(Error); return pMenu; } + +BOOL +FASTCALL +IntIsMenu(HMENU Menu) +{ + if (UserGetMenuObject(Menu)) return TRUE; + return FALSE; +} + PMENU WINAPI IntGetMenu(HWND hWnd) Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] Thu Jun 30 15:48:20 2016 @@ -122,6 +122,8 @@ // // +BOOL FASTCALL IntIsMenu(HMENU); + PMENU FASTCALL IntGetMenuObject(HMENU hMenu); Modified: trunk/reactos/win32ss/user/ntuser/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.h [iso-8859-1] Thu Jun 30 15:48:20 2016 @@ -16,7 +16,7 @@ #define HAS_THINFRAME(Style, ExStyle) \ (((Style) & WS_BORDER) || (!((Style) & (WS_CHILD | WS_POPUP)))) -#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && pWnd->IDMenu) +#define HAS_MENU(pWnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && IntIsMenu(UlongToHandle(pWnd->IDMenu))) #define IntIsDesktopWindow(WndObj) \ (WndObj->spwndParent == NULL)

8 years, 2 months

[hbelusca] 71703: [KERNEL32] - Whitespace fixes (dosdev.c, except.c, loader.c) - except.c: Remove some unneeded casts; NtQueryInformationProcess for 'ProcessDebugPort' is implemented and therefore ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Jun 30 14:00:34 2016 New Revision: 71703 URL: http://svn.reactos.org/svn/reactos?rev=71703&view=rev Log: [KERNEL32] - Whitespace fixes (dosdev.c, except.c, loader.c) - except.c: Remove some unneeded casts; NtQueryInformationProcess for 'ProcessDebugPort' is implemented and therefore it will never return STATUS_NOT_IMPLEMENTED. Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/kernel32/client/loader.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Thu Jun 30 14:00:34 2016 @@ -442,7 +442,7 @@ if (Length + NameLength + 1 >= ucchMax) { Length = 0; - BaseSetLastNTError (STATUS_BUFFER_TOO_SMALL); + BaseSetLastNTError(STATUS_BUFFER_TOO_SMALL); break; } Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Thu Jun 30 14:00:34 2016 @@ -85,7 +85,7 @@ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionRecord->ExceptionCode); - if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionRecord->NumberParameters == 2) { DbgPrint("Faulting Address: %8x\n", ExceptionRecord->ExceptionInformation[1]); @@ -209,7 +209,7 @@ /* Query the current setting */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, - (PVOID)&ErrMode, + &ErrMode, sizeof(ErrMode), NULL); if (!NT_SUCCESS(Status)) @@ -238,97 +238,106 @@ /* * @implemented */ -LONG WINAPI -UnhandledExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) -{ - LONG RetValue; - HANDLE DebugPort = NULL; - NTSTATUS ErrCode; - ULONG_PTR ErrorParameters[4]; - ULONG ErrorResponse; - PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; - LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; - - if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && - ExceptionRecord->NumberParameters >= 2) - { - switch(ExceptionRecord->ExceptionInformation[0]) - { - case EXCEPTION_WRITE_FAULT: - /* Change the protection on some write attempts, some InstallShield setups - have this bug */ - RetValue = BasepCheckForReadOnlyResource( - (PVOID)ExceptionRecord->ExceptionInformation[1]); - if (RetValue == EXCEPTION_CONTINUE_EXECUTION) - return EXCEPTION_CONTINUE_EXECUTION; - break; - case EXCEPTION_EXECUTE_FAULT: - /* FIXME */ - break; - } - } - - /* Is there a debugger running ? */ - ErrCode = NtQueryInformationProcess(NtCurrentProcess(), ProcessDebugPort, - &DebugPort, sizeof(HANDLE), NULL); - if (!NT_SUCCESS(ErrCode) && ErrCode != STATUS_NOT_IMPLEMENTED) - { - BaseSetLastNTError(ErrCode); - return EXCEPTION_EXECUTE_HANDLER; - } - - if (DebugPort) - { - /* Pass the exception to debugger. */ - DPRINT("Passing exception to debugger\n"); - return EXCEPTION_CONTINUE_SEARCH; - } - - RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); - if (RealFilter) - { - LONG ret = RealFilter(ExceptionInfo); - if (ret != EXCEPTION_CONTINUE_SEARCH) - return ret; - } - - PrintStackTrace(ExceptionInfo); - - /* Save exception code and address */ - ErrorParameters[0] = (ULONG)ExceptionRecord->ExceptionCode; - ErrorParameters[1] = (ULONG_PTR)ExceptionRecord->ExceptionAddress; - - if ((NTSTATUS)ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) - { - /* get the type of operation that caused the access violation */ - ErrorParameters[2] = ExceptionRecord->ExceptionInformation[0]; - } - else - { - ErrorParameters[2] = ExceptionRecord->ExceptionInformation[2]; - } - - /* Save faulting address */ - ErrorParameters[3] = ExceptionRecord->ExceptionInformation[1]; - - /* Raise the harderror */ - ErrCode = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION, - 4, 0, ErrorParameters, OptionOkCancel, &ErrorResponse); - - if (NT_SUCCESS(ErrCode) && (ErrorResponse == ResponseCancel)) - { - /* FIXME: Check the result, if the "Cancel" button was - clicked run a debugger */ - DPRINT1("Debugging is not implemented yet\n"); - } - - /* - * Returning EXCEPTION_EXECUTE_HANDLER means that the code in - * the __except block will be executed. Normally this will end up in a - * Terminate process. - */ - - return EXCEPTION_EXECUTE_HANDLER; +LONG +WINAPI +UnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) +{ + NTSTATUS Status; + LONG RetValue; + HANDLE DebugPort = NULL; + ULONG_PTR ErrorParameters[4]; + ULONG ErrorResponse; + PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; + LPTOP_LEVEL_EXCEPTION_FILTER RealFilter; + + if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + ExceptionRecord->NumberParameters >= 2) + { + switch(ExceptionRecord->ExceptionInformation[0]) + { + case EXCEPTION_WRITE_FAULT: + /* Change the protection on some write attempts, some InstallShield setups + have this bug */ + RetValue = BasepCheckForReadOnlyResource( + (PVOID)ExceptionRecord->ExceptionInformation[1]); + if (RetValue == EXCEPTION_CONTINUE_EXECUTION) + return EXCEPTION_CONTINUE_EXECUTION; + break; + + case EXCEPTION_EXECUTE_FAULT: + /* FIXME */ + break; + } + } + + /* Is there a debugger running? */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDebugPort, + &DebugPort, + sizeof(DebugPort), + NULL); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return EXCEPTION_EXECUTE_HANDLER; + } + + if (DebugPort) + { + /* Pass the exception to debugger. */ + DPRINT("Passing exception to debugger\n"); + return EXCEPTION_CONTINUE_SEARCH; + } + + RealFilter = RtlDecodePointer(GlobalTopLevelExceptionFilter); + if (RealFilter) + { + LONG ret = RealFilter(ExceptionInfo); + if (ret != EXCEPTION_CONTINUE_SEARCH) + return ret; + } + + PrintStackTrace(ExceptionInfo); + + /* Save exception code and address */ + ErrorParameters[0] = (ULONG)ExceptionRecord->ExceptionCode; + ErrorParameters[1] = (ULONG_PTR)ExceptionRecord->ExceptionAddress; + + if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) + { + /* get the type of operation that caused the access violation */ + ErrorParameters[2] = ExceptionRecord->ExceptionInformation[0]; + } + else + { + ErrorParameters[2] = ExceptionRecord->ExceptionInformation[2]; + } + + /* Save faulting address */ + ErrorParameters[3] = ExceptionRecord->ExceptionInformation[1]; + + /* Raise the harderror */ + Status = NtRaiseHardError(STATUS_UNHANDLED_EXCEPTION, + 4, + 0, + ErrorParameters, + OptionOkCancel, + &ErrorResponse); + + if (NT_SUCCESS(Status) && (ErrorResponse == ResponseCancel)) + { + /* FIXME: Check the result, if the "Cancel" button was + clicked run a debugger */ + DPRINT1("Debugging is not implemented yet\n"); + } + + /* + * Returning EXCEPTION_EXECUTE_HANDLER means that the code in + * the __except block will be executed. Normally this will end up in a + * Terminate process. + */ + + return EXCEPTION_EXECUTE_HANDLER; } /* Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Thu Jun 30 14:00:34 2016 @@ -177,7 +177,7 @@ LoadLibraryW(LPCWSTR lpLibFileName) { /* Call Ex version of the API */ - return LoadLibraryExW (lpLibFileName, 0, 0); + return LoadLibraryExW(lpLibFileName, 0, 0); }

8 years, 2 months

[hbelusca] 71702: [NOTEPAD]: Fix German menu keyboard shortcuts, by Joachim Henze. CORE-11461 #resolve #comment German shortcut fixed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 29 23:21:07 2016 New Revision: 71702 URL: http://svn.reactos.org/svn/reactos?rev=71702&view=rev Log: [NOTEPAD]: Fix German menu keyboard shortcuts, by Joachim Henze. CORE-11461 #resolve #comment German shortcut fixed, thanks! Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/de-DE.rc [iso-8859-1] Wed Jun 29 23:21:07 2016 @@ -41,12 +41,12 @@ MENUITEM "&EinfÃ¼gen\tStrg+V", CMD_PASTE MENUITEM "&LÃ¶schen\tEntf", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "Suchen...\tStrg+F", CMD_SEARCH MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT MENUITEM "&Ersetzen\tStrg+H", CMD_REPLACE MENUITEM "Gehe zu...\tStrg+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "Alles &markieren", CMD_SELECT_ALL + MENUITEM "Alles &markieren\tStrg+A", CMD_SELECT_ALL MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE END POPUP "F&ormat"

8 years, 2 months

[hbelusca] 71701: [CONSRV]: "Fix" pasting non-ansi characters in console by removing the code that was too careful (when pasting text we don't generally use the associated virtual key/scan code, bu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 29 23:14:29 2016 New Revision: 71701 URL: http://svn.reactos.org/svn/reactos?rev=71701&view=rev Log: [CONSRV]: "Fix" pasting non-ansi characters in console by removing the code that was too careful (when pasting text we don't generally use the associated virtual key/scan code, but just the unicode character itself. CORE-11465 #resolve #comment Fixed! You can paste cyrillic text in the console without problems, and it is correctly understood. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c [iso-8859-1] Wed Jun 29 23:14:29 2016 @@ -304,8 +304,14 @@ VkKey = VkKeyScanW(CurChar); if (VkKey == 0xFFFF) { - DPRINT1("VkKeyScanW failed - Should simulate the key...\n"); - continue; + DPRINT1("FIXME: TODO: VkKeyScanW failed - Should simulate the key!\n"); + /* + * We don't really need the scan/key code because we actually only + * use the UnicodeChar for output purposes. It may pose few problems + * later on but it's not of big importance. One trick would be to + * convert the character to OEM / multibyte and use MapVirtualKey + * on each byte (simulating an Alt-0xxx OEM keyboard press). + */ } /* Pressing some control keys */

8 years, 2 months

[hbelusca] 71700: [SHORTCUTS]: Update the translations for the ReactOS Read-Me file desktop shortcut. Courtesy David Quintana (gigaherz) for spanish, 'valeriusL' for russian, Grégory Macário Harbs ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 29 21:19:13 2016 New Revision: 71700 URL: http://svn.reactos.org/svn/reactos?rev=71700&view=rev Log: [SHORTCUTS]: Update the translations for the ReactOS Read-Me file desktop shortcut. Courtesy David Quintana (gigaherz) for spanish, 'valeriusL' for russian, Grégory Macário Harbs (Mysoft) for portuguese, myself for german, italian, dutch and ukrainian (translators, please check those 4 last languages ^^ ). Modified: trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Wed Jun 29 21:19:13 2016 @@ -72,7 +72,7 @@ GAMES=Games README_TITLE=Read Me -README_DESC=ReactOS Read Me +README_DESC=ReactOS Read-Me file CMD_TITLE=Command Prompt CMD_DESC=Open command prompt @@ -263,6 +263,9 @@ COMMUNICATIONS=Kommunikation GAMES=Spiele +README_TITLE=Lies Mich +README_DESC=Lies-Mich Datei fÃ¼r ReactOS + CMD_TITLE=Eingabeaufforderung CMD_DESC=Ãffne Kommandozeilenfenster EXPLORER_TITLE=ReactOS Explorer @@ -388,6 +391,9 @@ ENTERTAINMENT=Entretenimiento COMMUNICATIONS=Comunicaciones GAMES=Juegos + +README_TITLE=LÃ©ame +README_DESC=Documento LÃ©ame de ReactOS CMD_TITLE=Consola CMD_DESC=Abre una consola de comandos. @@ -770,6 +776,9 @@ COMMUNICATIONS=Comunicazioni GAMES=Giochi +README_TITLE=Leggimi +README_DESC=File Leggimi per ReactOS + CMD_TITLE=Prompt dei comandi CMD_DESC=Apri la finestra dei comandi EXPLORER_TITLE=ReactOS Explorer @@ -896,6 +905,9 @@ COMMUNICATIONS=Communications GAMES=Games +README_TITLE=Lees Mij +README_DESC=LeesMij bestand voor ReactOS + CMD_TITLE=Command Prompt CMD_DESC=Open command prompt EXPLORER_TITLE=ReactOS Explorer @@ -1084,6 +1096,9 @@ ENTERTAINMENT=Entretenimento COMMUNICATIONS=Communications GAMES=Jogos + +README_TITLE=Leia-Me +README_DESC=Arquivo de informaÃ§Ãµes para ReactOS CMD_TITLE=Command Prompt CMD_DESC=Abrir prompt de comando @@ -1211,6 +1226,9 @@ COMMUNICATIONS=Communications GAMES=ÐÐ³ÑÑ +README_TITLE=ÐÑÐ¾ÑÑÐ¸ ÐÐµÐ½Ñ +README_DESC=ÑÐ°Ð¹Ð» ReadMe Ð´Ð»Ñ ReactOS + CMD_TITLE=ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° CMD_DESC=ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð²Ð²Ð¾Ð´Ð¸Ð¼ÑÑ Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´. EXPLORER_TITLE=ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº ReactOS @@ -1400,6 +1418,9 @@ COMMUNICATIONS=Communications GAMES=ÐÐ³ÑÐ¸ +README_TITLE=ÐÑÐ¾ÑÐ¸ÑÐ°Ð¹ ÐÐµÐ½Ðµ +README_DESC=ÑÐ°Ð¹Ð» ReadMe Ð´Ð»Ñ ReactOS + CMD_TITLE=ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ð¹ ÑÑÐ´Ð¾Ðº CMD_DESC=ÐÑÐ´ÐºÑÐ¸ÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ð¹ ÑÑÐ´Ð¾Ðº EXPLORER_TITLE=ÐÑÐ¾Ð²ÑÐ´Ð½Ð¸Ðº ReactOS

8 years, 2 months

[hbelusca] 71699: [PING]: Fix statistics information in the case sending a ping packet fails. Patch by Tim Crawford. CORE-10274 #resolve #comment Fixed, thanks for the report!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jun 29 20:30:43 2016 New Revision: 71699 URL: http://svn.reactos.org/svn/reactos?rev=71699&view=rev Log: [PING]: Fix statistics information in the case sending a ping packet fails. Patch by Tim Crawford. CORE-10274 #resolve #comment Fixed, thanks for the report! Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Wed Jun 29 20:30:43 2016 @@ -652,6 +652,7 @@ else FormatOutput(IDS_COULD_NOT_TRANSMIT, WSAGetLastError()); GlobalFree(Buffer); + LostCount++; return FALSE; }

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016