Commit Graph

110 Commits

Author SHA1 Message Date
Michael Stefaniuc b01337e371 msscript.ocx/tests: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-12-28 12:26:09 +01:00
Gabriel Ivăncescu c409ab6290 msscript.ocx: Supply a stub ServiceProvider to InvokeEx in run_procedure.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-10 22:07:01 +02:00
Gabriel Ivăncescu fb746414e2 msscript.ocx: Implement UseSafeSubset properly by setting the interface safety options.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu 59fe65b619 msscript.ocx: Return S_OK from the IActiveScriptSiteWindow::EnableModeless stub.
This is needed so e.g. vbscript can display message boxes when used from
the script control.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu c57e2de626 msscript.ocx: Implement IActiveScriptSiteWindow::GetWindow.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu a46810c67a msscript.ocx: Implement IScriptControl::get_SitehWnd.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu 01ea797c34 msscript.ocx: Implement IScriptControl::put_SitehWnd.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu 8b6afc2677 msscript.ocx/tests: Add tests for SitehWnd.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-04 15:47:27 +02:00
Gabriel Ivăncescu b1e9b091ee msscript.ocx: Uncache the module objects when script is restarted, but not the Procedure count.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-27 18:10:53 +02:00
Gabriel Ivăncescu dae6979ee8 msscript.ocx: Implement IScriptError::get_Column.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:51 +02:00
Gabriel Ivăncescu 00b4d3687d msscript.ocx: Implement IScriptError::get_Line.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:49 +02:00
Gabriel Ivăncescu 4a588d3943 msscript.ocx: Implement IScriptError::get_Text.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:47 +02:00
Gabriel Ivăncescu 7bc6740a92 msscript.ocx: Implement IScriptError::get_HelpContext.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:44 +02:00
Gabriel Ivăncescu 79378814e4 msscript.ocx: Implement IScriptError::get_HelpFile.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:42 +02:00
Gabriel Ivăncescu 24d9f52fea msscript.ocx: Implement IScriptError::get_Description.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:40 +02:00
Gabriel Ivăncescu 7b46eb1ef7 msscript.ocx: Implement IScriptError::get_Source.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:38 +02:00
Gabriel Ivăncescu 503434cae7 msscript.ocx/tests: Add initial tests for ScriptError.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:36 +02:00
Gabriel Ivăncescu 4ca537b015 msscript.ocx: Implement IScriptError::get_Number.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:34 +02:00
Gabriel Ivăncescu 7c5885117a msscript.ocx: Implement IScriptError::Clear.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:32 +02:00
Gabriel Ivăncescu 4aaaae1586 msscript.ocx: Add the ScriptError stub implementation.
The error object has to be separate from the control, as it can be referenced
while the control is released. It is also available even without a script
host, and in fact the same object will be used (same address) when a host
is instantiated.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-25 10:28:25 +02:00
Gabriel Ivăncescu 3a9c50e3ff msscript.ocx: Implement the ScriptProcedure enumerator.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-20 18:47:56 +02:00
Gabriel Ivăncescu 3273add655 msscript.ocx: Implement ScriptProcedure::get_HasReturnValue.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:52 +02:00
Gabriel Ivăncescu f8de2787ef msscript.ocx: Implement ScriptProcedure::get_NumArgs.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:50 +02:00
Gabriel Ivăncescu 28228b3914 msscript.ocx: Implement ScriptProcedure::get_Name.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:48 +02:00
Gabriel Ivăncescu 19ebaa85fc msscript.ocx: Cache the procedures obtained from the ScriptProcedureCollection.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:46 +02:00
Gabriel Ivăncescu e8348bdbcc msscript.ocx: Implement ScriptProcedureCollection::get_Item.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:44 +02:00
Gabriel Ivăncescu d8e89f3119 msscript.ocx: Uncache the module objects when adding new code.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:42 +02:00
Gabriel Ivăncescu c8e4ceb461 msscript.ocx: Implement ScriptProcedureCollection::get_Count.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:40 +02:00
Gabriel Ivăncescu 697a44a795 msscript.ocx/tests: Add initial tests for Script Procedures.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-13 21:11:38 +02:00
Gabriel Ivăncescu f40270719b msscript.ocx: Add IScriptProcedureCollection stub implementation.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-11 18:19:06 +02:00
Gabriel Ivăncescu ad56f0c5c5 msscript.ocx: Implement ScriptControl::get_CodeObject.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-04 22:07:44 +02:00
Gabriel Ivăncescu 77b48fa41a msscript.ocx: Implement ScriptModule::get_CodeObject.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-04 22:07:42 +02:00
Gabriel Ivăncescu a5a7ceba0e msscript.ocx: Implement ScriptModule::Run.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-04 22:07:39 +02:00
Gabriel Ivăncescu 5035b82f8f msscript.ocx: Move ScriptControl::Run implementation into a helper.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-04 22:07:36 +02:00
Gabriel Ivăncescu c7aa513a3b msscript.ocx: Implement the ScriptModule enumerator.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-08-04 20:22:39 +02:00
Gabriel Ivăncescu e285c6e929 msscript.ocx: Implement parse_script_text on top of modules.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu e61a2a2fc0 msscript.ocx: Move parse_script_text up.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu f9fb1e3fbe msscript.ocx: Implement get_script_dispatch on top of modules.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu 045372cbe4 msscript.ocx: Implement IScriptModule::get_Name.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu d3fde3b198 msscript.ocx: Always detach the modules when changing the language.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu 7c0231b8c3 msscript.ocx: Implement IScriptModuleCollection::get_Item.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu a328ac5bc9 msscript.ocx: Implement IScriptModuleCollection::Add.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:31 +02:00
Gabriel Ivăncescu 523f9d2a4f msscript.ocx: Move IScriptControl::AddObject implementation into a helper.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-25 23:08:30 +02:00
Gabriel Ivăncescu 71d34fc43c msscript.ocx: Release the host ref in put_Language.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-24 18:36:08 +02:00
Gabriel Ivăncescu b34cd24f7d msscript.ocx: Fail if the module array failed to allocate.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-24 18:36:08 +02:00
Gabriel Ivăncescu f81862d415 msscript.ocx: Fix detaching the script host in put_Language.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-24 18:36:08 +02:00
Jacek Caban fcf6d67b83 msscript.ocx: Keep script host running as long as any script module is alive.
Based on patch by Gabriel Ivăncescu.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-23 22:38:05 +02:00
Jacek Caban 5a6ac3aac1 msscript.ocx: Move modules_count to the Script Host.
Based on patch by Gabriel Ivăncescu.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-23 22:38:05 +02:00
Gabriel Ivăncescu 67ef515174 msscript.ocx: Implement IScriptModuleCollection::get_Count.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-17 22:01:58 +02:00
Jacek Caban b531e51cd7 msscript: Parse script host object instead of control to parse_script_text.
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-06-12 19:27:04 +02:00