Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43724: - Fix a sneaky breakage of MSVC built kernels. "i386" is a gcc define and we don't define it in the makefiles.
by sginsberg＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: sginsberg Date: Sat Oct 24 22:44:43 2009 New Revision: 43724 URL: http://svn.reactos.org/svn/reactos?rev=43724&view=rev Log: - Fix a sneaky breakage of MSVC built kernels. "i386" is a gcc define and we don't define it in the makefiles. Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=437… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Oct 24 22:44:43 2009 @@ -1828,7 +1828,7 @@ InbvUpdateProgressBar(80); /* Initialize VDM support */ -#ifdef i386 +#if defined(_M_IX86) KeI386VdmInitialize(); #endif

1 0

[cgutman] 43723: - Implement SetIpNetEntry in iphlpapi and InfoTdiSetArptableMIB in tcpip - Added buffer size checks for InfoTdiSetRoute - "arp -s" works now
by cgutman＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: cgutman Date: Sat Oct 24 22:39:41 2009 New Revision: 43723 URL: http://svn.reactos.org/svn/reactos?rev=43723&view=rev Log: - Implement SetIpNetEntry in iphlpapi and InfoTdiSetArptableMIB in tcpip - Added buffer size checks for InfoTdiSetRoute - "arp -s" works now Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/iphlpapi/route_reactos.c trunk/reactos/drivers/network/tcpip/include/info.h trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -2087,15 +2087,54 @@ * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns NO_ERROR. */ DWORD WINAPI SetIpNetEntry(PMIB_IPNETROW pArpEntry) { - FIXME("(pArpEntry %p): stub\n", pArpEntry); - /* same as CreateIpNetEntry here, could use SIOCSARP, not sure I want to */ - return 0; + HANDLE tcpFile; + NTSTATUS status; + TCP_REQUEST_SET_INFORMATION_EX_ARP_ENTRY req = + TCP_REQUEST_SET_INFORMATION_INIT; + TDIEntityID id; + DWORD returnSize; + PMIB_IPNETROW arpBuff; + + if (!pArpEntry) + return ERROR_INVALID_PARAMETER; + + if (!NT_SUCCESS(openTcpFile( &tcpFile ))) + return ERROR_NOT_SUPPORTED; + + if (!NT_SUCCESS(getNthIpEntity( tcpFile, pArpEntry->dwIndex, &id ))) + { + closeTcpFile(tcpFile); + return ERROR_INVALID_PARAMETER; + } + + req.Req.ID.toi_class = INFO_CLASS_PROTOCOL; + req.Req.ID.toi_type = INFO_TYPE_PROVIDER; + req.Req.ID.toi_id = IP_MIB_ARPTABLE_ENTRY_ID; + req.Req.ID.toi_entity.tei_instance = id.tei_instance; + req.Req.ID.toi_entity.tei_entity = AT_ENTITY; + req.Req.BufferSize = sizeof(MIB_IPNETROW); + arpBuff = (PMIB_IPNETROW)&req.Req.Buffer[0]; + + RtlCopyMemory(arpBuff, pArpEntry, sizeof(MIB_IPNETROW)); + + status = DeviceIoControl( tcpFile, + IOCTL_TCP_SET_INFORMATION_EX, + &req, + sizeof(req), + NULL, + 0, + &returnSize, + NULL ); + + closeTcpFile(tcpFile); + + if (status) + return NO_ERROR; + else + return ERROR_INVALID_PARAMETER; } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -88,12 +88,19 @@ IFEntry ent; } IFEntrySafelySized; -typedef union _TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED { +typedef union _TCP_REQUEST_SET_INFORMATION_EX_ROUTE_ENTRY { CHAR MaxSize[sizeof(TCP_REQUEST_SET_INFORMATION_EX) - 1 + sizeof(IPRouteEntry)]; TCP_REQUEST_SET_INFORMATION_EX Req; -} TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED, - *PTCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED; +} TCP_REQUEST_SET_INFORMATION_EX_ROUTE_ENTRY, + *PTCP_REQUEST_SET_INFORMATION_EX_ROUTE_ENTRY; + +typedef union _TCP_REQUEST_SET_INFORMATION_EX_ARP_ENTRY { + CHAR MaxSize[sizeof(TCP_REQUEST_SET_INFORMATION_EX) - 1 + + sizeof(MIB_IPNETROW)]; + TCP_REQUEST_SET_INFORMATION_EX Req; +} TCP_REQUEST_SET_INFORMATION_EX_ARP_ENTRY, + *PTCP_REQUEST_SET_INFORMATION_EX_ARP_ENTRY; /* Encapsulates information about an interface */ typedef struct _IFInfo { Modified: trunk/reactos/dll/win32/iphlpapi/route_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/route_r… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/route_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/route_reactos.c [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -55,7 +55,7 @@ DWORD createIpForwardEntry( PMIB_IPFORWARDROW pRoute ) { HANDLE tcpFile; NTSTATUS status = openTcpFile( &tcpFile ); - TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED req = + TCP_REQUEST_SET_INFORMATION_EX_ROUTE_ENTRY req = TCP_REQUEST_SET_INFORMATION_INIT; IPRouteEntry *rte; TDIEntityID id; @@ -120,7 +120,7 @@ DWORD deleteIpForwardEntry( PMIB_IPFORWARDROW pRoute ) { HANDLE tcpFile; NTSTATUS status = openTcpFile( &tcpFile ); - TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED req = + TCP_REQUEST_SET_INFORMATION_EX_ROUTE_ENTRY req = TCP_REQUEST_SET_INFORMATION_INIT; IPRouteEntry *rte; TDIEntityID id; Modified: trunk/reactos/drivers/network/tcpip/include/info.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/info.h [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -160,7 +160,13 @@ PNDIS_BUFFER Buffer, PUINT BufferSize ); -TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, PIPROUTE_ENTRY Route); +TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, + PVOID Buffer, + UINT BufferSize); + +TDI_STATUS InfoTdiSetArptableMIB(PIP_INTERFACE IF, + PVOID Buffer, + UINT BufferSize); TDI_STATUS InfoTdiQueryGetArptableMIB(TDIEntityID ID, PIP_INTERFACE Interface, Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -132,6 +132,31 @@ } return Status; +} + +TDI_STATUS InfoTdiSetArptableMIB(PIP_INTERFACE IF, PVOID Buffer, UINT BufferSize) +{ + PIPARP_ENTRY ArpEntry = Buffer; + IP_ADDRESS Address; + PNEIGHBOR_CACHE_ENTRY NCE; + + if (!Buffer || BufferSize < sizeof(IPARP_ENTRY)) + return TDI_INVALID_PARAMETER; + + AddrInitIPv4(&Address, ArpEntry->LogAddr); + + if ((NCE = NBLocateNeighbor(&Address))) + NBRemoveNeighbor(NCE); + + if (NBAddNeighbor(IF, + &Address, + ArpEntry->PhysAddr, + ArpEntry->AddrSize, + NUD_PERMANENT, + 0)) + return TDI_SUCCESS; + else + return TDI_INVALID_PARAMETER; } VOID InsertTDIInterfaceEntity( PIP_INTERFACE Interface ) { Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -268,12 +268,18 @@ if (ID->toi_type != INFO_TYPE_PROVIDER) return TDI_INVALID_PARAMETER; - if (ID->toi_entity.tei_entity != CL_NL_ENTITY && - ID->toi_entity.tei_entity != CO_NL_ENTITY) - return TDI_INVALID_PARAMETER; - - if ((EntityListContext = GetContext(ID->toi_entity))) - return InfoTdiSetRoute(EntityListContext, (PIPROUTE_ENTRY)Buffer); + if (ID->toi_entity.tei_entity == AT_ENTITY) + if ((EntityListContext = GetContext(ID->toi_entity))) + return InfoTdiSetArptableMIB(EntityListContext, + Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; + else if (ID->toi_entity.tei_entity == CL_NL_ENTITY || + ID->toi_entity.tei_entity == CO_NL_ENTITY) + if ((EntityListContext = GetContext(ID->toi_entity))) + return InfoTdiSetRoute(EntityListContext, Buffer, BufferSize); + else + return TDI_INVALID_PARAMETER; else return TDI_INVALID_PARAMETER; Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Sat Oct 24 22:39:41 2009 @@ -173,13 +173,17 @@ return Status; } -TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, PIPROUTE_ENTRY Route) +TDI_STATUS InfoTdiSetRoute(PIP_INTERFACE IF, PVOID Buffer, UINT BufferSize) { IP_ADDRESS Address, Netmask, Router; + PIPROUTE_ENTRY Route = Buffer; AddrInitIPv4( &Address, Route->Dest ); AddrInitIPv4( &Netmask, Route->Mask ); AddrInitIPv4( &Router, Route->Gw ); + + if (!Buffer || BufferSize < sizeof(IPROUTE_ENTRY)) + return TDI_INVALID_PARAMETER; if (IF == Loopback) {

1 0

[sginsberg] 43722: - Don't put PAGED_CODE() before variable declarations -- this makes MSVC very, very sad. Reformat and clean up the code a bit too.
by sginsberg＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: sginsberg Date: Sat Oct 24 22:35:10 2009 New Revision: 43722 URL: http://svn.reactos.org/svn/reactos?rev=43722&view=rev Log: - Don't put PAGED_CODE() before variable declarations -- this makes MSVC very, very sad. Reformat and clean up the code a bit too. Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Sat Oct 24 22:35:10 2009 @@ -116,44 +116,49 @@ NTAPI MmPageEntireDriver(IN PVOID AddressWithinSection) { + //PMMPTE StartPte, EndPte; + PLDR_DATA_TABLE_ENTRY LdrEntry; PAGED_CODE(); - // - // We should find the driver loader entry and return its base address - // - //PMMPTE StartPte, EndPte; - PLDR_DATA_TABLE_ENTRY pLdrDataTabEntry = - MiLookupDataTableEntry(AddressWithinSection); - if (pLdrDataTabEntry) - { - // - // Is Paging disabled or it's mapped as an image - // - if ((MmDisablePagingExecutive & 1) || pLdrDataTabEntry->SectionPointer) - return pLdrDataTabEntry->DllBase; - - // - // Flush all queued DPCs. - // - KeFlushQueuedDpcs(); - - // - // Get PTE range for this section - // - //StartPte = MiGetPteAddress(pLdrDataTabEntry->DllBase); - //EndPte = MiGetPteAddress(pLdrDataTabEntry->DllBase + - // pLdrDataTabEntry->SizeOfImage); - - // - // Set paging for specified PTE range - // - //MiSetPagingOfDriver(StartPte, EndPte); - - // - // Return base address - // - return pLdrDataTabEntry->DllBase; - } - return NULL; + + // + // Get the loader entry + // + LdrEntry = MiLookupDataTableEntry(AddressWithinSection); + if (!LdrEntry) return NULL; + + // + // Check if paging of kernel mode is disabled or if the driver is mapped as + // an image + // + if ((MmDisablePagingExecutive & 0x1) || (LdrEntry->SectionPointer)) + { + // + // Don't do anything, just return the base address + // + return LdrEntry->DllBase; + } + + // + // Wait for active DPCs to finish before we page out the driver + // + KeFlushQueuedDpcs(); + + // + // Get the PTE range for the whole driver image + // + //StartPte = MiGetPteAddress(LdrEntry->DllBase); + //EndPte = MiGetPteAddress(LdrEntry->DllBase + + // LdrEntry->SizeOfImage); + + // + // Enable paging for the PTE range + // + //MiSetPagingOfDriver(StartPte, EndPte); + + // + // Return the base address + // + return LdrEntry->DllBase; } /*

1 0

[dreimer] 43721: chinese Translations by Elton Chung.
by dreimer＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: dreimer Date: Sat Oct 24 21:27:51 2009 New Revision: 43721 URL: http://svn.reactos.org/svn/reactos?rev=43721&view=rev Log: chinese Translations by Elton Chung. Added: trunk/reactos/base/applications/fontview/lang/zh-CN.rc (with props) trunk/reactos/base/applications/fontview/lang/zh-TW.rc (with props) trunk/reactos/base/applications/kbswitch/lang/zh-CN.rc (with props) trunk/reactos/base/applications/kbswitch/lang/zh-TW.rc (with props) trunk/reactos/base/applications/logoff/lang/zh-CN.rc (with props) trunk/reactos/base/applications/logoff/lang/zh-TW.rc (with props) Modified: trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -25,3 +25,5 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/no-NO.rc" +#include "lang/zh-CN.rc" +#include "lang/zh-TW.rc" Added: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS FontView + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/fontview/lang/zh-CN.rc + * PURPOSE: Chinese (Simplified) Language File for FontView + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUIT, "½áÊø" + IDS_PRINT, "ÁÐÓ¡" + IDS_STRING, "ReactOS¸øËùÓÐÈËÒ»¸ö×ÔÓÉµÄ²Ù×÷ÏµÍ³£¡1234567890" + IDS_ERROR, "´íÎó" + IDS_ERROR_NOMEM, "Ã»ÓÐ×ã¹»µÄÄÚ´æÀ´Íê³É²Ù×÷¡£" + IDS_ERROR_NOFONT, "£¥1²»ÊÇÒ»¸öÓÐÐ§µÄ×ÖÌåµµ°¸¡£" + IDS_ERROR_NOCLASS, "´°¿ÚÎÞ·¨³õÊ¼»¯¡£" + IDS_ERROR_BADCMD, "Ã»ÓÐÌá¹©×ÖÌåÎÄ¼þ¡£\nÓï·¨£º\n fontview.exe <×ÖÌåµµ°¸>" +END Propchange: trunk/reactos/base/applications/fontview/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/fontview/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS FontView + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/fontview/lang/zh-TW.rc + * PURPOSE: Chinese (Traditional) Language File for FontView + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUIT, "µ²§ô" + IDS_PRINT, "¦C¦L" + IDS_STRING, "ReactOS µ¹©Ò¦³¤H¤@Ó¦Û¥Ñªº¾Þ§@¨t²Î¡I 1234567890" + IDS_ERROR, "¿ù»~" + IDS_ERROR_NOMEM, "¨S¦³¨¬°÷ªº°O¾ÐÅé¨Ó§¹¦¨¾Þ§@¡C" + IDS_ERROR_NOFONT, "%1 ¤£¬O¤@Ó¦³®Äªº¦rÅéÀÉ®×¡C" + IDS_ERROR_NOCLASS, "µ¡¤fµLªkªì©l¤Æ¡C" + IDS_ERROR_BADCMD, "¨S¦³´£¨Ñ¦rÅé¤å¥ó¡C\n»yªk¡G\n fontview.exe <¦rÅéÀÉ®×>" +END Propchange: trunk/reactos/base/applications/fontview/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/zh-CN.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS KBSwitch + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/kbswitch/lang/zh-CN.rc + * PURPOSE: Chinese (Simplified) Language File for KBSwitch + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Ñ¡Ïî...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "&½áÊø", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/zh-TW.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS KBSwitch + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/kbswitch/lang/zh-TW.rc + * PURPOSE: Chinese (Traditional) Language File for KBSwitch + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&¿ï¶µ...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "&µ²§ô", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -12,3 +12,5 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" +#include "lang/zh-TW.rc" Added: trunk/reactos/base/applications/logoff/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/logoff/lang/zh-CN.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS Logout + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/logout/lang/zh-CN.rc + * PURPOSE: Chinese (Simplified) Language File for Logout + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "ÖÕÖ¹Ò»¸ö½×¶Î¡£\n\n\ + /v\t\tÏÔÊ¾ÓÐ¹ØÒÑÖ´ÐÐ¶¯×÷µÄ×ÊÑ¶¡£\n\ + /?\t\tÏÔÊ¾´Ë×ÊÑ¶¡£\n\n" + +IDS_LOGOFF_REMOTE, "ÕýÔÚÖÕÖ¹Ô¶¶Ë»úÆ÷µÄ½×¶Î¡£" +IDS_LOGOFF_LOCAL, "ÕýÔÚÖÕÖ¹±¾»úÆ÷µÄµ±Ç°½×¶Î¡£" + +IDS_ILLEGAL_PARAM, "ÎÞÐ§²ÎÊý\n" +END +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/logoff/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/zh-TW.rc (added) +++ trunk/reactos/base/applications/logoff/lang/zh-TW.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS Logout + * LICENSE: GPL - See COPYING in the top level directory + * FILE: rosapps/logout/lang/zh-TW.rc + * PURPOSE: Chinese (Traditional) Language File for Logout + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "²×¤î¤@Ó¶¥¬q¡C\n\n\ + /v\t\tÅã¥Ü¦³Ãö¤w°õ¦æ°Ê§@ªº¸ê°T¡C\n\ + /?\t\tÅã¥Ü¦¹¸ê°T¡C\n\n" + +IDS_LOGOFF_REMOTE, "¥¿¦b²×¤î»·ºÝ¾÷¾¹ªº¶¥¬q¡C" +IDS_LOGOFF_LOCAL, "¥¿¦b²×¤î¥»¾÷¾¹ªº·í«e¶¥¬q¡C" + +IDS_ILLEGAL_PARAM, "µL®Ä°Ñ¼Æ\n" +END +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] Sat Oct 24 21:27:51 2009 @@ -18,4 +18,5 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" - +#include "lang/zh-CN.rc" +#include "lang/zh-TW.rc"

1 0

[fireball] 43720: - Assign "Default" desktop to processes who don't have a parent.
by fireball＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: fireball Date: Sat Oct 24 20:37:56 2009 New Revision: 43720 URL: http://svn.reactos.org/svn/reactos?rev=43720&view=rev Log: - Assign "Default" desktop to processes who don't have a parent. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Oct 24 20:37:56 2009 @@ -125,7 +125,8 @@ } if (Type == PsW32ThreadCalloutInitialize) { - DPRINT("Creating W32 thread TID:%d at IRQ level: %lu. Win32Process %p\n", Thread->Tcb.Teb->ClientId.UniqueThread, KeGetCurrentIrql(), Win32Process); + DPRINT("Creating W32 thread TID:%d PID:%d at IRQ level: %lu. Win32Process %p, desktop %x\n", + Thread->Tcb.Teb->ClientId.UniqueThread, Thread->Tcb.Teb->ClientId.UniqueProcess, KeGetCurrentIrql(), Win32Process, Win32Process->desktop); Win32Thread->process = Win32Process; Win32Thread->peThread = Thread; Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Sat Oct 24 20:37:56 2009 @@ -439,17 +439,16 @@ process, 0, 0, DUP_HANDLE_SAME_ACCESS ); } - if (handle) set_process_default_desktop( process, desktop, handle ); - -#if 0 - { - // set default desktop differently. Just always assign a "default" desktop +#if 1 + else + { + // Always assign a "default" desktop if there is no parent desktop WCHAR deskbuf[8]; struct unicode_str full_str, desktop_name; WCHAR *full_name; desktop_name.str = deskbuf; - desktop_name.len = sizeof(deskbuf); + desktop_name.len = sizeof(deskbuf) - sizeof(WCHAR); wcscpy(deskbuf, L"Default"); if ((full_name = build_desktop_name( &desktop_name, winstation, &full_str ))) @@ -457,10 +456,12 @@ handle = open_object( winstation_namespace, &full_str, &desktop_ops, GENERIC_ALL, OBJ_CASE_INSENSITIVE ); ExFreePool( full_name ); - DPRINT1("handle %x\n", handle); + DPRINT("handle %x\n", handle); } } #endif + + if (handle) set_process_default_desktop( process, desktop, handle ); done: if (desktop) release_object( desktop );

1 0

[dreimer] 43719: Sync wordpad and winhlp32 to Wine 1.1.31 Update 3rd Party Files.txt
by dreimer＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: dreimer Date: Sat Oct 24 19:23:52 2009 New Revision: 43719 URL: http://svn.reactos.org/svn/reactos?rev=43719&view=rev Log: Sync wordpad and winhlp32 to Wine 1.1.31 Update 3rd Party Files.txt Modified: trunk/reactos/base/applications/winhlp32/callback.c trunk/reactos/base/applications/winhlp32/lex.yy.c trunk/reactos/base/applications/winhlp32/macro.c trunk/reactos/base/applications/winhlp32/macro.lex.l trunk/reactos/base/applications/winhlp32/winhelp.h trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/base/applications/winhlp32/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/callback.c [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -158,23 +158,23 @@ return 0; } -FARPROC Callbacks[] = +const struct winhelp_callbacks Callbacks = { - (FARPROC)WHD_GetFSError, - (FARPROC)WHD_Open, - (FARPROC)WHD_Close, - (FARPROC)WHD_OpenBag, - (FARPROC)WHD_CloseBag, - (FARPROC)WHD_ReadBag, - (FARPROC)WHD_TellBag, - (FARPROC)WHD_SeekBag, - (FARPROC)WHD_IsEofBag, - (FARPROC)WHD_SizeBag, - (FARPROC)WHD_Access, - (FARPROC)WHD_LLInfoFromBag, - (FARPROC)WHD_LLInfoFromFile, - (FARPROC)WHD_Error, - (FARPROC)WHD_ErrorString, - (FARPROC)WHD_GetInfo, - (FARPROC)WHD_API + WHD_GetFSError, + WHD_Open, + WHD_Close, + WHD_OpenBag, + WHD_CloseBag, + WHD_ReadBag, + WHD_TellBag, + WHD_SeekBag, + WHD_IsEofBag, + WHD_SizeBag, + WHD_Access, + WHD_LLInfoFromBag, + WHD_LLInfoFromFile, + WHD_Error, + WHD_ErrorString, + WHD_GetInfo, + WHD_API }; Modified: trunk/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -380,9 +380,9 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "macro.lex.l" +#line 1 ".\\macro.lex.l" #define INITIAL 0 -#line 2 "macro.lex.l" +#line 2 ".\\macro.lex.l" /* * Help Viewer * @@ -407,7 +407,7 @@ #define YY_NO_UNPUT 1 #define quote 1 -#line 26 "macro.lex.l" +#line 26 ".\\macro.lex.l" #include "config.h" #include <assert.h> #include <stdarg.h> @@ -593,7 +593,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 61 "macro.lex.l" +#line 61 ".\\macro.lex.l" #line 600 "lex.yy.c" @@ -681,32 +681,32 @@ case 1: YY_RULE_SETUP -#line 63 "macro.lex.l" +#line 63 ".\\macro.lex.l" yylval.integer = strtol(yytext, NULL, 10); return INTEGER; YY_BREAK case 2: YY_RULE_SETUP -#line 64 "macro.lex.l" +#line 64 ".\\macro.lex.l" yylval.integer = strtol(yytext, NULL, 16); return INTEGER; YY_BREAK case 3: YY_RULE_SETUP -#line 66 "macro.lex.l" +#line 66 ".\\macro.lex.l" return MACRO_Lookup(yytext, &yylval); YY_BREAK case 4: -#line 69 "macro.lex.l" +#line 69 ".\\macro.lex.l" case 5: -#line 70 "macro.lex.l" +#line 70 ".\\macro.lex.l" case 6: -#line 71 "macro.lex.l" +#line 71 ".\\macro.lex.l" case 7: -#line 72 "macro.lex.l" +#line 72 ".\\macro.lex.l" case 8: -#line 73 "macro.lex.l" +#line 73 ".\\macro.lex.l" case 9: YY_RULE_SETUP -#line 73 "macro.lex.l" +#line 73 ".\\macro.lex.l" { if (lex_data->quote_stk_idx == 0 || (yytext[0] == '\"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '\"') || @@ -741,31 +741,31 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 105 "macro.lex.l" +#line 105 ".\\macro.lex.l" *lex_data->strptr++ = yytext[0]; YY_BREAK case 11: YY_RULE_SETUP -#line 106 "macro.lex.l" +#line 106 ".\\macro.lex.l" *lex_data->strptr++ = yytext[1]; YY_BREAK case YY_STATE_EOF(quote): -#line 107 "macro.lex.l" +#line 107 ".\\macro.lex.l" return 0; YY_BREAK case 12: YY_RULE_SETUP -#line 109 "macro.lex.l" +#line 109 ".\\macro.lex.l" YY_BREAK case 13: YY_RULE_SETUP -#line 110 "macro.lex.l" +#line 110 ".\\macro.lex.l" return yytext[0]; YY_BREAK case 14: YY_RULE_SETUP -#line 111 "macro.lex.l" +#line 111 ".\\macro.lex.l" ECHO; YY_BREAK #line 772 "lex.yy.c" @@ -1654,7 +1654,7 @@ return 0; } #endif -#line 111 "macro.lex.l" +#line 111 ".\\macro.lex.l" #if 0 @@ -1699,7 +1699,7 @@ } } -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret); +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret); /****************************************************************** * MACRO_CheckArgs @@ -1769,7 +1769,7 @@ * Invokes boolean function fn, which arguments are defined by args * stores bool result into ret */ -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret) +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -1781,8 +1781,18 @@ switch (strlen(args)) { - case 0: *ret = (void*)(fn)(); break; - case 1: *ret = (void*)(fn)(pa[0]); break; + case 0: + { + BOOL (WINAPI *func)(void) = fn; + *ret = (void *)(ULONG_PTR)func(); + break; + } + case 1: + { + BOOL (WINAPI *func)(void *) = fn; + *ret = (void *)(ULONG_PTR)func( pa[0]); + break; + } default: WINE_FIXME("NIY\n"); } @@ -1794,7 +1804,7 @@ * * */ -static int MACRO_CallVoidFunc(FARPROC fn, const char* args) +static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -1806,13 +1816,48 @@ switch (strlen(args)) { - case 0: (fn)(); break; - case 1: (fn)(pa[0]); break; - case 2: (fn)(pa[0],pa[1]); break; - case 3: (fn)(pa[0],pa[1],pa[2]); break; - case 4: (fn)(pa[0],pa[1],pa[2],pa[3]); break; - case 5: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4]); break; - case 6: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4],pa[5]); break; + case 0: + { + void (WINAPI *func)(void) = fn; + func(); + break; + } + case 1: + { + void (WINAPI *func)(void*) = fn; + func( pa[0] ); + break; + } + case 2: + { + void (WINAPI *func)(void*,void*) = fn; + func( pa[0], pa[1] ); + break; + } + case 3: + { + void (WINAPI *func)(void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2] ); + break; + } + case 4: + { + void (WINAPI *func)(void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3] ); + break; + } + case 5: + { + void (WINAPI *func)(void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4] ); + break; + } + case 6: + { + void (WINAPI *func)(void*,void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4], pa[5] ); + break; + } default: WINE_FIXME("NIY\n"); } Modified: trunk/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -39,7 +39,7 @@ const char* alias; BOOL isBool; const char* arguments; - FARPROC fn; + void *fn; }; static struct MacroDesc*MACRO_Loaded /* = NULL */; @@ -696,7 +696,7 @@ static void CALLBACK MACRO_RegisterRoutine(LPCSTR dll_name, LPCSTR proc, LPCSTR args) { - FARPROC fn = NULL; + void *fn = NULL; int size; WINHELP_DLL* dll; @@ -735,7 +735,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (LONG_PTR)&Callbacks, 0); } else WINE_WARN("OOM\n"); } @@ -857,97 +857,97 @@ */ static struct MacroDesc MACRO_Builtins[] = { - {"About", NULL, 0, "", (FARPROC)MACRO_About}, - {"AddAccelerator", "AA", 0, "UUS", (FARPROC)MACRO_AddAccelerator}, - {"ALink", "AL", 0, "SUS", (FARPROC)MACRO_ALink}, - {"Annotate", NULL, 0, "", (FARPROC)MACRO_Annotate}, - {"AppendItem", NULL, 0, "SSSS", (FARPROC)MACRO_AppendItem}, - {"Back", NULL, 0, "", (FARPROC)MACRO_Back}, - {"BackFlush", "BF", 0, "", (FARPROC)MACRO_BackFlush}, - {"BookmarkDefine", NULL, 0, "", (FARPROC)MACRO_BookmarkDefine}, - {"BookmarkMore", NULL, 0, "", (FARPROC)MACRO_BookmarkMore}, - {"BrowseButtons", NULL, 0, "", (FARPROC)MACRO_BrowseButtons}, - {"ChangeButtonBinding", "CBB",0, "SS", (FARPROC)MACRO_ChangeButtonBinding}, - {"ChangeEnable", "CE", 0, "SS", (FARPROC)MACRO_ChangeEnable}, - {"ChangeItemBinding", "CIB",0, "SS", (FARPROC)MACRO_ChangeItemBinding}, - {"CheckItem", "CI", 0, "S", (FARPROC)MACRO_CheckItem}, - {"CloseSecondarys", "CS", 0, "", (FARPROC)MACRO_CloseSecondarys}, - {"CloseWindow", "CW", 0, "S", (FARPROC)MACRO_CloseWindow}, - {"Compare", NULL, 0, "S", (FARPROC)MACRO_Compare}, - {"Contents", NULL, 0, "", (FARPROC)MACRO_Contents}, - {"ControlPanel", NULL, 0, "SSU", (FARPROC)MACRO_ControlPanel}, - {"CopyDialog", NULL, 0, "", (FARPROC)MACRO_CopyDialog}, - {"CopyTopic", "CT", 0, "", (FARPROC)MACRO_CopyTopic}, - {"CreateButton", "CB", 0, "SSS", (FARPROC)MACRO_CreateButton}, - {"DeleteItem", NULL, 0, "S", (FARPROC)MACRO_DeleteItem}, - {"DeleteMark", NULL, 0, "S", (FARPROC)MACRO_DeleteMark}, - {"DestroyButton", NULL, 0, "S", (FARPROC)MACRO_DestroyButton}, - {"DisableButton", "DB", 0, "S", (FARPROC)MACRO_DisableButton}, - {"DisableItem", "DI", 0, "S", (FARPROC)MACRO_DisableItem}, - {"EnableButton", "EB", 0, "S", (FARPROC)MACRO_EnableButton}, - {"EnableItem", "EI", 0, "S", (FARPROC)MACRO_EnableItem}, - {"EndMPrint", NULL, 0, "", (FARPROC)MACRO_EndMPrint}, - {"ExecFile", "EF", 0, "SSUS", (FARPROC)MACRO_ExecFile}, - {"ExecProgram", "EP", 0, "SU", (FARPROC)MACRO_ExecProgram}, - {"Exit", NULL, 0, "", (FARPROC)MACRO_Exit}, - {"ExtAbleItem", NULL, 0, "SU", (FARPROC)MACRO_ExtAbleItem}, - {"ExtInsertItem", NULL, 0, "SSSSUU", (FARPROC)MACRO_ExtInsertItem}, - {"ExtInsertMenu", NULL, 0, "SSSUU", (FARPROC)MACRO_ExtInsertMenu}, - {"FileExist", "FE", 1, "S", (FARPROC)MACRO_FileExist}, - {"FileOpen", "FO", 0, "", (FARPROC)MACRO_FileOpen}, - {"Find", NULL, 0, "", (FARPROC)MACRO_Find}, - {"Finder", "FD", 0, "", (FARPROC)MACRO_Finder}, - {"FloatingMenu", NULL, 0, "", (FARPROC)MACRO_FloatingMenu}, - {"Flush", "FH", 0, "", (FARPROC)MACRO_Flush}, - {"FocusWindow", NULL, 0, "S", (FARPROC)MACRO_FocusWindow}, - {"Generate", NULL, 0, "SUU", (FARPROC)MACRO_Generate}, - {"GotoMark", NULL, 0, "S", (FARPROC)MACRO_GotoMark}, - {"HelpOn", NULL, 0, "", (FARPROC)MACRO_HelpOn}, - {"HelpOnTop", NULL, 0, "", (FARPROC)MACRO_HelpOnTop}, - {"History", NULL, 0, "", (FARPROC)MACRO_History}, - {"InitMPrint", NULL, 1, "", (FARPROC)MACRO_InitMPrint}, - {"InsertItem", NULL, 0, "SSSSU", (FARPROC)MACRO_InsertItem}, - {"InsertMenu", NULL, 0, "SSU", (FARPROC)MACRO_InsertMenu}, - {"IfThen", "IF", 0, "BS", (FARPROC)MACRO_IfThen}, - {"IfThenElse", "IE", 0, "BSS", (FARPROC)MACRO_IfThenElse}, - {"IsBook", NULL, 1, "", (FARPROC)MACRO_IsBook}, - {"IsMark", NULL, 1, "S", (FARPROC)MACRO_IsMark}, - {"IsNotMark", "NM", 1, "S", (FARPROC)MACRO_IsNotMark}, - {"JumpContents", NULL, 0, "SS", (FARPROC)MACRO_JumpContents}, - {"JumpContext", "JC", 0, "SSU", (FARPROC)MACRO_JumpContext}, - {"JumpHash", "JH", 0, "SSU", (FARPROC)MACRO_JumpHash}, - {"JumpHelpOn", NULL, 0, "", (FARPROC)MACRO_JumpHelpOn}, - {"JumpID", "JI", 0, "SS", (FARPROC)MACRO_JumpID}, - {"JumpKeyword", "JK", 0, "SSS", (FARPROC)MACRO_JumpKeyword}, - {"KLink", "KL", 0, "SUSS", (FARPROC)MACRO_KLink}, - {"Menu", "MU", 0, "", (FARPROC)MACRO_Menu}, - {"MPrintHash", NULL, 0, "U", (FARPROC)MACRO_MPrintHash}, - {"MPrintID", NULL, 0, "S", (FARPROC)MACRO_MPrintID}, - {"Next", NULL, 0, "", (FARPROC)MACRO_Next}, - {"NoShow", "NS", 0, "", (FARPROC)MACRO_NoShow}, - {"PopupContext", "PC", 0, "SU", (FARPROC)MACRO_PopupContext}, - {"PopupHash", NULL, 0, "SU", (FARPROC)MACRO_PopupHash}, - {"PopupId", "PI", 0, "SS", (FARPROC)MACRO_PopupId}, - {"PositionWindow", "PW", 0, "IIUUUS", (FARPROC)MACRO_PositionWindow}, - {"Prev", NULL, 0, "", (FARPROC)MACRO_Prev}, - {"Print", NULL, 0, "", (FARPROC)MACRO_Print}, - {"PrinterSetup", NULL, 0, "", (FARPROC)MACRO_PrinterSetup}, - {"RegisterRoutine", "RR", 0, "SSS", (FARPROC)MACRO_RegisterRoutine}, - {"RemoveAccelerator", "RA", 0, "UU", (FARPROC)MACRO_RemoveAccelerator}, - {"ResetMenu", NULL, 0, "", (FARPROC)MACRO_ResetMenu}, - {"SaveMark", NULL, 0, "S", (FARPROC)MACRO_SaveMark}, - {"Search", NULL, 0, "", (FARPROC)MACRO_Search}, - {"SetContents", NULL, 0, "SU", (FARPROC)MACRO_SetContents}, - {"SetHelpOnFile", NULL, 0, "S", (FARPROC)MACRO_SetHelpOnFile}, - {"SetPopupColor", "SPC",0, "UUU", (FARPROC)MACRO_SetPopupColor}, - {"ShellExecute", "SE", 0, "SSUUSS", (FARPROC)MACRO_ShellExecute}, - {"ShortCut", "SH", 0, "SSUUS", (FARPROC)MACRO_ShortCut}, - {"TCard", NULL, 0, "U", (FARPROC)MACRO_TCard}, - {"Test", NULL, 0, "U", (FARPROC)MACRO_Test}, - {"TestALink", NULL, 1, "S", (FARPROC)MACRO_TestALink}, - {"TestKLink", NULL, 1, "S", (FARPROC)MACRO_TestKLink}, - {"UncheckItem", "UI", 0, "S", (FARPROC)MACRO_UncheckItem}, - {"UpdateWindow", "UW", 0, "SS", (FARPROC)MACRO_UpdateWindow}, + {"About", NULL, 0, "", MACRO_About}, + {"AddAccelerator", "AA", 0, "UUS", MACRO_AddAccelerator}, + {"ALink", "AL", 0, "SUS", MACRO_ALink}, + {"Annotate", NULL, 0, "", MACRO_Annotate}, + {"AppendItem", NULL, 0, "SSSS", MACRO_AppendItem}, + {"Back", NULL, 0, "", MACRO_Back}, + {"BackFlush", "BF", 0, "", MACRO_BackFlush}, + {"BookmarkDefine", NULL, 0, "", MACRO_BookmarkDefine}, + {"BookmarkMore", NULL, 0, "", MACRO_BookmarkMore}, + {"BrowseButtons", NULL, 0, "", MACRO_BrowseButtons}, + {"ChangeButtonBinding", "CBB",0, "SS", MACRO_ChangeButtonBinding}, + {"ChangeEnable", "CE", 0, "SS", MACRO_ChangeEnable}, + {"ChangeItemBinding", "CIB",0, "SS", MACRO_ChangeItemBinding}, + {"CheckItem", "CI", 0, "S", MACRO_CheckItem}, + {"CloseSecondarys", "CS", 0, "", MACRO_CloseSecondarys}, + {"CloseWindow", "CW", 0, "S", MACRO_CloseWindow}, + {"Compare", NULL, 0, "S", MACRO_Compare}, + {"Contents", NULL, 0, "", MACRO_Contents}, + {"ControlPanel", NULL, 0, "SSU", MACRO_ControlPanel}, + {"CopyDialog", NULL, 0, "", MACRO_CopyDialog}, + {"CopyTopic", "CT", 0, "", MACRO_CopyTopic}, + {"CreateButton", "CB", 0, "SSS", MACRO_CreateButton}, + {"DeleteItem", NULL, 0, "S", MACRO_DeleteItem}, + {"DeleteMark", NULL, 0, "S", MACRO_DeleteMark}, + {"DestroyButton", NULL, 0, "S", MACRO_DestroyButton}, + {"DisableButton", "DB", 0, "S", MACRO_DisableButton}, + {"DisableItem", "DI", 0, "S", MACRO_DisableItem}, + {"EnableButton", "EB", 0, "S", MACRO_EnableButton}, + {"EnableItem", "EI", 0, "S", MACRO_EnableItem}, + {"EndMPrint", NULL, 0, "", MACRO_EndMPrint}, + {"ExecFile", "EF", 0, "SSUS", MACRO_ExecFile}, + {"ExecProgram", "EP", 0, "SU", MACRO_ExecProgram}, + {"Exit", NULL, 0, "", MACRO_Exit}, + {"ExtAbleItem", NULL, 0, "SU", MACRO_ExtAbleItem}, + {"ExtInsertItem", NULL, 0, "SSSSUU", MACRO_ExtInsertItem}, + {"ExtInsertMenu", NULL, 0, "SSSUU", MACRO_ExtInsertMenu}, + {"FileExist", "FE", 1, "S", MACRO_FileExist}, + {"FileOpen", "FO", 0, "", MACRO_FileOpen}, + {"Find", NULL, 0, "", MACRO_Find}, + {"Finder", "FD", 0, "", MACRO_Finder}, + {"FloatingMenu", NULL, 0, "", MACRO_FloatingMenu}, + {"Flush", "FH", 0, "", MACRO_Flush}, + {"FocusWindow", NULL, 0, "S", MACRO_FocusWindow}, + {"Generate", NULL, 0, "SUU", MACRO_Generate}, + {"GotoMark", NULL, 0, "S", MACRO_GotoMark}, + {"HelpOn", NULL, 0, "", MACRO_HelpOn}, + {"HelpOnTop", NULL, 0, "", MACRO_HelpOnTop}, + {"History", NULL, 0, "", MACRO_History}, + {"InitMPrint", NULL, 1, "", MACRO_InitMPrint}, + {"InsertItem", NULL, 0, "SSSSU", MACRO_InsertItem}, + {"InsertMenu", NULL, 0, "SSU", MACRO_InsertMenu}, + {"IfThen", "IF", 0, "BS", MACRO_IfThen}, + {"IfThenElse", "IE", 0, "BSS", MACRO_IfThenElse}, + {"IsBook", NULL, 1, "", MACRO_IsBook}, + {"IsMark", NULL, 1, "S", MACRO_IsMark}, + {"IsNotMark", "NM", 1, "S", MACRO_IsNotMark}, + {"JumpContents", NULL, 0, "SS", MACRO_JumpContents}, + {"JumpContext", "JC", 0, "SSU", MACRO_JumpContext}, + {"JumpHash", "JH", 0, "SSU", MACRO_JumpHash}, + {"JumpHelpOn", NULL, 0, "", MACRO_JumpHelpOn}, + {"JumpID", "JI", 0, "SS", MACRO_JumpID}, + {"JumpKeyword", "JK", 0, "SSS", MACRO_JumpKeyword}, + {"KLink", "KL", 0, "SUSS", MACRO_KLink}, + {"Menu", "MU", 0, "", MACRO_Menu}, + {"MPrintHash", NULL, 0, "U", MACRO_MPrintHash}, + {"MPrintID", NULL, 0, "S", MACRO_MPrintID}, + {"Next", NULL, 0, "", MACRO_Next}, + {"NoShow", "NS", 0, "", MACRO_NoShow}, + {"PopupContext", "PC", 0, "SU", MACRO_PopupContext}, + {"PopupHash", NULL, 0, "SU", MACRO_PopupHash}, + {"PopupId", "PI", 0, "SS", MACRO_PopupId}, + {"PositionWindow", "PW", 0, "IIUUUS", MACRO_PositionWindow}, + {"Prev", NULL, 0, "", MACRO_Prev}, + {"Print", NULL, 0, "", MACRO_Print}, + {"PrinterSetup", NULL, 0, "", MACRO_PrinterSetup}, + {"RegisterRoutine", "RR", 0, "SSS", MACRO_RegisterRoutine}, + {"RemoveAccelerator", "RA", 0, "UU", MACRO_RemoveAccelerator}, + {"ResetMenu", NULL, 0, "", MACRO_ResetMenu}, + {"SaveMark", NULL, 0, "S", MACRO_SaveMark}, + {"Search", NULL, 0, "", MACRO_Search}, + {"SetContents", NULL, 0, "SU", MACRO_SetContents}, + {"SetHelpOnFile", NULL, 0, "S", MACRO_SetHelpOnFile}, + {"SetPopupColor", "SPC",0, "UUU", MACRO_SetPopupColor}, + {"ShellExecute", "SE", 0, "SSUUSS", MACRO_ShellExecute}, + {"ShortCut", "SH", 0, "SSUUS", MACRO_ShortCut}, + {"TCard", NULL, 0, "U", MACRO_TCard}, + {"Test", NULL, 0, "U", MACRO_Test}, + {"TestALink", NULL, 1, "S", MACRO_TestALink}, + {"TestKLink", NULL, 1, "S", MACRO_TestKLink}, + {"UncheckItem", "UI", 0, "S", MACRO_UncheckItem}, + {"UpdateWindow", "UW", 0, "SS", MACRO_UpdateWindow}, {NULL, NULL, 0, NULL, NULL} }; Modified: trunk/reactos/base/applications/winhlp32/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/macro.lex.l [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -152,7 +152,7 @@ } } -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret); +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret); /****************************************************************** * MACRO_CheckArgs @@ -222,7 +222,7 @@ * Invokes boolean function fn, which arguments are defined by args * stores bool result into ret */ -static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret) +static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -234,8 +234,18 @@ switch (strlen(args)) { - case 0: *ret = (void*)(fn)(); break; - case 1: *ret = (void*)(fn)(pa[0]); break; + case 0: + { + BOOL (WINAPI *func)(void) = fn; + *ret = (void *)(ULONG_PTR)func(); + break; + } + case 1: + { + BOOL (WINAPI *func)(void *) = fn; + *ret = (void *)(ULONG_PTR)func( pa[0]); + break; + } default: WINE_FIXME("NIY\n"); } @@ -247,7 +257,7 @@ * * */ -static int MACRO_CallVoidFunc(FARPROC fn, const char* args) +static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); @@ -259,13 +269,48 @@ switch (strlen(args)) { - case 0: (fn)(); break; - case 1: (fn)(pa[0]); break; - case 2: (fn)(pa[0],pa[1]); break; - case 3: (fn)(pa[0],pa[1],pa[2]); break; - case 4: (fn)(pa[0],pa[1],pa[2],pa[3]); break; - case 5: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4]); break; - case 6: (fn)(pa[0],pa[1],pa[2],pa[3],pa[4],pa[5]); break; + case 0: + { + void (WINAPI *func)(void) = fn; + func(); + break; + } + case 1: + { + void (WINAPI *func)(void*) = fn; + func( pa[0] ); + break; + } + case 2: + { + void (WINAPI *func)(void*,void*) = fn; + func( pa[0], pa[1] ); + break; + } + case 3: + { + void (WINAPI *func)(void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2] ); + break; + } + case 4: + { + void (WINAPI *func)(void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3] ); + break; + } + case 5: + { + void (WINAPI *func)(void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4] ); + break; + } + case 6: + { + void (WINAPI *func)(void*,void*,void*,void*,void*,void*) = fn; + func( pa[0], pa[1], pa[2], pa[3], pa[4], pa[5] ); + break; + } default: WINE_FIXME("NIY\n"); } Modified: trunk/reactos/base/applications/winhlp32/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.h [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -115,7 +115,7 @@ #define DW_ACTIVATE 9 #define DW_CALLBACKS 10 -typedef long (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG, LONG); +typedef LONG (CALLBACK *WINHELP_LDLLHandler)(WORD, LONG_PTR, LONG_PTR); typedef struct tagDll { @@ -140,8 +140,28 @@ HFONT hButtonFont; } WINHELP_GLOBALS; +extern const struct winhelp_callbacks +{ + WORD (WINAPI *GetFSError)(void); + HANDLE (WINAPI *HfsOpenSz)(LPSTR,BYTE); + WORD (WINAPI *RcCloseHfs)(HANDLE); + HANDLE (WINAPI *HfOpenHfs)(HANDLE,LPSTR,BYTE); + HANDLE (WINAPI *RcCloseHf)(HANDLE); + LONG (WINAPI *LcbReadHf)(HANDLE,BYTE*,LONG); + LONG (WINAPI *LTellHf)(HANDLE); + LONG (WINAPI *LSeekHf)(HANDLE,LONG,WORD); + BOOL (WINAPI *FEofHf)(HANDLE); + LONG (WINAPI *LcbSizeHf)(HANDLE); + BOOL (WINAPI *FAccessHfs)(HANDLE,LPSTR,BYTE); + WORD (WINAPI *RcLLInfoFromHf)(HANDLE,WORD,LPWORD,LPLONG,LPLONG); + WORD (WINAPI *RcLLInfoFromHfs)(HANDLE,LPSTR,WORD,LPWORD,LPLONG,LPLONG); + void (WINAPI *ErrorW)(int); + void (WINAPI *ErrorSz)(LPSTR); + ULONG_PTR (WINAPI *GetInfo)(WORD,HWND); + LONG (WINAPI *API)(LPSTR,WORD,DWORD); +} Callbacks; + extern WINHELP_GLOBALS Globals; -extern FARPROC Callbacks[]; BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE*, int, BOOL); BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*), Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -219,8 +219,8 @@ STRING_PREVIEW_PRINT, "ÐÐµÑÐ°ÑÑ" STRING_PREVIEW_NEXTPAGE, "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" STRING_PREVIEW_PREVPAGE, "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "ÐÐ²Ðµ ÑÑÑÐ°Ð½Ð¸ÑÑ" + STRING_PREVIEW_ONEPAGE, "ÐÐ´Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°" STRING_PREVIEW_CLOSE, "ÐÐ°ÐºÑÑÑÑ" END @@ -231,7 +231,7 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" + STRING_DEFAULT_FILENAME, "ÐÐ¾ÐºÑÐ¼ÐµÐ½Ñ" STRING_PROMPT_SAVE_CHANGES, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² '%s'?" STRING_SEARCH_FINISHED, "ÐÐ¾Ð¸ÑÐº Ð² Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐµ Ð·Ð°Ð²ÐµÑÑÐµÐ½." STRING_LOAD_RICHED_FAILED, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ¸ RichEdit." @@ -240,6 +240,11 @@ "ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸?" STRING_INVALID_NUMBER, "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¸ÑÐ»Ð¾Ð²Ð¾Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ" STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÑÑÑÑ" + STRING_WRITE_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ°Ð¹Ð»." + STRING_WRITE_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°." + STRING_OPEN_FAILED, "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ ÑÐ°Ð¹Ð»." + STRING_OPEN_ACCESS_DENIED, "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿ÑÐ°Ð² Ð´Ð»Ñ Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð°." STRING_PRINTING_NOT_IMPLEMENTED, "ÐÐµÑÐ°ÑÑ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ" + STRING_MAX_TAB_STOPS, "ÐÐµÐ»ÑÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð±Ð¾Ð»ÐµÐµ 32 Ð¿Ð¾Ð·Ð¸ÑÐ¸Ð¹ ÑÐ°Ð±ÑÐ»ÑÑÐ¸Ð¸." END #pragma code_page(default) Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Sat Oct 24 19:23:52 2009 @@ -43,7 +43,7 @@ Website: http://expat.sourceforge.net Title: LibXML -Version: 2.7.1 +Version: 2.7.6 Actual Version: 2.7.6 Website: http://xmlsoft.org

1 0

[spetreolle] 43718: - Add reg.exe from Wine 1.1.31
by spetreolle＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: spetreolle Date: Sat Oct 24 17:23:45 2009 New Revision: 43718 URL: http://svn.reactos.org/svn/reactos?rev=43718&view=rev Log: - Add reg.exe from Wine 1.1.31 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 24 17:23:45 2009 @@ -188,6 +188,7 @@ reactos/base/applications/games/winemine # Out of sync reactos/base/applications/iexplore # Autosync reactos/base/applications/notepad # Forked at Wine-20041201 +reactos/base/applications/reg # Synced to Wine-1_1_31 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Autosync reactos/base/applications/wordpad # Autosync

1 0

[spetreolle] 43717: add missing checks fixes winmm:mixer crash
by spetreolle＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: spetreolle Date: Sat Oct 24 17:13:30 2009 New Revision: 43717 URL: http://svn.reactos.org/svn/reactos?rev=43717&view=rev Log: add missing checks fixes winmm:mixer crash Modified: trunk/reactos/dll/win32/winmm/winmm.c Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Sat Oct 24 17:13:30 2009 @@ -568,6 +568,9 @@ TRACE("(%p, %p, %08lx)\n", hmix, lpmliW, fdwInfo); + if (lpmliW == NULL || lpmliW->cbStruct != sizeof(*lpmliW)) + return MMSYSERR_INVALPARAM; + if ((uRet = MIXER_GetDev(hmix, fdwInfo, &lpwm)) != MMSYSERR_NOERROR) return uRet;

1 0

[dchapyshev] 43716: - Fix Russian translation
by dchapyshev＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: dchapyshev Date: Sat Oct 24 16:34:11 2009 New Revision: 43716 URL: http://svn.reactos.org/svn/reactos?rev=43716&view=rev Log: - Fix Russian translation Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sat Oct 24 16:34:11 2009 @@ -201,9 +201,9 @@ STRINGTABLE BEGIN IDS_GAMES "Èãðû" - IDS_CMT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà""" + IDS_CMT_SOLITAIRE "Ïàñüÿíñ Êîñûíêà" IDS_CMT_WINEMINE "Ñàïåð" - IDS_CMT_SPIDER "Ïàñüÿíñ ""Ïàóê""" + IDS_CMT_SPIDER "Ïàñüÿíñ Ïàóê" END STRINGTABLE @@ -254,7 +254,7 @@ IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Ïàñüÿíñ ""Êîñûíêà"".lnk" + IDS_SHORT_SOLITAIRE "Ïàñüÿíñ Êîñûíêà.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" IDS_SHORT_MAGNIFY "Ýêðàííàÿ ëóïà.lnk" @@ -265,7 +265,7 @@ IDS_SHORT_SNDVOL32 "Ãðîìêîñòü.lnk" IDS_SHORT_DXDIAG "Ñðåäñòâî äèàãíîñòèêè ReactX.lnk" IDS_SHORT_PAINT "Paint.lnk" - IDS_SHORT_SPIDER "Ïàñüÿíñ ""Ïàóê"".lnk" + IDS_SHORT_SPIDER "Ïàñüÿíñ Ïàóê.lnk" END STRINGTABLE

1 0

[khornicek] 43715: - merge some of the more meaningful stuff from the reactx branch
by khornicek＠svn.reactos.org 24 Oct '09

24 Oct '09

Author: khornicek Date: Sat Oct 24 16:09:48 2009 New Revision: 43715 URL: http://svn.reactos.org/svn/reactos?rev=43715&view=rev Log: - merge some of the more meaningful stuff from the reactx branch Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -129,6 +129,19 @@ return retVal; } +/*++ +* @name DDraw->AddRef +* @implemented +* +* The function DDraw->AddRef manages all ref counters in the COM object DDraw-> + +* @return +* Returns the local Ref counter value for the COM object +* +* @remarks. +* none +* +*--*/ ULONG WINAPI Main_DirectDraw_AddRef (LPDDRAWI_DIRECTDRAW_INT This) { @@ -136,13 +149,20 @@ DX_WINDBG_trace(); - _SEH2_TRY - { + /* Lock the thread */ + AcquireDDThreadLock(); + + _SEH2_TRY + { + /* Increment the internal ref counter */ This->dwIntRefCnt++; + + /* Increment the local internal ref counter */ This->lpLcl->dwLocalRefCnt++; if (This->lpLcl->lpGbl != NULL) { + /* Increment the gobal internal ref counter */ This->lpLcl->lpGbl->dwRefCnt++; } } @@ -161,6 +181,10 @@ } _SEH2_END; + /* Release the thread lock */ + ReleaseDDThreadLock(); + + /* Return the local Ref counter */ return retValue; } @@ -173,6 +197,10 @@ ULONG Counter = 0; DX_WINDBG_trace(); + + /* Lock the thread */ + AcquireDDThreadLock(); + _SEH2_TRY { if (This!=NULL) @@ -208,30 +236,47 @@ { } _SEH2_END; + + /* Release the thread lock */ + ReleaseDDThreadLock(); + return Counter; } + HRESULT WINAPI Main_DirectDraw_Initialize (LPDDRAWI_DIRECTDRAW_INT This, LPGUID lpGUID) { return DDERR_ALREADYINITIALIZED; } -/* - * Main_DirectDraw_Compact - * ms say this one is not implement but it return DDERR_NOEXCLUSIVEMODE - * when no exclusive owner are set in corpativelevel - */ + +/*++ +* @name DDraw->Compact +* @implemented +* +* In exlusive mode the function DDraw->Compact returns DERR_NOEXCLUSIVEMODE, otherwise it returns DD_OK +* +* @return +* Returns only error code DD_OK or DERR_NOEXCLUSIVEMODE +* +* @remarks. +* Microsoft says Compact is not implemented in ddraw.dll, but it returns DDERR_NOEXCLUSIVEMODE or DD_OK +* +*--*/ HRESULT WINAPI Main_DirectDraw_Compact(LPDDRAWI_DIRECTDRAW_INT This) { HRESULT retVal = DD_OK; DX_WINDBG_trace(); - // EnterCriticalSection(&ddcs); - - _SEH2_TRY - { + + /* Lock the thread */ + AcquireDDThreadLock(); + + _SEH2_TRY + { + /* Check if Exclusive mode has been activated */ if (This->lpLcl->lpGbl->lpExclusiveOwner != This->lpLcl) { retVal = DDERR_NOEXCLUSIVEMODE; @@ -241,7 +286,10 @@ { } _SEH2_END; - // LeaveCriticalSection(&ddcs); + + /* Release the thread lock */ + ReleaseDDThreadLock(); + return retVal; } Modified: trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -17,7 +17,31 @@ DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) { - DX_STUB; + DX_WINDBG_trace(); + + if (lpBltData->dwFlags & DDBLT_COLORFILL) + { + HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); + FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + (CONST RECT *)&lpBltData->rDest, + hbr); + DeleteObject(hbr); + lpBltData->ddRVal = DD_OK; + } + else if (lpBltData->dwFlags & DDBLT_ROP) + { + BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rDest.top, + lpBltData->rDest.left, + lpBltData->rDest.right, + lpBltData->rDest.bottom, + (HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rSrc.top, + lpBltData->rSrc.right, + lpBltData->bltFX.dwROP); + lpBltData->ddRVal = DD_OK; + } + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) @@ -42,17 +66,105 @@ DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) { - DX_STUB; -} - + + HDC hDC; + HBITMAP hImage = NULL; + + LONG cbBuffer = 0; + LPDWORD pixels = NULL; + + HDC hMemDC = NULL; + HBITMAP hDCBmp = NULL; + BITMAP bm = {0}; + + DX_WINDBG_trace(); + + /* ToDo tell ddraw internal this surface is locked */ + /* ToDo add support for dwFlags */ + + + /* Get our hdc for the active window */ + hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + + if (hDC != NULL) + { + /* Create a memory bitmap to store a copy of current hdc surface */ + + if (!lpLockData->bHasRect) + { + hImage = CreateCompatibleBitmap (hDC, lpLockData->lpDDSurface->lpGbl->wWidth, lpLockData->lpDDSurface->lpGbl->wHeight); + } + else + { + hImage = CreateCompatibleBitmap (hDC, lpLockData->rArea.right, lpLockData->rArea.bottom); + } + + /* Create a memory hdc so we can draw on our current memory bitmap */ + hMemDC = CreateCompatibleDC(hDC); + + if (hMemDC != NULL) + { + /* Select our memory bitmap to our memory hdc */ + hDCBmp = (HBITMAP) SelectObject (hMemDC, hImage); + + /* Get our memory bitmap information */ + GetObject(hImage, sizeof(BITMAP), &bm); + + if (!lpLockData->bHasRect) + { + BitBlt (hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, hDC, 0, 0, SRCCOPY); + } + else + { + BitBlt (hMemDC, lpLockData->rArea.top, lpLockData->rArea.left, lpLockData->rArea.right, lpLockData->rArea.bottom, hDC, 0, 0, SRCCOPY); + } + + SelectObject (hMemDC, hDCBmp); + + /* Allocate memory buffer for the bitmap pixel data */ + cbBuffer = bm.bmWidthBytes * bm.bmHeight ; + pixels = (PDWORD) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbBuffer ); + + if (pixels != NULL) + { + /* Get the bitmap bits */ + GetBitmapBits(hImage,cbBuffer,pixels); + + /* Fixme HACK - check which member stores the HEL bitmap buffer */ + lpLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 = pixels; + + /* Setup return value */ + lpLockData->ddRVal = DD_OK; + lpLockData->lpSurfData = pixels; + } + } + } + + + /* Free the pixels buffer if we fail */ + if ( (pixels != NULL) && + (lpLockData->ddRVal != DD_OK) ) + { + HeapFree(GetProcessHeap(), 0, pixels ); + } + + /* Cleanup after us */ + if (hImage != NULL) + { + DeleteObject (hImage); + } + + if (hMemDC != NULL) + { + DeleteDC (hMemDC); + } + + return DDHAL_DRIVER_HANDLED; +} DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) { - /* - This api is not doucment by MS So I leave it - as stub. - */ - + /* This api is not doucmented by MS, keep it stubbed */ DX_STUB; } @@ -78,7 +190,64 @@ DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) { - DX_STUB; + HDC hDC; + HBITMAP hImage = NULL; + + HDC hMemDC = NULL; + HBITMAP hDCBmp = NULL; + BITMAP bm = {0}; + + DX_WINDBG_trace(); + + /* Get our hdc for the active window */ + hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); + + if (hDC != NULL) + { + /* Create a memory bitmap to store a copy of current hdc surface */ + + /* fixme the rcarea are not store in the struct yet so the data will look corupted */ + hImage = CreateCompatibleBitmap (hDC, lpUnLockData->lpDDSurface->lpGbl->wWidth, lpUnLockData->lpDDSurface->lpGbl->wHeight); + + /* Create a memory hdc so we can draw on our current memory bitmap */ + hMemDC = CreateCompatibleDC(hDC); + + if (hMemDC != NULL) + { + /* Select our memory bitmap to our memory hdc */ + hDCBmp = (HBITMAP) SelectObject (hMemDC, hImage); + + /* Get our memory bitmap information */ + GetObject(hImage, sizeof(BITMAP), &bm); + + SetBitmapBits(hImage,bm.bmWidthBytes * bm.bmHeight, lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2); + + BitBlt (hDC, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY); + + SelectObject (hMemDC, hDCBmp); + + /* Setup return value */ + lpUnLockData->ddRVal = DD_OK; + } + } + + /* Cleanup after us */ + if (hImage != NULL) + { + DeleteObject (hImage); + } + + if (hMemDC != NULL) + { + DeleteDC (hMemDC); + } + + if (lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 != NULL) + { + HeapFree(GetProcessHeap(), 0, lpUnLockData->lpDDSurface->lpSurfMore->lpDDRAWReserved2 ); + } + + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -35,7 +35,7 @@ DWORD count; HRESULT ret; - if(pDDraw->lpLcl->dwLocalFlags != DDRAWILCL_SETCOOPCALLED) + if((pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) { return DDERR_NOCOOPERATIVELEVELSET; } @@ -45,7 +45,7 @@ return CLASS_E_NOAGGREGATION; } - if(!pDDSD->dwFlags & DDSD_CAPS) + if(!(pDDSD->dwFlags & DDSD_CAPS)) { return DDERR_INVALIDPARAMS; } @@ -60,14 +60,14 @@ return DDERR_INVALIDCAPS; } - if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) - && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + if((!(pDDSD->dwFlags & DDSD_HEIGHT) || !(pDDSD->dwFlags & DDSD_WIDTH)) + && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; } - else if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwFlags & DDSD_HEIGHT - && pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + else if(((pDDSD->dwFlags & DDSD_HEIGHT) || (pDDSD->dwFlags & DDSD_WIDTH)) + && (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) { return DDERR_INVALIDPARAMS; } Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -272,129 +272,166 @@ return This->dwIntRefCnt; } + HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT rdst, - LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - - DDHAL_BLTDATA mDdBlt; - - DX_WINDBG_trace(); - - if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags - & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT) - { - return DDERR_GENERIC; - } - - ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); - ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); - - if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) - { - DX_STUB_str("DdResetVisrgn failed"); + LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) +{ + DDHAL_BLTDATA mDdBlt; + + DX_WINDBG_trace(); + + if (ThisDest == NULL) + { + return DDERR_INVALIDPARAMS; + } + + /* Zero out members in DDHAL_BLTDATA */ + ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); + ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); + + /* Check if we got HAL support for this api */ + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_BLT) == DDHAL_SURFCB32_BLT) + { + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; + } + /* Check if we got HEL support for this api */ + else if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_BLT) == DDHAL_SURFCB32_BLT) + { + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt; + } + + if (mDdBlt.Blt == NULL) + { + /* This API is unsupported */ + return DDERR_UNSUPPORTED; + } + + /* Prepare for draw, if we do not reset the DdResetVisrgn some graphics card will not draw on the screen */ + if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) + { + DX_STUB_str("DdResetVisrgn failed"); + } + + mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + /* Setup Src */ + if (( ThisSrc != NULL ) ) + { + + mDdBlt.lpDDSrcSurface = ThisSrc->lpLcl->lpSurfMore->slist[0]; + ThisSrc->lpLcl->lpSurfMore->slist[0]->hDC = ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + if (rsrc != NULL) + { + memmove(&mDdBlt.rSrc, rsrc, sizeof (RECTL)); + } + else + { + if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rSrc)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + + /* FIXME + * compare so we do not write too far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + } + + /* Setup dest */ + if (rdst != NULL) + { + memmove(&mDdBlt.rDest, rdst, sizeof (RECTL)); + } + else + { + if (!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rDest)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + + /* FIXME + * compare so we do not write too far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + + /* setup bltFX */ + if (lpbltfx != NULL) + { + memmove(&mDdBlt.bltFX, lpbltfx, sizeof (DDBLTFX)); + } + + /* setup value that are not config yet */ + mDdBlt.dwFlags = dwFlags; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + + /* FIXME + BltData.dwRectCnt + BltData.dwROPFlags + BltData.IsClipped + BltData.prDestRects + BltData.rOrigDest + BltData.rOrigSrc + BltData.ddRVal + */ + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + DX_STUB_str("mDdBlt DDHAL_DRIVER_HANDLED"); + return DDERR_NOBLTHW; } - mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; - mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; - - ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = - ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; - - /* Setup Src */ - if (ThisSrc != NULL) - { - mDdBlt.lpDDSrcSurface = ThisSrc->lpLcl->lpSurfMore->slist[0]; - - ThisSrc->lpLcl->lpSurfMore->slist[0]->hDC = - ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hDC; - - if (rsrc != NULL) - { - memmove(&mDdBlt.rSrc, rsrc, sizeof (RECTL)); - } - else - { - if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd, - (RECT *)&mDdBlt.rSrc)) - { - DX_STUB_str("GetWindowRect failed"); - } - } - - /* FIXME - * compare so we do not write to far - * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width - * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght - * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp - */ - - } - - /* Setup dest */ - if (rdst != NULL) - { - memmove(&mDdBlt.rDest, rdst, sizeof (RECTL)); - } - else - { - if(!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd, - (RECT *)&mDdBlt.rDest)) - { - DX_STUB_str("GetWindowRect failed"); - } - - } - - /* FIXME - * compare so we do not write to far - * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width - * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght - * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp - */ - - - /* setup bltFX */ - if (lpbltfx != NULL) - { - memmove(&mDdBlt.bltFX, lpbltfx, sizeof (DDBLTFX)); - } - - /* setup value that are not config yet */ - mDdBlt.dwFlags = dwFlags; - mDdBlt.IsClipped = FALSE; - mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); - - - /* FIXME - BltData.dwRectCnt - BltData.dwROPFlags - BltData.IsClipped - BltData.prDestRects - BltData.rOrigDest - BltData.rOrigSrc - BltData.ddRVal - */ - - if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) - { - DX_STUB_str("mDdBlt DDHAL_DRIVER_HANDLED"); - return DDERR_NOBLTHW; - } - - return mDdBlt.ddRVal; -} - - -HRESULT WINAPI -Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT prect, + return mDdBlt.ddRVal; +} + + +HRESULT WINAPI +Main_DDrawSurface_Lock (LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE events) { DDHAL_LOCKDATA mdLock; DX_WINDBG_trace(); - DX_WINDBG_trace_res( (DWORD)This->lpLcl->lpGbl->wWidth, (DWORD)This->lpLcl->lpGbl->wHeight, (DWORD)This->lpLcl->lpGbl->lPitch, (DWORD) 0); + DX_WINDBG_trace_res( (DWORD)ThisDest->lpLcl->lpGbl->wWidth, (DWORD)ThisDest->lpLcl->lpGbl->wHeight, (DWORD)ThisDest->lpLcl->lpGbl->lPitch, (DWORD) 0); + + /* Zero out members in DDHAL_LOCKDATA */ + ZeroMemory(&mdLock, sizeof(DDHAL_LOCKDATA)); + + /* Check if we got HAL support for this api */ + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) + { + mdLock.Lock = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Lock; + } + /* Check if we got HEL support for this api */ + else if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_LOCK) == DDHAL_SURFCB32_LOCK) + { + mdLock.Lock = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock; + } + + if (mdLock.Lock == NULL) + { + /* This api are unsupported */ + return DDERR_UNSUPPORTED; + } if (events != NULL) { @@ -415,20 +452,18 @@ //FIXME check if it primary or not and use primary or pixelformat data, at moment it is hardcode to primary - mdLock.ddRVal = DDERR_NOTPALETTIZED; - mdLock.Lock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Lock; + mdLock.ddRVal = DDERR_CANTLOCKSURFACE; mdLock.dwFlags = flags; - mdLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mdLock.lpDDSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + mdLock.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; mdLock.lpSurfData = NULL; - if (!DdResetVisrgn(This->lpLcl->lpSurfMore->slist[0], NULL)) + if (!DdResetVisrgn(ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) { DX_STUB_str("Here DdResetVisrgn lock"); - return DDERR_UNSUPPORTED; - } - + // return DDERR_UNSUPPORTED; + } if (mdLock.Lock(&mdLock)!= DDHAL_DRIVER_HANDLED) { @@ -460,11 +495,11 @@ pDDSD->lpSurface = (LPVOID) mdLock.lpSurfData; - pDDSD->dwHeight = This->lpLcl->lpGbl->wHeight; - pDDSD->dwWidth = This->lpLcl->lpGbl->wWidth; - - pDDSD->ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; - pDDSD->lPitch = This->lpLcl->lpGbl->lPitch; + pDDSD->dwHeight = ThisDest->lpLcl->lpGbl->wHeight; + pDDSD->dwWidth = ThisDest->lpLcl->lpGbl->wWidth; + + pDDSD->ddpfPixelFormat.dwRGBBitCount = ThisDest->lpLcl->lpGbl->lpDD->lpModeInfo->dwBPP;// .lpModeInfo->dwBPP; //This->lpLcl->lpGbl->lPitch/ 8; + pDDSD->lPitch = ThisDest->lpLcl->lpGbl->lPitch; pDDSD->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; } @@ -474,30 +509,45 @@ HRESULT WINAPI Main_DDrawSurface_Unlock (LPDDRAWI_DDRAWSURFACE_INT This, LPRECT pRect) { - DDHAL_UNLOCKDATA mdUnLock; - - DX_WINDBG_trace(); - - if (!(This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK)) - { - DX_STUB_str("DDERR_UNSUPPORTED"); - return DDERR_UNSUPPORTED; - } + DDHAL_UNLOCKDATA mdUnLock; + + DX_WINDBG_trace(); + + /* Zero out members in DDHAL_UNLOCKDATA */ + ZeroMemory(&mdUnLock, sizeof(DDHAL_UNLOCKDATA)); + + /* Check if we got HAL support for this api */ + if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Unlock; + } + /* Check if we got HEL support for this api */ + else if (( This->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_UNLOCK) == DDHAL_SURFCB32_UNLOCK) + { + mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Unlock; + } + + if (mdUnLock.Unlock == NULL) + { + /* This api are unsupported */ + return DDERR_UNSUPPORTED; + } mdUnLock.ddRVal = DDERR_NOTPALETTIZED; mdUnLock.lpDD = This->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; - mdUnLock.Unlock = This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->HALDDSurface.Unlock; + mdUnLock.lpDDSurface = This->lpLcl->lpSurfMore->slist[0]; if (!DdResetVisrgn( mdUnLock.lpDDSurface, NULL)) { - DX_STUB_str("DDERR_UNSUPPORTED"); - return DDERR_UNSUPPORTED; + DX_STUB_str("DdResetVisrgn fail"); + //return DDERR_UNSUPPORTED; /* this can fail */ } if (mdUnLock.Unlock(&mdUnLock)!= DDHAL_DRIVER_HANDLED) { - DX_STUB_str("unLock fail"); + DX_STUB_str("unLock fail"); return DDERR_UNSUPPORTED; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -8,6 +8,7 @@ #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> +#include <pseh/pseh.h> #include <pseh/pseh2.h> Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Sat Oct 24 16:09:48 2009 @@ -33,8 +33,8 @@ This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; - /* fixme linking too second link when we shall not doing it */ - if (IsBadReadPtr(This,sizeof(LPDIRECTDRAW))) + if ( (IsBadWritePtr(This,sizeof(LPDDRAWI_DIRECTDRAW_INT)) != 0) || + (IsBadWritePtr(This->lpLcl,sizeof(LPDDRAWI_DIRECTDRAW_LCL)) != 0) ) { /* We do not have a DirectDraw interface, we need alloc it*/ LPDDRAWI_DIRECTDRAW_INT memThis; @@ -190,9 +190,6 @@ ddgbl.lpDriverHandle = &ddgbl; ddgbl.hDDVxd = -1; - - - if (reenable == FALSE) { if ((!IsBadReadPtr(This->lpLink,sizeof(LPDIRECTDRAW))) && (This->lpLink == NULL)) @@ -236,8 +233,6 @@ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); RtlCopyMemory(&ddgbl.cDriverName,&"DISPLAY",7); dwFlags |= DDRAWI_DISPLAYDRV | DDRAWI_GDIDRV; - - } else if (lpGuid == (LPGUID) DDCREATE_HARDWAREONLY) { @@ -289,7 +284,6 @@ /* Startup HEL and HAL */ This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; This->lpLcl->dwProcessId = GetCurrentProcessId(); - switch (devicetypes) { case 2: @@ -305,6 +299,7 @@ default: hal_ret = StartDirectDrawHal(iface, reenable); hel_ret = StartDirectDrawHel(iface, reenable); + break; } if (hal_ret!=DD_OK) @@ -362,18 +357,30 @@ { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreateSurface = HelDdCreateSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreatePalette = HelDdCreatePalette; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.DestroyDriver = HelDdDestroyDriver; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.GetScanLine = HelDdGetScanLine; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetColorKey = HelDdSetColorKey; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetMode = HelDdSetMode; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; - - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | + if (reenable == FALSE) + { + if (ddgbl.lpDDCBtmp == NULL) + { + DxHeapMemAlloc(ddgbl.lpDDCBtmp, sizeof(DDHAL_CALLBACKS)); + if ( ddgbl.lpDDCBtmp == NULL) + { + return DD_FALSE; + } + } + } + + ddgbl.lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface; + ddgbl.lpDDCBtmp->HELDD.CreateSurface = HelDdCreateSurface; + ddgbl.lpDDCBtmp->HELDD.CreatePalette = HelDdCreatePalette; + ddgbl.lpDDCBtmp->HELDD.DestroyDriver = HelDdDestroyDriver; + ddgbl.lpDDCBtmp->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; + ddgbl.lpDDCBtmp->HELDD.GetScanLine = HelDdGetScanLine; + ddgbl.lpDDCBtmp->HELDD.SetColorKey = HelDdSetColorKey; + ddgbl.lpDDCBtmp->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; + ddgbl.lpDDCBtmp->HELDD.SetMode = HelDdSetMode; + ddgbl.lpDDCBtmp->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; + + ddgbl.lpDDCBtmp->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE | DDHAL_CB32_CREATEPALETTE | DDHAL_CB32_DESTROYDRIVER | @@ -384,23 +391,23 @@ DDHAL_CB32_SETMODE | DDHAL_CB32_WAITFORVERTICALBLANK ; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); - - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt = HelDdSurfBlt; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Flip = HelDdSurfFlip; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock = HelDdSurfLock; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.reserved4 = HelDdSurfreserved4; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetClipList = HelDdSurfSetClipList; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetPalette = HelDdSurfSetPalette; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Unlock = HelDdSurfUnlock; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | + ddgbl.lpDDCBtmp->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); + + ddgbl.lpDDCBtmp->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; + ddgbl.lpDDCBtmp->HELDDSurface.Blt = HelDdSurfBlt; + ddgbl.lpDDCBtmp->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; + ddgbl.lpDDCBtmp->HELDDSurface.Flip = HelDdSurfFlip; + ddgbl.lpDDCBtmp->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; + ddgbl.lpDDCBtmp->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; + ddgbl.lpDDCBtmp->HELDDSurface.Lock = HelDdSurfLock; + ddgbl.lpDDCBtmp->HELDDSurface.reserved4 = HelDdSurfreserved4; + ddgbl.lpDDCBtmp->HELDDSurface.SetClipList = HelDdSurfSetClipList; + ddgbl.lpDDCBtmp->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; + ddgbl.lpDDCBtmp->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; + ddgbl.lpDDCBtmp->HELDDSurface.SetPalette = HelDdSurfSetPalette; + ddgbl.lpDDCBtmp->HELDDSurface.Unlock = HelDdSurfUnlock; + ddgbl.lpDDCBtmp->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; + ddgbl.lpDDCBtmp->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | DDHAL_SURFCB32_BLT | DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_FLIP | @@ -415,7 +422,7 @@ DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_UPDATEOVERLAY; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); + ddgbl.lpDDCBtmp->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); /* This->lpLcl->lpDDCB->HELDDPalette.DestroyPalette = HelDdPalDestroyPalette;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs