Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 63793: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsole functions. An attentive code reader will see that there are structure mem...
by hbelusca＠svn.reactos.org 01 Aug '14

01 Aug '14

Author: hbelusca Date: Fri Aug 1 18:08:29 2014 New Revision: 63793 URL: http://svn.reactos.org/svn/reactos?rev=63793&view=rev Log: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsole functions. An attentive code reader will see that there are structure members in CONSOLE_WRITECONSOLE that are indeed unused by kernel32 that can be used in ReactOS for undocumented extensions of WriteConsole... (for instance, adding a parameter for ANSI codes support, who knows!... :P) - Fix a bit the support for the CONSOLE_READCONSOLE_CONTROL parameter in ReadConsole (for unicode only). - Use the actual exe name for command history management, given via a hackish way by ReadConsole: the exe name is passed via the 80-byte-length limited static buffer, and is of course retrieved before actually using the static buffer (if needed). [CONSRV] - Fix writing input events in the console, but first preprocessing them for pausing commands (we treat them separately and remove them), then, in case we write many single events, we merge them in case they are mouse moves or repeated key down presses. This helps in not overflowing too quickly the input buffer, and that fixes all the remaining kernel32:console winetests!! (see CORE-8256) - Use the actual exe name for command history management, given via a hackish way by ReadConsole (blame MS!) Part 8/X CORE-7931 CORE-8256 #resolve #comment Fixed in the condrv_restructure branch in revision . Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -24,58 +24,154 @@ * Read functions * ******************/ +DWORD +WINAPI +GetConsoleInputExeNameW(DWORD nBufferLength, LPWSTR lpBuffer); + static BOOL -IntReadConsole(HANDLE hConsoleInput, - PVOID lpBuffer, - DWORD nNumberOfCharsToRead, - LPDWORD lpNumberOfCharsRead, - PCONSOLE_READCONSOLE_CONTROL pInputControl, - BOOL bUnicode) -{ +IntReadConsole(IN HANDLE hConsoleInput, + OUT PVOID lpBuffer, + IN DWORD nNumberOfCharsToRead, + OUT LPDWORD lpNumberOfCharsRead, + IN PCONSOLE_READCONSOLE_CONTROL pInputControl OPTIONAL, + IN BOOLEAN bUnicode) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READCONSOLE ReadConsoleRequest = &ApiMessage.Data.ReadConsoleRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; - ULONG CharSize; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + ULONG CharSize, SizeBytes; + + DPRINT("IntReadConsole\n"); + + /* Set up the data to send to the Console Server */ + ReadConsoleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ReadConsoleRequest->InputHandle = hConsoleInput; + ReadConsoleRequest->Unicode = bUnicode; + + /* + * Retrieve the current console executable name string and length (always + * in UNICODE format). + * FIXME: Do not use GetConsoleInputExeNameW but use something else... + */ + // 1- Get the exe name length in characters, including NULL character. + ReadConsoleRequest->ExeLength = + GetConsoleInputExeNameW(0, (PWCHAR)ReadConsoleRequest->StaticBuffer); + // 2- Get the exe name (GetConsoleInputExeNameW returns 1 in case of success). + if (GetConsoleInputExeNameW(ReadConsoleRequest->ExeLength, + (PWCHAR)ReadConsoleRequest->StaticBuffer) != 1) + { + // Nothing + ReadConsoleRequest->ExeLength = 0; + } + else + { + // Remove the NULL character, and convert in number of bytes. + ReadConsoleRequest->ExeLength--; + ReadConsoleRequest->ExeLength *= sizeof(WCHAR); + } + + /*** For DEBUGGING purposes ***/ + { + UNICODE_STRING ExeName; + ExeName.Length = ExeName.MaximumLength = ReadConsoleRequest->ExeLength; + ExeName.Buffer = (PWCHAR)ReadConsoleRequest->StaticBuffer; + DPRINT1("IntReadConsole(ExeName = %wZ)\n", &ExeName); + } + /******************************/ /* Determine the needed size */ - CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - ReadConsoleRequest->BufferSize = nNumberOfCharsToRead * CharSize; - - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, ReadConsoleRequest->BufferSize); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Allocate space in the Buffer */ - CsrAllocateMessagePointer(CaptureBuffer, - ReadConsoleRequest->BufferSize, - (PVOID*)&ReadConsoleRequest->Buffer); - - /* Set up the data to send to the Console Server */ - ReadConsoleRequest->InputHandle = hConsoleInput; - ReadConsoleRequest->Unicode = bUnicode; - ReadConsoleRequest->NrCharactersToRead = nNumberOfCharsToRead; - ReadConsoleRequest->NrCharactersRead = 0; - ReadConsoleRequest->CtrlWakeupMask = 0; - if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) - { - /* - * From MSDN (ReadConsole function), the description - * for pInputControl says: - * "This parameter requires Unicode input by default. - * For ANSI mode, set this parameter to NULL." - */ - ReadConsoleRequest->NrCharactersRead = pInputControl->nInitialChars; - RtlCopyMemory(ReadConsoleRequest->Buffer, - lpBuffer, - pInputControl->nInitialChars * sizeof(WCHAR)); - ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; - } + CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + SizeBytes = nNumberOfCharsToRead * CharSize; + + ReadConsoleRequest->CaptureBufferSize = + ReadConsoleRequest->NumBytes = SizeBytes; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are read. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (SizeBytes <= sizeof(ReadConsoleRequest->StaticBuffer)) + { + ReadConsoleRequest->Buffer = ReadConsoleRequest->StaticBuffer; + // CaptureBuffer = NULL; + } + else + { + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Allocate space in the Buffer */ + CsrAllocateMessagePointer(CaptureBuffer, + SizeBytes, + (PVOID*)&ReadConsoleRequest->Buffer); + } + + ReadConsoleRequest->InitialNumBytes = 0; + ReadConsoleRequest->CtrlWakeupMask = 0; + ReadConsoleRequest->ControlKeyState = 0; + + /* + * From MSDN (ReadConsole function), the description + * for pInputControl says: + * "This parameter requires Unicode input by default. + * For ANSI mode, set this parameter to NULL." + */ + if (bUnicode && pInputControl && + pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) + { + /* Sanity check */ + if (pInputControl->nInitialChars <= nNumberOfCharsToRead) + { + ReadConsoleRequest->InitialNumBytes = + pInputControl->nInitialChars * sizeof(WCHAR); // CharSize + + if (pInputControl->nInitialChars != 0) + { + /* + * It is possible here to overwrite the static buffer, in case + * the number of bytes to read was smaller than the static buffer. + * In this case, this means we are continuing a pending read, + * and we do not need in fact the executable name that was + * stored in the static buffer because it was first grabbed when + * we started the first read. + */ + RtlCopyMemory(ReadConsoleRequest->Buffer, + lpBuffer, + ReadConsoleRequest->InitialNumBytes); + } + + ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; + } + else + { + // Status = STATUS_INVALID_PARAMETER; + } + } + else + { + /* We are in a situation where pInputControl has no meaning */ + pInputControl = NULL; + } + + /* Check for sanity */ +/* + if (!NT_SUCCESS(Status) && pInputControl) + { + // Free CaptureBuffer if needed + // Set last error to last status + // Return FALSE + } +*/ /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -84,35 +180,49 @@ sizeof(*ReadConsoleRequest)); /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - RtlCopyMemory(lpBuffer, - ReadConsoleRequest->Buffer, - ReadConsoleRequest->NrCharactersRead * CharSize); - - if (lpNumberOfCharsRead != NULL) - *lpNumberOfCharsRead = ReadConsoleRequest->NrCharactersRead; - - if (pInputControl && pInputControl->nLength == sizeof(CONSOLE_READCONSOLE_CONTROL)) - pInputControl->dwControlKeyState = ReadConsoleRequest->ControlKeyState; + Success = NT_SUCCESS(ApiMessage.Status); + + /* Retrieve the results */ + if (Success) + { + _SEH2_TRY + { + *lpNumberOfCharsRead = ReadConsoleRequest->NumBytes / CharSize; + + if (bUnicode && pInputControl) + pInputControl->dwControlKeyState = ReadConsoleRequest->ControlKeyState; + + RtlCopyMemory(lpBuffer, + ReadConsoleRequest->Buffer, + ReadConsoleRequest->NumBytes); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; } else { - DPRINT1("CSR returned error in ReadConsole\n"); - - if (lpNumberOfCharsRead != NULL) - *lpNumberOfCharsRead = 0; - - /* Error out */ BaseSetLastNTError(ApiMessage.Status); } - CsrFreeCaptureBuffer(CaptureBuffer); - - /* Return TRUE or FALSE */ - // return TRUE; - return (ReadConsoleRequest->NrCharactersRead > 0); - // return NT_SUCCESS(ApiMessage.Status); + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + + if (Success) + { + /* Yield execution to another thread if Ctrl-C or Ctrl-Break happened */ + if (ApiMessage.Status == STATUS_ALERTED /* || ApiMessage.Status == STATUS_CANCELLED */) + { + NtYieldExecution(); + SetLastError(ERROR_OPERATION_ABORTED); // STATUS_CANCELLED + } + } + + /* Return success status */ + return Success; } @@ -228,12 +338,12 @@ static BOOL -IntReadConsoleOutput(HANDLE hConsoleOutput, - PCHAR_INFO lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpReadRegion, - BOOL bUnicode) +IntReadConsoleOutput(IN HANDLE hConsoleOutput, + OUT PCHAR_INFO lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpReadRegion, + IN BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READOUTPUT ReadOutputRequest = &ApiMessage.Data.ReadOutputRequest; @@ -292,7 +402,6 @@ } else { - /* Error out */ BaseSetLastNTError(ApiMessage.Status); } @@ -321,7 +430,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &ApiMessage.Data.ReadOutputCodeRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; - ULONG SizeBytes, CodeSize; + ULONG CodeSize, SizeBytes; DPRINT("IntReadConsoleOutputCode\n"); @@ -431,42 +540,79 @@ static BOOL -IntWriteConsole(HANDLE hConsoleOutput, - PVOID lpBuffer, - DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, +IntWriteConsole(IN HANDLE hConsoleOutput, + IN PVOID lpBuffer, + IN DWORD nNumberOfCharsToWrite, + OUT LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved, - BOOL bUnicode) -{ - BOOL bRet = TRUE; + IN BOOLEAN bUnicode) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITECONSOLE WriteConsoleRequest = &ApiMessage.Data.WriteConsoleRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; - ULONG CharSize; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + ULONG CharSize, SizeBytes; + + DPRINT("IntWriteConsole\n"); + + /* Set up the data to send to the Console Server */ + WriteConsoleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + WriteConsoleRequest->OutputHandle = hConsoleOutput; + WriteConsoleRequest->Unicode = bUnicode; + + /* Those members are unused by the client, on Windows */ + WriteConsoleRequest->Reserved1 = 0; + // WriteConsoleRequest->Reserved2 = {0}; /* Determine the needed size */ - CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); - WriteConsoleRequest->BufferSize = nNumberOfCharsToWrite * CharSize; - - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, WriteConsoleRequest->BufferSize); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Capture the buffer to write */ - CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)lpBuffer, - WriteConsoleRequest->BufferSize, - (PVOID*)&WriteConsoleRequest->Buffer); - - /* Start writing */ - WriteConsoleRequest->NrCharactersToWrite = nNumberOfCharsToWrite; - WriteConsoleRequest->OutputHandle = hConsoleOutput; - WriteConsoleRequest->Unicode = bUnicode; + CharSize = (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + SizeBytes = nNumberOfCharsToWrite * CharSize; + + WriteConsoleRequest->NumBytes = SizeBytes; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are written. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (SizeBytes <= sizeof(WriteConsoleRequest->StaticBuffer)) + { + WriteConsoleRequest->Buffer = WriteConsoleRequest->StaticBuffer; + // CaptureBuffer = NULL; + WriteConsoleRequest->UsingStaticBuffer = TRUE; + + _SEH2_TRY + { + RtlCopyMemory(WriteConsoleRequest->Buffer, + lpBuffer, + SizeBytes); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + _SEH2_END; + } + else + { + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Capture the buffer to write */ + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpBuffer, + SizeBytes, + (PVOID*)&WriteConsoleRequest->Buffer); + WriteConsoleRequest->UsingStaticBuffer = FALSE; + } /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -475,26 +621,32 @@ sizeof(*WriteConsoleRequest)); /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - if (lpNumberOfCharsWritten != NULL) - *lpNumberOfCharsWritten = WriteConsoleRequest->NrCharactersWritten; - - bRet = TRUE; + Success = NT_SUCCESS(ApiMessage.Status); + + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + + /* Retrieve the results */ + if (Success) + { + _SEH2_TRY + { + *lpNumberOfCharsWritten = WriteConsoleRequest->NumBytes / CharSize; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; } else { - if (lpNumberOfCharsWritten != NULL) - *lpNumberOfCharsWritten = 0; - - /* Error out */ BaseSetLastNTError(ApiMessage.Status); - bRet = FALSE; - } - - CsrFreeCaptureBuffer(CaptureBuffer); - - return bRet; + } + + /* Return success status */ + return Success; } @@ -600,12 +752,12 @@ static BOOL -IntWriteConsoleOutput(HANDLE hConsoleOutput, - CONST CHAR_INFO *lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpWriteRegion, - BOOL bUnicode) +IntWriteConsoleOutput(IN HANDLE hConsoleOutput, + IN CONST CHAR_INFO *lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpWriteRegion, + IN BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEOUTPUT WriteOutputRequest = &ApiMessage.Data.WriteOutputRequest; @@ -660,7 +812,6 @@ /* Check for success */ if (!NT_SUCCESS(ApiMessage.Status)) { - /* Error out */ BaseSetLastNTError(ApiMessage.Status); } @@ -689,7 +840,7 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &ApiMessage.Data.WriteOutputCodeRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; - ULONG SizeBytes, CodeSize; + ULONG CodeSize, SizeBytes; if ( (CodeType != CODE_ASCII ) && (CodeType != CODE_UNICODE ) && @@ -872,11 +1023,11 @@ */ BOOL WINAPI -ReadConsoleW(HANDLE hConsoleInput, - LPVOID lpBuffer, - DWORD nNumberOfCharsToRead, - LPDWORD lpNumberOfCharsRead, - PCONSOLE_READCONSOLE_CONTROL pInputControl) +ReadConsoleW(IN HANDLE hConsoleInput, + OUT LPVOID lpBuffer, + IN DWORD nNumberOfCharsToRead, + OUT LPDWORD lpNumberOfCharsRead, + IN PCONSOLE_READCONSOLE_CONTROL pInputControl OPTIONAL) { return IntReadConsole(hConsoleInput, lpBuffer, @@ -894,11 +1045,11 @@ */ BOOL WINAPI -ReadConsoleA(HANDLE hConsoleInput, - LPVOID lpBuffer, - DWORD nNumberOfCharsToRead, - LPDWORD lpNumberOfCharsRead, - PCONSOLE_READCONSOLE_CONTROL pInputControl) +ReadConsoleA(IN HANDLE hConsoleInput, + OUT LPVOID lpBuffer, + IN DWORD nNumberOfCharsToRead, + OUT LPDWORD lpNumberOfCharsRead, + IN PCONSOLE_READCONSOLE_CONTROL pInputControl OPTIONAL) { return IntReadConsole(hConsoleInput, lpBuffer, @@ -1044,11 +1195,11 @@ */ BOOL WINAPI -ReadConsoleOutputW(HANDLE hConsoleOutput, - PCHAR_INFO lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpReadRegion) +ReadConsoleOutputW(IN HANDLE hConsoleOutput, + OUT PCHAR_INFO lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpReadRegion) { return IntReadConsoleOutput(hConsoleOutput, lpBuffer, @@ -1066,11 +1217,11 @@ */ BOOL WINAPI -ReadConsoleOutputA(HANDLE hConsoleOutput, - PCHAR_INFO lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpReadRegion) +ReadConsoleOutputA(IN HANDLE hConsoleOutput, + OUT PCHAR_INFO lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpReadRegion) { return IntReadConsoleOutput(hConsoleOutput, lpBuffer, @@ -1158,10 +1309,10 @@ */ BOOL WINAPI -WriteConsoleW(HANDLE hConsoleOutput, - CONST VOID *lpBuffer, - DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, +WriteConsoleW(IN HANDLE hConsoleOutput, + IN CONST VOID *lpBuffer, + IN DWORD nNumberOfCharsToWrite, + OUT LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved) { return IntWriteConsole(hConsoleOutput, @@ -1180,10 +1331,10 @@ */ BOOL WINAPI -WriteConsoleA(HANDLE hConsoleOutput, - CONST VOID *lpBuffer, - DWORD nNumberOfCharsToWrite, - LPDWORD lpNumberOfCharsWritten, +WriteConsoleA(IN HANDLE hConsoleOutput, + IN CONST VOID *lpBuffer, + IN DWORD nNumberOfCharsToWrite, + OUT LPDWORD lpNumberOfCharsWritten, LPVOID lpReserved) { return IntWriteConsole(hConsoleOutput, @@ -1286,11 +1437,11 @@ */ BOOL WINAPI -WriteConsoleOutputW(HANDLE hConsoleOutput, - CONST CHAR_INFO *lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpWriteRegion) +WriteConsoleOutputW(IN HANDLE hConsoleOutput, + IN CONST CHAR_INFO *lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpWriteRegion) { return IntWriteConsoleOutput(hConsoleOutput, lpBuffer, @@ -1308,11 +1459,11 @@ */ BOOL WINAPI -WriteConsoleOutputA(HANDLE hConsoleOutput, - CONST CHAR_INFO *lpBuffer, - COORD dwBufferSize, - COORD dwBufferCoord, - PSMALL_RECT lpWriteRegion) +WriteConsoleOutputA(IN HANDLE hConsoleOutput, + IN CONST CHAR_INFO *lpBuffer, + IN COORD dwBufferSize, + IN COORD dwBufferCoord, + IN OUT PSMALL_RECT lpWriteRegion) { return IntWriteConsoleOutput(hConsoleOutput, lpBuffer, Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -218,30 +218,40 @@ typedef struct { - HANDLE OutputHandle; - - BOOL Unicode; - ULONG NrCharactersToWrite; - ULONG NrCharactersWritten; - - ULONG BufferSize; - PVOID Buffer; + HANDLE ConsoleHandle; + HANDLE OutputHandle; + + CHAR StaticBuffer[80]; + PVOID Buffer; // BufPtr + ULONG NumBytes; + + // On Windows, the client never uses this member + ULONG Reserved1; + + BOOLEAN UsingStaticBuffer; + BOOLEAN Unicode; + + // On Windows, the client never uses this member + CHAR Reserved2[6]; } CONSOLE_WRITECONSOLE, *PCONSOLE_WRITECONSOLE; typedef struct { + HANDLE ConsoleHandle; HANDLE InputHandle; - BOOL Unicode; - ULONG NrCharactersToRead; - ULONG NrCharactersRead; - - UNICODE_STRING ExeName; - DWORD CtrlWakeupMask; - DWORD ControlKeyState; - - ULONG BufferSize; - PVOID Buffer; + USHORT ExeLength; + + CHAR StaticBuffer[80]; + PVOID Buffer; // BufPtr + ULONG NumBytes; + + ULONG CaptureBufferSize; + + ULONG InitialNumBytes; + ULONG CtrlWakeupMask; + ULONG ControlKeyState; + BOOLEAN Unicode; } CONSOLE_READCONSOLE, *PCONSOLE_READCONSOLE; typedef struct Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -65,58 +65,75 @@ } } -NTSTATUS -ConioAddInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent, - BOOLEAN AppendToEnd) -{ - ConsoleInput *ConInRec; - - /* Check for pause or unpause */ - if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) - { - WORD vk = InputEvent->Event.KeyEvent.wVirtualKeyCode; - if (!(Console->PauseFlags & PAUSED_FROM_KEYBOARD)) - { - DWORD cks = InputEvent->Event.KeyEvent.dwControlKeyState; - if (Console->InputBuffer.Mode & ENABLE_LINE_INPUT && - (vk == VK_PAUSE || (vk == 'S' && - (cks & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) && - !(cks & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))))) - { - ConioPause(Console, PAUSED_FROM_KEYBOARD); - return STATUS_SUCCESS; - } - } - else - { - if ((vk < VK_SHIFT || vk > VK_CAPITAL) && vk != VK_LWIN && - vk != VK_RWIN && vk != VK_NUMLOCK && vk != VK_SCROLL) - { - ConioUnpause(Console, PAUSED_FROM_KEYBOARD); - return STATUS_SUCCESS; - } - } - } - - /* Add event to the queue */ - ConInRec = ConsoleAllocHeap(0, sizeof(ConsoleInput)); - if (ConInRec == NULL) return STATUS_INSUFFICIENT_RESOURCES; - - ConInRec->InputEvent = *InputEvent; - - if (AppendToEnd) - { - /* Append the event to the end of the queue */ - InsertTailList(&Console->InputBuffer.InputEvents, &ConInRec->ListEntry); - } - else - { - /* Append the event to the beginning of the queue */ - InsertHeadList(&Console->InputBuffer.InputEvents, &ConInRec->ListEntry); - } - - SetEvent(Console->InputBuffer.ActiveEvent); + +/* + * This pre-processing code MUST be IN consrv ONLY + */ +static ULONG +PreprocessInput(PCONSOLE Console, + PINPUT_RECORD InputEvent, + ULONG NumEventsToWrite) +{ + ULONG NumEvents; + + /* + * Loop each event, and for each, check for pause or unpause + * and perform adequate behaviour. + */ + for (NumEvents = NumEventsToWrite; NumEvents > 0; --NumEvents) + { + /* Check for pause or unpause */ + if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) + { + WORD vk = InputEvent->Event.KeyEvent.wVirtualKeyCode; + if (!(Console->PauseFlags & PAUSED_FROM_KEYBOARD)) + { + DWORD cks = InputEvent->Event.KeyEvent.dwControlKeyState; + if (Console->InputBuffer.Mode & ENABLE_LINE_INPUT && + (vk == VK_PAUSE || + (vk == 'S' && (cks & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) && + !(cks & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))))) + { + ConioPause(Console, PAUSED_FROM_KEYBOARD); + + /* Skip the event */ + RtlMoveMemory(InputEvent, + InputEvent + 1, + (NumEvents - 1) * sizeof(INPUT_RECORD)); + --NumEventsToWrite; + continue; + } + } + else + { + if ((vk < VK_SHIFT || vk > VK_CAPITAL) && vk != VK_LWIN && + vk != VK_RWIN && vk != VK_NUMLOCK && vk != VK_SCROLL) + { + ConioUnpause(Console, PAUSED_FROM_KEYBOARD); + + /* Skip the event */ + RtlMoveMemory(InputEvent, + InputEvent + 1, + (NumEvents - 1) * sizeof(INPUT_RECORD)); + --NumEventsToWrite; + continue; + } + } + } + + /* Go to the next event */ + ++InputEvent; + } + + return NumEventsToWrite; +} + +/* + * This post-processing code MUST be IN consrv ONLY + */ +static VOID +PostprocessInput(PCONSOLE Console) +{ CsrNotifyWait(&Console->ReadWaitQueue, FALSE, NULL, @@ -125,6 +142,170 @@ { CsrDereferenceWait(&Console->ReadWaitQueue); } +} + +NTSTATUS +ConioAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, // InputEvent + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG i = 0; + BOOLEAN SetWaitEvent = FALSE; + + if (NumEventsWritten) *NumEventsWritten = 0; + + /* + * This pre-processing code MUST be IN consrv ONLY!! + */ + NumEventsToWrite = PreprocessInput(Console, InputRecords, NumEventsToWrite); + if (NumEventsToWrite == 0) return STATUS_SUCCESS; + + + /* + * When adding many single events, in the case of repeated mouse move or + * key down events, we try to coalesce them so that we do not saturate + * too quickly the input buffer. + */ + if (NumEventsToWrite == 1 && !IsListEmpty(&Console->InputBuffer.InputEvents)) + { + PINPUT_RECORD InputRecord = InputRecords; // Only one element + PINPUT_RECORD LastInputRecord; + ConsoleInput* ConInRec; // Input + + /* Get the "next" event of the input buffer */ + if (AppendToEnd) + { + /* Get the tail element */ + ConInRec = CONTAINING_RECORD(Console->InputBuffer.InputEvents.Blink, + ConsoleInput, ListEntry); + } + else + { + /* Get the head element */ + ConInRec = CONTAINING_RECORD(Console->InputBuffer.InputEvents.Flink, + ConsoleInput, ListEntry); + } + LastInputRecord = &ConInRec->InputEvent; + + if (InputRecord->EventType == MOUSE_EVENT && + InputRecord->Event.MouseEvent.dwEventFlags == MOUSE_MOVED) + { + if (LastInputRecord->EventType == MOUSE_EVENT && + LastInputRecord->Event.MouseEvent.dwEventFlags == MOUSE_MOVED) + { + /* Update the mouse position */ + LastInputRecord->Event.MouseEvent.dwMousePosition.X = + InputRecord->Event.MouseEvent.dwMousePosition.X; + LastInputRecord->Event.MouseEvent.dwMousePosition.Y = + InputRecord->Event.MouseEvent.dwMousePosition.Y; + + i = 1; + // return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + } + } + else if (InputRecord->EventType == KEY_EVENT && + InputRecord->Event.KeyEvent.bKeyDown) + { + if (LastInputRecord->EventType == KEY_EVENT && + LastInputRecord->Event.KeyEvent.bKeyDown && + (LastInputRecord->Event.KeyEvent.wVirtualScanCode == // Same scancode + InputRecord->Event.KeyEvent.wVirtualScanCode) && + (LastInputRecord->Event.KeyEvent.uChar.UnicodeChar == // Same character + InputRecord->Event.KeyEvent.uChar.UnicodeChar) && + (LastInputRecord->Event.KeyEvent.dwControlKeyState == // Same Ctrl/Alt/Shift state + InputRecord->Event.KeyEvent.dwControlKeyState) ) + { + /* Update the repeat count */ + LastInputRecord->Event.KeyEvent.wRepeatCount += + InputRecord->Event.KeyEvent.wRepeatCount; + + i = 1; + // return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + } + } + } + + /* If we coalesced the only one element, we can quit */ + if (i == 1 && Status == STATUS_SUCCESS /* && NumEventsToWrite == 1 */) + goto Done; + + /* + * No event coalesced, add them in the usual way. + */ + + if (AppendToEnd) + { + /* Go to the beginning of the list */ + // InputRecords = InputRecords; + } + else + { + /* Go to the end of the list */ + InputRecords = &InputRecords[NumEventsToWrite - 1]; + } + + /* Set the event if the list is going to be non-empty */ + if (IsListEmpty(&Console->InputBuffer.InputEvents)) + SetWaitEvent = TRUE; + + for (i = 0; i < NumEventsToWrite && NT_SUCCESS(Status); ++i) + { + PINPUT_RECORD InputRecord; + ConsoleInput* ConInRec; + + if (AppendToEnd) + { + /* Select the event and go to the next one */ + InputRecord = InputRecords++; + } + else + { + /* Select the event and go to the previous one */ + InputRecord = InputRecords--; + } + + /* Add event to the queue */ + ConInRec = ConsoleAllocHeap(0, sizeof(ConsoleInput)); + if (ConInRec == NULL) + { + // return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + continue; + } + + ConInRec->InputEvent = *InputRecord; + + if (AppendToEnd) + { + /* Append the event to the end of the queue */ + InsertTailList(&Console->InputBuffer.InputEvents, &ConInRec->ListEntry); + } + else + { + /* Append the event to the beginning of the queue */ + InsertHeadList(&Console->InputBuffer.InputEvents, &ConInRec->ListEntry); + } + + // return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + } + + if (SetWaitEvent) SetEvent(Console->InputBuffer.ActiveEvent); + +Done: + if (NumEventsWritten) *NumEventsWritten = i; + + + /* + * This post-processing code MUST be IN consrv ONLY!! + */ + // if (NT_SUCCESS(Status)) + if (Status == STATUS_SUCCESS) PostprocessInput(Console); return STATUS_SUCCESS; } @@ -133,8 +314,14 @@ ConioProcessInputEvent(PCONSOLE Console, PINPUT_RECORD InputEvent) { - return ConioAddInputEvent(Console, InputEvent, TRUE); -} + ULONG NumEventsWritten; + return ConioAddInputEvents(Console, + InputEvent, + 1, + &NumEventsWritten, + TRUE); +} + VOID PurgeInputBuffer(PCONSOLE Console) @@ -158,6 +345,7 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, + /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, @@ -228,7 +416,8 @@ if (Input->InputEvent.EventType == KEY_EVENT && Input->InputEvent.Event.KeyEvent.bKeyDown) { - LineInputKeyDown(Console, &Input->InputEvent.Event.KeyEvent); + LineInputKeyDown(Console, ExeName, + &Input->InputEvent.Event.KeyEvent); ReadControl->dwControlKeyState = Input->InputEvent.Event.KeyEvent.dwControlKeyState; } ConsoleFreeHeap(Input); @@ -299,6 +488,7 @@ } } + // FIXME: Only set if Status == STATUS_SUCCESS ??? if (NumCharsRead) *NumCharsRead = i; return Status; @@ -345,11 +535,6 @@ *InputRecord = Input->InputEvent; - if (!Unicode) - { - ConioInputEventToAnsi(InputBuffer->Header.Console, InputRecord); - } - ++InputRecord; ++i; CurrentInput = CurrentInput->Flink; @@ -363,6 +548,15 @@ } if (NumEventsRead) *NumEventsRead = i; + + /* Now translate everything to ANSI */ + if (!Unicode) + { + for (; i > 0; --i) + { + ConioInputEventToAnsi(InputBuffer->Header.Console, --InputRecord); + } + } if (IsListEmpty(&InputBuffer->InputEvents)) { @@ -392,20 +586,23 @@ ASSERT(Console == InputBuffer->Header.Console); ASSERT((InputRecord != NULL) || (InputRecord == NULL && NumEventsToWrite == 0)); + /* First translate everything to UNICODE */ + if (!Unicode) + { + for (i = 0; i < NumEventsToWrite; ++i) + { + ConioInputEventToUnicode(Console, &InputRecord[i]); + } + } + + /* Now, add the events */ // if (NumEventsWritten) *NumEventsWritten = 0; - // Status = ConioAddInputEvents(Console, InputRecord, NumEventsToWrite, NumEventsWritten, AppendToEnd); - - for (i = 0; i < NumEventsToWrite && NT_SUCCESS(Status); ++i) - { - if (!Unicode) - { - ConioInputEventToUnicode(Console, InputRecord); - } - - Status = ConioAddInputEvent(Console, InputRecord++, AppendToEnd); - } - - if (NumEventsWritten) *NumEventsWritten = i; + Status = ConioAddInputEvents(Console, + InputRecord, + NumEventsToWrite, + NumEventsWritten, + AppendToEnd); + // if (NumEventsWritten) *NumEventsWritten = i; return Status; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -133,6 +133,7 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, + /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, @@ -148,20 +149,64 @@ PCONSOLE_INPUT_BUFFER InputBuffer = InputInfo->InputBuffer; CONSOLE_READCONSOLE_CONTROL ReadControl; + UNICODE_STRING ExeName; + + PVOID Buffer; + ULONG NrCharactersRead = 0; + ULONG CharSize = (ReadConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); + + /* Compute the executable name, if needed */ + if (ReadConsoleRequest->InitialNumBytes == 0 && + ReadConsoleRequest->ExeLength <= sizeof(ReadConsoleRequest->StaticBuffer)) + { + ExeName.Length = ExeName.MaximumLength = ReadConsoleRequest->ExeLength; + ExeName.Buffer = (PWCHAR)ReadConsoleRequest->StaticBuffer; + } + else + { + ExeName.Length = ExeName.MaximumLength = 0; + ExeName.Buffer = NULL; + } + + /* Build the ReadControl structure */ ReadControl.nLength = sizeof(CONSOLE_READCONSOLE_CONTROL); - ReadControl.nInitialChars = ReadConsoleRequest->NrCharactersRead; + ReadControl.nInitialChars = ReadConsoleRequest->InitialNumBytes / CharSize; ReadControl.dwCtrlWakeupMask = ReadConsoleRequest->CtrlWakeupMask; ReadControl.dwControlKeyState = ReadConsoleRequest->ControlKeyState; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are read. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (ReadConsoleRequest->CaptureBufferSize <= sizeof(ReadConsoleRequest->StaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // ReadConsoleRequest->Buffer = ReadConsoleRequest->StaticBuffer; + Buffer = ReadConsoleRequest->StaticBuffer; + } + else + { + Buffer = ReadConsoleRequest->Buffer; + } + + DPRINT1("Calling ConDrvReadConsole(%wZ)\n", &ExeName); Status = ConDrvReadConsole(InputBuffer->Header.Console, InputBuffer, + &ExeName, ReadConsoleRequest->Unicode, - ReadConsoleRequest->Buffer, + Buffer, &ReadControl, - ReadConsoleRequest->NrCharactersToRead, - &ReadConsoleRequest->NrCharactersRead); - - ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; + ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead + &NrCharactersRead); + DPRINT1("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", + NrCharactersRead, Status); + + // ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; if (Status == STATUS_PENDING) { @@ -173,7 +218,13 @@ } else { - /* We read all what we wanted, we return the error code we were given */ + /* + * We read all what we wanted. Set the number of bytes read and + * return the error code we were given. + */ + ReadConsoleRequest->NumBytes = NrCharactersRead * CharSize; + ReadConsoleRequest->ControlKeyState = ReadControl.dwControlKeyState; + return Status; // return STATUS_SUCCESS; } @@ -304,8 +355,12 @@ } else { - /* We read all what we wanted, we return the error code we were given */ + /* + * We read all what we wanted. Set the number of events read and + * return the error code we were given. + */ GetInputRequest->NumRecords = NumEventsRead; + return Status; // return STATUS_SUCCESS; } @@ -325,24 +380,38 @@ DPRINT("SrvReadConsole\n"); - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&ReadConsoleRequest->Buffer, - ReadConsoleRequest->BufferSize, - sizeof(BYTE))) - { - return STATUS_INVALID_PARAMETER; - } - - if (ReadConsoleRequest->NrCharactersRead > ReadConsoleRequest->NrCharactersToRead) + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are read. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (ReadConsoleRequest->CaptureBufferSize <= sizeof(ReadConsoleRequest->StaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // ReadConsoleRequest->Buffer = ReadConsoleRequest->StaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&ReadConsoleRequest->Buffer, + ReadConsoleRequest->CaptureBufferSize, + sizeof(BYTE))) + { + return STATUS_INVALID_PARAMETER; + } + } + + if (ReadConsoleRequest->InitialNumBytes > ReadConsoleRequest->NumBytes) { return STATUS_INVALID_PARAMETER; } Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, ReadConsoleRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; - - // This member is set by the caller (IntReadConsole in kernel32) - // ReadConsoleRequest->NrCharactersRead = 0; InputInfo.CallingThread = CsrGetClientThread(); InputInfo.HandleEntry = HandleEntry; @@ -462,7 +531,11 @@ Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), WriteInputRequest->InputHandle, &InputBuffer, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + WriteInputRequest->NumRecords = 0; + return Status; + } NumEventsWritten = 0; Status = ConDrvWriteConsoleInput(InputBuffer->Header.Console, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -373,17 +373,45 @@ PCONSOLE_WRITECONSOLE WriteConsoleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteConsoleRequest; PTEXTMODE_SCREEN_BUFFER ScreenBuffer; + PVOID Buffer; + ULONG NrCharactersWritten = 0; + ULONG CharSize = (WriteConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(ClientThread->Process), WriteConsoleRequest->OutputHandle, &ScreenBuffer, GENERIC_WRITE, FALSE); if (!NT_SUCCESS(Status)) return Status; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are written. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (WriteConsoleRequest->UsingStaticBuffer && + WriteConsoleRequest->NumBytes <= sizeof(WriteConsoleRequest->StaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // WriteConsoleRequest->Buffer = WriteConsoleRequest->StaticBuffer; + Buffer = WriteConsoleRequest->StaticBuffer; + } + else + { + Buffer = WriteConsoleRequest->Buffer; + } + + DPRINT("Calling ConDrvWriteConsole\n"); Status = ConDrvWriteConsole(ScreenBuffer->Header.Console, ScreenBuffer, WriteConsoleRequest->Unicode, - WriteConsoleRequest->Buffer, - WriteConsoleRequest->NrCharactersToWrite, - &WriteConsoleRequest->NrCharactersWritten); + Buffer, + WriteConsoleRequest->NumBytes / CharSize, // NrCharactersToWrite + &NrCharactersWritten); + DPRINT("ConDrvWriteConsole returned (%d ; Status = 0x%08x)\n", + NrCharactersWritten, Status); if (Status == STATUS_PENDING) { @@ -404,6 +432,11 @@ /* Wait until we un-pause the console */ // Status = STATUS_PENDING; } + else + { + /* We read all what we wanted. Set the number of bytes written. */ + WriteConsoleRequest->NumBytes = NrCharactersWritten * CharSize; + } Quit: ConSrvReleaseScreenBuffer(ScreenBuffer, FALSE); @@ -502,12 +535,30 @@ DPRINT("SrvWriteConsole\n"); - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID)&WriteConsoleRequest->Buffer, - WriteConsoleRequest->BufferSize, - sizeof(BYTE))) - { - return STATUS_INVALID_PARAMETER; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are written. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (WriteConsoleRequest->UsingStaticBuffer && + WriteConsoleRequest->NumBytes <= sizeof(WriteConsoleRequest->StaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // WriteConsoleRequest->Buffer = WriteConsoleRequest->StaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID)&WriteConsoleRequest->Buffer, + WriteConsoleRequest->NumBytes, + sizeof(BYTE))) + { + return STATUS_INVALID_PARAMETER; + } } Status = DoWriteConsole(ApiMessage, CsrGetClientThread(), TRUE); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -331,11 +331,15 @@ /* coninput.c */ VOID NTAPI ConioProcessKey(PCONSOLE Console, MSG* msg); -NTSTATUS ConioAddInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent, - BOOLEAN AppendToEnd); -NTSTATUS ConioProcessInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent); +NTSTATUS +ConioAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd); +NTSTATUS +ConioProcessInputEvent(PCONSOLE Console, + PINPUT_RECORD InputEvent); /* conoutput.c */ #define ConioInitRect(Rect, top, left, bottom, right) \ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -140,11 +140,15 @@ /* coninput.c */ VOID NTAPI ConioProcessKey(PCONSOLE Console, MSG* msg); -NTSTATUS ConioAddInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent, - BOOLEAN AppendToEnd); -NTSTATUS ConioProcessInputEvent(PCONSOLE Console, - PINPUT_RECORD InputEvent); +NTSTATUS +ConioAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd); +NTSTATUS +ConioProcessInputEvent(PCONSOLE Console, + PINPUT_RECORD InputEvent); /* conoutput.c */ #define ConioInitRect(Rect, top, left, bottom, right) \ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -43,22 +43,21 @@ /* PRIVATE FUNCTIONS **********************************************************/ static PHISTORY_BUFFER -HistoryCurrentBuffer(PCONSOLE Console) -{ - /* TODO: use actual EXE name sent from process that called ReadConsole */ - UNICODE_STRING ExeName = { 14, 14, L"cmd.exe" }; +HistoryCurrentBuffer(PCONSOLE Console, + PUNICODE_STRING ExeName) +{ PLIST_ENTRY Entry = Console->HistoryBuffers.Flink; PHISTORY_BUFFER Hist; for (; Entry != &Console->HistoryBuffers; Entry = Entry->Flink) { Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); - if (RtlEqualUnicodeString(&ExeName, &Hist->ExeName, FALSE)) + if (RtlEqualUnicodeString(ExeName, &Hist->ExeName, FALSE)) return Hist; } /* Couldn't find the buffer, create a new one */ - Hist = ConsoleAllocHeap(0, sizeof(HISTORY_BUFFER) + ExeName.Length); + Hist = ConsoleAllocHeap(0, sizeof(HISTORY_BUFFER) + ExeName->Length); if (!Hist) return NULL; Hist->MaxEntries = Console->HistoryBufferSize; Hist->NumEntries = 0; @@ -68,18 +67,19 @@ ConsoleFreeHeap(Hist); return NULL; } - Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName.Length; + Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName->Length; Hist->ExeName.Buffer = (PWCHAR)(Hist + 1); - memcpy(Hist->ExeName.Buffer, ExeName.Buffer, ExeName.Length); + memcpy(Hist->ExeName.Buffer, ExeName->Buffer, ExeName->Length); InsertHeadList(&Console->HistoryBuffers, &Hist->ListEntry); return Hist; } static VOID -HistoryAddEntry(PCONSOLE Console) +HistoryAddEntry(PCONSOLE Console, + PUNICODE_STRING ExeName) { UNICODE_STRING NewEntry; - PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName); INT i; if (!Hist) return; @@ -127,9 +127,11 @@ } static VOID -HistoryGetCurrentEntry(PCONSOLE Console, PUNICODE_STRING Entry) -{ - PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); +HistoryGetCurrentEntry(PCONSOLE Console, + PUNICODE_STRING ExeName, + PUNICODE_STRING Entry) +{ + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName); if (!Hist || Hist->NumEntries == 0) Entry->Length = 0; @@ -275,9 +277,11 @@ } static VOID -LineInputRecallHistory(PCONSOLE Console, INT Offset) -{ - PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); +LineInputRecallHistory(PCONSOLE Console, + PUNICODE_STRING ExeName, + INT Offset) +{ + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName); UINT Position = 0; if (!Hist || Hist->NumEntries == 0) return; @@ -293,7 +297,9 @@ } VOID -LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent) +LineInputKeyDown(PCONSOLE Console, + PUNICODE_STRING ExeName, + KEY_EVENT_RECORD *KeyEvent) { UINT Pos = Console->LinePos; PHISTORY_BUFFER Hist; @@ -346,7 +352,7 @@ else { /* Recall one character (but don't overwrite current line) */ - HistoryGetCurrentEntry(Console, &Entry); + HistoryGetCurrentEntry(Console, ExeName, &Entry); if (Pos < Console->LineSize) LineInputSetPos(Console, Pos + 1); else if (Pos * sizeof(WCHAR) < Entry.Length) @@ -365,26 +371,26 @@ return; case VK_PRIOR: /* Recall first history entry */ - LineInputRecallHistory(Console, -((WORD)-1)); + LineInputRecallHistory(Console, ExeName, -((WORD)-1)); return; case VK_NEXT: /* Recall last history entry */ - LineInputRecallHistory(Console, +((WORD)-1)); + LineInputRecallHistory(Console, ExeName, +((WORD)-1)); return; case VK_UP: case VK_F5: /* Recall previous history entry. On first time, actually recall the * current (usually last) entry; on subsequent times go back. */ - LineInputRecallHistory(Console, Console->LineUpPressed ? -1 : 0); + LineInputRecallHistory(Console, ExeName, Console->LineUpPressed ? -1 : 0); Console->LineUpPressed = TRUE; return; case VK_DOWN: /* Recall next history entry */ - LineInputRecallHistory(Console, +1); + LineInputRecallHistory(Console, ExeName, +1); return; case VK_F3: /* Recall remainder of current history entry */ - HistoryGetCurrentEntry(Console, &Entry); + HistoryGetCurrentEntry(Console, ExeName, &Entry); if (Pos * sizeof(WCHAR) < Entry.Length) { UINT InsertSize = (Entry.Length / sizeof(WCHAR) - Pos); @@ -398,11 +404,11 @@ break; case VK_F7: if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) - HistoryDeleteBuffer(HistoryCurrentBuffer(Console)); + HistoryDeleteBuffer(HistoryCurrentBuffer(Console, ExeName)); return; case VK_F8: /* Search for history entries starting with input. */ - Hist = HistoryCurrentBuffer(Console); + Hist = HistoryCurrentBuffer(Console, ExeName); if (!Hist || Hist->NumEntries == 0) return; /* Like Up/F5, on first time start from current (usually last) entry, @@ -446,7 +452,7 @@ } else if (KeyEvent->uChar.UnicodeChar == L'\r') { - HistoryAddEntry(Console); + HistoryAddEntry(Console, ExeName); /* TODO: Expand aliases */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.h [iso-8859-1] Fri Aug 1 18:08:29 2014 @@ -9,4 +9,8 @@ #pragma once VOID HistoryDeleteBuffers(PCONSOLE Console); -VOID LineInputKeyDown(PCONSOLE Console, KEY_EVENT_RECORD *KeyEvent); + +VOID +LineInputKeyDown(PCONSOLE Console, + PUNICODE_STRING ExeName, + KEY_EVENT_RECORD *KeyEvent);

1 0

[hbelusca] 63792: [CONSRV] - Start a better fix for the mouse event problem described in r62739. - Add a hack for the problem described in CORE-8394, that fixes some Far Manager mouse issues. CORE-...
by hbelusca＠svn.reactos.org 01 Aug '14

01 Aug '14

Author: hbelusca Date: Fri Aug 1 13:36:44 2014 New Revision: 63792 URL: http://svn.reactos.org/svn/reactos?rev=63792&view=rev Log: [CONSRV] - Start a better fix for the mouse event problem described in r62739. - Add a hack for the problem described in CORE-8394, that fixes some Far Manager mouse issues. CORE-8394 Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Fri Aug 1 13:36:44 2014 @@ -610,7 +610,6 @@ static VOID OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam) { - PCONSOLE Console = GuiData->Console; WORD ActivationState = LOWORD(wParam); DPRINT1("WM_ACTIVATE - ActivationState = %d\n"); @@ -637,12 +636,11 @@ } /* - * When we are in QuickEdit mode, ignore the next mouse signal - * when we are going to be enabled again via the mouse, in order - * to prevent e.g. an erroneous right-click from the user which - * would have as an effect to paste some unwanted text... + * Ignore the next mouse signal when we are going to be enabled again via + * the mouse, in order to prevent, e.g. when we are in Edit mode, erroneous + * mouse actions from the user that could spoil text selection or copy/pastes. */ - if (Console->QuickEdit && (ActivationState == WA_CLICKACTIVE)) + if (ActivationState == WA_CLICKACTIVE) GuiData->IgnoreNextMouseSignal = TRUE; } @@ -1386,15 +1384,18 @@ BOOL Err = FALSE; PCONSOLE Console = GuiData->Console; + // FIXME: It's here that we need to check whether we has focus or not + // and whether we are in edit mode or not, to know if we need to deal + // with the mouse, or not. + if (GuiData->IgnoreNextMouseSignal) { if (msg != WM_LBUTTONDOWN && msg != WM_MBUTTONDOWN && - msg != WM_RBUTTONDOWN && - msg != WM_MOUSEMOVE) + msg != WM_RBUTTONDOWN) { /* - * If this mouse signal is not a button-down action or a move, + * If this mouse signal is not a button-down action * then it is the last signal being ignored. */ GuiData->IgnoreNextMouseSignal = FALSE; @@ -1402,7 +1403,7 @@ else { /* - * This mouse signal is a button-down action or a move. + * This mouse signal is a button-down action. * Ignore it and perform default action. */ Err = TRUE; @@ -1607,6 +1608,20 @@ default: Err = TRUE; + break; + } + + /* + * HACK FOR CORE-8394: Ignore the next mouse move signal + * just after mouse down click actions. + */ + switch (msg) + { + case WM_LBUTTONDOWN: + case WM_MBUTTONDOWN: + case WM_RBUTTONDOWN: + GuiData->IgnoreNextMouseSignal = TRUE; + default: break; }

1 0

[dquintana] 63791: [STOBJECT] * Fix DllMain not being called when building with gcc. Apparently msvc makes DllMain extern "C" even if you didn't ask for it, unlike gcc. * Simplify some code.
by dquintana＠svn.reactos.org 31 Jul '14

31 Jul '14

Author: dquintana Date: Thu Jul 31 12:36:40 2014 New Revision: 63791 URL: http://svn.reactos.org/svn/reactos?rev=63791&view=rev Log: [STOBJECT] * Fix DllMain not being called when building with gcc. Apparently msvc makes DllMain extern "C" even if you didn't ask for it, unlike gcc. * Simplify some code. Modified: branches/shell-experiments/dll/shellext/stobject/csystray.cpp branches/shell-experiments/dll/shellext/stobject/stobject.cpp Modified: branches/shell-experiments/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/csystray.cpp [iso-8859-1] Thu Jul 31 12:36:40 2014 @@ -9,6 +9,11 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +SysTrayIconHandlers_t g_IconHandlers [] = { + { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message } +}; +const int g_NumIcons = _countof(g_IconHandlers); const GUID CLSID_SysTray = { 0x35CEC8A3, 0x2BE6, 0x11D2, { 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53 } }; Modified: branches/shell-experiments/dll/shellext/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/stobject/stobject.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/stobject/stobject.cpp [iso-8859-1] Thu Jul 31 12:36:40 2014 @@ -18,27 +18,15 @@ OBJECT_ENTRY(CLSID_SysTray, CSysTray) END_OBJECT_MAP() -const int ObjectMapCount = _countof(ObjectMap); - -class CShellTrayModule : public CComModule -{ -public: -}; - -HINSTANCE g_hInstance; -CShellTrayModule g_Module; -SysTrayIconHandlers_t g_IconHandlers [] = { - { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message } -}; -const int g_NumIcons = _countof(g_IconHandlers); +HINSTANCE g_hInstance; +CComModule g_Module; void *operator new (size_t, void *buf) { return buf; } -BOOL -WINAPI +STDAPI_(BOOL) DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { if (fdwReason == DLL_PROCESS_ATTACH) @@ -47,7 +35,7 @@ DisableThreadLibraryCalls(g_hInstance); /* HACK - the global constructors don't run, so I placement new them here */ - new (&g_Module) CShellTrayModule; + new (&g_Module) CComModule; new (&_AtlWinModule) CAtlWinModule; new (&_AtlBaseModule) CAtlBaseModule; new (&_AtlComModule) CAtlComModule; @@ -65,47 +53,22 @@ STDAPI DllRegisterServer(void) { - HRESULT hr; - - DbgPrint("DllRegisterServer should process %d classes...\n", ObjectMapCount); - - hr = g_Module.DllRegisterServer(FALSE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; + return g_Module.DllRegisterServer(FALSE); } STDAPI DllUnregisterServer(void) { - HRESULT hr; - - DbgPrint("DllUnregisterServer should process %d classes...\n", ObjectMapCount); - - hr = g_Module.DllUnregisterServer(FALSE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; + return g_Module.DllUnregisterServer(FALSE); } STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - HRESULT hr; - - DbgPrint("DllGetClassObject should process %d classes...\n", ObjectMapCount); - - hr = g_Module.DllGetClassObject(rclsid, riid, ppv); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - return S_OK; + return g_Module.DllGetClassObject(rclsid, riid, ppv); } -HRESULT -WINAPI +STDAPI DllCanUnloadNow(void) { return g_Module.DllCanUnloadNow();

1 0

[dquintana] 63790: [STOBJECT] * Move this shell extension to the shellext folder.
by dquintana＠svn.reactos.org 31 Jul '14

31 Jul '14

Author: dquintana Date: Thu Jul 31 11:44:21 2014 New Revision: 63790 URL: http://svn.reactos.org/svn/reactos?rev=63790&view=rev Log: [STOBJECT] * Move this shell extension to the shellext folder. Added: branches/shell-experiments/dll/shellext/stobject/ - copied from r63789, branches/shell-experiments/dll/win32/stobject/ Removed: branches/shell-experiments/dll/win32/stobject/ Modified: branches/shell-experiments/dll/shellext/CMakeLists.txt branches/shell-experiments/dll/win32/CMakeLists.txt Modified: branches/shell-experiments/dll/shellext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… ============================================================================== --- branches/shell-experiments/dll/shellext/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/shellext/CMakeLists.txt [iso-8859-1] Thu Jul 31 11:44:21 2014 @@ -4,3 +4,4 @@ add_subdirectory(devcpux) add_subdirectory(fontext) add_subdirectory(slayer) +add_subdirectory(stobject) Modified: branches/shell-experiments/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/CMa… ============================================================================== --- branches/shell-experiments/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/CMakeLists.txt [iso-8859-1] Thu Jul 31 11:44:21 2014 @@ -193,7 +193,6 @@ add_subdirectory(stdole2.tlb) add_subdirectory(stdole32.tlb) add_subdirectory(sti) -add_subdirectory(stobject) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed)

1 0

[dquintana] 63789: [STOBJECT] * Move SSO registration to the rgs file. * Add more debug prints.
by dquintana＠svn.reactos.org 31 Jul '14

31 Jul '14

Author: dquintana Date: Thu Jul 31 11:29:50 2014 New Revision: 63789 URL: http://svn.reactos.org/svn/reactos?rev=63789&view=rev Log: [STOBJECT] * Move SSO registration to the rgs file. * Add more debug prints. Modified: branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs branches/shell-experiments/dll/win32/stobject/stobject.cpp Modified: branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/resources/rgs/systray.rgs [iso-8859-1] Thu Jul 31 11:29:50 2014 @@ -11,3 +11,22 @@ } } } +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove CurrentVersion + { + NoRemove ShellServiceObjectDelayLoad + { + val SysTray = s '{35CEC8A3-2BE6-11D2-8773-92E220524153}' + } + } + } + } + } +} Modified: branches/shell-experiments/dll/win32/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/stobject.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/stobject.cpp [iso-8859-1] Thu Jul 31 11:29:50 2014 @@ -17,6 +17,8 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SysTray, CSysTray) END_OBJECT_MAP() + +const int ObjectMapCount = _countof(ObjectMap); class CShellTrayModule : public CComModule { @@ -60,67 +62,14 @@ return TRUE; } -static -HRESULT -RegisterShellServiceObject(REFGUID guidClass, LPCWSTR lpName, BOOL bRegister) -{ - const LPCWSTR strRegistryLocation = L"Software\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad"; - - HRESULT hr = E_FAIL; - - OLECHAR strGuid[128]; - - HKEY hKey = 0; - - if (!StringFromGUID2(guidClass, strGuid, _countof(strGuid))) - { - DbgPrint("StringFromGUID2 failed\n"); - goto cleanup; - } - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, strRegistryLocation, 0, KEY_WRITE, &hKey)) - { - DbgPrint("RegOpenKeyExW failed\n"); - goto cleanup; - } - - if (bRegister) - { - LONG cbGuid = (lstrlenW(strGuid) + 1) * 2; - if (RegSetValueExW(hKey, lpName, 0, REG_SZ, (const BYTE *) strGuid, cbGuid)) - { - DbgPrint("RegSetValueExW failed\n"); - goto cleanup; - } - } - else - { - if (RegDeleteValueW(hKey, lpName)) - { - DbgPrint("RegDeleteValueW failed\n"); - goto cleanup; - } - } - - hr = S_OK; - -cleanup: - if (hKey) - RegCloseKey(hKey); - - return hr; -} - STDAPI DllRegisterServer(void) { HRESULT hr; + DbgPrint("DllRegisterServer should process %d classes...\n", ObjectMapCount); + hr = g_Module.DllRegisterServer(FALSE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = RegisterShellServiceObject(CLSID_SysTray, L"SysTray", TRUE); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -132,9 +81,7 @@ { HRESULT hr; - hr = RegisterShellServiceObject(CLSID_SysTray, L"SysTray", FALSE); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + DbgPrint("DllUnregisterServer should process %d classes...\n", ObjectMapCount); hr = g_Module.DllUnregisterServer(FALSE); if (FAILED_UNEXPECTEDLY(hr)) @@ -147,7 +94,9 @@ DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { HRESULT hr; - + + DbgPrint("DllGetClassObject should process %d classes...\n", ObjectMapCount); + hr = g_Module.DllGetClassObject(rclsid, riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) return hr;

1 0

[dquintana] 63788: Sync with trunk r63786.
by dquintana＠svn.reactos.org 31 Jul '14

31 Jul '14

Author: dquintana Date: Thu Jul 31 00:57:14 2014 New Revision: 63788 URL: http://svn.reactos.org/svn/reactos?rev=63788&view=rev Log: Sync with trunk r63786. Added: branches/shell-experiments/base/applications/network/net/lang/ro-RO.rc - copied unchanged from r63787, trunk/reactos/base/applications/network/net/lang/ro-RO.rc branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt - copied unchanged from r63787, trunk/reactos/base/applications/rapps/rapps/ghostscript.txt branches/shell-experiments/base/applications/rapps/rapps/ghostview.txt - copied unchanged from r63787, trunk/reactos/base/applications/rapps/rapps/ghostview.txt branches/shell-experiments/base/applications/rapps/rapps/miktex.txt - copied unchanged from r63787, trunk/reactos/base/applications/rapps/rapps/miktex.txt branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt - copied unchanged from r63787, trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt branches/shell-experiments/base/system/subst/lang/de-DE.rc - copied unchanged from r63787, trunk/reactos/base/system/subst/lang/de-DE.rc branches/shell-experiments/base/system/winlogon/res/ - copied from r63787, trunk/reactos/base/system/winlogon/res/ branches/shell-experiments/dll/cpl/usrmgr/lang/tr-TR.rc - copied unchanged from r63787, trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc branches/shell-experiments/subsystems/ntvdm/lang/ro-RO.rc - copied unchanged from r63787, trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/base/applications/calc/lang/tr-TR.rc branches/shell-experiments/base/applications/charmap/lang/tr-TR.rc branches/shell-experiments/base/applications/cmdutils/dbgprint/dbgprint.c branches/shell-experiments/base/applications/cmdutils/help/lang/ro-RO.rc branches/shell-experiments/base/applications/cmdutils/help/lang/uk-UA.rc branches/shell-experiments/base/applications/cmdutils/xcopy/lang/Ro.rc branches/shell-experiments/base/applications/dxdiag/lang/tr-TR.rc branches/shell-experiments/base/applications/games/solitaire/lang/bg-BG.rc branches/shell-experiments/base/applications/games/solitaire/lang/ca-ES.rc branches/shell-experiments/base/applications/games/solitaire/lang/cs-CZ.rc branches/shell-experiments/base/applications/games/solitaire/lang/de-DE.rc branches/shell-experiments/base/applications/games/solitaire/lang/el-GR.rc branches/shell-experiments/base/applications/games/solitaire/lang/en-US.rc branches/shell-experiments/base/applications/games/solitaire/lang/es-ES.rc branches/shell-experiments/base/applications/games/solitaire/lang/eu-ES.rc branches/shell-experiments/base/applications/games/solitaire/lang/fr-FR.rc branches/shell-experiments/base/applications/games/solitaire/lang/he-IL.rc branches/shell-experiments/base/applications/games/solitaire/lang/hu-HU.rc branches/shell-experiments/base/applications/games/solitaire/lang/id-ID.rc branches/shell-experiments/base/applications/games/solitaire/lang/it-IT.rc branches/shell-experiments/base/applications/games/solitaire/lang/ja-JP.rc branches/shell-experiments/base/applications/games/solitaire/lang/ko-KR.rc branches/shell-experiments/base/applications/games/solitaire/lang/lt-LT.rc branches/shell-experiments/base/applications/games/solitaire/lang/nl-NL.rc branches/shell-experiments/base/applications/games/solitaire/lang/no-NO.rc branches/shell-experiments/base/applications/games/solitaire/lang/pl-PL.rc branches/shell-experiments/base/applications/games/solitaire/lang/ro-RO.rc branches/shell-experiments/base/applications/games/solitaire/lang/ru-RU.rc branches/shell-experiments/base/applications/games/solitaire/lang/sk-SK.rc branches/shell-experiments/base/applications/games/solitaire/lang/sq-AL.rc branches/shell-experiments/base/applications/games/solitaire/lang/sv-SE.rc branches/shell-experiments/base/applications/games/solitaire/lang/th-TH.rc branches/shell-experiments/base/applications/games/solitaire/lang/tr-TR.rc branches/shell-experiments/base/applications/games/solitaire/lang/uk-UA.rc branches/shell-experiments/base/applications/games/solitaire/lang/zh-CN.rc branches/shell-experiments/base/applications/games/solitaire/lang/zh-TW.rc branches/shell-experiments/base/applications/games/solitaire/solcreate.cpp branches/shell-experiments/base/applications/games/solitaire/solitaire.h branches/shell-experiments/base/applications/games/spider/lang/bg-BG.rc branches/shell-experiments/base/applications/games/spider/lang/de-DE.rc branches/shell-experiments/base/applications/games/spider/lang/en-US.rc branches/shell-experiments/base/applications/games/spider/lang/es-ES.rc branches/shell-experiments/base/applications/games/spider/lang/fr-FR.rc branches/shell-experiments/base/applications/games/spider/lang/he-IL.rc branches/shell-experiments/base/applications/games/spider/lang/hu-HU.rc branches/shell-experiments/base/applications/games/spider/lang/it-IT.rc branches/shell-experiments/base/applications/games/spider/lang/ja-JP.rc branches/shell-experiments/base/applications/games/spider/lang/nl-NL.rc branches/shell-experiments/base/applications/games/spider/lang/pl-PL.rc branches/shell-experiments/base/applications/games/spider/lang/pt-BR.rc branches/shell-experiments/base/applications/games/spider/lang/ro-RO.rc branches/shell-experiments/base/applications/games/spider/lang/ru-RU.rc branches/shell-experiments/base/applications/games/spider/lang/sk-SK.rc branches/shell-experiments/base/applications/games/spider/lang/sq-AL.rc branches/shell-experiments/base/applications/games/spider/lang/sv-SE.rc branches/shell-experiments/base/applications/games/spider/lang/tr-TR.rc branches/shell-experiments/base/applications/games/spider/lang/uk-UA.rc branches/shell-experiments/base/applications/games/spider/lang/zh-CN.rc branches/shell-experiments/base/applications/games/spider/lang/zh-TW.rc branches/shell-experiments/base/applications/games/spider/spider.cpp branches/shell-experiments/base/applications/games/spider/spider.h branches/shell-experiments/base/applications/games/winmine/lang/tr-TR.rc branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/devmgmt/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ro-RO.rc branches/shell-experiments/base/applications/mscutils/eventvwr/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc branches/shell-experiments/base/applications/network/net/net.rc branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/rapps/7zip.txt branches/shell-experiments/base/applications/rapps/rapps/abyss.txt branches/shell-experiments/base/applications/rapps/rapps/ac97forvirtualbox.txt branches/shell-experiments/base/applications/rapps/rapps/alreader.txt branches/shell-experiments/base/applications/rapps/rapps/ants.txt branches/shell-experiments/base/applications/rapps/rapps/bittorrent.txt branches/shell-experiments/base/applications/rapps/rapps/bochs.txt branches/shell-experiments/base/applications/rapps/rapps/boundaround.txt branches/shell-experiments/base/applications/rapps/rapps/christmasbound.txt branches/shell-experiments/base/applications/rapps/rapps/cnt.txt branches/shell-experiments/base/applications/rapps/rapps/codeblocks.txt branches/shell-experiments/base/applications/rapps/rapps/codeblocks_gcc.txt branches/shell-experiments/base/applications/rapps/rapps/codeblocks_gcc_2.txt branches/shell-experiments/base/applications/rapps/rapps/devcpp_mingw32.txt branches/shell-experiments/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt branches/shell-experiments/base/applications/rapps/rapps/doublecommander.txt branches/shell-experiments/base/applications/rapps/rapps/dplus.txt branches/shell-experiments/base/applications/rapps/rapps/fap.txt branches/shell-experiments/base/applications/rapps/rapps/fira.txt branches/shell-experiments/base/applications/rapps/rapps/firefox.txt branches/shell-experiments/base/applications/rapps/rapps/firefox36.txt branches/shell-experiments/base/applications/rapps/rapps/freebasic.txt branches/shell-experiments/base/applications/rapps/rapps/irfanview.txt branches/shell-experiments/base/applications/rapps/rapps/irfanviewplugins.txt branches/shell-experiments/base/applications/rapps/rapps/lazaruside.txt branches/shell-experiments/base/applications/rapps/rapps/libreoffice.txt branches/shell-experiments/base/applications/rapps/rapps/mcwin32.txt branches/shell-experiments/base/applications/rapps/rapps/mirandaim.txt branches/shell-experiments/base/applications/rapps/rapps/mirc.txt branches/shell-experiments/base/applications/rapps/rapps/mono2.txt branches/shell-experiments/base/applications/rapps/rapps/mpc.txt branches/shell-experiments/base/applications/rapps/rapps/net11.txt branches/shell-experiments/base/applications/rapps/rapps/net20sp2.txt branches/shell-experiments/base/applications/rapps/rapps/npp.txt branches/shell-experiments/base/applications/rapps/rapps/offbyone.txt branches/shell-experiments/base/applications/rapps/rapps/openoffice.txt branches/shell-experiments/base/applications/rapps/rapps/openoffice2.4.txt branches/shell-experiments/base/applications/rapps/rapps/openttd.txt branches/shell-experiments/base/applications/rapps/rapps/opera.txt branches/shell-experiments/base/applications/rapps/rapps/opera9.txt branches/shell-experiments/base/applications/rapps/rapps/peazip.txt branches/shell-experiments/base/applications/rapps/rapps/pptview.txt branches/shell-experiments/base/applications/rapps/rapps/ptanks.txt branches/shell-experiments/base/applications/rapps/rapps/python.txt branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt branches/shell-experiments/base/applications/rapps/rapps/rosbearm.txt branches/shell-experiments/base/applications/rapps/rapps/sbforvmware.txt branches/shell-experiments/base/applications/rapps/rapps/scite.txt branches/shell-experiments/base/applications/rapps/rapps/scummvm.txt branches/shell-experiments/base/applications/rapps/rapps/sdl_mixer.txt branches/shell-experiments/base/applications/rapps/rapps/sdl_runtime.txt branches/shell-experiments/base/applications/rapps/rapps/seamonkey.txt branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt branches/shell-experiments/base/applications/rapps/rapps/snoopy.txt branches/shell-experiments/base/applications/rapps/rapps/sumatrapdf.txt branches/shell-experiments/base/applications/rapps/rapps/summerbound.txt branches/shell-experiments/base/applications/rapps/rapps/supertux.txt branches/shell-experiments/base/applications/rapps/rapps/thunderbird.txt branches/shell-experiments/base/applications/rapps/rapps/totalcommander.txt branches/shell-experiments/base/applications/rapps/rapps/ultravnc.txt branches/shell-experiments/base/applications/rapps/rapps/utorrent.txt branches/shell-experiments/base/applications/rapps/rapps/vlc.txt branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc branches/shell-experiments/base/applications/write/lang/Sq.rc branches/shell-experiments/base/setup/reactos/lang/ro-RO.rc branches/shell-experiments/base/setup/reactos/lang/tr-TR.rc branches/shell-experiments/base/setup/usetup/filesup.c branches/shell-experiments/base/setup/usetup/fslist.c branches/shell-experiments/base/setup/usetup/lang/ro-RO.h branches/shell-experiments/base/setup/vmwinst/lang/ro-RO.rc branches/shell-experiments/base/setup/vmwinst/lang/tr-TR.rc branches/shell-experiments/base/setup/welcome/lang/tr-TR.rc branches/shell-experiments/base/shell/cmd/cmd.c branches/shell-experiments/base/shell/cmd/cmd.rc branches/shell-experiments/base/system/diskpart/lang/en-US.rc branches/shell-experiments/base/system/format/format.c branches/shell-experiments/base/system/format/lang/de-DE.rc branches/shell-experiments/base/system/regsvr32/lang/de-DE.rc branches/shell-experiments/base/system/rundll32/lang/de-DE.rc branches/shell-experiments/base/system/runonce/lang/de-DE.rc branches/shell-experiments/base/system/services/database.c branches/shell-experiments/base/system/smss/smutil.c branches/shell-experiments/base/system/subst/subst.rc branches/shell-experiments/base/system/winlogon/lang/de-DE.rc branches/shell-experiments/base/system/winlogon/lang/fr-FR.rc branches/shell-experiments/base/system/winlogon/lang/ro-RO.rc branches/shell-experiments/base/system/winlogon/winlogon.c branches/shell-experiments/base/system/winlogon/winlogon.rc branches/shell-experiments/boot/armllb/inc/osloader.h branches/shell-experiments/boot/bootdata/hivecls.inf branches/shell-experiments/boot/bootdata/hivesys.inf branches/shell-experiments/boot/bootdata/packages/reactos.dff.in branches/shell-experiments/boot/freeldr/fdebug/fdebug.rc branches/shell-experiments/boot/freeldr/fdebug/lang/tr-TR.rc branches/shell-experiments/boot/freeldr/freeldr/CMakeLists.txt branches/shell-experiments/boot/freeldr/freeldr/arch/arm/boot.s branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc branches/shell-experiments/dll/cpl/appwiz/addons.c branches/shell-experiments/dll/cpl/appwiz/lang/ro-RO.rc branches/shell-experiments/dll/cpl/appwiz/lang/tr-TR.rc branches/shell-experiments/dll/cpl/appwiz/rsrc.rc branches/shell-experiments/dll/cpl/console/lang/tr-TR.rc branches/shell-experiments/dll/cpl/desk/devsett.c branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc branches/shell-experiments/dll/cpl/hdwwiz/lang/ro-RO.rc branches/shell-experiments/dll/cpl/hdwwiz/lang/tr-TR.rc branches/shell-experiments/dll/cpl/inetcpl/lang/tr-TR.rc branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc branches/shell-experiments/dll/cpl/intl/lang/tr-TR.rc branches/shell-experiments/dll/cpl/joy/lang/tr-TR.rc branches/shell-experiments/dll/cpl/liccpa/lang/ro-RO.rc branches/shell-experiments/dll/cpl/liccpa/lang/tr-TR.rc branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc branches/shell-experiments/dll/cpl/sysdm/lang/ro-RO.rc branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc branches/shell-experiments/dll/cpl/telephon/lang/tr-TR.rc branches/shell-experiments/dll/cpl/timedate/lang/tr-TR.rc branches/shell-experiments/dll/cpl/usrmgr/usrmgr.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc branches/shell-experiments/dll/directx/wine/dsound/dsound_main.c branches/shell-experiments/dll/directx/wine/quartz/enumfilters.c branches/shell-experiments/dll/directx/wine/quartz/filesource.c branches/shell-experiments/dll/directx/wine/quartz/nullrenderer.c branches/shell-experiments/dll/directx/wine/quartz/parser.c branches/shell-experiments/dll/ntdll/csr/connect.c branches/shell-experiments/dll/ntdll/ldr/ldrutils.c branches/shell-experiments/dll/opengl/opengl32/dllmain.c branches/shell-experiments/dll/opengl/opengl32/icdload.c branches/shell-experiments/dll/opengl/opengl32/opengl32.h branches/shell-experiments/dll/opengl/opengl32/wgl.c branches/shell-experiments/dll/shellext/deskadp/deskadp.rc branches/shell-experiments/dll/shellext/deskadp/lang/tr-TR.rc branches/shell-experiments/dll/shellext/deskmon/deskmon.rc branches/shell-experiments/dll/shellext/deskmon/lang/tr-TR.rc branches/shell-experiments/dll/shellext/slayer/lang/tr-TR.rc branches/shell-experiments/dll/shellext/slayer/slayer.rc branches/shell-experiments/dll/win32/aclui/lang/tr-TR.rc branches/shell-experiments/dll/win32/advapi32/reg/reg.c branches/shell-experiments/dll/win32/cards/cards.h branches/shell-experiments/dll/win32/cards/res/default/Background_1.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_10.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_11.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_12.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_2.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_3.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_4.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_5.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_7.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_8.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_9.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/FreeCard.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Joker.bmp branches/shell-experiments/dll/win32/cards/res/default/OSign.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/XSign.bmp branches/shell-experiments/dll/win32/comctl32/comctl32.spec branches/shell-experiments/dll/win32/devmgr/advprop.c branches/shell-experiments/dll/win32/fmifs/chkdsk.c branches/shell-experiments/dll/win32/fmifs/compress.c branches/shell-experiments/dll/win32/fmifs/diskcopy.c branches/shell-experiments/dll/win32/fmifs/fmifs.spec branches/shell-experiments/dll/win32/fmifs/format.c branches/shell-experiments/dll/win32/fmifs/init.c branches/shell-experiments/dll/win32/fmifs/media.c branches/shell-experiments/dll/win32/fmifs/precomp.h branches/shell-experiments/dll/win32/fmifs/query.c branches/shell-experiments/dll/win32/kernel32/client/file/fileinfo.c branches/shell-experiments/dll/win32/kernel32/winnls/string/nls.c branches/shell-experiments/dll/win32/mpr/lang/mpr_Tr.rc branches/shell-experiments/dll/win32/mpr/mpr.rc branches/shell-experiments/dll/win32/msacm32/lang/msacm_Tr.rc branches/shell-experiments/dll/win32/msacm32/msacm.rc branches/shell-experiments/dll/win32/msgina/gui.c branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc branches/shell-experiments/dll/win32/msgina/lang/en-US.rc branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc branches/shell-experiments/dll/win32/msgina/msgina.c branches/shell-experiments/dll/win32/msgina/msgina.h branches/shell-experiments/dll/win32/msgina/resource.h branches/shell-experiments/dll/win32/msi/msi_Tr.rc branches/shell-experiments/dll/win32/netshell/connectmanager.cpp branches/shell-experiments/dll/win32/netshell/shfldr_netconnect.cpp branches/shell-experiments/dll/win32/newdev/lang/ro-RO.rc branches/shell-experiments/dll/win32/ole32/ole32.spec branches/shell-experiments/dll/win32/oleaut32/lang/oleaut32_Tr.rc branches/shell-experiments/dll/win32/oleaut32/oleaut32.rc branches/shell-experiments/dll/win32/rasdlg/lang/ro-RO.rc branches/shell-experiments/dll/win32/samlib/precomp.h branches/shell-experiments/dll/win32/samlib/samlib.c branches/shell-experiments/dll/win32/setupapi/interface.c branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Tr.rc branches/shell-experiments/dll/win32/shlwapi/path.c branches/shell-experiments/dll/win32/shlwapi/shlwapi.rc branches/shell-experiments/dll/win32/shlwapi/shlwapi.spec branches/shell-experiments/dll/win32/syssetup/lang/ro-RO.rc branches/shell-experiments/dll/win32/urlmon/urlmon.spec branches/shell-experiments/dll/win32/wbemprox/builtin.c branches/shell-experiments/dll/win32/wininet/http.c branches/shell-experiments/dll/win32/wininet/lang/wininet_Tr.rc branches/shell-experiments/dll/win32/wininet/rsrc.rc branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Tr.rc branches/shell-experiments/dll/win32/wldap32/wldap32.rc branches/shell-experiments/drivers/ksfilter/ks/precomp.h branches/shell-experiments/drivers/ksfilter/ks/swenum.c branches/shell-experiments/drivers/sac/driver/memory.c branches/shell-experiments/drivers/storage/class/disk/disk.c branches/shell-experiments/drivers/storage/scsiport/scsiport.c branches/shell-experiments/drivers/usb/usbehci/ (props changed) branches/shell-experiments/drivers/usb/usbehci/interfaces.h branches/shell-experiments/drivers/usb/usbehci/usb_queue.cpp branches/shell-experiments/drivers/usb/usbehci/usb_request.cpp branches/shell-experiments/drivers/usb/usbehci/usbehci.cpp branches/shell-experiments/drivers/usb/usbohci/ (props changed) branches/shell-experiments/drivers/usb/usbohci/usbohci.cpp branches/shell-experiments/drivers/usb/usbuhci/usbuhci.cpp branches/shell-experiments/include/ndk/amd64/mmtypes.h branches/shell-experiments/include/ndk/arm/mmtypes.h branches/shell-experiments/include/ndk/i386/mmtypes.h branches/shell-experiments/include/ndk/mmtypes.h branches/shell-experiments/include/ndk/psfuncs.h branches/shell-experiments/include/ndk/pstypes.h branches/shell-experiments/include/psdk/ntstatus.h branches/shell-experiments/include/psdk/sal.h branches/shell-experiments/include/reactos/libs/fmifs/fmifs.h branches/shell-experiments/include/reactos/wine/strmbase.h branches/shell-experiments/lib/3rdparty/strmbase/filter.c branches/shell-experiments/lib/3rdparty/strmbase/renderer.c branches/shell-experiments/lib/3rdparty/strmbase/transform.c branches/shell-experiments/lib/drivers/libusb/common_interfaces.h (contents, props changed) branches/shell-experiments/lib/drivers/libusb/hcd_controller.cpp (contents, props changed) branches/shell-experiments/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/shell-experiments/lib/drivers/libusb/libusb.cpp (contents, props changed) branches/shell-experiments/lib/fslib/vfatlib/fat32.c branches/shell-experiments/lib/pseh/CMakeLists.txt branches/shell-experiments/lib/rtl/error.c branches/shell-experiments/lib/rtl/exception.c branches/shell-experiments/lib/rtl/sd.c branches/shell-experiments/lib/sdk/crt/CMakeLists.txt branches/shell-experiments/lib/sdk/crt/printf/swprintf_s.c branches/shell-experiments/lib/sdk/crt/printf/wvsnprintfW.c branches/shell-experiments/lib/sdk/crt/printf/wvsprintfW.c branches/shell-experiments/lib/sdk/crt/string/winesup.c branches/shell-experiments/ntoskrnl/cc/fs.c branches/shell-experiments/ntoskrnl/cc/view.c branches/shell-experiments/ntoskrnl/config/cmapi.c branches/shell-experiments/ntoskrnl/config/cmse.c branches/shell-experiments/ntoskrnl/config/cmsysini.c branches/shell-experiments/ntoskrnl/config/ntapi.c branches/shell-experiments/ntoskrnl/fstub/disksup.c branches/shell-experiments/ntoskrnl/include/internal/cc.h branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c branches/shell-experiments/ntoskrnl/po/power.c branches/shell-experiments/ntoskrnl/ps/win32.c branches/shell-experiments/subsystems/ntvdm/dos/dem.c branches/shell-experiments/subsystems/ntvdm/ntvdm.rc branches/shell-experiments/subsystems/win32/csrsrv/procsup.c branches/shell-experiments/subsystems/win32/csrsrv/thredsup.c branches/shell-experiments/tools/spec2def/spec2def.c branches/shell-experiments/win32ss/gdi/eng/bitblt.c branches/shell-experiments/win32ss/gdi/eng/clip.c branches/shell-experiments/win32ss/gdi/eng/driverobj.c branches/shell-experiments/win32ss/gdi/eng/engobjects.h branches/shell-experiments/win32ss/gdi/eng/engwindow.c branches/shell-experiments/win32ss/gdi/eng/inteng.h branches/shell-experiments/win32ss/gdi/eng/lineto.c branches/shell-experiments/win32ss/gdi/ntgdi/arc.c branches/shell-experiments/win32ss/gdi/ntgdi/bitblt.c branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.h branches/shell-experiments/win32ss/gdi/ntgdi/dc.h branches/shell-experiments/win32ss/gdi/ntgdi/dclife.c branches/shell-experiments/win32ss/gdi/ntgdi/dcobjs.c branches/shell-experiments/win32ss/gdi/ntgdi/dcstate.c branches/shell-experiments/win32ss/gdi/ntgdi/dcutil.c branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c branches/shell-experiments/win32ss/gdi/ntgdi/drawing.c branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c branches/shell-experiments/win32ss/gdi/ntgdi/line.c branches/shell-experiments/win32ss/gdi/ntgdi/palette.c branches/shell-experiments/win32ss/gdi/ntgdi/palette.h branches/shell-experiments/win32ss/gdi/ntgdi/path.c branches/shell-experiments/win32ss/gdi/ntgdi/polyfill.c branches/shell-experiments/win32ss/gdi/ntgdi/region.c branches/shell-experiments/win32ss/gdi/ntgdi/region.h branches/shell-experiments/win32ss/gdi/ntgdi/wingl.c branches/shell-experiments/win32ss/user/ntuser/cursoricon.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/dce.h branches/shell-experiments/win32ss/user/ntuser/ntuser.c branches/shell-experiments/win32ss/user/ntuser/windc.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/user32/lang/ro-RO.rc branches/shell-experiments/win32ss/user/user32/windows/menu.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc branches/shell-experiments/win32ss/user/winsrv/consrv/lang/ro-RO.rc branches/shell-experiments/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc branches/shell-experiments/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/bg-BG.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/de-DE.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/el-GR.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/es-ES.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/fr-FR.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/ja-JP.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/no-NO.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/sk-SK.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/sv-SE.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/zh-CN.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/zh-TW.rc branches/shell-experiments/win32ss/user/winsrv/usersrv/usersrv.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/help/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/help/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/xcopy/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/solcreate.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/write/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/re… Modified: branches/shell-experiments/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/re… Modified: branches/shell-experiments/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/setup/vmwinst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/vm… Modified: branches/shell-experiments/base/setup/vmwinst/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/vm… Modified: branches/shell-experiments/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/we… Modified: branches/shell-experiments/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/d… Modified: branches/shell-experiments/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/f… Modified: branches/shell-experiments/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/f… Modified: branches/shell-experiments/base/system/regsvr32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/r… Modified: branches/shell-experiments/base/system/rundll32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/r… Modified: branches/shell-experiments/base/system/runonce/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/r… Modified: branches/shell-experiments/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/base/system/smss/smutil.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/w… Modified: branches/shell-experiments/boot/armllb/inc/osloader.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/armllb/i… Modified: branches/shell-experiments/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/acces… Modified: branches/shell-experiments/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/appwi… Modified: branches/shell-experiments/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/hdwwi… Modified: branches/shell-experiments/dll/cpl/hdwwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/hdwwi… Modified: branches/shell-experiments/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/inetc… Modified: branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/input… Modified: branches/shell-experiments/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/intl/… Modified: branches/shell-experiments/dll/cpl/joy/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/joy/l… Modified: branches/shell-experiments/dll/cpl/liccpa/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/liccp… Modified: branches/shell-experiments/dll/cpl/liccpa/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/liccp… Modified: branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/main/… Modified: branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/mmsys… Modified: branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/power… Modified: branches/shell-experiments/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/sysdm… Modified: branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/sysdm… Modified: branches/shell-experiments/dll/cpl/telephon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/telep… Modified: branches/shell-experiments/dll/cpl/timedate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/timed… Modified: branches/shell-experiments/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/usrmg… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/directx/wine/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/csr… Modified: branches/shell-experiments/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/ldr… Modified: branches/shell-experiments/dll/opengl/opengl32/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/opengl/opengl32/icdload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/opengl/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/shellext/deskadp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/shellext/deskmon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/shellext/slayer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/shellext/slayer/slayer.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/shellext/… Modified: branches/shell-experiments/dll/win32/aclui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/acl… Modified: branches/shell-experiments/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_5.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_8.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Joker.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/OSign.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/XSign.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/fmifs/chkdsk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/compress.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/diskcopy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/fmifs.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/format.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/init.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/media.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/fmifs/query.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/fmi… Modified: branches/shell-experiments/dll/win32/kernel32/client/file/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/mpr… Modified: branches/shell-experiments/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msa… Modified: branches/shell-experiments/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msi/msi_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msi… Modified: branches/shell-experiments/dll/win32/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/new… Modified: branches/shell-experiments/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/lang/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ras… Modified: branches/shell-experiments/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sam… Modified: branches/shell-experiments/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sam… Modified: branches/shell-experiments/dll/win32/setupapi/interface.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/set… Modified: branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shlwapi/lang/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shl… Modified: branches/shell-experiments/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sys… Modified: branches/shell-experiments/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/url… Modified: branches/shell-experiments/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wbe… Modified: branches/shell-experiments/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/wininet/lang/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wld… Modified: branches/shell-experiments/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/wld… Modified: branches/shell-experiments/drivers/ksfilter/ks/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/ksfil… Modified: branches/shell-experiments/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/ksfil… Modified: branches/shell-experiments/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/sac/d… Modified: branches/shell-experiments/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/usb/usbehci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/drivers/usb/usbehci/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/drivers/usb/usbohci/usbohci.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/drivers/usb/usbuhci/usbuhci.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/usb/u… Modified: branches/shell-experiments/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/a… Modified: branches/shell-experiments/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/a… Modified: branches/shell-experiments/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/i… Modified: branches/shell-experiments/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/m… Modified: branches/shell-experiments/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/p… Modified: branches/shell-experiments/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/p… Modified: branches/shell-experiments/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/reactos/libs/fmifs/fmifs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/wine/strmbase.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/drivers/libusb/common_interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/l… Modified: branches/shell-experiments/lib/drivers/libusb/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/l… Modified: branches/shell-experiments/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/l… Modified: branches/shell-experiments/lib/drivers/libusb/libusb.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/drivers/l… Modified: branches/shell-experiments/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fslib/vfa… Modified: branches/shell-experiments/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/CMak… Modified: branches/shell-experiments/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/error… Modified: branches/shell-experiments/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/excep… Modified: branches/shell-experiments/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/rtl/sd.c?… Modified: branches/shell-experiments/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/C… Modified: branches/shell-experiments/lib/sdk/crt/printf/swprintf_s.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/p… Modified: branches/shell-experiments/lib/sdk/crt/printf/wvsnprintfW.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/p… Modified: branches/shell-experiments/lib/sdk/crt/printf/wvsprintfW.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/p… Modified: branches/shell-experiments/lib/sdk/crt/string/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/sdk/crt/s… Modified: branches/shell-experiments/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/cc/f… Modified: branches/shell-experiments/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/cc/v… Modified: branches/shell-experiments/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/fstu… Modified: branches/shell-experiments/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/po/p… Modified: branches/shell-experiments/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ps/w… Modified: branches/shell-experiments/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/wi… Modified: branches/shell-experiments/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/wi… Modified: branches/shell-experiments/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/tools/spec2de… Modified: branches/shell-experiments/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/engobjects.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/e… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/wingl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/dce.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/usersrv/usersrv.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[dquintana] 63787: [STOBJECT] * Improve code organization. * Add some debug prints. * Fix some nits.
by dquintana＠svn.reactos.org 30 Jul '14

30 Jul '14

Author: dquintana Date: Wed Jul 30 22:08:05 2014 New Revision: 63787 URL: http://svn.reactos.org/svn/reactos?rev=63787&view=rev Log: [STOBJECT] * Improve code organization. * Add some debug prints. * Fix some nits. Added: branches/shell-experiments/dll/win32/stobject/csystray.cpp (with props) branches/shell-experiments/dll/win32/stobject/csystray.h (with props) Modified: branches/shell-experiments/base/shell/explorer-new/shellservice.c branches/shell-experiments/dll/win32/stobject/CMakeLists.txt branches/shell-experiments/dll/win32/stobject/precomp.h branches/shell-experiments/dll/win32/stobject/stobject.cpp branches/shell-experiments/dll/win32/stobject/volume.cpp Modified: branches/shell-experiments/base/shell/explorer-new/shellservice.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/shellservice.c [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -27,6 +27,7 @@ { IOleCommandTarget * pOct = pItem; HRESULT * phr = pData; + DbgPrint("Initializing SSO %p\n", pOct); *phr = IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_NEW, OLECMDEXECOPT_DODEFAULT, NULL, NULL); return SUCCEEDED(*phr); } @@ -34,6 +35,7 @@ static int CALLBACK ShutdownAllCallback(void* pItem, void* pData) { IOleCommandTarget * pOct = pItem; + DbgPrint("Shutting down SSO %p\n", pOct); IOleCommandTarget_Exec(pOct, &CGID_ShellServiceObject, OLECMDID_SAVE, OLECMDEXECOPT_DODEFAULT, NULL, NULL); return TRUE; } @@ -41,6 +43,7 @@ static int CALLBACK DeleteAllEnumCallback(void* pItem, void* pData) { IOleCommandTarget * pOct = pItem; + DbgPrint("Releasing SSO %p\n", pOct); IUnknown_Release(pOct); return TRUE; } @@ -60,10 +63,13 @@ hdpa = DPA_Create(5); + DbgPrint("Enumerating Shell Service Ojbect GUIDs...\n"); + if (RegOpenKey(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad", &hkey)) { + DbgPrint("ERROR: RegOpenKey failed.\n"); return HRESULT_FROM_WIN32(GetLastError()); } @@ -78,15 +84,24 @@ break; if (type != REG_SZ) + { + DbgPrint("WARNING: Value type was not REG_SZ.\n"); continue; + } hr = CLSIDFromString(value, &clsid); if (FAILED(hr)) + { + DbgPrint("ERROR: CLSIDFromString failed %08x.\n", hr); goto cleanup; + } hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (VOID**) &pOct); if (FAILED(hr)) + { + DbgPrint("ERROR: CoCreateInstance failed %08x.\n", hr); goto cleanup; + } DPA_AppendPtr(hdpa, pOct); @@ -96,6 +111,7 @@ if (ret != ERROR_NO_MORE_ITEMS) { + DbgPrint("ERROR: RegEnumValueW failed %08x.\n", ret); hr = HRESULT_FROM_WIN32(GetLastError()); goto cleanup; } Modified: branches/shell-experiments/dll/win32/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/CMakeLists.txt [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -15,6 +15,7 @@ spec2def(stobject.dll stobject.spec) add_library(stobject SHARED + csystray.cpp stobject.cpp stobject.rc volume.cpp Added: branches/shell-experiments/dll/win32/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/csystray.cpp (added) +++ branches/shell-experiments/dll/win32/stobject/csystray.cpp [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -0,0 +1,200 @@ +/* +* PROJECT: ReactOS system libraries +* LICENSE: GPL - See COPYING in the top level directory +* FILE: dll\win32\stobject\csystray.cpp +* PURPOSE: Systray shell service object implementation +* PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> +*/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +const GUID CLSID_SysTray = { 0x35CEC8A3, 0x2BE6, 0x11D2, { 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53 } }; + +CSysTray::CSysTray() {} +CSysTray::~CSysTray() {} + +HRESULT CSysTray::InitIcons() +{ + for (int i = 0; i < g_NumIcons; i++) + { + HRESULT hr = g_IconHandlers[i].pfnInit(this); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + +HRESULT CSysTray::ShutdownIcons() +{ + for (int i = 0; i < g_NumIcons; i++) + { + HRESULT hr = g_IconHandlers[i].pfnShutdown(this); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + +HRESULT CSysTray::UpdateIcons() +{ + for (int i = 0; i < g_NumIcons; i++) + { + HRESULT hr = g_IconHandlers[i].pfnUpdate(this); + if (FAILED(hr)) + return hr; + } + + return S_OK; +} + +HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + for (int i = 0; i < g_NumIcons; i++) + { + HRESULT hr = g_IconHandlers[i].pfnMessage(this, uMsg, wParam, lParam); + if (FAILED(hr)) + return hr; + + if (hr != S_FALSE) + return hr; + } + + return S_OK; +} + +HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) +{ + NOTIFYICONDATA nim; + nim.cbSize = sizeof(NOTIFYICONDATA); + nim.uFlags = NIF_ICON | NIF_STATE | NIF_TIP; + nim.hIcon = hIcon; + nim.uID = uId; + nim.uCallbackMessage = uId; + nim.dwState = 0; + nim.dwStateMask = 0; + nim.hWnd = m_hWnd; + nim.uVersion = NOTIFYICON_VERSION; + if (szTip) + StringCchCopy(nim.szTip, _countof(nim.szTip), szTip); + else + nim.szTip[0] = 0; + BOOL ret = Shell_NotifyIcon(code, &nim); + return ret ? S_OK : E_FAIL; +} + +DWORD WINAPI CSysTray::s_SysTrayThreadProc(PVOID param) +{ + CSysTray * st = (CSysTray*) param; + return st->SysTrayThreadProc(); +} + +HRESULT CSysTray::SysTrayMessageLoop() +{ + BOOL ret; + MSG msg; + + while ((ret = GetMessage(&msg, NULL, 0, 0)) != 0) + { + if (ret < 0) + break; + + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return S_OK; +} + +HRESULT CSysTray::SysTrayThreadProc() +{ + WCHAR strFileName[MAX_PATH]; + GetModuleFileNameW(g_hInstance, strFileName, MAX_PATH); + HMODULE hLib = LoadLibraryW(strFileName); + + CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE | COINIT_APARTMENTTHREADED); + + Create(NULL); + + HRESULT ret = SysTrayMessageLoop(); + + CoUninitialize(); + + FreeLibraryAndExitThread(hLib, ret); +} + +HRESULT CSysTray::CreateSysTrayThread() +{ + DbgPrint("CSysTray Init TODO: Initialize tray icon handlers.\n"); + + HANDLE hThread = CreateThread(NULL, 0, s_SysTrayThreadProc, this, 0, NULL); + + CloseHandle(hThread); + + return S_OK; +} + +HRESULT CSysTray::DestroySysTrayWindow() +{ + DestroyWindow(); + hwndSysTray = NULL; + return S_OK; +} + +// *** IOleCommandTarget methods *** +HRESULT STDMETHODCALLTYPE CSysTray::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CSysTray::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + if (!IsEqualGUID(*pguidCmdGroup, CGID_ShellServiceObject)) + return E_FAIL; + + switch (nCmdID) + { + case OLECMDID_NEW: // init + return CreateSysTrayThread(); + case OLECMDID_SAVE: // shutdown + return DestroySysTrayWindow(); + } + return S_OK; +} + +BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD dwMsgMapID) +{ + HRESULT hr; + + if (hWnd != m_hWnd) + return FALSE; + + switch (uMsg) + { + case WM_CREATE: + InitIcons(); + SetTimer(1, 2000, NULL); + return TRUE; + case WM_TIMER: + UpdateIcons(); + return TRUE; + case WM_DESTROY: + ShutdownIcons(); + return TRUE; + } + + DbgPrint("SysTray message received %u (%08p %08p)\n", uMsg, wParam, lParam); + + hr = ProcessIconMessage(uMsg, wParam, lParam); + if (FAILED(hr)) + return FALSE; + + if (hr == S_FALSE) + return FALSE; + + return TRUE; +} Propchange: branches/shell-experiments/dll/win32/stobject/csystray.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/shell-experiments/dll/win32/stobject/csystray.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/csystray.h (added) +++ branches/shell-experiments/dll/win32/stobject/csystray.h [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -0,0 +1,66 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\stobject.cpp + * PURPOSE: Systray shell service object + * PROGRAMMERS: Robert Naumann + David Quintana <gigaherz(a)gmail.com> + */ +#pragma once + +extern const GUID CLSID_SysTray; + + +typedef CWinTraits < + WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, + WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW +> CMessageWndClass; + +class CSysTray : + public CComCoClass<CSysTray, &CLSID_SysTray>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public CWindowImpl<CSysTray, CWindow, CMessageWndClass>, + public IOleCommandTarget +{ + // TODO: keep icon handlers here + + HWND hwndSysTray; + + static DWORD WINAPI s_SysTrayThreadProc(PVOID param); + HRESULT SysTrayMessageLoop(); + HRESULT SysTrayThreadProc(); + HRESULT CreateSysTrayThread(); + HRESULT DestroySysTrayWindow(); + + HRESULT InitIcons(); + HRESULT ShutdownIcons(); + HRESULT UpdateIcons(); + HRESULT ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); + +public: + HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip); + + HWND GetHWnd() { return m_hWnd; } + +protected: + BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD dwMsgMapID = 0); + +public: + CSysTray(); + virtual ~CSysTray(); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + DECLARE_WND_CLASS_EX(_T("SystemTray_Main"), CS_GLOBALCLASS, COLOR_3DFACE) + + DECLARE_REGISTRY_RESOURCEID(IDR_SYSTRAY) + DECLARE_NOT_AGGREGATABLE(CSysTray) + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CSysTray) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + END_COM_MAP() + +}; Propchange: branches/shell-experiments/dll/win32/stobject/csystray.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/shell-experiments/dll/win32/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/precomp.h [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -34,67 +34,27 @@ #include "resource.h" -extern const GUID CLSID_SysTray; - extern HINSTANCE g_hInstance; #define ID_ICON_VOLUME 0x4CB -/* --------------- CSysTray callbacks ------------------------------ */ +#include "csystray.h" -typedef CWinTraits < - WS_POPUP | WS_DLGFRAME | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, - WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR | WS_EX_PALETTEWINDOW -> CMessageWndClass; +typedef HRESULT(STDMETHODCALLTYPE * PFNSTINIT) (_In_ CSysTray * pSysTray); +typedef HRESULT(STDMETHODCALLTYPE * PFNSTSHUTDOWN) (_In_ CSysTray * pSysTray); +typedef HRESULT(STDMETHODCALLTYPE * PFNSTUPDATE) (_In_ CSysTray * pSysTray); +typedef HRESULT(STDMETHODCALLTYPE * PFNSTMESSAGE) (_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam); -class CSysTray : - public CComCoClass<CSysTray, &CLSID_SysTray>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public CWindowImpl<CSysTray, CWindow, CMessageWndClass>, - public IOleCommandTarget +struct SysTrayIconHandlers_t { - // TODO: keep icon handlers here + PFNSTINIT pfnInit; + PFNSTSHUTDOWN pfnShutdown; + PFNSTUPDATE pfnUpdate; + PFNSTMESSAGE pfnMessage; +}; - HWND hwndSysTray; - - static DWORD WINAPI s_SysTrayThreadProc(PVOID param); - HRESULT SysTrayMessageLoop(); - HRESULT SysTrayThreadProc(); - HRESULT CreateSysTrayThread(); - HRESULT DestroySysTrayWindow(); - - HRESULT InitIcons(); - HRESULT ShutdownIcons(); - HRESULT UpdateIcons(); - HRESULT ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); - -public: - HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip); - - HWND GetHWnd() { return m_hWnd; } - -protected: - BOOL ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD dwMsgMapID = 0); - -public: - CSysTray(); - virtual ~CSysTray(); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - DECLARE_WND_CLASS_EX(_T("SystemTray_Main"), CS_GLOBALCLASS, COLOR_3DFACE) - - DECLARE_REGISTRY_RESOURCEID(IDR_SYSTRAY) - DECLARE_NOT_AGGREGATABLE(CSysTray) - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP(CSysTray) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - END_COM_MAP() - -}; +extern SysTrayIconHandlers_t g_IconHandlers[]; +extern const int g_NumIcons; /* --------------- Icon callbacks ------------------------------ */ Modified: branches/shell-experiments/dll/win32/stobject/stobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/stobject.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/stobject.cpp [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -2,7 +2,7 @@ * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory * FILE: dll\win32\stobject\stobject.cpp - * PURPOSE: Systray shell service object + * PURPOSE: COM registration services for STobject.dll * PROGRAMMERS: Robert Naumann David Quintana <gigaherz(a)gmail.com> */ @@ -14,253 +14,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(stobject); -const GUID CLSID_SysTray = { 0x35CEC8A3, 0x2BE6, 0x11D2, { 0x87, 0x73, 0x92, 0xE2, 0x20, 0x52, 0x41, 0x53 } }; - -HINSTANCE g_hInstance; - -typedef HRESULT(STDMETHODCALLTYPE * PFNSTINIT) (_In_ CSysTray * pSysTray); -typedef HRESULT(STDMETHODCALLTYPE * PFNSTSHUTDOWN) (_In_ CSysTray * pSysTray); -typedef HRESULT(STDMETHODCALLTYPE * PFNSTUPDATE) (_In_ CSysTray * pSysTray); -typedef HRESULT(STDMETHODCALLTYPE * PFNSTMESSAGE) (_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam); - -struct SysTrayIconHandlers_t -{ - PFNSTINIT pfnInit; - PFNSTSHUTDOWN pfnShutdown; - PFNSTUPDATE pfnUpdate; - PFNSTMESSAGE pfnMessage; -}; - -SysTrayIconHandlers_t g_IconHandlers [] = { - { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message } -}; -const int g_NumIcons = _countof(g_IconHandlers); - -HRESULT CSysTray::InitIcons() -{ - for (int i = 0; i < g_NumIcons; i++) - { - HRESULT hr = g_IconHandlers[i].pfnInit(this); - if (FAILED(hr)) - return hr; - } - - return S_OK; -} - -HRESULT CSysTray::ShutdownIcons() -{ - for (int i = 0; i < g_NumIcons; i++) - { - HRESULT hr = g_IconHandlers[i].pfnShutdown(this); - if (FAILED(hr)) - return hr; - } - - return S_OK; -} - -HRESULT CSysTray::UpdateIcons() -{ - for (int i = 0; i < g_NumIcons; i++) - { - HRESULT hr = g_IconHandlers[i].pfnUpdate(this); - if (FAILED(hr)) - return hr; - } - - return S_OK; -} - -HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - for (int i = 0; i < g_NumIcons; i++) - { - HRESULT hr = g_IconHandlers[i].pfnMessage(this, uMsg, wParam, lParam); - if (FAILED(hr)) - return hr; - - if (hr != S_FALSE) - return hr; - } - - return S_OK; -} - -HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) -{ - NOTIFYICONDATA nim; - nim.cbSize = sizeof(NOTIFYICONDATA); - nim.uFlags = NIF_ICON | NIF_STATE | NIF_TIP; - nim.hIcon = hIcon; - nim.uID = uId; - nim.uCallbackMessage = uId; - nim.dwState = 0; - nim.dwStateMask = 0; - nim.hWnd = m_hWnd; - nim.uVersion = NOTIFYICON_VERSION; - if (szTip) - StringCchCopy(nim.szTip, _countof(nim.szTip), szTip); - else - nim.szTip[0] = 0; - BOOL ret = Shell_NotifyIcon(code, &nim); - return ret ? S_OK : E_FAIL; -} - -DWORD WINAPI CSysTray::s_SysTrayThreadProc(PVOID param) -{ - CSysTray * st = (CSysTray*) param; - return st->SysTrayThreadProc(); -} - -HRESULT CSysTray::SysTrayMessageLoop() -{ - BOOL ret; - MSG msg; - - while ((ret = GetMessage(&msg, NULL, 0, 0)) != 0) - { - if (ret < 0) - break; - - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - return S_OK; -} - -HRESULT CSysTray::SysTrayThreadProc() -{ - WCHAR strFileName[MAX_PATH]; - GetModuleFileNameW(g_hInstance, strFileName, MAX_PATH); - HMODULE hLib = LoadLibraryW(strFileName); - - CoInitializeEx(NULL, COINIT_DISABLE_OLE1DDE | COINIT_APARTMENTTHREADED); - - Create(NULL); - - HRESULT ret = SysTrayMessageLoop(); - - CoUninitialize(); - - FreeLibraryAndExitThread(hLib, ret); -} - -HRESULT CSysTray::CreateSysTrayThread() -{ - DbgPrint("CSysTray Init TODO: Initialize tray icon handlers.\n"); - - HANDLE hThread = CreateThread(NULL, 0, s_SysTrayThreadProc, this, 0, NULL); - - CloseHandle(hThread); - - return S_OK; -} - -HRESULT CSysTray::DestroySysTrayWindow() -{ - DestroyWindow(); - hwndSysTray = NULL; - return S_OK; -} - -CSysTray::CSysTray() {} -CSysTray::~CSysTray() {} - -// *** IOleCommandTarget methods *** -HRESULT STDMETHODCALLTYPE CSysTray::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) -{ - UNIMPLEMENTED; - return S_OK; -} - -HRESULT STDMETHODCALLTYPE CSysTray::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) -{ - if (!IsEqualGUID(*pguidCmdGroup, CGID_ShellServiceObject)) - return E_FAIL; - - switch (nCmdID) - { - case OLECMDID_NEW: // init - return CreateSysTrayThread(); - case OLECMDID_SAVE: // shutdown - return DestroySysTrayWindow(); - } - return S_OK; -} - -BOOL CSysTray::ProcessWindowMessage(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult, DWORD dwMsgMapID) -{ - HRESULT hr; - - if (hWnd != m_hWnd) - return FALSE; - - switch (uMsg) - { - case WM_CREATE: - InitIcons(); - SetTimer(1, 2000, NULL); - return TRUE; - case WM_TIMER: - UpdateIcons(); - return TRUE; - case WM_DESTROY: - ShutdownIcons(); - return TRUE; - } - - DbgPrint("SysTray message received %u (%08p %08p)\n", uMsg, wParam, lParam); - - hr = ProcessIconMessage(uMsg, wParam, lParam); - if (FAILED(hr)) - return FALSE; - - if (hr == S_FALSE) - return FALSE; - - return TRUE; -} - BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SysTray, CSysTray) END_OBJECT_MAP() class CShellTrayModule : public CComModule { +public: }; -CShellTrayModule gModule; - - -HRESULT RegisterShellServiceObject(REFGUID guidClass, LPCWSTR lpName, BOOL bRegister) -{ - const LPCWSTR strRegistryLocation = L"Software\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad"; - - OLECHAR strGuid[128]; // shouldn't need so much! - LSTATUS ret = 0; - HKEY hKey = 0; - if (StringFromGUID2(guidClass, strGuid, 128)) - { - if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, strRegistryLocation, 0, KEY_WRITE, &hKey)) - { - if (bRegister) - { - LONG cbGuid = (lstrlenW(strGuid) + 1) * 2; - ret = RegSetValueExW(hKey, lpName, 0, REG_SZ, (const BYTE *) strGuid, cbGuid); - } - else - { - ret = RegDeleteValueW(hKey, lpName); - } - } - } - if (hKey) - RegCloseKey(hKey); - return /*HRESULT_FROM_NT*/(ret); // regsvr32 considers anything != S_OK to be an error - -} +HINSTANCE g_hInstance; +CShellTrayModule g_Module; +SysTrayIconHandlers_t g_IconHandlers [] = { + { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message } +}; +const int g_NumIcons = _countof(g_IconHandlers); void *operator new (size_t, void *buf) { @@ -273,55 +41,123 @@ { if (fdwReason == DLL_PROCESS_ATTACH) { + g_hInstance = hinstDLL; + DisableThreadLibraryCalls(g_hInstance); + /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CShellTrayModule; + new (&g_Module) CShellTrayModule; new (&_AtlWinModule) CAtlWinModule; new (&_AtlBaseModule) CAtlBaseModule; new (&_AtlComModule) CAtlComModule; - g_hInstance = hinstDLL; - DisableThreadLibraryCalls(g_hInstance); - - gModule.Init(ObjectMap, g_hInstance, NULL); + g_Module.Init(ObjectMap, g_hInstance, NULL); } else if (fdwReason == DLL_PROCESS_DETACH) { g_hInstance = NULL; - gModule.Term(); + g_Module.Term(); } return TRUE; +} + +static +HRESULT +RegisterShellServiceObject(REFGUID guidClass, LPCWSTR lpName, BOOL bRegister) +{ + const LPCWSTR strRegistryLocation = L"Software\\Microsoft\\Windows\\CurrentVersion\\ShellServiceObjectDelayLoad"; + + HRESULT hr = E_FAIL; + + OLECHAR strGuid[128]; + + HKEY hKey = 0; + + if (!StringFromGUID2(guidClass, strGuid, _countof(strGuid))) + { + DbgPrint("StringFromGUID2 failed\n"); + goto cleanup; + } + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, strRegistryLocation, 0, KEY_WRITE, &hKey)) + { + DbgPrint("RegOpenKeyExW failed\n"); + goto cleanup; + } + + if (bRegister) + { + LONG cbGuid = (lstrlenW(strGuid) + 1) * 2; + if (RegSetValueExW(hKey, lpName, 0, REG_SZ, (const BYTE *) strGuid, cbGuid)) + { + DbgPrint("RegSetValueExW failed\n"); + goto cleanup; + } + } + else + { + if (RegDeleteValueW(hKey, lpName)) + { + DbgPrint("RegDeleteValueW failed\n"); + goto cleanup; + } + } + + hr = S_OK; + +cleanup: + if (hKey) + RegCloseKey(hKey); + + return hr; +} + +STDAPI +DllRegisterServer(void) +{ + HRESULT hr; + + hr = g_Module.DllRegisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = RegisterShellServiceObject(CLSID_SysTray, L"SysTray", TRUE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +STDAPI +DllUnregisterServer(void) +{ + HRESULT hr; + + hr = RegisterShellServiceObject(CLSID_SysTray, L"SysTray", FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = g_Module.DllUnregisterServer(FALSE); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; +} + +STDAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + + hr = g_Module.DllGetClassObject(rclsid, riid, ppv); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return S_OK; } HRESULT WINAPI DllCanUnloadNow(void) { - return gModule.DllCanUnloadNow(); + return g_Module.DllCanUnloadNow(); } - -STDAPI -DllRegisterServer(void) -{ - HRESULT hr = gModule.DllRegisterServer(FALSE); - if (FAILED(hr)) - return hr; - - return RegisterShellServiceObject(CLSID_SysTray, L"SysTray", TRUE); -} - -STDAPI -DllUnregisterServer(void) -{ - RegisterShellServiceObject(CLSID_SysTray, L"SysTray", FALSE); - - return gModule.DllUnregisterServer(FALSE); -} - -STDAPI -DllGetClassObject( -REFCLSID rclsid, -REFIID riid, -LPVOID *ppv) -{ - return gModule.DllGetClassObject(rclsid, riid, ppv); -} Modified: branches/shell-experiments/dll/win32/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/volume.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/stobject/volume.cpp [iso-8859-1] Wed Jul 30 22:08:05 2014 @@ -2,15 +2,16 @@ * PROJECT: ReactOS system libraries * LICENSE: GPL - See COPYING in the top level directory * FILE: dll\win32\stobject\volume.cpp - * PURPOSE: Systray shell service object - * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * PURPOSE: Volume notification icon handler + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ #include "precomp.h" #include <mmsystem.h> #include <mmddk.h> + +WINE_DEFAULT_DEBUG_CHANNEL(stobject); HICON g_hIconVolume; HICON g_hIconMute; @@ -33,7 +34,7 @@ DbgPrint("Volume_FindDefaultMixerID\n"); - result = waveOutMessage((HWAVEOUT) WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD) &waveOutId, (DWORD) &param2); + result = waveOutMessage((HWAVEOUT) WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR) &waveOutId, (DWORD_PTR) &param2); if (result) return E_FAIL;

1 0

[ekohl] 63786: [SAMLIB] SampCheckPassword: Implement the character class check.
by ekohl＠svn.reactos.org 30 Jul '14

30 Jul '14

Author: ekohl Date: Wed Jul 30 20:59:53 2014 New Revision: 63786 URL: http://svn.reactos.org/svn/reactos?rev=63786&view=rev Log: [SAMLIB] SampCheckPassword: Implement the character class check. Modified: trunk/reactos/dll/win32/samlib/precomp.h trunk/reactos/dll/win32/samlib/samlib.c Modified: trunk/reactos/dll/win32/samlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/precomp.h [iso-8859-1] Wed Jul 30 20:59:53 2014 @@ -9,5 +9,6 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #endif /* _SAMLIB_PCH_ */ Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Wed Jul 30 20:59:53 2014 @@ -128,8 +128,11 @@ IN PUNICODE_STRING Password) { USER_DOMAIN_PASSWORD_INFORMATION DomainPasswordInformation; + LPWORD CharTypeBuffer = NULL; ULONG PasswordLength; - NTSTATUS Status; + ULONG i; + ULONG Upper = 0, Lower = 0, Digit = 0, Punct = 0, Alpha = 0; + NTSTATUS Status = STATUS_SUCCESS; TRACE("(%p %p)\n", UserHandle, Password); @@ -152,10 +155,57 @@ /* Check the password complexity */ if (DomainPasswordInformation.PasswordProperties & DOMAIN_PASSWORD_COMPLEX) { - /* FIXME */ - } - - return STATUS_SUCCESS; + CharTypeBuffer = midl_user_allocate(PasswordLength * sizeof(WORD)); + if (CharTypeBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + GetStringTypeW(CT_CTYPE1, + Password->Buffer, + PasswordLength, + CharTypeBuffer); + + for (i = 0; i < PasswordLength; i++) + { + TRACE("%lu: %C %s %s %s %s\n", i, Password->Buffer[i], + (CharTypeBuffer[i] & C1_UPPER) ? "C1_UPPER" : " ", + (CharTypeBuffer[i] & C1_LOWER) ? "C1_LOWER" : " ", + (CharTypeBuffer[i] & C1_DIGIT) ? "C1_DIGIT" : " ", + (CharTypeBuffer[i] & C1_PUNCT) ? "C1_PUNCT" : " ", + (CharTypeBuffer[i] & C1_ALPHA) ? "C1_ALPHA" : " "); + + if (CharTypeBuffer[i] & C1_UPPER) + Upper = 1; + + if (CharTypeBuffer[i] & C1_LOWER) + Lower = 1; + + if (CharTypeBuffer[i] & C1_DIGIT) + Digit = 1; + + if (CharTypeBuffer[i] & C1_PUNCT) + Punct = 1; + + if ((CharTypeBuffer[i] & C1_ALPHA) && + !(CharTypeBuffer[i] & C1_UPPER) && + !(CharTypeBuffer[i] & C1_LOWER)) + Alpha = 1; + } + + TRACE("Upper: %lu\n", Upper); + TRACE("Lower: %lu\n", Lower); + TRACE("Digit: %lu\n", Digit); + TRACE("Punct: %lu\n", Punct); + TRACE("Alpha: %lu\n", Alpha); + + TRACE("Total: %lu\n", Upper + Lower + Digit + Punct + Alpha); + if (Upper + Lower + Digit + Punct + Alpha < 3) + Status = STATUS_PASSWORD_RESTRICTION; + } + + if (CharTypeBuffer != NULL) + midl_user_free(CharTypeBuffer); + + return Status; }

1 0

[dreimer] 63785: [CARDS] Replace the old ugly 16 color cards with better looking ones. (From: http://www.united3dartists.com/forum/viewtopic.php?f=31&t=954) Remove 10 of 12 backgrounds and add some...
by dreimer＠svn.reactos.org 30 Jul '14

30 Jul '14

Author: dreimer Date: Wed Jul 30 14:42:29 2014 New Revision: 63785 URL: http://svn.reactos.org/svn/reactos?rev=63785&view=rev Log: [CARDS] Replace the old ugly 16 color cards with better looking ones. (From: http://www.united3dartists.com/forum/viewtopic.php?f=31&t=954) Remove 10 of 12 backgrounds and add some CARD backgrounds, no ugly bubble images and stuff. 8 of 10 from my own card decks. 2 others are from deviantart image search. Modify the ReactOS card background to look way better. Now both, Bavarian and French cards look nicely and make our Solitaire and Spider look way more modern. Modified: trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/res/default/Background_1.bmp trunk/reactos/dll/win32/cards/res/default/Background_10.bmp trunk/reactos/dll/win32/cards/res/default/Background_11.bmp trunk/reactos/dll/win32/cards/res/default/Background_12.bmp trunk/reactos/dll/win32/cards/res/default/Background_2.bmp trunk/reactos/dll/win32/cards/res/default/Background_3.bmp trunk/reactos/dll/win32/cards/res/default/Background_4.bmp trunk/reactos/dll/win32/cards/res/default/Background_5.bmp trunk/reactos/dll/win32/cards/res/default/Background_6.bmp trunk/reactos/dll/win32/cards/res/default/Background_7.bmp trunk/reactos/dll/win32/cards/res/default/Background_8.bmp trunk/reactos/dll/win32/cards/res/default/Background_9.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Five.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Four.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_King.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Six.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Three.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Two.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Five.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Four.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_King.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Six.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Three.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Two.bmp trunk/reactos/dll/win32/cards/res/default/FreeCard.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Five.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Four.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_King.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Six.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Three.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Two.bmp trunk/reactos/dll/win32/cards/res/default/Joker.bmp trunk/reactos/dll/win32/cards/res/default/OSign.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Five.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Four.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Spades_King.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Six.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Three.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Two.bmp trunk/reactos/dll/win32/cards/res/default/XSign.bmp Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] Wed Jul 30 14:42:29 2014 @@ -41,8 +41,8 @@ #define ectSAVEEDGESMASK 0x80000000 #if defined(CARDSTYLE_DEFAULT) -# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX -# define CARD_HEIGHT 96 +# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from http://united3dartists.com +# define CARD_HEIGHT 112 #elif defined(CARDSTYLE_BAVARIAN) # define CARD_WIDTH 110 # define CARD_HEIGHT 198 Modified: trunk/reactos/dll/win32/cards/res/default/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Joker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/OSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/default/XSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/defaul… ============================================================================== Binary files - no diff available.

1 0

[jgardou] 63784: [NDK] - Make the MMWSLE structure multi-arch aware
by jgardou＠svn.reactos.org 30 Jul '14

30 Jul '14

Author: jgardou Date: Wed Jul 30 13:11:55 2014 New Revision: 63784 URL: http://svn.reactos.org/svn/reactos?rev=63784&view=rev Log: [NDK] - Make the MMWSLE structure multi-arch aware Modified: trunk/reactos/include/ndk/amd64/mmtypes.h trunk/reactos/include/ndk/arm/mmtypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/mmtypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Wed Jul 30 13:11:55 2014 @@ -35,6 +35,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L +#define MM_PAGE_FRAME_NUMBER_SIZE 52 // // Address of the shared user page Modified: trunk/reactos/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/mmtypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Jul 30 13:11:55 2014 @@ -36,6 +36,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L +#define MM_PAGE_FRAME_NUMBER_SIZE 20 // // Sanity checks for Paging Macros Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h [iso-8859-1] Wed Jul 30 13:11:55 2014 @@ -34,6 +34,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L +#define MM_PAGE_FRAME_NUMBER_SIZE 20 // // Address of the shared user page Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Wed Jul 30 13:11:55 2014 @@ -842,14 +842,14 @@ // typedef struct _MMWSLENTRY { - ULONG Valid:1; - ULONG LockedInWs:1; - ULONG LockedInMemory:1; - ULONG Protection:5; - ULONG Hashed:1; - ULONG Direct:1; - ULONG Age:2; - ULONG VirtualPageNumber:20; + ULONG_PTR Valid:1; + ULONG_PTR LockedInWs:1; + ULONG_PTR LockedInMemory:1; + ULONG_PTR Protection:5; + ULONG_PTR Hashed:1; + ULONG_PTR Direct:1; + ULONG_PTR Age:2; + ULONG_PTR VirtualPageNumber: MM_PAGE_FRAME_NUMBER_SIZE; } MMWSLENTRY, *PMMWSLENTRY; typedef struct _MMWSLE @@ -857,7 +857,7 @@ union { PVOID VirtualAddress; - ULONG Long; + ULONG_PTR Long; MMWSLENTRY e1; } u1; } MMWSLE, *PMMWSLE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs