[akhaldi] 58839: [JSCRIPT] * Add the typelib related registration data. * Set the correct dependencies for the resource file.
24 Apr
2013
24 Apr
'13
11:18 a.m.
Author: akhaldi
Date: Wed Apr 24 11:18:29 2013
New Revision: 58839
URL: http://svn.reactos.org/svn/reactos?rev=58839&view=rev
Log:
[JSCRIPT]
* Add the typelib related registration data.
* Set the correct dependencies for the resource file.
Modified:
trunk/reactos/dll/win32/jscript/CMakeLists.txt
trunk/reactos/dll/win32/jscript/jscript_classes.rgs
Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Wed Apr 24 11:18:29 2013
@@ -1,5 +1,3 @@
-
-add_typelib(jsglobal.idl)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -42,6 +40,19 @@
add_library(jscript SHARED ${SOURCE} rsrc.rc)
add_idl_headers(jscript_idlheader jscript_classes.idl)
+add_typelib(jsglobal.idl)
+
+list(APPEND jscript_rc_deps
+ ${CMAKE_CURRENT_SOURCE_DIR}/jscript.rgs
+ ${CMAKE_CURRENT_SOURCE_DIR}/jscript_classes.rgs
+ ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb)
+
+set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
"${jscript_rc_deps}")
+
+# jsglobal.tlb needs stdole2.tlb
+add_dependencies(jscript jscript_idlheader stdole2)
+
+
if(NOT MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
#allow_warnings(jscript)
@@ -52,7 +63,4 @@
target_link_libraries(jscript wine)
add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
add_pch(jscript jscript.h)
-# jsglobal.tlb needs stdole2.tlb
-add_dependencies(jscript jscript_idlheader stdole2)
add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)
-set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb)
Modified: trunk/reactos/dll/win32/jscript/jscript_classes.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_…
==============================================================================
--- trunk/reactos/dll/win32/jscript/jscript_classes.rgs [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/jscript/jscript_classes.rgs [iso-8859-1] Wed Apr 24 11:18:29
2013
@@ -33,4 +33,147 @@
{
CLSID = s '{F414C262-6AC0-11CF-B6D1-00AA00BBBB58}'
}
+ NoRemove Typelib
+ {
+ NoRemove '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}'
+ {
+ '1.0' = s 'JSGlobal'
+ {
+ '0' { win32 = s '%MODULE%' }
+ FLAGS = s '0'
+ }
+ }
+ }
+ NoRemove Interface
+ {
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B086}' = s 'GlobalObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B087}' = s 'DateObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B088}' = s 'MathObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B089}' = s 'NumberObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B090}' = s 'RegExpObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B091}' = s 'StringObj'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B092}' = s 'ArrayInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B093}' = s 'FunctionInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B094}' = s 'StringInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B095}' = s 'BoolInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B096}' = s 'NumberInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B097}' = s 'ObjectInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B098}' = s 'DateInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B099}' = s 'RegExpInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09A}' = s 'ErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09B}' = s 'EvalErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09C}' = s
'RangeErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09D}' = s
'ReferenceErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09E}' = s
'SyntaxErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09F}' = s 'TypeErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ '{3EEF9758-35FC-11D1-8CE4-00C04FC2B0A0}' = s 'URIErrorInstance'
+ {
+ ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+ ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+ TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version =
s '1.0' }
+ }
+ }
+ NoRemove CLSID
+ {
+ }
}
4166
days inactive
4166
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org