Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[ekohl] 68197: [USETUP] Implement CreateLogicalPartition. Now we can create logical partitons, but they will not be written to a disk yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 19 19:01:39 2015 New Revision: 68197 URL: http://svn.reactos.org/svn/reactos?rev=68197&view=rev Log: [USETUP] Implement CreateLogicalPartition. Now we can create logical partitons, but they will not be written to a disk yet. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Jun 19 19:01:39 2015 @@ -2621,9 +2621,9 @@ PPARTLIST List, ULONGLONG SectorCount) { -// PDISKENTRY DiskEntry; + PDISKENTRY DiskEntry; PPARTENTRY PartEntry; -// PPARTENTRY NewPartEntry; + PPARTENTRY NewPartEntry; DPRINT1("CreateLogicalPartition(%I64u)\n", SectorCount); @@ -2635,10 +2635,71 @@ return; } -// DiskEntry = List->CurrentDisk; + DiskEntry = List->CurrentDisk; PartEntry = List->CurrentPartition; DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + + if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + { + DPRINT1("Convert existing partition entry\n"); + + /* Convert current entry to 'new (unformatted)' */ + PartEntry->IsPartitioned = TRUE; + PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + PartEntry->FormatState = Unformatted; + PartEntry->AutoCreate = FALSE; + PartEntry->New = TRUE; + PartEntry->BootIndicator = FALSE; + PartEntry->LogicalPartition = TRUE; + + DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); + } + else + { + DPRINT1("Add new partition entry\n"); + + /* Insert and initialize a new partition entry */ + NewPartEntry = RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + /* Insert the new entry into the list */ + InsertTailList(&PartEntry->ListEntry, + &NewPartEntry->ListEntry); + + NewPartEntry->DiskEntry = DiskEntry; + + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + + DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); + DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); + DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->New = TRUE; + NewPartEntry->FormatState = Unformatted; + NewPartEntry->BootIndicator = FALSE; + NewPartEntry->LogicalPartition = TRUE; + + PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; + PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + } + + UpdateDiskLayout(DiskEntry); + + DiskEntry->Dirty = TRUE; + + UpdatePartitionNumbers(DiskEntry); + + AssignDriveLetters(List); }

9 years, 4 months

[tfaber] 68196: [ADVAPI32] - Use a separate heap allocation for the thread parameters to ScServiceMainStub, since the thread can live longer than the ACTIVE_SERVICE structure CORE-9235

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Jun 19 18:16:27 2015 New Revision: 68196 URL: http://svn.reactos.org/svn/reactos?rev=68196&view=rev Log: [ADVAPI32] - Use a separate heap allocation for the thread parameters to ScServiceMainStub, since the thread can live longer than the ACTIVE_SERVICE structure CORE-9235 Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Fri Jun 19 18:16:27 2015 @@ -40,9 +40,9 @@ UNICODE_STRING ServiceName; union { - SERVICE_THREAD_PARAMSA A; - SERVICE_THREAD_PARAMSW W; - } ThreadParams; + LPSERVICE_MAIN_FUNCTIONA A; + LPSERVICE_MAIN_FUNCTIONW W; + } ServiceMain; LPHANDLER_FUNCTION HandlerFunction; LPHANDLER_FUNCTION_EX HandlerFunctionEx; LPVOID HandlerContext; @@ -165,43 +165,41 @@ static DWORD WINAPI -ScServiceMainStub(LPVOID Context) -{ - PACTIVE_SERVICE lpService = (PACTIVE_SERVICE)Context; - - TRACE("ScServiceMainStub() called\n"); +ScServiceMainStubA(LPVOID Context) +{ + PSERVICE_THREAD_PARAMSA ThreadParams = Context; + + TRACE("ScServiceMainStubA() called\n"); /* Call the main service routine and free the arguments vector */ - if (lpService->bUnicode) - { - (lpService->ThreadParams.W.lpServiceMain)(lpService->ThreadParams.W.dwArgCount, - lpService->ThreadParams.W.lpArgVector); - - if (lpService->ThreadParams.W.lpArgVector != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpService->ThreadParams.W.lpArgVector); - - lpService->ThreadParams.W.lpArgVector = NULL; - lpService->ThreadParams.W.dwArgCount = 0; - } - } - else - { - (lpService->ThreadParams.A.lpServiceMain)(lpService->ThreadParams.A.dwArgCount, - lpService->ThreadParams.A.lpArgVector); - - if (lpService->ThreadParams.A.lpArgVector != NULL) - { - HeapFree(GetProcessHeap(), - 0, - lpService->ThreadParams.A.lpArgVector); - - lpService->ThreadParams.A.lpArgVector = NULL; - lpService->ThreadParams.A.dwArgCount = 0; - } - } + (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, + ThreadParams->lpArgVector); + + if (ThreadParams->lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), 0, ThreadParams->lpArgVector); + } + HeapFree(GetProcessHeap(), 0, ThreadParams); + + return ERROR_SUCCESS; +} + +static DWORD WINAPI +ScServiceMainStubW(LPVOID Context) +{ + PSERVICE_THREAD_PARAMSW ThreadParams = Context; + + TRACE("ScServiceMainStubW() called\n"); + + /* Call the main service routine and free the arguments vector */ + (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, + ThreadParams->lpArgVector); + + if (ThreadParams->lpArgVector != NULL) + { + HeapFree(GetProcessHeap(), 0, ThreadParams->lpArgVector); + } + HeapFree(GetProcessHeap(), 0, ThreadParams); return ERROR_SUCCESS; } @@ -451,6 +449,8 @@ HANDLE ThreadHandle; DWORD ThreadId; DWORD dwError; + PSERVICE_THREAD_PARAMSA ThreadParamsA; + PSERVICE_THREAD_PARAMSW ThreadParamsW; if (lpService == NULL || ControlPacket == NULL) return ERROR_INVALID_PARAMETER; @@ -465,54 +465,59 @@ /* Build the arguments vector */ if (lpService->bUnicode == TRUE) { + ThreadParamsW = HeapAlloc(GetProcessHeap(), 0, sizeof(*ThreadParamsW)); + if (ThreadParamsW == NULL) + return ERROR_NOT_ENOUGH_MEMORY; dwError = ScBuildUnicodeArgsVector(ControlPacket, - &lpService->ThreadParams.W.dwArgCount, - &lpService->ThreadParams.W.lpArgVector); - } - else - { - dwError = ScBuildAnsiArgsVector(ControlPacket, - &lpService->ThreadParams.A.dwArgCount, - &lpService->ThreadParams.A.lpArgVector); - } - - if (dwError != ERROR_SUCCESS) - return dwError; - - /* Invoke the services entry point and implement the command loop */ - ThreadHandle = CreateThread(NULL, - 0, - ScServiceMainStub, - lpService, - CREATE_SUSPENDED, - &ThreadId); - if (ThreadHandle == NULL) - { - /* Free the arguments vector */ - if (lpService->bUnicode) + &ThreadParamsW->dwArgCount, + &ThreadParamsW->lpArgVector); + if (dwError != ERROR_SUCCESS) + return dwError; + ThreadParamsW->lpServiceMain = lpService->ServiceMain.W; + ThreadHandle = CreateThread(NULL, + 0, + ScServiceMainStubW, + ThreadParamsW, + CREATE_SUSPENDED, + &ThreadId); + if (ThreadHandle == NULL) { - if (lpService->ThreadParams.W.lpArgVector != NULL) + if (ThreadParamsW->lpArgVector != NULL) { HeapFree(GetProcessHeap(), 0, - lpService->ThreadParams.W.lpArgVector); - lpService->ThreadParams.W.lpArgVector = NULL; - lpService->ThreadParams.W.dwArgCount = 0; + ThreadParamsW->lpArgVector); } + HeapFree(GetProcessHeap(), 0, ThreadParamsW); } - else + } + else + { + ThreadParamsA = HeapAlloc(GetProcessHeap(), 0, sizeof(*ThreadParamsA)); + if (ThreadParamsA == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + dwError = ScBuildAnsiArgsVector(ControlPacket, + &ThreadParamsA->dwArgCount, + &ThreadParamsA->lpArgVector); + if (dwError != ERROR_SUCCESS) + return dwError; + ThreadParamsA->lpServiceMain = lpService->ServiceMain.A; + ThreadHandle = CreateThread(NULL, + 0, + ScServiceMainStubA, + ThreadParamsA, + CREATE_SUSPENDED, + &ThreadId); + if (ThreadHandle == NULL) { - if (lpService->ThreadParams.A.lpArgVector != NULL) + if (ThreadParamsA->lpArgVector != NULL) { HeapFree(GetProcessHeap(), 0, - lpService->ThreadParams.A.lpArgVector); - lpService->ThreadParams.A.lpArgVector = NULL; - lpService->ThreadParams.A.dwArgCount = 0; + ThreadParamsA->lpArgVector); } + HeapFree(GetProcessHeap(), 0, ThreadParamsA); } - - return ERROR_SERVICE_NO_THREAD; } ResumeThread(ThreadHandle); @@ -922,7 +927,7 @@ { RtlCreateUnicodeStringFromAsciiz(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].ThreadParams.A.lpServiceMain = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].ServiceMain.A = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = FALSE; lpActiveServices[i].bOwnProcess = FALSE; @@ -1009,7 +1014,7 @@ { RtlCreateUnicodeString(&lpActiveServices[i].ServiceName, lpServiceStartTable[i].lpServiceName); - lpActiveServices[i].ThreadParams.W.lpServiceMain = lpServiceStartTable[i].lpServiceProc; + lpActiveServices[i].ServiceMain.W = lpServiceStartTable[i].lpServiceProc; lpActiveServices[i].hServiceStatus = 0; lpActiveServices[i].bUnicode = TRUE; lpActiveServices[i].bOwnProcess = FALSE;

9 years, 4 months

[cfinck] 68195: [LOCALSPL] - Get rid of the Generic Tables entirely and make use of the new Skiplist for the Global Job List, the Printer's Job List and the Printer List. Use a doubly linked-list f...

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 19 15:21:30 2015 New Revision: 68195 URL: http://svn.reactos.org/svn/reactos?rev=68195&view=rev Log: [LOCALSPL] - Get rid of the Generic Tables entirely and make use of the new Skiplist for the Global Job List, the Printer's Job List and the Printer List. Use a doubly linked-list for the Print Processors (there won't be many) and just save the information returned from the Print Processor's EnumPrintProcessorDatatypesW instead of putting it in another structure. - Implement LocalAddJob and LocalGetJob (with full JOB_INFO_1W and JOB_INFO_2W support) This makes use of the element index in the new Skiplist implementation to retrieve the position of the job in the list. - Do some changes to LocalStartDocPrinter, though this will make use of LocalAddJob in the future. - Make some global variables static again. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/CMakeLists.txt [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -1,5 +1,7 @@ spec2def(localspl.dll localspl.spec ADD_IMPORTLIB) + +include_directories(${REACTOS_SOURCE_DIR}/lib/skiplist) list(APPEND SOURCE jobs.c @@ -16,7 +18,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) set_module_type(localspl win32dll UNICODE) -target_link_libraries(localspl wine) -add_importlibs(localspl advapi32 spoolss msvcrt kernel32 ntdll) +target_link_libraries(localspl skiplist16 wine) +add_importlibs(localspl advapi32 rpcrt4 spoolss msvcrt kernel32 ntdll) add_pch(localspl precomp.h SOURCE) add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -7,10 +7,103 @@ #include "precomp.h" -LIST_ENTRY LocalJobQueue; +// Global Variables +SKIPLIST GlobalJobList; + +// Local Variables +static DWORD _dwLastJobID; + + +/** + * @name _GlobalJobListCompareRoutine + * + * SKIPLIST_COMPARE_ROUTINE for the Global Job List. + * We need the Global Job List to check whether a Job ID is already in use. Consequently, this list is sorted by ID. + */ +static int WINAPI +_GlobalJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) +{ + PLOCAL_JOB A = (PLOCAL_JOB)FirstStruct; + PLOCAL_JOB B = (PLOCAL_JOB)SecondStruct; + + return A->dwJobID - B->dwJobID; +} + +/** + * @name _PrinterJobListCompareRoutine + * + * SKIPLIST_COMPARE_ROUTINE for the each Printer's Job List. + * Jobs in this list are sorted in the desired order of processing. + */ +static int WINAPI +_PrinterJobListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) +{ + PLOCAL_JOB A = (PLOCAL_JOB)FirstStruct; + PLOCAL_JOB B = (PLOCAL_JOB)SecondStruct; + int iComparison; + FILETIME ftSubmittedA; + FILETIME ftSubmittedB; + ULARGE_INTEGER uliSubmittedA; + ULARGE_INTEGER uliSubmittedB; + ULONGLONG ullResult; + + // First compare the priorities to determine the order. + // The job with a higher priority shall come first. + iComparison = A->dwPriority - B->dwPriority; + if (iComparison != 0) + return iComparison; + + // Both have the same priority, so go by creation time. + // Comparison is done using the MSDN-recommended way for comparing SYSTEMTIMEs. + if (!SystemTimeToFileTime(&A->stSubmitted, &ftSubmittedA)) + { + ERR("SystemTimeToFileTime failed for A with error %lu!\n", GetLastError()); + return 0; + } + + if (!SystemTimeToFileTime(&B->stSubmitted, &ftSubmittedB)) + { + ERR("SystemTimeToFileTime failed for B with error %lu!\n", GetLastError()); + return 0; + } + + uliSubmittedA.LowPart = ftSubmittedA.dwLowDateTime; + uliSubmittedA.HighPart = ftSubmittedA.dwHighDateTime; + uliSubmittedB.LowPart = ftSubmittedB.dwLowDateTime; + uliSubmittedB.HighPart = ftSubmittedB.dwHighDateTime; + ullResult = uliSubmittedA.QuadPart - uliSubmittedB.QuadPart; + + if (ullResult < 0) + return -1; + else if (ullResult > 0) + return 1; + + return 0; +} + +BOOL +GetNextJobID(PDWORD dwJobID) +{ + ++_dwLastJobID; + + while (LookupElementSkiplist(&GlobalJobList, &_dwLastJobID, NULL)) + { + // This ID is already taken. Try the next one. + ++_dwLastJobID; + } + + if (!IS_VALID_JOB_ID(_dwLastJobID)) + { + ERR("Job ID %lu isn't valid!\n", _dwLastJobID); + return FALSE; + } + + *dwJobID = _dwLastJobID; + return TRUE; +} void -InitializeJobQueue() +InitializeGlobalJobList() { const WCHAR wszPath[] = L"\\PRINTERS\\?????.SHD"; const DWORD cchPath = _countof(wszPath) - 1; @@ -19,11 +112,18 @@ DWORD dwJobID; HANDLE hFind; - PLOCAL_JOB pJob; + PLOCAL_JOB pJob = NULL; PWSTR p; WCHAR wszFullPath[MAX_PATH]; WIN32_FIND_DATAW FindData; + // This one is incremented in GetNextJobID. + _dwLastJobID = 0; + + // Initialize an empty list for all jobs of all local printers. + // We will search it by Job ID (supply a pointer to a DWORD in LookupElementSkiplist). + InitializeSkiplist(&GlobalJobList, DllAllocSplMem, _GlobalJobListCompareRoutine, (PSKIPLIST_FREE_ROUTINE)DllFreeSplMem); + // Construct the full path search pattern. CopyMemory(wszFullPath, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); CopyMemory(&wszFullPath[cchSpoolDirectory], wszPath, (cchPath + 1) * sizeof(WCHAR)); @@ -33,7 +133,7 @@ if (hFind == INVALID_HANDLE_VALUE) { // No unfinished jobs found. - return; + goto Cleanup; } do @@ -56,12 +156,368 @@ if (!pJob) continue; - // Add it to the job queue of the respective printer. - InsertTailList(&pJob->Printer->JobQueue, &pJob->Entry); + // Add it to the Global Job List. + if (!InsertElementSkiplist(&GlobalJobList, pJob)) + { + ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); + goto Cleanup; + } + + // Add it to the Printer's Job List. + if (!InsertElementSkiplist(&pJob->Printer->JobList, pJob)) + { + ERR("InsertElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); + goto Cleanup; + } } while (FindNextFileW(hFind, &FindData)); - FindClose(hFind); +Cleanup: + // Outside the loop + if (hFind) + FindClose(hFind); +} + +void +InitializePrinterJobList(PLOCAL_PRINTER pPrinter) +{ + // Initialize an empty list for this printer's jobs. + // This one is only for sorting the jobs. If you need to lookup a job, search the GlobalJobList by Job ID. + InitializeSkiplist(&pPrinter->JobList, DllAllocSplMem, _PrinterJobListCompareRoutine, (PSKIPLIST_FREE_ROUTINE)DllFreeSplMem); +} + +BOOL WINAPI +LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded) +{ + const WCHAR wszDoubleBackslash[] = L"\\"; + const DWORD cchDoubleBackslash = _countof(wszDoubleBackslash) - 1; + const WCHAR wszPrintersPath[] = L"\\PRINTERS\\"; + const DWORD cchPrintersPath = _countof(wszPrintersPath) - 1; + const DWORD cchSpl = _countof("?????.SPL") - 1; + + ADDJOB_INFO_1W AddJobInfo1; + BOOL bReturnValue = FALSE; + DWORD cchMachineName; + DWORD cchUserName; + PBYTE p; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + RPC_BINDING_HANDLE hServerBinding = NULL; + RPC_STATUS Status; + RPC_WSTR pwszBinding = NULL; + RPC_WSTR pwszMachineName = NULL; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + goto Cleanup; + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + + // Check if this is the right structure level. + if (Level != 1) + goto Cleanup; + + // FIXME: This needs to fail if the printer is set to do direct printing. + + // Check if the supplied buffer is large enough. + *pcbNeeded = sizeof(ADDJOB_INFO_1W) + (cchSpoolDirectory + cchPrintersPath + cchSpl + 1) * sizeof(WCHAR); + if (cbBuf < *pcbNeeded) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto Cleanup; + } + + // Create a new job. + pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); + if (!pJob) + { + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Reserve an ID for this job. + if (!GetNextJobID(&pJob->dwJobID)) + goto Cleanup; + + // Copy over defaults to the LOCAL_JOB structure. + pJob->Printer = pPrinterHandle->Printer; + pJob->dwPriority = DEF_PRIORITY; + pJob->pwszDatatype = AllocSplStr(pPrinterHandle->pwszDatatype); + pJob->pwszDocumentName = AllocSplStr(wszDefaultDocumentName); + CopyMemory(&pJob->DevMode, &pPrinterHandle->DevMode, sizeof(DEVMODEW)); + GetSystemTime(&pJob->stSubmitted); + + // Get the user name for the Job. + cchUserName = UNLEN + 1; + pJob->pwszUserName = DllAllocSplMem(cchUserName * sizeof(WCHAR)); + if (!GetUserNameW(pJob->pwszUserName, &cchUserName)) + { + ERR("GetUserNameW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // FIXME: For now, pwszNotifyName equals pwszUserName. + pJob->pwszNotifyName = AllocSplStr(pJob->pwszUserName); + + // Get the name of the machine that submitted the Job over RPC. + Status = RpcBindingServerFromClient(NULL, &hServerBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingServerFromClient failed with status %lu!\n", Status); + goto Cleanup; + } + + Status = RpcBindingToStringBindingW(hServerBinding, &pwszBinding); + if (Status != RPC_S_OK) + { + ERR("RpcBindingToStringBindingW failed with status %lu!\n", Status); + goto Cleanup; + } + + Status = RpcStringBindingParseW(pwszBinding, NULL, NULL, &pwszMachineName, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcStringBindingParseW failed with status %lu!\n", Status); + goto Cleanup; + } + + cchMachineName = wcslen(pwszMachineName); + pJob->pwszMachineName = DllAllocSplMem((cchMachineName + cchDoubleBackslash + 1) * sizeof(WCHAR)); + CopyMemory(pJob->pwszMachineName, wszDoubleBackslash, cchDoubleBackslash * sizeof(WCHAR)); + CopyMemory(pJob->pwszMachineName + cchDoubleBackslash, pwszMachineName, (cchMachineName + 1) * sizeof(WCHAR)); + + // Add the job to the Global Job List. + if (!InsertElementSkiplist(&GlobalJobList, pJob)) + { + ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); + goto Cleanup; + } + + // Add the job at the end of the Printer's Job List. + // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. + if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) + { + ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); + goto Cleanup; + } + + // Return a proper ADDJOB_INFO_1W structure. + AddJobInfo1.JobId = pJob->dwJobID; + AddJobInfo1.Path = (PWSTR)(pData + sizeof(ADDJOB_INFO_1W)); + p = pData; + CopyMemory(p, &AddJobInfo1, sizeof(ADDJOB_INFO_1W)); + p += sizeof(ADDJOB_INFO_1W); + CopyMemory(p, wszSpoolDirectory, cchSpoolDirectory); + p += cchSpoolDirectory; + CopyMemory(p, wszPrintersPath, cchPrintersPath); + p += cchPrintersPath; + swprintf((PWSTR)p, L"%05lu.SPL", pJob->dwJobID); + + bReturnValue = TRUE; + +Cleanup: + if (pwszMachineName) + RpcStringFreeW(&pwszMachineName); + + if (pwszBinding) + RpcStringFreeW(&pwszBinding); + + if (hServerBinding) + RpcBindingFree(&hServerBinding); + + return bReturnValue; +} + + +static BOOL +_LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +{ + DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + JOB_INFO_1W JobInfo1 = { 0 }; + PBYTE pString; + + // Check if the supplied buffer is large enough. + *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbUserName; + if (cbBuf < *pcbNeeded) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + // Put the strings right after the JOB_INFO_1W structure. + pString = pOutput + sizeof(JOB_INFO_1W); + + JobInfo1.pDatatype = (PWSTR)pString; + CopyMemory(pString, pJob->pwszDatatype, cbDatatype); + pString += cbDatatype; + + JobInfo1.pDocument = (PWSTR)pString; + CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); + pString += cbDocumentName; + + JobInfo1.pMachineName = (PWSTR)pString; + CopyMemory(pString, pJob->pwszMachineName, cbMachineName); + pString += cbMachineName; + + JobInfo1.pPrinterName = (PWSTR)pString; + CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + pString += cbPrinterName; + + JobInfo1.pUserName = (PWSTR)pString; + CopyMemory(pString, pJob->pwszUserName, cbUserName); + pString += cbUserName; + + // Fill the structure and copy it as well. + JobInfo1.JobId = pJob->dwJobID; + JobInfo1.Priority = pJob->dwPriority; + JobInfo1.Status = pJob->dwStatus; + JobInfo1.TotalPages = pJob->dwTotalPages; + CopyMemory(&JobInfo1.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); + CopyMemory(pOutput, &JobInfo1, sizeof(JOB_INFO_1W)); + + return TRUE; +} + +static BOOL +_LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +{ + DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); + DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); + DWORD cbDriverName = (wcslen(pJob->Printer->pwszPrinterDriver) + 1) * sizeof(WCHAR); + DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); + DWORD cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessor = (wcslen(pJob->Printer->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); + FILETIME ftNow; + FILETIME ftSubmitted; + JOB_INFO_2W JobInfo2 = { 0 }; + PBYTE pString; + ULARGE_INTEGER uliNow; + ULARGE_INTEGER uliSubmitted; + + // Check if the supplied buffer is large enough. + *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbUserName; + if (cbBuf < *pcbNeeded) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + // Put the strings right after the JOB_INFO_2W structure. + pString = pOutput + sizeof(JOB_INFO_2W); + + JobInfo2.pDatatype = (PWSTR)pString; + CopyMemory(pString, pJob->pwszDatatype, cbDatatype); + pString += cbDatatype; + + JobInfo2.pDevMode = (PDEVMODEW)pString; + CopyMemory(pString, &pJob->DevMode, sizeof(DEVMODEW)); + pString += sizeof(DEVMODEW); + + JobInfo2.pDocument = (PWSTR)pString; + CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); + pString += cbDocumentName; + + JobInfo2.pDriverName = (PWSTR)pString; + CopyMemory(pString, pJob->Printer->pwszPrinterDriver, cbDriverName); + pString += cbDriverName; + + JobInfo2.pMachineName = (PWSTR)pString; + CopyMemory(pString, pJob->pwszMachineName, cbMachineName); + pString += cbMachineName; + + JobInfo2.pNotifyName = (PWSTR)pString; + CopyMemory(pString, pJob->pwszNotifyName, cbNotifyName); + pString += cbNotifyName; + + JobInfo2.pPrinterName = (PWSTR)pString; + CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + pString += cbPrinterName; + + JobInfo2.pPrintProcessor = (PWSTR)pString; + CopyMemory(pString, pJob->Printer->pPrintProcessor->pwszName, cbPrintProcessor); + pString += cbPrintProcessor; + + JobInfo2.pUserName = (PWSTR)pString; + CopyMemory(pString, pJob->pwszUserName, cbUserName); + pString += cbUserName; + + // Time in JOB_INFO_2W is the number of milliseconds elapsed since the job was submitted. Calculate this time. + if (!SystemTimeToFileTime(&pJob->stSubmitted, &ftSubmitted)) + { + ERR("SystemTimeToFileTime failed with error %lu!\n", GetLastError()); + return FALSE; + } + + GetSystemTimeAsFileTime(&ftNow); + uliSubmitted.LowPart = ftSubmitted.dwLowDateTime; + uliSubmitted.HighPart = ftSubmitted.dwHighDateTime; + uliNow.LowPart = ftNow.dwLowDateTime; + uliNow.HighPart = ftNow.dwHighDateTime; + JobInfo2.Time = (DWORD)((uliNow.QuadPart - uliSubmitted.QuadPart) / 10000); + + // Position in JOB_INFO_2W is the 1-based index of the job in the processing queue. + // Retrieve this through the element index of the job in the Printer's Job List. + if (!LookupElementSkiplist(&pJob->Printer->JobList, pJob, &JobInfo2.Position)) + { + ERR("pJob could not be located in the Printer's Job List!\n"); + return FALSE; + } + + // Make the index 1-based. + ++JobInfo2.Position; + + // Fill the rest of the structure. + JobInfo2.JobId = pJob->dwJobID; + JobInfo2.PagesPrinted = pJob->dwPagesPrinted; + JobInfo2.Priority = pJob->dwPriority; + JobInfo2.StartTime = pJob->dwStartTime; + JobInfo2.Status = pJob->dwStatus; + JobInfo2.TotalPages = pJob->dwTotalPages; + JobInfo2.UntilTime = pJob->dwUntilTime; + CopyMemory(&JobInfo2.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); + + // Finally copy the structure to the output pointer. + CopyMemory(pOutput, &JobInfo2, sizeof(JOB_INFO_2W)); + return TRUE; +} + +BOOL WINAPI +LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) +{ + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + return FALSE; + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + + // Get the desired job. + pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); + if (!pJob || pJob->Printer != pPrinterHandle->Printer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // The function behaves differently for each level. + if (Level == 1) + return _LocalGetJobLevel1(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + else if (Level == 2) + return _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + + return FALSE; } PLOCAL_JOB @@ -80,7 +536,7 @@ hFile = CreateFileW(pwszFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { - ERR("CreateFileW failed with error %lu!\n", GetLastError()); + ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } @@ -89,30 +545,30 @@ pShadowFile = DllAllocSplMem(cbFileSize); if (!pShadowFile) { - ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + ERR("DllAllocSplMem failed with error %lufor file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Read the entire file. if (!ReadFile(hFile, pShadowFile, cbFileSize, &cbRead, NULL)) { - ERR("ReadFile failed with error %lu!\n", GetLastError()); + ERR("ReadFile failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Check signature and header size. if (pShadowFile->dwSignature != SHD_WIN2003_SIGNATURE || pShadowFile->cbHeader != sizeof(SHD_HEADER)) { - ERR("Signature or Header Size mismatch!\n"); - goto Cleanup; - } - - // Retrieve the associated printer from the table. + ERR("Signature or Header Size mismatch for file \"%S\"!\n", pwszFilePath); + goto Cleanup; + } + + // Retrieve the associated printer from the list. pwszPrinterName = (PWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offPrinterName); - pPrinter = RtlLookupElementGenericTable(&PrinterTable, pwszPrinterName); + pPrinter = LookupElementSkiplist(&PrinterList, &pwszPrinterName, NULL); if (!pPrinter) { - ERR("This shadow file references a non-existing printer!\n"); + ERR("Shadow file \"%S\" references a non-existing printer!\n", pwszFilePath); goto Cleanup; } @@ -120,15 +576,18 @@ pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); if (!pJob) { - ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + ERR("DllAllocSplMem failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } pJob->dwJobID = pShadowFile->dwJobID; + pJob->dwTotalPages = pShadowFile->dwTotalPages; + pJob->dwPriority = pShadowFile->dwPriority; pJob->Printer = pPrinter; pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszOutputFile = NULL; + CopyMemory(&pJob->stSubmitted, &pShadowFile->stSubmitted, sizeof(SYSTEMTIME)); CopyMemory(&pJob->DevMode, (PDEVMODEW)((ULONG_PTR)pShadowFile + pShadowFile->offDevMode), sizeof(DEVMODEW)); pReturnValue = pJob; @@ -160,33 +619,42 @@ hFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { - ERR("CreateFileW failed with error %lu!\n", GetLastError()); + ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Compute the total size of the shadow file. + cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); - cbFileSize = sizeof(SHD_HEADER) + cbDatatype + cbDocumentName + cbPrinterName; + cbFileSize = sizeof(SHD_HEADER) + cbPrinterName + cbDatatype + cbDocumentName + sizeof(DEVMODEW); // Allocate memory for it. pShadowFile = DllAllocSplMem(cbFileSize); if (!pShadowFile) { - ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + ERR("DllAllocSplMem failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } // Fill out the shadow file header information. pShadowFile->dwSignature = SHD_WIN2003_SIGNATURE; pShadowFile->cbHeader = sizeof(SHD_HEADER); + + // Copy the values. pShadowFile->dwJobID = pJob->dwJobID; + pShadowFile->dwTotalPages = pJob->dwTotalPages; + pShadowFile->dwPriority = pJob->dwPriority; + CopyMemory(&pShadowFile->stSubmitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); // Add the extra values that are stored as offsets in the shadow file. // The first value begins right after the shadow file header. dwCurrentOffset = sizeof(SHD_HEADER); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->Printer->pwszPrinterName, cbPrinterName); + pShadowFile->offPrinterName = dwCurrentOffset; + dwCurrentOffset += cbPrinterName; + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pwszDatatype, cbDatatype); pShadowFile->offDatatype = dwCurrentOffset; dwCurrentOffset += cbDatatype; @@ -195,14 +663,14 @@ pShadowFile->offDocumentName = dwCurrentOffset; dwCurrentOffset += cbDocumentName; - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->Printer->pwszPrinterName, cbPrinterName); - pShadowFile->offPrinterName = dwCurrentOffset; - dwCurrentOffset += cbPrinterName; + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, &pJob->DevMode, sizeof(DEVMODEW)); + pShadowFile->offDevMode = dwCurrentOffset; + dwCurrentOffset += sizeof(DEVMODEW); // Write the file. if (!WriteFile(hFile, pShadowFile, cbFileSize, &cbWritten, NULL)) { - ERR("WriteFile failed with error %lu!\n", GetLastError()); + ERR("WriteFile failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -11,7 +11,7 @@ WCHAR wszSpoolDirectory[MAX_PATH]; DWORD cchSpoolDirectory; -// Constants +// Global Constants const WCHAR wszCurrentEnvironment[] = #if defined(_X86_) L"Windows NT x86"; @@ -23,16 +23,19 @@ #error Unsupported architecture #endif +const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; + const WCHAR* wszPrintProviderInfo[3] = { L"Windows NT Local Print Providor", // Name L"Windows NT Local Printers", // Description L"Locally connected Printers" // Comment }; -static const PRINTPROVIDOR PrintProviderFunctions = { +// Local Constants +static const PRINTPROVIDOR _PrintProviderFunctions = { LocalOpenPrinter, // fpOpenPrinter NULL, // fpSetJob - NULL, // fpGetJob + LocalGetJob, // fpGetJob NULL, // fpEnumJobs NULL, // fpAddPrinter NULL, // fpDeletePrinter @@ -56,7 +59,7 @@ NULL, // fpAbortPrinter NULL, // fpReadPrinter LocalEndDocPrinter, // fpEndDocPrinter - NULL, // fpAddJob + LocalAddJob, // fpAddJob NULL, // fpScheduleJob NULL, // fpGetPrinterData NULL, // fpSetPrinterData @@ -139,8 +142,9 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); _GetSpoolDirectory(); - InitializePrintProcessorTable(); - InitializePrinterTable(); + InitializePrintProcessorList(); + InitializePrinterList(); + InitializeGlobalJobList(); break; } @@ -150,7 +154,7 @@ BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, DWORD cbPrintProvidor, LPWSTR pFullRegistryPath) { - CopyMemory(pPrintProvidor, &PrintProviderFunctions, min(cbPrintProvidor, sizeof(PRINTPROVIDOR))); + CopyMemory(pPrintProvidor, &_PrintProviderFunctions, min(cbPrintProvidor, sizeof(PRINTPROVIDOR))); return TRUE; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -13,6 +13,8 @@ #include <stdlib.h> #include <wchar.h> +#include <lmcons.h> +#include <rpc.h> #include <windef.h> #include <winbase.h> #include <wingdi.h> @@ -21,6 +23,8 @@ #include <winsplp.h> #include <ndk/rtlfuncs.h> +#define SKIPLIST_LEVELS 16 +#include <skiplist.h> #include <spoolss.h> #include <wine/debug.h> @@ -47,8 +51,10 @@ */ typedef struct _LOCAL_PRINT_PROCESSOR { + LIST_ENTRY Entry; PWSTR pwszName; - RTL_GENERIC_TABLE DatatypeTable; + PDATATYPES_INFO_1W pDatatypesInfo1; + DWORD dwDatatypeCount; PClosePrintProcessor pfnClosePrintProcessor; PControlPrintProcessor pfnControlPrintProcessor; PEnumPrintProcessorDatatypesW pfnEnumPrintProcessorDatatypesW; @@ -64,13 +70,15 @@ */ typedef struct _LOCAL_PRINTER { + // This sort key must be the first element for LookupElementSkiplist to work! PWSTR pwszPrinterName; + PWSTR pwszPrinterDriver; PWSTR pwszDescription; PWSTR pwszDefaultDatatype; DEVMODEW DefaultDevMode; PLOCAL_PRINT_PROCESSOR pPrintProcessor; - LIST_ENTRY JobQueue; + SKIPLIST JobList; } LOCAL_PRINTER, *PLOCAL_PRINTER; @@ -80,13 +88,24 @@ */ typedef struct _LOCAL_JOB { - LIST_ENTRY Entry; - PLOCAL_PRINTER Printer; - DWORD dwJobID; - PWSTR pwszDocumentName; - PWSTR pwszDatatype; - PWSTR pwszOutputFile; - DEVMODEW DevMode; + // This sort key must be the first element for LookupElementSkiplist to work! + DWORD dwJobID; // Internal and external ID of this Job + + PLOCAL_PRINTER Printer; // Associated Printer to this Job + DWORD dwPriority; // Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY + SYSTEMTIME stSubmitted; // Time of the submission of this Job + PWSTR pwszUserName; // User that submitted the Job + PWSTR pwszNotifyName; // User that shall be notified about the status of the Job + PWSTR pwszDocumentName; // Name of the Document that is printed + PWSTR pwszDatatype; // Datatype of the Document + PWSTR pwszOutputFile; // Output File to spool the Job to + DWORD dwTotalPages; // Total pages of the Document + DWORD dwPagesPrinted; // Number of pages that have already been printed + DWORD dwStartTime; // Earliest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwStatus; // JOB_STATUS_* flags of the Job + PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) + DEVMODEW DevMode; // Associated Device Mode to this Job } LOCAL_JOB, *PLOCAL_JOB; @@ -140,35 +159,42 @@ DWORD offPrintProcessor; DWORD offDatatype; DWORD dwUnknown2; - SYSTEMTIME stSubmitTime; + SYSTEMTIME stSubmitted; DWORD dwStartTime; DWORD dwUntilTime; DWORD dwUnknown6; - DWORD dwPageCount; + DWORD dwTotalPages; DWORD cbSecurityDescriptor; DWORD offSecurityDescriptor; DWORD dwUnknown3; DWORD dwUnknown4; DWORD dwUnknown5; - DWORD offComputerName; + DWORD offMachineName; DWORD dwSPLSize; } SHD_HEADER, *PSHD_HEADER; // jobs.c +extern SKIPLIST GlobalJobList; +BOOL GetNextJobID(PDWORD dwJobID); +void InitializeGlobalJobList(); +void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); +BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob); // main.c extern const WCHAR wszCurrentEnvironment[]; +extern const WCHAR wszDefaultDocumentName[]; extern const WCHAR* wszPrintProviderInfo[3]; extern WCHAR wszSpoolDirectory[MAX_PATH]; extern DWORD cchSpoolDirectory; // printers.c -extern RTL_GENERIC_TABLE PrinterTable; -void InitializePrinterTable(); +extern SKIPLIST PrinterList; +void InitializePrinterList(); BOOL WINAPI LocalEnumPrinters(DWORD Flags, LPWSTR Name, DWORD Level, LPBYTE pPrinterEnum, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalOpenPrinter(PWSTR lpPrinterName, HANDLE* phPrinter, PPRINTER_DEFAULTSW pDefault); DWORD WINAPI LocalStartDocPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo); @@ -179,15 +205,14 @@ BOOL WINAPI LocalClosePrinter(HANDLE hPrinter); // printprocessors.c -extern RTL_GENERIC_TABLE PrintProcessorTable; -void InitializePrintProcessorTable(); +BOOL FindDatatype(PLOCAL_PRINT_PROCESSOR pPrintProcessor, PWSTR pwszDatatype); +PLOCAL_PRINT_PROCESSOR FindPrintProcessor(PWSTR pwszName); +void InitializePrintProcessorList(); BOOL WINAPI LocalEnumPrintProcessorDatatypes(LPWSTR pName, LPWSTR pPrintProcessorName, DWORD Level, LPBYTE pDatatypes, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalEnumPrintProcessors(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalGetPrintProcessorDirectory(LPWSTR pName, LPWSTR pEnvironment, DWORD Level, LPBYTE pPrintProcessorInfo, DWORD cbBuf, LPDWORD pcbNeeded); // tools.c PWSTR AllocAndRegQueryWSZ(HKEY hKey, PCWSTR pwszValueName); -PVOID NTAPI GenericTableAllocateRoutine(PRTL_GENERIC_TABLE Table, CLONG ByteSize); -VOID NTAPI GenericTableFreeRoutine(PRTL_GENERIC_TABLE Table, PVOID Buffer); #endif Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -8,40 +8,33 @@ #include "precomp.h" // Global Variables -RTL_GENERIC_TABLE PrinterTable; +SKIPLIST PrinterList; /** - * @name _PrinterTableCompareRoutine + * @name _PrinterListCompareRoutine * - * RTL_GENERIC_COMPARE_ROUTINE for the Printer Table. + * SKIPLIST_COMPARE_ROUTINE for the Printer List. * Does a case-insensitive comparison, because e.g. LocalOpenPrinter doesn't match the case when looking for Printers. */ -static RTL_GENERIC_COMPARE_RESULTS NTAPI -_PrinterTableCompareRoutine(PRTL_GENERIC_TABLE Table, PVOID FirstStruct, PVOID SecondStruct) +static int WINAPI +_PrinterListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) { PLOCAL_PRINTER A = (PLOCAL_PRINTER)FirstStruct; PLOCAL_PRINTER B = (PLOCAL_PRINTER)SecondStruct; - int iResult = wcsicmp(A->pwszPrinterName, B->pwszPrinterName); - - if (iResult < 0) - return GenericLessThan; - else if (iResult > 0) - return GenericGreaterThan; - else - return GenericEqual; + return wcsicmp(A->pwszPrinterName, B->pwszPrinterName); } /** - * @name InitializePrinterTable + * @name InitializePrinterList * - * Initializes a RTL_GENERIC_TABLE of locally available Printers. - * The table is searchable by name and returns information about the printers, including their job queues. + * Initializes a list of locally available Printers. + * The list is searchable by name and returns information about the printers, including their job queues. * During this process, the job queues are also initialized. */ void -InitializePrinterTable() +InitializePrinterList() { const WCHAR wszPrintersKey[] = L"SYSTEM\\CurrentControlSet\\Control\\Print\\Printers"; @@ -52,14 +45,13 @@ HKEY hKey = NULL; HKEY hSubKey = NULL; LONG lStatus; + PLOCAL_PRINTER pPrinter = NULL; PLOCAL_PRINT_PROCESSOR pPrintProcessor; - PLOCAL_PRINTER pPrinter = NULL; PWSTR pwszPrintProcessor = NULL; WCHAR wszPrinterName[MAX_PRINTER_NAME + 1]; - // Initialize an empty table for our printers. - // We will search it by printer name. - RtlInitializeGenericTable(&PrinterTable, _PrinterTableCompareRoutine, GenericTableAllocateRoutine, GenericTableFreeRoutine, NULL); + // Initialize an empty list for our printers. + InitializeSkiplist(&PrinterList, DllAllocSplMem, _PrinterListCompareRoutine, (PSKIPLIST_FREE_ROUTINE)DllFreeSplMem); // Open our printers registry key. Each subkey is a local printer there. lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszPrintersKey, 0, KEY_READ, &hKey); @@ -91,6 +83,15 @@ { if (pPrinter->pwszDefaultDatatype) DllFreeSplStr(pPrinter->pwszDefaultDatatype); + + if (pPrinter->pwszDescription) + DllFreeSplStr(pPrinter->pwszDescription); + + if (pPrinter->pwszPrinterDriver) + DllFreeSplStr(pPrinter->pwszPrinterDriver); + + if (pPrinter->pwszPrinterName) + DllFreeSplStr(pPrinter->pwszPrinterName); DllFreeSplMem(pPrinter); pPrinter = NULL; @@ -129,8 +130,8 @@ if (!pwszPrintProcessor) continue; - // Try to find it in the Print Processor Table. - pPrintProcessor = RtlLookupElementGenericTable(&PrintProcessorTable, pwszPrintProcessor); + // Try to find it in the Print Processor List. + pPrintProcessor = FindPrintProcessor(pwszPrintProcessor); if (!pPrintProcessor) { ERR("Invalid Print Processor \"%S\" for Printer \"%S\"!\n", pwszPrintProcessor, wszPrinterName); @@ -147,7 +148,7 @@ pPrinter->pwszPrinterName = AllocSplStr(wszPrinterName); pPrinter->pPrintProcessor = pPrintProcessor; - InitializeListHead(&pPrinter->JobQueue); + InitializePrinterJobList(pPrinter); // Get the printer driver. pPrinter->pwszPrinterDriver = AllocAndRegQueryWSZ(hSubKey, L"Printer Driver"); @@ -165,7 +166,7 @@ continue; // Verify that it's valid. - if (!RtlLookupElementGenericTable(&pPrintProcessor->DatatypeTable, pPrinter->pwszDefaultDatatype)) + if (!FindDatatype(pPrintProcessor, pPrinter->pwszDefaultDatatype)) { ERR("Invalid default datatype \"%S\" for Printer \"%S\"!\n", pPrinter->pwszDefaultDatatype, wszPrinterName); continue; @@ -176,14 +177,14 @@ lStatus = RegQueryValueExW(hSubKey, L"Default DevMode", NULL, NULL, (PBYTE)&pPrinter->DefaultDevMode, &cbDevMode); if (lStatus != ERROR_SUCCESS || cbDevMode != sizeof(DEVMODEW)) { - ERR("Couldn't query DevMode for Printer \"%S\", status is %ld, cbDevMode is %lu!\n", wszPrinterName, lStatus, cbDevMode); - continue; - } - - // Add this printer to the printer table. - if (!RtlInsertElementGenericTable(&PrinterTable, pPrinter, sizeof(LOCAL_PRINTER), NULL)) - { - ERR("RtlInsertElementGenericTable failed with error %lu!\n", GetLastError()); + ERR("Couldn't query a valid DevMode for Printer \"%S\", status is %ld, cbDevMode is %lu!\n", wszPrinterName, lStatus, cbDevMode); + continue; + } + + // Add this printer to the printer list. + if (!InsertElementSkiplist(&PrinterList, pPrinter)) + { + ERR("InsertElementSkiplist failed for Printer \"%S\"!\n", pPrinter->pwszPrinterName); goto Cleanup; } @@ -192,20 +193,31 @@ } Cleanup: + // Inside the loop + if (hSubKey) + RegCloseKey(hSubKey); + + if (pPrinter) + { + if (pPrinter->pwszDefaultDatatype) + DllFreeSplStr(pPrinter->pwszDefaultDatatype); + + if (pPrinter->pwszDescription) + DllFreeSplStr(pPrinter->pwszDescription); + + if (pPrinter->pwszPrinterDriver) + DllFreeSplStr(pPrinter->pwszPrinterDriver); + + if (pPrinter->pwszPrinterName) + DllFreeSplStr(pPrinter->pwszPrinterName); + + DllFreeSplMem(pPrinter); + } + if (pwszPrintProcessor) DllFreeSplStr(pwszPrintProcessor); - if (pPrinter) - { - if (pPrinter->pwszDefaultDatatype) - DllFreeSplStr(pPrinter->pwszDefaultDatatype); - - DllFreeSplMem(pPrinter); - } - - if (hSubKey) - RegCloseKey(hSubKey); - + // Outside the loop if (hKey) RegCloseKey(hKey); } @@ -223,9 +235,9 @@ DWORD i; PBYTE pPrinterInfo; PBYTE pPrinterString; + PSKIPLIST_NODE pNode; PLOCAL_PRINTER pPrinter; PRINTER_INFO_1W PrinterInfo1; - PVOID pRestartKey = NULL; WCHAR wszComputerName[2 + MAX_COMPUTERNAME_LENGTH + 1 + 1]; DWORD dwOffsets[] = { @@ -302,8 +314,10 @@ } // Count the required buffer size and the number of printers. - for (pPrinter = RtlEnumerateGenericTableWithoutSplaying(&PrinterTable, &pRestartKey); pPrinter; pPrinter = RtlEnumerateGenericTableWithoutSplaying(&PrinterTable, &pRestartKey)) - { + for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) + { + pPrinter = (PLOCAL_PRINTER)pNode->Element; + // This looks wrong, but is totally right. PRINTER_INFO_1W has three members pName, pComment and pDescription. // But pComment equals the "Description" registry value while pDescription is concatenated out of pName and pComment. // On top of this, the computer name is prepended to the printer name if the user supplied the local computer name during the query. @@ -328,8 +342,10 @@ pPrinterString = pPrinterEnum + *pcReturned * sizeof(PRINTER_INFO_1W); // Copy over the printer information. - for (pPrinter = RtlEnumerateGenericTableWithoutSplaying(&PrinterTable, &pRestartKey); pPrinter; pPrinter = RtlEnumerateGenericTableWithoutSplaying(&PrinterTable, &pRestartKey)) - { + for (pNode = PrinterList.Head.Next[0]; pNode; pNode = pNode->Next[0]) + { + pPrinter = (PLOCAL_PRINTER)pNode->Element; + // FIXME: As for now, the Flags member returns no information. PrinterInfo1.Flags = 0; @@ -409,7 +425,6 @@ PLOCAL_HANDLE pHandle; PLOCAL_PRINTER pPrinter; PLOCAL_PRINTER_HANDLE pPrinterHandle = NULL; - PLIST_ENTRY pEntry; WCHAR wszComputerName[MAX_COMPUTERNAME_LENGTH + 1]; // Sanity checks @@ -478,8 +493,8 @@ CopyMemory(pwszPrinterName, lpPrinterName, cchPrinterName * sizeof(WCHAR)); pwszPrinterName[cchPrinterName] = 0; - // Retrieve the associated printer from the table. - pPrinter = RtlLookupElementGenericTable(&PrinterTable, pwszPrinterName); + // Retrieve the associated printer from the list. + pPrinter = LookupElementSkiplist(&PrinterList, &pwszPrinterName, NULL); if (!pPrinter) { // The printer does not exist. @@ -495,7 +510,7 @@ if (pDefault && pDefault->pDatatype) { // Use the datatype if it's valid. - if (!RtlLookupElementGenericTable(&pPrinter->pPrintProcessor->DatatypeTable, pDefault->pDatatype)) + if (!FindDatatype(pPrinter->pPrintProcessor, pDefault->pDatatype)) { SetLastError(ERROR_INVALID_DATATYPE); goto Cleanup; @@ -550,30 +565,16 @@ goto Cleanup; } - // Look for this job in the job queue of the printer. - pEntry = pPrinter->JobQueue.Flink; - - for (;;) + // Look for this job in the Global Job List. + pJob = LookupElementSkiplist(&GlobalJobList, &dwJobID, NULL); + if (!pJob || pJob->Printer != pPrinter) { - if (pEntry == &pPrinter->JobQueue) - { - // We have reached the end of the list without finding the desired Job ID. - SetLastError(ERROR_INVALID_PRINTER_NAME); - goto Cleanup; - } - - // Get our job structure. - pJob = CONTAINING_RECORD(pEntry, LOCAL_JOB, Entry); - - if (pJob->dwJobID == dwJobID) - { - // We have found the desired job. Give the caller a printer handle referencing it. - pPrinterHandle->StartedJob = pJob; - break; - } - - pEntry = pEntry->Flink; + // The user supplied a non-existing Job ID or the Job ID does not belong to the supplied printer name. + SetLastError(ERROR_INVALID_PRINTER_NAME); + goto Cleanup; } + + pPrinterHandle->StartedJob = pJob; } // Create a new handle that references a printer. @@ -647,11 +648,10 @@ DWORD WINAPI LocalStartDocPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) { - DWORD dwReturnValue = 0; PDOC_INFO_1W pDocumentInfo1; PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; - PLOCAL_JOB pJob; // Sanity checks if (!pDocInfo) @@ -688,15 +688,16 @@ // Create a new job. pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); pJob->Printer = pPrinterHandle->Printer; + pJob->dwPriority = DEF_PRIORITY; // Check if a datatype was given. if (pDocumentInfo1->pDatatype) { // Use the datatype if it's valid. - if (!RtlLookupElementGenericTable(&pJob->Printer->pPrintProcessor->DatatypeTable, pDocumentInfo1->pDatatype)) + if (!FindDatatype(pJob->Printer->pPrintProcessor, pDocumentInfo1->pDatatype)) { SetLastError(ERROR_INVALID_DATATYPE); - goto Cleanup; + return 0; } pJob->pwszDatatype = AllocSplStr(pDocumentInfo1->pDatatype); @@ -717,14 +718,27 @@ if (pDocumentInfo1->pOutputFile) pJob->pwszOutputFile = AllocSplStr(pDocumentInfo1->pOutputFile); - // Enqueue the job. - ///////////// TODO ///////////////////// - -Cleanup: - if (pJob) - DllFreeSplMem(pJob); - - return dwReturnValue; + // Get an ID for the new job. + if (!GetNextJobID(&pJob->dwJobID)) + return 0; + + // Add the job to the Global Job List. + if (!InsertElementSkiplist(&GlobalJobList, pJob)) + { + ERR("InsertElementSkiplist failed for job %lu for the GlobalJobList!\n", pJob->dwJobID); + return 0; + } + + // Add the job at the end of the Printer's Job List. + // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. + if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) + { + ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); + return 0; + } + + pPrinterHandle->StartedJob = pJob; + return pJob->dwJobID; } BOOL WINAPI Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -8,8 +8,8 @@ #include "precomp.h" -// Global Variables -RTL_GENERIC_TABLE PrintProcessorTable; +// Local Variables +static LIST_ENTRY _PrintProcessorList; /** * @name _OpenEnvironment @@ -76,83 +76,67 @@ return bReturnValue; } +BOOL +FindDatatype(PLOCAL_PRINT_PROCESSOR pPrintProcessor, PWSTR pwszDatatype) +{ + DWORD i; + PDATATYPES_INFO_1W pCurrentDatatype = pPrintProcessor->pDatatypesInfo1; + + for (i = 0; i < pPrintProcessor->dwDatatypeCount; i++) + { + if (wcsicmp(pCurrentDatatype->pName, pwszDatatype) == 0) + return TRUE; + + ++pCurrentDatatype; + } + + return FALSE; +} + +PLOCAL_PRINT_PROCESSOR +FindPrintProcessor(PWSTR pwszName) +{ + PLIST_ENTRY pEntry; + PLOCAL_PRINT_PROCESSOR pPrintProcessor; + + for (pEntry = _PrintProcessorList.Flink; pEntry; pEntry = pEntry->Flink) + { + pPrintProcessor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_PROCESSOR, Entry); + + if (wcsicmp(pPrintProcessor->pwszName, pwszName) == 0) + return pPrintProcessor; + } + + return NULL; +} + /** - * @name _PrinterTableCompareRoutine - * - * RTL_GENERIC_COMPARE_ROUTINE for the Print Processor Table. - * Does a case-insensitive comparison, because e.g. LocalEnumPrintProcessorDatatypes doesn't match the case when looking for Print Processors. - */ -static RTL_GENERIC_COMPARE_RESULTS NTAPI -_PrintProcessorTableCompareRoutine(PRTL_GENERIC_TABLE Table, PVOID FirstStruct, PVOID SecondStruct) -{ - PLOCAL_PRINT_PROCESSOR A = (PLOCAL_PRINT_PROCESSOR)FirstStruct; - PLOCAL_PRINT_PROCESSOR B = (PLOCAL_PRINT_PROCESSOR)SecondStruct; - - int iResult = wcsicmp(A->pwszName, B->pwszName); - - if (iResult < 0) - return GenericLessThan; - else if (iResult > 0) - return GenericGreaterThan; - else - return GenericEqual; -} - -/** - * @name _DatatypeTableCompareRoutine - * - * RTL_GENERIC_COMPARE_ROUTINE for the Datatype Table. - * Does a case-insensitive comparison, because e.g. LocalOpenPrinter doesn't match the case when looking for Datatypes. - */ -static RTL_GENERIC_COMPARE_RESULTS NTAPI -_DatatypeTableCompareRoutine(PRTL_GENERIC_TABLE Table, PVOID FirstStruct, PVOID SecondStruct) -{ - PWSTR A = (PWSTR)FirstStruct; - PWSTR B = (PWSTR)SecondStruct; - - int iResult = wcsicmp(A, B); - - if (iResult < 0) - return GenericLessThan; - else if (iResult > 0) - return GenericGreaterThan; - else - return GenericEqual; -} - -/** - * @name InitializePrintProcessorTable - * - * Initializes a RTL_GENERIC_TABLE of locally available Print Processors. - * The table is searchable by name and returns pointers to the functions of the loaded Print Processor DLL. + * @name InitializePrintProcessorList + * + * Initializes a singly linked list of locally available Print Processors. */ void -InitializePrintProcessorTable() +InitializePrintProcessorList() { DWORD cbDatatypes; DWORD cbFileName; DWORD cchPrintProcessorPath; DWORD cchMaxSubKey; DWORD cchPrintProcessorName; - DWORD dwDatatypes; DWORD dwSubKeys; DWORD i; - DWORD j; HINSTANCE hinstPrintProcessor; HKEY hKey = NULL; HKEY hSubKey = NULL; HKEY hSubSubKey = NULL; LONG lStatus; - PDATATYPES_INFO_1W pDatatypesInfo1 = NULL; PLOCAL_PRINT_PROCESSOR pPrintProcessor = NULL; - PWSTR pwszDatatype = NULL; PWSTR pwszPrintProcessorName = NULL; WCHAR wszFileName[MAX_PATH]; WCHAR wszPrintProcessorPath[MAX_PATH]; - // Initialize an empty table for our Print Processors. - // We will search it by Print Processor name. - RtlInitializeGenericTable(&PrintProcessorTable, _PrintProcessorTableCompareRoutine, GenericTableAllocateRoutine, GenericTableFreeRoutine, NULL); + // Initialize an empty list for our Print Processors. + InitializeListHead(&_PrintProcessorList); // Prepare the path to the Print Processor directory. if (!LocalGetPrintProcessorDirectory(NULL, NULL, 1, (PBYTE)wszPrintProcessorPath, sizeof(wszPrintProcessorPath), &cchPrintProcessorPath)) @@ -204,14 +188,11 @@ if (pPrintProcessor->pwszName) DllFreeSplStr(pPrintProcessor->pwszName); + if (pPrintProcessor->pDatatypesInfo1) + DllFreeSplMem(pPrintProcessor->pDatatypesInfo1); + DllFreeSplMem(pPrintProcessor); pPrintProcessor = NULL; - } - - if (pDatatypesInfo1) - { - DllFreeSplMem(pDatatypesInfo1); - pDatatypesInfo1 = NULL; } // Get the name of this Print Processor. @@ -306,68 +287,46 @@ } // Get all supported datatypes. - pPrintProcessor->pfnEnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, &cbDatatypes, &dwDatatypes); - pDatatypesInfo1 = DllAllocSplMem(cbDatatypes); - if (!pDatatypesInfo1) + pPrintProcessor->pfnEnumPrintProcessorDatatypesW(NULL, NULL, 1, NULL, 0, &cbDatatypes, &pPrintProcessor->dwDatatypeCount); + pPrintProcessor->pDatatypesInfo1 = DllAllocSplMem(cbDatatypes); + if (!pPrintProcessor->pDatatypesInfo1) { ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); goto Cleanup; } - if (!pPrintProcessor->pfnEnumPrintProcessorDatatypesW(NULL, NULL, 1, (PBYTE)pDatatypesInfo1, cbDatatypes, &cbDatatypes, &dwDatatypes)) + if (!pPrintProcessor->pfnEnumPrintProcessorDatatypesW(NULL, NULL, 1, (PBYTE)pPrintProcessor->pDatatypesInfo1, cbDatatypes, &cbDatatypes, &pPrintProcessor->dwDatatypeCount)) { ERR("EnumPrintProcessorDatatypesW failed for Print Processor \"%S\" with error %lu!\n", wszPrintProcessorPath, GetLastError()); continue; } - // Add the supported datatypes to the datatype table. - RtlInitializeGenericTable(&pPrintProcessor->DatatypeTable, _DatatypeTableCompareRoutine, GenericTableAllocateRoutine, GenericTableFreeRoutine, NULL); - - for (j = 0; j < dwDatatypes; j++) - { - pwszDatatype = AllocSplStr(pDatatypesInfo1->pName); - - if (!RtlInsertElementGenericTable(&pPrintProcessor->DatatypeTable, pDatatypesInfo1->pName, sizeof(PWSTR), NULL)) - { - ERR("RtlInsertElementGenericTable failed for iteration %lu with error %lu!\n", j, GetLastError()); - goto Cleanup; - } - - ++pDatatypesInfo1; - } - - // Add the Print Processor to the table. - if (!RtlInsertElementGenericTable(&PrintProcessorTable, pPrintProcessor, sizeof(LOCAL_PRINT_PROCESSOR), NULL)) - { - ERR("RtlInsertElementGenericTable failed for iteration %lu with error %lu!\n", i, GetLastError()); - goto Cleanup; - } + // Add the Print Processor to the list. + InsertTailList(&_PrintProcessorList, &pPrintProcessor->Entry); // Don't let the cleanup routines free this. - pwszDatatype = NULL; pPrintProcessor = NULL; } Cleanup: - if (pwszDatatype) - DllFreeSplStr(pwszDatatype); - - if (pDatatypesInfo1) - DllFreeSplMem(pDatatypesInfo1); + // Inside the loop + if (hSubSubKey) + RegCloseKey(hSubSubKey); if (pPrintProcessor) { if (pPrintProcessor->pwszName) DllFreeSplStr(pPrintProcessor->pwszName); + if (pPrintProcessor->pDatatypesInfo1) + DllFreeSplMem(pPrintProcessor->pDatatypesInfo1); + DllFreeSplMem(pPrintProcessor); } + // Outside the loop if (pwszPrintProcessorName) DllFreeSplStr(pwszPrintProcessorName); - - if (hSubSubKey) - RegCloseKey(hSubSubKey); if (hSubKey) RegCloseKey(hSubKey); @@ -423,7 +382,7 @@ } // Try to find the Print Processor. - pPrintProcessor = RtlLookupElementGenericTable(&PrintProcessorTable, pPrintProcessorName); + pPrintProcessor = FindPrintProcessor(pPrintProcessorName); if (!pPrintProcessor) { SetLastError(ERROR_UNKNOWN_PRINTPROCESSOR); @@ -499,6 +458,7 @@ } // Verify pEnvironment and open its registry key. + // We use the registry and not the PrintProcessorList here, because the caller may request information about a different environment. if (!_OpenEnvironment(pEnvironment, &hKey)) goto Cleanup; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/tools.c [iso-8859-1] Fri Jun 19 15:21:30 2015 @@ -56,25 +56,3 @@ return pwszValue; } - -/** - * @name GenericTableAllocateRoutine - * - * RTL_GENERIC_ALLOCATE_ROUTINE for all our RTL_GENERIC_TABLEs, using DllAllocSplMem. - */ -PVOID NTAPI -GenericTableAllocateRoutine(PRTL_GENERIC_TABLE Table, CLONG ByteSize) -{ - return DllAllocSplMem(ByteSize); -} - -/** - * @name GenericTableFreeRoutine - * - * RTL_GENERIC_FREE_ROUTINE for all our RTL_GENERIC_TABLEs, using DllFreeSplMem. - */ -VOID NTAPI -GenericTableFreeRoutine(PRTL_GENERIC_TABLE Table, PVOID Buffer) -{ - DllFreeSplMem(Buffer); -}

9 years, 4 months

[cfinck] 68194: [LOCALSPL_APITEST] Put the calls that eventually give us the function pointers to localspl into a separate procedure GetLocalsplFuncs to enable further tests easily.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 19 15:05:58 2015 New Revision: 68194 URL: http://svn.reactos.org/svn/reactos?rev=68194&view=rev Log: [LOCALSPL_APITEST] Put the calls that eventually give us the function pointers to localspl into a separate procedure GetLocalsplFuncs to enable further tests easily. Modified: branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/fpEnumPrinters.c branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/main.c Modified: branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/fpEnumPrinters.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] Fri Jun 19 15:05:58 2015 @@ -18,40 +18,20 @@ #include "../localspl_apitest.h" #include <spoolss.h> +extern BOOL GetLocalsplFuncs(LPPRINTPROVIDOR pp); + START_TEST(fpEnumPrinters) { DWORD cbNeeded; DWORD cbTemp; DWORD dwReturned; DWORD i; - HMODULE hLocalspl; - PInitializePrintProvidor pfnInitializePrintProvidor; PRINTPROVIDOR pp; PPRINTER_INFO_1W pPrinterInfo1; PVOID pMem; - // Get us a handle to the loaded localspl.dll. - hLocalspl = GetModuleHandleW(L"localspl"); - if (!hLocalspl) - { - skip("GetModuleHandleW failed with error %lu!\n", GetLastError()); + if (!GetLocalsplFuncs(&pp)) return; - } - - // Get a pointer to its InitializePrintProvidor function. - pfnInitializePrintProvidor = (PInitializePrintProvidor)GetProcAddress(hLocalspl, "InitializePrintProvidor"); - if (!pfnInitializePrintProvidor) - { - skip("GetProcAddress failed with error %lu!\n", GetLastError()); - return; - } - - // Get localspl's function pointers. - if (!pfnInitializePrintProvidor(&pp, sizeof(pp), NULL)) - { - skip("pfnInitializePrintProvidor failed with error %lu!\n", GetLastError()); - return; - } // Verify that localspl only returns information about a single print provider (namely itself). cbNeeded = 0xDEADBEEF; Modified: branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/ros… ============================================================================== --- branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/rostests/apitests/localspl/dll/main.c [iso-8859-1] Fri Jun 19 15:05:58 2015 @@ -33,6 +33,38 @@ { 0, 0 } }; + +BOOL +GetLocalsplFuncs(LPPRINTPROVIDOR pp) +{ + HMODULE hLocalspl; + PInitializePrintProvidor pfnInitializePrintProvidor; + + // Get us a handle to the loaded localspl.dll. + hLocalspl = GetModuleHandleW(L"localspl"); + if (!hLocalspl) + { + skip("GetModuleHandleW failed with error %u!\n", GetLastError()); + return FALSE; + } + + // Get a pointer to its InitializePrintProvidor function. + pfnInitializePrintProvidor = (PInitializePrintProvidor)GetProcAddress(hLocalspl, "InitializePrintProvidor"); + if (!pfnInitializePrintProvidor) + { + skip("GetProcAddress failed with error %u!\n", GetLastError()); + return FALSE; + } + + // Get localspl's function pointers. + if (!pfnInitializePrintProvidor(pp, sizeof(PRINTPROVIDOR), NULL)) + { + skip("pfnInitializePrintProvidor failed with error %u!\n", GetLastError()); + return FALSE; + } + + return TRUE; +} // Running the tests from the injected DLL and redirecting their output to the pipe. BOOL WINAPI

9 years, 4 months

[cfinck] 68193: [RPCRT4] Add a lazy stub for RpcBindingServerFromClient to get my upcoming localspl changes to compile. This needs further attention later.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 19 15:00:41 2015 New Revision: 68193 URL: http://svn.reactos.org/svn/reactos?rev=68193&view=rev Log: [RPCRT4] Add a lazy stub for RpcBindingServerFromClient to get my upcoming localspl changes to compile. This needs further attention later. Modified: branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpc_binding.c branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpcrt4.spec branches/colins-printing-for-freedom/reactos/include/psdk/rpcdce.h Modified: branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Fri Jun 19 15:00:41 2015 @@ -800,6 +800,16 @@ TRACE("(%p,%p) = %s\n", Binding, ObjectUuid, debugstr_guid(&bind->ObjectUuid)); *ObjectUuid = bind->ObjectUuid; return RPC_S_OK; +} + + +/*********************************************************************** + * RpcBindingServerFromClient (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcBindingServerFromClient(RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding) +{ + /* This is a stub, just fail for now. */ + return RPC_S_INVALID_ARG; } /*********************************************************************** Modified: branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Fri Jun 19 15:00:41 2015 @@ -345,7 +345,7 @@ @ stdcall RpcBindingInqObject(ptr ptr) @ stub RpcBindingInqOption @ stdcall RpcBindingReset(ptr) -@ stub RpcBindingServerFromClient +@ stdcall RpcBindingServerFromClient(ptr ptr) @ stdcall RpcBindingSetAuthInfoA(ptr str long long ptr long) @ stdcall RpcBindingSetAuthInfoExA(ptr str long long ptr long ptr) @ stdcall RpcBindingSetAuthInfoExW(ptr wstr long long ptr long ptr) Modified: branches/colins-printing-for-freedom/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/include/psdk/rpcdce.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/include/psdk/rpcdce.h [iso-8859-1] Fri Jun 19 15:00:41 2015 @@ -338,6 +338,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingReset( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingServerFromClient( RPC_BINDING_HANDLE ClientBinding, RPC_BINDING_HANDLE* ServerBinding ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetOption( RPC_BINDING_HANDLE Binding, ULONG Option, ULONG_PTR OptionValue );

9 years, 4 months

[cfinck] 68192: [SKIPLIST] Verify that SKIPLIST_LEVELS is in the required range using C_ASSERTs (thanks to Thomas for the hint!)

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 19 12:33:45 2015 New Revision: 68192 URL: http://svn.reactos.org/svn/reactos?rev=68192&view=rev Log: [SKIPLIST] Verify that SKIPLIST_LEVELS is in the required range using C_ASSERTs (thanks to Thomas for the hint!) Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] Fri Jun 19 12:33:45 2015 @@ -14,6 +14,9 @@ #ifndef SKIPLIST_LEVELS #error Please define SKIPLIST_LEVELS to a value between 1 and 32. #endif + +C_ASSERT(SKIPLIST_LEVELS >= 1); +C_ASSERT(SKIPLIST_LEVELS <= 32); // Function pointer definitions typedef PVOID (WINAPI *PSKIPLIST_ALLOCATE_ROUTINE)(DWORD);

9 years, 4 months

[cfinck] 68191: [SKIPLIST] Add my implementation of an efficient Skiplist. A Skiplist can do insertion, deletion and lookups in O(log N) on average just like balanced trees. It features simpler alg...

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Jun 19 10:27:46 2015 New Revision: 68191 URL: http://svn.reactos.org/svn/reactos?rev=68191&view=rev Log: [SKIPLIST] Add my implementation of an efficient Skiplist. A Skiplist can do insertion, deletion and lookups in O(log N) on average just like balanced trees. It features simpler algorithms though due to purely relying on probabilistic balancing at insertion and not on rebalancing with every modification. This simple structure allowed me to implement some additions on top of the standard algorithms: * Storing distances between elements on each level to efficiently return the index of the element in the Skiplist when doing a lookup. * InsertTailElementSkiplist to explicitly insert an element at the end of the Skiplist. This needs no comparisons and is useful when you can be sure that the new element would be inserted at the end (e.g. for a new print job in the queue with default priority). More features are easily possible, but for now I limited features on those needed for my Local Spooler work. Some references on Skiplists: * ftp://ftp.cs.umd.edu/pub/skipLists/skiplists.pdf * http://drum.lib.umd.edu/bitstream/1903/544/2/CS-TR-2286.1.pdf Added: branches/colins-printing-for-freedom/reactos/lib/skiplist/ (with props) branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt (with props) branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c (with props) branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h (with props) branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c (with props) Modified: branches/colins-printing-for-freedom/reactos/lib/CMakeLists.txt Modified: branches/colins-printing-for-freedom/reactos/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/CMakeLists.txt [iso-8859-1] Fri Jun 19 10:27:46 2015 @@ -27,6 +27,7 @@ add_subdirectory(rtl) add_subdirectory(sdk) +add_subdirectory(skiplist) add_subdirectory(smlib) add_subdirectory(tdilib) Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jun 19 10:27:46 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt (added) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt [iso-8859-1] Fri Jun 19 10:27:46 2015 @@ -0,0 +1,10 @@ + +# The library +add_definitions(-DSKIPLIST_LEVELS=16) +add_library(skiplist16 skiplist.c) + +# The Test program +add_executable(skiplist_test skiplist_test.c) +target_link_libraries(skiplist_test skiplist16) +set_module_type(skiplist_test win32cui) +add_importlibs(skiplist_test msvcrt kernel32 ntdll) Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c (added) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c [iso-8859-1] Fri Jun 19 10:27:46 2015 @@ -0,0 +1,397 @@ +/* + * PROJECT: Skiplist implementation for the ReactOS Project + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: All implemented functions operating on the Skiplist + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <intrin.h> +#include <windef.h> +#include <winbase.h> +#include "skiplist.h" + +/** + * @name _GetRandomLevel + * + * Returns a random level for the next element to be inserted. + * This level is geometrically distributed for p = 0.5, so perfectly suitable for an efficient Skiplist implementation. + * + * @return + * A value between 0 and SKIPLIST_LEVELS - 1. + */ +static __inline CHAR +_GetRandomLevel() +{ + // Using a simple fixed seed and the Park-Miller Lehmer Minimal Standard Random Number Generator gives an acceptable distribution for our "random" levels. + static DWORD dwRandom = 1; + + DWORD dwLevel = 0; + DWORD dwShifted; + + // Generate 32 uniformly distributed pseudo-random bits using the Park-Miller Lehmer Minimal Standard Random Number Generator. + dwRandom = (DWORD)(((ULONGLONG)dwRandom * 48271UL) % 2147483647UL); + + // Shift out (32 - SKIPLIST_LEVELS) bits to the right to have no more than SKIPLIST_LEVELS bits set. + dwShifted = dwRandom >> (32 - SKIPLIST_LEVELS); + + // BitScanForward doesn't operate on a zero input value. + if (dwShifted) + { + // BitScanForward sets dwLevel to the zero-based position of the first set bit (from LSB to MSB). + // This makes dwLevel a geometrically distributed value between 0 and SKIPLIST_LEVELS - 1 for p = 0.5. + BitScanForward(&dwLevel, dwShifted); + } + + // dwLevel can't have a value higher than 31 this way, so a CHAR is more than enough. + return (CHAR)dwLevel; +} + +/** + * @name _InsertElementSkiplistWithInformation + * + * Determines a level for the new element and inserts it at the given position in the Skiplist. + * This function is internally used by the Skiplist insertion functions. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param Element + * The element to insert. + * + * @param pUpdate + * Array containing the last nodes before our new node on each level. + * + * @param dwDistance + * Array containing the distance to the last node before our new node on each level. + * + * @return + * TRUE if the node was successfully inserted, FALSE if no memory could be allocated for it. + */ +static BOOL +_InsertElementSkiplistWithInformation(PSKIPLIST Skiplist, PVOID Element, PSKIPLIST_NODE* pUpdate, DWORD* dwDistance) +{ + CHAR chNewLevel; + CHAR i; + PSKIPLIST_NODE pNode; + + // Get the highest level, on which the node shall be inserted. + chNewLevel = _GetRandomLevel(); + + // Check if the new level is higher than the maximum level we currently have in the Skiplist. + if (chNewLevel > Skiplist->MaximumLevel) + { + // It is, so we also need to insert the new node right after the Head node on some levels. + // These are the levels higher than the current maximum level up to the new level. + // We also need to set the distance of these elements to the new node count to account for the calculations below. + for (i = Skiplist->MaximumLevel + 1; i <= chNewLevel; i++) + { + pUpdate[i] = &Skiplist->Head; + pUpdate[i]->Distance[i] = Skiplist->NodeCount + 1; + } + + // The new level is the new maximum level of the entire Skiplist. + Skiplist->MaximumLevel = chNewLevel; + } + + // Finally create our new Skiplist node. + pNode = Skiplist->AllocateRoutine(sizeof(SKIPLIST_NODE)); + if (!pNode) + return FALSE; + + pNode->Element = Element; + + // For each used level, insert us between the saved node for this level and its current next node. + for (i = 0; i <= chNewLevel; i++) + { + pNode->Next[i] = pUpdate[i]->Next[i]; + pUpdate[i]->Next[i] = pNode; + + // We know the walked distance in this level: dwDistance[i] + // We also know the element index of the new node: dwDistance[0] + // The new node's distance is now the walked distance in this level plus the difference between the saved node's distance and the element index. + pNode->Distance[i] = dwDistance[i] + (pUpdate[i]->Distance[i] - dwDistance[0]); + + // The saved node's distance is now the element index plus one (to account for the added node) minus the walked distance in this level. + pUpdate[i]->Distance[i] = dwDistance[0] + 1 - dwDistance[i]; + } + + // For all levels above the new node's level, we need to increment the distance, because we've just added our new node. + for (i = chNewLevel + 1; i <= Skiplist->MaximumLevel; i++) + ++pUpdate[i]->Distance[i]; + + // We've successfully added a node :) + ++Skiplist->NodeCount; + return TRUE; +} + +/** + * @name DeleteElementSkiplist + * + * Deletes an element from the Skiplist. The efficiency of this operation is O(log N) on average. + * + * Instead of the result of a LookupElementSkiplist call, it's sufficient to provide a dummy element with just enough information for your CompareRoutine. + * A lookup for the element to be deleted needs to be performed in any case. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param Element + * Information about the element to be deleted. + * + * @return + * Returns the deleted element or NULL if no such element was found. + * You can then free memory for the deleted element if necessary. + */ +PVOID +DeleteElementSkiplist(PSKIPLIST Skiplist, PVOID Element) +{ + CHAR i; + PSKIPLIST_NODE pLastComparedNode = NULL; + PSKIPLIST_NODE pNode = &Skiplist->Head; + PSKIPLIST_NODE pUpdate[SKIPLIST_LEVELS]; + PVOID pReturnValue; + + // Find the node on every currently used level, after which the node to be deleted must follow. + // This can be done efficiently by starting from the maximum level and going down a level each time a position has been found. + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + while (pNode->Next[i] && pNode->Next[i] != pLastComparedNode && Skiplist->CompareRoutine(pNode->Next[i]->Element, Element) < 0) + pNode = pNode->Next[i]; + + // Reduce the number of comparisons by not comparing the same node on different levels twice. + pLastComparedNode = pNode->Next[i]; + pUpdate[i] = pNode; + } + + // Check if the node we're looking for has been found. + pNode = pNode->Next[0]; + if (!pNode || Skiplist->CompareRoutine(pNode->Element, Element) != 0) + { + // It hasn't been found, so there's nothing to delete. + return NULL; + } + + // Beginning at the lowest level, remove the node from each level of the list and merge distances. + // We can stop as soon as we found the first level that doesn't contain the node. + for (i = 0; i <= Skiplist->MaximumLevel && pUpdate[i]->Next[i] == pNode; i++) + { + pUpdate[i]->Distance[i] += pNode->Distance[i] - 1; + pUpdate[i]->Next[i] = pNode->Next[i]; + } + + // Now decrement the distance of the corresponding node in levels higher than the deleted node's level to account for the deleted node. + while (i <= Skiplist->MaximumLevel) + { + --pUpdate[i]->Distance[i]; + i++; + } + + // Return the deleted element (so the caller can free it if necessary) and free the memory for the node itself (allocated by us). + pReturnValue = pNode->Element; + Skiplist->FreeRoutine(pNode); + + // Find all levels which now contain no more nodes and reduce the maximum level of the entire Skiplist accordingly. + while (Skiplist->MaximumLevel > 0 && !Skiplist->Head.Next[Skiplist->MaximumLevel]) + --Skiplist->MaximumLevel; + + // We've successfully deleted the node :) + --Skiplist->NodeCount; + return pReturnValue; +} + +/** + * @name InitializeSkiplist + * + * Initializes a new Skiplist structure. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param AllocateRoutine + * Pointer to a SKIPLIST_ALLOCATE_ROUTINE for allocating memory for new Skiplist nodes. + * + * @param CompareRoutine + * Pointer to a SKIPLIST_COMPARE_ROUTINE for comparing two elements of the Skiplist. + * + * @param FreeRoutine + * Pointer to a SKIPLIST_FREE_ROUTINE for freeing memory allocated with AllocateRoutine. + */ +void +InitializeSkiplist(PSKIPLIST Skiplist, PSKIPLIST_ALLOCATE_ROUTINE AllocateRoutine, PSKIPLIST_COMPARE_ROUTINE CompareRoutine, PSKIPLIST_FREE_ROUTINE FreeRoutine) +{ + // Store the routines. + Skiplist->AllocateRoutine = AllocateRoutine; + Skiplist->CompareRoutine = CompareRoutine; + Skiplist->FreeRoutine = FreeRoutine; + + // Initialize the members and pointers. + // The Distance array is only used when a node is non-NULL, so it doesn't need initialization. + Skiplist->MaximumLevel = 0; + Skiplist->NodeCount = 0; + ZeroMemory(Skiplist->Head.Next, sizeof(Skiplist->Head.Next)); +} + +/** + * @name InsertElementSkiplist + * + * Inserts a new element into the Skiplist. The efficiency of this operation is O(log N) on average. + * Uses CompareRoutine to find the right position for the insertion. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param Element + * The element to insert. + * + * @return + * TRUE if the node was successfully inserted, FALSE if it already exists or no memory could be allocated for it. + */ +BOOL +InsertElementSkiplist(PSKIPLIST Skiplist, PVOID Element) +{ + CHAR i; + DWORD dwDistance[SKIPLIST_LEVELS + 1] = { 0 }; + PSKIPLIST_NODE pLastComparedNode = NULL; + PSKIPLIST_NODE pNode = &Skiplist->Head; + PSKIPLIST_NODE pUpdate[SKIPLIST_LEVELS]; + + // Find the node on every currently used level, after which the new node needs to be inserted. + // This can be done efficiently by starting from the maximum level and going down a level each time a position has been found. + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + // When entering this level, we begin at the distance of the last level we walked through. + dwDistance[i] = dwDistance[i + 1]; + + while (pNode->Next[i] && pNode->Next[i] != pLastComparedNode && Skiplist->CompareRoutine(pNode->Next[i]->Element, Element) < 0) + { + // Save our position in every level when walking through the nodes. + dwDistance[i] += pNode->Distance[i]; + + // Advance to the next node. + pNode = pNode->Next[i]; + } + + // Reduce the number of comparisons by not comparing the same node on different levels twice. + pLastComparedNode = pNode->Next[i]; + pUpdate[i] = pNode; + } + + // Check if the node already exists in the Skiplist. + pNode = pNode->Next[0]; + if (pNode && Skiplist->CompareRoutine(pNode->Element, Element) == 0) + { + // All elements to be inserted mustn't exist in the list, so we see this as a failure. + return FALSE; + } + + // The rest of the procedure is the same for both insertion functions. + return _InsertElementSkiplistWithInformation(Skiplist, Element, pUpdate, dwDistance); +} + +/** + * @name InsertTailElementSkiplist + * + * Inserts a new element at the end of the Skiplist. The efficiency of this operation is O(log N) on average. + * In contrast to InsertElementSkiplist, this function is more efficient by not calling CompareRoutine at all and always inserting the element at the end. + * You're responsible for calling this function only when you can guarantee that InsertElementSkiplist would also insert the element at the end. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param Element + * The element to insert. + * + * @return + * TRUE if the node was successfully inserted, FALSE if it already exists or no memory could be allocated for it. + */ +BOOL +InsertTailElementSkiplist(PSKIPLIST Skiplist, PVOID Element) +{ + CHAR i; + DWORD dwDistance[SKIPLIST_LEVELS + 1] = { 0 }; + PSKIPLIST_NODE pNode = &Skiplist->Head; + PSKIPLIST_NODE pUpdate[SKIPLIST_LEVELS]; + + // Find the last node on every currently used level, after which the new node needs to be inserted. + // This can be done efficiently by starting from the maximum level and going down a level each time a position has been found. + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + // When entering this level, we begin at the distance of the last level we walked through. + dwDistance[i] = dwDistance[i + 1]; + + while (pNode->Next[i]) + { + // Save our position in every level when walking through the nodes. + dwDistance[i] += pNode->Distance[i]; + + // Advance to the next node. + pNode = pNode->Next[i]; + } + + pUpdate[i] = pNode; + } + + // The rest of the procedure is the same for both insertion functions. + return _InsertElementSkiplistWithInformation(Skiplist, Element, pUpdate, dwDistance); +} + +/** + * @name LookupElementSkiplist + * + * Looks up an element in the Skiplist. The efficiency of this operation is O(log N) on average. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param Element + * Information about the element to look for. + * + * @param ElementIndex + * Pointer to a DWORD that will contain the zero-based index of the element in the Skiplist. + * If you're not interested in the index, you can set this parameter to NULL. + * + * @return + * Returns the found element or NULL if no such element was found. + */ +PVOID +LookupElementSkiplist(PSKIPLIST Skiplist, PVOID Element, PDWORD ElementIndex) +{ + CHAR i; + DWORD dwIndex = 0; + PSKIPLIST_NODE pLastComparedNode = NULL; + PSKIPLIST_NODE pNode = &Skiplist->Head; + + // Do the efficient lookup in Skiplists: + // * Start from the maximum level. + // * Walk through all nodes on this level that come before the node we're looking for. + // * When we have reached such a node, go down a level and continue there. + // * Repeat these steps till we're in level 0, right in front of the node we're looking for. + pNode = &Skiplist->Head; + + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + while (pNode->Next[i] && pNode->Next[i] != pLastComparedNode && Skiplist->CompareRoutine(pNode->Next[i]->Element, Element) < 0) + { + dwIndex += pNode->Distance[i]; + pNode = pNode->Next[i]; + } + + // Reduce the number of comparisons by not comparing the same node on different levels twice. + pLastComparedNode = pNode->Next[i]; + } + + // We must be right in front of the node we're looking for now, otherwise it doesn't exist in the Skiplist at all. + pNode = pNode->Next[0]; + if (!pNode || Skiplist->CompareRoutine(pNode->Element, Element) != 0) + { + // It hasn't been found, so there's nothing to return. + return NULL; + } + + // Return the index of the element if the caller is interested. + if (ElementIndex) + *ElementIndex = dwIndex; + + // Return the stored element of the found node. + return pNode->Element; +} Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h (added) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] Fri Jun 19 10:27:46 2015 @@ -0,0 +1,50 @@ +/* + * PROJECT: Skiplist implementation for the ReactOS Project + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Interfaces for the Skiplist + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#ifndef _REACTOS_SKIPLIST_H +#define _REACTOS_SKIPLIST_H + +// Define SKIPLIST_LEVELS to a value between 1 and 32 before including this header. +// This specifies the maximum number of levels you want your Skiplist to have. +// A value of X is recommended for handling up to 2^X elements. +#ifndef SKIPLIST_LEVELS +#error Please define SKIPLIST_LEVELS to a value between 1 and 32. +#endif + +// Function pointer definitions +typedef PVOID (WINAPI *PSKIPLIST_ALLOCATE_ROUTINE)(DWORD); +typedef int (WINAPI *PSKIPLIST_COMPARE_ROUTINE)(PVOID, PVOID); +typedef void (WINAPI *PSKIPLIST_FREE_ROUTINE)(PVOID); + +// Structure definitions +typedef struct _SKIPLIST_NODE +{ + DWORD Distance[SKIPLIST_LEVELS]; + struct _SKIPLIST_NODE* Next[SKIPLIST_LEVELS]; + PVOID Element; +} +SKIPLIST_NODE, *PSKIPLIST_NODE; + +typedef struct _SKIPLIST +{ + SKIPLIST_NODE Head; + CHAR MaximumLevel; + DWORD NodeCount; + PSKIPLIST_ALLOCATE_ROUTINE AllocateRoutine; + PSKIPLIST_COMPARE_ROUTINE CompareRoutine; + PSKIPLIST_FREE_ROUTINE FreeRoutine; +} +SKIPLIST, *PSKIPLIST; + +// Function prototypes +void InitializeSkiplist(PSKIPLIST Skiplist, PSKIPLIST_ALLOCATE_ROUTINE AllocateRoutine, PSKIPLIST_COMPARE_ROUTINE CompareRoutine, PSKIPLIST_FREE_ROUTINE FreeRoutine); +BOOL InsertElementSkiplist(PSKIPLIST Skiplist, PVOID Element); +BOOL InsertTailElementSkiplist(PSKIPLIST Skiplist, PVOID Element); +PVOID DeleteElementSkiplist(PSKIPLIST Skiplist, PVOID Element); +PVOID LookupElementSkiplist(PSKIPLIST Skiplist, PVOID Element, PDWORD ElementIndex); + +#endif Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c (added) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c [iso-8859-1] Fri Jun 19 10:27:46 2015 @@ -0,0 +1,93 @@ +/* + * PROJECT: Skiplist implementation for the ReactOS Project + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: A simple program for testing the Skiplist implementation + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <windows.h> +#include <stdio.h> +#include "skiplist.h" + +void +DumpSkiplist(PSKIPLIST Skiplist) +{ + CHAR i; + DWORD j; + PSKIPLIST_NODE pNode; + + printf("======= DUMPING SKIPLIST =======\n"); + + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + pNode = &Skiplist->Head; + printf("H"); + + while (pNode->Next[i]) + { + printf("-"); + + // By using the Distance array for painting the lines, we verify both the links and the distances for correctness. + for (j = 1; j < pNode->Distance[i]; j++) + printf("---"); + + printf("%02lu", (DWORD)pNode->Next[i]->Element); + + pNode = pNode->Next[i]; + } + + printf("\n"); + } + + printf("================================\n\n"); +} + +PVOID WINAPI +MyAlloc(DWORD Size) +{ + return HeapAlloc(GetProcessHeap(), 0, Size); +} + +int WINAPI +MyCompare(PVOID A, PVOID B) +{ + return (DWORD)A - (DWORD)B; +} + +void WINAPI +MyFree(PVOID Ptr) +{ + HeapFree(GetProcessHeap(), 0, Ptr); +} + +int +main() +{ + DWORD Element; + DWORD ElementIndex; + DWORD i; + SKIPLIST Skiplist; + + system("mode con cols=300"); + InitializeSkiplist(&Skiplist, MyAlloc, MyCompare, MyFree); + + // Insert some random elements with random numbers. + for (i = 0; i < 40; i++) + InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + + // Delete all with index 0 to 29. + for (i = 0; i < 30; i++) + DeleteElementSkiplist(&Skiplist, (PVOID)i); + + // Insert some more random elements. + for (i = 0; i < 40; i++) + InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + + // Check if an element with number 44 is in the list and output its index. + Element = (DWORD)LookupElementSkiplist(&Skiplist, (PVOID)44, &ElementIndex); + printf("Element = %lu, ElementIndex = %lu\n\n", Element, ElementIndex); + + DumpSkiplist(&Skiplist); + + return 0; +} Propchange: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 4 months

[tfaber] 68190: [WIN32K:NTUSER] - Restructure co_UserProcessHotKeys to correctly process modifier-only hotkeys. Fixes start menu opening after Win+X shortcuts, and probably several other hotkey-rel...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 18 15:45:32 2015 New Revision: 68190 URL: http://svn.reactos.org/svn/reactos?rev=68190&view=rev Log: [WIN32K:NTUSER] - Restructure co_UserProcessHotKeys to correctly process modifier-only hotkeys. Fixes start menu opening after Win+X shortcuts, and probably several other hotkey-related issues. Thanks to reactosfanboy. CORE-9728 #resolve Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Thu Jun 18 15:45:32 2015 @@ -36,7 +36,7 @@ // HOT_KEY hkWinKey = {NULL, 1, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; PHOT_KEY gphkFirst = NULL; -BOOL bWinHotkeyActive = FALSE; +UINT gfsModOnlyCandidate; /* FUNCTIONS *****************************************************************/ @@ -180,18 +180,47 @@ PHOT_KEY pHotKey; PWND pWnd; BOOL DoNotPostMsg = FALSE; + BOOL IsModifier = FALSE; if (wVk == VK_SHIFT || wVk == VK_CONTROL || wVk == VK_MENU || wVk == VK_LWIN || wVk == VK_RWIN) { - /* Those keys are specified by modifiers */ - wVk = 0; + /* Remember that this was a modifier */ + IsModifier = TRUE; } fModifiers = IntGetModifiers(gafAsyncKeyState); - /* Check if it is a hotkey */ - pHotKey = IsHotKey(fModifiers, wVk); + if (bIsDown) + { + if (IsModifier) + { + /* Modifier key down -- no hotkey trigger, but remember this */ + gfsModOnlyCandidate = fModifiers; + return FALSE; + } + else + { + /* Regular key down -- check for hotkey, and reset mod candidates */ + pHotKey = IsHotKey(fModifiers, wVk); + gfsModOnlyCandidate = 0; + } + } + else + { + if (IsModifier) + { + /* Modifier key up -- modifier-only keys are triggered here */ + pHotKey = IsHotKey(gfsModOnlyCandidate, 0); + gfsModOnlyCandidate = 0; + } + else + { + /* Regular key up -- no hotkey, but reset mod-only candidates */ + gfsModOnlyCandidate = 0; + return FALSE; + } + } if (pHotKey) { @@ -208,71 +237,53 @@ return DoNotPostMsg; } - /* Process hotkey if it is key up event */ - if (!bIsDown) - { - /* WIN and F12 keys are not hardcoded here. See comments on top of this file. */ - if (pHotKey->id == IDHK_WINKEY && bWinHotkeyActive) + /* WIN and F12 keys are not hardcoded here. See comments on top of this file. */ + if (pHotKey->id == IDHK_WINKEY) + { + ASSERT(!bIsDown); + pWnd = ValidateHwndNoErr(InputWindowStation->ShellWindow); + if (pWnd) { - pWnd = ValidateHwndNoErr(InputWindowStation->ShellWindow); - if (pWnd) - { - TRACE("System Hot key Id %d Key %u\n", pHotKey->id, wVk ); - UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); - co_IntShellHookNotify(HSHELL_TASKMAN, 0, 0); - bWinHotkeyActive = FALSE; - return FALSE; - } - } - } - else - { /* The user pressed the win key */ - if (pHotKey->id == IDHK_WINKEY) - { - bWinHotkeyActive = TRUE; + TRACE("System Hot key Id %d Key %u\n", pHotKey->id, wVk ); + UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); + co_IntShellHookNotify(HSHELL_TASKMAN, 0, 0); return FALSE; } } - if (bIsDown) - { - if (!pHotKey->pWnd) + if (!pHotKey->pWnd) + { + TRACE("UPTM Hot key Id %d Key %u\n", pHotKey->id, wVk ); + UserPostThreadMessage(pHotKey->pti, WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); + //ptiLastInput = pHotKey->pti; + return TRUE; /* Don't send any message */ + } + else + { + pWnd = pHotKey->pWnd; + if (pWnd == PWND_BOTTOM) { - TRACE("UPTM Hot key Id %d Key %u\n", pHotKey->id, wVk ); - UserPostThreadMessage(pHotKey->pti, WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); - //ptiLastInput = pHotKey->pti; - return TRUE; /* Don't send any message */ + if (gpqForeground == NULL) + return FALSE; + + pWnd = gpqForeground->spwndFocus; } - else + + if (pWnd) { - if (pHotKey->pWnd == PWND_BOTTOM) - { - if (gpqForeground != NULL) - { - pWnd = gpqForeground->spwndFocus; - } - else - return FALSE; + // pWnd->head.rpdesk->pDeskInfo->spwndShell needs testing. + if (pWnd == ValidateHwndNoErr(InputWindowStation->ShellWindow) && pHotKey->id == SC_TASKLIST) + { + UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); + co_IntShellHookNotify(HSHELL_TASKMAN, 0, 0); } else { - pWnd = pHotKey->pWnd; + TRACE("UPM Hot key Id %d Key %u\n", pHotKey->id, wVk ); + UserPostMessage(UserHMGetHandle(pWnd), WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); } - if (pWnd) - { // pWnd->head.rpdesk->pDeskInfo->spwndShell needs testing. - if (pWnd == ValidateHwndNoErr(InputWindowStation->ShellWindow) && pHotKey->id == SC_TASKLIST) - { - ERR("Sending to shell window w/o IDHK_WINKEY..\n"); - UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); - } - else - { - TRACE("UPM Hot key Id %d Key %u\n", pHotKey->id, wVk ); - UserPostMessage(UserHMGetHandle(pWnd), WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); - } - //ptiLastInput = pWnd->head.pti; - return TRUE; /* Don't send any message */ - } + //ptiLastInput = pWnd->head.pti; + return TRUE; /* Don't send any message */ } } }

9 years, 4 months

[tfaber] 68189: [USER32_APITEST] - Arch, will you stop only testing your code with MSVC?!

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 18 14:02:55 2015 New Revision: 68189 URL: http://svn.reactos.org/svn/reactos?rev=68189&view=rev Log: [USER32_APITEST] - Arch, will you stop only testing your code with MSVC?! Modified: trunk/rostests/apitests/user32/RegisterHotKey.c Modified: trunk/rostests/apitests/user32/RegisterHotKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RegisterH… ============================================================================== --- trunk/rostests/apitests/user32/RegisterHotKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RegisterHotKey.c [iso-8859-1] Thu Jun 18 14:02:55 2015 @@ -30,7 +30,7 @@ if (msg.message == WM_HOTKEY) hotkey_count++; \ DispatchMessageW(&msg); \ } \ - ok(hotkey_count == 1, "Received %d WM_HOTKEY messages, expected 1\n"); \ + ok(hotkey_count == 1, "Received %d WM_HOTKEY messages, expected 1\n", hotkey_count); \ } while (0) #define msg_no_hotkey(msg) do \ { \

9 years, 4 months

[tfaber] 68188: [USER32_APITEST] - Fail if we get too many WM_HOTKEY messages CORE-9728

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 18 13:59:51 2015 New Revision: 68188 URL: http://svn.reactos.org/svn/reactos?rev=68188&view=rev Log: [USER32_APITEST] - Fail if we get too many WM_HOTKEY messages CORE-9728 Modified: trunk/rostests/apitests/user32/RegisterHotKey.c Modified: trunk/rostests/apitests/user32/RegisterHotKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RegisterH… ============================================================================== --- trunk/rostests/apitests/user32/RegisterHotKey.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RegisterHotKey.c [iso-8859-1] Thu Jun 18 13:59:51 2015 @@ -23,14 +23,14 @@ #define expect_hotkey(id, mod, vk) do \ { \ MSG msg; \ - BOOL got_hotkey = FALSE; \ + int hotkey_count = 0; \ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) \ { \ msg_hotkey(&msg, id, mod, vk); \ - if (msg.message == WM_HOTKEY) got_hotkey = TRUE; \ + if (msg.message == WM_HOTKEY) hotkey_count++; \ DispatchMessageW(&msg); \ } \ - ok(got_hotkey, "Did not receive expected WM_HOTKEY message\n"); \ + ok(hotkey_count == 1, "Received %d WM_HOTKEY messages, expected 1\n"); \ } while (0) #define msg_no_hotkey(msg) do \ { \

9 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
35
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 June 2015