Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[hbelusca] 74356: [CONSOLE.CPL]: Code formatting only (in preparation of a subsequent commit).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 17 17:45:18 2017 New Revision: 74356 URL: http://svn.reactos.org/svn/reactos?rev=74356&view=rev Log: [CONSOLE.CPL]: Code formatting only (in preparation of a subsequent commit). Modified: trunk/reactos/dll/cpl/console/font.c Modified: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/console/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/font.c [iso-8859-1] Mon Apr 17 17:45:18 2017 @@ -129,9 +129,9 @@ */ /* - * In ReactOS, we relax some criteria: + * In ReactOS we relax some of the criteria: * - We allow fixed-pitch FF_MODERN (Monospace) TrueType fonts - * that can be italic and have negative A or C space. + * that can be italic or have negative A or C space. * - If it is not a TrueType font, it can be from another character set * than OEM_CHARSET. * - We do not support Asian criteria at the moment. @@ -147,7 +147,9 @@ ) { DPRINT1("Font '%S' rejected because it%s (lfPitchAndFamily = %d).\n", - pszName, !(lplf->lfPitchAndFamily & FIXED_PITCH) ? "'s not FIXED_PITCH" : (!(lpntm->ntmFlags & NTM_NONNEGATIVE_AC) ? " has negative A or C space" : " is broken"), + pszName, !(lplf->lfPitchAndFamily & FIXED_PITCH) ? "'s not FIXED_PITCH" + : (!(lpntm->ntmFlags & NTM_NONNEGATIVE_AC) ? " has negative A or C space" + : " is broken"), lplf->lfPitchAndFamily); return TRUE; } @@ -395,8 +397,11 @@ DPRINT1("ConInfo->FaceName = '%S'\n", ConInfo->FaceName); idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, LB_FINDSTRINGEXACT, 0, (LPARAM)ConInfo->FaceName); - if (idx != LB_ERR) SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, - LB_SETCURSEL, (WPARAM)idx, 0); + if (idx != LB_ERR) + { + SendDlgItemMessageW(hwndDlg, IDC_LBOX_FONTTYPE, + LB_SETCURSEL, (WPARAM)idx, 0); + } FontTypeChange(hwndDlg, ConInfo);

7 years, 8 months

[tfaber] 74355: [NTOS:CC] - Implement CcPurgeCacheSection CORE-12893

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 17:29:10 2017 New Revision: 74355 URL: http://svn.reactos.org/svn/reactos?rev=74355&view=rev Log: [NTOS:CC] - Implement CcPurgeCacheSection CORE-12893 Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=74355… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Mon Apr 17 17:29:10 2017 @@ -135,10 +135,82 @@ IN ULONG Length, IN BOOLEAN UninitializeCacheMaps) { + PROS_SHARED_CACHE_MAP SharedCacheMap; + LONGLONG StartOffset; + LONGLONG EndOffset; + LIST_ENTRY FreeList; + KIRQL OldIrql; + PLIST_ENTRY ListEntry; + PROS_VACB Vacb; + LONGLONG ViewEnd; + CCTRACE(CC_API_DEBUG, "SectionObjectPointer=%p\n FileOffset=%p Length=%lu UninitializeCacheMaps=%d", SectionObjectPointer, FileOffset, Length, UninitializeCacheMaps); - //UNIMPLEMENTED; + if (UninitializeCacheMaps) + { + DPRINT1("FIXME: CcPurgeCacheSection not uninitializing private cache maps\n"); + } + + SharedCacheMap = SectionObjectPointer->SharedCacheMap; + + StartOffset = FileOffset != NULL ? FileOffset->QuadPart : 0; + if (Length == 0 || FileOffset == NULL) + { + EndOffset = MAXLONGLONG; + } + else + { + EndOffset = StartOffset + Length; + ASSERT(EndOffset > StartOffset); + } + + InitializeListHead(&FreeList); + + KeAcquireGuardedMutex(&ViewLock); + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &OldIrql); + ListEntry = SharedCacheMap->CacheMapVacbListHead.Flink; + while (ListEntry != &SharedCacheMap->CacheMapVacbListHead) + { + Vacb = CONTAINING_RECORD(ListEntry, ROS_VACB, CacheMapVacbListEntry); + ListEntry = ListEntry->Flink; + + /* Skip VACBs outside the range, or only partially in range */ + if (Vacb->FileOffset.QuadPart < StartOffset) + { + continue; + } + ViewEnd = min(Vacb->FileOffset.QuadPart + VACB_MAPPING_GRANULARITY, + SharedCacheMap->SectionSize.QuadPart); + if (ViewEnd >= EndOffset) + { + break; + } + + ASSERT((Vacb->ReferenceCount == 0) || + (Vacb->ReferenceCount == 1 && Vacb->Dirty)); + + /* This VACB is in range, so unlink it and mark for free */ + RemoveEntryList(&Vacb->VacbLruListEntry); + if (Vacb->Dirty) + { + RemoveEntryList(&Vacb->DirtyVacbListEntry); + DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; + } + RemoveEntryList(&Vacb->CacheMapVacbListEntry); + InsertHeadList(&FreeList, &Vacb->CacheMapVacbListEntry); + } + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, OldIrql); + KeReleaseGuardedMutex(&ViewLock); + + while (!IsListEmpty(&FreeList)) + { + Vacb = CONTAINING_RECORD(RemoveHeadList(&FreeList), + ROS_VACB, + CacheMapVacbListEntry); + CcRosInternalFreeVacb(Vacb); + } + return FALSE; }

7 years, 8 months

[tfaber] 74354: [FASTFAT] - On rename/move, flush parent directory data from cache instead of purging it. CORE-12893

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 17 16:54:28 2017 New Revision: 74354 URL: http://svn.reactos.org/svn/reactos?rev=74354&view=rev Log: [FASTFAT] - On rename/move, flush parent directory data from cache instead of purging it. CORE-12893 Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Mon Apr 17 16:54:28 2017 @@ -132,7 +132,7 @@ Status = vfatUpdateFCB(DeviceExt, pFcb, &DirContext, pFcb->parentFcb); if (NT_SUCCESS(Status)) { - CcPurgeCacheSection(&pFcb->parentFcb->SectionObjectPointers, NULL, 0, FALSE); + CcFlushCache(&pFcb->parentFcb->SectionObjectPointers, NULL, 0, NULL); } return Status; @@ -987,7 +987,7 @@ } OldParent = pFcb->parentFcb; - CcPurgeCacheSection(&OldParent->SectionObjectPointers, NULL, 0, FALSE); + CcFlushCache(&OldParent->SectionObjectPointers, NULL, 0, NULL); MoveContext.InPlace = (OldParent == ParentFcb); /* Add our new entry with our cluster */ @@ -999,7 +999,7 @@ *pFcb->Attributes, &MoveContext); - CcPurgeCacheSection(&pFcb->parentFcb->SectionObjectPointers, NULL, 0, FALSE); + CcFlushCache(&pFcb->parentFcb->SectionObjectPointers, NULL, 0, NULL); return Status; }

7 years, 8 months

[mjansen] 74353: [WIN32SS] Add full name support in FontFamilyFillInfo. Patch by Katayama Hirofumi MZ. CORE-10876

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Apr 17 16:08:38 2017 New Revision: 74353 URL: http://svn.reactos.org/svn/reactos?rev=74353&view=rev Log: [WIN32SS] Add full name support in FontFamilyFillInfo. Patch by Katayama Hirofumi MZ. CORE-10876 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Apr 17 16:08:38 2017 @@ -2090,7 +2090,8 @@ /* Convert UTF-16 big endian to little endian */ SwapEndian(Buf, Name.string_len); - Status = RtlCreateUnicodeString(pNameW, Buf); + RtlCreateUnicodeString(pNameW, Buf); + Status = STATUS_SUCCESS; break; } @@ -2111,7 +2112,8 @@ } static void FASTCALL -FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI) +FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, + LPCWSTR FullName, PFONTGDI FontGDI) { ANSI_STRING StyleA; UNICODE_STRING StyleW; @@ -2126,7 +2128,9 @@ DWORD fs0; NTSTATUS status; FT_Face Face = FontGDI->SharedFace->Face; - + UNICODE_STRING NameW; + + RtlInitUnicodeString(&NameW, NULL); RtlZeroMemory(Info, sizeof(FONTFAMILYINFO)); Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL); Otm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT); @@ -2189,28 +2193,37 @@ ExFreePoolWithTag(Otm, GDITAG_TEXT); /* face name */ - /* TODO: full name */ if (FaceName) { - RtlStringCbCopyW(Info->EnumLogFontEx.elfLogFont.lfFaceName, - sizeof(Info->EnumLogFontEx.elfLogFont.lfFaceName), - FaceName); - RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, - sizeof(Info->EnumLogFontEx.elfFullName), - FaceName); + RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), FaceName); } else { - UNICODE_STRING NameW; - RtlInitUnicodeString(&NameW, NULL); status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY, gusLanguageID); if (NT_SUCCESS(status)) { /* store it */ - RtlStringCbCopyW(Info->EnumLogFontEx.elfLogFont.lfFaceName, - sizeof(Info->EnumLogFontEx.elfLogFont.lfFaceName), + RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), NameW.Buffer); + RtlFreeUnicodeString(&NameW); + } + } + + /* full name */ + if (FullName) + { + RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, + sizeof(Info->EnumLogFontEx.elfFullName), + FullName); + } + else + { + status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FULL_NAME, + gusLanguageID); + if (NT_SUCCESS(status)) + { + /* store it */ RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName, sizeof(Info->EnumLogFontEx.elfFullName), NameW.Buffer); @@ -2371,7 +2384,8 @@ { if (*Count < Size) { - FontFamilyFillInfo(Info + *Count, EntryFaceNameW.Buffer, FontGDI); + FontFamilyFillInfo(Info + *Count, EntryFaceNameW.Buffer, + NULL, FontGDI); } (*Count)++; } @@ -2442,7 +2456,7 @@ if (InfoContext->Count < InfoContext->Size) { FontFamilyFillInfo(InfoContext->Info + InfoContext->Count, - RegistryName.Buffer, FontGDI); + RegistryName.Buffer, NULL, FontGDI); } InfoContext->Count++; return STATUS_SUCCESS; @@ -4715,7 +4729,7 @@ IsEqual = FALSE; FontFamilyFillInfo(&FamInfo[Count], FontEntry->FaceName.Buffer, - FontEntry->Font); + NULL, FontEntry->Font); for (i = 0; i < Count; ++i) { if (EqualFamilyInfo(&FamInfo[i], &FamInfo[Count]))

7 years, 8 months

[mjansen] 74352: [WIN32SS] Add extra logging to failed SURFACE_AllocSurface calls. CORE-13036

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Apr 17 15:48:56 2017 New Revision: 74352 URL: http://svn.reactos.org/svn/reactos?rev=74352&view=rev Log: [WIN32SS] Add extra logging to failed SURFACE_AllocSurface calls. CORE-13036 Modified: trunk/reactos/win32ss/gdi/eng/surface.c Modified: trunk/reactos/win32ss/gdi/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.c [iso-8859-1] Mon Apr 17 15:48:56 2017 @@ -324,7 +324,8 @@ pvBits); if (!psurf) { - DPRINT1("SURFACE_AllocSurface failed.\n"); + DPRINT1("SURFACE_AllocSurface failed. (STYPE_BITMAP, sizl.cx=%ld, sizl.cy=%ld, iFormat=%lu, fl=%lu, lWidth=%ld, pvBits=0x%p)\n", + sizl.cx, sizl.cy, iFormat, fl, lWidth, pvBits); return NULL; } @@ -363,7 +364,8 @@ NULL); if (!psurf) { - DPRINT1("SURFACE_AllocSurface failed.\n"); + DPRINT1("SURFACE_AllocSurface failed. (STYPE_DEVBITMAP, sizl.cx=%ld, sizl.cy=%ld, iFormat=%lu)\n", + sizl.cx, sizl.cy, iFormat); return NULL; } @@ -402,7 +404,8 @@ NULL); if (!psurf) { - DPRINT1("SURFACE_AllocSurface failed.\n"); + DPRINT1("SURFACE_AllocSurface failed. (STYPE_DEVICE, sizl.cx=%ld, sizl.cy=%ld, iFormat=%lu)\n", + sizl.cx, sizl.cy, iFormat); return NULL; }

7 years, 8 months

[cfinck] 74351: [ISOHYBRID] Don't include inttypes.h, which isn't available on MSVC < 2013. Add the 4 needed typedefs to reactos_support_code.h instead. Fixes CORE-13031

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Apr 17 13:49:46 2017 New Revision: 74351 URL: http://svn.reactos.org/svn/reactos?rev=74351&view=rev Log: [ISOHYBRID] Don't include inttypes.h, which isn't available on MSVC < 2013. Add the 4 needed typedefs to reactos_support_code.h instead. Fixes CORE-13031 Modified: trunk/reactos/sdk/tools/isohybrid/isohybrid.c trunk/reactos/sdk/tools/isohybrid/reactos_support_code.h Modified: trunk/reactos/sdk/tools/isohybrid/isohybrid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/isohybrid/isohyb… ============================================================================== --- trunk/reactos/sdk/tools/isohybrid/isohybrid.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/isohybrid/isohybrid.c [iso-8859-1] Mon Apr 17 13:49:46 2017 @@ -36,7 +36,7 @@ #include <string.h> //#include <unistd.h> #include <sys/stat.h> -#include <inttypes.h> +//#include <inttypes.h> #ifdef REACTOS_ISOHYBRID_EFI_MAC_SUPPORT #include <uuid/uuid.h> #endif Modified: trunk/reactos/sdk/tools/isohybrid/reactos_support_code.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/isohybrid/reacto… ============================================================================== --- trunk/reactos/sdk/tools/isohybrid/reactos_support_code.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/isohybrid/reactos_support_code.h [iso-8859-1] Mon Apr 17 13:49:46 2017 @@ -13,6 +13,12 @@ #include <alloca.h> #include <unistd.h> #endif + +// isotypes.h would provide these, but it's not available on MSVC < 2013. +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long uint64_t; void isohybrid_error(int eval, const char* fmt, ...); void isohybrid_warning(const char* fmt, ...);

7 years, 8 months

[cfinck] 74350: [WINSPOOL] Added tests for some more basic and newly discovered corner cases of EnumPrintersW.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Apr 17 13:40:51 2017 New Revision: 74350 URL: http://svn.reactos.org/svn/reactos?rev=74350&view=rev Log: [WINSPOOL] Added tests for some more basic and newly discovered corner cases of EnumPrintersW. Modified: trunk/rostests/apitests/winspool/EnumPrinters.c Modified: trunk/rostests/apitests/winspool/EnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/EnumPri… ============================================================================== --- trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] Mon Apr 17 13:40:51 2017 @@ -19,10 +19,23 @@ BYTE ZeroBuffer[50] = { 0 }; DWORD cbNeeded; DWORD cbTemp; + DWORD cchComputerName; DWORD dwReturned; + PPRINTER_INFO_1W pPrinterInfo1; PVOID pMem; - DWORD i; - DWORD dwValidLevels[] = { 0, 1, 2, 4, 5 }; + DWORD Level; + WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 2 + 1]; + + wszComputerName[0] = L'\\'; + wszComputerName[1] = L'\\'; + cchComputerName = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(&wszComputerName[2], &cchComputerName)) + { + skip("GetComputerNameW failed with error %lu!\n", GetLastError()); + return; + } + + cchComputerName += 2; // Verify that EnumPrintersW returns success and zeroes all input variables even though no flag has been specified. memset(TempBuffer, 0xDE, sizeof(TempBuffer)); @@ -53,54 +66,160 @@ ok(cbNeeded == 0xDEADBEEF, "cbNeeded is %lu!\n", cbNeeded); ok(dwReturned == 0xDEADBEEF, "dwReturned is %lu!\n", dwReturned); - // Try for all valid levels. Level 0 is valid here and returns the PRINTER_INFO_STRESS structure (documented in MS-RPRN). - for (i = 0; i < sizeof(dwValidLevels) / sizeof(DWORD); i++) + // Try for all levels. Level 0 is valid here and returns the PRINTER_INFO_STRESS structure (documented in MS-RPRN). + for (Level = 0; Level <= 5; Level++) { + if (Level == 3) + continue; + // Try with no valid arguments at all. SetLastError(0xDEADBEEF); - ok(!EnumPrintersW(0, NULL, dwValidLevels[i], NULL, 0, NULL, NULL), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == RPC_X_NULL_REF_POINTER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); + ok(!EnumPrintersW(0, NULL, Level, NULL, 0, NULL, NULL), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == RPC_X_NULL_REF_POINTER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); // It has to succeed if we supply the required pointers and query no information. SetLastError(0xDEADBEEF); - ok(EnumPrintersW(0, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, dwValidLevels[i]); - ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + ok(EnumPrintersW(0, NULL, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); // This constant is from Windows 9x/ME times and mustn't work anymore. SetLastError(0xDEADBEEF); - ok(EnumPrintersW(PRINTER_ENUM_DEFAULT, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, dwValidLevels[i]); - ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); + ok(EnumPrintersW(PRINTER_ENUM_DEFAULT, NULL, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); // Now things get interesting. Let's query the buffer size for information about the local printers. SetLastError(0xDEADBEEF); - ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); - ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); - - // Same error has to occur with no buffer, but a size < 4 (AlignRpcPtr comes into play here). - SetLastError(0xDEADBEEF); - ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, 1, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", dwValidLevels[i]); - ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); - - // Now provide the demanded size, but no buffer. - SetLastError(0xDEADBEEF); - ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - ok(cbTemp == 0, "cbTemp is %lu for Level %lu!\n", cbTemp, dwValidLevels[i]); - ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, dwValidLevels[i]); - - // Finally use the function as intended and aim for success! - pMem = HeapAlloc(GetProcessHeap(), 0, cbNeeded); - SetLastError(0xDEADBEEF); - ok(EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, dwValidLevels[i], pMem, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", dwValidLevels[i]); - ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), dwValidLevels[i]); - HeapFree(GetProcessHeap(), 0, pMem); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // There need to be installed local printers for the next steps. + if (cbNeeded > 0) + { + // Same error has to occur with no buffer, but a size < 4 (AlignRpcPtr comes into play here). + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, Level, NULL, 1, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded > 0, "cbNeeded is 0 for Level %lu!\n", Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // Now provide the demanded size, but no buffer. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, Level, NULL, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbTemp == 0, "cbTemp is %lu for Level %lu!\n", cbTemp, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // Finally use the function as intended and aim for success! + // After that, cbTemp contains the needed buffer size without the computer name prepended. + pMem = HeapAlloc(GetProcessHeap(), 0, cbNeeded); + SetLastError(0xDEADBEEF); + ok(EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, Level, pMem, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns FALSE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + HeapFree(GetProcessHeap(), 0, pMem); + + if (Level != 4) + { + // Show that the Name parameter is checked when PRINTER_ENUM_NAME is also specified. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, L"LOREM IPSUM", Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() != ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + } + + // Show that the structure is returned with its known size again when PRINTER_ENUM_NAME is specified and Name + // is the (case-insensitively compared) name of the Local Print Provider. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, L"wInDoWs NT Local Print Providor", Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == cbTemp, "cbNeeded is %lu, reference size is %lu for Level %lu!\n", cbNeeded, cbTemp, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // Now we specify the correct "\\COMPUTERNAME" for Name. + // The returned structure should have some strings prepended with the Computer Name and thus require a larger buffer. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, wszComputerName, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded > cbTemp, "cbNeeded is %lu, reference size is %lu for Level %lu!\n", cbNeeded, cbTemp, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + if (Level != 4) + { + // This won't work when there is a trailing backslash (i.e. "\\COMPUTERNAME\"). + wszComputerName[cchComputerName++] = L'\\'; + wszComputerName[cchComputerName] = 0; + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, wszComputerName, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INVALID_NAME, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == 0, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + wszComputerName[--cchComputerName] = 0; + } + + // Now it gets funky. There are also cases where EnumPrintersW takes the Name parameter into account, + // although PRINTER_ENUM_NAME is not given. + // A bogus Name without two backslashes is ignored. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, L"LOREM IPSUM", Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == cbTemp, "cbNeeded is %lu, reference size is %lu for Level %lu!\n", cbNeeded, cbTemp, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // Specifying "\\COMPUTERNAME" again prepends it to some strings. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, wszComputerName, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded > cbTemp, "cbNeeded is %lu, reference size is %lu for Level %lu!\n", cbNeeded, cbTemp, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // Specifying "\\COMPUTERNAME\" also verifies the Computer Name, but doesn't prepend it. + // This logic is crazy, and different to PRINTER_ENUM_NAME... + wszComputerName[cchComputerName++] = L'\\'; + wszComputerName[cchComputerName] = 0; + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, wszComputerName, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == cbTemp, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + + // I can even put an additional bogus character after the trailing backslash, doesn't change anything. + wszComputerName[cchComputerName++] = L'a'; + wszComputerName[cchComputerName] = 0; + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL, wszComputerName, Level, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE for Level %lu!\n", Level); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu for Level %lu!\n", GetLastError(), Level); + ok(cbNeeded == cbTemp, "cbNeeded is %lu for Level %lu!\n", cbNeeded, Level); + ok(dwReturned == 0, "dwReturned is %lu for Level %lu!\n", dwReturned, Level); + cchComputerName -= 2; + wszComputerName[cchComputerName] = 0; + } + else + { + skip("cbNeeded is 0 on Level %lu, skipping additional tests!\n", Level); + } } + + // Using EnumPrintersW with PRINTER_ENUM_NAME, Level 1 and no Name must return information about the Print Providers. + // First record must always be the Local Print Provider. + SetLastError(0xDEADBEEF); + ok(!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, NULL, 0, &cbNeeded, &dwReturned), "EnumPrintersW returns TRUE!\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbNeeded > 0, "cbNeeded is 0!\n"); + ok(dwReturned == 0, "dwReturned is %lu!\n", dwReturned); + + SetLastError(0xDEADBEEF); + pPrinterInfo1 = (PPRINTER_INFO_1W)HeapAlloc(GetProcessHeap(), 0, cbNeeded); + ok(EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_NAME, NULL, 1, (PBYTE)pPrinterInfo1, cbNeeded, &cbTemp, &dwReturned), "EnumPrintersW returns FALSE!\n"); + ok(GetLastError() == ERROR_SUCCESS, "EnumPrintersW returns error %lu!\n", GetLastError()); + ok(cbTemp == cbNeeded, "cbTemp is %lu, cbNeeded is %lu!\n", cbTemp, cbNeeded); + ok(dwReturned > 0, "dwReturned is %lu!\n", dwReturned); + ok(!wcscmp(pPrinterInfo1->pName, L"Windows NT Local Print Providor"), "pPrinterInfo1->pName is %S!\n", pPrinterInfo1->pName); + ok(!wcscmp(pPrinterInfo1->pComment, L"Locally connected Printers"), "pPrinterInfo1->pComment is %S!\n", pPrinterInfo1->pComment); + ok(!wcscmp(pPrinterInfo1->pDescription, L"Windows NT Local Printers"), "pPrinterInfo1->pDescription is %S!\n", pPrinterInfo1->pDescription); + HeapFree(GetProcessHeap(), 0, pPrinterInfo1); }

7 years, 8 months

[ekohl] 74349: [SERVMAN] Track changes to the general and and recovery pages. CORE-12743

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 17 12:48:51 2017 New Revision: 74349 URL: http://svn.reactos.org/svn/reactos?rev=74349&view=rev Log: [SERVMAN] Track changes to the general and and recovery pages. CORE-12743 Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_general.c [iso-8859-1] Mon Apr 17 12:48:51 2017 @@ -8,6 +8,14 @@ */ #include "precomp.h" + + +typedef struct _PAGEDATA +{ + PSERVICEPROPSHEET dlgInfo; + BOOL bPageChanged; +} PAGEDATA, *PPAGEDATA; + static VOID SetButtonStates(PSERVICEPROPSHEET dlgInfo, @@ -184,8 +192,8 @@ 0, (LPARAM)pServiceConfig->lpBinaryPathName); HeapFree(ProcessHeap, - 0, - pServiceConfig); + 0, + pServiceConfig); } @@ -197,10 +205,7 @@ if (dlgInfo->Info->bIsUserAnAdmin) { - HWND hEdit = GetDlgItem(hwndDlg, - IDC_EDIT); - EnableWindow(hEdit, - TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT), TRUE); } } @@ -257,12 +262,12 @@ WPARAM wParam, LPARAM lParam) { - PSERVICEPROPSHEET dlgInfo; + PPAGEDATA pPageData; /* Get the window context */ - dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg, - GWLP_USERDATA); - if (dlgInfo == NULL && uMsg != WM_INITDIALOG) + pPageData = (PPAGEDATA)GetWindowLongPtr(hwndDlg, + GWLP_USERDATA); + if (pPageData == NULL && uMsg != WM_INITDIALOG) { return FALSE; } @@ -270,26 +275,36 @@ switch (uMsg) { case WM_INITDIALOG: - { - dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); - if (dlgInfo != NULL) + pPageData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PAGEDATA)); + if (pPageData != NULL) { SetWindowLongPtr(hwndDlg, GWLP_USERDATA, - (LONG_PTR)dlgInfo); - InitGeneralPage(dlgInfo, hwndDlg); - SetButtonStates(dlgInfo, hwndDlg); + (LONG_PTR)pPageData); + + pPageData->dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam); + if (pPageData->dlgInfo != NULL) + { + InitGeneralPage(pPageData->dlgInfo, hwndDlg); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + } } - } - break; + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pPageData); + break; case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_START_TYPE: if (HIWORD(wParam) == CBN_SELCHANGE) + { + pPageData->bPageChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - break; + } + break; case IDC_START: { @@ -300,90 +315,89 @@ lpStartParams = szStartParams; RunActionWithProgress(hwndDlg, - dlgInfo->pService->lpServiceName, - dlgInfo->pService->lpDisplayName, + pPageData->dlgInfo->pService->lpServiceName, + pPageData->dlgInfo->pService->lpDisplayName, ACTION_START, lpStartParams); - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); + UpdateServiceStatus(pPageData->dlgInfo->pService); + ChangeListViewText(pPageData->dlgInfo->Info, pPageData->dlgInfo->pService, LVSTATUS); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + SetServiceStatusText(pPageData->dlgInfo, hwndDlg); break; } case IDC_STOP: RunActionWithProgress(hwndDlg, - dlgInfo->pService->lpServiceName, - dlgInfo->pService->lpDisplayName, + pPageData->dlgInfo->pService->lpServiceName, + pPageData->dlgInfo->pService->lpDisplayName, ACTION_STOP, NULL); - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); + UpdateServiceStatus(pPageData->dlgInfo->pService); + ChangeListViewText(pPageData->dlgInfo->Info, pPageData->dlgInfo->pService, LVSTATUS); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + SetServiceStatusText(pPageData->dlgInfo, hwndDlg); break; case IDC_PAUSE: RunActionWithProgress(hwndDlg, - dlgInfo->pService->lpServiceName, - dlgInfo->pService->lpDisplayName, + pPageData->dlgInfo->pService->lpServiceName, + pPageData->dlgInfo->pService->lpDisplayName, ACTION_PAUSE, NULL); - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); + UpdateServiceStatus(pPageData->dlgInfo->pService); + ChangeListViewText(pPageData->dlgInfo->Info, pPageData->dlgInfo->pService, LVSTATUS); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + SetServiceStatusText(pPageData->dlgInfo, hwndDlg); break; case IDC_RESUME: RunActionWithProgress(hwndDlg, - dlgInfo->pService->lpServiceName, - dlgInfo->pService->lpDisplayName, + pPageData->dlgInfo->pService->lpServiceName, + pPageData->dlgInfo->pService->lpDisplayName, ACTION_RESUME, NULL); - UpdateServiceStatus(dlgInfo->pService); - ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS); - SetButtonStates(dlgInfo, hwndDlg); - SetServiceStatusText(dlgInfo, hwndDlg); + UpdateServiceStatus(pPageData->dlgInfo->pService); + ChangeListViewText(pPageData->dlgInfo->Info, pPageData->dlgInfo->pService, LVSTATUS); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + SetServiceStatusText(pPageData->dlgInfo, hwndDlg); break; case IDC_EDIT: - { - HWND hName, hDesc, hExePath; - - hName = GetDlgItem(hwndDlg, IDC_DISP_NAME); - hDesc = GetDlgItem(hwndDlg, IDC_DESCRIPTION); - hExePath = GetDlgItem(hwndDlg, IDC_EXEPATH); - - SendMessage(hName, EM_SETREADONLY, FALSE, 0); - SendMessage(hDesc, EM_SETREADONLY, FALSE, 0); - SendMessage(hExePath, EM_SETREADONLY, FALSE, 0); - break; - } - + SendDlgItemMessage(hwndDlg, IDC_DISP_NAME, EM_SETREADONLY, FALSE, 0); + SendDlgItemMessage(hwndDlg, IDC_DESCRIPTION, EM_SETREADONLY, FALSE, 0); + SendDlgItemMessage(hwndDlg, IDC_EXEPATH, EM_SETREADONLY, FALSE, 0); + break; + + case IDC_DISP_NAME: + case IDC_DESCRIPTION: + case IDC_EXEPATH: case IDC_START_PARAM: - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if (HIWORD(wParam) == EN_CHANGE) + { + pPageData->bPageChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; } break; case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) { - LPNMHDR lpnm = (LPNMHDR)lParam; - - switch (lpnm->code) - { - case PSN_APPLY: - SaveDlgInfo(dlgInfo, hwndDlg); - SetButtonStates(dlgInfo, hwndDlg); - break; - } + case PSN_APPLY: + if (pPageData->bPageChanged) + { + SaveDlgInfo(pPageData->dlgInfo, hwndDlg); + SetButtonStates(pPageData->dlgInfo, hwndDlg); + pPageData->bPageChanged = FALSE; + } + break; } - break; + break; } return FALSE; Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_recovery.c [iso-8859-1] Mon Apr 17 12:48:51 2017 @@ -15,7 +15,7 @@ { ENUM_SERVICE_STATUS_PROCESS *pService; LPSERVICE_FAILURE_ACTIONS pServiceFailure; - + BOOL bChanged; } RECOVERYDATA, *PRECOVERYDATA; static @@ -364,6 +364,74 @@ 0, (LPARAM)szFile); } +} + + +static +VOID +SetFailureActions( + HWND hwndDlg) +{ + SERVICE_FAILURE_ACTIONS FailureActions; + BOOL bRestartService = FALSE; + BOOL bRunProgram = FALSE; + BOOL bRebootComputer = FALSE; + INT id, index; + + ZeroMemory(&FailureActions, sizeof(FailureActions)); + + /* Count the number of valid failure actions */ + for (id = IDC_FIRST_FAILURE; id <= IDC_SUBSEQUENT_FAILURES; id++) + { + index = SendDlgItemMessageW(hwndDlg, + id, + CB_GETCURSEL, + 0, + 0); + switch (index) + { + case 1: /* Restart Service */ + bRestartService = TRUE; + FailureActions.cActions++; + break; + + case 2: /* Run Program */ + bRunProgram = TRUE; + FailureActions.cActions++; + break; + + case 3: /* Reboot Computer */ + bRebootComputer = TRUE; + FailureActions.cActions++; + break; + } + } + + if (bRestartService) + { + // IDC_RESTART_TIME + } + + if (bRunProgram) + { + // IDC_RESTART_TIME + } + + if (bRebootComputer) + { + // IDC_RESTART_TIME + } + + +#if 0 +typedef struct _SERVICE_FAILURE_ACTIONS { + DWORD dwResetPeriod; + LPTSTR lpRebootMsg; + LPTSTR lpCommand; + DWORD cActions; + SC_ACTION *lpsaActions; +} SERVICE_FAILURE_ACTIONS, *LPSERVICE_FAILURE_ACTIONS; +#endif } @@ -423,13 +491,36 @@ if (HIWORD(wParam) == CBN_SELCHANGE) { UpdateFailureActions(hwndDlg, pRecoveryData); + pRecoveryData->bChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; + case IDC_RESET_TIME: + case IDC_RESTART_TIME: + case IDC_PROGRAM: + case IDC_PARAMETERS: + if (HIWORD(wParam) == EN_CHANGE) + { + pRecoveryData->bChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_ADD_FAILCOUNT: + if (HIWORD(wParam) == BN_CLICKED) + { + pRecoveryData->bChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_BROWSE_PROGRAM: BrowseFile(hwndDlg); break; + + case IDC_RESTART_OPTIONS: + break; } break; @@ -437,6 +528,11 @@ switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: + if (pRecoveryData->bChanged) + { + SetFailureActions(hwndDlg); + pRecoveryData->bChanged = FALSE; + } break; } break;

7 years, 8 months

[ekohl] 74348: Avoid attempts to reinstall a driver on reboot when a previous attempt has already failed. [NEWDEV] Set the CONFIGFLAG_FAILEDINSTALL flag in the new hardware wizards welcome page and...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 17 11:34:08 2017 New Revision: 74348 URL: http://svn.reactos.org/svn/reactos?rev=74348&view=rev Log: Avoid attempts to reinstall a driver on reboot when a previous attempt has already failed. [NEWDEV] Set the CONFIGFLAG_FAILEDINSTALL flag in the new hardware wizards welcome page and remove it only when the driver was successfully installed. [UMPNPMGR] Do not invoke the device installer if the devices CONFIGFLAG_FAILEDINSTALL flag is set. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 17 11:34:08 2017 @@ -21,7 +21,7 @@ * PROJECT: ReactOS kernel * FILE: base/services/umpnpmgr/umpnpmgr.c * PURPOSE: User-mode Plug and Play manager - * PROGRAMMER: Eric Kohl + * PROGRAMMER: Eric Kohl (eric.kohl(a)reactos.org) * Hervé Poussineau (hpoussin(a)reactos.org) * Colin Finck (colin(a)reactos.org) */ @@ -3230,6 +3230,22 @@ return TRUE; } + BytesWritten = sizeof(DWORD); + if (RegQueryValueExW(DeviceKey, + L"ConfigFlags", + NULL, + NULL, + (PBYTE)&Value, + &BytesWritten) == ERROR_SUCCESS) + { + if (Value & CONFIGFLAG_FAILEDINSTALL) + { + DPRINT("No need to install: %S\n", DeviceInstance); + RegCloseKey(DeviceKey); + return TRUE; + } + } + RegCloseKey(DeviceKey); } Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Apr 17 11:34:08 2017 @@ -52,6 +52,44 @@ } static BOOL +SetFailedInstall( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DevInfoData OPTIONAL, + IN BOOLEAN Set) +{ + DWORD dwType, dwSize, dwFlags = 0; + + dwSize = sizeof(dwFlags); + if (!SetupDiGetDeviceRegistryProperty(DeviceInfoSet, + DevInfoData, + SPDRP_CONFIGFLAGS, + &dwType, + (PBYTE)&dwFlags, + dwSize, + &dwSize)) + { + return FALSE; + } + + if (Set) + dwFlags |= CONFIGFLAG_FAILEDINSTALL; + else + dwFlags &= ~CONFIGFLAG_FAILEDINSTALL; + + if (!SetupDiSetDeviceRegistryProperty(DeviceInfoSet, + DevInfoData, + SPDRP_CONFIGFLAGS, + (PBYTE)&dwFlags, + dwSize)) + { + + return FALSE; + } + + return TRUE; +} + +static BOOL CanDisableDevice( IN DEVINST DevInst, IN HMACHINE hMachine, @@ -462,6 +500,10 @@ BM_SETCHECK, (WPARAM)TRUE, (LPARAM)0); + + SetFailedInstall(DevInstData->hDevInfo, + &DevInstData->devInfoData, + TRUE); break; } @@ -807,8 +849,13 @@ hThread = 0; if (wParam == 0) { + SP_DEVINSTALL_PARAMS installParams; + + SetFailedInstall(DevInstData->hDevInfo, + &DevInstData->devInfoData, + FALSE); + /* Should we reboot? */ - SP_DEVINSTALL_PARAMS installParams; installParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); if (SetupDiGetDeviceInstallParams( DevInstData->hDevInfo,

7 years, 8 months

[mjansen] 74347: [BROWSEUI] Port some IAutoComplete changes from wine + fix a memory leak. This allows the dropdown to show with ACO_AUTOSUGGEST and an empty input.

by mjansen＠svn.reactos.org

Author: mjansen Date: Mon Apr 17 09:35:08 2017 New Revision: 74347 URL: http://svn.reactos.org/svn/reactos?rev=74347&view=rev Log: [BROWSEUI] Port some IAutoComplete changes from wine + fix a memory leak. This allows the dropdown to show with ACO_AUTOSUGGEST and an empty input. Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp trunk/reactos/dll/win32/browseui/CAutoComplete.h Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] Mon Apr 17 09:35:08 2017 @@ -86,12 +86,32 @@ } /****************************************************************************** + * create_listbox + */ +void CAutoComplete::CreateListbox() +{ + HWND hwndParent = GetParent(hwndEdit); + + /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ + hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, + WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hwndParent, NULL, + (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); + + if (hwndListBox) + { + wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); + SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); + } +} + + +/****************************************************************************** * IAutoComplete_fnInit */ HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; - TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", this, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -128,28 +148,14 @@ this->hwndEdit = hwndEdit; this->initialized = TRUE; - wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); -// SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); - SetPropW( hwndEdit, autocomplete_propertyW, (HANDLE)this ); + this->wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + /* Keep at least one reference to the object until the edit window is destroyed. */ + this->AddRef(); + SetPropW( this->hwndEdit, autocomplete_propertyW, (HANDLE)this ); if (options & ACO_AUTOSUGGEST) { - HWND hwndParent; - - hwndParent = GetParent(hwndEdit); - - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - hwndListBox = CreateWindowExW(0, lbName, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); - - if (hwndListBox) - { - wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); - SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); - } + this->CreateListbox(); } if (pwzsRegKeyPath) @@ -247,6 +253,9 @@ options = (AUTOCOMPLETEOPTIONS)dwFlag; + if ((options & ACO_AUTOSUGGEST) && hwndEdit && !hwndListBox) + CreateListbox(); + return hr; } @@ -255,8 +264,7 @@ */ LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - CAutoComplete *pThis = static_cast<CAutoComplete *>(GetPropW(hwnd, autocomplete_propertyW));//GetWindowLongPtrW(hwnd, GWLP_USERDATA); - LPOLESTR strs; + CAutoComplete *pThis = static_cast<CAutoComplete *>(GetPropW(hwnd, autocomplete_propertyW)); HRESULT hr; WCHAR hwndText[255]; WCHAR *hwndQCText; @@ -341,9 +349,9 @@ /* Change the selection */ sel = SendMessageW(pThis->hwndListBox, LB_GETCURSEL, 0, 0); if (wParam == VK_UP) - sel = ((sel-1)<0)?count-1:sel-1; + sel = ((sel-1) < 0) ? count-1 : sel-1; else - sel = ((sel+1)>= count)?-1:sel+1; + sel = ((sel+1) >= count) ? -1 : sel+1; SendMessageW(pThis->hwndListBox, LB_SETCURSEL, sel, 0); @@ -428,26 +436,31 @@ pThis->enumstr->Reset(); filled = FALSE; - + size_t curlen = wcslen(hwndText); + for(cpt = 0;;) { + CComHeapPtr<OLECHAR> strs; hr = pThis->enumstr->Next(1, &strs, &fetched); if (hr != S_OK) break; - if ((LPWSTR)wcsstr(strs, hwndText) == strs) - { - - if (pThis->options & ACO_AUTOAPPEND) - { - SetWindowTextW(hwnd, strs); - SendMessageW(hwnd, EM_SETSEL, wcslen(hwndText), wcslen(strs)); - break; + if (!_wcsnicmp(hwndText, strs, curlen)) + { + + if (pThis->options & ACO_AUTOAPPEND && *hwndText) + { + CComBSTR str((PCWSTR)strs); + memcpy(str.m_str, hwndText, curlen * sizeof(WCHAR)); + SetWindowTextW(hwnd, str); + SendMessageW(hwnd, EM_SETSEL, curlen, str.Length()); + if (!(pThis->options & ACO_AUTOSUGGEST)) + break; } if (pThis->options & ACO_AUTOSUGGEST) { - SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); + SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)(LPOLESTR)strs); filled = TRUE; cpt++; } @@ -475,7 +488,15 @@ } }; break; - + + case WM_DESTROY: + { + /* Release our reference that we had since ->Init() */ + pThis->Release(); + return 0; + } + + default: { return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -537,12 +558,28 @@ */ HRESULT STDMETHODCALLTYPE CAutoComplete::GetDropDownStatus(DWORD *pdwFlags, LPWSTR *ppwszString) { - FIXME("(%p, %p, %p): stub\n", this, pdwFlags, ppwszString); + BOOL dropped = IsWindowVisible(hwndListBox); + if (pdwFlags) - *pdwFlags = 0; + *pdwFlags = (dropped ? ACDD_VISIBLE : 0); + if (ppwszString) + { *ppwszString = NULL; - return E_NOTIMPL; + + if (dropped) + { + int sel = SendMessageW(hwndListBox, LB_GETCURSEL, 0, 0); + if (sel >= 0) + { + DWORD len = SendMessageW(hwndListBox, LB_GETTEXTLEN, sel, 0); + *ppwszString = (LPWSTR)CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + SendMessageW(hwndListBox, LB_GETTEXT, sel, (LPARAM)*ppwszString); + } + } + } + + return S_OK; } HRESULT STDMETHODCALLTYPE CAutoComplete::ResetEnumerator() Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/browseui/CAutoComplete.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.h [iso-8859-1] Mon Apr 17 09:35:08 2017 @@ -48,6 +48,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + void CreateListbox(); + // IAutoComplete2 virtual HRESULT WINAPI Enable(BOOL fEnable); virtual HRESULT WINAPI Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete);

7 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

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 April 2017