Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 70312: [TCPIP] Fix one test failure
by pschweitzer＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: pschweitzer Date: Tue Dec 8 22:16:18 2015 New Revision: 70312 URL: http://svn.reactos.org/svn/reactos?rev=70312&view=rev Log: [TCPIP] Fix one test failure Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Dec 8 22:16:18 2015 @@ -1672,7 +1672,8 @@ Irp->IoStatus.Information = 0; - if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < 2 * sizeof(ULONG)) { + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < 2 * sizeof(ULONG) || + IrpSp->Parameters.DeviceIoControl.OutputBufferLength == 0) { Status = STATUS_INVALID_BUFFER_SIZE; goto Exit; }

1 0

[gedmurphy] 70311: [GDI32_APITEST] - Add some tests for GetGlyphIndices
by gedmurphy＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: gedmurphy Date: Tue Dec 8 22:14:48 2015 New Revision: 70311 URL: http://svn.reactos.org/svn/reactos?rev=70311&view=rev Log: [GDI32_APITEST] - Add some tests for GetGlyphIndices Added: trunk/rostests/apitests/gdi32/GetGlyphIndices.c (with props) trunk/rostests/apitests/gdi32/ReactOSTestTahoma.ttf (with props) trunk/rostests/apitests/gdi32/resource.rc (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Tue Dec 8 22:14:48 2015 @@ -44,6 +44,7 @@ GetCurrentObject.c GetDIBColorTable.c GetDIBits.c + GetGlyphIndices.c GetObject.c GetRandomRgn.c GetPixel.c @@ -72,7 +73,7 @@ init.c testlist.c) -add_executable(gdi32_apitest ${SOURCE}) +add_executable(gdi32_apitest ${SOURCE} resource.rc) target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) Added: trunk/rostests/apitests/gdi32/GetGlyphIndices.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetGlyphIn… ============================================================================== --- trunk/rostests/apitests/gdi32/GetGlyphIndices.c (added) +++ trunk/rostests/apitests/gdi32/GetGlyphIndices.c [iso-8859-1] Tue Dec 8 22:14:48 2015 @@ -0,0 +1,170 @@ +/* +* PROJECT: ReactOS api tests +* LICENSE: GPL - See COPYING in the top level directory +* PURPOSE: Test for GetGlyphIndices +* PROGRAMMERS: Ged Murphy +*/ + +#include <apitest.h> +#include <wingdi.h> +#include <winuser.h> +#include <Strsafe.h> + + +#define ok_lasterrornotchanged() \ + ok_err(0x12345) + +#define MAX_BMP_GLYPHS 0xFFFF + +static LPVOID GetResource(LPCWSTR FontName, LPDWORD Size) +{ + HRSRC hRsrc; + LPVOID Data; + + hRsrc = FindResourceW(GetModuleHandleW(NULL), FontName, (LPCWSTR)RT_RCDATA); + if (!hRsrc) return NULL; + + Data = LockResource(LoadResource(GetModuleHandleW(NULL), hRsrc)); + if (!Data) return NULL; + + *Size = SizeofResource(GetModuleHandleW(NULL), hRsrc); + if (*Size == 0) return NULL; + + return Data; +} + +static BOOL ExtractTTFFile(LPCWSTR FontName, LPWSTR TempFile) +{ + WCHAR TempPath[MAX_PATH]; + HANDLE hFile; + void *Data; + DWORD Size; + BOOL ret; + + Data = GetResource(FontName, &Size); + if (!Data) return FALSE; + + GetTempPathW(MAX_PATH, TempPath); + GetTempFileNameW(TempPath, L"ttf", 0, TempFile); + + hFile = CreateFileW(TempFile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hFile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hFile, Data, Size, &Size, NULL); + + CloseHandle(hFile); + return ret; +} + +static BOOL InstallTempFont(LPWSTR TempFile) +{ + if (ExtractTTFFile(L"ReactOSTestTahoma.ttf", TempFile)) + { + if (AddFontResourceExW(TempFile, FR_PRIVATE, 0) > 0) + { + return TRUE; + } + } + + return FALSE; +} + +static VOID RemoveTempFont(LPWSTR TempFile) +{ + BOOL Success; + Success = RemoveFontResourceExW(TempFile, FR_PRIVATE, 0); + ok(Success, "RemoveFontResourceEx() failed, we're leaving fonts installed : %lu\n", GetLastError()); + DeleteFileW(TempFile); +} + +static HFONT IntCreateFont(LPWSTR FontName) +{ + LOGFONTW Font = { 0 }; + Font.lfCharSet = DEFAULT_CHARSET; + wcsncpy(Font.lfFaceName, FontName, sizeof(Font.lfFaceName) / sizeof(Font.lfFaceName[0])); + return CreateFontIndirectW(&Font); +} + +START_TEST(GetGlyphIndices) +{ + WCHAR Glyphs[MAX_BMP_GLYPHS]; + WORD Indices[MAX_BMP_GLYPHS]; + WCHAR Single[2] = { L' ', UNICODE_NULL }; + WCHAR TempTTFFile[MAX_PATH]; + HFONT hFont; + HDC hdc; + int i; + + if (!InstallTempFont(TempTTFFile)) + { + skip("Failed to create ttf file for testing\n"); + return; + } + + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "CreateCompatibleDC failed, skipping tests.\n"); + if (!hdc) return; + + hFont = IntCreateFont(L"ReactOSTestTahoma"); + ok(hFont != NULL, "Failed to open the test font"); + SelectObject(hdc, hFont); + + SetLastError(0x12345); + + /* Test NULL DC */ + ok_int(GetGlyphIndicesW(NULL, Single, 1, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); + + /* Test invalid DC */ + ok_int(GetGlyphIndicesW((HDC)(ULONG_PTR)0x12345, Single, 1, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); + + /* Test invalid params */ + ok_int(GetGlyphIndicesW(hdc, NULL, 0, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, NULL, 1, Indices, 0), GDI_ERROR); + ok_lasterrornotchanged(); + ok_int(GetGlyphIndicesW(hdc, Single, 1, NULL, 0), GDI_ERROR); + ok_lasterrornotchanged(); + + /* Test a single valid char */ + Single[0] = L'a'; + ok_int(GetGlyphIndicesW(hdc, Single, 1, Indices, 0), 1); + ok_lasterrornotchanged(); + ok_int(Indices[0], 68); + + /* Setup an array of all possible BMP glyphs */ + for (i = 0; i < 4; i++) + Glyphs[i] = (WCHAR)i; + + /* Test a string of valid chars */ + StringCchCopyW(Glyphs, MAX_BMP_GLYPHS, L"0123"); + ok_int(GetGlyphIndicesW(hdc, Glyphs, 4, Indices, 0), 4); + ok_lasterrornotchanged(); + ok_int(Indices[0], 19); + ok_int(Indices[1], 20); + ok_int(Indices[2], 21); + ok_int(Indices[3], 22); + + /* Setup an array of all possible BMP glyphs */ + for (i = 0; i < MAX_BMP_GLYPHS; i++) + Glyphs[i] = (WCHAR)i; + + /* Get all the glyphs */ + ok_int(GetGlyphIndicesW(hdc, + Glyphs, + MAX_BMP_GLYPHS, + Indices, + GGI_MARK_NONEXISTING_GLYPHS), MAX_BMP_GLYPHS); + + /* The first 32 are invalid and should contain 0xffff */ + for (i = 0; i < 32; i++) + ok_int(Indices[i], 0xffff); + + /* These are the first 2 valid chars */ + ok(Indices[32] != 0xffff, "ascii char ' ' should be a valid char"); + ok(Indices[33] != 0xffff, "ascii char '!' should be a valid char"); + + RemoveTempFont(TempTTFFile); +} + Propchange: trunk/rostests/apitests/gdi32/GetGlyphIndices.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/ReactOSTestTahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ReactOSTes… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/gdi32/ReactOSTestTahoma.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/gdi32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/resource.r… ============================================================================== --- trunk/rostests/apitests/gdi32/resource.rc (added) +++ trunk/rostests/apitests/gdi32/resource.rc [iso-8859-1] Tue Dec 8 22:14:48 2015 @@ -0,0 +1,3 @@ +#include "windef.h" + +ReactOSTestTahoma.ttf RCDATA ReactOSTestTahoma.ttf Propchange: trunk/rostests/apitests/gdi32/resource.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Tue Dec 8 22:14:48 2015 @@ -45,6 +45,7 @@ extern void func_GetCurrentObject(void); extern void func_GetDIBColorTable(void); extern void func_GetDIBits(void); +extern void func_GetGlyphIndices(void); extern void func_GetPixel(void); extern void func_GetObject(void); extern void func_GetRandomRgn(void); @@ -115,6 +116,7 @@ { "GetCurrentObject", func_GetCurrentObject }, { "GetDIBColorTable", func_GetDIBColorTable }, { "GetDIBits", func_GetDIBits }, + { "GetGlyphIndices", func_GetGlyphIndices }, { "GetPixel", func_GetPixel }, { "GetObject", func_GetObject }, { "GetRandomRgn", func_GetRandomRgn },

1 0

[tfaber] 70310: [CLASS2] - Don't take a reference on the device object in ScsiClassClaimDevice since it's not going to be released before device removal. Inspired by classpnp. Fixes ejecting mass s...
by tfaber＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: tfaber Date: Tue Dec 8 17:46:33 2015 New Revision: 70310 URL: http://svn.reactos.org/svn/reactos?rev=70310&view=rev Log: [CLASS2] - Don't take a reference on the device object in ScsiClassClaimDevice since it's not going to be released before device removal. Inspired by classpnp. Fixes ejecting mass storage devices. CORE-8911 #resolve Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 17:46:33 2015 @@ -4826,7 +4826,7 @@ if (Release) { - ObDereferenceObject(PortDeviceObject); + //ObDereferenceObject(PortDeviceObject); return STATUS_SUCCESS; } @@ -4850,6 +4850,7 @@ return status; } + ObDereferenceObject(srb.DataBuffer); // // Return the new port device object pointer.

1 0

[ekohl] 70309: [SYSSETUP] - Get rid of the global SetupData variable. Allocate the setup data struct from heap instead and pass its pointer to all wizard pages. - Keep the setup data pointer in all...
by ekohl＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: ekohl Date: Tue Dec 8 15:57:47 2015 New Revision: 70309 URL: http://svn.reactos.org/svn/reactos?rev=70309&view=rev Log: [SYSSETUP] - Get rid of the global SetupData variable. Allocate the setup data struct from heap instead and pass its pointer to all wizard pages. - Keep the setup data pointer in all wizard pages where it is needed. - Keep the handle to the unattended.inf file open as long as the setup wizard exists. Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Tue Dec 8 15:57:47 2015 @@ -56,6 +56,8 @@ DWORD TimeZoneIndex; DWORD DisableAutoDaylightTimeSet; LCID LocaleID; + + HINF hUnattendedInf; } SETUPDATA, *PSETUPDATA; typedef struct _ADMIN_INFO @@ -67,7 +69,6 @@ extern HINSTANCE hDllInstance; extern HINF hSysSetupInf; -extern SETUPDATA SetupData; extern ADMIN_INFO AdminInfo; BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Tue Dec 8 15:57:47 2015 @@ -45,10 +45,6 @@ PVOID DefaultContext; } REGISTRATIONDATA, *PREGISTRATIONDATA; -/* GLOBALS ******************************************************************/ - -SETUPDATA SetupData; - /* FUNCTIONS ****************************************************************/ @@ -224,16 +220,20 @@ WPARAM wParam, LPARAM lParam) { + PSETUPDATA pSetupData; + + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: { - PSETUPDATA SetupData; HWND hwndControl; DWORD dwStyle; /* Get pointer to the global setup data */ - SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); hwndControl = GetParent(hwndDlg); @@ -253,7 +253,7 @@ SendDlgItemMessage(hwndDlg, IDC_WELCOMETITLE, WM_SETFONT, - (WPARAM)SetupData->hTitleFont, + (WPARAM)pSetupData->hTitleFont, (LPARAM)TRUE); } break; @@ -268,7 +268,7 @@ case PSN_SETACTIVE: /* Enable the Next button */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); - if (SetupData.UnattendSetup) + if (pSetupData->UnattendSetup) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE); return TRUE; @@ -276,7 +276,7 @@ break; case PSN_WIZBACK: - SetupData.UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; default: @@ -303,11 +303,17 @@ PWCHAR Projects; PWCHAR End, CurrentProject; INT ProjectsSize, ProjectsCount; + PSETUPDATA pSetupData; + + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: { + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + Projects = NULL; ProjectsSize = 256; do @@ -370,7 +376,7 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData.UnattendSetup) + if (pSetupData->UnattendSetup) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE); return TRUE; @@ -378,7 +384,7 @@ break; case PSN_WIZBACK: - SetupData.UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; default: @@ -450,11 +456,17 @@ WCHAR Title[64]; WCHAR ErrorName[256]; LPNMHDR lpnm; + PSETUPDATA pSetupData; + + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: { + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + /* set a localized ('Owner') placeholder string as default */ if (LoadStringW(hDllInstance, IDS_MACHINE_OWNER_NAME, OwnerName, _countof(OwnerName))) { @@ -482,11 +494,11 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData.UnattendSetup) + if (pSetupData->UnattendSetup) { - SendMessage(GetDlgItem(hwndDlg, IDC_OWNERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.OwnerName); - SendMessage(GetDlgItem(hwndDlg, IDC_OWNERORGANIZATION), WM_SETTEXT, 0, (LPARAM)SetupData.OwnerOrganization); - if (WriteOwnerSettings(SetupData.OwnerName, SetupData.OwnerOrganization)) + SendMessage(GetDlgItem(hwndDlg, IDC_OWNERNAME), WM_SETTEXT, 0, (LPARAM)pSetupData->OwnerName); + SendMessage(GetDlgItem(hwndDlg, IDC_OWNERORGANIZATION), WM_SETTEXT, 0, (LPARAM)pSetupData->OwnerOrganization); + if (WriteOwnerSettings(pSetupData->OwnerName, pSetupData->OwnerOrganization)) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE); return TRUE; @@ -525,7 +537,7 @@ } case PSN_WIZBACK: - SetupData.UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; default: @@ -661,6 +673,9 @@ WCHAR Title[64]; WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256]; LPNMHDR lpnm; + PSETUPDATA pSetupData; + + pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) { @@ -670,6 +685,9 @@ switch (uMsg) { case WM_INITDIALOG: + pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + /* Generate a new pseudo-random computer name */ GenerateComputerName(ComputerName); @@ -683,17 +701,17 @@ /* Set focus to computer name */ SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); - if (SetupData.UnattendSetup) - { - SendMessage(GetDlgItem(hwndDlg, IDC_COMPUTERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.ComputerName); - SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD1), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); - SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD2), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); - WriteComputerSettings(SetupData.ComputerName, NULL); - SetAdministratorPassword(SetupData.AdminPassword); + if (pSetupData->UnattendSetup) + { + SendMessage(GetDlgItem(hwndDlg, IDC_COMPUTERNAME), WM_SETTEXT, 0, (LPARAM)pSetupData->ComputerName); + SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD1), WM_SETTEXT, 0, (LPARAM)pSetupData->AdminPassword); + SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD2), WM_SETTEXT, 0, (LPARAM)pSetupData->AdminPassword); + WriteComputerSettings(pSetupData->ComputerName, NULL); + SetAdministratorPassword(pSetupData->AdminPassword); } /* Store the administrator account name as the default user name */ - WriteDefaultLogonData(SetupData.ComputerName); + WriteDefaultLogonData(pSetupData->ComputerName); break; @@ -706,7 +724,7 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData.UnattendSetup && WriteComputerSettings(SetupData.ComputerName, hwndDlg)) + if (pSetupData->UnattendSetup && WriteComputerSettings(pSetupData->ComputerName, hwndDlg)) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); return TRUE; @@ -791,7 +809,7 @@ break; case PSN_WIZBACK: - SetupData.UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; default: @@ -2091,8 +2109,9 @@ } -BOOL -ProcessUnattendInf(HINF hUnattendedInf) +VOID +ProcessUnattendInf( + PSETUPDATA pSetupData) { INFCONTEXT InfContext; WCHAR szName[256]; @@ -2100,13 +2119,13 @@ DWORD LineLength; HKEY hKey; - if (!SetupFindFirstLineW(hUnattendedInf, + if (!SetupFindFirstLineW(pSetupData->hUnattendedInf, L"Unattend", L"UnattendSetupEnabled", &InfContext)) { DPRINT1("Error: Cant find UnattendSetupEnabled Key! %d\n", GetLastError()); - return FALSE; + return; } if (!SetupGetStringFieldW(&InfContext, @@ -2116,24 +2135,25 @@ &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); - return FALSE; + return; } if (wcscmp(szValue, L"yes") != 0) { DPRINT("Unattend setup was disabled by UnattendSetupEnabled key.\n"); - return FALSE; - } - - if (!SetupFindFirstLineW(hUnattendedInf, + return; + } + + pSetupData->UnattendSetup = TRUE; + + if (!SetupFindFirstLineW(pSetupData->hUnattendedInf, L"Unattend", NULL, &InfContext)) { DPRINT1("Error: SetupFindFirstLine failed %d\n", GetLastError()); - return FALSE; - } - + return; + } do { @@ -2144,7 +2164,7 @@ &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); - return FALSE; + return; } if (!SetupGetStringFieldW(&InfContext, @@ -2154,62 +2174,63 @@ &LineLength)) { DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); - return FALSE; + return; } DPRINT1("Name %S Value %S\n", szName, szValue); if (!wcscmp(szName, L"FullName")) { - if ((sizeof(SetupData.OwnerName) / sizeof(TCHAR)) > LineLength) - { - wcscpy(SetupData.OwnerName, szValue); + if ((sizeof(pSetupData->OwnerName) / sizeof(TCHAR)) > LineLength) + { + wcscpy(pSetupData->OwnerName, szValue); } } else if (!wcscmp(szName, L"OrgName")) { - if ((sizeof(SetupData.OwnerOrganization) / sizeof(WCHAR)) > LineLength) - { - wcscpy(SetupData.OwnerOrganization, szValue); + if ((sizeof(pSetupData->OwnerOrganization) / sizeof(WCHAR)) > LineLength) + { + wcscpy(pSetupData->OwnerOrganization, szValue); } } else if (!wcscmp(szName, L"ComputerName")) { - if ((sizeof(SetupData.ComputerName) / sizeof(WCHAR)) > LineLength) - { - wcscpy(SetupData.ComputerName, szValue); + if ((sizeof(pSetupData->ComputerName) / sizeof(WCHAR)) > LineLength) + { + wcscpy(pSetupData->ComputerName, szValue); } } else if (!wcscmp(szName, L"AdminPassword")) { - if ((sizeof(SetupData.AdminPassword) / sizeof(WCHAR)) > LineLength) - { - wcscpy(SetupData.AdminPassword, szValue); + if ((sizeof(pSetupData->AdminPassword) / sizeof(WCHAR)) > LineLength) + { + wcscpy(pSetupData->AdminPassword, szValue); } } else if (!wcscmp(szName, L"TimeZoneIndex")) { - SetupData.TimeZoneIndex = _wtoi(szValue); + pSetupData->TimeZoneIndex = _wtoi(szValue); } else if (!wcscmp(szName, L"DisableAutoDaylightTimeSet")) { - SetupData.DisableAutoDaylightTimeSet = _wtoi(szValue); + pSetupData->DisableAutoDaylightTimeSet = _wtoi(szValue); } else if (!wcscmp(szName, L"DisableVmwInst")) { if(!wcscmp(szValue, L"yes")) - SetupData.DisableVmwInst = 1; + pSetupData->DisableVmwInst = 1; else - SetupData.DisableVmwInst = 0; + pSetupData->DisableVmwInst = 0; } else if (!wcscmp(szName, L"DisableGeckoInst")) { if(!wcscmp(szValue, L"yes")) - SetupData.DisableGeckoInst = 1; + pSetupData->DisableGeckoInst = 1; else - SetupData.DisableGeckoInst = 0; + pSetupData->DisableGeckoInst = 0; } } while (SetupFindNextLine(&InfContext, &InfContext)); + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\RunOnce", 0, @@ -2217,11 +2238,10 @@ &hKey) != ERROR_SUCCESS) { DPRINT1("Error: failed to open HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce\n"); - return TRUE; - } - - - if (SetupFindFirstLineW(hUnattendedInf, + return; + } + + if (SetupFindFirstLineW(pSetupData->hUnattendedInf, L"GuiRunOnce", NULL, &InfContext)) @@ -2258,7 +2278,6 @@ } RegCloseKey(hKey); - return TRUE; } /* @@ -2308,10 +2327,10 @@ VOID -ProcessUnattendSetup(VOID) +ProcessUnattendSetup( + PSETUPDATA pSetupData) { WCHAR szPath[MAX_PATH]; - HINF hUnattendedInf; DWORD dwLength; if (!GetRosInstallCD(szPath, MAX_PATH)) @@ -2331,15 +2350,13 @@ wcscat(szPath, L"reactos\\unattend.inf"); - hUnattendedInf = SetupOpenInfFileW(szPath, - NULL, - INF_STYLE_OLDNT, - NULL); - - if (hUnattendedInf != INVALID_HANDLE_VALUE) - { - SetupData.UnattendSetup = ProcessUnattendInf(hUnattendedInf); - SetupCloseInfFile(hUnattendedInf); + pSetupData->hUnattendedInf = SetupOpenInfFileW(szPath, + NULL, + INF_STYLE_OLDNT, + NULL); + if (pSetupData->hUnattendedInf != INVALID_HANDLE_VALUE) + { + ProcessUnattendInf(pSetupData); } } @@ -2353,17 +2370,29 @@ UINT nPages = 0; HWND hWnd; MSG msg; - - /* Clear setup data */ - ZeroMemory(&SetupData, sizeof(SETUPDATA)); - - ProcessUnattendSetup(); + PSETUPDATA pSetupData = NULL; + + /* Allocate setup data */ + pSetupData = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SETUPDATA)); + if (pSetupData == NULL) + { + MessageBoxW(NULL, + L"Setup failed to allocate global data!", + L"ReactOS Setup", + MB_ICONERROR | MB_OK); + return; + } + + pSetupData->hUnattendedInf = INVALID_HANDLE_VALUE; + ProcessUnattendSetup(pSetupData); /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hDllInstance; - psp.lParam = (LPARAM)&SetupData; + psp.lParam = (LPARAM)pSetupData; psp.pfnDlgProc = WelcomeDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); @@ -2438,7 +2467,7 @@ psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); /* Create title font */ - SetupData.hTitleFont = CreateTitleFont(); + pSetupData->hTitleFont = CreateTitleFont(); /* Display the wizard */ hWnd = (HWND)PropertySheet(&psh); @@ -2453,7 +2482,11 @@ } } - DeleteObject(SetupData.hTitleFont); + if (pSetupData->hUnattendedInf != INVALID_HANDLE_VALUE) + SetupCloseInfFile(pSetupData->hUnattendedInf); + + DeleteObject(pSetupData->hTitleFont); + HeapFree(GetProcessHeap(), 0, pSetupData); } /* EOF */

1 0

[tfaber] 70308: [CLASS2] - Properly forward PNP IRPs to the lower device CORE-8911
by tfaber＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: tfaber Date: Tue Dec 8 13:54:35 2015 New Revision: 70308 URL: http://svn.reactos.org/svn/reactos?rev=70308&view=rev Log: [CLASS2] - Properly forward PNP IRPs to the lower device CORE-8911 Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 13:54:35 2015 @@ -354,14 +354,14 @@ { ASSERT(DeviceInfo->Signature == '2slc'); IoSkipCurrentIrpStackLocation(Irp); - return STATUS_SUCCESS; + return IoCallDriver(DeviceInfo->LowerDevice, Irp); } else if (IrpSp->MinorFunction == IRP_MN_REMOVE_DEVICE) { - PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; - ASSERT(DeviceInfo->Signature == '2slc'); ScsiClassRemoveDriveLetter(DeviceInfo); + + IoForwardIrpSynchronously(DeviceInfo->LowerDevice, Irp); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -372,6 +372,12 @@ } else { + if (DeviceInfo->Signature == '2slc') + { + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceInfo->LowerDevice, Irp); + } + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED;

1 0

[tfaber] 70307: [CLASS2] - Fix build CORE-8911
by tfaber＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: tfaber Date: Tue Dec 8 13:30:06 2015 New Revision: 70307 URL: http://svn.reactos.org/svn/reactos?rev=70307&view=rev Log: [CLASS2] - Fix build CORE-8911 Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 13:30:06 2015 @@ -347,6 +347,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); if (IrpSp->MinorFunction == IRP_MN_START_DEVICE)

1 0

[tfaber] 70306: [CLASS2] - Add a Signature member to make devices created from class2's AddDevice recognizable CORE-8911
by tfaber＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: tfaber Date: Tue Dec 8 13:25:37 2015 New Revision: 70306 URL: http://svn.reactos.org/svn/reactos?rev=70306&view=rev Log: [CLASS2] - Add a Signature member to make devices created from class2's AddDevice recognizable CORE-8911 Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Dec 8 13:25:37 2015 @@ -137,6 +137,7 @@ /* The following hack to assign drive letters with a non-PnP storage stack */ typedef struct _CLASS_DEVICE_INFO { + ULONG Signature; ULONG DeviceType; ULONG Partitions; ULONG DeviceNumber; @@ -350,6 +351,7 @@ if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) { + ASSERT(DeviceInfo->Signature == '2slc'); IoSkipCurrentIrpStackLocation(Irp); return STATUS_SUCCESS; } @@ -357,6 +359,7 @@ { PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; + ASSERT(DeviceInfo->Signature == '2slc'); ScsiClassRemoveDriveLetter(DeviceInfo); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -403,6 +406,7 @@ DeviceInfo = DeviceObject->DeviceExtension; RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO)); + DeviceInfo->Signature = '2slc'; /* Attach it to the PDO */ DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); @@ -624,6 +628,8 @@ { PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Invoke the device-specific routine, if one exists. Otherwise complete // with SUCCESS @@ -677,6 +683,8 @@ ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG maximumTransferLength = deviceExtension->PortCapabilities->MaximumTransferLength; NTSTATUS status; + + ASSERT(*(PULONG)deviceExtension != '2slc'); if (DeviceObject->Flags & DO_VERIFY_VOLUME && !(currentIrpStack->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { @@ -1041,6 +1049,8 @@ SCSI_REQUEST_BLOCK srb; NTSTATUS status; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Allocate read capacity buffer from nonpaged pool. // @@ -1263,6 +1273,8 @@ PCOMPLETION_CONTEXT context; PSCSI_REQUEST_BLOCK srb; KIRQL currentIrql; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Allocate context from nonpaged pool. @@ -1408,6 +1420,8 @@ PSCSI_REQUEST_BLOCK srb; PCOMPLETION_CONTEXT context; PCDB cdb; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Allocate Srb from nonpaged pool. @@ -1633,6 +1647,8 @@ DebugPrint((2, "ScsiClassSplitRequest: Requires %d IRPs\n", irpCount)); DebugPrint((2, "ScsiClassSplitRequest: Original IRP %lx\n", Irp)); + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // If all partial transfers complete successfully then the status and // bytes transferred are already set up. Failing a partial-transfer IRP @@ -1817,6 +1833,8 @@ NTSTATUS status; BOOLEAN retry; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Check SRB status for success of completing request. // @@ -1968,6 +1986,8 @@ LONG irpCount; NTSTATUS status; BOOLEAN retry; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Check SRB status for success of completing request. @@ -2189,6 +2209,8 @@ LARGE_INTEGER dummy; PAGED_CODE(); + + ASSERT(*(PULONG)deviceExtension != '2slc'); dummy.QuadPart = 0; @@ -2481,6 +2503,7 @@ ULONG i; #endif + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Check that request sense buffer is valid. @@ -3161,6 +3184,8 @@ PIO_STACK_LOCATION nextIrpStack = IoGetNextIrpStackLocation(Irp); ULONG transferByteCount; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Determine the transfer count of the request. If this is a read or a // write then the transfer count is in the Irp stack. Otherwise assume @@ -3291,6 +3316,8 @@ PCDB cdb; ULONG logicalBlockAddress; USHORT transferBlocks; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Calculate relative sector address. @@ -3510,6 +3537,8 @@ SCSI_REQUEST_BLOCK srb; ULONG retries = 1; NTSTATUS status; + + ASSERT(*(PULONG)deviceExtension != '2slc'); RtlZeroMemory(&srb, sizeof(SCSI_REQUEST_BLOCK)); @@ -3687,6 +3716,8 @@ PAGED_CODE(); + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Write length to SRB. // @@ -3860,6 +3891,7 @@ PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Call the class specific driver DeviceControl routine. @@ -3908,6 +3940,8 @@ PCDB cdb; NTSTATUS status; ULONG modifiedIoControlCode; + + ASSERT(*(PULONG)deviceExtension != '2slc'); if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_RESET_DEVICE) { @@ -4456,6 +4490,8 @@ { PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + if (deviceExtension->ClassShutdownFlush) { // @@ -4609,6 +4645,8 @@ PDEVICE_EXTENSION deviceExtension = deviceObject->DeviceExtension; + ASSERT(*(PULONG)deviceExtension != '2slc'); + // // Fill in entry points // @@ -4853,6 +4891,8 @@ PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; PSCSI_REQUEST_BLOCK srb; + + ASSERT(*(PULONG)deviceExtension != '2slc'); // // Get a pointer to the SRB. @@ -5108,6 +5148,9 @@ deviceExtension->PhysicalDevice->DeviceExtension; PIRP originalIrp; + ASSERT(*(PULONG)deviceExtension != '2slc'); + ASSERT(*(PULONG)physicalExtension != '2slc'); + originalIrp = irpStack->Parameters.Others.Argument1; //

1 0

[akhaldi] 70305: [WINSPOOL] Properly stub IsValidDevmodeW.
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 13:01:28 2015 New Revision: 70305 URL: http://svn.reactos.org/svn/reactos?rev=70305&view=rev Log: [WINSPOOL] Properly stub IsValidDevmodeW. Modified: trunk/reactos/dll/win32/winspool/winspool.spec Modified: trunk/reactos/dll/win32/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.spec [iso-8859-1] Tue Dec 8 13:01:28 2015 @@ -153,7 +153,7 @@ @ stdcall GetPrintProcessorDirectoryW(wstr wstr long ptr long ptr) @ stub GetSpoolFileHandle @ stub IsValidDevmodeA -@ stub IsValidDevmodeW +@ stdcall -stub IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) @ stub PlayGdiScriptOnPrinterIC

1 0

[tfaber] 70304: [FASTFAT] - Always use the full path name when looking for FCB hashes CORE-10483 #resolve
by tfaber＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: tfaber Date: Tue Dec 8 12:57:45 2015 New Revision: 70304 URL: http://svn.reactos.org/svn/reactos?rev=70304&view=rev Log: [FASTFAT] - Always use the full path name when looking for FCB hashes CORE-10483 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Tue Dec 8 12:57:45 2015 @@ -437,6 +437,7 @@ DPRINT("'%wZ'\n", PathNameU); + ASSERT(PathNameU->Length >= sizeof(WCHAR) && PathNameU->Buffer[0] == L'\\'); Hash = vfatNameHash(0, PathNameU); entry = pVCB->FcbHashTable[Hash % pVCB->HashTableSize]; @@ -812,14 +813,15 @@ DPRINT("vfatGetFCBForFile (%p,%p,%p,%wZ)\n", pVCB, pParentFCB, pFCB, pFileNameU); - FileNameU.Buffer = NameBuffer; - FileNameU.MaximumLength = sizeof(NameBuffer); - RtlCopyUnicodeString(&FileNameU, pFileNameU); + RtlInitEmptyUnicodeString(&FileNameU, NameBuffer, sizeof(NameBuffer)); parentFCB = *pParentFCB; if (parentFCB == NULL) { + /* Passed-in name is the full name */ + RtlCopyUnicodeString(&FileNameU, pFileNameU); + // Trivial case, open of the root directory on volume if (RtlEqualUnicodeString(&FileNameU, &RootNameU, FALSE)) { @@ -888,9 +890,20 @@ } else { + /* Make absolute path */ + RtlCopyUnicodeString(&FileNameU, &parentFCB->PathNameU); + curr = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; + if (*curr != L'\\') + { + RtlAppendUnicodeToString(&FileNameU, L"\\"); + curr++; + } + ASSERT(*curr == L'\\'); + RtlAppendUnicodeStringToString(&FileNameU, pFileNameU); + FCB = parentFCB; parentFCB = NULL; - prev = curr = FileNameU.Buffer - 1; + prev = curr; last = FileNameU.Buffer + FileNameU.Length / sizeof(WCHAR) - 1; }

1 0

[akhaldi] 70303: [QEDIT_WINETEST] Welcome to the green family.
by akhaldi＠svn.reactos.org 08 Dec '15

08 Dec '15

Author: akhaldi Date: Tue Dec 8 12:43:26 2015 New Revision: 70303 URL: http://svn.reactos.org/svn/reactos?rev=70303&view=rev Log: [QEDIT_WINETEST] Welcome to the green family. Modified: trunk/rostests/winetests/qedit/CMakeLists.txt Modified: trunk/rostests/winetests/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qedit/CMakeList… ============================================================================== --- trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qedit/CMakeLists.txt [iso-8859-1] Tue Dec 8 12:43:26 2015 @@ -1,4 +1,5 @@ +add_definitions(-DUSE_WINE_TODOS) add_executable(qedit_winetest mediadet.c testlist.c qedit.rc) set_module_type(qedit_winetest win32cui) add_importlibs(qedit_winetest oleaut32 ole32 msvcrt kernel32)

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