Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[jimtabor] 29028: Fix typo, add extra entry to the structure.
by jimtabor＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: jimtabor Date: Fri Sep 14 09:05:35 2007 New Revision: 29028 URL: http://svn.reactos.org/svn/reactos?rev=29028&view=rev Log: Fix typo, add extra entry to the structure. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri Sep 14 09:05:35 2007 @@ -679,14 +679,15 @@ // typedef struct _W32CLTINFO_TEB { - ULONG Win32ClientInfo0[3]; + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; ULONG ulAppCompatFlags; ULONG ulAppCompatFlags2; ULONG Win32ClientInfo1[5]; HWND hWND; PVOID pvWND; ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, PW32CLTINFO_TEB; +} W32CLTINFO_TEB, *PW32CLTINFO_TEB; // // Initial TEB

1 0

[tkreuzer] 29027: make upper 16 bit of gdi table entries type field more windows compatible
by tkreuzer＠svn.reactos.org 14 Sep '07

14 Sep '07

Author: tkreuzer Date: Fri Sep 14 06:53:49 2007 New Revision: 29027 URL: http://svn.reactos.org/svn/reactos?rev=29027&view=rev Log: make upper 16 bit of gdi table entries type field more windows compatible Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Sep 14 06:53:49 2007 @@ -403,10 +403,10 @@ RtlZeroMemory(ObjectBody, GetObjectSize(TypeIndex)); - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - TypeInfo = (ObjectType & GDI_HANDLE_TYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + TypeInfo = (ObjectType & GDI_HANDLE_BASETYPE_MASK) | (ObjectType >> GDI_ENTRY_UPPER_SHIFT); FreeEntry = InterlockedPopEntrySList(&HandleTable->FreeEntriesHead); if(FreeEntry != NULL) @@ -641,6 +641,7 @@ if(((ULONG_PTR)PrevProcId & ~0x1) == 0) { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); + DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); KeRosDumpStackFrames(NULL, 20); } else @@ -1060,7 +1061,7 @@ } BOOL INTERNAL_CALL -GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *hObj) +GDIOBJ_ConvertToStockObj(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ *phObj) { /* * FIXME !!!!! THIS FUNCTION NEEDS TO BE FIXED - IT IS NOT SAFE WHEN OTHER THREADS @@ -1069,22 +1070,24 @@ PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, LockedProcessId, PrevProcId; PETHREAD Thread; + HGDIOBJ hObj; #ifdef GDI_DEBUG ULONG Attempts = 0; #endif - ASSERT(hObj); - - DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", *hObj); + ASSERT(phObj); + hObj = *phObj; + + DPRINT("GDIOBJ_ConvertToStockObj: hObj: 0x%08x\n", hObj); Thread = PsGetCurrentThread(); - if(!GDI_HANDLE_IS_STOCKOBJ(*hObj)) + if(!GDI_HANDLE_IS_STOCKOBJ(hObj)) { ProcessId = PsGetCurrentProcessId(); LockedProcessId = (HANDLE)((ULONG_PTR)ProcessId | 0x1); - Entry = GDI_HANDLE_GET_ENTRY(HandleTable, *hObj); + Entry = GDI_HANDLE_GET_ENTRY(HandleTable, hObj); LockHandle: /* lock the object, we must not convert stock objects, so don't check!!! */ @@ -1096,16 +1099,13 @@ /* we're locking an object that belongs to our process. First calculate the new object type including the stock object flag and then try to exchange it.*/ - /* FIXME: On Windows the higher 16 bit of the type field don't always match - the type from the handle, it is probably a storage type - (type = pen, storage = brush) */ - NewType = GDI_HANDLE_GET_TYPE(*hObj); - NewType |= GDI_HANDLE_GET_UPPER(*hObj) >> GDI_ENTRY_UPPER_SHIFT; - - /* This is the type that the object should have right now, save it */ - OldType = NewType; + /* On Windows the higher 16 bit of the type field don't contain the + full type from the handle, but the base type. + (type = BRSUH, PEN, EXTPEN, basetype = BRUSH) */ + OldType = ((ULONG)hObj & GDI_HANDLE_BASETYPE_MASK) | ((ULONG)hObj >> GDI_ENTRY_UPPER_SHIFT); + /* As the object should be a stock object, set it's flag, but only in the lower 16 bits */ - NewType |= GDI_ENTRY_STOCK_MASK; + NewType = OldType | GDI_ENTRY_STOCK_MASK; /* Try to exchange the type field - but only if the old (previous type) matches! */ PrevType = InterlockedCompareExchange(&Entry->Type, NewType, OldType); @@ -1146,7 +1146,8 @@ /* remove the process id lock and make it global */ (void)InterlockedExchangePointer(&Entry->ProcessId, GDI_GLOBAL_PROCESS); - *hObj = (HGDIOBJ)((ULONG)(*hObj) | GDI_HANDLE_STOCK_MASK); + hObj = (HGDIOBJ)((ULONG)(hObj) | GDI_HANDLE_STOCK_MASK); + *phObj = hObj; /* we're done, successfully converted the object */ return TRUE; @@ -1300,6 +1301,7 @@ else { DPRINT1("Attempted to change ownership of an object 0x%x currently being destroyed!!!\n", ObjectHandle); + DPRINT1("Entry->Type = 0x%lx, Entry->KernelData = 0x%p\n", Entry->Type, Entry->KernelData); } } else if(PrevProcId == LockedProcessId)

1 0

[jimtabor] 29026: Add window client information structure to TEB.
by jimtabor＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: jimtabor Date: Thu Sep 13 20:57:53 2007 New Revision: 29026 URL: http://svn.reactos.org/svn/reactos?rev=29026&view=rev Log: Add window client information structure to TEB. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 13 20:57:53 2007 @@ -675,6 +675,20 @@ } GDI_TEB_BATCH, *PGDI_TEB_BATCH; // +// Window Client Information structure +// +typedef struct _W32CLTINFO_TEB +{ + ULONG Win32ClientInfo0[3]; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLTINFO_TEB, PW32CLTINFO_TEB; + +// // Initial TEB // typedef struct _INITIAL_TEB @@ -733,7 +747,7 @@ ULONG GdiClientPID; ULONG GdiClientTID; PVOID GdiThreadLocalInfo; - ULONG Win32ClientInfo[62]; + W32CLTINFO_TEB Win32ClientInfo; PVOID glDispatchTable[0xE9]; ULONG glReserved1[0x1D]; PVOID glReserved2;

1 0

[dreimer] 29025: Reformat the RC Files of the cpls to use rsrc.rc for including additional languages. *Nameofcpl*.rc should be LANG_NEUTRAL SUBLANG_NEUTRAL. Add manifest.xml to all CPLs to support skinning from now on.
by dreimer＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: dreimer Date: Thu Sep 13 15:40:16 2007 New Revision: 29025 URL: http://svn.reactos.org/svn/reactos?rev=29025&view=rev Log: Reformat the RC Files of the cpls to use rsrc.rc for including additional languages. *Nameofcpl*.rc should be LANG_NEUTRAL SUBLANG_NEUTRAL. Add manifest.xml to all CPLs to support skinning from now on. Added: trunk/reactos/dll/cpl/access/manifest.xml trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/manifest.xml trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/desk/manifest.xml trunk/reactos/dll/cpl/desk/rsrc.rc trunk/reactos/dll/cpl/hdwwiz/manifest.xml trunk/reactos/dll/cpl/input/manifest.xml trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/manifest.xml trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/liccpa/manifest.xml trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/manifest.xml trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/manifest.xml trunk/reactos/dll/cpl/ncpa/manifest.xml trunk/reactos/dll/cpl/ncpa/rsrc.rc trunk/reactos/dll/cpl/powercfg/manifest.xml trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/timedate/manifest.xml trunk/reactos/dll/cpl/timedate/rsrc.rc trunk/reactos/dll/cpl/usrmgr/manifest.xml trunk/reactos/dll/cpl/usrmgr/rsrc.rc Modified: trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/intl/intl.rc trunk/reactos/dll/cpl/liccpa/liccpa.rc trunk/reactos/dll/cpl/main/main.rc trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/ncpa/ncpa.rc trunk/reactos/dll/cpl/odbccp32/odbccp32.rc trunk/reactos/dll/cpl/powercfg/powercfg.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/timedate/timedate.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Thu Sep 13 15:40:16 2007 @@ -9,19 +9,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "access.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDI_CPLACCESS ICON "resources/applet.ico" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" - - +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/access/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/access/manifest.xml (added) +++ trunk/reactos/dll/cpl/access/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/rsrc.rc (added) +++ trunk/reactos/dll/cpl/access/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,15 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,7 @@ #include "resource.h" #include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" @@ -11,30 +13,8 @@ #include <reactos/version.rc> #endif -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" -/* - * 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/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/appwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/manifest.xml (added) +++ trunk/reactos/dll/cpl/appwiz/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc (added) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,20 @@ +#include "resource.h" +#include <windows.h> + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Thu Sep 13 15:40:16 2007 @@ -10,24 +10,10 @@ #define REACTOS_STR_ORIGINAL_FILENAME "desk.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" - +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/desk/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/desk/manifest.xml (added) +++ trunk/reactos/dll/cpl/desk/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/rsrc.rc (added) +++ trunk/reactos/dll/cpl/desk/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,4 @@ #include <windows.h> - #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -15,6 +14,8 @@ #include <reactos/version.rc> #endif +123 24 DISCARDABLE "manifest.xml" + IDI_CPLICON ICON "resources/applet.ico" #include "rsrc.rc" Added: trunk/reactos/dll/cpl/hdwwiz/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/manifest.xml (added) +++ trunk/reactos/dll/cpl/hdwwiz/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: 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 (original) +++ trunk/reactos/dll/cpl/input/input.rc Thu Sep 13 15:40:16 2007 @@ -1,8 +1,10 @@ #include "resource.h" #include <windows.h> +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Language Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "input\0" #define REACTOS_STR_ORIGINAL_FILENAME "input.dll\0" #ifdef _MSC_VER @@ -11,20 +13,12 @@ #include <reactos/version.rc> #endif +123 24 DISCARDABLE "manifest.xml" + 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/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/input/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/input/manifest.xml (added) +++ trunk/reactos/dll/cpl/input/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc (added) +++ trunk/reactos/dll/cpl/input/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,6 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/intl/intl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.rc (original) +++ trunk/reactos/dll/cpl/intl/intl.rc Thu Sep 13 15:40:16 2007 @@ -4,33 +4,13 @@ #include "resource.h" #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Regional Settings Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "intl\0" #define REACTOS_STR_ORIGINAL_FILENAME "intl.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON ICON "resources/applet.ico" - - -/* - * 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/cs-CZ.rc" -#include "lang/de-DE.rc" -//#include "lang/el-GR.rc" -#include "lang/en-US.rc" -//#include "lang/es-ES.rc" -//#include "lang/fr-FR.rc" -//#include "lang/hu-HU.rc" -//#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" -//#include "lang/nl-NL.rc" -#include "lang/ru-RU.rc" -//#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/intl/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/intl/manifest.xml (added) +++ trunk/reactos/dll/cpl/intl/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/rsrc.rc (added) +++ trunk/reactos/dll/cpl/intl/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,17 @@ +#include <windows.h> +#include "resource.h" + +//#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +//#include "lang/el-GR.rc" +#include "lang/en-US.rc" +//#include "lang/es-ES.rc" +//#include "lang/fr-FR.rc" +//#include "lang/hu-HU.rc" +//#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +//#include "lang/ja-JP.rc" +//#include "lang/nl-NL.rc" +#include "lang/ru-RU.rc" +//#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rc (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rc Thu Sep 13 15:40:16 2007 @@ -2,6 +2,8 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" @@ -9,15 +11,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "cplsample.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON_1 ICON "resources/cpl_icon1.ico" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/liccpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/manifest.xml (added) +++ trunk/reactos/dll/cpl/liccpa/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/rsrc.rc (added) +++ trunk/reactos/dll/cpl/liccpa/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,12 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rc (original) +++ trunk/reactos/dll/cpl/main/main.rc Thu Sep 13 15:40:16 2007 @@ -3,16 +3,15 @@ #include <windows.h> #include "resource.h" - -/* define language neutral resources */ - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sample Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Keyboard Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "main\0" #define REACTOS_STR_ORIGINAL_FILENAME "main.cpl\0" #include <reactos/version.rc> + +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON_1 ICON "resources/mouse.ico" IDC_CPLICON_2 ICON "resources/keyboard.ico" @@ -21,19 +20,4 @@ IDI_MOUSE_LEFT ICON "resources/mouse_left.ico" IDI_MOUSE_RIGHT ICON "resources/mouse_right.ico" - -/* include localised resources */ - -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/main/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/main/manifest.xml (added) +++ trunk/reactos/dll/cpl/main/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (added) +++ trunk/reactos/dll/cpl/main/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,16 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/mmsys/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/manifest.xml… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/manifest.xml (added) +++ trunk/reactos/dll/cpl/mmsys/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rc (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rc Thu Sep 13 15:40:16 2007 @@ -1,5 +1,7 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Multimedia Control Panel\0" @@ -7,6 +9,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "mmsys.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDI_CPLICON ICON "resources/mmsys.ico" IDI_MUTED_ICON ICON "resources/muted.ico" Added: trunk/reactos/dll/cpl/ncpa/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/manifest.xml?… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/manifest.xml (added) +++ trunk/reactos/dll/cpl/ncpa/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Thu Sep 13 15:40:16 2007 @@ -1,34 +1,20 @@ /* $Id$ */ +#include <windows.h> #include "resource.h" -#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "ncpa\0" #define REACTOS_STR_ORIGINAL_FILENAME "ncpa.cpl\0" +123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" IDI_HORIZONTAL ICON "resources/HORIZ.ICO" IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nb-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/ncpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/rsrc.rc (added) +++ trunk/reactos/dll/cpl/ncpa/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.… ============================================================================== --- trunk/reactos/dll/cpl/odbccp32/odbccp32.rc (original) +++ trunk/reactos/dll/cpl/odbccp32/odbccp32.rc Thu Sep 13 15:40:16 2007 @@ -1,4 +1,3 @@ - #include <windows.h> #include "resource.h" Added: trunk/reactos/dll/cpl/powercfg/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/manifest.xml (added) +++ trunk/reactos/dll/cpl/powercfg/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Thu Sep 13 15:40:16 2007 @@ -2,6 +2,8 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Power Management Control Panel\0" @@ -9,19 +11,11 @@ #define REACTOS_STR_ORIGINAL_FILENAME "powercfg.cpl\0" #include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" + IDI_AC ICON "resources/ac.ico" IDI_ACDC ICON "resources/acdc.ico" IDI_DC ICON "resources/dc.ico" IDI_SCREEN ICON "resources/screen.ico" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc (added) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc (added) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,21 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" + +/* +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/es-ES.rc" +#include "lang/hu-HU.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/sv-SE.rc" +*/ Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Thu Sep 13 15:40:16 2007 @@ -2,7 +2,7 @@ #include <commctrl.h> #include "resource.h" -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Applet\0" @@ -13,30 +13,11 @@ 123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" - IDI_USERPROF ICON "resources/devmgr.ico" IDI_HARDPROF ICON "resources/devmgr.ico" IDI_DEVMGR ICON "resources/devmgr.ico" - IDB_ROSBMP BITMAP "resources/rosbitmap.bmp" RC_LICENSE RTDATA "resources/gpl.txt" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" - -/* -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/es-ES.rc" -#include "lang/hu-HU.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/sv-SE.rc" -*/ +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/timedate/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/manifest.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/manifest.xml (added) +++ trunk/reactos/dll/cpl/timedate/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/timedate/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/rsrc.rc (added) +++ trunk/reactos/dll/cpl/timedate/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,22 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/it-IT.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/th-TH.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/timedate/timedate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rc (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rc Thu Sep 13 15:40:16 2007 @@ -1,37 +1,18 @@ #include <windows.h> #include <commctrl.h> - #include "resource.h" - LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS time/date Control Panel\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Time/Date Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "timedate\0" #define REACTOS_STR_ORIGINAL_FILENAME "timedate.cpl\0" -//#include <reactos/version.rc> +#include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_CPLICON ICON "resources/applet.ico" IDC_WORLD BITMAP "resources/world.bmp" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#include "rsrc.rc" Added: trunk/reactos/dll/cpl/usrmgr/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/manifest.xm… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/manifest.xml (added) +++ trunk/reactos/dll/cpl/usrmgr/manifest.xml Thu Sep 13 15:40:16 2007 @@ -1,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.System.ControlPanel.System" + type="win32" + /> + <description>ReactOS System Control Panel</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> + + Added: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/rsrc.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/rsrc.rc Thu Sep 13 15:40:16 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rc (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rc Thu Sep 13 15:40:16 2007 @@ -7,12 +7,11 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS User Manager Panel\0" #define REACTOS_STR_INTERNAL_NAME "usrmgr\0" #define REACTOS_STR_ORIGINAL_FILENAME "usrmgr.cpl\0" +#include <reactos/version.rc> -#include <reactos/version.rc> +123 24 DISCARDABLE "manifest.xml" IDC_USRMGR_ICON ICON "resources/applet.ico" IDC_USRMGR_ICON2 ICON "resources/applet.ico" - -#include "lang/en-US.rc" -#include "lang/ru-RU.rc" +#include "rsrc.rc"

1 0

[janderwald] 29024: - implement reading/displaying audio schemes
by janderwald＠svn.reactos.org 13 Sep '07

13 Sep '07

Author: janderwald Date: Thu Sep 13 07:11:15 2007 New Revision: 29024 URL: http://svn.reactos.org/svn/reactos?rev=29024&view=rev Log: - implement reading/displaying audio schemes Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Thu Sep 13 07:11:15 2007 @@ -13,6 +13,7 @@ <library>msvcrt</library> <library>devmgr</library> <library>gdi32</library> + <library>winmm</library> <library>advapi32</library> <file>mmsys.c</file> <file>sounds.c</file> Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Thu Sep 13 07:11:15 2007 @@ -23,12 +23,17 @@ #define IDC_DEVICE_MIDI_LIST 114 #define IDC_DEVICE_VOICE_LIST 115 #define IDC_DEVICE_VOICE_REC_LIST 116 +#define IDC_TEXT_SOUND 117 +#define IDC_PLAY_SOUND 118 +#define IDC_BROWSE_SOUND 119 + #define IDB_SPEAKIMG 4624 #define IDC_SPEAKIMG 4625 #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 +#define IDS_NO_SOUND 1002 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Thu Sep 13 07:11:15 2007 @@ -40,18 +40,27 @@ PAPP_CONTEXT AppContext; }SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; +typedef struct __LABEL_MAP__ +{ + TCHAR * szName; + TCHAR * szDesc; + TCHAR * szIcon; + struct __LABEL_MAP__ * Next; +}LABEL_MAP, *PLABEL_MAP; + +static PLABEL_MAP s_Map = NULL; + BOOL -LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) +LoadEventLabel(HKEY hKey, TCHAR * szSubKey) { HKEY hSubKey; DWORD dwData; DWORD dwDesc; TCHAR szDesc[MAX_PATH]; TCHAR szData[MAX_PATH]; - - - LRESULT lResult; + PLABEL_MAP pMap; + if (RegOpenKeyEx(hKey, szSubKey, 0, @@ -85,17 +94,32 @@ return FALSE; } - - //FIXME - //lResult = SendDlgItemMessage(hwndDlg, - lResult = 0; + pMap = HeapAlloc(GetProcessHeap(), 0, sizeof(LABEL_MAP)); + if (!pMap) + { + return FALSE; + } + pMap->szName = _tcsdup(szSubKey); + pMap->szDesc = _tcsdup(szDesc); + pMap->szIcon = _tcsdup(szData); + + if (s_Map) + { + pMap->Next = s_Map; + s_Map = pMap; + } + else + { + s_Map = pMap; + s_Map->Next = 0; + } return TRUE; } BOOL -LoadEventLabels(HWND hwndDlg, HKEY hKey) +LoadEventLabels() { HKEY hSubKey; DWORD dwCurKey; @@ -103,8 +127,8 @@ DWORD dwName; DWORD dwResult; DWORD dwCount; - if (RegOpenKeyEx(hKey, - _T("EventLabels"), + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\EventLabels"), 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) @@ -128,7 +152,7 @@ if (dwResult == ERROR_SUCCESS) { - if (LoadEventLabel(hwndDlg, hSubKey, szName)) + if (LoadEventLabel(hSubKey, szName)) { dwCount++; } @@ -140,6 +164,23 @@ RegCloseKey(hSubKey); return (dwCount != 0); } +PLABEL_MAP FindLabel(TCHAR * szName) +{ + PLABEL_MAP pMap = s_Map; + + while(pMap) + { + if (!_tcscmp(pMap->szName, szName)) + return pMap; + + pMap = pMap->Next; + + } + return NULL; +} + + + BOOL AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) @@ -189,8 +230,6 @@ return FALSE; } - - DWORD EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) { @@ -237,7 +276,7 @@ if (dwResult == ERROR_SUCCESS) { - if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcsicmp(szName, szDefault)))) { dwNumSchemes++; } @@ -292,10 +331,11 @@ BOOL -ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; + TCHAR szBuffer[MAX_PATH]; DWORD dwValue; PSOUND_SCHEME_CONTEXT pScheme; PAPP_CONTEXT pAppContext; @@ -349,10 +389,29 @@ //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); return FALSE; } - pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + if (!pLabelContext) + { + HeapFree(GetProcessHeap(), 0, pLabelContext); + if (Create) + { + HeapFree(GetProcessHeap(), 0, pAppContext); + } + return FALSE; + } + dwValue = ExpandEnvironmentStrings(szValue, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); + if (dwValue == 0 || dwValue > (sizeof(szBuffer) / sizeof(TCHAR))) + { + /* fixme */ + HeapFree(GetProcessHeap(), 0, pLabelContext); + if (Create) + { + HeapFree(GetProcessHeap(), 0, pAppContext); + } + return FALSE; + } + _tcscpy(pLabelContext->szValue, szBuffer); _tcscpy(pLabelContext->szName, szLabelName); - _tcscpy(pLabelContext->szValue, szValue); pLabelContext->Next = pAppContext->LabelContext; pAppContext->LabelContext = pLabelContext; @@ -367,7 +426,7 @@ DWORD -ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName) { HKEY hSubKey; DWORD dwNumProfiles; @@ -403,7 +462,7 @@ if (dwResult == ERROR_SUCCESS) { - if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, szDefault)) + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName)) { dwNumProfiles++; } @@ -429,6 +488,7 @@ DWORD dwNumEntry; DWORD dwName; TCHAR szName[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); @@ -451,6 +511,17 @@ { RegCloseKey(hSubKey); return FALSE; + } + + dwDefault = sizeof(szIcon) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + _T("DispFileName"), + NULL, + NULL, + (LPBYTE)szIcon, + &dwDefault) != ERROR_SUCCESS) + { + szIcon[0] = _T('\0'); } dwCurKey = 0; @@ -468,8 +539,38 @@ NULL); if (dwResult == ERROR_SUCCESS) { - if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, szDefault)) + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName)) { + LRESULT lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount != CB_ERR) + { + LRESULT lIndex; + LRESULT lResult; + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult != CB_ERR) + { + PAPP_CONTEXT pAppContext; + PSOUND_SCHEME_CONTEXT pScheme = (PSOUND_SCHEME_CONTEXT)lResult; + if (!_tcsicmp(pScheme->szName, _T(".None"))) + { + continue; + } + pAppContext = FindAppContext(pScheme, szAppName); + if (pAppContext) + { + _tcscpy(pAppContext->szDesc, szDefault); + _tcscpy(pAppContext->szIcon, szIcon); + } + + } + } + + + } + + dwNumEntry++; } } @@ -523,13 +624,13 @@ BOOL -LoadSoundProfiles(HWND hwndDlg, HKEY hKey) +LoadSoundProfiles(HWND hwndDlg) { HKEY hSubKey; DWORD dwNumSchemes; - if (RegOpenKeyEx(hKey, - _T("Schemes"), + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("AppEvents\\Schemes"), 0, KEY_READ, &hSubKey) != ERROR_SUCCESS) @@ -548,29 +649,144 @@ RegCloseKey(hSubKey); return FALSE; } - - - BOOL -InitSoundSettings(HWND hwndDlg) -{ - HKEY hKey; - - if (RegOpenKey(HKEY_CURRENT_USER, - _T("AppEvents"), - &hKey) != ERROR_SUCCESS) - { - return FALSE; - } - LoadSoundProfiles(hwndDlg, hKey); - //LoadEventLabels(hwndDlg, hKey); - - RegCloseKey(hKey); +LoadSoundFiles(HWND hwndDlg) +{ + TCHAR szPath[MAX_PATH]; + TCHAR szNone[MAX_PATH]; + TCHAR * ptr; + WIN32_FIND_DATA FileData; + HANDLE hFile; + LRESULT lResult; + UINT length; - return TRUE; -} - - + length = GetWindowsDirectory(szPath, sizeof(szPath) / sizeof(TCHAR)); + if (length == 0 || length > (sizeof(szPath) / sizeof(TCHAR))) + { + return FALSE; + } + if (szPath[length-1] != _T('\\')) + { + szPath[length] = _T('\\'); + length++; + } + _tcscpy(&szPath[length], _T("media\\*")); + length += 7; + + hFile = FindFirstFile(szPath, &FileData); + if (hFile == INVALID_HANDLE_VALUE) + { + return FALSE; + } + if (LoadString(hApplet, IDS_NO_SOUND, szNone, MAX_PATH)) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szNone); + } + + do + { + if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; + + ptr = _tcsrchr(FileData.cFileName, _T('\\')); + if (ptr) + { + ptr++; + } + else + { + ptr = FileData.cFileName; + } + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + if (lResult != CB_ERR) + { + _tcscpy(&szPath[length-1], FileData.cFileName); + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_tcsdup(szPath)); + } + }while(FindNextFile(hFile, &FileData) != 0); + + FindClose(hFile); + return TRUE; +} + + + +BOOL +ShowSoundScheme(HWND hwndDlg) +{ + LRESULT lIndex; + PSOUND_SCHEME_CONTEXT pScheme; + PAPP_CONTEXT pAppContext; + LV_ITEM listItem; + LV_COLUMN dummy; + HWND hDlgCtrl, hList; + RECT rect; + int ItemIndex; + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME); + hList = GetDlgItem(hwndDlg, IDC_SCHEME_LIST); + + lIndex = SendMessage(hDlgCtrl, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + + lIndex = SendMessage(hDlgCtrl, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lIndex == CB_ERR) + { + return FALSE; + } + pScheme = (PSOUND_SCHEME_CONTEXT)lIndex; + pAppContext = pScheme->AppContext; + if (!pAppContext) + { + return FALSE; + } + + /* add column for app */ + GetClientRect(hList, &rect); + ZeroMemory(&dummy, sizeof(LV_COLUMN)); + dummy.mask = LVCF_WIDTH; + dummy.iSubItem = 0; + dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); + (void)ListView_InsertColumn(hList, 0, &dummy); + ItemIndex = 0; + while(pAppContext) + { + PLABEL_CONTEXT pLabelContext = pAppContext->LabelContext; + if (pLabelContext) + { +#if 0 + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + listItem.pszText = pAppContext->szDesc; + listItem.lParam = (LPARAM)pAppContext; + listItem.iItem = ItemIndex; + listItem.iImage = -1; + (void)ListView_InsertItem(hList, &listItem); + ItemIndex++; +#endif + while(pLabelContext) + { + PLABEL_MAP pMap = FindLabel(pLabelContext->szName); + if (pMap) + { + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; + listItem.pszText = pMap->szDesc; + listItem.lParam = (LPARAM)pLabelContext; + listItem.iItem = ItemIndex; + listItem.iImage = -1; + (void)ListView_InsertItem(hList, &listItem); + ItemIndex++; + } + pLabelContext = pLabelContext->Next; + } + } + pAppContext = pAppContext->Next; + } + return TRUE; +} /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -579,13 +795,164 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: - InitSoundSettings(hwndDlg); + LoadEventLabels(); + LoadSoundProfiles(hwndDlg); + LoadSoundFiles(hwndDlg); + ShowSoundScheme(hwndDlg); + if (wParam == (WPARAM)GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)) + return TRUE; + SetFocus(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)); + return FALSE; + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_PLAY_SOUND: + { + LRESULT lIndex; + TCHAR szValue[MAX_PATH]; + + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + break; + } + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); + PlaySound(szValue, NULL, SND_FILENAME); + break; + } + case IDC_SOUND_SCHEME: + { + if (HIWORD(wParam) == CBN_SELENDOK) + { + (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST)); + ShowSoundScheme(hwndDlg); + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), FALSE); + } + break; + } + case IDC_SOUND_LIST: + { + if (HIWORD(wParam) == CBN_SELENDOK) + { + PLABEL_CONTEXT pLabelContext; + INT SelCount; + LVITEM item; + LRESULT lIndex; + SelCount = ListView_GetSelectionMark(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); + if (SelCount == -1) + { + break; + } + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (lIndex == CB_ERR) + { + break; + } + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = SelCount; + if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + { + TCHAR szValue[MAX_PATH]; + pLabelContext = (PLABEL_CONTEXT)item.lParam; + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETLBTEXT, (WPARAM)lIndex, (LPARAM)szValue); + /// + /// should store in current member + /// + _tcscpy(pLabelContext->szValue, szValue); + if (_tcslen(szValue) && lIndex != 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + } + } + } + break; + } + } + break; + } + case WM_NOTIFY: + { + LVITEM item; + PLABEL_CONTEXT pLabelContext; + LPNMHDR lpnm = (LPNMHDR)lParam; + TCHAR * ptr; + switch(lpnm->code) + { + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; + + if ((nm->uNewState & LVIS_SELECTED) == 0) + { + return FALSE; + } + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_PARAM; + item.iItem = nm->iItem; + if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) + { + LRESULT lCount, lIndex, lResult; + pLabelContext = (PLABEL_CONTEXT)item.lParam; + if (!pLabelContext) + { + return FALSE; + } + EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_SOUND), TRUE); + if (_tcslen(pLabelContext->szValue) == 0) + { + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE); + break; + + } + EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); + lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + for (lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR || lResult == 0) + continue; + + if (!_tcscmp((TCHAR*)lResult, pLabelContext->szValue)) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + return FALSE; + } + } + ptr = _tcsrchr(pLabelContext->szValue, _T('\\')); + if (ptr) + { + ptr++; + } + else + { + ptr = pLabelContext->szValue; + } + lIndex = SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr); + if (lIndex != CB_ERR) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lIndex, (LPARAM)_tcsdup(pLabelContext->szValue)); + SendDlgItemMessage(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lIndex, (LPARAM)0); + } + } + break; + } + } + } break; }

1 0

[janderwald] 29023: - implement loading of sound items
by janderwald＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: janderwald Date: Thu Sep 13 00:22:41 2007 New Revision: 29023 URL: http://svn.reactos.org/svn/reactos?rev=29023&view=rev Log: - implement loading of sound items Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Thu Sep 13 00:22:41 2007 @@ -12,9 +12,34 @@ #include <setupapi.h> #include <cpl.h> #include <tchar.h> - +#include <stdio.h> #include "mmsys.h" #include "resource.h" + +typedef struct __LABEL_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + struct __LABEL_CONTEXT__ *Next; +}LABEL_CONTEXT, *PLABEL_CONTEXT; + +typedef struct __APP_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + TCHAR szIcon[MAX_PATH]; + PLABEL_CONTEXT LabelContext; + struct __APP_CONTEXT__ * Next; +}APP_CONTEXT, *PAPP_CONTEXT; + + +typedef struct __SOUND_SCHEME_CONTEXT__ +{ + TCHAR szName[MAX_PATH]; + TCHAR szDesc[MAX_PATH]; + PAPP_CONTEXT AppContext; +}SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; + BOOL LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) @@ -117,7 +142,7 @@ } BOOL -AddSoundScheme(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) +AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) { HKEY hSubKey; TCHAR szValue[MAX_PATH]; @@ -145,10 +170,15 @@ LRESULT lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); if (lResult != CB_ERR) { - /// - /// FIXME store a context struct - /// - SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)szSubKey); + PSOUND_SCHEME_CONTEXT pScheme = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUND_SCHEME_CONTEXT)); + if (pScheme != NULL) + { + _tcscpy(pScheme->szDesc, szValue); + _tcscpy(pScheme->szName, szSubKey); + pScheme->AppContext = NULL; + } + + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); if (SetDefault) { SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); @@ -161,8 +191,8 @@ -BOOL -EnumerateSoundSchemes(HWND hwndDlg, HKEY hKey) +DWORD +EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) { HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; @@ -207,7 +237,7 @@ if (dwResult == ERROR_SUCCESS) { - if (AddSoundScheme(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + if (AddSoundProfile(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) { dwNumSchemes++; } @@ -217,15 +247,286 @@ }while(dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); - return (dwNumSchemes != 0); -} - - -BOOL -LoadSoundSchemes(HWND hwndDlg, HKEY hKey) -{ - HKEY hSubKey; - BOOL Result; + return dwNumSchemes; +} + +PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) +{ + LRESULT lCount, lIndex, lResult; + PSOUND_SCHEME_CONTEXT pScheme; + + lCount = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); + if (lCount == CB_ERR) + { + return NULL; + } + + for(lIndex = 0; lIndex < lCount; lIndex++) + { + lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_GETITEMDATA, (WPARAM)lIndex, (LPARAM)0); + if (lResult == CB_ERR) + { + continue; + } + + pScheme = (PSOUND_SCHEME_CONTEXT)lResult; + if (!_tcsicmp(pScheme->szName, szName)) + { + return pScheme; + } + } + return FALSE; +} +PAPP_CONTEXT FindAppContext(PSOUND_SCHEME_CONTEXT pScheme, TCHAR * szAppName) +{ + PAPP_CONTEXT pAppContext = pScheme->AppContext; + while(pAppContext) + { + if (!_tcsicmp(pAppContext->szName, szAppName)) + return pScheme->AppContext; + pAppContext = pAppContext->Next; + } + return FALSE; +} + + + +BOOL +ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +{ + HKEY hSubKey; + TCHAR szValue[MAX_PATH]; + DWORD dwValue; + PSOUND_SCHEME_CONTEXT pScheme; + PAPP_CONTEXT pAppContext; + PLABEL_CONTEXT pLabelContext; + BOOL Create = FALSE; + + //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); + + if (!_tcsicmp(szProfile, _T(".Current"))) + { + //ignore current settings for now + return TRUE; + } + + if (RegOpenKeyEx(hKey, + szProfile, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwValue = sizeof(szValue) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szValue, + &dwValue) != ERROR_SUCCESS) + { + return FALSE; + } + pScheme = FindSoundProfile(hwndDlg, szProfile); + if (!pScheme) + { + //MessageBox(hwndDlg, szProfile, _T("no profile!!"), MB_OK); + return FALSE; + } + + pAppContext = FindAppContext(pScheme, szAppName); + if (!pAppContext) + { + pAppContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(APP_CONTEXT)); + Create = TRUE; + } + + if (!pAppContext) + { + + //MessageBox(hwndDlg, szAppName, _T("no appcontext"), MB_OK); + return FALSE; + } + + pLabelContext = (PLABEL_CONTEXT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_CONTEXT)); + _tcscpy(pLabelContext->szName, szLabelName); + _tcscpy(pLabelContext->szValue, szValue); + pLabelContext->Next = pAppContext->LabelContext; + pAppContext->LabelContext = pLabelContext; + + if (Create) + { + _tcscpy(pAppContext->szName, szAppName); + pAppContext->Next = pScheme->AppContext; + pScheme->AppContext = pAppContext; + } + return TRUE; +} + + +DWORD +ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName, TCHAR * szDefault) +{ + HKEY hSubKey; + DWORD dwNumProfiles; + DWORD dwCurKey; + DWORD dwResult; + DWORD dwProfile; + TCHAR szProfile[MAX_PATH]; + + if (RegOpenKeyEx(hKey, + szLabelName, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + //MessageBox(hwndDlg, szLabelName, szAppName, MB_OK); + + dwNumProfiles = 0; + dwCurKey = 0; + do + { + dwProfile = sizeof(szProfile) / sizeof(TCHAR); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szProfile, + &dwProfile, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (ImportSoundLabel(hwndDlg, hSubKey, szProfile, szLabelName, szAppName, szDefault)) + { + dwNumProfiles++; + } + } + + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return dwNumProfiles; +} + + + +DWORD +ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) +{ + HKEY hSubKey; + TCHAR szDefault[MAX_PATH]; + DWORD dwDefault; + DWORD dwCurKey; + DWORD dwResult; + DWORD dwNumEntry; + DWORD dwName; + TCHAR szName[MAX_PATH]; + + //MessageBox(hwndDlg, szAppName, _T("Importing...\n"), MB_OK); + + if (RegOpenKeyEx(hKey, + szAppName, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwDefault = sizeof(szDefault) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szDefault, + &dwDefault) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + dwCurKey = 0; + dwNumEntry = 0; + do + { + dwName = sizeof(szName) / sizeof(TCHAR); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + if (dwResult == ERROR_SUCCESS) + { + if (ImportSoundEntry(hwndDlg, hSubKey, szName, szAppName, szDefault)) + { + dwNumEntry++; + } + } + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); + return dwNumEntry; +} + +BOOL +ImportSoundProfiles(HWND hwndDlg, HKEY hKey) +{ + DWORD dwCurKey; + DWORD dwResult; + DWORD dwNumApps; + TCHAR szName[MAX_PATH]; + HKEY hSubKey; + + if (RegOpenKeyEx(hKey, + _T("Apps"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwNumApps = 0; + dwCurKey = 0; + do + { + dwResult = RegEnumKey(hSubKey, + dwCurKey, + szName, + sizeof(szName) / sizeof(TCHAR)); + + if (dwResult == ERROR_SUCCESS) + { + if (ImportAppProfile(hwndDlg, hSubKey, szName)) + { + dwNumApps++; + } + } + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); + + return (dwNumApps != 0); +} + + + +BOOL +LoadSoundProfiles(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwNumSchemes; if (RegOpenKeyEx(hKey, _T("Schemes"), @@ -236,12 +537,16 @@ return FALSE; } - - - Result = EnumerateSoundSchemes(hwndDlg, hSubKey); - RegCloseKey(hSubKey); - - return Result; + dwNumSchemes = EnumerateSoundProfiles(hwndDlg, hSubKey); + + + if (dwNumSchemes) + { + //MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK); + ImportSoundProfiles(hwndDlg, hSubKey); + } + RegCloseKey(hSubKey); + return FALSE; } @@ -257,9 +562,8 @@ { return FALSE; } - - LoadEventLabels(hwndDlg, hKey); - LoadSoundSchemes(hwndDlg, hKey); + LoadSoundProfiles(hwndDlg, hKey); + //LoadEventLabels(hwndDlg, hKey); RegCloseKey(hKey);

1 0

[gedmurphy] 29022: Set the main icon resource number to 3004. This should ensure SetupDiLoadClassIcon loads it correctly.
by gedmurphy＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: gedmurphy Date: Wed Sep 12 23:00:36 2007 New Revision: 29022 URL: http://svn.reactos.org/svn/reactos?rev=29022&view=rev Log: Set the main icon resource number to 3004. This should ensure SetupDiLoadClassIcon loads it correctly. Modified: trunk/reactos/dll/cpl/mmsys/resource.h Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h Wed Sep 12 23:00:36 2007 @@ -2,9 +2,9 @@ #define __CPL_RESOURCE_H -#define IDI_CPLICON 4379 -#define IDI_MUTED_ICON 4380 -#define IDI_MICROPHONE_ICON 4381 +#define IDI_CPLICON 3004 +#define IDI_MUTED_ICON 4393 +#define IDI_MICROPHONE_ICON 4378 #define IDD_HARDWARE 100 #define IDD_VOLUME 101

1 0

[janderwald] 29021: - start implementing sound scheme dialog
by janderwald＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: janderwald Date: Wed Sep 12 21:51:51 2007 New Revision: 29021 URL: http://svn.reactos.org/svn/reactos?rev=29021&view=rev Log: - start implementing sound scheme dialog Added: trunk/reactos/dll/cpl/mmsys/sounds.c (with props) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Wed Sep 12 21:51:51 2007 @@ -144,24 +144,7 @@ return FALSE; } -/* Sounds property page dialog callback */ -static INT_PTR CALLBACK -SoundsDlgProc(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; -} + /* Audio property page dialog callback */ static INT_PTR CALLBACK Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h Wed Sep 12 21:51:51 2007 @@ -27,6 +27,16 @@ LPARAM wParam, LPARAM lParam); +/* sounds.c */ + +INT_PTR +CALLBACK +SoundsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); + + #endif /* __CPL_MMSYS_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild Wed Sep 12 21:51:51 2007 @@ -13,6 +13,8 @@ <library>msvcrt</library> <library>devmgr</library> <library>gdi32</library> + <library>advapi32</library> <file>mmsys.c</file> + <file>sounds.c</file> <file>mmsys.rc</file> </module> Added: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c (added) +++ trunk/reactos/dll/cpl/mmsys/sounds.c Wed Sep 12 21:51:51 2007 @@ -1,0 +1,289 @@ +/* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ + * + * PROJECT: ReactOS Multimedia Control Panel + * FILE: lib/cpl/mmsys/mmsys.c + * PURPOSE: ReactOS Multimedia Control Panel + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * Johannes Anderwald <janderwald(a)reactos.com> + */ + +#include <windows.h> +#include <commctrl.h> +#include <setupapi.h> +#include <cpl.h> +#include <tchar.h> + +#include "mmsys.h" +#include "resource.h" + +BOOL +LoadEventLabel(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey) +{ + HKEY hSubKey; + DWORD dwData; + DWORD dwDesc; + TCHAR szDesc[MAX_PATH]; + TCHAR szData[MAX_PATH]; + + + LRESULT lResult; + if (RegOpenKeyEx(hKey, + szSubKey, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwDesc = sizeof(szDesc) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szDesc, + &dwDesc) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + dwData = sizeof(szDesc) / sizeof(TCHAR); + if (RegQueryValueEx(hSubKey, + _T("DispFileName"), + NULL, + NULL, + (LPBYTE)szData, + &dwData) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + return FALSE; + } + + + //FIXME + //lResult = SendDlgItemMessage(hwndDlg, + lResult = 0; + return TRUE; +} + + + +BOOL +LoadEventLabels(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwCurKey; + TCHAR szName[MAX_PATH]; + DWORD dwName; + DWORD dwResult; + DWORD dwCount; + if (RegOpenKeyEx(hKey, + _T("EventLabels"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwCurKey = 0; + dwCount = 0; + do + { + dwName = sizeof(szName) / sizeof(szName[0]); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (LoadEventLabel(hwndDlg, hSubKey, szName)) + { + dwCount++; + } + } + dwCurKey++; + + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return (dwCount != 0); +} + +BOOL +AddSoundScheme(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) +{ + HKEY hSubKey; + TCHAR szValue[MAX_PATH]; + DWORD dwValue, dwResult; + + if (RegOpenKeyEx(hKey, + szSubKey, + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwValue = sizeof(szValue) / sizeof(TCHAR); + dwResult = RegQueryValueEx(hSubKey, + NULL, + NULL, + NULL, + (LPBYTE)szValue, + &dwValue); + RegCloseKey(hSubKey); + if (dwResult == ERROR_SUCCESS) + { + LRESULT lResult = SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValue); + if (lResult != CB_ERR) + { + /// + /// FIXME store a context struct + /// + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)szSubKey); + if (SetDefault) + { + SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); + } + } + return TRUE; + } + return FALSE; +} + + + +BOOL +EnumerateSoundSchemes(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + DWORD dwName, dwCurKey, dwResult, dwNumSchemes; + TCHAR szName[MAX_PATH]; + TCHAR szDefault[MAX_PATH]; + + dwName = sizeof(szDefault) / sizeof(TCHAR); + if (RegQueryValueEx(hKey, + NULL, + NULL, + NULL, + (LPBYTE)szDefault, + &dwName) != ERROR_SUCCESS) + { + return FALSE; + } + + + + if (RegOpenKeyEx(hKey, + _T("Names"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwNumSchemes = 0; + dwCurKey = 0; + do + { + dwName = sizeof(szName) / sizeof(szName[0]); + dwResult = RegEnumKeyEx(hSubKey, + dwCurKey, + szName, + &dwName, + NULL, + NULL, + NULL, + NULL); + + if (dwResult == ERROR_SUCCESS) + { + if (AddSoundScheme(hwndDlg, hSubKey, szName, (!_tcscmp(szName, szDefault)))) + { + dwNumSchemes++; + } + } + + dwCurKey++; + }while(dwResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + return (dwNumSchemes != 0); +} + + +BOOL +LoadSoundSchemes(HWND hwndDlg, HKEY hKey) +{ + HKEY hSubKey; + BOOL Result; + + if (RegOpenKeyEx(hKey, + _T("Schemes"), + 0, + KEY_READ, + &hSubKey) != ERROR_SUCCESS) + { + return FALSE; + } + + + + Result = EnumerateSoundSchemes(hwndDlg, hSubKey); + RegCloseKey(hSubKey); + + return Result; +} + + + +BOOL +InitSoundSettings(HWND hwndDlg) +{ + HKEY hKey; + + if (RegOpenKey(HKEY_CURRENT_USER, + _T("AppEvents"), + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + LoadEventLabels(hwndDlg, hKey); + LoadSoundSchemes(hwndDlg, hKey); + + RegCloseKey(hKey); + + return TRUE; +} + + +/* Sounds property page dialog callback */ +INT_PTR +CALLBACK +SoundsDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + switch(uMsg) + { + case WM_INITDIALOG: + InitSoundSettings(hwndDlg); + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/mmsys/sounds.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 29020: Check for the Makefile instead of the ".svn" directory, when "Build-Shared.cmd" is executed. The ".svn" directory does not exist, when you try to build an SVN Export. (and all "src" Release packages are SVN Exports)
by cfinck＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: cfinck Date: Wed Sep 12 19:34:14 2007 New Revision: 29020 URL: http://svn.reactos.org/svn/reactos?rev=29020&view=rev Log: Check for the Makefile instead of the ".svn" directory, when "Build-Shared.cmd" is executed. The ".svn" directory does not exist, when you try to build an SVN Export. (and all "src" Release packages are SVN Exports) Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Wed Sep 12 19:34:14 2007 @@ -31,7 +31,7 @@ :: if %logdiff% == 0 ( if not exist "RosBE-Logs\." ( - if not exist ".svn\." ( + if not exist "Makefile" ( echo Folder is empty. No Build can be performed without a Source Code. goto :EOB ) else (

1 0

[dreimer] 29019: Translate the Keyboard Settings too.
by dreimer＠svn.reactos.org 12 Sep '07

12 Sep '07

Author: dreimer Date: Wed Sep 12 19:17:15 2007 New Revision: 29019 URL: http://svn.reactos.org/svn/reactos?rev=29019&view=rev Log: Translate the Keyboard Settings too. Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Wed Sep 12 19:17:15 2007 @@ -114,134 +114,134 @@ BEGIN IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." - 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" + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgisch (Punkt)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgisch (Wallonisch)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portugiesisch (Brasilianisch, ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Französisch (Kanada)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Französisch (Kanada, herkömmlich)" + IDS_DANISH_LAYOUT, "Dänisch" + IDS_DUTCH_LAYOUT, "Niederländisch" + IDS_FINNISH_LAYOUT, "Finnisch" + IDS_FRENCH_LAYOUT, "Französisch" + IDS_GERMAN_LAYOUT, "Deutsch" + IDS_GERMAN_IBM_LAYOUT, "Deutsch (IBM)" + IDS_ICELANDIC_LAYOUT, "Isländisch" + IDS_IRISH_LAYOUT, "Irisch" + IDS_ITALIAN_LAYOUT, "Italienisch" + IDS_ITALIAN_142_LAYOUT, "Italienisch (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Lateinamerikanisch" + IDS_NORWEGIAN_LAYOUT, "Norwegisch" + IDS_PORTUGUESE_LAYOUT, "Portugiesisch" + IDS_SPANISH_LAYOUT, "Spanisch" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanisch (Variation)" + IDS_SWEDISH_LAYOUT, "Schwedisch" + IDS_SWISS_FRENCH_LAYOUT, "Französisch (Schweiz)" + IDS_SWISS_GERMAN_LAYOUT, "Deutsch (Schweiz)" + IDS_UNITED_KINGDOM_LAYOUT, "Englisch (Großbritannien u. Nordirland)" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "Englisch (USA, International)" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "Englisch (USA, Dvorak für Linkshänder)" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "Englisch (USA, Dvorak für Rechtshänder)" + IDS_ALBANIAN_LAYOUT, "Albanisch" + IDS_CROATIAN_LAYOUT, "Kroatisch" + IDS_CZECH_LAYOUT, "Tschechisch" + IDS_CZECH_QWERTY_LAYOUT, "Tschechisch (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Ungarisch" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Ungarisch (101-Tastatur)" + IDS_POLISH_LAYOUT, "Polnisch (Programmierer)" + IDS_POLISH_214_LAYOUT, "Polnisch (214)" + IDS_ROMANIAN_LAYOUT, "Rumänisch" + IDS_SERBIAN_LATIN_LAYOUT, "Serbisch (Lateinisch)" + IDS_SLOVAK_LAYOUT, "Slowakisch" + IDS_SLOVAK_QWERTY_LAYOUT, "Slowakisch (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slowenisch" + IDS_ESTONIAN_LAYOUT, "Estnisch" + IDS_LATVIAN_LAYOUT, "Lettisch" + IDS_LATVIAN_QWERTY_LAYOUT, "Lettisch (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Litauisch (IBM)" + IDS_GREEK_LAYOUT, "Griechisch" + IDS_GREEK_LATIN_LAYOUT, "Griechisch (Lateinisch)" + IDS_GREEK_220_LAYOUT, "Griechisch (220)" + IDS_GREEK_319_LAYOUT, "Griechisch (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Griechisch (220, Lateinisch)" + IDS_GREEK_319_LATIN_LAYOUT, "Griechisch (319, Lateinisch)" + IDS_BELARUSIAN_LAYOUT, "Belarussisch" + IDS_BULGARIAN_LAYOUT, "Bulgarisch" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarisch (Lateinisch)" + IDS_RUSSIAN_LAYOUT, "Russisch" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russisch (Schreibmaschine)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbisch (Kyrillisch)" + IDS_UKRAINIAN_LAYOUT, "Ukrainisch" + IDS_TURKISH_F_LAYOUT, "Türkisch F" + IDS_TURKISH_Q_LAYOUT, "Türkisch Q" + IDS_JAPANESE_LAYOUT, "Japanisch" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanisches Eingabesystem (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Koreanisch" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Koreanisches Eingabesystem (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinesisch (traditionell) - US-Tastatur" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinesisch (traditionell) - Phonetisch" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinesisch (traditionell) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinesisch (traditionell) - Big5-Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinesisch (traditionell) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinesisch (traditionell) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinesisch (traditionell) - Alphanumerisch" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinesisch (vereinfacht) - US-Tastatur" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinesisch (vereinfacht) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinesisch (vereinfacht) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinesisch (vereinfacht) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinesisch (vereinfacht) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (nicht ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (nicht ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebräisch" + IDS_ARABIC_101_LAYOUT, "Arabisch (101)" + IDS_ARABIC_102_LAYOUT, "Arabisch (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabisch (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Tschechisch (Programmierer)" + IDS_LITHUANIAN_LAYOUT, "Litauisch" + IDS_BELGIAN_COMMA_LAYOUT, "Belgisch (Komma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinesisch (traditionell) - Phonetisch, neu" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinesisch (vereinfacht) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "Englisch (USA, Dvorak)" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinesisch (traditionell) - ChangJie, neu" + IDS_ASSAMESE_LAYOUT, "Assamisch" + 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 (traditionell)" + IDS_CANTONESE_PHONETIC_LAYOUT, "Phonetisches Kantonesisch" + IDS_FAEROESE_LAYOUT, "Färöisch" + IDS_FYRO_MACEDONIAN_LAYOUT, "Mazedonisch (FYROM)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Kanada (Standard -- Multilingual)" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinesisch (traditionell) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinesisch (traditionell) - Array" + IDS_KAZAKH_LAYOUT, "Kasachisch" + IDS_UZBEK_CYRILLIC_LAYOUT, "Usbekisches Kyrillisch" + IDS_AZERI_CYRILLIC_LAYOUT, "Aserbaidschanisch (Kyrillisch)" + IDS_TATAR_LAYOUT, "Tatarisch" + IDS_AZERI_LATIN_LAYOUT, "Aserbaidschanisch (Lateinisch)" + IDS_VIETNAMESE_LAYOUT, "Vietnamesisch" + IDS_GEORGIAN_LAYOUT, "Georgisch" + IDS_ARMENIAN_EASTERN_LAYOUT, "Ostarmenisch" + IDS_ARMENIAN_WESTERN_LAYOUT, "Westarmenisch" + IDS_GREEK_POLYTONIC_LAYOUT, "Griechisch (Polytonisch)" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US-Englische Tabelle für IBM Arabisch 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gälisch" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugiesisch (Brasilianisch, ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolisches Kyrillisch" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kirgisisches Kyrillisch" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syrisch" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syrisch (Phonetisch)" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi (Phonetisch)" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi (Schreibmaschine)" END

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007