September 2013 - Wine-Commits

Frédéric Delanoy : wineusr: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML .
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: f8d33a0edc6ac04307b05b51280666edc616c7ff URL: http://source.winehq.org/git/docs.git/?a=commit;h=f8d33a0edc6ac04307b05b512… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:03 2013 +0200 wineusr: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML. --- en/wineusr-guide.sgml | 14 +++++++------- en/wineusr-running.sgml | 25 ++++++++++++------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/en/wineusr-guide.sgml b/en/wineusr-guide.sgml index 13698b4..175d194 100644 --- a/en/wineusr-guide.sgml +++ b/en/wineusr-guide.sgml @@ -1,11 +1,11 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity introduction SYSTEM "wineusr-introduction.sgml"> -<!entity getting SYSTEM "wineusr-getting.sgml"> -<!entity configuring SYSTEM "wineusr-configuring.sgml"> -<!entity running SYSTEM "wineusr-running.sgml"> -<!entity bugs SYSTEM "wineusr-bugs.sgml"> -<!entity glossary SYSTEM "wineusr-glossary.sgml"> +<!ENTITY introduction SYSTEM "wineusr-introduction.sgml"> +<!ENTITY getting SYSTEM "wineusr-getting.sgml"> +<!ENTITY configuring SYSTEM "wineusr-configuring.sgml"> +<!ENTITY running SYSTEM "wineusr-running.sgml"> +<!ENTITY bugs SYSTEM "wineusr-bugs.sgml"> +<!ENTITY glossary SYSTEM "wineusr-glossary.sgml"> ]> <book id="index" lang="en"> diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 747e704..402e34f 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -501,18 +501,19 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </row> </thead> <tbody> - <row> + <row> <entry>How to run (assuming executable is called <filename>foo.exe</filename>)</entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wine foo.exe</userinput></screen> - </msgtext></entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wineconsole -- --backend=user foo.exe</userinput></screen> - </msgtext></entry> - <entry><msgtext> -<screen><prompt>$</prompt> <userinput>wineconsole foo.exe</userinput></screen> - </msgtext>You can also use <userinput>--backend=curses</userinput> as an option</entry> - </row> + <entry> + <screen><prompt>$ </prompt><userinput>wine foo.exe</userinput></screen> + </entry> + <entry> + <screen><prompt>$ </prompt><userinput>wineconsole -- --backend=user foo.exe</userinput></screen> + </entry> + <entry> + <screen><prompt>$ </prompt><userinput>wineconsole foo.exe</userinput></screen> + You can also use <parameter class="option">--backend=curses</parameter> as an option + </entry> + </row> <row> <entry>Good support for line oriented CUI applications (which print information line after line) @@ -711,7 +712,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" <row> <entry>Edition mode</entry> <entry> - <msgtext> <para> When the user enter commands, he or she can choose between several edition modes: @@ -735,7 +735,6 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </listitem> </itemizedlist> </para> - </msgtext> </entry> </row> </tbody>

1 0

André Hentschel : winedev: Don' t recommend a preprocessor check to comment out code.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: 81555011154280813636d684211e515547f07440 URL: http://source.winehq.org/git/docs.git/?a=commit;h=81555011154280813636d6842… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 3 00:12:20 2013 +0200 winedev: Don't recommend a preprocessor check to comment out code. --- en/winedev-coding.sgml | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/en/winedev-coding.sgml b/en/winedev-coding.sgml index abc7447..dc865b1 100644 --- a/en/winedev-coding.sgml +++ b/en/winedev-coding.sgml @@ -100,21 +100,20 @@ <listitem> <para> Commenting out a block of code is usually done by - enclosing it in <command>#if 0 ... #endif</command> - statements. For example. + using <command>if (0)</command>. For example: </para> <screen> /* note about reason for commenting block */ -#if 0 +if (0) { code code /* comments */ code -#endif +} </screen> <para> The reason for using this method is that it does not require that you edit comments that may be inside the - block of code. + block of code and it makes sure the code gets maintained. </para> </listitem> <listitem>

1 0

André Hentschel : winedev: Leave instructions up to the howto.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: bf8123ff496696c7312424f693791a80cf2430f5 URL: http://source.winehq.org/git/docs.git/?a=commit;h=bf8123ff496696c7312424f69… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 22:14:37 2013 +0200 winedev: Leave instructions up to the howto. --- en/winedev-testing.sgml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index f0643b2..9350f00 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -389,9 +389,8 @@ Kit</ulink>. </para></listitem> <listitem><para> If you want to use the Microsoft C++ Toolkit under Wine, - install it under Windows, then copy it to your fake C drive; - it'll work fine there. See <ulink url="http://kegel.com/wine/cl-howto.html">CL Howto</ulink> - for some tips on making it easy to use from the Linux command line. + see <ulink url="http://kegel.com/wine/cl-howto.html">CL Howto</ulink> + for some tips on making it easy to use it from the Linux command line. </para></listitem> </itemizedlist> </para>

1 0

Frédéric Delanoy : winelib: Upgrade to Docbook 4 SGML.
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: c24e262aee7e5a7a2c23c4df3e629b2edf24fafd URL: http://source.winehq.org/git/docs.git/?a=commit;h=c24e262aee7e5a7a2c23c4df3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:05 2013 +0200 winelib: Upgrade to Docbook 4 SGML. --- en/winelib-guide.sgml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/en/winelib-guide.sgml b/en/winelib-guide.sgml index fb94674..e09f922 100644 --- a/en/winelib-guide.sgml +++ b/en/winelib-guide.sgml @@ -1,10 +1,10 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity intro SYSTEM "winelib-intro.sgml"> -<!entity porting SYSTEM "winelib-porting.sgml"> -<!entity toolkit SYSTEM "winelib-toolkit.sgml"> -<!entity mfc SYSTEM "winelib-mfc.sgml"> -<!entity bindlls SYSTEM "winelib-bindlls.sgml"> +<!ENTITY intro SYSTEM "winelib-intro.sgml"> +<!ENTITY porting SYSTEM "winelib-porting.sgml"> +<!ENTITY toolkit SYSTEM "winelib-toolkit.sgml"> +<!ENTITY mfc SYSTEM "winelib-mfc.sgml"> +<!ENTITY bindlls SYSTEM "winelib-bindlls.sgml"> ]>

1 0

Frédéric Delanoy : winedev: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML .
by Alexandre Julliard Sept. 3, 2013

Sept. 3, 2013

Module: docs Branch: master Commit: 2ac7f38d911dca3081e6e5cf97e1dbdffe7adbe2 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2ac7f38d911dca3081e6e5cf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 31 18:49:04 2013 +0200 winedev: Remove inappropriate msgtext tags in table cells & upgrade to Docbook 4 SGML. --- en/winedev-debugger.sgml | 14 -------------- en/winedev-documentation.sgml | 6 +++--- en/winedev-guide.sgml | 28 ++++++++++++++-------------- en/winedev-kernel.sgml | 4 ---- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 1b764b0..f73d473 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -1533,12 +1533,10 @@ set $BreakAllThreadsStartup = 1 <tbody> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>cont</command></member> <member><command>c</command></member> </simplelist> - </msgtext> </entry> <entry>continue execution until next breakpoint or exception.</entry> @@ -1550,12 +1548,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>step</command></member> <member><command>s</command></member> </simplelist> - </msgtext> </entry> <entry> continue execution until next <quote>C</quote> line of code @@ -1564,12 +1560,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>next</command></member> <member><command>n</command></member> </simplelist> - </msgtext> </entry> <entry> continue execution until next <quote>C</quote> line of code @@ -1578,12 +1572,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>stepi</command></member> <member><command>si</command></member> </simplelist> - </msgtext> </entry> <entry> execute next assembly instruction (enters function @@ -1592,12 +1584,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>nexti</command></member> <member><command>ni</command></member> </simplelist> - </msgtext> </entry> <entry> execute next assembly instruction (doesn't enter @@ -1606,12 +1596,10 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member><command>finish</command></member> <member><command>f</command></member> </simplelist> - </msgtext> </entry> <entry>execute until current function is exited</entry> </row> @@ -1981,7 +1969,6 @@ set $BreakAllThreadsStartup = 1 </row> <row> <entry> - <msgtext> <simplelist type="inline"> <member> <command>del display</command> @@ -1992,7 +1979,6 @@ set $BreakAllThreadsStartup = 1 <replaceable>N</replaceable> </member> </simplelist> - </msgtext> </entry> <entry>deletes display <replaceable>N</replaceable></entry> </row> diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 407a228..e83657b 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -920,7 +920,7 @@ Generally, you will declare which DTD you want to use as the first line of your SGML document. In the case of DocBook, you will use something like this: - <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> + <programlisting><!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <book> ... </book></programlisting> @@ -929,7 +929,7 @@ Note that you must specify your toplevel element inside the doctype declaration. If you were writing an article rather than a book, you might use this declaration instead: - <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> + <programlisting><!doctype article PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <article> ... </article></programlisting> @@ -980,7 +980,7 @@ --> <programlisting> <![CDATA[ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" []> +<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" []> <book id="index"> <bookinfo> <title>A Poet's Guide to Nonsense</title> diff --git a/en/winedev-guide.sgml b/en/winedev-guide.sgml index aebbbac..0e39680 100644 --- a/en/winedev-guide.sgml +++ b/en/winedev-guide.sgml @@ -1,19 +1,19 @@ -<!doctype book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [ +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN" [ -<!entity debugger SYSTEM "winedev-debugger.sgml"> -<!entity debugging SYSTEM "winedev-debugging.sgml"> -<!entity otherdebug SYSTEM "winedev-otherdebug.sgml"> -<!entity codingpractice SYSTEM "winedev-coding.sgml"> -<!entity testing SYSTEM "winedev-testing.sgml"> -<!entity documentation SYSTEM "winedev-documentation.sgml"> +<!ENTITY debugger SYSTEM "winedev-debugger.sgml"> +<!ENTITY debugging SYSTEM "winedev-debugging.sgml"> +<!ENTITY otherdebug SYSTEM "winedev-otherdebug.sgml"> +<!ENTITY codingpractice SYSTEM "winedev-coding.sgml"> +<!ENTITY testing SYSTEM "winedev-testing.sgml"> +<!ENTITY documentation SYSTEM "winedev-documentation.sgml"> -<!entity architecture SYSTEM "winedev-architecture.sgml"> -<!entity kernel SYSTEM "winedev-kernel.sgml"> -<!entity windowing SYSTEM "winedev-windowing.sgml"> -<!entity ole SYSTEM "winedev-ole.sgml"> -<!entity opengl SYSTEM "winedev-opengl.sgml"> -<!entity ddraw SYSTEM "winedev-ddraw.sgml"> -<!entity multimedia SYSTEM "winedev-multimedia.sgml"> +<!ENTITY architecture SYSTEM "winedev-architecture.sgml"> +<!ENTITY kernel SYSTEM "winedev-kernel.sgml"> +<!ENTITY windowing SYSTEM "winedev-windowing.sgml"> +<!ENTITY ole SYSTEM "winedev-ole.sgml"> +<!ENTITY opengl SYSTEM "winedev-opengl.sgml"> +<!ENTITY ddraw SYSTEM "winedev-ddraw.sgml"> +<!ENTITY multimedia SYSTEM "winedev-multimedia.sgml"> ]> <book id="index" lang="en"> diff --git a/en/winedev-kernel.sgml b/en/winedev-kernel.sgml index 16067f3..4a210ef 100644 --- a/en/winedev-kernel.sgml +++ b/en/winedev-kernel.sgml @@ -1189,7 +1189,6 @@ if (res != ERROR_SUCCESS) return res; <entry>Drive relative path</entry> <entry><filename>j:gee\bar.txt</filename></entry> <entry> - <msgtext> <para> <itemizedlist> <listitem> @@ -1212,10 +1211,8 @@ if (res != ERROR_SUCCESS) return res; </listitem> </itemizedlist> </para> - </msgtext> </entry> <entry> - <msgtext> <para> <itemizedlist> <listitem> @@ -1238,7 +1235,6 @@ if (res != ERROR_SUCCESS) return res; </listitem> </itemizedlist> </para> - </msgtext> </entry> </row> <row>

1 0

André Hentschel : Use protocol relative urls in the theme
by Jeremy Newman Sept. 3, 2013

Sept. 3, 2013

Module: website Branch: master Commit: ef8cfbe0c92cd930f0ed05a053aa44fa5293c174 URL: http://source.winehq.org/git/website.git/?a=commit;h=ef8cfbe0c92cd930f0ed05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 2 20:39:38 2013 +0200 Use protocol relative urls in the theme --- templates/de/global/404.template | 2 +- templates/de/global/themes/winehq/content.template | 8 ++++---- .../de/global/themes/winehq/content_nobox.template | 8 ++++---- templates/en/global/404.template | 2 +- templates/en/global/themes/winehq/content.template | 8 ++++---- .../en/global/themes/winehq/content_nobox.template | 8 ++++---- templates/es/global/404.template | 2 +- templates/fr/global/404.template | 2 +- templates/fr/global/themes/winehq/content.template | 8 ++++---- .../fr/global/themes/winehq/content_nobox.template | 8 ++++---- templates/he/global/404.template | 2 +- templates/he/global/themes/winehq/content.template | 8 ++++---- .../he/global/themes/winehq/content_nobox.template | 8 ++++---- templates/tr/global/404.template | 2 +- templates/tr/global/themes/winehq/content.template | 8 ++++---- .../tr/global/themes/winehq/content_nobox.template | 8 ++++---- templates/zh-cn/global/404.template | 2 +- 17 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ef8cfbe0c92cd930f0…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.1
by Jeremy Newman Sept. 3, 2013

Sept. 3, 2013

Module: website Branch: master Commit: dc0a446a2868126ba9081c78c355c20f6406f9e6 URL: http://source.winehq.org/git/website.git/?a=commit;h=dc0a446a2868126ba9081c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 31 06:56:33 2013 +0200 Polish translation for release 1.7.1 --- news/pl/2013083001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2013083001.xml b/news/pl/2013083001.xml new file mode 100644 index 0000000..36f70f6 --- /dev/null +++ b/news/pl/2013083001.xml @@ -0,0 +1,18 @@ +<news> +<date>Sierpień 30, 2013</date> +<title>Wydano Wine 1.7.1</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.1 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.1">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla obiektów kluczowych zdarzeń.</li> + <li>Wsparcie dla mechanizmu synchronizacji "init once".</li> + <li>Wsparcie aktywacji kontekstu dla bibliotek DLL, bibliotek typów, i klas COM.</li> + <li>Wsparcie dla wczytywania bibliotek typów 32-bitowych na 64-bitach.</li> + <li>Rozmaite poprawki w sterowniku Mac.</li> + <li>Kilka poprawek dla urządzeń na port szeregowy.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

André Hentschel : Wine 1.7.1 freigegeben
by Jeremy Newman Sept. 3, 2013

Sept. 3, 2013

Module: website Branch: master Commit: e797247bec1af5e146447c9133114158c77c4ea8 URL: http://source.winehq.org/git/website.git/?a=commit;h=e797247bec1af5e146447c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 30 20:44:03 2013 +0200 Wine 1.7.1 freigegeben --- news/de/2013083001.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2013083001.xml b/news/de/2013083001.xml new file mode 100644 index 0000000..68a90b1 --- /dev/null +++ b/news/de/2013083001.xml @@ -0,0 +1,18 @@ +<news> +<date>30. August 2013</date> +<title>Wine 1.7.1 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.1 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung für "keyed event" Objekte.</li> + <li>Unterstützung für den "init once" Synchronisationsmechanismus.</li> + <li>Activation Context Unterstützung für DLLs, Typelibs und COM Klassen.</li> + <li>Das Laden von 32-Bit Typelibs wird unter 64-Bit unterstützt.</li> + <li>Verschiedene Mac Treiber Fehlerbehebungen.</li> + <li>Einige Fehlerbehebungen für die seriellen Schnittstellen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +<p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.1
by Jeremy Newman Sept. 3, 2013

Sept. 3, 2013

Module: website Branch: master Commit: cda0a006ad78ccf66fb5ab28caaf9da718e051ab URL: http://source.winehq.org/git/website.git/?a=commit;h=cda0a006ad78ccf66fb5ab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 30 21:48:40 2013 +0200 French translation for release 1.7.1 --- news/fr/2013083001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/fr/2013083001.xml b/news/fr/2013083001.xml new file mode 100644 index 0000000..6ad45fd --- /dev/null +++ b/news/fr/2013083001.xml @@ -0,0 +1,17 @@ +<news> +<date>30 août 2013</date> +<title>Sortie de Wine 1.7.1</title> +<body> +<p> La version de développement 1.7.1 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.1">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des objets de type « keyed event ».</li> + <li>Prise en charge du mécanisme de synchronisation de type « initialisation unique ».</li> + <li>Prise en charge du contexte d'activation pour les DLL, bibliothèques de types et classes COM.</li> + <li>Prise en charge du chargement des bibliothèques de types 32 bits sur les systèmes 64 bits.</li> + <li>Divers correctifs pour le pilote Mac.</li> + <li>Quelques correctifs pour les périphériques série.</li> + <li>Diverses corrections de bogues.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.1.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Bruno Jesus : server: Store the protocol while creating the socket.
by Alexandre Julliard Sept. 2, 2013

Sept. 2, 2013

Module: wine Branch: master Commit: f5023dda2d50b56d8c5d633c5769190ad0816916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5023dda2d50b56d8c5d633c5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Aug 31 00:14:44 2013 -0300 server: Store the protocol while creating the socket. --- server/sock.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/server/sock.c b/server/sock.c index 041867e..13cef61 100644 --- a/server/sock.c +++ b/server/sock.c @@ -96,6 +96,7 @@ struct sock unsigned int pmask; /* pending events */ unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ + unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ unsigned short family; /* socket family */ struct event *event; /* event object */ @@ -643,6 +644,7 @@ static struct object *create_socket( int family, int type, int protocol, unsigne init_sock( sock ); sock->state = (type != SOCK_STREAM) ? (FD_READ|FD_WRITE) : 0; sock->flags = flags; + sock->proto = protocol; sock->type = type; sock->family = family; @@ -715,6 +717,7 @@ static struct sock *accept_socket( obj_handle_t handle ) if (sock->state & FD_WINE_NONBLOCKING) acceptsock->state |= FD_WINE_NONBLOCKING; acceptsock->mask = sock->mask; + acceptsock->proto = sock->proto; acceptsock->type = sock->type; acceptsock->family = sock->family; acceptsock->window = sock->window;

1 0