Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[akhaldi] 58836: [IEFRAME] * Add the typelib related registration data. * Set the correct dependencies for the resource file.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 23 16:05:31 2013 New Revision: 58836 URL: http://svn.reactos.org/svn/reactos?rev=58836&view=rev Log: [IEFRAME] * Add the typelib related registration data. * Set the correct dependencies for the resource file. Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] Tue Apr 23 16:05:31 2013 @@ -35,7 +35,13 @@ endif() add_typelib(ieframe_v1.idl) -set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) + +list(APPEND ieframe_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/ieframe.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/ieframe_v1.rgs + ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) + +set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS "${ieframe_rc_deps}") # ieframe_v1.tlb needs stdole2.tlb add_dependencies(ieframe stdole2) Modified: trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe_v1.rgs [iso-8859-1] Tue Apr 23 16:05:31 2013 @@ -23,4 +23,276 @@ { CLSID = s '{FBF23B40-E3F0-101B-8488-00AA003E56F8}' } + NoRemove Typelib + { + NoRemove '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + { + '1.1' = s 'Microsoft Internet Controls' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B}' = s 'IWebBrowser' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{EAB22AC2-30C1-11CF-A7EB-0000C05BAE0B}' = s 'DWebBrowserEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{0002DF05-0000-0000-C000-000000000046}' = s 'IWebBrowserApp' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{D30C1661-CDAF-11D0-8A3E-00C04FC9E26E}' = s 'IWebBrowser2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{34A715A0-6587-11D0-924A-0020AFC7AC4D}' = s 'DWebBrowserEvents2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{FE4106E0-399A-11D0-A48C-00A0C90A8F39}' = s 'DShellWindowsEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{85CB6900-4D95-11CF-960C-0080C7F4EE85}' = s 'IShellWindows' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}' = s 'IShellUIHelper' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{A7FE6EDA-1932-4281-B881-87B31B8BC52C}' = s 'IShellUIHelper2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136806-B2DE-11D1-B9F2-00A0C98BC547}' = s 'DShellNameSpaceEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136804-B2DE-11D1-B9F2-00A0C98BC547}' = s 'IShellFavoritesNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{E572D3C9-37BE-4AE2-825D-D521763E3108}' = s 'IShellNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{F3470F24-15FD-11D2-BB2E-00805FF7EFCA}' = s 'IScriptErrorList' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{BA9239A4-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearch' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{47C922A2-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearches' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA1}' = s 'ISearchAssistantOC' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA2}' = s 'ISearchAssistantOC2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA3}' = s 'ISearchAssistantOC3' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{1611FDDA-445B-11D2-85DE-00C04FA35C89}' = s '_SearchAssistantEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + } + NoRemove CLSID + { + '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' = s 'Microsoft Web Browser Version 1' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{8856F961-340A-11D0-A96B-00C04FD705A2}' = s 'Microsoft Web Browser' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.2' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{0002DF01-0000-0000-C000-000000000046}' = s 'Internet Explorer(Ver 1.0)' + { + ProgId = s 'InternetExplorer.Application.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'InternetExplorer.Application' + } + '{9BA05972-F6A8-11CF-A442-00A0C90A8F39}' = s 'ShellWindows' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + } + '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' = s 'Microsoft Shell UI Helper' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.UIHelper.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.UIHelper' + } + '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + '{B45FF030-4447-11D2-85DE-00C04FA35C89}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + } + 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + CurVer = s 'Shell.Explorer.1' + } + 'Shell.Explorer.2' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + CurVer = s 'Shell.Explorer.2' + } + 'InternetExplorer.Application.1' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + } + 'InternetExplorer.Application' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + CurVer = s 'InternetExplorer.Application.1' + } + 'Shell.UIHelper.1' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + } + 'Shell.UIHelper' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + CurVer = s 'Shell.UIHelper.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } }

11 years, 4 months

[hbelusca] 58835: [KDCOM] Formatting change only (requested by Timo).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 23 00:48:49 2013 New Revision: 58835 URL: http://svn.reactos.org/svn/reactos?rev=58835&view=rev Log: [KDCOM] Formatting change only (requested by Timo). Modified: trunk/reactos/drivers/base/kddll/kdcom.c Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Tue Apr 23 00:48:49 2013 @@ -223,9 +223,14 @@ KdpPollByte(OUT PUCHAR OutByte) { /* Poll the byte */ - return (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS - ? KDP_PACKET_RECEIVED - : KDP_PACKET_TIMEOUT); + if (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS) + { + return KDP_PACKET_RECEIVED; + } + else + { + return KDP_PACKET_TIMEOUT; + } } KDP_STATUS @@ -233,9 +238,14 @@ KdpReceiveByte(OUT PUCHAR OutByte) { /* Get the byte */ - return (CpGetByte(&KdDebugComPort, OutByte, TRUE) == CP_GET_SUCCESS - ? KDP_PACKET_RECEIVED - : KDP_PACKET_TIMEOUT); + if (CpGetByte(&KdDebugComPort, OutByte, TRUE) == CP_GET_SUCCESS) + { + return KDP_PACKET_RECEIVED; + } + else + { + return KDP_PACKET_TIMEOUT; + } } KDP_STATUS

11 years, 4 months

[hbelusca] 58834: [KDCOM] - Use stdlib.h header instead of declaring the atol function's prototype (caught by Jérôme). - Clarify the loop in KdpSendPacket (by Timo). NOTE: I also noticed that it wa...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Apr 23 00:41:45 2013 New Revision: 58834 URL: http://svn.reactos.org/svn/reactos?rev=58834&view=rev Log: [KDCOM] - Use stdlib.h header instead of declaring the atol function's prototype (caught by Jérôme). - Clarify the loop in KdpSendPacket (by Timo). NOTE: I also noticed that it was not this loop-change that fixed reconnection (see commit message of r58823), but one of the changes of revision r58822 (certainly the one in the KdpReceiveByte function) (ironically I said "Seems to fix..." since I noticed that change of behaviour when I was trying to play with the code in KdpSendPacket with modifications of r58822, but I didn't notice that in fact it happened with changes of r58822. It is only today that I constated that, during a revert of r58823 + test + a remark from Timo). Modified: trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.c trunk/reactos/drivers/base/kddll/kdserial.c Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Tue Apr 23 00:41:45 2013 @@ -8,8 +8,7 @@ #include "kddll.h" #include <cportlib/cportlib.h> - -long atol(const char *str); +#include <stdlib.h> /* Serial debug connection */ Modified: trunk/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Tue Apr 23 00:41:45 2013 @@ -34,7 +34,10 @@ PUCHAR ByteBuffer = Buffer; ULONG Checksum = 0; - while (Length-- > 0) Checksum += (ULONG)*ByteBuffer++; + while (Length-- > 0) + { + Checksum += (ULONG)*ByteBuffer++; + } return Checksum; } @@ -335,18 +338,8 @@ Retries = KdContext->KdpDefaultRetries; - do + for (;;) { - if (Retries == 0) - { - /* PACKET_TYPE_KD_DEBUG_IO is allowed to instantly timeout */ - if (PacketType == PACKET_TYPE_KD_DEBUG_IO) - { - /* No response, silently fail. */ - return; - } - } - /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -357,7 +350,10 @@ KdpSendBuffer(MessageHeader->Buffer, MessageHeader->Length); /* If we have meesage data, also send it */ - if (MessageData) KdpSendBuffer(MessageData->Buffer, MessageData->Length); + if (MessageData) + { + KdpSendBuffer(MessageData->Buffer, MessageData->Length); + } /* Finalize with a trailing byte */ KdpSendByte(PACKET_TRAILING_BYTE); @@ -368,17 +364,37 @@ NULL, NULL, KdContext); - if (KdStatus == KDP_PACKET_TIMEOUT) - { - if (Retries > 0) Retries--; - } + + /* Did we succeed? */ + if (KdStatus == KDP_PACKET_RECEIVED) + { + /* Packet received, we can quit the loop */ + CurrentPacketId &= ~SYNC_PACKET_ID; + break; + } + else if (KdStatus == KDP_PACKET_TIMEOUT) + { + /* Timeout, decrement the retry count */ + if (Retries > 0) + Retries--; + + /* + * If the retry count reaches zero, bail out + * for packet types allowed to timeout. + */ + if (Retries == 0) + { + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + return; + } + } + } + // else (KdStatus == KDP_PACKET_RESEND) /* Resend the packet */ /* Packet timed out, send it again */ KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); - - } while (KdStatus != KDP_PACKET_RECEIVED); - - CurrentPacketId &= ~SYNC_PACKET_ID; + } } /* EOF */ Modified: trunk/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Tue Apr 23 00:41:45 2013 @@ -24,7 +24,10 @@ { PUCHAR ByteBuffer = Buffer; - while (Size-- > 0) KdpSendByte(*ByteBuffer++); + while (Size-- > 0) + { + KdpSendByte(*ByteBuffer++); + } } /****************************************************************************** @@ -49,7 +52,9 @@ { /* Try to get a byte from the port */ Status = KdpReceiveByte(&Byte); - if (Status != KDP_PACKET_RECEIVED) return Status; + if (Status != KDP_PACKET_RECEIVED) + return Status; + *ByteBuffer++ = Byte; }

11 years, 4 months

[pschweitzer] 58833: [NTOSKRNL] Properly handle (as Windows does) WC in case last dot was eaten in path name translation Fixes last FindFile failing tests

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Apr 22 19:36:33 2013 New Revision: 58833 URL: http://svn.reactos.org/svn/reactos?rev=58833&view=rev Log: [NTOSKRNL] Properly handle (as Windows does) WC in case last dot was eaten in path name translation Fixes last FindFile failing tests Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Mon Apr 22 19:36:33 2013 @@ -669,7 +669,7 @@ PFIND_DATA_HANDLE FindDataHandle; PFIND_FILE_DATA FindFileData; - UNICODE_STRING NtPath, FilePattern; + UNICODE_STRING NtPath, FilePattern, FileName; PWSTR NtPathBuffer; RTL_RELATIVE_NAME_U RelativePath; ULONG DeviceNameInfo = 0; @@ -678,6 +678,8 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; HANDLE hDirectory = NULL; + + BOOLEAN HadADot = FALSE; /* * May represent many FILE_BOTH_DIR_INFORMATION @@ -691,6 +693,12 @@ { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; + } + + RtlInitUnicodeString(&FileName, lpFileName); + if (FileName.Length != 0 && FileName.Buffer[FileName.Length / sizeof(WCHAR) - 1] == L'.') + { + HadADot = TRUE; } if (!RtlDosPathNameToNtPathName_U(lpFileName, @@ -856,6 +864,15 @@ PatternIndex++; } + + /* Handle partial wc if our last dot was eaten */ + if (HadADot) + { + if (FilePattern.Buffer[FilePattern.Length / sizeof(WCHAR) - 1] == L'*') + { + FilePattern.Buffer[FilePattern.Length / sizeof(WCHAR) - 1] = L'<'; + } + } } Status = NtQueryDirectoryFile(hDirectory,

11 years, 4 months

[tfaber] 58832: [NTDLL_APITEST] - Add test cases showing that RtlDosPathNameToNtPathName_U strips trailing dots

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Apr 22 19:09:12 2013 New Revision: 58832 URL: http://svn.reactos.org/svn/reactos?rev=58832&view=rev Log: [NTDLL_APITEST] - Add test cases showing that RtlDosPathNameToNtPathName_U strips trailing dots Modified: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c Modified: trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosPath… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosPathNameToNtPathName_U.c [iso-8859-1] Mon Apr 22 19:09:12 2013 @@ -395,6 +395,9 @@ test(PREP0 "C:\\foo\\..\\" , "C:\\" , NULL); test(PREP1 "C:\\foo\\..\\" , "C:\\" , NULL); test(PREP2 "C:\\foo\\..\\" , "C:\\foo\\..\\" , NULL); + test(PREP0 "C:\\foo." , "C:\\foo" , "foo"); + test(PREP1 "C:\\foo." , "C:\\foo" , "foo"); + test(PREP2 "C:\\foo." , "C:\\foo." , "foo."); test(PREP0 "C:\\f\\b\\.." , "C:\\f" , "f"); test(PREP1 "C:\\f\\b\\.." , "C:\\f" , "f");

11 years, 4 months

[gadamopoulos] 58831: [uxtheme] - Do not apply non client metrics defined in the theme, while applying the theme. This is now done by desk.cpl - Implement OpenThemeDataFromFile to let desk.cpl open...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Apr 22 16:46:43 2013 New Revision: 58831 URL: http://svn.reactos.org/svn/reactos?rev=58831&view=rev Log: [uxtheme] - Do not apply non client metrics defined in the theme, while applying the theme. This is now done by desk.cpl - Implement OpenThemeDataFromFile to let desk.cpl open a theme file and query the metrics stored in the theme file - Make use of the HTHEME hTheme parameter in GetThemeSysBool, GetThemeSysColor, GetThemeSysFont, GetThemeSysInt, GetThemeSysSize and GetThemeSysString Modified: trunk/reactos/dll/win32/uxtheme/metric.c trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/metric.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/metric.c [iso-8859-1] Mon Apr 22 16:46:43 2013 @@ -35,7 +35,9 @@ TRACE("(%p, %d)\n", hTheme, iBoolID); SetLastError(0); if(hTheme) { - if((tp = MSSTYLES_FindMetric(TMT_BOOL, iBoolID))) { + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; + + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_BOOL, iBoolID))) { hr = MSSTYLES_GetPropertyBool(tp, &ret); if(SUCCEEDED(hr)) return ret; @@ -62,10 +64,15 @@ HRESULT hr; PTHEME_PROPERTY tp; + // TODO: Check if this is correct + if ( iColorID >= 0 && iColorID < 32) + iColorID += TMT_SCROLLBAR; + TRACE("(%p, %d)\n", hTheme, iColorID); SetLastError(0); if(hTheme) { - if((tp = MSSTYLES_FindMetric(TMT_COLOR, iColorID))) { + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_COLOR, iColorID))) { COLORREF color; hr = MSSTYLES_GetPropertyColor(tp, &color); if(SUCCEEDED(hr)) @@ -96,7 +103,8 @@ TRACE("(%p, %d)\n", hTheme, iFontID); if(hTheme) { - if((tp = MSSTYLES_FindMetric(TMT_FONT, iFontID))) { + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_FONT, iFontID))) { HDC hdc = GetDC(NULL); hr = MSSTYLES_GetPropertyFont(tp, hdc, plf); ReleaseDC(NULL, hdc); @@ -134,6 +142,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue) { PTHEME_PROPERTY tp; + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; TRACE("(%p, %d)\n", hTheme, iIntID); if(!hTheme) @@ -142,7 +151,7 @@ WARN("Unknown IntID: %d\n", iIntID); return STG_E_INVALIDPARAMETER; } - if((tp = MSSTYLES_FindMetric(TMT_INT, iIntID))) + if((tp = MSSTYLES_FindMetric(ptc->tf , TMT_INT, iIntID))) return MSSTYLES_GetPropertyInt(tp, piValue); return E_PROP_ID_UNSUPPORTED; } @@ -168,6 +177,8 @@ }; if(hTheme) { + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; + for(i=0; i<sizeof(metricMap)/sizeof(metricMap[0]); i+=2) { if(metricMap[i] == iSizeID) { id = metricMap[i+1]; @@ -176,7 +187,7 @@ } SetLastError(0); if(id != -1) { - if((tp = MSSTYLES_FindMetric(TMT_SIZE, id))) { + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_SIZE, id))) { if(SUCCEEDED(MSSTYLES_GetPropertyInt(tp, &i))) { return i; } @@ -188,6 +199,12 @@ return 0; } } + + + // TODO: Check if this is correct + // In windows for SM_CXFRAME this function returns what seems to be the non client metric iBorderWidth + if (iSizeID == SM_CXFRAME) + return GetSystemMetrics(SM_CXFRAME) - GetSystemMetrics(SM_CXDLGFRAME); return GetSystemMetrics(iSizeID); } @@ -198,6 +215,7 @@ LPWSTR pszStringBuff, int cchMaxStringChars) { PTHEME_PROPERTY tp; + PTHEME_CLASS ptc = (PTHEME_CLASS) hTheme; TRACE("(%p, %d)\n", hTheme, iStringID); if(!hTheme) @@ -206,7 +224,7 @@ WARN("Unknown StringID: %d\n", iStringID); return STG_E_INVALIDPARAMETER; } - if((tp = MSSTYLES_FindMetric(TMT_STRING, iStringID))) + if((tp = MSSTYLES_FindMetric(ptc->tf, TMT_STRING, iStringID))) return MSSTYLES_GetPropertyString(tp, pszStringBuff, cchMaxStringChars); return E_PROP_ID_UNSUPPORTED; } Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Mon Apr 22 16:46:43 2013 @@ -30,7 +30,6 @@ static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); -static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern HINSTANCE hDllInst; @@ -41,8 +40,6 @@ static const WCHAR szThemesIniResource[] = { 't','h','e','m','e','s','_','i','n','i','\0' }; - -static PTHEME_FILE tfActiveTheme; /***********************************************************************/ @@ -214,21 +211,13 @@ } /*********************************************************************** - * MSSTYLES_SetActiveTheme - * - * Set the current active theme - */ -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics) -{ - if(tfActiveTheme) - MSSTYLES_CloseThemeFile(tfActiveTheme); - tfActiveTheme = tf; - if (tfActiveTheme) - { - tfActiveTheme->dwRefCount++; - if(!tfActiveTheme->classes) - MSSTYLES_ParseThemeIni(tfActiveTheme, setMetrics); - } + * MSSTYLES_ReferenceTheme + * + * Increase the reference count of the theme file + */ +HRESULT MSSTYLES_ReferenceTheme(PTHEME_FILE tf) +{ + tf->dwRefCount++; return S_OK; } @@ -545,7 +534,7 @@ } /*********************************************************************** - * MSSTYLES_FFindMetric + * MSSTYLES_FindMetric * * Find a metric property for a theme file * @@ -557,28 +546,9 @@ * RETURNS * The property found, or NULL */ -static inline PTHEME_PROPERTY MSSTYLES_FFindMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId) +PTHEME_PROPERTY MSSTYLES_FindMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId) { return MSSTYLES_LFindProperty(tf->metrics, iPropertyPrimitive, iPropertyId); -} - -/*********************************************************************** - * MSSTYLES_FindMetric - * - * Find a metric property for the current installed theme - * - * PARAMS - * tf Theme file - * iPropertyPrimitive Type of value expected - * iPropertyId ID of the required value - * - * RETURNS - * The property found, or NULL - */ -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) -{ - if(!tfActiveTheme) return NULL; - return MSSTYLES_FFindMetric(tfActiveTheme, iPropertyPrimitive, iPropertyId); } /*********************************************************************** @@ -639,7 +609,7 @@ */ static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) { - PTHEME_PROPERTY cur = MSSTYLES_FFindMetric(tf, iPropertyPrimitive, iPropertyId); + PTHEME_PROPERTY cur = MSSTYLES_FindMetric(tf, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ if(cur) return cur; @@ -656,185 +626,6 @@ return cur; } -/* Color-related state for theme ini parsing */ -struct PARSECOLORSTATE -{ - int colorCount; - int colorElements[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - COLORREF colorRgb[TMT_LASTCOLOR-TMT_FIRSTCOLOR]; - int captionColors; -}; - -static inline void parse_init_color (struct PARSECOLORSTATE* state) -{ - memset (state, 0, sizeof (*state)); -} - -static BOOL parse_handle_color_property (struct PARSECOLORSTATE* state, - int iPropertyId, LPCWSTR lpValue, - DWORD dwValueLen) -{ - int r,g,b; - LPCWSTR lpValueEnd = lpValue + dwValueLen; - if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &r) && - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &g) && - MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &b)) { - state->colorElements[state->colorCount] = iPropertyId - TMT_FIRSTCOLOR; - state->colorRgb[state->colorCount++] = RGB(r,g,b); - switch (iPropertyId) - { - case TMT_ACTIVECAPTION: - state->captionColors |= 0x1; - break; - case TMT_INACTIVECAPTION: - state->captionColors |= 0x2; - break; - case TMT_GRADIENTACTIVECAPTION: - state->captionColors |= 0x4; - break; - case TMT_GRADIENTINACTIVECAPTION: - state->captionColors |= 0x8; - break; - } - return TRUE; - } - else { - return FALSE; - } -} - -static void parse_apply_color (struct PARSECOLORSTATE* state) -{ - if (state->colorCount > 0) - SetSysColors(state->colorCount, state->colorElements, state->colorRgb); - if (state->captionColors == 0xf) - SystemParametersInfoW (SPI_SETGRADIENTCAPTIONS, 0, (PVOID)TRUE, 0); -} - -/* Non-client-metrics-related state for theme ini parsing */ -struct PARSENONCLIENTSTATE -{ - NONCLIENTMETRICSW metrics; - BOOL metricsDirty; - LOGFONTW iconTitleFont; -}; - -static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) -{ - memset (state, 0, sizeof (*state)); - state->metrics.cbSize = sizeof (NONCLIENTMETRICSW); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW), - &state->metrics, 0); - SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW), - &state->iconTitleFont, 0); -} - -static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state, - int iPropertyId, LPCWSTR lpValue, - DWORD dwValueLen) -{ - LOGFONTW font; - - memset (&font, 0, sizeof (font)); - if (SUCCEEDED (MSSTYLES_GetFont (lpValue, lpValue + dwValueLen, &lpValue, - &font))) - { - switch (iPropertyId) - { - case TMT_CAPTIONFONT: - state->metrics.lfCaptionFont = font; - state->metricsDirty = TRUE; - break; - case TMT_SMALLCAPTIONFONT: - state->metrics.lfSmCaptionFont = font; - state->metricsDirty = TRUE; - break; - case TMT_MENUFONT: - state->metrics.lfMenuFont = font; - state->metricsDirty = TRUE; - break; - case TMT_STATUSFONT: - state->metrics.lfStatusFont = font; - state->metricsDirty = TRUE; - break; - case TMT_MSGBOXFONT: - state->metrics.lfMessageFont = font; - state->metricsDirty = TRUE; - break; - case TMT_ICONTITLEFONT: - state->iconTitleFont = font; - state->metricsDirty = TRUE; - break; - } - return TRUE; - } - else - return FALSE; -} - -static BOOL parse_handle_nonclient_size (struct PARSENONCLIENTSTATE* state, - int iPropertyId, LPCWSTR lpValue, - DWORD dwValueLen) -{ - int size; - LPCWSTR lpValueEnd = lpValue + dwValueLen; - if(MSSTYLES_GetNextInteger(lpValue, lpValueEnd, &lpValue, &size)) { - switch (iPropertyId) - { - case TMT_SIZINGBORDERWIDTH: - state->metrics.iBorderWidth = size; - state->metricsDirty = TRUE; - break; - case TMT_SCROLLBARWIDTH: - state->metrics.iScrollWidth = size; - state->metricsDirty = TRUE; - break; - case TMT_SCROLLBARHEIGHT: - state->metrics.iScrollHeight = size; - state->metricsDirty = TRUE; - break; - case TMT_CAPTIONBARWIDTH: - state->metrics.iCaptionWidth = size; - state->metricsDirty = TRUE; - break; - case TMT_CAPTIONBARHEIGHT: - state->metrics.iCaptionHeight = size; - state->metricsDirty = TRUE; - break; - case TMT_SMCAPTIONBARWIDTH: - state->metrics.iSmCaptionWidth = size; - state->metricsDirty = TRUE; - break; - case TMT_SMCAPTIONBARHEIGHT: - state->metrics.iSmCaptionHeight = size; - state->metricsDirty = TRUE; - break; - case TMT_MENUBARWIDTH: - state->metrics.iMenuWidth = size; - state->metricsDirty = TRUE; - break; - case TMT_MENUBARHEIGHT: - state->metrics.iMenuHeight = size; - state->metricsDirty = TRUE; - break; - } - return TRUE; - } - else - return FALSE; -} - -static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) -{ - if (state->metricsDirty) - { - SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics), - &state->metrics, 0); - SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont), - &state->iconTitleFont, 0); - } -} - /*********************************************************************** * MSSTYLES_ParseThemeIni * @@ -843,7 +634,7 @@ * PARAMS * tf Theme to parse */ -static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics) +void MSSTYLES_ParseThemeIni(PTHEME_FILE tf) { static const WCHAR szSysMetrics[] = {'S','y','s','M','e','t','r','i','c','s','\0'}; static const WCHAR szGlobals[] = {'g','l','o','b','a','l','s','\0'}; @@ -863,73 +654,50 @@ DWORD dwValueLen; LPCWSTR lpValue; + if(tf->classes) + return; + ini = MSSTYLES_GetActiveThemeIni(tf); - while((lpName=UXINI_GetNextSection(ini, &dwLen))) { - if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, lpName, dwLen, szSysMetrics, -1) == CSTR_EQUAL) { - struct PARSECOLORSTATE colorState; - struct PARSENONCLIENTSTATE nonClientState; - - parse_init_color (&colorState); - parse_init_nonclient (&nonClientState); - - while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { + while((lpName=UXINI_GetNextSection(ini, &dwLen))) + { + if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, lpName, dwLen, szSysMetrics, -1) == CSTR_EQUAL) + { + while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) + { lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); - if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) { - if(iPropertyId >= TMT_FIRSTCOLOR && iPropertyId <= TMT_LASTCOLOR) { - if (!parse_handle_color_property (&colorState, iPropertyId, - lpValue, dwValueLen)) - FIXME("Invalid color value for %s\n", - debugstr_w(szPropertyName)); - } - else if (setMetrics && (iPropertyId == TMT_FLATMENUS)) { - BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't'); - SystemParametersInfoW (SPI_SETFLATMENU, 0, (PVOID)(INT_PTR)flatMenus, 0); - } - else if ((iPropertyId >= TMT_FIRSTFONT) - && (iPropertyId <= TMT_LASTFONT)) - { - if (!parse_handle_nonclient_font (&nonClientState, - iPropertyId, lpValue, dwValueLen)) - FIXME("Invalid font value for %s\n", - debugstr_w(szPropertyName)); - } - else if ((iPropertyId >= TMT_FIRSTSIZE) - && (iPropertyId <= TMT_LASTSIZE)) - { - if (!parse_handle_nonclient_size (&nonClientState, - iPropertyId, lpValue, dwValueLen)) - FIXME("Invalid size value for %s\n", - debugstr_w(szPropertyName)); - } - /* Catch all metrics, including colors */ - MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen); + if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) + { + /* Catch all metrics, including colors */ + MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen); } - else { + else + { TRACE("Unknown system metric %s\n", debugstr_w(szPropertyName)); } } - if (setMetrics) + continue; + } + + if(MSSTYLES_ParseIniSectionName(lpName, dwLen, szAppName, szClassName, &iPartId, &iStateId)) + { + BOOL isGlobal = FALSE; + if(!lstrcmpiW(szClassName, szGlobals)) { - parse_apply_color (&colorState); - parse_apply_nonclient (&nonClientState); - } - continue; - } - if(MSSTYLES_ParseIniSectionName(lpName, dwLen, szAppName, szClassName, &iPartId, &iStateId)) { - BOOL isGlobal = FALSE; - if(!lstrcmpiW(szClassName, szGlobals)) { isGlobal = TRUE; } cls = MSSTYLES_AddClass(tf, szAppName, szClassName); ps = MSSTYLES_AddPartState(cls, iPartId, iStateId); - while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) { + while((lpName=UXINI_GetNextValue(ini, &dwLen, &lpValue, &dwValueLen))) + { lstrcpynW(szPropertyName, lpName, min(dwLen+1, sizeof(szPropertyName)/sizeof(szPropertyName[0]))); - if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) { + if(MSSTYLES_LookupProperty(szPropertyName, &iPropertyPrimitive, &iPropertyId)) + { MSSTYLES_AddProperty(ps, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen, isGlobal); } - else { + else + { TRACE("Unknown property %s\n", debugstr_w(szPropertyName)); } } @@ -939,19 +707,25 @@ /* App/Class combos override values defined by the base class, map these overrides */ globals = MSSTYLES_FindClass(tf, NULL, szGlobals); cls = tf->classes; - while(cls) { - if(*cls->szAppName) { + while(cls) + { + if(*cls->szAppName) + { cls->overrides = MSSTYLES_FindClass(tf, NULL, cls->szClassName); - if(!cls->overrides) { + if(!cls->overrides) + { TRACE("No overrides found for app %s class %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName)); } - else { + else + { cls->overrides = globals; } } - else { + else + { /* Everything overrides globals..except globals */ - if(cls != globals) cls->overrides = globals; + if(cls != globals) + cls->overrides = globals; } cls = cls->next; } @@ -972,7 +746,7 @@ * to a particular application * pszClassList List of requested classes, semicolon delimited */ -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) +PTHEME_CLASS MSSTYLES_OpenThemeClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassList) { PTHEME_CLASS cls = NULL; WCHAR szClassName[MAX_THEME_CLASS_NAME]; @@ -980,12 +754,8 @@ LPCWSTR end; DWORD len; - if(!tfActiveTheme) { - TRACE("there is no active theme\n"); + if(!tf->classes) { return NULL; - } - if(!tfActiveTheme->classes) { - return NULL; } start = pszClassList; @@ -993,16 +763,16 @@ len = end-start; lstrcpynW(szClassName, start, min(len+1, sizeof(szClassName)/sizeof(szClassName[0]))); start = end+1; - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + cls = MSSTYLES_FindClass(tf, pszAppName, szClassName); if(cls) break; } if(!cls && *start) { lstrcpynW(szClassName, start, sizeof(szClassName)/sizeof(szClassName[0])); - cls = MSSTYLES_FindClass(tfActiveTheme, pszAppName, szClassName); + cls = MSSTYLES_FindClass(tf, pszAppName, szClassName); } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); - cls->tf = tfActiveTheme; + cls->tf = tf; cls->tf->dwRefCount++; } return cls; Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Mon Apr 22 16:46:43 2013 @@ -51,9 +51,8 @@ ATOM atWndContrext; static BOOL bThemeActive = FALSE; -static WCHAR szCurrentTheme[MAX_PATH]; -static WCHAR szCurrentColor[64]; -static WCHAR szCurrentSize[64]; + +static PTHEME_FILE ActiveThemeFile; /***********************************************************************/ @@ -128,6 +127,19 @@ return dwRet; } +static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +{ + if(ActiveThemeFile) + MSSTYLES_CloseThemeFile(ActiveThemeFile); + ActiveThemeFile = tf; + if (ActiveThemeFile) + { + MSSTYLES_ReferenceTheme(ActiveThemeFile); + MSSTYLES_ParseThemeIni(ActiveThemeFile); + } + return S_OK; +} + /*********************************************************************** * UXTHEME_LoadTheme * @@ -140,6 +152,9 @@ HRESULT hr; WCHAR tmp[10]; PTHEME_FILE pt; + WCHAR szCurrentTheme[MAX_PATH]; + WCHAR szCurrentColor[64]; + WCHAR szCurrentSize[64]; if(bLoad == TRUE) { @@ -180,23 +195,17 @@ &pt); if(FAILED(hr)) { bThemeActive = FALSE; - szCurrentTheme[0] = '\0'; - szCurrentColor[0] = '\0'; - szCurrentSize[0] = '\0'; } else { - /* Make sure the global color & size match the theme */ - lstrcpynW(szCurrentColor, pt->pszSelectedColor, sizeof(szCurrentColor)/sizeof(szCurrentColor[0])); - lstrcpynW(szCurrentSize, pt->pszSelectedSize, sizeof(szCurrentSize)/sizeof(szCurrentSize[0])); - - MSSTYLES_SetActiveTheme(pt, FALSE); TRACE("Theme active: %s %s %s\n", debugstr_w(szCurrentTheme), debugstr_w(szCurrentColor), debugstr_w(szCurrentSize)); + + UXTHEME_SetActiveTheme(pt); MSSTYLES_CloseThemeFile(pt); } } if(!bThemeActive) { - MSSTYLES_SetActiveTheme(NULL, FALSE); + UXTHEME_SetActiveTheme(NULL); TRACE("Theming not active\n"); } } @@ -453,32 +462,26 @@ } /*********************************************************************** - * UXTHEME_SetActiveTheme + * UXTHEME_ApplyTheme * * Change the current active theme */ -static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) +static HRESULT UXTHEME_ApplyTheme(PTHEME_FILE tf) { HKEY hKey; WCHAR tmp[2]; HRESULT hr; if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); - hr = MSSTYLES_SetActiveTheme(tf, TRUE); + hr = UXTHEME_SetActiveTheme(tf); if(FAILED(hr)) return hr; if(tf) { bThemeActive = TRUE; - lstrcpynW(szCurrentTheme, tf->szThemeFile, sizeof(szCurrentTheme)/sizeof(szCurrentTheme[0])); - lstrcpynW(szCurrentColor, tf->pszSelectedColor, sizeof(szCurrentColor)/sizeof(szCurrentColor[0])); - lstrcpynW(szCurrentSize, tf->pszSelectedSize, sizeof(szCurrentSize)/sizeof(szCurrentSize[0])); } else { UXTHEME_RestoreSystemMetrics(); bThemeActive = FALSE; - szCurrentTheme[0] = '\0'; - szCurrentColor[0] = '\0'; - szCurrentSize[0] = '\0'; } TRACE("Writing theme config to registry\n"); @@ -487,12 +490,12 @@ tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); if(bThemeActive) { - RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor, - (lstrlenW(szCurrentColor)+1)*sizeof(WCHAR)); - RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize, - (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); - RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme, - (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)tf->pszSelectedColor, + (lstrlenW(tf->pszSelectedColor)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)tf->pszSelectedSize, + (lstrlenW(tf->pszSelectedSize)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)tf->szThemeFile, + (lstrlenW(tf->szThemeFile)+1)*sizeof(WCHAR)); } else { RegDeleteValueW(hKey, szColorName); @@ -619,10 +622,8 @@ return NULL; } -/*********************************************************************** - * OpenThemeDataEx (UXTHEME.61) - */ -HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) +static HTHEME WINAPI +OpenThemeDataInternal(PTHEME_FILE ThemeFile, HWND hwnd, LPCWSTR pszClassList, DWORD flags) { WCHAR szAppBuff[256]; WCHAR szClassBuff[256]; @@ -649,7 +650,7 @@ pszUseClassList = pszClassList; if (pszUseClassList) - hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + hTheme = MSSTYLES_OpenThemeClass(ThemeFile, pszAppName, pszUseClassList); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); @@ -657,9 +658,24 @@ return hTheme; } +/*********************************************************************** + * OpenThemeDataEx (UXTHEME.61) + */ +HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) +{ + return OpenThemeDataInternal(ActiveThemeFile, hwnd, pszClassList, flags); +} + +/*********************************************************************** + * OpenThemeDataEx (UXTHEME.16) + */ HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, HWND hwnd, LPCWSTR pszClassList, DWORD flags) { - return S_OK; + PTHEME_FILE ThemeFile = (PTHEME_FILE)hThemeFile; + + MSSTYLES_ParseThemeIni(ThemeFile); + + return OpenThemeDataInternal(ThemeFile, hwnd, pszClassList, flags); } /*********************************************************************** @@ -667,7 +683,7 @@ */ HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist) { - return OpenThemeDataEx(hwnd, classlist, 0); + return OpenThemeDataInternal(ActiveThemeFile, hwnd, classlist, 0); } /*********************************************************************** @@ -720,11 +736,35 @@ LPWSTR pszColorBuff, int cchMaxColorChars, LPWSTR pszSizeBuff, int cchMaxSizeChars) { - if(!bThemeActive) - return E_PROP_ID_UNSUPPORTED; - if(pszThemeFileName) lstrcpynW(pszThemeFileName, szCurrentTheme, dwMaxNameChars); - if(pszColorBuff) lstrcpynW(pszColorBuff, szCurrentColor, cchMaxColorChars); - if(pszSizeBuff) lstrcpynW(pszSizeBuff, szCurrentSize, cchMaxSizeChars); + int cchar; + + if(ActiveThemeFile == NULL) + return E_PROP_ID_UNSUPPORTED; + + if(pszThemeFileName) + { + cchar = lstrlenW(ActiveThemeFile->szThemeFile) + 1; + if(cchar > dwMaxNameChars) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + lstrcpynW(pszThemeFileName, ActiveThemeFile->szThemeFile, cchar); + } + + if(pszColorBuff) + { + cchar = lstrlenW(ActiveThemeFile->pszSelectedColor) + 1; + if(cchar > cchMaxColorChars) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + lstrcpynW(pszColorBuff, ActiveThemeFile->pszSelectedColor, cchar); + } + + if(pszSizeBuff) + { + cchar = lstrlenW(ActiveThemeFile->pszSelectedSize) + 1; + if(cchar > cchMaxSizeChars) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + lstrcpynW(pszSizeBuff, ActiveThemeFile->pszSelectedSize, cchar); + } + return S_OK; } @@ -936,7 +976,7 @@ { HRESULT hr; TRACE("(%p,%s,%p)\n", hThemeFile, unknown, hWnd); - hr = UXTHEME_SetActiveTheme(hThemeFile); + hr = UXTHEME_ApplyTheme(hThemeFile); UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); return hr; } @@ -1229,6 +1269,6 @@ PNONCLIENTMETRICSW pncMetrics, COLORREF* lpaRgbValues) { - return S_OK; -} - + return E_NOTIMPL; +} + Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Mon Apr 22 16:46:43 2013 @@ -79,18 +79,20 @@ typedef struct _UXINI_FILE *PUXINI_FILE; -HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); -void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); -HRESULT MSSTYLES_SetActiveTheme(PTHEME_FILE tf, BOOL setMetrics); -PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList); -HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwId); BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue); BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId); + +HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); +HRESULT MSSTYLES_ReferenceTheme(PTHEME_FILE tf); +void MSSTYLES_CloseThemeFile(PTHEME_FILE tf); +void MSSTYLES_ParseThemeIni(PTHEME_FILE tf); +PTHEME_CLASS MSSTYLES_OpenThemeClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassList); +HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc); PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); -PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId); +PTHEME_PROPERTY MSSTYLES_FindMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId); HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal);

11 years, 4 months

[pschweitzer] 58830: [NTOSKRNL] Erratum for r58810. Forgot to change that if...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Apr 22 16:21:10 2013 New Revision: 58830 URL: http://svn.reactos.org/svn/reactos?rev=58830&view=rev Log: [NTOSKRNL] Erratum for r58810. Forgot to change that if... Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Apr 22 16:21:10 2013 @@ -179,8 +179,7 @@ ExpressionPosition++; } /* Check cases that eat one char */ - else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM)) { NamePosition++; ExpressionPosition++;

11 years, 4 months

[akhaldi] 58829: [HHCTRL.OCX][IEFRAME] * Add missing stdole2 dependency. CORE-7087

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 22 15:21:38 2013 New Revision: 58829 URL: http://svn.reactos.org/svn/reactos?rev=58829&view=rev Log: [HHCTRL.OCX][IEFRAME] * Add missing stdole2 dependency. CORE-7087 Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt trunk/reactos/dll/win32/ieframe/CMakeLists.txt Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Mon Apr 22 15:21:38 2013 @@ -20,6 +20,10 @@ add_typelib(hhctrl_tlb.idl) set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/hhctrl_tlb.tlb) + +# hhctrl_tlb.tlb needs stdole2.tlb +add_dependencies(hhctrl stdole2) + set_module_type(hhctrl win32ocx) target_link_libraries(hhctrl uuid wine itss_guid) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] Mon Apr 22 15:21:38 2013 @@ -36,6 +36,10 @@ add_typelib(ieframe_v1.idl) set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) + +# ieframe_v1.tlb needs stdole2.tlb +add_dependencies(ieframe stdole2) + set_module_type(ieframe win32dll) target_link_libraries(ieframe uuid wine) add_importlibs(ieframe urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)

11 years, 4 months

[gadamopoulos] 58828: [desk.cpl] - Draw the classic theme preview if drawing the visual styles preview failed

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Apr 22 13:02:48 2013 New Revision: 58828 URL: http://svn.reactos.org/svn/reactos?rev=58828&view=rev Log: [desk.cpl] - Draw the classic theme preview if drawing the visual styles preview failed Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Mon Apr 22 13:02:48 2013 @@ -15,19 +15,20 @@ static void AppearancePage_UpdateThemePreview(HWND hwndDlg, GLOBALS *g) { - if (g->ActiveTheme.ThemeActive == FALSE) - { - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Scheme); - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SET_HDC_PREVIEW, 0, 0); - } - else + if (g->ActiveTheme.ThemeActive) { RECT rcWindow; + GetClientRect(GetDlgItem(hwndDlg, IDC_APPEARANCE_PREVIEW), &rcWindow); - DrawThemePreview(g->hdcThemePreview, &g->Scheme, &g->ActiveTheme, &rcWindow); - - SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SET_HDC_PREVIEW, 0, (LPARAM)g->hdcThemePreview); - } + if (DrawThemePreview(g->hdcThemePreview, &g->Scheme, &g->ActiveTheme, &rcWindow)) + { + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SET_HDC_PREVIEW, 0, (LPARAM)g->hdcThemePreview); + return; + } + } + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Scheme); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_SET_HDC_PREVIEW, 0, 0); } static void

11 years, 4 months

[akhaldi] 58827: [SHDOCVW] * Add the shdocvw_v1.idl TYPELIB and WINE_REGISTRY resources.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 22 11:33:48 2013 New Revision: 58827 URL: http://svn.reactos.org/svn/reactos?rev=58827&view=rev Log: [SHDOCVW] * Add the shdocvw_v1.idl TYPELIB and WINE_REGISTRY resources. Added: trunk/reactos/dll/win32/shdocvw/shdocvw_v1.rgs (with props) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/shdocvw.rc Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Mon Apr 22 11:33:48 2013 @@ -12,7 +12,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) - add_typelib(shdocvw_v1.idl) set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb) add_library(shdocvw SHARED ${SOURCE} shdocvw.rc) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rc [iso-8859-1] Mon Apr 22 11:33:48 2013 @@ -18,6 +18,10 @@ #include <windef.h> +1 WINE_REGISTRY shdocvw_v1.rgs + +1 TYPELIB shdocvw_v1.tlb + LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine core dll" Added: trunk/reactos/dll/win32/shdocvw/shdocvw_v1.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_v1.rgs (added) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_v1.rgs [iso-8859-1] Mon Apr 22 11:33:48 2013 @@ -1,0 +1,275 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + { + '1.1' = s 'Microsoft Internet Controls' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B}' = s 'IWebBrowser' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{EAB22AC2-30C1-11CF-A7EB-0000C05BAE0B}' = s 'DWebBrowserEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{0002DF05-0000-0000-C000-000000000046}' = s 'IWebBrowserApp' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{D30C1661-CDAF-11D0-8A3E-00C04FC9E26E}' = s 'IWebBrowser2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{34A715A0-6587-11D0-924A-0020AFC7AC4D}' = s 'DWebBrowserEvents2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{FE4106E0-399A-11D0-A48C-00A0C90A8F39}' = s 'DShellWindowsEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{85CB6900-4D95-11CF-960C-0080C7F4EE85}' = s 'IShellWindows' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{729FE2F8-1EA8-11D1-8F85-00C04FC2FBE1}' = s 'IShellUIHelper' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{A7FE6EDA-1932-4281-B881-87B31B8BC52C}' = s 'IShellUIHelper2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136806-B2DE-11D1-B9F2-00A0C98BC547}' = s 'DShellNameSpaceEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{55136804-B2DE-11D1-B9F2-00A0C98BC547}' = s 'IShellFavoritesNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{E572D3C9-37BE-4AE2-825D-D521763E3108}' = s 'IShellNameSpace' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{F3470F24-15FD-11D2-BB2E-00805FF7EFCA}' = s 'IScriptErrorList' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{BA9239A4-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearch' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{47C922A2-3DD5-11D2-BF8B-00C04FB93661}' = s 'ISearches' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA1}' = s 'ISearchAssistantOC' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA2}' = s 'ISearchAssistantOC2' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{72423E8F-8011-11D2-BE79-00A0C9A83DA3}' = s 'ISearchAssistantOC3' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + '{1611FDDA-445B-11D2-85DE-00C04FA35C89}' = s '_SearchAssistantEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' { val Version = s '1.1' } + } + } + NoRemove CLSID + { + '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' = s 'Microsoft Web Browser Version 1' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{8856F961-340A-11D0-A96B-00C04FD705A2}' = s 'Microsoft Web Browser' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.Explorer.2' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.Explorer' + } + '{0002DF01-0000-0000-C000-000000000046}' = s 'Internet Explorer(Ver 1.0)' + { + ProgId = s 'InternetExplorer.Application.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'InternetExplorer.Application' + } + '{9BA05972-F6A8-11CF-A442-00A0C90A8F39}' = s 'ShellWindows' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + } + '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' = s 'Microsoft Shell UI Helper' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'Shell.UIHelper.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'Shell.UIHelper' + } + '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' = s 'Shell Name Space' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'ShellNameSpace.ShellNameSpace.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'ShellNameSpace.ShellNameSpace' + } + '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + '{B45FF030-4447-11D2-85DE-00C04FA35C89}' = s 'SearchAssistantOC' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + ProgId = s 'SearchAssistantOC.SearchAssistantOC.1' + TypeLib = s '{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}' + Version = s '1.1' + VersionIndependentProgId = s 'SearchAssistantOC.SearchAssistantOC' + } + } + 'Shell.Explorer.1' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser Version 1' + { + CLSID = s '{EAB22AC3-30C1-11CF-A7EB-0000C05BAE0B}' + CurVer = s 'Shell.Explorer.1' + } + 'Shell.Explorer.2' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + } + 'Shell.Explorer' = s 'Microsoft Web Browser' + { + CLSID = s '{8856F961-340A-11D0-A96B-00C04FD705A2}' + CurVer = s 'Shell.Explorer.2' + } + 'InternetExplorer.Application.1' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + } + 'InternetExplorer.Application' = s 'Internet Explorer(Ver 1.0)' + { + CLSID = s '{0002DF01-0000-0000-C000-000000000046}' + CurVer = s 'InternetExplorer.Application.1' + } + 'Shell.UIHelper.1' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + } + 'Shell.UIHelper' = s 'Microsoft Shell UI Helper' + { + CLSID = s '{64AB4BB7-111E-11D1-8F79-00C04FC2FBE1}' + CurVer = s 'Shell.UIHelper.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{2F2F1F96-2BC1-4B1C-BE28-EA3774F4676A}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'ShellNameSpace.ShellNameSpace.1' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + } + 'ShellNameSpace.ShellNameSpace' = s 'Shell Name Space' + { + CLSID = s '{55136805-B2DE-11D1-B9F2-00A0C98BC547}' + CurVer = s 'ShellNameSpace.ShellNameSpace.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{2E71FD0F-AAB1-42C0-9146-6D2C4EDCF07D}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } + 'SearchAssistantOC.SearchAssistantOC.1' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + } + 'SearchAssistantOC.SearchAssistantOC' = s 'SearchAssistantOC' + { + CLSID = s '{B45FF030-4447-11D2-85DE-00C04FA35C89}' + CurVer = s 'SearchAssistantOC.SearchAssistantOC.1' + } +} Propchange: trunk/reactos/dll/win32/shdocvw/shdocvw_v1.rgs ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013