svn: /phpdoc/ja/trunk/reference/com/ com/construct.xml compersisthelper/construct.xml compersisthelper/getcurfilename.xml compersisthelper/loadfromfile.xml compersisthelper/savetofile.xml dotnet/construct.xml functions/com-create-guid.xml functions/com-event-sink.xml functions/com-get-active-object.xml functions/com-load-typelib.xml functions/com-message-pump.xml functions/com-print-typeinfo.xml functions/variant-abs.xml functions/variant-cmp.xml functions/variant-date-to-timestamp.xml functions
[email protected] (Yoshinari Takaoka)
| Newsgroups | php.doc.ja |
|---|---|
| Message-ID | <[email protected]> |
mumumu Tue, 24 Nov 2020 23:47:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=351615 Log: Generate com_dotnet methodsynopses based on stubs Based on patch contributed by Máté Kocsis <[email protected]>. Changed paths: U phpdoc/ja/trunk/reference/com/com/construct.xml U phpdoc/ja/trunk/reference/com/compersisthelper/construct.xml U phpdoc/ja/trunk/reference/com/compersisthelper/getcurfilename.xml U phpdoc/ja/trunk/reference/com/compersisthelper/loadfromfile.xml U phpdoc/ja/trunk/reference/com/compersisthelper/savetofile.xml U phpdoc/ja/trunk/reference/com/dotnet/construct.xml U phpdoc/ja/trunk/reference/com/functions/com-create-guid.xml U phpdoc/ja/trunk/reference/com/functions/com-event-sink.xml U phpdoc/ja/trunk/reference/com/functions/com-get-active-object.xml U phpdoc/ja/trunk/reference/com/functions/com-load-typelib.xml U phpdoc/ja/trunk/reference/com/functions/com-message-pump.xml U phpdoc/ja/trunk/reference/com/functions/com-print-typeinfo.xml U phpdoc/ja/trunk/reference/com/functions/variant-abs.xml U phpdoc/ja/trunk/reference/com/functions/variant-cmp.xml U phpdoc/ja/trunk/reference/com/functions/variant-date-to-timestamp.xml U phpdoc/ja/trunk/reference/com/functions/variant-fix.xml U phpdoc/ja/trunk/reference/com/functions/variant-int.xml U phpdoc/ja/trunk/reference/com/functions/variant-neg.xml U phpdoc/ja/trunk/reference/com/functions/variant-not.xml U phpdoc/ja/trunk/reference/com/functions/variant-round.xml U phpdoc/ja/trunk/reference/com/variant/construct.xml
svn-diffs-351615.txt
(text/x-diff, 42.1 KB)
Modified: phpdoc/ja/trunk/reference/com/com/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/com/construct.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/com/construct.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 350083 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="com.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,11 +11,11 @@
<refsect1 role="description">
&reftitle.description;
<constructorsynopsis role="oop">
- <methodname>com::__construct</methodname>
+ <modifier>public</modifier> <methodname>com::__construct</methodname>
<methodparam><type>string</type><parameter>module_name</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>server_name</parameter><initializer>&null;</initializer></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer>CP_ACP</initializer></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>typelib</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>server_name</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer><constant>CP_ACP</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>string</type><parameter>typelib</parameter><initializer>""</initializer></methodparam>
</constructorsynopsis>
<para>
新しい com オブジェクトを構築します。
@@ -153,7 +153,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/compersisthelper/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/compersisthelper/construct.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/compersisthelper/construct.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349271 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="compersisthelper.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -12,11 +12,11 @@
&reftitle.description;
<constructorsynopsis>
<modifier>public</modifier> <methodname>COMPersistHelper::__construct</methodname>
- <methodparam choice="opt"><type>variant</type><parameter>com_object</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type class="union"><type>variant</type><type>null</type></type><parameter>variant</parameter></methodparam>
</constructorsynopsis>
<para>
永続化を助けるオブジェクトを構築します。
- これは通常、<parameter>com_object</parameter> に結びつけて使います。
+ これは通常、<parameter>variant</parameter> に結びつけて使います。
</para>
</refsect1>
@@ -24,7 +24,7 @@
&reftitle.parameters;
<variablelist>
<varlistentry>
- <term><parameter>com_object</parameter></term>
+ <term><parameter>variant</parameter></term>
<listitem>
<simpara>
<interfacename>IDispatch</interfacename> を実装した <acronym>COM</acronym> オブジェクト。
@@ -34,7 +34,7 @@
をオブジェクトが実装していなければなりません。
</simpara>
<simpara>
- <parameter>com_object</parameter> に &null;を渡す意味があるのは、
+ <parameter>variant</parameter> に &null;を渡す意味があるのは、
<methodname>COMPersistHelper::LoadFromStream</methodname> を呼び出してオブジェクトを読み込んだ場合に限ります。
</simpara>
</listitem>
@@ -56,7 +56,6 @@
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/compersisthelper/getcurfilename.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/compersisthelper/getcurfilename.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/compersisthelper/getcurfilename.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349255 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="compersisthelper.getcurfilename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,8 +11,8 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <modifier>public</modifier> <type>string</type><methodname>COMPersistHelper::GetCurFileName</methodname>
- <void />
+ <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>COMPersistHelper::GetCurFileName</methodname>
+ <void/>
</methodsynopsis>
<para>
オブジェクトに関連付けられた現在のファイル名を取得します。
@@ -42,7 +42,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/compersisthelper/loadfromfile.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/compersisthelper/loadfromfile.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/compersisthelper/loadfromfile.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349271 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="compersisthelper.loadfromfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -12,7 +12,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>public</modifier> <type>bool</type><methodname>COMPersistHelper::LoadFromFile</methodname>
- <methodparam><type>string</type><parameter>path</parameter></methodparam>
+ <methodparam><type>string</type><parameter>filename</parameter></methodparam>
<methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
@@ -24,7 +24,7 @@
&reftitle.parameters;
<variablelist>
<varlistentry>
- <term><parameter>path</parameter></term>
+ <term><parameter>filename</parameter></term>
<listitem>
<simpara>
読み込むオブジェクトが保存されたファイル名
@@ -64,7 +64,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/compersisthelper/savetofile.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/compersisthelper/savetofile.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/compersisthelper/savetofile.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349271 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="compersisthelper.savetofile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -12,7 +12,7 @@
&reftitle.description;
<methodsynopsis>
<modifier>public</modifier> <type>bool</type><methodname>COMPersistHelper::SaveToFile</methodname>
- <methodparam choice="opt"><type>string</type><parameter>filename</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>filename</parameter></methodparam>
<methodparam choice="opt"><type>bool</type><parameter>remember</parameter><initializer>&true;</initializer></methodparam>
</methodsynopsis>
<para>
@@ -83,7 +83,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/dotnet/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/dotnet/construct.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/dotnet/construct.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349253 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="dotnet.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,10 +11,10 @@
<refsect1 role="description">
&reftitle.description;
<constructorsynopsis role="oop">
- <methodname>dotnet::__construct</methodname>
+ <modifier>public</modifier> <methodname>dotnet::__construct</methodname>
<methodparam><type>string</type><parameter>assembly_name</parameter></methodparam>
- <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer>CP_ACP</initializer></methodparam>
+ <methodparam><type>string</type><parameter>datatype_name</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer><constant>CP_ACP</constant></initializer></methodparam>
</constructorsynopsis>
<para>
新しい dotnet オブジェクトを構築します。
@@ -33,7 +33,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>class_name</parameter></term>
+ <term><parameter>datatype_name</parameter></term>
<listitem>
<simpara>
アセンブリ中のどのクラスをインスタンス化するかを指定します。
@@ -53,7 +53,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-create-guid.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-create-guid.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-create-guid.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
<refentry xml:id="function.com-create-guid" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>com_create_guid</refname>
@@ -9,7 +10,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>string</type><methodname>com_create_guid</methodname>
+ <type class="union"><type>string</type><type>false</type></type><methodname>com_create_guid</methodname>
<void/>
</methodsynopsis>
<para>
@@ -24,6 +25,7 @@
&reftitle.returnvalues;
<para>
GUID を文字列で返します。
+ &return.falseforfailure;
</para>
</refsect1>
<refsect1 role="seealso">
@@ -35,7 +37,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-event-sink.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-event-sink.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-event-sink.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 351221 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.com-event-sink" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,13 +11,13 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>com_event_sink</methodname>
- <methodparam><type>variant</type><parameter>comobject</parameter></methodparam>
- <methodparam><type>object</type><parameter>sinkobject</parameter></methodparam>
- <methodparam choice="opt"><type>mixed</type><parameter>sinkinterface</parameter></methodparam>
+ <methodparam><type>variant</type><parameter>variant</parameter></methodparam>
+ <methodparam><type>object</type><parameter>sink_object</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>array</type><type>string</type><type>null</type></type><parameter>sink_interface</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
- <parameter>comobject</parameter> が生成したイベントを PHP オブジェクト
- <parameter>sinkobject</parameter> に通知するよう、COM に指示します。
+ <parameter>variant</parameter> が生成したイベントを PHP オブジェクト
+ <parameter>sink_object</parameter> に通知するよう、COM に指示します。
</para>
<para>
この機能を利用する際には注意しましょう。もし以下の例のようなことを
@@ -30,7 +30,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>comobject</parameter></term>
+ <term><parameter>variant</parameter></term>
<listitem>
<para>
</para>
@@ -37,10 +37,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>sinkobject</parameter></term>
+ <term><parameter>sink_object</parameter></term>
<listitem>
<para>
- <parameter>sinkobject</parameter> には、要求されるディスパッチ
+ <parameter>sink_object</parameter> には、要求されるディスパッチ
インターフェイスと同じ名前のメソッドを持つクラスのインスタンスを
指定する必要があります。この要求を満たすクラスを作成するために、
<function>com_print_typeinfo</function> を使用することができます。
@@ -48,13 +48,13 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>sinkinterface</parameter></term>
+ <term><parameter>sink_interface</parameter></term>
<listitem>
<para>
- PHP は <parameter>comobject</parameter> に関連するタイプライブラリで
+ PHP は <parameter>variant</parameter> に関連するタイプライブラリで
指定されたデフォルトのディスパッチインターフェイスを使用しようと
しますが、使用させたいインターフェイス名を
- <parameter>sinkinterface</parameter> に指定することで、それを
+ <parameter>sink_interface</parameter> に指定することで、それを
上書きすることが可能です。
</para>
</listitem>
@@ -68,6 +68,29 @@
&return.success;
</para>
</refsect1>
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>sink_interface</parameter> は、nullable になりました。
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="examples">
&reftitle.examples;
<para>
@@ -131,7 +154,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-get-active-object.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-get-active-object.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-get-active-object.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
+<!-- Credits: mumumu -->
<refentry xml:id="function.com-get-active-object" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>com_get_active_object</refname>
@@ -10,8 +11,8 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>com_get_active_object</methodname>
- <methodparam><type>string</type><parameter>progid</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>code_page</parameter></methodparam>
+ <methodparam><type>string</type><parameter>prog_id</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>codepage</parameter><initializer>&null;</initializer></methodparam>
</methodsynopsis>
<para>
<function>com_get_active_object</function> は、新しい
@@ -29,10 +30,10 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>progid</parameter></term>
+ <term><parameter>prog_id</parameter></term>
<listitem>
<para>
- <parameter>progid</parameter> は、アクセスしたいオブジェクトの
+ <parameter>prog_id</parameter> は、アクセスしたいオブジェクトの
ProgID あるいは CLSID (たとえば <literal>Word.Application</literal>)
である必要があります。
</para>
@@ -39,7 +40,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>code_page</parameter></term>
+ <term><parameter>codepage</parameter></term>
<listitem>
<para>
<xref linkend="class.com"/> クラスの場合と同様の働きをします。
@@ -67,6 +68,30 @@
メソッドを使用することで、例外コードの内容を調べることが可能です。
</para>
</refsect1>
+
+
+ <refsect1 role="changelog">
+ &reftitle.changelog;
+ <informaltable>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>&Version;</entry>
+ <entry>&Description;</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>8.0.0</entry>
+ <entry>
+ <parameter>codepage</parameter> は、nullable になりました。
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </refsect1>
+
<refsect1 role="notes">
&reftitle.notes;
<warning>
@@ -82,7 +107,6 @@
</warning>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-load-typelib.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-load-typelib.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-load-typelib.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 346747 Maintainer: hirokawa Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: hirokawa Status: ready -->
<!-- CREDITS: takagi,mumumu -->
-<refentry xml:id='function.com-load-typelib' xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="function.com-load-typelib" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>com_load_typelib</refname>
<refpurpose>タイプライブラリを読み込む</refpurpose>
@@ -11,8 +11,8 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>com_load_typelib</methodname>
- <methodparam><type>string</type><parameter>typelib_name</parameter></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>case_sensitive</parameter><initializer>&true;</initializer></methodparam>
+ <methodparam><type>string</type><parameter>typelib</parameter></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>case_insensitive</parameter><initializer>&true;</initializer></methodparam>
</methodsynopsis>
<para>
タイプライブラリを読み込んで定数をエンジン内に登録し、それらが
@@ -37,10 +37,10 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>typelib_name</parameter></term>
+ <term><parameter>typelib</parameter></term>
<listitem>
<para>
- <parameter>typelib_name</parameter> は、以下のいずれかの形式となります。
+ <parameter>typelib</parameter> は、以下のいずれかの形式となります。
<itemizedlist>
<listitem>
<para>
@@ -70,10 +70,10 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>case_sensitive</parameter></term>
+ <term><parameter>case_insensitive</parameter></term>
<listitem>
<para>
- <parameter>case_sensitive</parameter> は、
+ <parameter>case_insensitive</parameter> は、
<function>define</function> 関数の <literal>$case_insensitive</literal> とは逆の動きをします。
</para>
</listitem>
@@ -88,7 +88,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-message-pump.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-message-pump.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-message-pump.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<refentry xml:id="function.com-message-pump" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>com_message_pump</refname>
@@ -10,10 +10,10 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>com_message_pump</methodname>
- <methodparam choice="opt"><type>int</type><parameter>timeoutms</parameter><initializer>0</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>timeout_milliseconds</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
- この関数は、<parameter>timeoutms</parameter> ミリ秒が経過するか
+ この関数は、<parameter>timeout_milliseconds</parameter> ミリ秒が経過するか
キューにメッセージが到着するまで待機します。
</para>
<para>
@@ -31,13 +31,13 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>timeoutms</parameter></term>
+ <term><parameter>timeout_milliseconds</parameter></term>
<listitem>
<para>
タイムアウト。ミリ秒単位で指定します。
</para>
<para>
- <parameter>timeoutms</parameter> の値を指定しなかった場合は
+ <parameter>timeout_milliseconds</parameter> の値を指定しなかった場合は
0 であるとみなされます。0 という値は、一切待機しないことを
意味します。処理待ち状態のメッセージがあればそれを処理し、
なければこの関数はすぐに &false; を返します。
@@ -57,7 +57,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/com-print-typeinfo.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/com-print-typeinfo.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/com-print-typeinfo.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347694 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.com-print-typeinfo" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,9 +11,9 @@
&reftitle.description;
<methodsynopsis>
<type>bool</type><methodname>com_print_typeinfo</methodname>
- <methodparam><type>object</type><parameter>comobject</parameter></methodparam>
- <methodparam choice="opt"><type>string</type><parameter>dispinterface</parameter><initializer>&null;</initializer></methodparam>
- <methodparam choice="opt"><type>bool</type><parameter>wantsink</parameter><initializer>&false;</initializer></methodparam>
+ <methodparam><type class="union"><type>variant</type><type>string</type></type><parameter>variant</parameter></methodparam>
+ <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>dispatch_interface</parameter><initializer>&null;</initializer></methodparam>
+ <methodparam choice="opt"><type>bool</type><parameter>display_sink</parameter><initializer>&false;</initializer></methodparam>
</methodsynopsis>
<para>
この関数の目的は、イベントシンクに使用するスケルトンクラスの作成を支援することです。
@@ -27,10 +27,10 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>comobject</parameter></term>
+ <term><parameter>variant</parameter></term>
<listitem>
<para>
- <parameter>comobject</parameter> は、COM オブジェクトのインスタンスか
+ <parameter>variant</parameter> は、COM オブジェクトのインスタンスか
あるいはタイプライブラリの名前 (<function>com_load_typelib</function>
の規則にしたがって名前解決されます) のいずれかです。
</para>
@@ -37,7 +37,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>dispinterface</parameter></term>
+ <term><parameter>dispatch_interface</parameter></term>
<listitem>
<para>
結果を表示したいインターフェイスで、
@@ -46,7 +46,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>wantsink</parameter></term>
+ <term><parameter>display_sink</parameter></term>
<listitem>
<para>
&true; の場合、対応するシンクインターフェイスが代わりに表示されます。
@@ -72,7 +72,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-abs.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-abs.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-abs.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347836 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.variant-abs" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>variant_abs</methodname>
- <methodparam><type>mixed</type><parameter>val</parameter></methodparam>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
variant の絶対値を返します。
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>val</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -36,7 +36,7 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- <parameter>val</parameter> の絶対値を返します。
+ <parameter>value</parameter> の絶対値を返します。
</para>
</refsect1>
@@ -56,7 +56,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-cmp.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-cmp.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-cmp.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<refentry xml:id="function.variant-cmp" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>variant_cmp</refname>
@@ -12,8 +12,8 @@
<type>int</type><methodname>variant_cmp</methodname>
<methodparam><type>mixed</type><parameter>left</parameter></methodparam>
<methodparam><type>mixed</type><parameter>right</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>lcid</parameter></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>locale_id</parameter><initializer><constant>LOCALE_SYSTEM_DEFAULT</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
</methodsynopsis>
<para>
<parameter>left</parameter> と <parameter>right</parameter>
@@ -44,7 +44,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>lcid</parameter></term>
+ <term><parameter>locale_id</parameter></term>
<listitem>
<para>
文字列の比較に使用する有効なロケール識別子です
@@ -146,7 +146,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-date-to-timestamp.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-date-to-timestamp.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-date-to-timestamp.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<refentry xml:id="function.variant-date-to-timestamp" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>variant_date_to_timestamp</refname>
@@ -9,7 +9,7 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>int</type><methodname>variant_date_to_timestamp</methodname>
+ <type class="union"><type>int</type><type>null</type></type><methodname>variant_date_to_timestamp</methodname>
<methodparam><type>variant</type><parameter>variant</parameter></methodparam>
</methodsynopsis>
<para>
@@ -37,6 +37,7 @@
&reftitle.returnvalues;
<para>
unix タイムスタンプを返します。
+ 失敗時には &null; を返します。
</para>
</refsect1>
<refsect1 role="seealso">
@@ -50,7 +51,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-fix.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-fix.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-fix.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347836 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.variant-fix" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>variant_fix</methodname>
- <methodparam><type>mixed</type><parameter>variant</parameter></methodparam>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
variant の整数部を取得します。
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>variant</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -36,9 +36,9 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- <parameter>variant</parameter> が負の数の場合、variant の値以上の
+ <parameter>value</parameter> が負の数の場合、variant の値以上の
最初の整数値を返します。それ以外の場合は
- <parameter>variant</parameter> の値の整数部分を返します。
+ <parameter>value</parameter> の値の整数部分を返します。
</para>
</refsect1>
@@ -72,7 +72,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-int.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-int.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-int.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347836 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.variant-int" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,7 +11,7 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>variant_int</methodname>
- <methodparam><type>mixed</type><parameter>variant</parameter></methodparam>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
variant の整数部を返します。
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>variant</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -36,9 +36,9 @@
<refsect1 role="returnvalues">
&reftitle.returnvalues;
<para>
- <parameter>variant</parameter> が負の数の場合、variant の値以上の
+ <parameter>value</parameter> が負の数の場合、variant の値以上の
最初の整数値を返します。それ以外の場合は
- <parameter>variant</parameter> の値の整数部分を返します。
+ <parameter>value</parameter> の値の整数部分を返します。
</para>
</refsect1>
@@ -62,7 +62,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-neg.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-neg.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-neg.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347836 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.variant-neg" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,10 +11,10 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>variant_neg</methodname>
- <methodparam><type>mixed</type><parameter>variant</parameter></methodparam>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
- <parameter>variant</parameter> の論理否定演算を行います。
+ <parameter>value</parameter> の論理否定演算を行います。
</para>
</refsect1>
<refsect1 role="parameters">
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>variant</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -48,7 +48,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-not.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-not.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-not.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 347836 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<!-- Credits: mumumu -->
<refentry xml:id="function.variant-not" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
@@ -11,10 +11,10 @@
&reftitle.description;
<methodsynopsis>
<type>variant</type><methodname>variant_not</methodname>
- <methodparam><type>mixed</type><parameter>variant</parameter></methodparam>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
</methodsynopsis>
<para>
- <parameter>variant</parameter> のビット否定演算を行い、その結果を返します。
+ <parameter>value</parameter> のビット否定演算を行い、その結果を返します。
</para>
</refsect1>
<refsect1 role="parameters">
@@ -22,7 +22,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>variant</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -37,7 +37,7 @@
&reftitle.returnvalues;
<para>
ビット否定演算の結果を返します。
- <parameter>variant</parameter> が &null; の場合、
+ <parameter>value</parameter> が &null; の場合、
結果も &null; となります。
</para>
</refsect1>
@@ -50,7 +50,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/functions/variant-round.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/functions/variant-round.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/functions/variant-round.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 334762 Maintainer: takagi Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: takagi Status: ready -->
<refentry xml:id="function.variant-round" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>variant_round</refname>
@@ -9,12 +9,12 @@
<refsect1 role="description">
&reftitle.description;
<methodsynopsis>
- <type>mixed</type><methodname>variant_round</methodname>
- <methodparam><type>mixed</type><parameter>variant</parameter></methodparam>
+ <type class="union"><type>variant</type><type>null</type></type><methodname>variant_round</methodname>
+ <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
<methodparam><type>int</type><parameter>decimals</parameter></methodparam>
</methodsynopsis>
<para>
- <parameter>variant</parameter> を、
+ <parameter>value</parameter> を、
<parameter>decimals</parameter> で指定した桁で丸めた結果を返します。
</para>
</refsect1>
@@ -23,7 +23,7 @@
<para>
<variablelist>
<varlistentry>
- <term><parameter>variant</parameter></term>
+ <term><parameter>value</parameter></term>
<listitem>
<para>
variant。
@@ -46,6 +46,7 @@
&reftitle.returnvalues;
<para>
丸めた結果を返します。
+ 失敗した場合は &null; を返します。
</para>
</refsect1>
<refsect1 role="seealso">
@@ -57,7 +58,6 @@
</para>
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
Modified: phpdoc/ja/trunk/reference/com/variant/construct.xml
===================================================================
--- phpdoc/ja/trunk/reference/com/variant/construct.xml 2020-11-24 23:28:17 UTC (rev 351614)
+++ phpdoc/ja/trunk/reference/com/variant/construct.xml 2020-11-24 23:47:45 UTC (rev 351615)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
-<!-- EN-Revision: 349253 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: 351554 Maintainer: mumumu Status: ready -->
<refentry xml:id="variant.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
@@ -11,10 +11,10 @@
<refsect1 role="description">
&reftitle.description;
<constructorsynopsis role="oop">
- <methodname>variant::__construct</methodname>
+ <modifier>public</modifier> <methodname>variant::__construct</methodname>
<methodparam choice="opt"><type>mixed</type><parameter>value</parameter><initializer>&null;</initializer></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>VT_EMPTY</initializer></methodparam>
- <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer>CP_ACP</initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer><constant>VT_EMPTY</constant></initializer></methodparam>
+ <methodparam choice="opt"><type>int</type><parameter>codepage</parameter><initializer><constant>CP_ACP</constant></initializer></methodparam>
</constructorsynopsis>
<para>
新しい variant オブジェクトを構築します。
@@ -62,7 +62,6 @@
</refsect1>
</refentry>
-
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml