* chartooem() and oemtochar() removed. 97/10397/2
Sylvestre Ledru [Tue, 5 Feb 2013 10:10:14 +0000 (11:10 +0100)]
Change-Id: I6a27ca1ff4c37dc952021d0812799de14961d90e

12 files changed:
scilab/CHANGES_5.4.X
scilab/modules/windows_tools/help/en_US/chartooem.xml [deleted file]
scilab/modules/windows_tools/help/en_US/oemtochar.xml [deleted file]
scilab/modules/windows_tools/includes/gw_windows_tools.h
scilab/modules/windows_tools/locales/ja_JP.po
scilab/modules/windows_tools/locales/windows_tools.pot
scilab/modules/windows_tools/sci_gateway/c/gw_windows_tools.c
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c [deleted file]
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c [deleted file]
scilab/modules/windows_tools/sci_gateway/windows_tools_gateway.xml
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj.filters

index dc15840..079cb33 100644 (file)
@@ -59,6 +59,8 @@ Removed functions
 
 * xbasr() removed. Automatically managed by Scilab now.
 
+* chartoeom() and eomtochar() removed.
+
 
 Obsolete functions
 ===================
diff --git a/scilab/modules/windows_tools/help/en_US/chartooem.xml b/scilab/modules/windows_tools/help/en_US/chartooem.xml
deleted file mode 100644 (file)
index 9898d34..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="chartooem">
-    <refnamediv>
-        <refname>chartooem</refname>
-        <refpurpose>translates a string into the OEM-defined
-            character set (Windows only)
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <refsection>
-            <para>Obsolete, it will be removed in Scilab 5.4.1</para>
-        </refsection>
-        <title>Calling Sequence</title>
-        <synopsis>str=chartooem(str1)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>str1</term>
-                <listitem>
-                    <para>a matrix of ANSI character string.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>a matrix of OEM-defined character string.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>chartooem</literal> translates a string into the OEM-defined
-            character set.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="oemtochar">oemtochar</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>This function will be removed in Scilab 5.4.1</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/windows_tools/help/en_US/oemtochar.xml b/scilab/modules/windows_tools/help/en_US/oemtochar.xml
deleted file mode 100644 (file)
index 71b301b..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="oemtochar">
-    <refnamediv>
-        <refname>oemtochar</refname>
-        <refpurpose>translates a string from the OEM-defined
-            character set into either an ANSI string (Windows Only)
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <refsection>
-            <para>Obsolete, it will be removed in Scilab 5.4.1</para>
-        </refsection>
-        <title>Calling Sequence</title>
-        <synopsis>str=oemtochar(str1)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>str1</term>
-                <listitem>
-                    <para>a matrix of OEM-defined character string.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>str</term>
-                <listitem>
-                    <para>a matrix of ANSI character string.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            <literal>oemtochar</literal> translates a string from the OEM-defined
-            character set into either an ANSI string.
-        </para>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="chartooem">chartooem</link>
-            </member>
-        </simplelist>
-    </refsection>
-    <refsection>
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>5.4.0</revnumber>
-                <revremark>This function will be removed in Scilab 5.4.1</revremark>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 46d3fbd..d1028d0 100644 (file)
@@ -1,11 +1,11 @@
 /*
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) INRIA - Allan CORNET
-* 
+*
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
 * you should have received as part of this distribution.  The terms
-* are also available at    
+* are also available at
 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 *
 */
@@ -20,18 +20,16 @@ WINDOWS_TOOLS_IMPEXP int gw_windows_tools(void);
 /*--------------------------------------------------------------------------*/
 /* Declaration of all the profile function declared and */
 /* used in sci_gateway */
-WINDOWS_TOOLS_IMPEXP int sci_winopen(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_winqueryreg(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_findfileassociation(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_dos(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_mcisendstring(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_oemtochar(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_chartooem(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_consolebox(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_win64(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_istssession(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_getsystemmetrics(char *fname,unsigned long l);
-WINDOWS_TOOLS_IMPEXP int sci_createGUID(char *fname,unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_winopen(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_winqueryreg(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_findfileassociation(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_dos(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_mcisendstring(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_consolebox(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_win64(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_istssession(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_getsystemmetrics(char *fname, unsigned long l);
+WINDOWS_TOOLS_IMPEXP int sci_createGUID(char *fname, unsigned long l);
 /*--------------------------------------------------------------------------*/
 #endif /* __GW_WINDOWS_TOOLS_H__ */
 
index f3a02df..b65413f 100644 (file)
@@ -34,13 +34,11 @@ msgstr ""
 "%s: この機能は Scilab %s 以降廃止されます\n"
 "\n"
 
-# File: sci_gateway/c/sci_chartooem.c, line: 48
 # File: sci_gateway/c/sci_dos.c, line: 50
 # File: sci_gateway/c/sci_dos.c, line: 62
 # File: sci_gateway/c/sci_findfileassociation.c, line: 38
 # File: sci_gateway/c/sci_getsystemmetrics.c, line: 31
 # File: sci_gateway/c/sci_mcisendstring.c, line: 106
-# File: sci_gateway/c/sci_oemtochar.c, line: 48
 #, c-format
 msgid "%s: Wrong type for input argument #%d: String expected.\n"
 msgstr "%s: 入力引数 #%d で不正な型: 文字列を想定します。\n"
@@ -72,24 +70,20 @@ msgstr "%s: 入力引数で不正な型: スカラーを想定します。\n"
 msgid "%s: Can not read input argument #%d.\n"
 msgstr "%s: 入力引数 #%d を読み込めません.\n"
 
-# File: sci_gateway/c/sci_chartooem.c, line: 48
 # File: sci_gateway/c/sci_dos.c, line: 50
 # File: sci_gateway/c/sci_dos.c, line: 62
 # File: sci_gateway/c/sci_findfileassociation.c, line: 38
 # File: sci_gateway/c/sci_getsystemmetrics.c, line: 31
 # File: sci_gateway/c/sci_mcisendstring.c, line: 106
-# File: sci_gateway/c/sci_oemtochar.c, line: 48
 #, c-format
 msgid "%s: Wrong type for input argument #%d: A string expected.\n"
 msgstr "%s: 入力引数 #%d で不正な型: 文字列を想定します。\n"
 
-# File: sci_gateway/c/sci_chartooem.c, line: 48
 # File: sci_gateway/c/sci_dos.c, line: 50
 # File: sci_gateway/c/sci_dos.c, line: 62
 # File: sci_gateway/c/sci_findfileassociation.c, line: 38
 # File: sci_gateway/c/sci_getsystemmetrics.c, line: 31
 # File: sci_gateway/c/sci_mcisendstring.c, line: 106
-# File: sci_gateway/c/sci_oemtochar.c, line: 48
 #, c-format
 msgid "%s: Wrong size for input argument #%d: A string expected.\n"
 msgstr "%s: 入力引数 #%d で不正なサイズ: 文字列を想定します。\n"
index d716f30..c2f9206 100644 (file)
@@ -16,35 +16,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Revision-Date: 2013-01-24 17:14+0100\n"
 
-# File: sci_gateway/c/sci_chartooem.c, line: 31
-# File: sci_gateway/c/sci_oemtochar.c, line: 31
-#, c-format
-msgid "%s: Feature %s is obsolete.\n"
-msgstr ""
-
-#
-# File: sci_gateway/c/sci_chartooem.c, line: 31
-# File: sci_gateway/c/sci_chartooem.c, line: 32
-# File: sci_gateway/c/sci_oemtochar.c, line: 31
-# File: sci_gateway/c/sci_oemtochar.c, line: 32
-msgid "Warning"
-msgstr ""
-
-#
-# File: sci_gateway/c/sci_chartooem.c, line: 32
-# File: sci_gateway/c/sci_oemtochar.c, line: 32
-#, c-format
-msgid ""
-"%s: This feature will be permanently removed in Scilab %s\n"
-"\n"
-msgstr ""
-
 #
-# File: sci_gateway/c/sci_chartooem.c, line: 57
 # File: sci_gateway/c/sci_findfileassociation.c, line: 39
 # File: sci_gateway/c/sci_getsystemmetrics.c, line: 32
 # File: sci_gateway/c/sci_mcisendstring.c, line: 119
-# File: sci_gateway/c/sci_oemtochar.c, line: 57
 # File: sci_gateway/c/sci_winqueryreg.c, line: 53
 # File: sci_gateway/c/sci_winqueryreg.c, line: 80
 # File: sci_gateway/c/sci_winqueryreg.c, line: 100
index 0cb8c5b..7921220 100644 (file)
@@ -1,11 +1,11 @@
 /*
 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 * Copyright (C) INRIA - Allan CORNET
-* 
+*
 * This file must be used under the terms of the CeCILL.
 * This source file is licensed as described in the file COPYING, which
 * you should have received as part of this distribution.  The terms
-* are also available at    
+* are also available at
 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 *
 */
 /*--------------------------------------------------------------------------*/
 static gw_generic_table Tab[] =
 {
-{sci_winopen,"winopen"},
-{sci_winqueryreg,"winqueryreg"},
-{sci_findfileassociation,"findfileassociation"},
-{sci_dos,"dos"},
-{sci_mcisendstring,"mcisendstring"},
-{sci_oemtochar,"oemtochar"},
-{sci_chartooem,"chartooem"},
-{sci_consolebox,"consolebox"},
-{sci_win64,"win64"},
-{sci_istssession,"istssession"},
-{sci_getsystemmetrics,"getsystemmetrics"},
-{sci_createGUID,"createGUID"}
+    {sci_winopen, "winopen"},
+    {sci_winqueryreg, "winqueryreg"},
+    {sci_findfileassociation, "findfileassociation"},
+    {sci_dos, "dos"},
+    {sci_mcisendstring, "mcisendstring"},
+    {sci_consolebox, "consolebox"},
+    {sci_win64, "win64"},
+    {sci_istssession, "istssession"},
+    {sci_getsystemmetrics, "getsystemmetrics"},
+    {sci_createGUID, "createGUID"}
 };
 /*--------------------------------------------------------------------------*/
 int gw_windows_tools(void)
-{  
-       Rhs = Max(0, Rhs);
+{
+    Rhs = Max(0, Rhs);
 
-       if(pvApiCtx == NULL)
-       {
-               pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
-       }
+    if (pvApiCtx == NULL)
+    {
+        pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
+    }
 
-       pvApiCtx->pstName = (char*)Tab[Fin-1].name;
-       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-       return 0;
+    pvApiCtx->pstName = (char*)Tab[Fin - 1].name;
+    callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c b/scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
deleted file mode 100644 (file)
index bbda440..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) INRIA - Allan CORNET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#include <windows.h>
-#include "gw_windows_tools.h"
-#include "stack-c.h"
-#include "MALLOC.h"
-#include "scilabmode.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "warningmode.h"
-#include "sciprint.h"
-/*--------------------------------------------------------------------------*/
-int sci_chartooem(char *fname, unsigned long l)
-{
-    static int l1, n1, m1;
-    char *Output = NULL;
-
-    if (getWarningMode())
-    {
-        sciprint(_("%s: Feature %s is obsolete.\n"), _("Warning"), fname);
-        sciprint(_("%s: This feature will be permanently removed in Scilab %s\n\n"), _("Warning"), "5.4.1");
-    }
-
-    CheckRhs(1, 1);
-    CheckLhs(0, 1);
-
-    if (GetType(1) == sci_strings)
-    {
-        char *Charstring = NULL;
-
-        GetRhsVar(1, STRING_DATATYPE, &m1, &n1, &l1);
-        Charstring = cstk(l1);
-
-        Output = (char*)MALLOC((strlen(Charstring) + 1) * sizeof(char));
-        if (getScilabMode() == SCILAB_STD)
-        {
-            CharToOem(Charstring, Output);
-        }
-        else
-        {
-            wsprintf(Output, "%s", Charstring);
-        }
-    }
-    else
-    {
-        Scierror(999, _("%s: Wrong type for input argument #%d: String expected.\n"), fname, 1);
-        return 0;
-    }
-
-    n1 = 1;
-    m1 = (int)strlen(Output);
-    CreateVarFromPtr( Rhs + 1, STRING_DATATYPE, &m1, &n1, &Output);
-    if (Output)
-    {
-        FREE(Output);
-        Output = NULL;
-    }
-    LhsVar(1) = Rhs + 1;
-    PutLhsVar();
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c b/scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
deleted file mode 100644 (file)
index 9a0c7ca..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) INRIA - Allan CORNET
-*
-* This file must be used under the terms of the CeCILL.
-* This source file is licensed as described in the file COPYING, which
-* you should have received as part of this distribution.  The terms
-* are also available at
-* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-*
-*/
-
-/*--------------------------------------------------------------------------*/
-#include <windows.h>
-#include "gw_windows_tools.h"
-#include "stack-c.h"
-#include "MALLOC.h"
-#include "scilabmode.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "warningmode.h"
-#include "sciprint.h"
-/*--------------------------------------------------------------------------*/
-int sci_oemtochar(char *fname, unsigned long l)
-{
-    int l1 = 0, n1 = 0, m1 = 0;
-    char *Output = NULL;
-
-    if (getWarningMode())
-    {
-        sciprint(_("%s: Feature %s is obsolete.\n"), _("Warning"), fname);
-        sciprint(_("%s: This feature will be permanently removed in Scilab %s\n\n"), _("Warning"), "5.4.1");
-    }
-
-    CheckRhs(1, 1);
-    CheckLhs(0, 1);
-
-    if (GetType(1) == sci_strings)
-    {
-        char *OEMstring = NULL;
-
-        GetRhsVar(1, STRING_DATATYPE, &m1, &n1, &l1);
-        OEMstring = cstk(l1);
-
-        Output = (char*)MALLOC((strlen(OEMstring) + 1) * sizeof(char));
-        if (getScilabMode() == SCILAB_STD)
-        {
-            OemToChar(OEMstring, Output);
-        }
-        else
-        {
-            wsprintf(Output, "%s", OEMstring);
-        }
-    }
-    else
-    {
-        Scierror(999, _("%s: Wrong type for input argument #%d: String expected.\n"), fname, 1);
-        return 0;
-    }
-
-    n1 = 1;
-    m1 = (int)strlen(Output);
-    CreateVarFromPtr(Rhs + 1, STRING_DATATYPE, &m1, &n1, &Output);
-    if (Output)
-    {
-        FREE(Output);
-        Output = NULL;
-    }
-
-    LhsVar(1) = Rhs + 1;
-    PutLhsVar();
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index c0c7421..2b2f02a 100644 (file)
@@ -2,8 +2,8 @@
 
 <!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
 <GATEWAY name="windows_tools">
-<!-- =================== -->
-<!--
+    <!-- =================== -->
+    <!--
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
@@ -19,9 +19,9 @@
  ===================
  Don't touch if you do not know what you are doing
 -->
-
-
-<!--
+    
+    
+    <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Allan CORNET
  * 
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
 -->
-<!-- =================== -->
-
-<PRIMITIVE gatewayId="47" primitiveId="1" primitiveName="winopen" />
-<PRIMITIVE gatewayId="47" primitiveId="2" primitiveName="winqueryreg" />
-<PRIMITIVE gatewayId="47" primitiveId="3" primitiveName="findfileassociation" />
-<PRIMITIVE gatewayId="47" primitiveId="4" primitiveName="dos" />
-<PRIMITIVE gatewayId="47" primitiveId="5" primitiveName="mcisendstring" />
-<PRIMITIVE gatewayId="47" primitiveId="6" primitiveName="oemtochar" />
-<PRIMITIVE gatewayId="47" primitiveId="7" primitiveName="chartooem" />
-<PRIMITIVE gatewayId="47" primitiveId="8" primitiveName="consolebox" />
-<PRIMITIVE gatewayId="47" primitiveId="9" primitiveName="win64" />
-<PRIMITIVE gatewayId="47" primitiveId="10" primitiveName="istssession" />
-<PRIMITIVE gatewayId="47" primitiveId="11" primitiveName="getsystemmetrics" />
-<PRIMITIVE gatewayId="47" primitiveId="12" primitiveName="createGUID" />
+    <!-- =================== -->
+    
+    <PRIMITIVE gatewayId="47" primitiveId="1" primitiveName="winopen" />
+    <PRIMITIVE gatewayId="47" primitiveId="2" primitiveName="winqueryreg" />
+    <PRIMITIVE gatewayId="47" primitiveId="3" primitiveName="findfileassociation" />
+    <PRIMITIVE gatewayId="47" primitiveId="4" primitiveName="dos" />
+    <PRIMITIVE gatewayId="47" primitiveId="5" primitiveName="mcisendstring" />
+    <PRIMITIVE gatewayId="47" primitiveId="6" primitiveName="consolebox" />
+    <PRIMITIVE gatewayId="47" primitiveId="7" primitiveName="win64" />
+    <PRIMITIVE gatewayId="47" primitiveId="8" primitiveName="istssession" />
+    <PRIMITIVE gatewayId="47" primitiveId="9" primitiveName="getsystemmetrics" />
+    <PRIMITIVE gatewayId="47" primitiveId="10" primitiveName="createGUID" />
 </GATEWAY>
index 6b67194..a55621f 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -205,7 +205,6 @@ lib /DEF:"$(ProjectDir)Call_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile Include="httpdownloadfile.c" />
     <ClCompile Include="InitializeWindows_tools.c" />
     <ClCompile Include="registry.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_chartooem.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_consolebox.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_createGUID.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_dos.c" />
@@ -213,7 +212,6 @@ lib /DEF:"$(ProjectDir)Call_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile Include="..\..\sci_gateway\c\sci_getsystemmetrics.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_istssession.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_mcisendstring.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_oemtochar.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_win64.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_winopen.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_winqueryreg.c" />
@@ -280,4 +278,4 @@ lib /DEF:"$(ProjectDir)Call_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index c65f804..df1b8c9 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -44,9 +44,6 @@
     <ClCompile Include="registry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_chartooem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_consolebox.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -68,9 +65,6 @@
     <ClCompile Include="..\..\sci_gateway\c\sci_mcisendstring.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_oemtochar.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_win64.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>