Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[cfinck] 28938: Change some prompts in the German translation of Explorer and Shell32, the previous ones sounded a bit strange

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Sep 8 15:28:19 2007 New Revision: 28938 URL: http://svn.reactos.org/svn/reactos?rev=28938&view=rev Log: Change some prompts in the German translation of Explorer and Shell32, the previous ones sounded a bit strange Modified: trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/dll/win32/shell32/shell32_De.rc Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Sat Sep 8 15:28:19 2007 @@ -336,7 +336,7 @@ IDS_START "Start" IDS_LOGOFF "Abmelden..." IDS_SHUTDOWN "Herunterfahren..." - IDS_RESTART "Neustarten..." + IDS_RESTART "Neu starten..." IDS_LAUNCH "Ausführen..." IDS_START_HELP "Hilfe" IDS_SEARCH_FILES "Suche Dateien..." Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Sat Sep 8 15:28:19 2007 @@ -169,10 +169,10 @@ IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben" /* message box strings */ - IDS_RESTART_TITLE "Neustarten" - IDS_RESTART_PROMPT "Möchten Sie, dass ein simulierter Windows Neustart durchgeführt wird ?" - IDS_SHUTDOWN_TITLE "Anhalten" - IDS_SHUTDOWN_PROMPT "Möchten Sie die aktuelle ReactOS Sitzung beenden ?" + IDS_RESTART_TITLE "Neu starten" + IDS_RESTART_PROMPT "Möchten Sie das System neu starten?" + IDS_SHUTDOWN_TITLE "Herunterfahren" + IDS_SHUTDOWN_PROMPT "Möchten Sie das System herunterfahren?" /* shell folder path default values */ IDS_PROGRAMS "Startmenü\\Programme"

17 years, 3 months

[cfinck] 28937: Accept the parameters case-insensitive in shutdown as well

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Sep 8 13:55:42 2007 New Revision: 28937 URL: http://svn.reactos.org/svn/reactos?rev=28937&view=rev Log: Accept the parameters case-insensitive in shutdown as well Modified: trunk/reactos/base/applications/shutdown/shutdown.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c Sat Sep 8 13:55:42 2007 @@ -55,11 +55,25 @@ if (argv[i][0] == '-' || argv[i][0] == '/') { switch(argv[i][1]) { - case '?': PrintUsage(); exit(0); - case 'f': opts.force = TRUE; break; - case 'l': opts.logoff = TRUE; break; - case 'r': opts.restart = TRUE; break; - case 's': opts.shutdown = TRUE; break; + case '?': + PrintUsage(); + exit(0); + case 'f': + case 'F': + opts.force = TRUE; + break; + case 'l': + case 'L': + opts.logoff = TRUE; + break; + case 'r': + case 'R': + opts.restart = TRUE; + break; + case 's': + case 'S': + opts.shutdown = TRUE; + break; default: // Unknown arguments will exit program. PrintUsage();

17 years, 3 months

[cfinck] 28936: - Accept the parameters case-insensitive - Replace the "/h" option by a "/?" option as described in the Usage text - Use a consistent indentation - Change the Usage text a bit

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Sep 8 13:04:51 2007 New Revision: 28936 URL: http://svn.reactos.org/svn/reactos?rev=28936&view=rev Log: - Accept the parameters case-insensitive - Replace the "/h" option by a "/?" option as described in the Usage text - Use a consistent indentation - Change the Usage text a bit Modified: trunk/rosapps/logevent/logevent.c Modified: trunk/rosapps/logevent/logevent.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.c?rev=28… ============================================================================== --- trunk/rosapps/logevent/logevent.c (original) +++ trunk/rosapps/logevent/logevent.c Sat Sep 8 13:04:51 2007 @@ -32,58 +32,58 @@ #include <tchar.h> #include <stdarg.h> -TCHAR* m_MachineName = NULL; -TCHAR* m_Text = "No User Event Text"; -TCHAR* m_Source = "User Event"; -WORD m_Severity = EVENTLOG_INFORMATION_TYPE; -WORD m_Category = 0; -DWORD m_EventID = 1; +TCHAR* m_MachineName = NULL; +TCHAR* m_Text = "No User Event Text"; +TCHAR* m_Source = "User Event"; +WORD m_Severity = EVENTLOG_INFORMATION_TYPE; +WORD m_Category = 0; +DWORD m_EventID = 1; void Usage(VOID) { - fputs("logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); - fputs("\n", stderr); - fputs(" Options:\n", stderr); - fputs(" -s Severity one of :\n", stderr); - fputs(" (S)uccess\n", stderr); - fputs(" (I)nformation\n", stderr); - fputs(" (W)arning\n", stderr); - fputs(" (E)rror\n", stderr); - fputs(" (F)ailure\n", stderr); - fputs(" -r Source\n", stderr); - fputs(" -c Category number\n", stderr); - fputs(" -e Event ID\n", stderr); - fputs(" /? Help\n", stderr); + fputs("Usage: logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); + fputs("\n\n", stderr); + fputs("Options:\n", stderr); + fputs(" -s Severity one of:\n", stderr); + fputs(" \t(S)uccess\n", stderr); + fputs(" \t(I)nformation\n", stderr); + fputs(" \t(W)arning\n", stderr); + fputs(" \t(E)rror\n", stderr); + fputs(" \t(F)ailure\n", stderr); + fputs(" -r Source\n", stderr); + fputs(" -c Category number\n", stderr); + fputs(" -e Event ID\n", stderr); + fputs(" /? Help\n", stderr); } void WriteEvent (VOID) { - HANDLE hAppLog; - BOOL bSuccess; - LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry - - /* Get a handle to the Application event log */ - hAppLog = RegisterEventSource( - (LPCSTR)m_MachineName, /* machine */ - (LPCSTR)m_Source); /* source name */ - - /* Now report the event, which will add this event to the event log */ - bSuccess = ReportEvent( - hAppLog, /* event-log handle */ - m_Severity, /* event type */ - m_Category, /* category */ - m_EventID, /* event ID */ - NULL, /* no user SID */ - 1, /* number of substitution strings */ - 0, /* no binary data */ - arrLogEntry, /* string array */ - NULL); /* address of data */ - - DeregisterEventSource(hAppLog); - - return; + HANDLE hAppLog; + BOOL bSuccess; + LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry + + /* Get a handle to the Application event log */ + hAppLog = RegisterEventSource( + (LPCSTR)m_MachineName, /* machine */ + (LPCSTR)m_Source); /* source name */ + + /* Now report the event, which will add this event to the event log */ + bSuccess = ReportEvent( + hAppLog, /* event-log handle */ + m_Severity, /* event type */ + m_Category, /* category */ + m_EventID, /* event ID */ + NULL, /* no user SID */ + 1, /* number of substitution strings */ + 0, /* no binary data */ + arrLogEntry, /* string array */ + NULL); /* address of data */ + + DeregisterEventSource(hAppLog); + + return; } /* Parse command line parameters */ @@ -92,7 +92,7 @@ INT i; BOOL ShowUsage; BOOL FoundEventText; - BOOL InvalidOption; + BOOL InvalidOption; if (argc < 2) { ShowUsage = TRUE; @@ -106,44 +106,68 @@ for (i = 1; i < argc; i++) { if (argv[i][0] == '-' || argv[i][0] == '/') { switch (argv[i][1]) { - case 's': - switch (argv[i + 1][0]) - { - case 's': - m_Severity = EVENTLOG_SUCCESS; - i++; - break; - case 'i': - m_Severity = EVENTLOG_INFORMATION_TYPE; - i++; - break; - case 'w': - m_Severity = EVENTLOG_WARNING_TYPE; - i++; - break; - case 'e': - m_Severity = EVENTLOG_ERROR_TYPE; - i++; - break; - case 'f': - m_Severity = EVENTLOG_ERROR_TYPE; - i++; - break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; - } - break; - case 'm': m_MachineName = argv[i + 1]; i++; break; - case 'r': m_Source = argv[i + 1]; i++; break; - case 'c': m_Category = atoi(argv[i + 1]); i++; break; - case 'e': m_EventID = atoi(argv[i + 1]); i++; break; - case 'h': ShowUsage = TRUE; break; - default: - printf("Bad option %s.\n", argv[i]); - Usage(); - return FALSE; + case 's': + case 'S': + switch (argv[i + 1][0]) + { + case 's': + case 'S': + m_Severity = EVENTLOG_SUCCESS; + i++; + break; + case 'i': + case 'I': + m_Severity = EVENTLOG_INFORMATION_TYPE; + i++; + break; + case 'w': + case 'W': + m_Severity = EVENTLOG_WARNING_TYPE; + i++; + break; + case 'e': + case 'E': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + case 'f': + case 'F': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + break; + case 'm': + case 'M': + m_MachineName = argv[i + 1]; + i++; + break; + case 'r': + case 'R': + m_Source = argv[i + 1]; + i++; + break; + case 'c': + case 'C': + m_Category = atoi(argv[i + 1]); + i++; + break; + case 'e': + case 'E': + m_EventID = atoi(argv[i + 1]); + i++; + break; + case '?': + ShowUsage = TRUE; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; } if (InvalidOption) { printf("Bad option format %s.\n", argv[i]); @@ -154,7 +178,7 @@ printf("Bad parameter %s.\n", argv[i]); return FALSE; } else { - m_Text = argv[i]; + m_Text = argv[i]; FoundEventText = TRUE; } } @@ -175,8 +199,8 @@ int main(int argc, char **argv) { - if (ParseCmdline(argc, argv)) - WriteEvent (); - - return 0; -} + if (ParseCmdline(argc, argv)) + WriteEvent (); + + return 0; +}

17 years, 3 months

[cfinck] 28935: Add a "logevent" utility for adding an event to the EventLog, developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2598 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Sep 8 12:31:56 2007 New Revision: 28935 URL: http://svn.reactos.org/svn/reactos?rev=28935&view=rev Log: Add a "logevent" utility for adding an event to the EventLog, developed by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) See issue #2598 for more details. Added: trunk/rosapps/logevent/ trunk/rosapps/logevent/logevent.c trunk/rosapps/logevent/logevent.rbuild trunk/rosapps/logevent/logevent.rc Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=28935… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat Sep 8 12:31:56 2007 @@ -49,6 +49,10 @@ </directory> --> +<directory name="logevent"> + <xi:include href="logevent/logevent.rbuild" /> +</directory> + <directory name="magnify"> <xi:include href="magnify/magnify.rbuild" /> </directory> Added: trunk/rosapps/logevent/logevent.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.c?rev=28… ============================================================================== --- trunk/rosapps/logevent/logevent.c (added) +++ trunk/rosapps/logevent/logevent.c Sat Sep 8 12:31:56 2007 @@ -1,0 +1,182 @@ +/* + * ReactOS Win32 Applications + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* $Id: hostname.c 21664 2006-04-19 20:14:03Z gedmurphy $ + * + * COPYRIGHT : See COPYING in the top level directory + * PROJECT : Event Logging Utility + * FILE : logevent.c + * PROGRAMMER: Marc Piulachs (marc.piulachs at codexchange [dot] net) + */ + +#include <windows.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <malloc.h> +#include <tchar.h> +#include <stdarg.h> + +TCHAR* m_MachineName = NULL; +TCHAR* m_Text = "No User Event Text"; +TCHAR* m_Source = "User Event"; +WORD m_Severity = EVENTLOG_INFORMATION_TYPE; +WORD m_Category = 0; +DWORD m_EventID = 1; + +void +Usage(VOID) +{ + fputs("logevent.exe [-m \\MachineName] [options] \"Event Text\"", stderr); + fputs("\n", stderr); + fputs(" Options:\n", stderr); + fputs(" -s Severity one of :\n", stderr); + fputs(" (S)uccess\n", stderr); + fputs(" (I)nformation\n", stderr); + fputs(" (W)arning\n", stderr); + fputs(" (E)rror\n", stderr); + fputs(" (F)ailure\n", stderr); + fputs(" -r Source\n", stderr); + fputs(" -c Category number\n", stderr); + fputs(" -e Event ID\n", stderr); + fputs(" /? Help\n", stderr); +} + +void +WriteEvent (VOID) +{ + HANDLE hAppLog; + BOOL bSuccess; + LPCTSTR arrLogEntry[] = { m_Text }; //writing just one entry + + /* Get a handle to the Application event log */ + hAppLog = RegisterEventSource( + (LPCSTR)m_MachineName, /* machine */ + (LPCSTR)m_Source); /* source name */ + + /* Now report the event, which will add this event to the event log */ + bSuccess = ReportEvent( + hAppLog, /* event-log handle */ + m_Severity, /* event type */ + m_Category, /* category */ + m_EventID, /* event ID */ + NULL, /* no user SID */ + 1, /* number of substitution strings */ + 0, /* no binary data */ + arrLogEntry, /* string array */ + NULL); /* address of data */ + + DeregisterEventSource(hAppLog); + + return; +} + +/* Parse command line parameters */ +static BOOL ParseCmdline(int argc, TCHAR **argv) +{ + INT i; + BOOL ShowUsage; + BOOL FoundEventText; + BOOL InvalidOption; + + if (argc < 2) { + ShowUsage = TRUE; + } else { + ShowUsage = FALSE; + } + + FoundEventText = FALSE; + InvalidOption = FALSE; + + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' || argv[i][0] == '/') { + switch (argv[i][1]) { + case 's': + switch (argv[i + 1][0]) + { + case 's': + m_Severity = EVENTLOG_SUCCESS; + i++; + break; + case 'i': + m_Severity = EVENTLOG_INFORMATION_TYPE; + i++; + break; + case 'w': + m_Severity = EVENTLOG_WARNING_TYPE; + i++; + break; + case 'e': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + case 'f': + m_Severity = EVENTLOG_ERROR_TYPE; + i++; + break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + break; + case 'm': m_MachineName = argv[i + 1]; i++; break; + case 'r': m_Source = argv[i + 1]; i++; break; + case 'c': m_Category = atoi(argv[i + 1]); i++; break; + case 'e': m_EventID = atoi(argv[i + 1]); i++; break; + case 'h': ShowUsage = TRUE; break; + default: + printf("Bad option %s.\n", argv[i]); + Usage(); + return FALSE; + } + if (InvalidOption) { + printf("Bad option format %s.\n", argv[i]); + return FALSE; + } + } else { + if (FoundEventText) { + printf("Bad parameter %s.\n", argv[i]); + return FALSE; + } else { + m_Text = argv[i]; + FoundEventText = TRUE; + } + } + } + + if ((!ShowUsage) && (!FoundEventText)) { + printf("The event text must be specified.\n"); + return FALSE; + } + + if (ShowUsage) { + Usage(); + return FALSE; + } + + return TRUE; +} + +int main(int argc, char **argv) +{ + if (ParseCmdline(argc, argv)) + WriteEvent (); + + return 0; +} Added: trunk/rosapps/logevent/logevent.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.rbuild?r… ============================================================================== --- trunk/rosapps/logevent/logevent.rbuild (added) +++ trunk/rosapps/logevent/logevent.rbuild Sat Sep 8 12:31:56 2007 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> + +<module name="logevent" type="win32cui" installbase="system32" installname="logevent.exe" allowwarnings="true"> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>advapi32</library> + <file>logevent.c</file> + <file>logevent.rc</file> +</module> Added: trunk/rosapps/logevent/logevent.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/logevent/logevent.rc?rev=2… ============================================================================== --- trunk/rosapps/logevent/logevent.rc (added) +++ trunk/rosapps/logevent/logevent.rc Sat Sep 8 12:31:56 2007 @@ -1,0 +1,5 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Win32 logevent utility\0" +#define REACTOS_STR_INTERNAL_NAME "logevent\0" +#define REACTOS_STR_ORIGINAL_FILENAME "logevent.exe\0" + +#include <reactos/version.rc>

17 years, 3 months

[cwittich] 28934: -fix a bug in GetDisplayNumberFromDeviceName -don't overwrite memory in IntEnumDisplaySettings

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Sep 8 11:43:45 2007 New Revision: 28934 URL: http://svn.reactos.org/svn/reactos?rev=28934&view=rev Log: -fix a bug in GetDisplayNumberFromDeviceName -don't overwrite memory in IntEnumDisplaySettings Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 11:43:45 2007 @@ -2736,7 +2736,7 @@ *DisplayNumber = ((GDIDEVICE *)pDC->GDIDevice)->DisplayNumber; - DC_UnlockDc(DesktopHDC); + DC_UnlockDc(pDC); UserReleaseDC(DesktopObject, DesktopHDC, FALSE); return STATUS_SUCCESS; @@ -2787,7 +2787,6 @@ static UNICODE_STRING CachedDeviceName; PDEVMODEW CachedMode = NULL; DEVMODEW DevMode; - INT Size, OldSize; ULONG DisplayNumber; if (!NT_SUCCESS(GetDisplayNumberFromDeviceName(pDeviceName, &DisplayNumber))) @@ -2884,7 +2883,7 @@ } /* Call DDI driver's EnableDriver function */ - RtlZeroMemory(&DrvEnableData, sizeof (DrvEnableData)); + RtlZeroMemory(&DrvEnableData, sizeof(DrvEnableData)); if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof (DrvEnableData), &DrvEnableData)) { @@ -2999,20 +2998,9 @@ ASSERT(CachedMode != NULL); - Size = OldSize = pDevMode->dmSize; - if (Size > CachedMode->dmSize) - Size = CachedMode->dmSize; - RtlCopyMemory(pDevMode, CachedMode, Size); - RtlZeroMemory((PCHAR)pDevMode + Size, OldSize - Size); - pDevMode->dmSize = OldSize; - - Size = OldSize = pDevMode->dmDriverExtra; - if (Size > CachedMode->dmDriverExtra) - Size = CachedMode->dmDriverExtra; - RtlCopyMemory((PCHAR)pDevMode + pDevMode->dmSize, - (PCHAR)CachedMode + CachedMode->dmSize, Size); - RtlZeroMemory((PCHAR)pDevMode + pDevMode->dmSize + Size, OldSize - Size); - pDevMode->dmDriverExtra = OldSize; + RtlCopyMemory(pDevMode, CachedMode, pDevMode->dmSize); + RtlZeroMemory(pDevMode + pDevMode->dmSize, pDevMode->dmDriverExtra); + RtlCopyMemory(pDevMode + pDevMode->dmSize, CachedMode + CachedMode->dmSize, min(pDevMode->dmDriverExtra, CachedMode->dmDriverExtra)); return TRUE; } @@ -3162,7 +3150,7 @@ LONG Ret=0; NTSTATUS Status ; - DPRINT1("display flag : %x\n",dwflags); + DPRINT1("display flags : %x\n",dwflags); if ((dwflags & CDS_UPDATEREGISTRY) == CDS_UPDATEREGISTRY) { @@ -3185,7 +3173,7 @@ if (dwflags == 0) { /* Dynamically change graphics mode */ - DPRINT1("flag 0 UNIMPLEMENT \n"); + DPRINT1("flag 0 UNIMPLEMENTED\n"); return DISP_CHANGE_FAILED; } @@ -3193,7 +3181,7 @@ { /* Test reslution */ dwflags &= ~CDS_TEST; - DPRINT1("flag CDS_TEST UNIMPLEMENT"); + DPRINT1("flag CDS_TEST UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; } @@ -3202,15 +3190,12 @@ DEVMODEW lpDevMode; /* Full Screen */ dwflags &= ~CDS_FULLSCREEN; - DPRINT1("flag CDS_FULLSCREEN partially implemented"); + DPRINT1("flag CDS_FULLSCREEN partially implemented\n"); Ret = DISP_CHANGE_FAILED; - lpDevMode.dmBitsPerPel =0; - lpDevMode.dmPelsWidth =0; - lpDevMode.dmPelsHeight =0; - lpDevMode.dmDriverExtra =0; - + RtlZeroMemory(&lpDevMode, sizeof(DEVMODEW)); lpDevMode.dmSize = sizeof(DEVMODEW); + if (!IntEnumDisplaySettings(pDeviceName, ENUM_CURRENT_SETTINGS, &lpDevMode, 0)) return DISP_CHANGE_FAILED; @@ -3231,7 +3216,7 @@ Ret=DISP_CHANGE_BADPARAM; else { - DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENT"); + DPRINT1("flag CDS_VIDEOPARAMETERS UNIMPLEMENTED\n"); Ret = DISP_CHANGE_FAILED; } @@ -3247,7 +3232,7 @@ HANDLE DevInstRegKey; ULONG NewValue; - DPRINT1("set CDS_UPDATEREGISTRY \n"); + DPRINT1("set CDS_UPDATEREGISTRY\n"); dwflags &= ~CDS_UPDATEREGISTRY;

17 years, 3 months

[jimtabor] 28933: - Remove DCU_UpdateUserXForms from files for now. - 28932: Wrong Meta Tag! - Starting the implementation of thread locking of GDI objects. - Ref: http://www.winehq.org/pipermail/wine-cvs/2007-August/035810.html

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Sep 8 05:27:49 2007 New Revision: 28933 URL: http://svn.reactos.org/svn/reactos?rev=28933&view=rev Log: - Remove DCU_UpdateUserXForms from files for now. - 28932: Wrong Meta Tag! - Starting the implementation of thread locking of GDI objects. - Ref: http://www.winehq.org/pipermail/wine-cvs/2007-August/035810.html Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Sat Sep 8 05:27:49 2007 @@ -411,7 +411,6 @@ // // If we are getting called that means User XForms is a mess! // - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); ExFreePool(Points); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 8 05:27:49 2007 @@ -2608,7 +2608,6 @@ /* Create inverse of world-to-viewport transformation */ dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Sat Sep 8 05:27:49 2007 @@ -1626,7 +1626,6 @@ IntDPtoLP(dc, &pt, 1); IntGdiMoveToEx(dc, pt.x, pt.y, NULL); } - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret); return ret; }

17 years, 3 months

[jimtabor] 28932: - Reordered IntGdiGet/SetDCState and separated the copy sections. - When creating DCE for window handles, allocate a DC structure for the default window DC. - Return Dhpdev if not zero for NtGdiOpenDCW. - Reordered the DC object.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Sep 8 05:05:27 2007 New Revision: 28932 URL: http://svn.reactos.org/svn/reactos?rev=28932&view=rev Log: - Reordered IntGdiGet/SetDCState and separated the copy sections. - When creating DCE for window handles, allocate a DC structure for the default window DC. - Return Dhpdev if not zero for NtGdiOpenDCW. - Reordered the DC object. Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Sat Sep 8 05:05:27 2007 @@ -5,6 +5,11 @@ /* GDI logical bitmap object */ typedef struct _BITMAPOBJ { + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + SURFOBJ SurfObj; FLONG flHooks; FLONG flFlags; Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/brush.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/brush.h Sat Sep 8 05:05:27 2007 @@ -23,6 +23,11 @@ typedef struct { + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + ULONG ulStyle; HBITMAP hbmPattern; HANDLE hbmClient; Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Sat Sep 8 05:05:27 2007 @@ -43,6 +43,19 @@ #endif } GDIOBJHDR, *PGDIOBJHDR; +// +// Every GDI Object must have this standard type of header. +// It's for thread locking. +// This header is standalone, used only in gdiobj.c. +// +typedef struct _GDIOBJEMPTYHDR +{ + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; +} GDIOBJEMPTYHDR, *PGDIOBJEMPTYHDR; + BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle); void INTERNAL_CALL GDIOBJ_SetOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle, PEPROCESS Owner); void INTERNAL_CALL GDIOBJ_CopyOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ CopyFrom, HGDIOBJ CopyTo); Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h Sat Sep 8 05:05:27 2007 @@ -16,6 +16,11 @@ } ColorShifts; typedef struct _PALGDI { + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + PALOBJ PalObj; XLATEOBJ *logicalToSystem; HPALETTE Self; Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Sat Sep 8 05:05:27 2007 @@ -6,6 +6,11 @@ /* Internal region data. Can't use RGNDATA structure because buffer is allocated statically */ typedef struct _ROSRGNDATA { + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + RGNDATAHEADER rdh; PRECT Buffer; } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA; Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h Sat Sep 8 05:05:27 2007 @@ -6,6 +6,11 @@ /* GDI logical font object */ typedef struct { + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + ENUMLOGFONTEXDVW logfont; //LOGFONTW logfont; FONTOBJ *Font; BOOLEAN Initialized; /* Don't reinitialize for each DC */

17 years, 3 months

[cwittich] 28931: use the same version number for the dx libraries

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Sep 8 02:42:09 2007 New Revision: 28931 URL: http://svn.reactos.org/svn/reactos?rev=28931&view=rev Log: use the same version number for the dx libraries Modified: trunk/reactos/dll/directx/d3d8/d3d8.rc trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc trunk/reactos/dll/directx/d3d9/d3d9.rc trunk/reactos/dll/directx/ddraw/ddraw.rc Modified: trunk/reactos/dll/directx/d3d8/d3d8.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rc (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rc Sat Sep 8 02:42:09 2007 @@ -4,4 +4,10 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Direct3D\0" #define REACTOS_STR_INTERNAL_NAME "d3d8\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/d3d8th… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc (original) +++ trunk/reactos/dll/directx/d3d8thk/d3d8thk.rc Sat Sep 8 02:42:09 2007 @@ -2,4 +2,10 @@ #define REACTOS_STR_FILE_DESCRIPTION "Direct3D OS Thunk layer\0" #define REACTOS_STR_INTERNAL_NAME "d3d8thk\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d8thk.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/d3d9/d3d9.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rc?r… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rc (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rc Sat Sep 8 02:42:09 2007 @@ -4,4 +4,10 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Direct3D\0" #define REACTOS_STR_INTERNAL_NAME "d3d9\0" #define REACTOS_STR_ORIGINAL_FILENAME "d3d9.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + #include <reactos/version.rc> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc Sat Sep 8 02:42:09 2007 @@ -4,4 +4,10 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 - DDraw\0" #define REACTOS_STR_INTERNAL_NAME "ddraw\0" #define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + #include <reactos/version.rc>

17 years, 3 months

[fireball] 28930: Dmitry Chapyshev <lentind@yandex.ru>: - Implement basics of input.dll (does not work yet, just has dialogs/resources).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Sep 7 22:22:43 2007 New Revision: 28930 URL: http://svn.reactos.org/svn/reactos?rev=28930&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Implement basics of input.dll (does not work yet, just has dialogs/resources). Added: trunk/reactos/dll/cpl/input/ (with props) trunk/reactos/dll/cpl/input/add.c (with props) trunk/reactos/dll/cpl/input/advanced.c (with props) trunk/reactos/dll/cpl/input/changekeyseq.c (with props) trunk/reactos/dll/cpl/input/input.c (with props) trunk/reactos/dll/cpl/input/input.def (with props) trunk/reactos/dll/cpl/input/input.h (with props) trunk/reactos/dll/cpl/input/input.rbuild (with props) trunk/reactos/dll/cpl/input/input.rc (with props) trunk/reactos/dll/cpl/input/inputlangprop.c (with props) trunk/reactos/dll/cpl/input/keysettings.c (with props) trunk/reactos/dll/cpl/input/lang/ (with props) trunk/reactos/dll/cpl/input/lang/en-US.rc (with props) trunk/reactos/dll/cpl/input/langbar.c (with props) trunk/reactos/dll/cpl/input/resource.h (with props) trunk/reactos/dll/cpl/input/resources/ (with props) trunk/reactos/dll/cpl/input/resources/information.ico (with props) trunk/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico (with props) trunk/reactos/dll/cpl/input/resources/keyboard.ico (with props) trunk/reactos/dll/cpl/input/resources/marker.ico (with props) trunk/reactos/dll/cpl/input/resources/microphone.ico (with props) trunk/reactos/dll/cpl/input/settings.c (with props) Modified: trunk/reactos/dll/cpl/cpl.rbuild Modified: trunk/reactos/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cpl.rbuild?rev=289… ============================================================================== --- trunk/reactos/dll/cpl/cpl.rbuild (original) +++ trunk/reactos/dll/cpl/cpl.rbuild Fri Sep 7 22:22:43 2007 @@ -9,6 +9,9 @@ </directory> <directory name="hdwwiz"> <xi:include href="hdwwiz/hdwwiz.rbuild" /> +</directory> +<directory name="input"> + <xi:include href="input/input.rbuild" /> </directory> <directory name="intl"> <xi:include href="intl/intl.rbuild" /> Propchange: trunk/reactos/dll/cpl/input/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Sep 7 22:22:43 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Added: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=28… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c (added) +++ trunk/reactos/dll/cpl/input/add.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,70 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/add.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +INT_PTR CALLBACK +AddDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + + } + case WM_COMMAND: + { + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + EndDialog(hDlg,LOWORD(wParam)); + return TRUE; + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/add.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/advanced.c (added) +++ trunk/reactos/dll/cpl/input/advanced.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,58 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/advanced.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +/* Property page dialog callback */ +INT_PTR CALLBACK +AdvancedPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) + { + case WM_INITDIALOG: + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/advanced.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/changekeyseq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/changekeyseq… ============================================================================== --- trunk/reactos/dll/cpl/input/changekeyseq.c (added) +++ trunk/reactos/dll/cpl/input/changekeyseq.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,74 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/changekeyseq.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +INT_PTR CALLBACK +ChangeKeySeqDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/changekeyseq.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c (added) +++ trunk/reactos/dll/cpl/input/input.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,144 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/input.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +#define NUM_APPLETS (1) + +LONG CALLBACK SystemApplet(VOID); +HINSTANCE hApplet = 0; + +/* Applets */ +APPLET Applets[NUM_APPLETS] = +{ + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} +}; + +VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT; + psp->hInstance = hApplet; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + + +/* First Applet */ + +LONG CALLBACK +SystemApplet(VOID) +{ + PROPSHEETPAGE psp[2]; + PROPSHEETHEADER psh; + TCHAR Caption[1024]; + + LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = Caption; + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = NULL; + + InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC) SettingPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + + +/* Control Panel Callback */ +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + CPLINFO *CPlInfo; + DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl); + + i = (DWORD)lParam1; + switch(uMsg) + { + case CPL_INIT: + return TRUE; + + case CPL_GETCOUNT: + return NUM_APPLETS; + + case CPL_INQUIRE: + CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + + case CPL_DBLCLK: + Applets[i].AppletProc(); + break; + } + + return FALSE; +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/input.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/input.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.def?re… ============================================================================== --- trunk/reactos/dll/cpl/input/input.def (added) +++ trunk/reactos/dll/cpl/input/input.def Fri Sep 7 22:22:43 2007 @@ -1,0 +1,6 @@ +LIBRARY input.dll + +EXPORTS +CPlApplet + +; EOF Propchange: trunk/reactos/dll/cpl/input/input.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h (added) +++ trunk/reactos/dll/cpl/input/input.h Fri Sep 7 22:22:43 2007 @@ -1,0 +1,52 @@ +#ifndef __CPL_INPUT_H +#define __CPL_INPUT_H + +typedef LONG (CALLBACK *CPLAPPLET_PROC)(VOID); + +typedef struct +{ + int idIcon; + int idName; + int idDescription; + CPLAPPLET_PROC AppletProc; +} APPLET, *PAPPLET; + +extern HINSTANCE hApplet; + +/* input.c */ +VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); + +/* settings.c */ +INT_PTR CALLBACK +SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); + +/* advanced.c */ +INT_PTR CALLBACK +AdvancedPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); + +/* langbar.c */ +INT_PTR CALLBACK +LangBarDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); + +/* keysettings.c */ +INT_PTR CALLBACK +KeySettingsDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); + +/* add.c */ +INT_PTR CALLBACK +AddDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); + +/* changekeyseq.c */ +INT_PTR CALLBACK +ChangeKeySeqDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); + +/* inputlangprop.c */ +INT_PTR CALLBACK +InputLangPropDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); + +void ShowLastWin32Error(HWND hWndOwner); + +#endif /* __CPL_INPUT_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/input.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild (added) +++ trunk/reactos/dll/cpl/input/input.rbuild Fri Sep 7 22:22:43 2007 @@ -1,0 +1,24 @@ +<module name="input" type="win32dll" extension=".dll" baseaddress="${BASEADDRESS_APPWIZ}" installbase="system32" installname="input.dll"> + <importlibrary definition="input.def" /> + <include base="input">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>comctl32</library> + <library>msvcrt</library> + <file>input.c</file> + <file>settings.c</file> + <file>advanced.c</file> + <file>langbar.c</file> + <file>keysettings.c</file> + <file>add.c</file> + <file>changekeyseq.c</file> + <file>inputlangprop.c</file> + <file>input.rc</file> +</module> Propchange: trunk/reactos/dll/cpl/input/input.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (added) +++ trunk/reactos/dll/cpl/input/input.rc Fri Sep 7 22:22:43 2007 @@ -1,0 +1,28 @@ +#include "resource.h" +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_INTERNAL_NAME "input\0" +#define REACTOS_STR_ORIGINAL_FILENAME "input.dll\0" +#ifdef _MSC_VER +#include <../../../reactos/version.rc> +#else +#include <reactos/version.rc> +#endif + +IDI_KEYBOARD_ICO ICON "resources/keyboard.ico" +IDI_MARKER_ICO ICON "resources/marker.ico" +IDI_MIC_ICO ICON "resources/microphone.ico" +IDI_KEY_SHORT_ICO ICON "resources/keyboard-shortcuts.ico" +IDI_INFO_ICO ICON "resources/information.ico" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ + +#include "lang/en-US.rc" Propchange: trunk/reactos/dll/cpl/input/input.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/inputlangprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/inputlangpro… ============================================================================== --- trunk/reactos/dll/cpl/input/inputlangprop.c (added) +++ trunk/reactos/dll/cpl/input/inputlangprop.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,74 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/inputlangprop.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +INT_PTR CALLBACK +InputLangPropDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/inputlangprop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/keysettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/keysettings.… ============================================================================== --- trunk/reactos/dll/cpl/input/keysettings.c (added) +++ trunk/reactos/dll/cpl/input/keysettings.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,80 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/keysettings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +INT_PTR CALLBACK +KeySettingsDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_CHANGE_KEY_SEQ_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_CHANGE_KEY_SEQ), + hDlg, + ChangeKeySeqDlgProc); + break; + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/keysettings.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/input/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Sep 7 22:22:43 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Added: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (added) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Fri Sep 7 22:22:43 2007 @@ -1,0 +1,247 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Settings" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Default input language", -1, 7,7,231,53 + LTEXT "Select one of the installed input languages to use when you start your coputer.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "&Installed services", -1, 7,65,231,115 + LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Proferences", -1, 7,185,231,36 + PUSHBUTTON "Language &Bar...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Key Settings...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Compatibility Configuration", -1, 7,7,231,60 + AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Select this check box to on advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 + GROUPBOX "System Configuration", -1, 7,74,231,60 + AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Select this chack box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Language Bar Settings" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "Show the Language &bar on the desktop", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "Show the Language bar as &transparent when inactive", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Show &additional Language bar icons in the Notification area", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Show text &labels on the Language bar", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "Turn &off advanced text services", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 182, 99, 50, 14 +} + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Advanced Key Settings" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "To turn off Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Press the CAPS &LOCK key", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "Press the SHI&FT key", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Hot keys for input languages", -1, 7, 37, 258, 95 + LTEXT "Action", -1, 14, 47, 60, 9 + RTEXT "&Key sequence", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Change Key Sequence...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Cancel", IDCANCEL, 146, 140, 70, 14 +} + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Add Input language" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Input language:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Change Key Sequence" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Enable Key Sequence", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Key:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 +} + +IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Input language Properties" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Input language:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Cancel", IDCANCEL, 169, 53, 52, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Text Services and Input Languages" + IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" +END Propchange: trunk/reactos/dll/cpl/input/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/langbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/langbar.c?re… ============================================================================== --- trunk/reactos/dll/cpl/input/langbar.c (added) +++ trunk/reactos/dll/cpl/input/langbar.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,74 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/langbar.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +INT_PTR CALLBACK +LangBarDlgProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + + break; + case IDCANCEL: + EndDialog(hDlg,LOWORD(wParam)); + break; + } + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/langbar.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h (added) +++ trunk/reactos/dll/cpl/input/resource.h Fri Sep 7 22:22:43 2007 @@ -1,0 +1,193 @@ +#ifndef __CPL_RESOURCE_H +#define __CPL_RESOURCE_H + +/* metrics */ +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 +#define SYSTEM_COLUMN (0 * PROPSHEETPADDING) +#define ICONSIZE 16 + +/* IDI */ +#define IDI_KEYBOARD_ICO 202 +#define IDI_MARKER_ICO 205 +#define IDI_MIC_ICO 203 +#define IDI_KEY_SHORT_ICO 200 +#define IDI_INFO_ICO 207 +#define IDI_CPLSYSTEM 1502 + +/* IDD */ +#define IDD_PROPPAGESETTINGS 500 +#define IDD_PROPPAGEADVANCED 501 +#define IDD_LANGBAR 502 +#define IDD_KEYSETTINGS 503 +#define IDD_ADD 504 +#define IDD_CHANGE_KEY_SEQ 505 +#define IDD_INPUT_LANG_PROP 506 + +/* IDC */ +#define IDC_DEFAULT_INPUT_LANG 150 +#define IDC_ADD_BUTTON 151 +#define IDC_REMOVE_BUTTON 152 +#define IDC_PROP_BUTTON 153 +#define IDC_LANG_BAR_BUTTON 154 +#define IDC_KEY_SETTINGS_BUTTON 155 +#define IDC_SET_DEFAULT 156 +#define IDC_KEYLAYOUT_TREE 157 +#define IDC_CHANGE_KEY_SEQ_BUTTON 158 +#define IDC_LANGBAR_TRANSP_INACT_CHECKBOX 159 +#define IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX 160 +#define IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX 161 +#define IDC_OFF_ADVAN_TEXTSERV_CHECKBOX 162 +#define IDC_LANGBAR_ON_DESK_CHECKBOX 163 +#define IDC_SUPPORT_ADV_SERV_CHECKBOX 164 +#define IDC_TURNOFF_ADV_TXTSERV_CHECKBOX 165 +#define IDC_PRESS_CAPSLOCK_KEY_RADIOBTN 166 +#define IDC_PRESS_SHIFT_KEY_RADIOBTN 167 +#define IDC_KEY_LISTBOX 168 +#define IDC_INPUT_LANGUAGE_COMBO 169 +#define IDC_KEYBOARD_LAYOUT_COMBO 170 +#define IDC_ENABLE_KEY_SEQ_CHECKBOX 171 +#define IDC_CTRL_CHECKBOX 172 +#define IDC_ALT_CHECKBOX 173 +#define IDC_CKEY_COMBOBOX 174 +#define IDC_KEYBOARD_LAYOUT_IME_COMBO 175 + +/* IDS */ +#define IDS_CPLSYSTEMNAME 1 +#define IDS_CPLSYSTEMDESCRIPTION 2 + +#define IDS_US_LAYOUT 5000 +#define IDS_BELGIAN_LAYOUT 5001 +#define IDS_BELGIAN_FRENCH_LAYOUT 5002 +#define IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT 5003 +#define IDS_CANADIAN_FRENCH_LAYOUT 5004 +#define IDS_CANADIAN_FRENCH_LEGACY_LAYOUT 5005 +#define IDS_DANISH_LAYOUT 5007 +#define IDS_DUTCH_LAYOUT 5008 +#define IDS_FINNISH_LAYOUT 5009 +#define IDS_FRENCH_LAYOUT 5010 +#define IDS_GERMAN_LAYOUT 5011 +#define IDS_GERMAN_IBM_LAYOUT 5012 +#define IDS_ICELANDIC_LAYOUT 5013 +#define IDS_IRISH_LAYOUT 5014 +#define IDS_ITALIAN_LAYOUT 5015 +#define IDS_ITALIAN_142_LAYOUT 5016 +#define IDS_LATIN_AMERICAN_LAYOUT 5017 +#define IDS_NORWEGIAN_LAYOUT 5018 +#define IDS_PORTUGUESE_LAYOUT 5019 +#define IDS_SPANISH_LAYOUT 5020 +#define IDS_SPANISH_VARIANTION_LAYOUT 5021 +#define IDS_SWEDISH_LAYOUT 5022 +#define IDS_SWISS_FRENCH_LAYOUT 5023 +#define IDS_SWISS_GERMAN_LAYOUT 5024 +#define IDS_UNITED_KINGDOM_LAYOUT 5025 +#define IDS_UNITED_STATES_INTERNATIONAL_LAYOUT 5026 +#define IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT 5027 +#define IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT 5028 +#define IDS_ALBANIAN_LAYOUT 5029 +#define IDS_CROATIAN_LAYOUT 5030 +#define IDS_CZECH_LAYOUT 5031 +#define IDS_CZECH_QWERTY_LAYOUT 5032 +#define IDS_HUNGARIAN_LAYOUT 5033 +#define IDS_HUNGARIAN_101_KEY_LAYOUT 5034 +#define IDS_POLISH_LAYOUT 5035 +#define IDS_POLISH_214_LAYOUT 5036 +#define IDS_ROMANIAN_LAYOUT 5037 +#define IDS_SERBIAN_LATIN_LAYOUT 5038 +#define IDS_SLOVAK_LAYOUT 5039 +#define IDS_SLOVAK_QWERTY_LAYOUT 5040 +#define IDS_SLOVENIAN_LAYOUT 5041 +#define IDS_ESTONIAN_LAYOUT 5042 +#define IDS_LATVIAN_LAYOUT 5043 +#define IDS_LATVIAN_QWERTY_LAYOUT 5044 +#define IDS_LITHUANIAN_IBM_LAYOUT 5045 +#define IDS_GREEK_LAYOUT 5046 +#define IDS_GREEK_LATIN_LAYOUT 5047 +#define IDS_GREEK_220_LAYOUT 5048 +#define IDS_GREEK_319_LAYOUT 5049 +#define IDS_GREEK_220_LATIN_LAYOUT 5050 +#define IDS_GREEK_319_LATIN_LAYOUT 5051 +#define IDS_BELARUSIAN_LAYOUT 5052 +#define IDS_BULGARIAN_LAYOUT 5053 +#define IDS_BULGARIAN_LATIN_LAYOUT 5054 +#define IDS_RUSSIAN_LAYOUT 5055 +#define IDS_RUSSIAN_TYPEWRITER_LAYOUT 5056 +#define IDS_SERBIAN_CYRILLIC_LAYOUT 5057 +#define IDS_UKRAINIAN_LAYOUT 5058 +#define IDS_TURKISH_F_LAYOUT 5059 +#define IDS_TURKISH_Q_LAYOUT 5060 +#define IDS_JAPANESE_LAYOUT 5061 +#define IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT 5062 +#define IDS_KOREAN_LAYOUT 5063 +#define IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT 5064 +#define IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT 5065 +#define IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT 5066 +#define IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT 5067 +#define IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT 5068 +#define IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT 5069 +#define IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT 5070 +#define IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT 5071 +#define IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT 5072 +#define IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT 5073 +#define IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT 5074 +#define IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT 5075 +#define IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT 5077 +#define IDS_THAI_KEDMANEE_LAYOUT 5079 +#define IDS_THAI_PATTACHOTE_LAYOUT 5080 +#define IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT 5081 +#define IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT 5082 +#define IDS_HEBREW_LAYOUT 5083 +#define IDS_ARABIC_101_LAYOUT 5084 +#define IDS_ARABIC_102_LAYOUT 5085 +#define IDS_ARABIC_102_AZERTY_LAYOUT 5086 +#define IDS_CZECH_PROGRAMMERS_LAYOUT 5087 +#define IDS_LITHUANIAN_LAYOUT 5088 +#define IDS_BELGIAN_COMMA_LAYOUT 5089 +#define IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT 5090 +#define IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT 5091 +#define IDS_UNITED_STATES_DVIRAK_LAYOUT 5092 +#define IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT 5093 +#define IDS_ASSAMESE_LAYOUT 5094 +#define IDS_BENGALI_LAYOUT 5095 +#define IDS_DEVANAGARI_INSCRIPT_LAYOUT 5096 +#define IDS_GUJARATI_LAYOUT 5097 +#define IDS_KANNADA_LAYOUT 5098 +#define IDS_MALAYALAM_LAYOUT 5099 +#define IDS_ORIYA_LAYOUT 5100 +#define IDS_PUNJABI_LAYOUT 5101 +#define IDS_TAMIL_LAYOUT 5102 +#define IDS_TELUGU_LAYOUT 5103 +#define IDS_MARATHI_LAYOUT 5104 +#define IDS_HINDI_TRADITIONAL_LAYOUT 5105 +#define IDS_CANTONESE_PHONETIC_LAYOUT 5107 +#define IDS_FAEROESE_LAYOUT 5108 +#define IDS_FYRO_MACEDONIAN_LAYOUT 5109 +#define IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT 5110 +#define IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT 5111 +#define IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT 5112 +#define IDS_KAZAKH_LAYOUT 5113 +#define IDS_UZBEK_CYRILLIC_LAYOUT 5114 +#define IDS_AZERI_CYRILLIC_LAYOUT 5115 +#define IDS_TATAR_LAYOUT 5116 +#define IDS_AZERI_LATIN_LAYOUT 5117 +#define IDS_VIETNAMESE_LAYOUT 5118 +#define IDS_GEORGIAN_LAYOUT 5119 +#define IDS_ARMENIAN_EASTERN_LAYOUT 5120 +#define IDS_ARMENIAN_WESTERN_LAYOUT 5121 +#define IDS_GREEK_POLYTONIC_LAYOUT 5122 +#define IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT 5123 +#define IDS_FARSI_LAYOUT 5124 +#define IDS_GAELIC_LAYOUT 5125 +#define IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT 5126 +#define IDS_MONGOLIAN_CYRILLIC_LAYOUT 5127 +#define IDS_KYRGYZ_CYRILLIC_LAYOUT 5128 +#define IDS_URDU_LAYOUT 5129 +#define IDS_SYRIAC_LAYOUT 5130 +#define IDS_SYRIAC_PHONETIC_LAYOUT 5131 +#define IDS_DIVEHI_PHONETIC_LAYOUT 5132 +#define IDS_DIVEHI_TYPEWRITER_LAYOUT 5133 + +#endif /* __CPL_RESOURCE_H */ + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/cpl/input/resources/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Sep 7 22:22:43 2007 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Added: trunk/reactos/dll/cpl/input/resources/information.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/in… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/input/resources/information.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ke… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/input/resources/keyboard.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ke… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/input/resources/keyboard.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/input/resources/marker.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/ma… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/input/resources/marker.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/input/resources/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resources/mi… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/input/resources/microphone.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c (added) +++ trunk/reactos/dll/cpl/input/settings.c Fri Sep 7 22:22:43 2007 @@ -1,0 +1,87 @@ +/* + * ReactOS + * Copyright (C) 2007 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * + * PROJECT: input.dll + * FILE: dll/win32/input/settings.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) + * UPDATE HISTORY: + * 06-09-2007 Created + */ + +#include <windows.h> +#include <commctrl.h> +#include <cpl.h> + +#include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <tchar.h> +#include <process.h> + +#include "resource.h" +#include "input.h" + +/* Property page dialog callback */ +INT_PTR CALLBACK +SettingPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + switch (uMsg) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_LANG_BAR_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_LANGBAR), + hwndDlg, + LangBarDlgProc); + break; + case IDC_KEY_SETTINGS_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_KEYSETTINGS), + hwndDlg, + KeySettingsDlgProc); + break; + case IDC_ADD_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_ADD), + hwndDlg, + AddDlgProc); + break; + case IDC_PROP_BUTTON: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_INPUT_LANG_PROP), + hwndDlg, + InputLangPropDlgProc); + break; + } + break; + } + + return FALSE; +} + +/* EOF */ Propchange: trunk/reactos/dll/cpl/input/settings.c ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 3 months

[janderwald] 28929: - store setting BootCDRegtestActive - only show dbgprint when required

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Sep 7 22:11:55 2007 New Revision: 28929 URL: http://svn.reactos.org/svn/reactos?rev=28929&view=rev Log: - store setting BootCDRegtestActive - only show dbgprint when required Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h (original) +++ trunk/reactos/dll/win32/syssetup/globals.h Fri Sep 7 22:11:55 2007 @@ -47,6 +47,7 @@ TCHAR AdminPassword[15]; /* max. 14 characters */ BOOL UnattendSetup; BOOL DisableVmwInst; + DWORD BootCDRegtestActive; SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead; @@ -59,6 +60,7 @@ extern HINSTANCE hDllInstance; extern HINF hSysSetupInf; +extern SETUPDATA SetupData; /* wizard.c */ VOID InstallWizard (VOID); Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Fri Sep 7 22:11:55 2007 @@ -810,9 +810,12 @@ return 0; } - /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL - /// DO NOT REMOVE!!! - DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); + if (SetupData.BootCDRegtestActive) + { + /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL + /// DO NOT REMOVE!!! + DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); + } ExitWindowsEx(EWX_REBOOT, 0); return 0; Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Fri Sep 7 22:11:55 2007 @@ -57,7 +57,7 @@ /* GLOBALS ******************************************************************/ -static SETUPDATA SetupData; +SETUPDATA SetupData; /* FUNCTIONS ****************************************************************/ @@ -2007,7 +2007,6 @@ TCHAR szValue[MAX_PATH]; DWORD LineLength; HKEY hKey; - DWORD BootCDRegtestActive = 0; if (!SetupFindFirstLine(hUnattendedInf, _T("Unattend"), @@ -2111,7 +2110,7 @@ } else if (!_tcscmp(szName, _T("BootCDRegTestActive"))) { - BootCDRegtestActive = _ttoi(szValue); + SetupData.BootCDRegtestActive = _ttoi(szValue); } } @@ -2164,8 +2163,7 @@ }while(SetupFindNextLine(&InfContext, &InfContext)); } - DPRINT("BootCDRegtestActive %d\n", BootCDRegtestActive); - if (BootCDRegtestActive) + if (SetupData.BootCDRegtestActive) { char szPath[MAX_PATH]; FILE * file;

17 years, 3 months

← Newer
1
...
36
37
38
39
40
41
42
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007