Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[cwittich] 38164: DPRINT1 -> DPRINT on failure to prevent spamming of buildbot winetest logs
by cwittich＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: cwittich Date: Thu Dec 18 01:26:07 2008 New Revision: 38164 URL: http://svn.reactos.org/svn/reactos?rev=38164&view=rev Log: DPRINT1 -> DPRINT on failure to prevent spamming of buildbot winetest logs Modified: trunk/reactos/dll/win32/kernel32/misc/atom.c Modified: trunk/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/at… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] Thu Dec 18 01:26:07 2008 @@ -405,7 +405,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT1("Failed: %lx\n", Status); + DPRINT("Failed: %lx\n", Status); SetLastErrorByStatus(Status); }

1 0

[jmorlan] 38163: FAT##FindAndMarkAvailableCluster: Decrement the AvailableClusters count to keep reported free space consistent.
by jmorlan＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jmorlan Date: Wed Dec 17 21:09:45 2008 New Revision: 38163 URL: http://svn.reactos.org/svn/reactos?rev=38163&view=rev Log: FAT##FindAndMarkAvailableCluster: Decrement the AvailableClusters count to keep reported free space consistent. Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] Wed Dec 17 21:09:45 2008 @@ -164,6 +164,8 @@ *Block = 0xffff; CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); + if (DeviceExt->AvailableClustersValid) + InterlockedDecrement((PLONG)&DeviceExt->AvailableClusters); return(STATUS_SUCCESS); } @@ -227,6 +229,8 @@ *CBlock = (*CBlock & 0xf) | 0xfff0; CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); + if (DeviceExt->AvailableClustersValid) + InterlockedDecrement((PLONG)&DeviceExt->AvailableClusters); return(STATUS_SUCCESS); } } @@ -281,6 +285,8 @@ *Block = 0x0fffffff; CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); + if (DeviceExt->AvailableClustersValid) + InterlockedDecrement((PLONG)&DeviceExt->AvailableClusters); return(STATUS_SUCCESS); }

1 0

[jimtabor] 38162: Patch by Aric Stewart : user32: Implement handling of WM_INPUTLANGCHANGE. Updated header and made WIN_ListChildren global.
by jimtabor＠svn.reactos.org 18 Dec '08

18 Dec '08

Author: jimtabor Date: Wed Dec 17 19:14:39 2008 New Revision: 38162 URL: http://svn.reactos.org/svn/reactos?rev=38162&view=rev Log: Patch by Aric Stewart : user32: Implement handling of WM_INPUTLANGCHANGE. Updated header and made WIN_ListChildren global. Modified: trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Wed Dec 17 19:14:39 2008 @@ -63,3 +63,5 @@ HINSTANCE hInstance, LPVOID lpParam, BOOL Unicode); + +HWND* WIN_ListChildren (HWND hWndparent); Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Wed Dec 17 19:14:39 2008 @@ -1574,8 +1574,15 @@ case WM_INPUTLANGCHANGE: { - //FIXME: What to do? - return TRUE; + int count = 0; + HWND *win_array = WIN_ListChildren( hWnd ); + + if (!win_array) + break; + while (win_array[count]) + SendMessageW( win_array[count++], WM_INPUTLANGCHANGE, wParam, lParam); + HeapFree(GetProcessHeap(),0,win_array); + break; } case WM_ENDSESSION: Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Wed Dec 17 19:14:39 2008 @@ -126,7 +126,6 @@ static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); -static HWND* WIN_ListChildren (HWND hWndparent) {

1 0

[dreimer] 38161: Add German Table to Kernel32
by dreimer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: dreimer Date: Wed Dec 17 17:19:08 2008 New Revision: 38161 URL: http://svn.reactos.org/svn/reactos?rev=38161&view=rev Log: Add German Table to Kernel32 Added: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc (with props) Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc Added: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/kernel32/lang/de-DE.rc [iso-8859-1] Wed Dec 17 17:19:08 2008 @@ -1,0 +1,163 @@ +#pragma code_page(1252) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - Mitteleuropäisch)" + 1251 "1251 (ANSI - Kyrillisch)" + 1252 "1252 (ANSI - Westeuropäisch)" + 1253 "1253 (ANSI - Griechisch)" + 1254 "1254 (ANSI - Türkisch)" + 1255 "1255 (ANSI - Hebräisch)" + 1256 "1256 (ANSI - Arabisch)" + 1257 "1257 (ANSI - Baltisch)" + 1258 "1258 (ANSI/OEM - Vietnamesisch)" + 874 "874 (ANSI/OEM - Thailändisch)" + 932 "932 (ANSI/OEM - Japanisch (Shift-JIS))" + 936 "936 (ANSI/OEM - Chinesisch vereinfacht (GB2312))" + 949 "949 (ANSI/OEM - Koreanisch)" + 950 "950 (ANSI/OEM - Chinesisch traditionell (Big5))" + + 437 "437 (OEM - USA)" + 737 "737 (OEM - Griechisch)" + 775 "775 (OEM - Baltisch)" + 850 "850 (OEM - Westeuropäisch)" + 852 "852 (OEM - Mitteleuropäisch)" + 855 "855 (OEM - Kyrillisch)" + 857 "857 (OEM - Türkisch)" + 858 "858 (OEM - Multilingual Lateinisch 1)" + 860 "860 (OEM - Portugiesisch)" + 861 "861 (OEM - Isländisch)" + 862 "862 (OEM - Hebräisch)" + 863 "863 (OEM - Französisch, Kanada)" + 864 "864 (OEM - Arabisch (864))" + 865 "865 (OEM - Nordisch)" + 866 "866 (OEM - Kyrillisch)" + 869 "869 (OEM - Griechisch, modern)" + + 10000 "10000 (MAC - Westeuropäisch)" + 10001 "10001 (MAC - Japanisch)" + 10002 "10002 (MAC - Chinesisch traditionell)" + 10003 "10003 (MAC - Koreanisch)" + 10004 "10004 (MAC - Arabisch)" + 10005 "10005 (MAC - Hebräisch)" + 10006 "10006 (MAC - Griechisch)" + 10007 "10007 (MAC - Kyrillisch)" + 10008 "10008 (MAC - Chinesisch vereinfacht)" + 10010 "10010 (MAC - Rumänisch)" + 10017 "10017 (MAC - Ukrainisch)" + 10021 "10021 (MAC - Thailändisch)" + 10029 "10029 (MAC - Mitteleuropäisch)" + 10079 "10079 (MAC - Isländisch)" + 10081 "10081 (MAC - Türkisch)" + 10082 "10082 (MAC - Kroatisch)" + + 65000 "65000 (Unicode (UTF-7))" + 65001 "65001 (Unicode (UTF-8))" + + 3700 "37 (IBM EBCDIC - USA-Kanada)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - Türkisch, Lateinisch-5)" + 1047 "1047 (IBM EBCDIC - Lateinisch-1)" + 1140 "1140 (IBM EBCDIC - USA-Kanada-Europäisch)" + 1141 "1141 (IBM EBCDIC - Deutschland-Europäisch)" + 1142 "1142 (IBM EBCDIC - Dänemark-Norwegen-Europäisch)" + 1143 "1143 (IBM EBCDIC - Finnland-Schweden-Europäisch)" + 1144 "1144 (IBM EBCDIC - Italien-Europäisch)" + 1145 "1145 (IBM EBCDIC - Spanisch-Europäisch)" + 1146 "1146 (IBM EBCDIC - Großbritannien-Europäisch)" + 1147 "1147 (IBM EBCDIC - Frankreich-Europäisch)" + 1148 "1148 (IBM EBCDIC - International-Europäisch)" + 1149 "1149 (IBM EBCDIC - Isländisch-Europäisch)" + 20273 "20273 (IBM EBCDIC - Deutschland)" + 20277 "20277 (IBM EBCDIC - Dänemark-Norwegen)" + 20278 "20278 (IBM EBCDIC - Finnland-Schweden)" + 20280 "20280 (IBM EBCDIC - Italien)" + 20284 "20284 (IBM EBCDIC - Spanien)" + 20285 "20285 (IBM EBCDIC - UK)" + 20290 "20290 (IBM EBCDIC - Japanisch Katakana)" + 20297 "20297 (IBM EBCDIC - Frankreich)" + 20420 "20420 (IBM EBCDIC - Arabisch)" + 20423 "20423 (IBM EBCDIC - Griechisch)" + 20424 "20424 (IBM EBCDIC - Hebräisch)" + 20833 "20833 (IBM EBCDIC - Koreanisch, erweitert)" + 20838 "20838 (IBM EBCDIC - Thai)" + 20871 "20871 (IBM EBCDIC - Isländisch)" + 20880 "20880 (IBM EBCDIC - Kyrillisch, Russisch)" + 20905 "20905 (IBM EBCDIC - Türkisch)" + 20924 "20924 (IBM EBCDIC - Lateinisch-1)" + 21025 "21025 (IBM EBCDIC - Kyrillisch, Serbisch-Bulgarisch)" + 500 "500 (IBM EBCDIC - International)" + 870 "870 (IBM EBCDIC - Multilingual Lateinisch-2)" + 875 "875 (IBM EBCDIC - Griechisch, modern)" + + 20269 "20269 (ISO 6937)" + 28591 "28591 (ISO 8859-1 Westeuropäisch)" + 28592 "28592 (ISO 8859-2 Mitteleuropäisch)" + 28593 "28593 (ISO 8859-3 Lateinisch 3)" + 28594 "28594 (ISO 8859-4 Baltisch)" + 28595 "28595 (ISO 8859-5 Kyrillisch)" + 28596 "28596 (ISO 8859-6 Arabisch)" + 28597 "28597 (ISO 8859-7 Griechisch)" + 28598 "28598 (ISO 8859-8 Hebräisch (Visual))" + 28599 "28599 (ISO 8859-9 Türkisch)" + 28605 "28605 (ISO 8859-15 Lateinisch 9)" + 38598 "38598 (ISO 8859-8 Hebräisch (Logisch))" + + 20105 "20105 (IA5 Westeuropäisch)" + 20106 "20106 (IA5 Deutsch)" + 20107 "20107 (IA5 Schwedisch)" + 20108 "20108 (IA5 Norwegisch)" + + 1361 "1361 (Koreanisch (Johab))" + 20000 "20000 (CNS - Chinesisch traditionell)" + 20001 "20001 (TCA - Taiwan)" + 20002 "20002 (Eten - Chinesisch traditionell)" + 20003 "20003 (IBM5550 - Taiwan)" + 20004 "20004 (TeleText - Taiwan)" + 20005 "20005 (Wang - Taiwan)" + 20127 "20127 (US-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (Kyrillisch (KOI8-R))" + 21027 "21027 (Ext Alpha Lowercase)" + 21866 "21866 (Kyrillisch (KOI8-U))" + 708 "708 (Arabisch (ASMO 708))" + 720 "720 (Arabisch)" + 20932 "20932 (Japanisch (JIS 0208-1990 und 0212-1990))" + 20936 "20936 (GB2312-80 Chinesisch (vereinfacht))" + 20949 "20949 (Koreanisch Wansung)" + + 57002 "57002 (ISCII Devanagari)" + 57003 "57003 (ISCII Bengali)" + 57004 "57004 (ISCII Tamil)" + 57005 "57005 (ISCII Telugu)" + 57006 "57006 (ISCII Assamisch)" + 57007 "57007 (ISCII Oriya)" + 57008 "57008 (ISCII Kannada)" + 57009 "57009 (ISCII Malayalam)" + 57010 "57010 (ISCII Gujarati)" + 57011 "57011 (ISCII Punjabi)" + + 50930 "50930 (IBM EBCDIC - Japanisch (Katakana) Erweitert und Japanisch)" + 50931 "50931 (IBM EBCDIC - USA/Kanada und Japanisch)" + 50933 "50933 (IBM EBCDIC - Koreanisch Erweitert und Koreanisch)" + 50935 "50935 (IBM EBCDIC - Chinesisch vereinfacht)" + 50937 "50937 (IBM EBCDIC - USA/Kanada und Chinesisch traditionell)" + 50939 "50939 (IBM EBCDIC - Japanisch (Lateinisch) Erweitert und Japanisch)" + + 50220 "50220 (Japanisch (JIS))" + 50221 "50221 (Japanisch (JIS, 1 Byte Kana erlaubt))" + 50222 "50222 (Japanisch (JIS, 1 Byte Kana erlaubt - SO/SI))" + 50225 "50225 (Koreanisch (ISO))" + 50227 "50227 (Chinesisch vereinfacht (ISO-2022))" + 50229 "50229 (Chinesisch traditionell (ISO-2022))" + + 51932 "51932 (Japanisch (EUC))" + 51936 "51936 (Chinesisch vereinfacht (EUC))" + 51949 "51949 (Koreanisch (EUC))" + 51950 "51950 (Chinesisch vereinfacht (EUC))" + + 52936 "52936 (Chinesisch vereinfacht (HZ))" + 54936 "54936 (Chinesisch vereinfacht (GB18030))" +END Propchange: trunk/reactos/dll/win32/kernel32/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Wed Dec 17 17:19:08 2008 @@ -247,5 +247,6 @@ //#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_NEUTRAL */ +#include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/ru-RU.rc"

1 0

[janderwald] 38160: - Sorry I BROKE build
by janderwald＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: janderwald Date: Wed Dec 17 15:16:31 2008 New Revision: 38160 URL: http://svn.reactos.org/svn/reactos?rev=38160&view=rev Log: - Sorry I BROKE build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Dec 17 15:16:31 2008 @@ -425,7 +425,7 @@ drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 -drivers\wdm\audio\backpln\portcls.sys 2 +drivers\wdm\audio\backpln\portcls\portcls.sys 2 drivers\wmi\wmilib.sys 2 ; Media

1 0

[janderwald] 38159: - add ks.sys & portcls.sys to bootcd image
by janderwald＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: janderwald Date: Wed Dec 17 14:59:31 2008 New Revision: 38159 URL: http://svn.reactos.org/svn/reactos?rev=38159&view=rev Log: - add ks.sys & portcls.sys to bootcd image Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Dec 17 14:59:31 2008 @@ -398,6 +398,8 @@ drivers\input\mouclass\mouclass.sys 2 drivers\input\sermouse\sermouse.sys 2 +drivers\ksfilter\ks\ks.sys 2 + drivers\network\afd\afd.sys 2 drivers\network\ndis\ndis.sys 2 drivers\network\tcpip\tcpip.sys 2 @@ -423,6 +425,7 @@ drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 +drivers\wdm\audio\backpln\portcls.sys 2 drivers\wmi\wmilib.sys 2 ; Media

1 0

[cgutman] 38158: Check the status of IPSendDatagram
by cgutman＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: cgutman Date: Wed Dec 17 14:48:52 2008 New Revision: 38158 URL: http://svn.reactos.org/svn/reactos?rev=38158&view=rev Log: Check the status of IPSendDatagram Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Wed Dec 17 14:48:52 2008 @@ -230,7 +230,11 @@ TI_DbgPrint(MID_TRACE,("About to send datagram\n")); - IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ); + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return Status; + } TI_DbgPrint(MID_TRACE,("Leaving\n")); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Wed Dec 17 14:48:52 2008 @@ -64,6 +64,7 @@ IP_PACKET Packet = { 0 }; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; + NTSTATUS Status; if( *data == 0x45 ) { /* IPv4 */ Header = (PIPv4_HEADER)data; @@ -102,7 +103,11 @@ Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; - IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ); + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return OSK_EINVAL; + } return 0; } Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Wed Dec 17 14:48:52 2008 @@ -200,7 +200,11 @@ return STATUS_UNSUCCESSFUL; } - IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ); + if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) + { + FreeNdisPacket(Packet.NdisPacket); + return Status; + } return STATUS_SUCCESS; }

1 0

[dchapyshev] 38157: - More implement GetCPInfoExW - Add resources for getting localized of code pages names
by dchapyshev＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: dchapyshev Date: Wed Dec 17 10:30:31 2008 New Revision: 38157 URL: http://svn.reactos.org/svn/reactos?rev=38157&view=rev Log: - More implement GetCPInfoExW - Add resources for getting localized of code pages names Added: trunk/reactos/dll/win32/kernel32/lang/en-US.rc (with props) trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc (with props) Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc trunk/reactos/dll/win32/kernel32/misc/lang.c Added: trunk/reactos/dll/win32/kernel32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/kernel32/lang/en-US.rc [iso-8859-1] Wed Dec 17 10:30:31 2008 @@ -1,0 +1,163 @@ +#pragma code_page(1252) + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - Central Europe)" + 1251 "1251 (ANSI - Cyrillic)" + 1252 "1252 (ANSI - Latin I)" + 1253 "1253 (ANSI - Greek)" + 1254 "1254 (ANSI - Turkish)" + 1255 "1255 (ANSI - Hebrew)" + 1256 "1256 (ANSI - Arabic)" + 1257 "1257 (ANSI - Baltic)" + 1258 "1258 (ANSI/OEM - Viet Nam)" + 874 "874 (ANSI/OEM - Thai)" + 932 "932 (ANSI/OEM - Japanese Shift-JIS)" + 936 "936 (ANSI/OEM - Simplified Chinese GBK)" + 949 "949 (ANSI/OEM - Korean)" + 950 "950 (ANSI/OEM - Traditional Chinese Big5)" + + 437 "437 (OEM - United States)" + 737 "737 (OEM - Greek 437G)" + 775 "775 (OEM - Baltic)" + 850 "850 (OEM - Multilingual Latin I)" + 852 "852 (OEM - Latin II)" + 855 "855 (OEM - Cyrillic)" + 857 "857 (OEM - Turkish)" + 858 "858 (OEM - Multilingual Latin I + Euro)" + 860 "860 (OEM - Portuguese)" + 861 "861 (OEM - Icelandic)" + 862 "862 (OEM - Hebrew)" + 863 "863 (OEM - Canadian French)" + 864 "864 (OEM - Arabic)" + 865 "865 (OEM - Nordic)" + 866 "866 (OEM - Russian)" + 869 "869 (OEM - Modern Greek)" + + 10000 "10000 (MAC - Roman)" + 10001 "10001 (MAC - Japanese)" + 10002 "10002 (MAC - Traditional Chinese Big5)" + 10003 "10003 (MAC - Korean)" + 10004 "10004 (MAC - Arabic)" + 10005 "10005 (MAC - Hebrew)" + 10006 "10006 (MAC - Greek I)" + 10007 "10007 (MAC - Cyrillic)" + 10008 "10008 (MAC - Simplified Chinese GB 2312)" + 10010 "10010 (MAC - Romania)" + 10017 "10017 (MAC - Ukraine)" + 10021 "10021 (MAC - Thai)" + 10029 "10029 (MAC - Latin II)" + 10079 "10079 (MAC - Icelandic)" + 10081 "10081 (MAC - Turkish)" + 10082 "10082 (MAC - Croatia)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - U.S./Canada)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - Turkish (Latin-5))" + 1047 "1047 (IBM EBCDIC - Latin-1/Open System)" + 1140 "1140 (IBM EBCDIC - U.S./Canada (37 + Euro))" + 1141 "1141 (IBM EBCDIC - Germany (20273 + Euro))" + 1142 "1142 (IBM EBCDIC - Denmark/Norway (20277 + Euro))" + 1143 "1143 (IBM EBCDIC - Finland/Sweden (20278 + Euro))" + 1144 "1144 (IBM EBCDIC - Italy (20280 + Euro))" + 1145 "1145 (IBM EBCDIC - Latin America/Spain (20284 + Euro))" + 1146 "1146 (IBM EBCDIC - United Kingdom (20285 + Euro))" + 1147 "1147 (IBM EBCDIC - France (20297 + Euro))" + 1148 "1148 (IBM EBCDIC - International (500 + Euro))" + 1149 "1149 (IBM EBCDIC - Icelandic (20871 + Euro))" + 20273 "20273 (IBM EBCDIC - Germany)" + 20277 "20277 (IBM EBCDIC - Denmark/Norway)" + 20278 "20278 (IBM EBCDIC - Finland/Sweden)" + 20280 "20280 (IBM EBCDIC - Italy)" + 20284 "20284 (IBM EBCDIC - Latin America/Spain)" + 20285 "20285 (IBM EBCDIC - United Kingdom)" + 20290 "20290 (IBM EBCDIC - Japanese Katakana Extended)" + 20297 "20297 (IBM EBCDIC - France)" + 20420 "20420 (IBM EBCDIC - Arabic)" + 20423 "20423 (IBM EBCDIC - Greek)" + 20424 "20424 (IBM EBCDIC - Hebrew)" + 20833 "20833 (IBM EBCDIC - Korean Extended)" + 20838 "20838 (IBM EBCDIC - Thai)" + 20871 "20871 (IBM EBCDIC - Icelandic)" + 20880 "20880 (IBM EBCDIC - Cyrillic (Russian))" + 20905 "20905 (IBM EBCDIC - Turkish)" + 20924 "20924 (IBM EBCDIC - Latin-1/Open System (1047 + Euro))" + 21025 "21025 (IBM EBCDIC - Cyrillic (Serbian, Bulgarian))" + 500 "500 (IBM EBCDIC - International)" + 870 "870 (IBM EBCDIC - Multilingual/ROECE (Latin-2))" + 875 "875 (IBM EBCDIC - Modern Greek)" + + 20269 "20269 (ISO 6937 Non-Spacing Accent)" + 28591 "28591 (ISO 8859-1 Latin I)" + 28592 "28592 (ISO 8859-2 Central Europe)" + 28593 "28593 (ISO 8859-3 Latin 3)" + 28594 "28594 (ISO 8859-4 Baltic)" + 28595 "28595 (ISO 8859-5 Cyrillic)" + 28596 "28596 (ISO 8859-6 Arabic)" + 28597 "28597 (ISO 8859-7 Greek)" + 28598 "28598 (ISO 8859-8 Hebrew: Visual Ordering)" + 28599 "28599 (ISO 8859-9 Latin 5)" + 28605 "28605 (ISO 8859-15 Latin 9)" + 38598 "38598 (ISO 8859-8 Hebrew: Logical Ordering)" + + 20105 "20105 (IA5 IRV International Alphabet No.5)" + 20106 "20106 (IA5 German)" + 20107 "20107 (IA5 Swedish)" + 20108 "20108 (IA5 Norwegian)" + + 1361 "1361 (Korean - Johab)" + 20000 "20000 (CNS - Taiwan)" + 20001 "20001 (TCA - Taiwan)" + 20002 "20002 (Eten - Taiwan)" + 20003 "20003 (IBM5550 - Taiwan)" + 20004 "20004 (TeleText - Taiwan)" + 20005 "20005 (Wang - Taiwan)" + 20127 "20127 (US-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (Russian - KOI8)" + 21027 "21027 (Ext Alpha Lowercase)" + 21866 "21866 (Ukrainian - KOI8-U)" + 708 "708 (Arabic - ASMO)" + 720 "720 (Arabic - Transparent ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (Simplified Chinese GB2312)" + 20949 "20949 (Korean Wansung)" + + 57002 "57002 (ISCII Devanagari)" + 57003 "57003 (ISCII Bengali)" + 57004 "57004 (ISCII Tamil)" + 57005 "57005 (ISCII Telugu)" + 57006 "57006 (ISCII Assamese)" + 57007 "57007 (ISCII Oriya)" + 57008 "57008 (ISCII Kannada)" + 57009 "57009 (ISCII Malayalam)" + 57010 "57010 (ISCII Gujarati)" + 57011 "57011 (ISCII Gurmukhi)" + + 50930 "50930 (IBM EBCDIC - Japanese (Katakana) Extended and Japanese)" + 50931 "50931 (IBM EBCDIC - US/Canada and Japanese)" + 50933 "50933 (IBM EBCDIC - Korean Extended and Korean)" + 50935 "50935 (IBM EBCDIC - Simplified Chinese)" + 50937 "50937 (IBM EBCDIC - US/Canada and Traditional Chinese)" + 50939 "50939 (IBM EBCDIC - Japanese (Latin) Extended and Japanese)" + + 50220 "50220 (ISO-2022 Japanese with no halfwidth Katakana)" + 50221 "50221 (ISO-2022 Japanese with halfwidth Katakana)" + 50222 "50222 (ISO-2022 Japanese JIS X 0201-1989)" + 50225 "50225 (ISO-2022 Korean)" + 50227 "50227 (ISO-2022 Simplified Chinese)" + 50229 "50229 (ISO-2022 Traditional Chinese)" + + 51932 "51932 (EUC-Japanese)" + 51936 "51936 (EUC-Simplified Chinese)" + 51949 "51949 (EUC-Korean)" + 51950 "51950 (EUC-Traditional Chinese)" + + 52936 "52936 (HZ-GB2312 Simplified Chinese)" + 54936 "54936 (GB18030 Simplified Chinese)" +END Propchange: trunk/reactos/dll/win32/kernel32/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc (added) +++ trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc [iso-8859-1] Wed Dec 17 10:30:31 2008 @@ -1,0 +1,163 @@ +#pragma code_page(1251) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + /* Names of code pages */ + 1250 "1250 (ANSI - öåíòðàëüíî-åâðîïåéñêàÿ)" + 1251 "1251 (ANSI - êèðèëëèöà)" + 1252 "1252 (ANSI - ëàòèíèöà 1)" + 1253 "1253 (ANSI - ãðå÷åñêàÿ)" + 1254 "1254 (ANSI - òóðåöêàÿ)" + 1255 "1255 (ANSI - èâðèò)" + 1256 "1256 (ANSI - àðàáñêàÿ)" + 1257 "1257 (ANSI - áàëòèéñêàÿ)" + 1258 "1258 (ANSI/OEM - âüåòíàìñêàÿ)" + 874 "874 (ANSI/OEM - òàéñêàÿ)" + 932 "932 (ANSI/OEM - ÿïîíñêàÿ Shift-JIS)" + 936 "936 (ANSI/OEM - êèòàéñêàÿ óïðîùåííàÿ GBK)" + 949 "949 (ANSI/OEM - êîðåéñêàÿ)" + 950 "950 (ANSI/OEM - êèòàéñêàÿ òðàäèöèîííàÿ Big5)" + + 437 "437 (OEM - ÑØÀ)" + 737 "737 (OEM - ãðå÷åñêàÿ 437G)" + 775 "775 (OEM - áàëòèéñêàÿ)" + 850 "850 (OEM - ìíîãîÿçû÷íàÿ ëàòèíèöà 1)" + 852 "852 (OEM - ëàòèíèöà 2)" + 855 "855 (OEM - êèðèëëèöà òðàäèöèîííàÿ)" + 857 "857 (OEM - òóðåöêàÿ)" + 858 "858 (OEM - ìíîãîÿçû÷íàÿ ëàòèíèöà 1 + Åâðî)" + 860 "860 (OEM - ïîðòóãàëüñêàÿ)" + 861 "861 (OEM - èñëàíäñêàÿ)" + 862 "862 (OEM - èâðèò)" + 863 "863 (OEM - ôðàíêî-êàíàäñêàÿ)" + 864 "864 (OEM - àðàáñêàÿ)" + 865 "865 (OEM - ñêàíäèíàâñêàÿ)" + 866 "866 (OEM - ðóññêàÿ)" + 869 "869 (OEM - ãðå÷åñêàÿ ñîâðåìåííàÿ)" + + 10000 "10000 (MAC - ëàòèíèöà)" + 10001 "10001 (MAC - ÿïîíñêàÿ)" + 10002 "10002 (MAC - êèòàéñêàÿ òðàäèöèîííàÿ Big5)" + 10003 "10003 (MAC - êîðåéñêàÿ)" + 10004 "10004 (MAC - àðàáñêàÿ)" + 10005 "10005 (MAC - èâðèò)" + 10006 "10006 (MAC - ãðå÷åñêàÿ 1)" + 10007 "10007 (MAC - êèðèëëèöà)" + 10008 "10008 (MAC - êèòàéñêàÿ óïðîùåííàÿ GB 2312)" + 10010 "10010 (MAC - ðóìûíñêàÿ)" + 10017 "10017 (MAC - óêðàèíñêàÿ)" + 10021 "10021 (MAC - òàéñêàÿ)" + 10029 "10029 (MAC - ëàòèíèöà 2)" + 10079 "10079 (MAC - èñëàíäñêàÿ)" + 10081 "10081 (MAC - òóðåöêàÿ)" + 10082 "10082 (MAC - õîðâàòñêàÿ)" + + 65000 "65000 (UTF-7)" + 65001 "65001 (UTF-8)" + + 3700 "37 (IBM EBCDIC - ÑØÀ/Êàíàäà)" /* FIXME */ + 1026 "1026 (IBM EBCDIC - òóðåöêàÿ (ëàòèíèöà-5))" + 1047 "1047 (IBM EBCDIC - ëàòèíèöà 1/Open System)" + 1140 "1140 (IBM EBCDIC - ÑØÀ/Êàíàäà (37 + åâðî))" + 1141 "1141 (IBM EBCDIC - íåìåöêàÿ (20273 + åâðî))" + 1142 "1142 (IBM EBCDIC - äàòñêàÿ/íîðâåæñêàÿ (20277 + åâðî))" + 1143 "1143 (IBM EBCDIC - ôèíñêàÿ/øâåäñêàÿ (20278 + åâðî))" + 1144 "1144 (IBM EBCDIC - èòàëüÿíñêàÿ (20280 + åâðî))" + 1145 "1145 (IBM EBCDIC - ëàòèíîàìåð/èñïàíñêàÿ (20284 + åâðî))" + 1146 "1146 (IBM EBCDIC - áðèòàíñêàÿ (20285 + åâðî))" + 1147 "1147 (IBM EBCDIC - ôðàíöóçñêàÿ (20297 + åâðî))" + 1148 "1148 (IBM EBCDIC - ìåæäóíàðîäíàÿ (500 + åâðî))" + 1149 "1149 (IBM EBCDIC - èñëàíäñêàÿ (20871 + åâðî))" + 20273 "20273 (IBM EBCDIC - íåìåöêàÿ)" + 20277 "20277 (IBM EBCDIC - äàòñêàÿ/íîðâåæñêàÿ)" + 20278 "20278 (IBM EBCDIC - ôèíñêàÿ/øâåäñêàÿ)" + 20280 "20280 (IBM EBCDIC - èòàëüÿíñêàÿ)" + 20284 "20284 (IBM EBCDIC - ëàòèíîàìåðèêàíñêàÿ/èñïàíñêàÿ)" + 20285 "20285 (IBM EBCDIC - áðèòàíñêàÿ)" + 20290 "20290 (IBM EBCDIC - ÿïîíñêàÿ ðàñøèðåííàÿ êàòàêàíà)" + 20297 "20297 (IBM EBCDIC - ôðàíöóçñêàÿ)" + 20420 "20420 (IBM EBCDIC - àðàáñêàÿ)" + 20423 "20423 (IBM EBCDIC - ãðå÷åñêàÿ)" + 20424 "20424 (IBM EBCDIC - èâðèò)" + 20833 "20833 (IBM EBCDIC - êîðåéñêàÿ ðàñøèðåííàÿ)" + 20838 "20838 (IBM EBCDIC - òàéñêàÿ)" + 20871 "20871 (IBM EBCDIC - èñëàíäñêàÿ)" + 20880 "20880 (IBM EBCDIC - êèðèëëèöà (ðóññêàÿ))" + 20905 "20905 (IBM EBCDIC - òóðåöêàÿ)" + 20924 "20924 (IBM EBCDIC - ëàòèíèöà 1/Open System (1047 + åâðî))" + 21025 "21025 (IBM EBCDIC - êèðèëëèöà (ñåðáñêàÿ, áîëãàðñêàÿ))" + 500 "500 (IBM EBCDIC - ìåæäóíàðîäíàÿ)" + 870 "870 (IBM EBCDIC - ìíîãîÿçû÷íàÿ/ROECE (ëàòèíèöà-2))" + 875 "875 (IBM EBCDIC - ñîâðåìåííàÿ ãðå÷åñêàÿ)" + + 20269 "20269 (ISO 6937 äèàêðèòè÷åñêèå çíàêè)" + 28591 "28591 (ISO 8859-1 ëàòèíèöà 1)" + 28592 "28592 (ISO 8859-2 öåíòðàëüíîåâðîïåéñêàÿ)" + 28593 "28593 (ISO 8859-3 ëàòèíèöà 3)" + 28594 "28594 (ISO 8859-4 áàëòèéñêàÿ)" + 28595 "28595 (ISO 8859-5 êèðèëëèöà)" + 28596 "28596 (ISO 8859-6 àðàáñêàÿ)" + 28597 "28597 (ISO 8859-7 ãðå÷åñêàÿ)" + 28598 "28598 (ISO 8859-8 èâðèò: âèçóàëüíàÿ ñîðòèðîâêà)" + 28599 "28599 (ISO 8859-9 ëàòèíèöà 5)" + 28605 "28605 (ISO 8859-15 ëàòèíèöà 9)" + 38598 "38598 (ISO 8859-8 èâðèò: ëîãè÷åñêàÿ ñîðòèðîâêà)" + + 20105 "20105 (IA5 IRV ìåæäóíàðîäíûé àëôàâèò ¹5)" + 20106 "20106 (IA5 íåìåöêàÿ)" + 20107 "20107 (IA5 øâåäñêàÿ)" + 20108 "20108 (IA5 íîðâåæñêàÿ)" + + 1361 "1361 (êîðåéñêàÿ - Johab)" + 20000 "20000 (CNS - òàéâàíüñêàÿ)" + 20001 "20001 (TCA - òàéâàíüñêàÿ)" + 20002 "20002 (Eten - òàéâàíüñêàÿ)" + 20003 "20003 (IBM5550 - òàéâàíüñêàÿ)" + 20004 "20004 (TeleText - òàéâàíüñêàÿ)" + 20005 "20005 (Wang - òàéâàíüñêàÿ)" + 20127 "20127 (ÑØÀ-ASCII)" + 20261 "20261 (T.61)" + 20866 "20866 (ðóññêàÿ - ÊÎÈ8)" + 21027 "21027 (ðàñø. àëô. íèæíèé ðåãèñòð)" + 21866 "21866 (óêðàèíñêàÿ - ÊÎÈ8-U)" + 708 "708 (àðàáñêàÿ - ASMO)" + 720 "720 (àðàáñêàÿ - ïðîçðà÷íàÿ ASMO)" + 20932 "20932 (JIS X 0208-1990 & 0212-1990)" + 20936 "20936 (GB2312 êèòàéñêàÿ óïðîùåííàÿ)" + 20949 "20949 (Korean Wansung)" + + 57002 "57002 (ISCII äåâàíàãàðè)" + 57003 "57003 (ISCII áåíãàëüñêàÿ)" + 57004 "57004 (ISCII òàìèëüñêàÿ)" + 57005 "57005 (ISCII òåëóãó)" + 57006 "57006 (ISCII àññàìñêàÿ)" + 57007 "57007 (ISCII îðèÿ)" + 57008 "57008 (ISCII êàííàäà)" + 57009 "57009 (ISCII ìàëàÿëàì)" + 57010 "57010 (ISCII ãóäæàðàòè)" + 57011 "57011 (ISCII ãóðìóõè)" + + 50930 "50930 (IBM EBCDIC - ÿïîíñêàÿ (ñ êàòàêàíîé))" + 50931 "50931 (IBM EBCDIC - ÑØÀ/Êàíàäà è ÿïîíñêàÿ)" + 50933 "50933 (IBM EBCDIC - êîðåéñêàÿ è ðàñøèðåííàÿ êîðåéñêàÿ)" + 50935 "50935 (IBM EBCDIC - êèòàéñêàÿ óïðîùåííàÿ)" + 50937 "50937 (IBM EBCDIC - ÑØÀ/Êàíàäà è êèòàéñêàÿ òðàäèöèîííàÿ)" + 50939 "50939 (IBM EBCDIC - ÿïîíñêàÿ (ëàòèíèöà) ðàñøèðåííàÿ è ÿïîíñêàÿ)" + + 50220 "50220 (ISO-2022 ÿïîíñêàÿ áåç ïîëóøèðèííîé êàòàêàíû)" + 50221 "50221 (ISO-2022 ÿïîíñêàÿ ñ ïîëóøèðèííîé êàòàêàíîé)" + 50222 "50222 (ISO-2022 ÿïîíñêàÿ JIS X 0201-1989)" + 50225 "50225 (ISO-2022 êîðåéñêàÿ)" + 50227 "50227 (ISO-2022 êèòàéñêàÿ óïðîùåííàÿ)" + 50229 "50229 (ISO-2022 êèòàéñêàÿ òðàäèöèîííàÿ)" + + 51932 "51932 (EUC-ÿïîíñêàÿ)" + 51936 "51936 (EUC-êèòàéñêàÿ óïðîùåííàÿ)" + 51949 "51949 (EUC-êîðåéñêàÿ)" + 51950 "51950 (EUC-êèòàéñêàÿ òðàäèöèîííàÿ)" + + 52936 "52936 (HZ-GB2312 êèòàéñêàÿ óïðîùåííàÿ)" + 54936 "54936 (GB18030 êèòàéñêàÿ óïðîùåííàÿ)" +END Propchange: trunk/reactos/dll/win32/kernel32/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc [iso-8859-1] Wed Dec 17 10:30:31 2008 @@ -246,3 +246,6 @@ //#include "nls/cym.nls" /* 0x0492 LANG_WELSH, SUBLANG_NEUTRAL */ //#include "nls/brf.nls" /* 0x0493 LANG_BRETON, SUBLANG_NEUTRAL */ + +#include "lang/en-US.rc" +#include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Wed Dec 17 10:30:31 2008 @@ -1284,6 +1284,53 @@ return TRUE; } +static BOOL +GetLocalisedText(DWORD dwResId, WCHAR *lpszDest) +{ + HRSRC hrsrc; + LCID lcid; + LANGID langId; + DWORD dwId; + + if (dwResId == 37) + dwId = dwResId * 100; + else + dwId = dwResId; + + lcid = GetUserDefaultLCID(); + lcid = ConvertDefaultLocale(lcid); + + langId = LANGIDFROMLCID(lcid); + + if (PRIMARYLANGID(langId) == LANG_NEUTRAL) + langId = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); + + hrsrc = FindResourceExW(hCurrentModule, + (LPWSTR)RT_STRING, + MAKEINTRESOURCEW((dwId >> 4) + 1), + langId); + if (hrsrc) + { + HGLOBAL hmem = LoadResource(hCurrentModule, hrsrc); + + if (hmem) + { + const WCHAR *p; + unsigned int i; + + p = LockResource(hmem); + for (i = 0; i < (dwId & 0x0f); i++) p += *p + 1; + + memcpy(lpszDest, p + 1, *p * sizeof(WCHAR)); + lpszDest[*p] = '\0'; + + return TRUE; + } + } + + DPRINT1("Could not get codepage name. dwResId = %ld\n", dwResId); + return FALSE; +} /* * @implemented @@ -1301,21 +1348,17 @@ { case CP_UTF7: { - static const WCHAR utf7[] = L"Unicode (UTF-7)\0"; - lpCPInfoEx->CodePage = CP_UTF7; lpCPInfoEx->UnicodeDefaultChar = 0x3f; - wcscpy(lpCPInfoEx->CodePageName, utf7); + return GetLocalisedText((DWORD)CodePage, lpCPInfoEx->CodePageName); } break; case CP_UTF8: { - static const WCHAR utf8[] = L"Unicode (UTF-8)\0"; - lpCPInfoEx->CodePage = CP_UTF8; lpCPInfoEx->UnicodeDefaultChar = 0x3f; - wcscpy(lpCPInfoEx->CodePageName, utf8); + return GetLocalisedText((DWORD)CodePage, lpCPInfoEx->CodePageName); } default: @@ -1332,14 +1375,10 @@ lpCPInfoEx->CodePage = CodePageEntry->CodePageTable.CodePage; lpCPInfoEx->UnicodeDefaultChar = CodePageEntry->CodePageTable.UniDefaultChar; - /* FIXME: We need to get a codepage name */ - DPRINT1("FIXME: We need to get a codepage name!\n"); - wcscpy(lpCPInfoEx->CodePageName, L"Unknown\0"); + return GetLocalisedText((DWORD)CodePage, lpCPInfoEx->CodePageName); } break; } - - return TRUE; }

1 0

[janderwald] 38156: - Handle PcNewRegistryKey for DeviceRegistryKey, DriverRegistryKey, HwProfileRegistryKey - Implement IPortClsVersion interface
by janderwald＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: janderwald Date: Wed Dec 17 10:01:32 2008 New Revision: 38156 URL: http://svn.reactos.org/svn/reactos?rev=38156&view=rev Log: - Handle PcNewRegistryKey for DeviceRegistryKey, DriverRegistryKey, HwProfileRegistryKey - Implement IPortClsVersion interface Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Wed Dec 17 10:01:32 2008 @@ -33,5 +33,6 @@ <file>miniport.c</file> <file>miniport_dmus.c</file> <file>miniport_fmsynth.c</file> + <file>version.c</file> <file>portcls.rc</file> </module> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Wed Dec 17 10:01:32 2008 @@ -253,6 +253,22 @@ Status = ZwOpenKey(&hHandle, DesiredAccess, ObjectAttributes); } + else if (RegistryKeyType == DeviceRegistryKey || + RegistryKeyType == DriverRegistryKey || + RegistryKeyType == HwProfileRegistryKey) + { + if (RegistryKeyType == HwProfileRegistryKey) + { + /* IoOpenDeviceRegistryKey used different constant */ + RegistryKeyType = PLUGPLAY_REGKEY_CURRENT_HWPROFILE; + } + + Status = IoOpenDeviceRegistryKey(DeviceObject, RegistryKeyType, DesiredAccess, &hHandle); + } + else if (RegistryKeyType == DeviceInterfaceRegistryKey) + { + /* FIXME */ + } if (!NT_SUCCESS(Status)) { Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c [iso-8859-1] Wed Dec 17 10:01:32 2008 @@ -1,0 +1,96 @@ +#include "private.h" + + +typedef struct CResourceList +{ + IPortClsVersionVtbl *lpVtbl; + LONG ref; +}IPortClsVersionImpl; + +const GUID IID_IPortClsVersion; + +//--------------------------------------------------------------- +// IPortClsVersion interface functions +// + +NTSTATUS +NTAPI +IPortClsVersion_fnQueryInterface( + IPortClsVersion * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortClsVersionImpl * This = (IPortClsVersionImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IPortClsVersion_fnAddRef( + IPortClsVersion * iface) +{ + IPortClsVersionImpl * This = (IPortClsVersionImpl*)iface; + + return InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IPortClsVersion_fnRelease( + IPortClsVersion * iface) +{ + IPortClsVersionImpl * This = (IPortClsVersionImpl*)iface; + + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +DWORD +NTAPI +IPortClsVersion_fnGetVersion( + IPortClsVersion * iface) +{ + return kVersionWinXP_UAAQFE; +} + +static IPortClsVersionVtbl vt_PortClsVersion = +{ + /* IUnknown methods */ + IPortClsVersion_fnQueryInterface, + IPortClsVersion_fnAddRef, + IPortClsVersion_fnRelease, + IPortClsVersion_fnGetVersion +}; + +NTSTATUS NewPortClsVersion( + OUT PPORTCLSVERSION * OutVersion) +{ + IPortClsVersionImpl * This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IPortClsVersionImpl), TAG_PORTCLASS); + + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = &vt_PortClsVersion; + This->ref = 1; + *OutVersion = (PPORTCLSVERSION)&This->lpVtbl; + + return STATUS_SUCCESS; + +} + + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 38155: - Add IID_IPortClsVersion
by janderwald＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: janderwald Date: Wed Dec 17 09:58:32 2008 New Revision: 38155 URL: http://svn.reactos.org/svn/reactos?rev=38155&view=rev Log: - Add IID_IPortClsVersion Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Wed Dec 17 09:58:32 2008 @@ -1638,6 +1638,10 @@ #undef INTERFACE #define INTERFACE IPortClsVersion +#if (NTDDI_VERSION >= NTDDI_WINXP) +DEFINE_GUID(IID_IPortClsVersion, 0x7D89A7BBL, 0x869B, 0x4567, 0x8D, 0xBE, 0x1E, 0x16, 0x8C, 0xC8, 0x53, 0xDE); +#endif + DECLARE_INTERFACE_(IPortClsVersion, IUnknown) { DEFINE_ABSTRACT_UNKNOWN()

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008