Ros-diffs November 2012

ros-diffs@reactos.org

11 participants
124 discussions

[hbelusca] 57705: [KERNEL32] - Place console.c file in a dedicated directory because I will after split it into logical units (eg. a file for Alias-functions, a file for Read-write functions, etc.....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Nov 15 16:24:43 2012 New Revision: 57705 URL: http://svn.reactos.org/svn/reactos?rev=57705&view=rev Log: [KERNEL32] - Place console.c file in a dedicated directory because I will after split it into logical units (eg. a file for Alias-functions, a file for Read-write functions, etc...) to facilitate maintenance. Added: branches/ros-csrss/dll/win32/kernel32/client/console/ (with props) branches/ros-csrss/dll/win32/kernel32/client/console/console.c - copied unchanged from r57704, branches/ros-csrss/dll/win32/kernel32/client/file/console.c Removed: branches/ros-csrss/dll/win32/kernel32/client/file/console.c Modified: branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/CM… Removed: branches/ros-csrss/dll/win32/kernel32/client/file/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/kernel32/cl…

11 years, 10 months

[jimtabor] 57704: [Win32k] - Rewrite message events to use posting to queues instead of sending them. See CORE-6551.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 14 03:45:55 2012 New Revision: 57704 URL: http://svn.reactos.org/svn/reactos?rev=57704&view=rev Log: [Win32k] - Rewrite message events to use posting to queues instead of sending them. See CORE-6551. Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -900,7 +900,7 @@ /* Post a keyboard message */ TRACE("Posting keyboard msg %u wParam 0x%x lParam 0x%x\n", Msg.message, Msg.wParam, Msg.lParam); - MsqPostMessage(pFocusQueue, &Msg, TRUE, QS_KEY); + MsqPostMessage(pFocusQueue, &Msg, TRUE, QS_KEY, 0); } return TRUE; @@ -1121,7 +1121,7 @@ NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; NewMsg.wParam = HIWORD(lpMsg->lParam); NewMsg.lParam = LOWORD(lpMsg->lParam); - MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); + MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY, 0); return TRUE; } @@ -1150,7 +1150,7 @@ { TRACE("Msg: %x '%lc' (%04x) %08x\n", NewMsg.message, wch[i], wch[i], NewMsg.lParam); NewMsg.wParam = wch[i]; - MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); + MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY, 0); } bResult = TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -1105,7 +1105,7 @@ KeQueryTickCount(&LargeTickCount); Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); + MsqPostMessage(pThread->MessageQueue, &Message, FALSE, QS_POSTMESSAGE, 0); ObDereferenceObject( peThread ); return TRUE; } @@ -1228,7 +1228,7 @@ } else { - MsqPostMessage(Window->head.pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); + MsqPostMessage(Window->head.pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE, 0); } } return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -622,7 +622,7 @@ else { TRACE("Posting mouse message to hwnd=0x%x!\n", UserHMGetHandle(pwnd)); - MsqPostMessage(MessageQueue, Msg, TRUE, QS_MOUSEBUTTON); + MsqPostMessage(MessageQueue, Msg, TRUE, QS_MOUSEBUTTON, 0); } } else if (hdcScreen) @@ -675,7 +675,7 @@ KeQueryTickCount(&LargeTickCount); Mesg.time = MsqCalculateMessageTime(&LargeTickCount); Mesg.pt = gpsi->ptCursor; - MsqPostMessage(Window->head.pti->MessageQueue, &Mesg, FALSE, Type); + MsqPostMessage(Window->head.pti->MessageQueue, &Mesg, FALSE, Type, 0); UserDereferenceObject(Window); ObDereferenceObject (Thread); @@ -1252,8 +1252,11 @@ } VOID FASTCALL -MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN HardwareMessage, - DWORD MessageBits) +MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, + MSG* Msg, + BOOLEAN HardwareMessage, + DWORD MessageBits, + DWORD dwQEvent) { PUSER_MESSAGE Message; @@ -1262,7 +1265,12 @@ return; } - if(!HardwareMessage) + if (dwQEvent) + { + InsertHeadList(&MessageQueue->PostedMessagesListHead, + &Message->ListEntry); + } + else if (!HardwareMessage) { InsertTailList(&MessageQueue->PostedMessagesListHead, &Message->ListEntry); @@ -1273,7 +1281,9 @@ &Message->ListEntry); } + Message->dwQEvent = dwQEvent; Message->QS_Flags = MessageBits; + //Message->pti = pti; Fixed in ATI changes. See CORE-6551 MsqWakeQueue(MessageQueue, MessageBits, (MessageBits & QS_TIMER ? FALSE : TRUE)); } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -23,6 +23,9 @@ LIST_ENTRY ListEntry; MSG Msg; DWORD QS_Flags; + LONG_PTR ExtraInfo; + DWORD dwQEvent; + PTHREADINFO pti; } USER_MESSAGE, *PUSER_MESSAGE; struct _USER_MESSAGE_QUEUE; @@ -156,7 +159,7 @@ UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult); PUSER_MESSAGE FASTCALL MsqCreateMessage(LPMSG Msg); VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message); -VOID FASTCALL MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits); +VOID FASTCALL MsqPostMessage(PUSER_MESSAGE_QUEUE, MSG*, BOOLEAN, DWORD, DWORD); VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); BOOLEAN APIENTRY MsqPeekMessage(IN PUSER_MESSAGE_QUEUE MessageQueue, Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -409,7 +409,7 @@ Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER, 0); pTmr->flags &= ~TMRF_READY; pti->cTimersReady++; Hit = TRUE; Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Nov 14 03:45:55 2012 @@ -462,7 +462,6 @@ ((Dce->DCXFlags & DCX_CACHECOMPAREMASK) == DcxFlags)) { UpdateClipOrigin = TRUE; - //bUpdateVisRgn = FALSE; break; } }

11 years, 10 months

[hbelusca] 57703: [CSRSRV] - Comments formatting. - Correct a nasty initialization bug which unveiled itself as, eg., critical sections being already initialized in consoles, whereas we were creati...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Nov 13 23:45:02 2012 New Revision: 57703 URL: http://svn.reactos.org/svn/reactos?rev=57703&view=rev Log: [CSRSRV] - Comments formatting. - Correct a nasty initialization bug which unveiled itself as, eg., critical sections being already initialized in consoles, whereas we were creating new ones. It was because we didn't copy correctly per-process server data from parent process to child process. Now consoles initialize finely. Now, only modifications to the console subsystem remain to make it totally conform to the new messaging structures of csrss (I mean, using the capture buffers). Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Tue Nov 13 23:45:02 2012 @@ -763,9 +763,11 @@ } /* - * Our Root Process was never officially initalized, so write the data - * for each Server DLL manually. + * Our Root Process was never officially initalized, + * so write the data for each Server DLL manually. */ + + /* Loop every DLL */ for (i = 0; i < CSR_SERVER_DLL_MAX; i++) { /* Get the current Server */ Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Nov 13 23:45:02 2012 @@ -562,7 +562,7 @@ /* Inherit the Process Data */ CurrentProcess = CurrentThread->Process; - ProcessData = &CurrentProcess->ServerData[CSR_SERVER_DLL_MAX]; + ProcessData = &CsrProcess->ServerData[CSR_SERVER_DLL_MAX]; for (i = 0; i < CSR_SERVER_DLL_MAX; i++) { /* Get the current Server */

11 years, 10 months

[hbelusca] 57702: [CONSRV] - Initialize the per-process structure size : fixes console initialization.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Nov 13 21:11:30 2012 New Revision: 57702 URL: http://svn.reactos.org/svn/reactos?rev=57702&view=rev Log: [CONSRV] - Initialize the per-process structure size : fixes console initialization. Modified: branches/ros-csrss/win32ss/user/consrv/init.c Modified: branches/ros-csrss/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/init.c [iso-8859-1] Tue Nov 13 21:11:30 2012 @@ -459,7 +459,7 @@ LoadedServerDll->DispatchTable = ConsoleServerApiDispatchTable; LoadedServerDll->ValidTable = ConsoleServerApiServerValidTable; LoadedServerDll->NameTable = ConsoleServerApiNameTable; - LoadedServerDll->SizeOfProcessData = 0; + LoadedServerDll->SizeOfProcessData = sizeof(CONSOLE_PROCESS_DATA); LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = Win32CsrReleaseConsole; LoadedServerDll->NewProcessCallback = ConsoleNewProcess;

11 years, 10 months

[hbelusca] 57701: [CSRSRV] - Use a variable ServerDll instead of using each time CsrLoadedServerDll[i], as it is done in some other places. - Clean the code (remove extra-parentheses). - Zero-out t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Nov 13 21:08:19 2012 New Revision: 57701 URL: http://svn.reactos.org/svn/reactos?rev=57701&view=rev Log: [CSRSRV] - Use a variable ServerDll instead of using each time CsrLoadedServerDll[i], as it is done in some other places. - Clean the code (remove extra-parentheses). - Zero-out the memory buffer allocated for CsrSrvSharedStaticServerData. Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c branches/ros-csrss/subsystems/win32/csrsrv/procsup.c branches/ros-csrss/subsystems/win32/csrsrv/server.c branches/ros-csrss/subsystems/win32/csrsrv/session.c Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Tue Nov 13 21:08:19 2012 @@ -54,7 +54,7 @@ ServerDll = CsrLoadedServerDll[i]; /* Make sure it's valid and that it has callback */ - if ((ServerDll) && (ServerDll->HardErrorCallback)) + if (ServerDll && ServerDll->HardErrorCallback) { ServerDll->HardErrorCallback(ThreadData, HardErrorMessage); } Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Tue Nov 13 21:08:19 2012 @@ -437,7 +437,7 @@ ServerDll = CsrLoadedServerDll[i]; /* Check if it's valid and if it has a Disconnect Callback */ - if ((ServerDll) && (ServerDll->DisconnectCallback)) + if (ServerDll && ServerDll->DisconnectCallback) { /* Call it */ ServerDll->DisconnectCallback(CsrProcess); @@ -530,6 +530,7 @@ PCSR_THREAD CurrentThread = CsrGetClientThread(); CLIENT_ID CurrentCid; PCSR_PROCESS CurrentProcess; + PCSR_SERVER_DLL ServerDll; PVOID ProcessData; ULONG i; PCSR_PROCESS CsrProcess; @@ -564,8 +565,11 @@ ProcessData = &CurrentProcess->ServerData[CSR_SERVER_DLL_MAX]; for (i = 0; i < CSR_SERVER_DLL_MAX; i++) { + /* Get the current Server */ + ServerDll = CsrLoadedServerDll[i]; + /* Check if the DLL is Loaded and has Per Process Data */ - if ((CsrLoadedServerDll[i]) && (CsrLoadedServerDll[i]->SizeOfProcessData)) + if (ServerDll && ServerDll->SizeOfProcessData) { /* Set the pointer */ CsrProcess->ServerData[i] = ProcessData; @@ -573,11 +577,11 @@ /* Copy the Data */ RtlMoveMemory(ProcessData, CurrentProcess->ServerData[i], - CsrLoadedServerDll[i]->SizeOfProcessData); + ServerDll->SizeOfProcessData); /* Update next data pointer */ ProcessData = (PVOID)((ULONG_PTR)ProcessData + - CsrLoadedServerDll[i]->SizeOfProcessData); + ServerDll->SizeOfProcessData); } else { @@ -1305,7 +1309,9 @@ { /* Get the current server */ ServerDll = CsrLoadedServerDll[i]; - if ((ServerDll) && (ServerDll->ShutdownProcessCallback)) + + /* Check if it's valid and if it has a Shutdown Process Callback */ + if (ServerDll && ServerDll->ShutdownProcessCallback) { /* Release the lock, make the callback, and acquire it back */ CsrReleaseProcessLock(); Modified: branches/ros-csrss/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/server.c [iso-8859-1] Tue Nov 13 21:08:19 2012 @@ -421,7 +421,7 @@ /* Now allocate space from the heap for the Shared Data */ CsrSrvSharedStaticServerData = RtlAllocateHeap(CsrSrvSharedSectionHeap, - 0, + HEAP_ZERO_MEMORY, CSR_SERVER_DLL_MAX * sizeof(PVOID)); if (!CsrSrvSharedStaticServerData) return STATUS_NO_MEMORY; Modified: branches/ros-csrss/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs… ============================================================================== --- branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win32/csrsrv/session.c [iso-8859-1] Tue Nov 13 21:08:19 2012 @@ -215,10 +215,11 @@ PSB_CREATE_SESSION_MSG CreateSession = &ApiMessage->CreateSession; HANDLE hProcess, hThread; PCSR_PROCESS CsrProcess; + PCSR_THREAD CsrThread; + PCSR_SERVER_DLL ServerDll; + PVOID ProcessData; NTSTATUS Status; KERNEL_USER_TIMES KernelTimes; - PCSR_THREAD CsrThread; - PVOID ProcessData; ULONG i; /* Save the Process and Thread Handles */ @@ -309,15 +310,18 @@ /* Loop every DLL */ for (i = 0; i < CSR_SERVER_DLL_MAX; i++) { + /* Get the current Server */ + ServerDll = CsrLoadedServerDll[i]; + /* Check if the DLL is loaded and has Process Data */ - if (CsrLoadedServerDll[i] && CsrLoadedServerDll[i]->SizeOfProcessData) + if (ServerDll && ServerDll->SizeOfProcessData) { /* Write the pointer to the data */ CsrProcess->ServerData[i] = ProcessData; /* Move to the next data location */ ProcessData = (PVOID)((ULONG_PTR)ProcessData + - CsrLoadedServerDll[i]->SizeOfProcessData); + ServerDll->SizeOfProcessData); } else {

11 years, 10 months

[ekohl] 57700: [NETAPI32] NetLocalGroupEnum: Add code to return information about a single alias to the caller. Now, the user account control panel enumerates the built-in groups. ; -)

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 11 22:28:08 2012 New Revision: 57700 URL: http://svn.reactos.org/svn/reactos?rev=57700&view=rev Log: [NETAPI32] NetLocalGroupEnum: Add code to return information about a single alias to the caller. Now, the user account control panel enumerates the built-in groups. ;-) Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Sun Nov 11 22:28:08 2012 @@ -246,13 +246,16 @@ PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; PSID DomainSid = NULL; + PLOCALGROUP_INFO_0 LocalInfo0; + PLOCALGROUP_INFO_1 LocalInfo1; + LPWSTR Ptr; ULONG i; + ULONG Size; SAM_HANDLE AliasHandle = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; - + LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); @@ -263,7 +266,7 @@ if (resumehandle != NULL && *resumehandle != 0) { - EnumContext = (PENUM_CONTEXT)resumehandle; + EnumContext = (PENUM_CONTEXT)*resumehandle; } else { @@ -334,16 +337,18 @@ } - while (TRUE) - { +// while (TRUE) +// { + TRACE("EnumContext->Index: %lu\n", EnumContext->Index); + TRACE("EnumContext->Returned: %lu\n", EnumContext->Returned); if (EnumContext->Index >= EnumContext->Returned) { - if (EnumContext->BuiltinDone == TRUE) - { - ApiStatus = NERR_Success; - goto done; - } +// if (EnumContext->BuiltinDone == TRUE) +// { +// ApiStatus = NERR_Success; +// goto done; +// } TRACE("Calling SamEnumerateAliasesInDomain\n"); @@ -408,6 +413,62 @@ TRACE("Name: %S\n", AliasInfo->Name.Buffer); TRACE("Comment: %S\n", AliasInfo->AdminComment.Buffer); + switch (level) + { + case 0: + Size = sizeof(LOCALGROUP_INFO_0) + + AliasInfo->Name.Length + sizeof(WCHAR); + break; + + case 1: + Size = sizeof(LOCALGROUP_INFO_1) + + AliasInfo->Name.Length + sizeof(WCHAR) + + AliasInfo->AdminComment.Length + sizeof(WCHAR); + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + ApiStatus = NetApiBufferAllocate(Size, &Buffer); + if (ApiStatus != NERR_Success) + goto done; + + switch (level) + { + case 0: + LocalInfo0 = (PLOCALGROUP_INFO_0)Buffer; + + Ptr = (LPWSTR)LocalInfo0++; + LocalInfo0->lgrpi0_name = Ptr; + + memcpy(LocalInfo0->lgrpi0_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo0->lgrpi0_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + + case 1: + LocalInfo1 = (PLOCALGROUP_INFO_1)Buffer; + + Ptr = (LPWSTR)((ULONG_PTR)LocalInfo1 + sizeof(LOCALGROUP_INFO_1)); + LocalInfo1->lgrpi1_name = Ptr; + + memcpy(LocalInfo1->lgrpi1_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo1->lgrpi1_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + AliasInfo->Name.Length + sizeof(WCHAR)); + LocalInfo1->lgrpi1_comment = Ptr; + + memcpy(LocalInfo1->lgrpi1_comment, + AliasInfo->AdminComment.Buffer, + AliasInfo->AdminComment.Length); + LocalInfo1->lgrpi1_comment[AliasInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + } if (AliasInfo != NULL) { @@ -421,12 +482,19 @@ AliasInfo = NULL; } - EnumContext->Index++; - } - + + (*entriesread)++; + +// } done: + if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Returned) + ApiStatus = ERROR_MORE_DATA; + + if (EnumContext != NULL) + *totalentries = EnumContext->Returned; + if (resumehandle == NULL || ApiStatus != ERROR_MORE_DATA) { if (EnumContext != NULL) @@ -471,6 +539,10 @@ if (resumehandle != NULL) *resumehandle = (DWORD_PTR)EnumContext; + + *bufptr = (LPBYTE)Buffer; + + TRACE ("return %lu\n", ApiStatus); return ApiStatus; }

11 years, 10 months

[jimtabor] 57699: [Win32k] - Implement Gdi32 counterpart SetStretchBltMode for Win32k.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 11 03:18:21 2012 New Revision: 57699 URL: http://svn.reactos.org/svn/reactos?rev=57699&view=rev Log: [Win32k] - Implement Gdi32 counterpart SetStretchBltMode for Win32k. Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dcutil.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sun Nov 11 03:18:21 2012 @@ -173,6 +173,7 @@ VOID FASTCALL DCU_SetDcUndeletable(HDC); BOOL FASTCALL IntSetDefaultRegion(PDC); ULONG TranslateCOLORREF(PDC pdc, COLORREF crColor); +int FASTCALL GreSetStretchBltMode(HDC hdc, int iStretchMode); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcutil.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcutil.c [iso-8859-1] Sun Nov 11 03:18:21 2012 @@ -94,6 +94,29 @@ DC_UnlockDc(pdc); return crOldColor; +} + +int +FASTCALL +GreSetStretchBltMode(HDC hDC, int iStretchMode) +{ + PDC pdc; + PDC_ATTR pdcattr; + INT oSMode = 0; + + pdc = DC_LockDc(hDC); + if (pdc) + { + pdcattr = pdc->pdcattr; + oSMode = pdcattr->lStretchBltMode; + pdcattr->lStretchBltMode = iStretchMode; + + // Wine returns an error here. We set the default. + if ((iStretchMode <= 0) || (iStretchMode > MAXSTRETCHBLTMODE)) iStretchMode = WHITEONBLACK; + + pdcattr->jStretchBltMode = iStretchMode; + } + return oSMode; } VOID

11 years, 10 months

[jimtabor] 57698: [Win32k] - Fix api test crash.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Nov 11 03:01:58 2012 New Revision: 57698 URL: http://svn.reactos.org/svn/reactos?rev=57698&view=rev Log: [Win32k] - Fix api test crash. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Nov 11 03:01:58 2012 @@ -1154,6 +1154,12 @@ return FALSE; } + if (!psurfColor) + { + ERR("Attention HAX FIX API DrawIconEx TEST Line 37: psurfColor is NULL going with Mask!\n"); + psurfColor = SURFACE_ShareLockSurface(hbmMask); + } + psurfOffScreen = SURFACE_AllocSurface(STYPE_BITMAP, cxWidth, cyHeight, psurfColor->SurfObj.iBitmapFormat, 0, 0, NULL);

11 years, 10 months

[hbelusca] 57697: [MSGINA] Resize the dialogs to fit the ReactOS image, and add the logo to the "Please wait..." dialog (which is displayed when a user is logging-on or quitting his session and the...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 11 01:54:11 2012 New Revision: 57697 URL: http://svn.reactos.org/svn/reactos?rev=57697&view=rev Log: [MSGINA] Resize the dialogs to fit the ReactOS image, and add the logo to the "Please wait..." dialog (which is displayed when a user is logging-on or quitting his session and the "Save your parameters..." message is displayed). Now ReactOS looks perfect. Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐ¾ÑÐ°ÐºÐ°Ð¹ÑÐµ..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "ÐÑÐ¾Ð´" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»:",IDC_STATIC,36,75,45,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "ÐÐ°ÑÐ¾Ð»Ð°:",IDC_STATIC,36,93,42,8 @@ -32,12 +33,12 @@ PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ÐÐ°ÐºÐ²Ð¾ Ð¶ÐµÐ»Ð°ÐµÑÐµ?",IDC_STATIC,86,60,87,8 PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,95,99,14 PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,76,75,14 Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -5,12 +5,13 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ProsÃm Äekejte..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -27,7 +28,7 @@ CAPTION "PÅihlÃ¡Å¡enÃ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "JmÃ©no:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Heslo:",IDC_STATIC,36,93,42,8 @@ -37,12 +38,12 @@ PUSHBUTTON "Vypnout",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "BezpeÄnost" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Co chcete udÄlat?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,76,70,14 PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Bitte warten..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Benutzername:",IDC_STATIC,26, 75, 54, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Passwort:",IDC_STATIC,43, 93, 38, 8 @@ -32,12 +33,12 @@ PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,165, 122, 64, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Sicherheit" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Was wollen Sie tun?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Computer sperren",IDC_LOCK,10,76,70,14 PUSHBUTTON "Abmelden",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Please wait..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Username:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,36,93,42,8 @@ -32,12 +33,12 @@ PUSHBUTTON "Shutdown",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Security" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "What do you want to do?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Lock computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Log off",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -5,12 +5,13 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Por favor espere..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -27,7 +28,7 @@ CAPTION "Acceder" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Usuario:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "ContraseÃ±a:",IDC_STATIC,36,93,42,8 @@ -37,12 +38,12 @@ PUSHBUTTON "Cerrar",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 261, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Seguridad" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Â¿QuÃ© quieres hacer?",IDC_STATIC, 94, 60, 87, 8 PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4, 76, 83, 14 PUSHBUTTON "Salir",IDC_LOGOFF, 92, 76, 88, 14 Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Veuillez patienter..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "Connexion" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Utilisateur:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Mot de passe:",IDC_STATIC,36,93,42,8 @@ -32,12 +33,12 @@ PUSHBUTTON "Ãteindre",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 258, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "SÃ©curitÃ©" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Que voulez vous faire?",IDC_STATIC, 94, 60, 87, 8 PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4, 76, 82, 14 PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93, 76, 85, 14 Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Harap menunggu..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "Masuk" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Nama pengguna:",IDC_STATIC,22, 75, 61, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Kata sandi:",IDC_STATIC, 40, 93, 42, 8 @@ -32,12 +33,12 @@ PUSHBUTTON "Matikan",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Keamanan" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Apa yang ingin anda lakukan?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Kunci komputer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Keluar",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -8,12 +8,13 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Attendere..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -30,7 +31,7 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Utente:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,36,93,42,8 @@ -40,12 +41,12 @@ PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Sicurezza" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Cosa volete fare?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,76,70,14 PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ãå¾ã¡ãã ãã..." FONT 9, "MS UI Gothic",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "ãã°ãªã³" FONT 9, "MS UI Gothic",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ã¦ã¼ã¶ã¼å:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "ãã¹ã¯ã¼ã:",IDC_STATIC,36,93,42,8 @@ -32,12 +33,12 @@ PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "ã»ãã¥ãªãã£" FONT 9, "MS UI Gothic",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ä½ããã¾ãã?",IDC_STATIC,86,60,87,8 PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,76,70,14 PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,11 +1,12 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "Vent litt..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -22,7 +23,7 @@ CAPTION "Logg pÃ¥ ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Brukernavn:",IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Passord:",IDC_STATIC,36,93,42,8 @@ -32,12 +33,12 @@ PUSHBUTTON "Avslutt",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 247, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "ReactOS-sikkerhet" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Hva vil du gjÃ¸re?",IDC_STATIC, 92, 60, 87, 8 PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 76, 74, 14 PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 76, 78, 14 Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -8,12 +8,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ProszÄ czekaÄ..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -30,7 +31,7 @@ CAPTION "Logon" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Nazwa uÅ¼ytkownika:",IDC_STATIC, 11, 75, 70, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "HasÅo:",IDC_STATIC, 56, 93, 27, 8 @@ -40,12 +41,12 @@ PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "BezpieczeÅstwo" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Co chcesz teraz zrobiÄ?",IDC_STATIC,86,60,87,8 PUSHBUTTON "Blokada komputera",IDC_LOCK,10,76,70,14 PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -1,12 +1,13 @@ //2011.12.10 - Fulea Ètefan: minor changes (corrections) LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "AÈteptaÈiâ¦" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -23,7 +24,7 @@ CAPTION "Autentificare" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Nume utilizator:", IDC_STATIC,36,75,40,8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "ParolÄ:", IDC_STATIC,36,93,42,8 @@ -33,12 +34,12 @@ PUSHBUTTON "&OpreÈte", IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Securitate" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Ce acÈiune preferaÈi?", IDC_STATIC,86,60,87,8 PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,76,70,14 PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -2,12 +2,13 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -24,7 +25,7 @@ CAPTION "ÐÑÐ¾Ð´" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 RTEXT "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 6, 75, 70, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL RTEXT "ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 6, 93, 70, 8 @@ -39,7 +40,7 @@ CAPTION "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ:", IDC_STATIC, 7, 60, 123, 8 PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7, 76, 86, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102, 76, 86, 14 Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -4,12 +4,13 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "PoÄkajte, prosÃm ..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -26,7 +27,7 @@ CAPTION "PrihlÃ¡senie" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Meno pouÅ¾ÃvateÄ¾a:",IDC_STATIC,18, 75, 64, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "Heslo:",IDC_STATIC,56, 93, 24, 8 @@ -36,12 +37,12 @@ PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,179,122,50,14 END -IDD_LOGGEDON_DLG DIALOGEX 0,0,247,116 +IDD_LOGGEDON_DLG DIALOGEX 0,0,275,116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "BezpeÄnosÅ¥" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Äo chcete urobiÅ¥?",IDC_STATIC,86,60,87,8 PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,76,70,14 PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,76,70,14 Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Nov 11 01:54:11 2012 @@ -8,12 +8,13 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 +IDD_STATUSWINDOW_DLG DIALOGEX 0,0,275,80 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "ÐÐ°ÑÐµÐºÐ°Ð¹ÑÐµ..." FONT 8,"MS Shell Dlg",400,0,1 BEGIN - LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "",IDC_STATUSLABEL,7,62,261,12,SS_WORDELLIPSIS END IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 @@ -30,7 +31,7 @@ CAPTION "ÐÑÑÐ´" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,59 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ:",IDC_STATIC,33, 75, 48, 8 EDITTEXT IDC_USERNAME,84,72,119,14,ES_AUTOHSCROLL LTEXT "ÐÐ°ÑÐ¾Ð»Ñ:",IDC_STATIC,48, 93, 34, 8 @@ -40,12 +41,12 @@ PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN,148, 122, 86, 14 END -IDD_LOGGEDON_DLG DIALOGEX 0, 0, 257, 116 +IDD_LOGGEDON_DLG DIALOGEX 0, 0, 275, 116 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "ÐÐµÐ·Ð¿ÐµÐºÐ°" FONT 8,"MS Shell Dlg",400,0,1 BEGIN - CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,247,53 + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 LTEXT "Ð©Ð¾ ÐÐ¸ ÑÐ¾ÑÐµÑÐµ Ð·ÑÐ¾Ð±Ð¸ÑÐ¸?",IDC_STATIC, 86, 60, 87, 8 PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6, 76, 70, 14 PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80, 76, 80, 14

11 years, 10 months

[hbelusca] 57696: [MSGINA] Introduce a new logon image. Resizing the dialog boxes remains to do.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 10 23:45:08 2012 New Revision: 57696 URL: http://svn.reactos.org/svn/reactos?rev=57696&view=rev Log: [MSGINA] Introduce a new logon image. Resizing the dialog boxes remains to do. Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available.

11 years, 10 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2012