Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 71712: The javascript search is turd...
by gedmurphy＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: gedmurphy Date: Fri Jul 1 17:29:19 2016 New Revision: 71712 URL: http://svn.reactos.org/svn/reactos?rev=71712&view=rev Log: The javascript search is turd... Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=71712&r1=7171… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Fri Jul 1 17:29:19 2016 @@ -1479,7 +1479,7 @@ # The default value is: NO. # This tag requires that the tag SEARCHENGINE is set to YES. -SERVER_BASED_SEARCH = NO +SERVER_BASED_SEARCH = YES # When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP # script for searching. Instead the search results are written to an XML file

1 0

[tfaber] 71711: [DNSAPI] - Check for NULL pointer in DnsQuery to avoid crashing tests
by tfaber＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: tfaber Date: Fri Jul 1 17:19:04 2016 New Revision: 71711 URL: http://svn.reactos.org/svn/reactos?rev=71711&view=rev Log: [DNSAPI] - Check for NULL pointer in DnsQuery to avoid crashing tests Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Fri Jul 1 17:19:04 2016 @@ -59,6 +59,9 @@ LPSTR CurrentName; unsigned i, CNameLoop; + if (Name == NULL) + return ERROR_INVALID_PARAMETER; + *QueryResultSet = 0; switch(Type) @@ -200,6 +203,9 @@ PDNS_RECORD QueryResultWide; PDNS_RECORD ConvertedRecord = 0, LastRecord = 0; + if (Name == NULL) + return ERROR_INVALID_PARAMETER; + Buffer = DnsWToC(Name); Status = DnsQuery_A(Buffer, Type, Options, Servers, &QueryResultWide, Reserved);

1 0

[tfaber] 71710: [DNSAPI_APITEST] - Fix unix build ROSTESTS-226
by tfaber＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: tfaber Date: Fri Jul 1 15:19:40 2016 New Revision: 71710 URL: http://svn.reactos.org/svn/reactos?rev=71710&view=rev Log: [DNSAPI_APITEST] - Fix unix build ROSTESTS-226 Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/DnsQuery.… ============================================================================== --- trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] Fri Jul 1 15:19:40 2016 @@ -8,7 +8,7 @@ #include <winsock2.h> #include <ws2tcpip.h> #include <stdio.h> -#include <WinDNS.h> +#include <windns.h> #include <apitest.h>

1 0

[tfaber] 71709: [DNSAPI_APITEST] - Add a test for DnsQuery. Patch by Víctor Martínez Calvo, with additional tests and fixes by me. ROSTESTS-226 #resolve
by tfaber＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: tfaber Date: Fri Jul 1 14:44:55 2016 New Revision: 71709 URL: http://svn.reactos.org/svn/reactos?rev=71709&view=rev Log: [DNSAPI_APITEST] - Add a test for DnsQuery. Patch by Víctor Martínez Calvo, with additional tests and fixes by me. ROSTESTS-226 #resolve Added: trunk/rostests/apitests/dnsapi/ trunk/rostests/apitests/dnsapi/CMakeLists.txt (with props) trunk/rostests/apitests/dnsapi/DnsQuery.c (with props) trunk/rostests/apitests/dnsapi/testlist.c (with props) Modified: trunk/rostests/apitests/CMakeLists.txt Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… ============================================================================== --- trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/CMakeLists.txt [iso-8859-1] Fri Jul 1 14:44:55 2016 @@ -8,6 +8,7 @@ add_subdirectory(com) add_subdirectory(crt) add_subdirectory(dciman32) +add_subdirectory(dnsapi) add_subdirectory(gdi32) add_subdirectory(gditools) add_subdirectory(iphlpapi) Added: trunk/rostests/apitests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/CMakeList… ============================================================================== --- trunk/rostests/apitests/dnsapi/CMakeLists.txt (added) +++ trunk/rostests/apitests/dnsapi/CMakeLists.txt [iso-8859-1] Fri Jul 1 14:44:55 2016 @@ -0,0 +1,10 @@ + +list(APPEND SOURCE + DnsQuery.c + testlist.c) + +add_executable(dnsapi_apitest ${SOURCE}) +target_link_libraries(dnsapi_apitest wine) +set_module_type(dnsapi_apitest win32cui) +add_importlibs(dnsapi_apitest ws2_32 dnsapi msvcrt kernel32 ntdll) +add_cd_file(TARGET dnsapi_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/dnsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dnsapi/DnsQuery.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/DnsQuery.… ============================================================================== --- trunk/rostests/apitests/dnsapi/DnsQuery.c (added) +++ trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] Fri Jul 1 14:44:55 2016 @@ -0,0 +1,112 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for DnsQuery_A + * PROGRAMMER: Victor Martinez Calvo <victor.martinez(a)reactos.org> + */ + +#include <winsock2.h> +#include <ws2tcpip.h> +#include <stdio.h> +#include <WinDNS.h> +#include <apitest.h> + + +void TestHostName(void) +{ + + DNS_STATUS dns_status = NO_ERROR; + char host_name[255]; + PDNS_RECORD dp = NULL; + WCHAR host_nameW[255]; + + gethostname(host_name, sizeof(host_name)); + mbstowcs(host_nameW, host_name, 255); + + //DnsQuery_A: + //NULL + dp = InvalidPointer; + dns_status = DnsQuery_A(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_A failed with error %lu\n", dns_status); + ok(dp == InvalidPointer, "dp = %p\n", dp); + + //Testing HostName + dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + //127.0.0.1 + dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + //Localhost strings + dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + //DnsQuery_W: + //NULL + dp = InvalidPointer; + dns_status = DnsQuery_W(NULL, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + if (dns_status == NO_ERROR) + { + /* Win2003 */ + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + ok(dp != NULL && dp != InvalidPointer, "dp = %p\n", dp); + } + else + { + /* Win7 */ + ok(dns_status == ERROR_INVALID_PARAMETER, "DnsQuery_W failed with error %lu\n", dns_status); + ok(dp == InvalidPointer, "dp = %p\n", dp); + } + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); + + //Testing HostName + dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + //127.0.0.1 + dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + //Localhost strings + dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); + + dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); + ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); + DnsRecordListFree(dp, DnsFreeRecordList); +} + +START_TEST(DnsQuery) +{ + WSADATA wsaData; + int iResult; + + // Initialize Winsock + iResult = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(iResult == 0, "WSAStartup failed: %d\n", iResult); + if (iResult != 0) return; + + // Tests + TestHostName(); + + return; +} Propchange: trunk/rostests/apitests/dnsapi/DnsQuery.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/dnsapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/testlist.… ============================================================================== --- trunk/rostests/apitests/dnsapi/testlist.c (added) +++ trunk/rostests/apitests/dnsapi/testlist.c [iso-8859-1] Fri Jul 1 14:44:55 2016 @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_DnsQuery(void); + +const struct test winetest_testlist[] = +{ + { "DnsQuery", func_DnsQuery }, + { 0, 0 } +}; Propchange: trunk/rostests/apitests/dnsapi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71708: [KERNEL32]: Don't hardcode flag values for NtOpenKey.
by hbelusca＠svn.reactos.org 30 Jun '16

30 Jun '16

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 */

1 0

[jimtabor] 71707: [Win32SS] - Remove unused flag and set old menu type back, based on wine.
by jimtabor＠svn.reactos.org 30 Jun '16

30 Jun '16

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)) {

1 0

[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 30 Jun '16

30 Jun '16

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…

1 0

[apriyadarshi] 71705: - Completed Interrupt Handler Routine - Added Inquiry Completion Routine Check Notes.txt
by apriyadarshi＠svn.reactos.org 30 Jun '16

30 Jun '16

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; //////////////////////////////////////////////////////////////

1 0

[jimtabor] 71704: [NtUser] - Use internal function to validate menu handle. See CORE-11479 for more information.
by jimtabor＠svn.reactos.org 30 Jun '16

30 Jun '16

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)

1 0

[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 30 Jun '16

30 Jun '16

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); }

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