Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[ekohl] 68307: [USETUP] Restrict valid characters of the install path to: - Letters - Digits - Dots (.) - Backslashes (\) - Dashes (-) - Underscores (_) CORE-6179 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 28 19:06:07 2015 New Revision: 68307 URL: http://svn.reactos.org/svn/reactos?rev=68307&view=rev Log: [USETUP] Restrict valid characters of the install path to: - Letters - Digits - Dots (.) - Backslashes (\) - Dashes (-) - Underscores (_) CORE-6179 #resolve Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jun 28 19:06:07 2015 @@ -3080,6 +3080,7 @@ PDISKENTRY DiskEntry; PPARTENTRY PartEntry; WCHAR InstallDir[51]; + WCHAR c; ULONG Length; /* We do not need the filsystem list any more */ @@ -3157,10 +3158,14 @@ { if (Length < 50) { - InstallDir[Length] = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; - Length++; - InstallDir[Length] = 0; - CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + c = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; + if (iswalpha(c) || iswdigit(c) || c == '.' || c == '\\' || c == '-' || c == '_') + { + InstallDir[Length] = c; + Length++; + InstallDir[Length] = 0; + CONSOLE_SetInputTextXY(8, 11, 51, InstallDir); + } } } }

9 years, 5 months

[hbelusca] 68306: [NTOS] - Do not forget to initialize LoadDll->NamePointer in DbgkMapViewOfSection!! - Just copy the NamePointer (pointer to pointer to file name) in DbgUiConvertStateChangeStructu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 28 18:52:51 2015 New Revision: 68306 URL: http://svn.reactos.org/svn/reactos?rev=68306&view=rev Log: [NTOS] - Do not forget to initialize LoadDll->NamePointer in DbgkMapViewOfSection!! - Just copy the NamePointer (pointer to pointer to file name) in DbgUiConvertStateChangeStructure. See the description of the lpImageName member of the LOAD_DLL_DEBUG_INFO structure in https://msdn.microsoft.com/en-us/library/windows/desktop/ms680351(v=vs.85).… for more details. This fixes some debugging stuff with GDB (see the below-mentioned report). Adapted from a patch by andy-123 (whom I don't remember his name^^), CORE-7019 #resolve #comment Fixed in r68306 CORE-8622 #comment An updated fix was committed in r68306 Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c trunk/reactos/ntoskrnl/dbgk/dbgkutil.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Sun Jun 28 18:52:51 2015 @@ -62,13 +62,8 @@ OUT PVOID Win32DebugEvent) { NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; THREAD_BASIC_INFORMATION ThreadBasicInfo; LPDEBUG_EVENT DebugEvent = Win32DebugEvent; - HANDLE ThreadHandle; - HANDLE ProcessHandle; - PTEB Teb; - PVOID Pointer; /* Write common data */ DebugEvent->dwProcessId = (DWORD)WaitStateChange-> @@ -80,7 +75,7 @@ { /* New thread */ case DbgCreateThreadStateChange: - + { /* Setup Win32 code */ DebugEvent->dwDebugEventCode = CREATE_THREAD_DEBUG_EVENT; @@ -109,10 +104,11 @@ ThreadBasicInfo.TebBaseAddress; } break; + } /* New process */ case DbgCreateProcessStateChange: - + { /* Write Win32 debug code */ DebugEvent->dwDebugEventCode = CREATE_PROCESS_DEBUG_EVENT; @@ -160,30 +156,33 @@ DebugEvent->u.CreateProcessInfo.lpImageName = NULL; DebugEvent->u.CreateProcessInfo.fUnicode = TRUE; break; + } /* Thread exited */ case DbgExitThreadStateChange: - + { /* Write the Win32 debug code and the exit status */ DebugEvent->dwDebugEventCode = EXIT_THREAD_DEBUG_EVENT; DebugEvent->u.ExitThread.dwExitCode = WaitStateChange->StateInfo.ExitThread.ExitStatus; break; + } /* Process exited */ case DbgExitProcessStateChange: - + { /* Write the Win32 debug code and the exit status */ DebugEvent->dwDebugEventCode = EXIT_PROCESS_DEBUG_EVENT; DebugEvent->u.ExitProcess.dwExitCode = WaitStateChange->StateInfo.ExitProcess.ExitStatus; break; + } /* Any sort of exception */ case DbgExceptionStateChange: case DbgBreakpointStateChange: case DbgSingleStepStateChange: - + { /* Check if this was a debug print */ if (WaitStateChange->StateInfo.Exception.ExceptionRecord. ExceptionCode == DBG_PRINTEXCEPTION_C) @@ -225,84 +224,40 @@ WaitStateChange->StateInfo.Exception.FirstChance; } break; + } /* DLL Load */ case DbgLoadDllStateChange: - + { /* Set the Win32 debug code */ DebugEvent->dwDebugEventCode = LOAD_DLL_DEBUG_EVENT; /* Copy the rest of the data */ + DebugEvent->u.LoadDll.hFile = + WaitStateChange->StateInfo.LoadDll.FileHandle; DebugEvent->u.LoadDll.lpBaseOfDll = WaitStateChange->StateInfo.LoadDll.BaseOfDll; - DebugEvent->u.LoadDll.hFile = - WaitStateChange->StateInfo.LoadDll.FileHandle; DebugEvent->u.LoadDll.dwDebugInfoFileOffset = WaitStateChange->StateInfo.LoadDll.DebugInfoFileOffset; DebugEvent->u.LoadDll.nDebugInfoSize = WaitStateChange->StateInfo.LoadDll.DebugInfoSize; - - /* Open the thread */ - InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); - Status = NtOpenThread(&ThreadHandle, - THREAD_QUERY_INFORMATION, - &ObjectAttributes, - &WaitStateChange->AppClientId); - if (NT_SUCCESS(Status)) - { - /* Query thread information */ - Status = NtQueryInformationThread(ThreadHandle, - ThreadBasicInformation, - &ThreadBasicInfo, - sizeof(ThreadBasicInfo), - NULL); - NtClose(ThreadHandle); - } - - /* If we got thread information, open the process */ - if (NT_SUCCESS(Status)) - { - Status = NtOpenProcess(&ProcessHandle, - PROCESS_VM_READ, - &ObjectAttributes, - &WaitStateChange->AppClientId); - } - - if (NT_SUCCESS(Status)) - { - /* Read the image name from the TIB */ - Teb = ThreadBasicInfo.TebBaseAddress; - Status = NtReadVirtualMemory(ProcessHandle, - &Teb->NtTib.ArbitraryUserPointer, - &Pointer, - sizeof(Pointer), - NULL); - NtClose(ProcessHandle); - } - - if (NT_SUCCESS(Status)) - { - /* If everything was successful, set the image name */ - DebugEvent->u.LoadDll.lpImageName = Pointer; - } - else - { - /* Otherwise, no name */ - DebugEvent->u.LoadDll.lpImageName = NULL; - } + DebugEvent->u.LoadDll.lpImageName = + WaitStateChange->StateInfo.LoadDll.NamePointer; /* It's Unicode */ DebugEvent->u.LoadDll.fUnicode = TRUE; break; + } /* DLL Unload */ case DbgUnloadDllStateChange: - + { /* Set Win32 code and DLL Base */ DebugEvent->dwDebugEventCode = UNLOAD_DLL_DEBUG_EVENT; DebugEvent->u.UnloadDll.lpBaseOfDll = WaitStateChange->StateInfo.UnloadDll.BaseAddress; break; + } /* Anything else, fail */ default: return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] Sun Jun 28 18:52:51 2015 @@ -405,6 +405,7 @@ LoadDll->BaseOfDll = BaseAddress; LoadDll->DebugInfoFileOffset = 0; LoadDll->DebugInfoSize = 0; + LoadDll->NamePointer = &NtCurrentTeb()->NtTib.ArbitraryUserPointer; /* Get the NT Headers */ NtHeader = RtlImageNtHeader(BaseAddress);

9 years, 5 months

[cwittich] 68305: [BROWSEUI] don't expose some interfaces expose IID_IContextMenu3 from CBandSiteMenu

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 28 18:22:02 2015 New Revision: 68305 URL: http://svn.reactos.org/svn/reactos?rev=68305&view=rev Log: [BROWSEUI] don't expose some interfaces expose IID_IContextMenu3 from CBandSiteMenu Modified: trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/addresseditbox.h trunk/reactos/dll/win32/browseui/bandsitemenu.h trunk/reactos/dll/win32/browseui/internettoolbar.h Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Sun Jun 28 18:22:02 2015 @@ -136,6 +136,5 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] Sun Jun 28 18:22:02 2015 @@ -97,7 +97,6 @@ COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] Sun Jun 28 18:22:02 2015 @@ -55,6 +55,7 @@ BEGIN_COM_MAP(CBandSiteMenu) COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sun Jun 28 18:22:02 2015 @@ -228,7 +228,6 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) // COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) COM_INTERFACE_ENTRY_IID(IID_IPersistStreamInit, IPersistStreamInit) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) @@ -237,7 +236,5 @@ COM_INTERFACE_ENTRY_IID(IID_IShellChangeNotify, IShellChangeNotify) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) END_COM_MAP() };

9 years, 5 months

[cfinck] 68304: [LOCALSPL] - Partly implement LocalScheduleJob. - Set the default status to JOB_STATUS_SPOOLING in LocalAddJob. - Fix file sharing flags in ReadJobShadowFile and WriteJobShadowFile....

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jun 28 15:51:32 2015 New Revision: 68304 URL: http://svn.reactos.org/svn/reactos?rev=68304&view=rev Log: [LOCALSPL] - Partly implement LocalScheduleJob. - Set the default status to JOB_STATUS_SPOOLING in LocalAddJob. - Fix file sharing flags in ReadJobShadowFile and WriteJobShadowFile. [SPOOLSS, SPOOLSV, WINSPOOL] - Forward the newly implemented ScheduleJob call all the way down to localspl.dll. - Stub ReadPrinter. [WINPRINT] Implement a very simple RAW Print Processor that just takes the input and forwards it to the Print Monitor. This one doesn't even do pausing or multiple copies yet. The implementation includes: - Implemented ClosePrintProcessor, OpenPrintProcessor and PrintDocumentOnPrintProcessor (apart from the previously implemented EnumPrintProcessorDatatypesW). - Stubbed ControlPrintProcessor and GetPrintProcessorCapabilities. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/raw.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec 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 Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/jobs.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -26,6 +26,12 @@ } BOOL WINAPI +ScheduleJob(HANDLE hPrinter, DWORD dwJobID) +{ + return LocalSplFuncs.fpScheduleJob(hPrinter, dwJobID); +} + +BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { return LocalSplFuncs.fpSetJob(hPrinter, JobId, Level, pJobInfo, Command); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/printers.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -50,6 +50,12 @@ return LocalSplFuncs.fpOpenPrinter(pPrinterName, phPrinter, pDefault); } +BOOL WINAPI +ReadPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pNoBytesRead) +{ + return FALSE; +} + DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -114,7 +114,7 @@ @ stub ProvidorFindClosePrinterChangeNotification @ stub ProvidorFindFirstPrinterChangeNotification @ stub pszDbgAllocMsgA -@ stub ReadPrinter +@ stdcall ReadPrinter(long ptr long ptr) @ stdcall ReallocSplMem(ptr long long) @ stdcall ReallocSplStr(ptr ptr) @ stub RemoteFindFirstPrinterChangeNotification @@ -132,7 +132,7 @@ @ stub RouterFreePrinterNotifyInfo @ stub RouterRefreshPrinterChangeNotification @ stub RouterReplyPrinter -@ stub ScheduleJob +@ stdcall ScheduleJob(long long) @ stub SeekPrinter @ stub SendRecvBidiData @ stub SetAllocFailCount Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolsv/jobs.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -139,8 +139,20 @@ DWORD _RpcScheduleJob(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD JobId) { - UNIMPLEMENTED; - return ERROR_INVALID_FUNCTION; + DWORD dwErrorCode; + + dwErrorCode = RpcImpersonateClient(NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RpcImpersonateClient failed with error %lu!\n", dwErrorCode); + return dwErrorCode; + } + + ScheduleJob(hPrinter, JobId); + dwErrorCode = GetLastError(); + + RpcRevertToSelf(); + return dwErrorCode; } DWORD Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/jobs.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -164,6 +164,27 @@ } BOOL WINAPI +ScheduleJob(HANDLE hPrinter, DWORD dwJobID) +{ + DWORD dwErrorCode; + + // Do the RPC call + RpcTryExcept + { + dwErrorCode = _RpcScheduleJob(hPrinter, dwJobID); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwErrorCode = RpcExceptionCode(); + ERR("_RpcSetJob failed with exception code %lu!\n", dwErrorCode); + } + RpcEndExcept; + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI SetJobA(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) { UNIMPLEMENTED; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/printers.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -212,6 +212,12 @@ return bReturnValue; } +BOOL WINAPI +ReadPrinter(HANDLE hPrinter, PVOID pBuf, DWORD cbBuf, PDWORD pNoBytesRead) +{ + return FALSE; +} + DWORD WINAPI StartDocPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pDocInfo) { Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/winspool.spec [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -168,10 +168,10 @@ 267 stub QueryColorProfile 268 stub QueryRemoteFonts 269 stub QuerySpoolMode -270 stub ReadPrinter +270 stdcall ReadPrinter(long ptr long ptr) 271 stub ResetPrinterA 272 stub ResetPrinterW -273 stub ScheduleJob +273 stdcall ScheduleJob(long long) 274 stub SeekPrinter 275 stub SetAllocFailCount 276 stub SetFormA Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/CMakeLists.txt [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -3,12 +3,12 @@ list(APPEND SOURCE main.c + raw.c precomp.h) add_library(winprint SHARED ${SOURCE} winprint.rc - ${CMAKE_CURRENT_BINARY_DIR}/winprint_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/winprint.def) set_module_type(winprint win32dll UNICODE) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -7,11 +7,69 @@ #include "precomp.h" -PCWSTR pwszDatatypes[] = { +// Local Constants +static PCWSTR _pwszDatatypes[] = { L"RAW", 0 }; + +/** + * @name ClosePrintProcessor + * + * Closes a Print Processor Handle that has previously been opened through OpenPrintProcessor. + * + * @param hPrintProcessor + * The return value of a previous successful OpenPrintProcessor call. + * + * @return + * TRUE if the Print Processor Handle was successfully closed, FALSE otherwise. + * A more specific error code can be obtained through GetLastError. + */ +BOOL WINAPI +ClosePrintProcessor(HANDLE hPrintProcessor) +{ + DWORD dwErrorCode; + PWINPRINT_HANDLE pHandle; + + // Sanity checks + if (!hPrintProcessor) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pHandle = (PWINPRINT_HANDLE)hPrintProcessor; + + // Free all structure fields for which memory has been allocated. + if (pHandle->pwszDatatype) + DllFreeSplStr(pHandle->pwszDatatype); + + if (pHandle->pwszDocumentName) + DllFreeSplStr(pHandle->pwszDocumentName); + + if (pHandle->pwszOutputFile) + DllFreeSplStr(pHandle->pwszOutputFile); + + if (pHandle->pwszPrinterPort) + DllFreeSplStr(pHandle->pwszPrinterPort); + + // Finally free the WINSPOOL_HANDLE structure itself. + DllFreeSplMem(pHandle); + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +ControlPrintProcessor(HANDLE hPrintProcessor, DWORD Command) +{ + UNIMPLEMENTED; + return FALSE; +} + /** * @name EnumPrintProcessorDatatypesW * @@ -50,7 +108,7 @@ { DWORD cbDatatype; DWORD dwErrorCode; - DWORD dwOffsets[_countof(pwszDatatypes)]; + DWORD dwOffsets[_countof(_pwszDatatypes)]; PCWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; @@ -65,7 +123,7 @@ *pcbNeeded = 0; *pcReturned = 0; - for (pCurrentDatatype = pwszDatatypes; *pCurrentDatatype; pCurrentDatatype++) + for (pCurrentDatatype = _pwszDatatypes; *pCurrentDatatype; pCurrentDatatype++) { cbDatatype = (wcslen(*pCurrentDatatype) + 1) * sizeof(WCHAR); *pcbNeeded += sizeof(DATATYPES_INFO_1W) + cbDatatype; @@ -93,7 +151,7 @@ // Copy over all datatypes. *pCurrentOffset = MAXDWORD; - PackStrings(pwszDatatypes, pDatatypes, dwOffsets, &pDatatypes[*pcbNeeded]); + PackStrings(_pwszDatatypes, pDatatypes, dwOffsets, &pDatatypes[*pcbNeeded]); dwErrorCode = ERROR_SUCCESS; @@ -101,3 +159,114 @@ SetLastError(dwErrorCode); return (dwErrorCode == ERROR_SUCCESS); } + + +DWORD WINAPI +GetPrintProcessorCapabilities(PWSTR pValueName, DWORD dwAttributes, PBYTE pData, DWORD nSize, PDWORD pcbNeeded) +{ + UNIMPLEMENTED; + return 0; +} + +/** + * @name OpenPrintProcessor + * + * Prepares this Print Processor for processing a document. + * + * @param pPrinterName + * String in the format "\\COMPUTERNAME\Port:, Port" that is passed to OpenPrinterW for writing to the Print Monitor on the specified port. + * + * @param pPrintProcessorOpenData + * Pointer to a PRINTPROCESSOROPENDATA structure containing details about the print job to be processed. + * + * @return + * A Print Processor handle on success or NULL in case of a failure. This handle has to be passed to PrintDocumentOnPrintProcessor to do the actual processing. + * A more specific error code can be obtained through GetLastError. + */ +HANDLE WINAPI +OpenPrintProcessor(PWSTR pPrinterName, PPRINTPROCESSOROPENDATA pPrintProcessorOpenData) +{ + DWORD dwErrorCode; + HANDLE hReturnValue = NULL; + PWINPRINT_HANDLE pHandle = NULL; + + // Sanity checks + // This time a datatype needs to be given. We can't fall back to a default here. + if (!pPrintProcessorOpenData || !pPrintProcessorOpenData->pDatatype || !*pPrintProcessorOpenData->pDatatype) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Create a new WINPRINT_HANDLE structure. and fill the relevant fields. + pHandle = DllAllocSplMem(sizeof(WINPRINT_HANDLE)); + + // Check what datatype was given. + if (wcsicmp(pPrintProcessorOpenData->pDatatype, L"RAW") == 0) + { + pHandle->Datatype = RAW; + } + else + { + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; + } + + // Fill the relevant fields. + pHandle->dwJobID = pPrintProcessorOpenData->JobId; + pHandle->pwszDatatype = AllocSplStr(pPrintProcessorOpenData->pDatatype); + pHandle->pwszDocumentName = AllocSplStr(pPrintProcessorOpenData->pDocumentName); + pHandle->pwszOutputFile = AllocSplStr(pPrintProcessorOpenData->pOutputFile); + pHandle->pwszPrinterPort = AllocSplStr(pPrintProcessorOpenData->pPrinterName); + + // We were successful! Return the handle and don't let the cleanup routine free it. + dwErrorCode = ERROR_SUCCESS; + hReturnValue = pHandle; + pHandle = NULL; + +Cleanup: + if (pHandle) + DllFreeSplMem(pHandle); + + SetLastError(dwErrorCode); + return hReturnValue; +} + +/** + * @name PrintDocumentOnPrintProcessor + * + * Prints a document on this Print Processor after a handle for the document has been opened through OpenPrintProcessor. + * + * @param hPrintProcessor + * The return value of a previous successful OpenPrintProcessor call. + * + * @param pDocumentName + * String in the format "Printer, Job N" describing the spooled job that is to be processed. + * + * @return + * TRUE if the document was successfully processed by this Print Processor, FALSE otherwise. + * A more specific error code can be obtained through GetLastError. + */ +BOOL WINAPI +PrintDocumentOnPrintProcessor(HANDLE hPrintProcessor, PWSTR pDocumentName) +{ + DWORD dwErrorCode; + PWINPRINT_HANDLE pHandle; + + // Sanity checks + if (!hPrintProcessor) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pHandle = (PWINPRINT_HANDLE)hPrintProcessor; + + // Call the corresponding Print function for the datatype. + if (pHandle->Datatype == RAW) + dwErrorCode = PrintRawJob(pHandle, pDocumentName); + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/precomp.h [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -22,4 +22,19 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winprint); +// Structures +typedef struct _WINPRINT_HANDLE +{ + enum { RAW } Datatype; + DWORD dwJobID; + PWSTR pwszDatatype; + PWSTR pwszDocumentName; + PWSTR pwszOutputFile; + PWSTR pwszPrinterPort; +} +WINPRINT_HANDLE, *PWINPRINT_HANDLE; + +// raw.c +DWORD PrintRawJob(PWINPRINT_HANDLE pHandle, PWSTR pwszPrinterAndJob); + #endif Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/raw.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/raw.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/raw.c [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS Standard Print Processor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Printing a job with RAW datatype + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * @name PrintRawJob + * + * @param pHandle + * Pointer to a WINPRINT_HANDLE structure containing information about this job. + * + * @param pwszPrinterAndJob + * String in the format "Printer, Job N" that is passed to OpenPrinterW to read from the spooled print job. + * + * @return + * An error code indicating success or failure. + */ +DWORD +PrintRawJob(PWINPRINT_HANDLE pHandle, PWSTR pwszPrinterAndJob) +{ + // Use a read buffer of 256 KB size like Windows does. + const DWORD cbReadBuffer = 262144; + + BOOL bStartedDoc = FALSE; + DOC_INFO_1W DocInfo1; + DWORD cbRead; + DWORD cbWritten; + DWORD dwErrorCode; + HANDLE hPrintJob; + HANDLE hPrintMonitor; + PBYTE pBuffer = NULL; + + // Open the spooled job to read from it. + if (!OpenPrinterW(pwszPrinterAndJob, &hPrintJob, NULL)) + { + dwErrorCode = GetLastError(); + ERR("OpenPrinterW failed for \"%S\" with error %lu!\n", pwszPrinterAndJob, GetLastError()); + goto Cleanup; + } + + // Open a Print Monitor handle to write to it. + if (!OpenPrinterW(pHandle->pwszPrinterPort, &hPrintMonitor, NULL)) + { + dwErrorCode = GetLastError(); + ERR("OpenPrinterW failed for \"%S\" with error %lu!\n", pHandle->pwszPrinterPort, GetLastError()); + goto Cleanup; + } + + // Fill the Document Information. + DocInfo1.pDatatype = pHandle->pwszDatatype; + DocInfo1.pDocName = pHandle->pwszDocumentName; + DocInfo1.pOutputFile = pHandle->pwszOutputFile; + + // Tell the Print Monitor that we're starting a new document. + if (!StartDocPrinterW(hPrintMonitor, 1, (PBYTE)&DocInfo1)) + { + dwErrorCode = GetLastError(); + ERR("StartDocPrinterW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + bStartedDoc = TRUE; + + // Allocate a read buffer on the heap. This would easily exceed the stack size. + pBuffer = DllAllocSplMem(cbReadBuffer); + if (!pBuffer) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Loop as long as data is available. + while (ReadPrinter(hPrintJob, pBuffer, cbReadBuffer, &cbRead) && cbRead) + { + // Write it to the Print Monitor. + WritePrinter(hPrintMonitor, pBuffer, cbRead, &cbWritten); + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (pBuffer) + DllFreeSplMem(pBuffer); + + if (bStartedDoc) + EndDocPrinter(hPrintMonitor); + + if (hPrintMonitor) + ClosePrinter(hPrintMonitor); + + if (hPrintJob) + ClosePrinter(hPrintJob); + + return dwErrorCode; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/raw.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/winprint.spec [iso-8859-1] Sun Jun 28 15:51:32 2015 @@ -1,6 +1,6 @@ -@ stub ClosePrintProcessor -@ stub ControlPrintProcessor +@ stdcall ClosePrintProcessor(long) +@ stdcall ControlPrintProcessor(long long) @ stdcall EnumPrintProcessorDatatypesW(ptr ptr long ptr long ptr ptr) -@ stub GetPrintProcessorCapabilities -@ stub OpenPrintProcessor -@ stub PrintDocumentOnPrintProcessor +@ stdcall GetPrintProcessorCapabilities(wstr long ptr long ptr) +@ stdcall OpenPrintProcessor(wstr ptr) +@ stdcall PrintDocumentOnPrintProcessor(long wstr) 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] Sun Jun 28 15:51:32 2015 @@ -267,6 +267,7 @@ pJob->pPrinter = pPrinterHandle->pPrinter; pJob->pPrintProcessor = pPrinterHandle->pPrinter->pPrintProcessor; pJob->dwPriority = DEF_PRIORITY; + pJob->dwStatus = JOB_STATUS_SPOOLING; pJob->pwszDatatype = AllocSplStr(pPrinterHandle->pwszDatatype); pJob->pwszDocumentName = AllocSplStr(wszDefaultDocumentName); CopyMemory(&pJob->DevMode, &pPrinterHandle->DevMode, sizeof(DEVMODEW)); @@ -986,6 +987,65 @@ return (dwErrorCode == ERROR_SUCCESS); } +BOOL WINAPI +LocalScheduleJob(HANDLE hPrinter, DWORD dwJobID) +{ + const WCHAR wszFolder[] = L"\\PRINTERS\\"; + const DWORD cchFolder = _countof(wszFolder) - 1; + + DWORD dwAttributes; + DWORD dwErrorCode; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + WCHAR wszFullPath[MAX_PATH]; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Check if the Job ID is valid. + pJob = LookupElementSkiplist(&GlobalJobList, &dwJobID, NULL); + if (!pJob || pJob->pPrinter != pPrinterHandle->pPrinter) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Construct the full path to the spool file. + CopyMemory(wszFullPath, wszSpoolDirectory, cchSpoolDirectory * sizeof(WCHAR)); + CopyMemory(&wszFullPath[cchSpoolDirectory], wszFolder, cchFolder * sizeof(WCHAR)); + swprintf(&wszFullPath[cchSpoolDirectory + cchFolder], L"%05lu.SPL", dwJobID); + + // Check if it exists. + dwAttributes = GetFileAttributesW(wszFullPath); + if (dwAttributes == INVALID_FILE_ATTRIBUTES || dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + dwErrorCode = ERROR_SPOOL_FILE_NOT_FOUND; + goto Cleanup; + } + + // Switch from spooling to printing. + pJob->dwStatus &= ~JOB_STATUS_SPOOLING; + pJob->dwStatus |= JOB_STATUS_PRINTING; + + // Write the job data into the shadow file. + wcscpy(wcsrchr(wszFullPath, L'.'), L".SHD"); + WriteJobShadowFile(wszFullPath, pJob); + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath) { @@ -1001,7 +1061,7 @@ PWSTR pwszPrintProcessor; // Try to open the file. - hFile = CreateFileW(pwszFilePath, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + hFile = CreateFileW(pwszFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); @@ -1013,7 +1073,7 @@ pShadowFile = DllAllocSplMem(cbFileSize); if (!pShadowFile) { - ERR("DllAllocSplMem failed with error %lufor file \"%S\"!\n", GetLastError(), pwszFilePath); + ERR("DllAllocSplMem failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); goto Cleanup; } @@ -1110,7 +1170,7 @@ PSHD_HEADER pShadowFile = NULL; // Try to open the SHD file. - hSHDFile = CreateFileW(pwszFilePath, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL); + hSHDFile = CreateFileW(pwszFilePath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (hSHDFile == INVALID_HANDLE_VALUE) { ERR("CreateFileW failed with error %lu for file \"%S\"!\n", GetLastError(), pwszFilePath); 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] Sun Jun 28 15:51:32 2015 @@ -60,7 +60,7 @@ NULL, // fpReadPrinter LocalEndDocPrinter, // fpEndDocPrinter LocalAddJob, // fpAddJob - NULL, // fpScheduleJob + LocalScheduleJob, // fpScheduleJob NULL, // fpGetPrinterData NULL, // fpSetPrinterData NULL, // fpWaitForPrinterChange 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] Sun Jun 28 15:51:32 2015 @@ -48,8 +48,8 @@ // Structures /** -* Describes a Print Processor. -*/ + * Describes a Print Processor. + */ typedef struct _LOCAL_PRINT_PROCESSOR { LIST_ENTRY Entry; @@ -189,6 +189,7 @@ BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalScheduleJob(HANDLE hPrinter, DWORD dwJobID); BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PWSTR pwszFilePath, const PLOCAL_JOB pJob);

9 years, 5 months

[ekohl] 68303: [CMLIB] HvFree: - Free the BaseBlock. - Do not free the hive itself because the HHIVE is part of the CMHIVE structure and freeing it here could be an unpleasant surprise. [NTOSKRNL] ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 28 15:41:18 2015 New Revision: 68303 URL: http://svn.reactos.org/svn/reactos?rev=68303&view=rev Log: [CMLIB] HvFree: - Free the BaseBlock. - Do not free the hive itself because the HHIVE is part of the CMHIVE structure and freeing it here could be an unpleasant surprise. [NTOSKRNL] CmpDestroyHive: Free the CMHIVE after calling HvFree. CmUnloadKey: Free the hive storage, the hive locks and the CMHIVE properly. Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sun Jun 28 15:41:18 2015 @@ -529,6 +529,7 @@ * @name HvFree * * Free all stroage and handles associated with hive descriptor. + * But do not free the hive descriptor itself. */ VOID CMAPI @@ -544,9 +545,14 @@ } HvpFreeHiveBins(RegistryHive); - } - - RegistryHive->Free(RegistryHive, 0); + + /* Free the BaseBlock */ + if (RegistryHive->BaseBlock) + { + RegistryHive->Free(RegistryHive->BaseBlock, 0); + RegistryHive->BaseBlock = NULL; + } + } } /* EOF */ Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun Jun 28 15:41:18 2015 @@ -2241,7 +2241,20 @@ /* Remove the hive from the hive file list */ CmpRemoveFromHiveFileList(CmHive); - /* FIXME: Destroy the hive */ + /* FIXME: More cleanup */ + + /* Free the hive storage */ + HvFree(Hive); + + /* Delete the flusher lock */ + ExDeleteResourceLite(CmHive->FlusherLock); + ExFreePoolWithTag(CmHive->FlusherLock, TAG_CM); + + /* Delete the view lock */ + ExFreePoolWithTag(CmHive->ViewLock, TAG_CM); + + /* Free the hive */ + CmpFree(CmHive, TAG_CM); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sun Jun 28 15:41:18 2015 @@ -257,8 +257,11 @@ /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CM); + /* Free the hive storage */ + HvFree(&CmHive->Hive); + /* Free the hive */ - HvFree(&CmHive->Hive); + CmpFree(CmHive, TAG_CM); return STATUS_SUCCESS; }

9 years, 5 months

[pschweitzer] 68302: [NTFS] Implement support for NTFS $DATA streams: - The driver is now able to read various streams for a same file, using the same syntax as Windows. - This fixes to read (in ge...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 28 13:14:07 2015 New Revision: 68302 URL: http://svn.reactos.org/svn/reactos?rev=68302&view=rev Log: [NTFS] Implement support for NTFS $DATA streams: - The driver is now able to read various streams for a same file, using the same syntax as Windows. - This fixes to read (in general) files with multiple streams where reading unnamed stream was leading to read beyond file end - Also fix reading small files which are smaller than a sector For demo, see: http://www.heisspiter.net/~Pierre/rostests/NTFS_Streams.png Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Jun 28 13:14:07 2015 @@ -218,7 +218,7 @@ UNICODE_STRING Name; RtlInitUnicodeString(&Name, MftIdToName[MftId]); - Status = NtfsMakeFCBFromDirEntry(DeviceExt, NULL, &Name, MftRecord, MftId, &FCB); + Status = NtfsMakeFCBFromDirEntry(DeviceExt, NULL, &Name, NULL, MftRecord, MftId, &FCB); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(MftRecord, TAG_NTFS); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Jun 28 13:14:07 2015 @@ -65,6 +65,7 @@ PNTFS_FCB NtfsCreateFCB(PCWSTR FileName, + PCWSTR Stream, PNTFS_VCB Vcb) { PNTFS_FCB Fcb; @@ -91,6 +92,15 @@ { Fcb->ObjectName = Fcb->PathName; } + } + + if (Stream) + { + wcscpy(Fcb->Stream, Stream); + } + else + { + Fcb->Stream[0] = UNICODE_NULL; } ExInitializeResourceLite(&Fcb->MainResource); @@ -316,7 +326,7 @@ return NULL; } - Fcb = NtfsCreateFCB(L"\\", Vcb); + Fcb = NtfsCreateFCB(L"\\", NULL, Vcb); if (!Fcb) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -400,18 +410,19 @@ NTSTATUS NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, - PNTFS_FCB DirectoryFCB, - PUNICODE_STRING Name, - PFILE_RECORD_HEADER Record, + PNTFS_FCB DirectoryFCB, + PUNICODE_STRING Name, + PCWSTR Stream, + PFILE_RECORD_HEADER Record, ULONGLONG MFTIndex, - PNTFS_FCB * fileFCB) + PNTFS_FCB * fileFCB) { WCHAR pathName[MAX_PATH]; PFILENAME_ATTRIBUTE FileName; PSTANDARD_INFORMATION StdInfo; PNTFS_FCB rcFCB; - DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p)\n", Vcb, DirectoryFCB, Name, Record, fileFCB); + DPRINT1("NtfsMakeFCBFromDirEntry(%p, %p, %wZ, %p, %p, %p)\n", Vcb, DirectoryFCB, Name, Stream, Record, fileFCB); FileName = GetBestFileNameFromRecord(Record); if (!FileName) @@ -440,7 +451,7 @@ pathName[FileName->NameLength] = UNICODE_NULL; } - rcFCB = NtfsCreateFCB(pathName, Vcb); + rcFCB = NtfsCreateFCB(pathName, Stream, Vcb); if (!rcFCB) { return STATUS_INSUFFICIENT_RESOURCES; @@ -531,6 +542,8 @@ UNICODE_STRING File; PFILE_RECORD_HEADER FileRecord; ULONGLONG MFTIndex; + PWSTR Colon; + USHORT Length = 0; DPRINT1("NtfsDirFindFile(%p, %p, %S, %p)\n", Vcb, DirectoryFcb, FileToFind, FoundFCB); @@ -538,13 +551,29 @@ RtlInitUnicodeString(&File, FileToFind); CurrentDir = DirectoryFcb->MFTIndex; + Colon = wcsrchr(FileToFind, L':'); + if (Colon != NULL) + { + Length = File.Length; + File.Length = (Colon - FileToFind) * sizeof(WCHAR); + + /* Skip colon */ + ++Colon; + DPRINT1("Will now look for file '%wZ' with stream '%S'\n", &File, Colon); + } + Status = NtfsLookupFileAt(Vcb, &File, &FileRecord, &MFTIndex, CurrentDir); if (!NT_SUCCESS(Status)) { return Status; } - Status = NtfsMakeFCBFromDirEntry(Vcb, DirectoryFcb, &File, FileRecord, MFTIndex, FoundFCB); + if (Length != 0) + { + File.Length = Length; + } + + Status = NtfsMakeFCBFromDirEntry(Vcb, DirectoryFcb, &File, Colon, FileRecord, MFTIndex, FoundFCB); ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Jun 28 13:14:07 2015 @@ -352,7 +352,7 @@ VolumeNameU = L"\0"; } - VolumeFcb = NtfsCreateFCB(VolumeNameU, DeviceExt); + VolumeFcb = NtfsCreateFCB(VolumeNameU, NULL, DeviceExt); if (VolumeFcb == NULL) { DPRINT1("Failed allocating volume FCB\n"); @@ -456,7 +456,7 @@ InitializeListHead(&Vcb->FcbListHead); - Fcb = NtfsCreateFCB(NULL, Vcb); + Fcb = NtfsCreateFCB(NULL, NULL, Vcb); if (Fcb == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Jun 28 13:14:07 2015 @@ -440,6 +440,7 @@ PFILE_OBJECT FileObject; PNTFS_VCB Vcb; + WCHAR Stream[MAX_PATH]; WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ WCHAR PathName[MAX_PATH]; /* path+filename 260 max */ @@ -586,6 +587,7 @@ PNTFS_FCB NtfsCreateFCB(PCWSTR FileName, + PCWSTR Stream, PNTFS_VCB Vcb); VOID @@ -649,6 +651,7 @@ NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, PNTFS_FCB DirectoryFCB, PUNICODE_STRING Name, + PCWSTR Stream, PFILE_RECORD_HEADER Record, ULONGLONG MFTIndex, PNTFS_FCB * fileFCB); Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun Jun 28 13:14:07 2015 @@ -57,6 +57,7 @@ ULONG ToRead; BOOLEAN AllocatedBuffer = FALSE; PCHAR ReadBuffer = (PCHAR)Buffer; + ULONGLONG StreamSize; DPRINT1("NtfsReadFile(%p, %p, %p, %u, %u, %x, %p)\n", DeviceExt, FileObject, Buffer, Length, ReadOffset, IrpFlags, LengthRead); @@ -70,33 +71,6 @@ Fcb = (PNTFS_FCB)FileObject->FsContext; - if (ReadOffset >= Fcb->Entry.AllocatedSize) - { - DPRINT1("Reading beyond file end!\n"); - return STATUS_END_OF_FILE; - } - - ToRead = Length; - if (ReadOffset + Length > Fcb->Entry.AllocatedSize) - ToRead = Fcb->Entry.AllocatedSize - ReadOffset; - - RealReadOffset = ReadOffset; - RealLength = ToRead; - - if ((ReadOffset % DeviceExt->NtfsInfo.BytesPerSector) != 0 || (ToRead % DeviceExt->NtfsInfo.BytesPerSector) != 0) - { - RealReadOffset = ROUND_DOWN(ReadOffset, DeviceExt->NtfsInfo.BytesPerSector); - RealLength = ROUND_UP(ToRead, DeviceExt->NtfsInfo.BytesPerSector); - - ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + DeviceExt->NtfsInfo.BytesPerSector, TAG_NTFS); - if (ReadBuffer == NULL) - { - DPRINT1("Not enough memory!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - AllocatedBuffer = TRUE; - } - FileRecord = ExAllocatePoolWithTag(NonPagedPool, DeviceExt->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (FileRecord == NULL) { @@ -120,12 +94,13 @@ return Status; } - Status = FindAttribute(DeviceExt, FileRecord, AttributeData, L"", 0, &DataContext); + + Status = FindAttribute(DeviceExt, FileRecord, AttributeData, Fcb->Stream, wcslen(Fcb->Stream), &DataContext); if (!NT_SUCCESS(Status)) { PNTFS_ATTR_RECORD Attribute; - DPRINT1("No unnamed data stream associated with file!\n"); + DPRINT1("No '%S' data stream associated with file!\n", Fcb->Stream); Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && @@ -135,7 +110,6 @@ { UNICODE_STRING Name; - ASSERT(Attribute->NameLength != 0); Name.Length = Attribute->NameLength * sizeof(WCHAR); Name.MaximumLength = Name.Length; Name.Buffer = (PWCHAR)((ULONG_PTR)Attribute + Attribute->NameOffset); @@ -145,17 +119,46 @@ Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } - ExFreePoolWithTag(FileRecord, TAG_NTFS); - if (AllocatedBuffer) - { - ExFreePoolWithTag(ReadBuffer, TAG_NTFS); - } + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } - DPRINT1("Effective read: %lu at %lu\n", RealLength, RealReadOffset); + StreamSize = AttributeDataLength(&DataContext->Record); + if (ReadOffset >= StreamSize) + { + DPRINT1("Reading beyond stream end!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_END_OF_FILE; + } + + ToRead = Length; + if (ReadOffset + Length > StreamSize) + ToRead = StreamSize - ReadOffset; + + RealReadOffset = ReadOffset; + RealLength = ToRead; + + if ((ReadOffset % DeviceExt->NtfsInfo.BytesPerSector) != 0 || (ToRead % DeviceExt->NtfsInfo.BytesPerSector) != 0) + { + RealReadOffset = ROUND_DOWN(ReadOffset, DeviceExt->NtfsInfo.BytesPerSector); + RealLength = ROUND_UP(ToRead, DeviceExt->NtfsInfo.BytesPerSector); + + ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + DeviceExt->NtfsInfo.BytesPerSector, TAG_NTFS); + if (ReadBuffer == NULL) + { + DPRINT1("Not enough memory!\n"); + ReleaseAttributeContext(DataContext); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return STATUS_INSUFFICIENT_RESOURCES; + } + AllocatedBuffer = TRUE; + } + + DPRINT1("Effective read: %lu at %lu for stream '%S'\n", RealLength, RealReadOffset, Fcb->Stream); RealLengthRead = ReadAttribute(DeviceExt, DataContext, RealReadOffset, (PCHAR)ReadBuffer, RealLength); - if (RealLengthRead != RealLength) + if (RealLengthRead == 0) { DPRINT1("Read failure!\n"); ReleaseAttributeContext(DataContext);

9 years, 5 months

[cwittich] 68301: [KERNEL32] warn about unimplemented MB_ERR_INVALID_CHARS case

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 28 13:06:43 2015 New Revision: 68301 URL: http://svn.reactos.org/svn/reactos?rev=68301&view=rev Log: [KERNEL32] warn about unimplemented MB_ERR_INVALID_CHARS case Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 13:06:43 2015 @@ -451,13 +451,17 @@ /* Different handling for DBCS code pages. */ if (CodePageTable->MaximumCharacterSize > 1) { - /* FIXME */ - UCHAR Char; USHORT DBCSOffset; LPCSTR MbsEnd = MultiByteString + MultiByteCount; INT Count; + if (Flags & MB_ERR_INVALID_CHARS) + { + /* FIXME */ + DPRINT1("IntMultiByteToWideCharCP: MB_ERR_INVALID_CHARS case not implemented!\n"); + } + /* Does caller query for output buffer size? */ if (WideCharCount == 0) {

9 years, 5 months

[cwittich] 68300: [KERNEL32] return the thread ansicodepage when no ansicodepage exists for a specific lcid in CP_THREAD_ACP case

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 28 12:34:01 2015 New Revision: 68300 URL: http://svn.reactos.org/svn/reactos?rev=68300&view=rev Log: [KERNEL32] return the thread ansicodepage when no ansicodepage exists for a specific lcid in CP_THREAD_ACP case Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 12:34:01 2015 @@ -218,6 +218,8 @@ /* Last error is set by GetLocaleInfoW. */ return NULL; } + if (CodePage == 0) + return &AnsiCodePage; } else if (CodePage == CP_MACCP) {

9 years, 5 months

[cwittich] 68299: [KERNEL32] replace WideCharToUtf7 with wine version

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jun 28 10:21:52 2015 New Revision: 68299 URL: http://svn.reactos.org/svn/reactos?rev=68299&view=rev Log: [KERNEL32] replace WideCharToUtf7 with wine version Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Sun Jun 28 10:21:52 2015 @@ -1476,160 +1476,127 @@ } } -static const char mustshift[] = -{ - 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1 -}; - -static const char base64[] = -"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -static INT WideCharToUtf7Size(LPCWSTR pszWide, INT cchWide) -{ - WCHAR wch; - INT c = 0; - BOOL fShift = FALSE; - - while(cchWide > 0) - { - wch = *pszWide; - if (wch < 0x80 && !mustshift[wch]) - { - c++; - cchWide--; - pszWide++; +static inline BOOL utf7_can_directly_encode(WCHAR codepoint) +{ + static const BOOL directly_encodable_table[] = + { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, /* 0x00 - 0x0F */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 - 0x1F */ + 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, /* 0x20 - 0x2F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 0x30 - 0x3F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x40 - 0x4F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, /* 0x50 - 0x5F */ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x60 - 0x6F */ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 /* 0x70 - 0x7A */ + }; + + return codepoint <= 0x7A ? directly_encodable_table[codepoint] : FALSE; +} + +static inline BOOL utf7_write_c(char *dst, int dstlen, int *index, char character) +{ + if (dstlen > 0) + { + if (*index >= dstlen) + return FALSE; + + dst[*index] = character; + } + + (*index)++; + + return TRUE; +} + +static INT WideCharToUtf7(const WCHAR *src, int srclen, char *dst, int dstlen) +{ + static const char base64_encoding_table[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + + const WCHAR *source_end = src + srclen; + int dest_index = 0; + + while (src < source_end) + { + if (*src == '+') + { + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; + } + else if (utf7_can_directly_encode(*src)) + { + if (!utf7_write_c(dst, dstlen, &dest_index, *src)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + src++; } else { - if (wch == L'+') - { - c++; - c++; - cchWide--; - pszWide++; - continue; - } - if (!fShift) - { - c++; - fShift = TRUE; - } - pszWide++; - cchWide--; - c += 3; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) - { - pszWide++; - cchWide--; - c += 3; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) + unsigned int offset = 0; + DWORD byte_pair = 0; + + if (!utf7_write_c(dst, dstlen, &dest_index, '+')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + + while (src < source_end && !utf7_can_directly_encode(*src)) + { + byte_pair = (byte_pair << 16) | *src; + offset += 16; + while (offset >= 6) { - pszWide++; - cchWide--; - c += 2; + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[(byte_pair >> (offset - 6)) & 0x3F])) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + offset -= 6; } - } - if (cchWide > 0 && *pszWide < 0x80 && !mustshift[*pszWide]) - { - c++; - fShift = FALSE; - } - } - } - if (fShift) - c++; - - return c; -} - -static INT WideCharToUtf7(LPCWSTR pszWide, INT cchWide, LPSTR pszUtf7, INT cchUtf7) -{ - WCHAR wch; - INT c, n; - WCHAR wsz[3]; - BOOL fShift = FALSE; - - c = WideCharToUtf7Size(pszWide, cchWide); - if (cchUtf7 == 0) - return c; - - if (cchUtf7 < c) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return 0; - } - - while(cchWide > 0) - { - wch = *pszWide; - if (wch < 0x80 && !mustshift[wch]) - { - *pszUtf7++ = (CHAR) wch; - cchWide--; - pszWide++; - } - else - { - if (wch == L'+') - { - *pszUtf7++ = '+'; - *pszUtf7++ = '-'; - cchWide--; - pszWide++; - continue; - } - if (!fShift) - { - *pszUtf7++ = '+'; - fShift = TRUE; - } - wsz[0] = *pszWide++; - cchWide--; - n = 1; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) - { - wsz[1] = *pszWide++; - cchWide--; - n++; - if (cchWide > 0 && (*pszWide >= 0x80 || mustshift[*pszWide])) + src++; + } + + if (offset) + { + /* Windows won't create a padded base64 character if there's no room for the - sign + * as well ; this is probably a bug in Windows */ + if (dstlen > 0 && dest_index + 1 >= dstlen) { - wsz[2] = *pszWide++; - cchWide--; - n++; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; } - } - *pszUtf7++ = base64[wsz[0] >> 10]; - *pszUtf7++ = base64[(wsz[0] >> 4) & 0x3F]; - *pszUtf7++ = base64[(wsz[0] << 2 | (n >= 2 ? wsz[1] >> 14 : 0)) & 0x3F]; - if (n >= 2) - { - *pszUtf7++ = base64[(wsz[1] >> 8) & 0x3F]; - *pszUtf7++ = base64[(wsz[1] >> 2) & 0x3F]; - *pszUtf7++ = base64[(wsz[1] << 4 | (n >= 3 ? wsz[2] >> 12 : 0)) & 0x3F]; - if (n >= 3) + + byte_pair <<= (6 - offset); + if (!utf7_write_c(dst, dstlen, &dest_index, base64_encoding_table[byte_pair & 0x3F])) { - *pszUtf7++ = base64[(wsz[2] >> 6) & 0x3F]; - *pszUtf7++ = base64[wsz[2] & 0x3F]; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; } } - if (cchWide > 0 && *pszWide < 0x80 && !mustshift[*pszWide]) - { - *pszUtf7++ = '-'; - fShift = FALSE; - } - } - } - if (fShift) - *pszUtf7 = '-'; - - return c; + + /* Windows always explicitly terminates the base64 sequence + even though RFC 2152 (page 3, rule 2) does not require this */ + if (!utf7_write_c(dst, dstlen, &dest_index, '-')) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + } + + return dest_index; } DWORD

9 years, 5 months

[hbelusca] 68298: [SHELL32]:Add SmartCard icon from Tango; patch by Lee Schroeder. CORE-9888 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 28 10:05:56 2015 New Revision: 68298 URL: http://svn.reactos.org/svn/reactos?rev=68298&view=rev Log: [SHELL32]:Add SmartCard icon from Tango; patch by Lee Schroeder. CORE-9888 #resolve Added: trunk/reactos/dll/win32/shell32/res/icons/308.ico (with props) Modified: trunk/reactos/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/icon_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/icon_res… ============================================================================== --- trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/icon_res.rc [iso-8859-1] Sun Jun 28 10:05:56 2015 @@ -146,7 +146,8 @@ /* TODO: 303.ico */ IDI_SHELL_DVD_ROM1 ICON "res/icons/304.ico" IDI_SHELL_FDD2 ICON "res/icons/305.ico" -/* TODO: 306.ico, 307.ico, 308.ico */ +/* TODO: 306.ico, 307.ico */ +IDI_SHELL_SMART_MEDIA ICON "res/icons/308.ico" IDI_SHELL_CAMERA1 ICON "res/icons/309.ico" /* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ IDI_SHELL_SCANNER ICON "res/icons/315.ico" Added: trunk/reactos/dll/win32/shell32/res/icons/308.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/icons/308.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sun Jun 28 10:05:56 2015 @@ -451,7 +451,8 @@ /* TODO: 303.ico */ #define IDI_SHELL_DVD_ROM1 304 #define IDI_SHELL_FDD2 305 -/* TODO: 306.ico, 307.ico, 308.ico */ +/* TODO: 306.ico, 307.ico */ +#define IDI_SHELL_SMART_MEDIA 308 #define IDI_SHELL_CAMERA1 309 /* TODO: 310.ico, 311.ico, 312.ico, 313.ico, 314.ico */ #define IDI_SHELL_SCANNER 315

9 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2015