April 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Rename some GL vendors.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: ca1b35aaffd6250fd2c4ff57190b2e5d6c8ea183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1b35aaffd6250fd2c4ff571… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 4 19:51:41 2010 +0200 wined3d: Rename some GL vendors. GL_VENDOR_ATI -> GL_VENDOR_FGLRX because it's much more specific. Besides, AMD also works on the Mesa drivers. --- dlls/wined3d/directx.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b67ede8..253ec4a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -571,7 +571,7 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - return (gl_vendor == GL_VENDOR_ATI); + return gl_vendor == GL_VENDOR_FGLRX; } @@ -1197,7 +1197,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl return GL_VENDOR_NVIDIA; if (strstr(gl_vendor_string, "ATI")) - return GL_VENDOR_ATI; + return GL_VENDOR_FGLRX; if (strstr(gl_vendor_string, "Intel(R)") || strstr(gl_renderer, "Intel(R)") @@ -1214,9 +1214,10 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl || strstr(gl_renderer, "Gallium")) return GL_VENDOR_MESA; - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_WINE.\n", debugstr_a(gl_vendor_string)); + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", + debugstr_a(gl_vendor_string)); - return GL_VENDOR_WINE; + return GL_VENDOR_UNKNOWN; } static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) @@ -1916,7 +1917,7 @@ static const struct vendor_card_selection vendor_card_select_table[] = {GL_VENDOR_APPLE, HW_VENDOR_NVIDIA, "Apple OSX NVidia binary driver", select_card_nvidia_binary}, {GL_VENDOR_APPLE, HW_VENDOR_ATI, "Apple OSX AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_APPLE, HW_VENDOR_INTEL, "Apple OSX Intel binary driver", select_card_intel_binary}, - {GL_VENDOR_ATI, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, + {GL_VENDOR_FGLRX, HW_VENDOR_ATI, "AMD/ATI binary driver", select_card_ati_binary}, {GL_VENDOR_MESA, HW_VENDOR_ATI, "Mesa AMD/ATI driver", select_card_ati_mesa}, {GL_VENDOR_MESA, HW_VENDOR_NVIDIA, "Mesa Nouveau driver", select_card_nvidia_mesa}, {GL_VENDOR_MESA, HW_VENDOR_INTEL, "Mesa Intel driver", select_card_intel_mesa} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f894d2..726281d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1259,9 +1259,9 @@ typedef struct WineD3D_PixelFormat enum wined3d_gl_vendor { - GL_VENDOR_WINE, + GL_VENDOR_UNKNOWN, GL_VENDOR_APPLE, - GL_VENDOR_ATI, + GL_VENDOR_FGLRX, GL_VENDOR_INTEL, GL_VENDOR_MESA, GL_VENDOR_NVIDIA,

1 0

Alexandre Julliard : rpcrt4: Fix the pointer alignment macros for 64-bit.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: afa56b29ced0ba676642bbb7d1549fe3c1272ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa56b29ced0ba676642bbb7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 21:38:32 2010 +0200 rpcrt4: Fix the pointer alignment macros for 64-bit. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f36069c..62f5847 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -93,7 +93,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* _Align must be the desired alignment, * e.g. ALIGN_LENGTH(len, 4) to align on a dword boundary. */ -#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align)-1)&~((_Align)-1)) +#define ALIGNED_LENGTH(_Len, _Align) (((_Len)+(_Align)-1)&~((ULONG_PTR)(_Align)-1)) #define ALIGNED_POINTER(_Ptr, _Align) ((LPVOID)ALIGNED_LENGTH((ULONG_PTR)(_Ptr), _Align)) #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align)

1 0

Alexandre Julliard : dpwsockx: Use standard Win32 types instead of the BSD ones.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: 854c3a872fa109df098b0926f347f7c945143938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=854c3a872fa109df098b0926f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 3 18:08:24 2010 +0200 dpwsockx: Use standard Win32 types instead of the BSD ones. --- dlls/dpwsockx/dpwsockx_dll.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dpwsockx/dpwsockx_dll.h b/dlls/dpwsockx/dpwsockx_dll.h index a9454da..1a6ad6c 100644 --- a/dlls/dpwsockx/dpwsockx_dll.h +++ b/dlls/dpwsockx/dpwsockx_dll.h @@ -47,13 +47,13 @@ typedef struct tagDPWS_DATA #ifdef WORDS_BIGENDIAN -static inline u_short __dpws_ushort_swap(u_short s) +static inline USHORT __dpws_ushort_swap(USHORT s) { return (s >> 8) | (s << 8); } -static inline u_long __dpws_ulong_swap(u_long l) +static inline ULONG __dpws_ulong_swap(ULONG l) { - return ((u_long)__dpws_ushort_swap((u_short)l) << 16) | __dpws_ushort_swap((u_short)(l >> 16)); + return ((ULONG)__dpws_ushort_swap((USHORT)l) << 16) | __dpws_ushort_swap((USHORT)(l >> 16)); } #define dpws_letohl(l) __dpws_ulong_swap(l) @@ -63,10 +63,10 @@ static inline u_long __dpws_ulong_swap(u_long l) #else /* WORDS_BIGENDIAN */ -#define dpws_letohl(l) ((u_long)(l)) -#define dpws_letohs(s) ((u_short)(s)) -#define dpws_htolel(l) ((u_long)(l)) -#define dpws_htoles(s) ((u_short)(s)) +#define dpws_letohl(l) ((ULONG)(l)) +#define dpws_letohs(s) ((USHORT)(s)) +#define dpws_htolel(l) ((ULONG)(l)) +#define dpws_htoles(s) ((USHORT)(s)) #endif /* WORDS_BIGENDIAN */

1 0

Alexandre Julliard : include: Try harder to redefine u_long, and avoid using it in headers as far as possible.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: c611af370bd0bd538238d767f01cc2316709b346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c611af370bd0bd538238d767f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 3 18:09:18 2010 +0200 include: Try harder to redefine u_long, and avoid using it in headers as far as possible. --- include/mstcpip.h | 6 ++-- include/winsock.h | 72 ++++++++++++++++++++++++--------------------------- include/winsock2.h | 18 ++++++------ include/ws2ipdef.h | 6 ++-- 4 files changed, 49 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c611af370bd0bd538238d…

1 0

André Hentschel : winemaker: Add German translation of the manpage.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: d53e75af1474d0bd9c8b8660827baaf8fe708f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53e75af1474d0bd9c8b86608… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 3 15:53:43 2010 +0200 winemaker: Add German translation of the manpage. --- .gitignore | 1 + tools/Makefile.in | 7 +- tools/winemaker.de.man.in | 245 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 251 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d53e75af1474d0bd9c8b8…

1 0

André Hentschel : server: Add German translation of the manpage.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: d5b28032ef3b42d9eadbff697f2643720b88775e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b28032ef3b42d9eadbff697… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 3 15:53:19 2010 +0200 server: Add German translation of the manpage. --- .gitignore | 1 + server/Makefile.in | 5 ++- server/wineserver.de.man.in | 113 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 7dcf06c..3af2027 100644 --- a/.gitignore +++ b/.gitignore @@ -253,6 +253,7 @@ programs/winetest/build.rc programs/winhlp32/macro.lex.yy.c server/wineserver server/wineserver-installed +server/wineserver.de.man server/wineserver.fr.man server/wineserver.man tools/fnt2bdf diff --git a/server/Makefile.in b/server/Makefile.in index cee5c39..7a67707 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -52,11 +52,12 @@ C_SRCS = \ winstation.c PROGRAMS = wineserver wineserver-installed -MANPAGES = wineserver.man wineserver.fr.man +MANPAGES = wineserver.man wineserver.de.man wineserver.fr.man INSTALLDIRS = \ $(DESTDIR)$(bindir) \ $(DESTDIR)$(mandir)/man$(prog_manext) \ + $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext) \ $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext) all: $(PROGRAMS) $(MANPAGES) @@ -72,8 +73,10 @@ wineserver-installed: $(OBJS) install install-lib:: wineserver-installed $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) wineserver-installed $(DESTDIR)$(bindir)/wineserver $(INSTALL_DATA) wineserver.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + $(INSTALL_DATA) wineserver.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) $(INSTALL_DATA) wineserver.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(bindir)/wineserver $(DESTDIR)$(mandir)/man$(prog_manext)/wineserver.$(prog_manext) + $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wineserver.$(prog_manext) diff --git a/server/wineserver.de.man.in b/server/wineserver.de.man.in new file mode 100644 index 0000000..0a4ea93 --- /dev/null +++ b/server/wineserver.de.man.in @@ -0,0 +1,113 @@ +.\" -*- nroff -*- +.TH WINESERVER 1 "April 2010" "@PACKAGE_STRING@" "Windows on Unix" +.SH NAME +wineserver \- Der Wine Server +.SH ÜBERSICHT +.BI wineserver\ [options] +.SH BESCHREIBUNG +.B wineserver +ist ein Hintergrundprozess der Wine grob die gleichen Dienste bereitstellt, +die der Windows Kernel unter Windows bereitstellt. +.PP +.B wineserver +startet normal automatisch mit \fBwine(1)\fR, deswegen müssten Sie +sich nicht damit beschäftigen. In einigen Fällen kann es nützlich sein +\fBwineserver\fR direkt mit verschiedenen Parametern zu starten wie +weiter unten beschrieben. +.SH ARGUMENTE +.TP +.BI \-d [n] ,\ --debug [=n] +Setzt das Debuglevel auf +.I n. +0 gibt keine Debuginfos aus, 1 ist normal und 2 steht für +detaillierte Debuginfos. Wenn +.I n +nicht angegeben wird, ist 1 der Standardwert. Die Debugausgabe wird +an stderr geleitet. \fBwine(1)\fR wird beim starten von \fBwineserver\fR +automatisch das Debuglevel setzen, wenn +server in der WINEDEBUG +Umgebungsvariable gesetzt ist. +.TP +.B \-f, --foreground +Lässt den Server für einfachere Fehlersuche im Vordergrund laufen. +Beispielsweise für den Betrieb im Debugger. +.TP +.B \-h, --help +Zeigt den Hilfetext an. +.TP +.BI \-k [n] ,\ --kill [=n] +Beendet den gerade laufenden +.B wineserver, +optional mit Signal \fIn\fR. Wenn kein Signal angegeben wurde, wird +erst ein SIGINT und darauf ein SIGKILL gesendet. Die \fBwineserver\fR +Instanz die beendet wird, wird durch die Umgebungsvariable WINEPREFIX +bestimmt. +.TP +.BI \-p [n] ,\ --persistent [=n] +Gibt die Zeit an, die \fBwineserver\fR weiterläuft nach dem sich alle Clients +beendet haben. Damit kann man das beenden und wieder starten sparen, +wenn Anwendungen schnell hintereinander gestartet werden. Die Zeit \fIn\fR ist +in Sekunden, der Standardwert ist 3. Wenn \fIn\fR nicht angegeben wird, läuft +der Server ewig weiter. +.TP +.B \-v, --version +Zeigt Versionsinformationen an und beendet sich wieder. +.TP +.B \-w, --wait +Wartet bis sich der gerade laufende +.B wineserver +beendet hat. +.SH UMGEBUNGSVARIABLEN +.TP +.I WINEPREFIX +Durch setzen dieser Variable wird der Inhalt als Pfad zu einem Verzeichnis +interpretiert, in dem +.B wineserver +seine Daten ablegt (Standardmäßig in \fI$HOME/.wine\fR). Alle +.B wine +Prozesse nutzen den gleichen +.B wineserver +(z.B.: beim gleichen Nutzer), teilen einige Sachen wie Registry, gemeinsamer Speicher +und Kernel Objekte. +Durch setzen von +.I WINEPREFIX +zu unterschiedlichen Pfaden für verschiedene Wine Prozesse ist es möglich unabhängige +Wine Sitzungen zu betreiben. +.TP +.I WINESERVER +Gibt den Pfad und Namen der +.B wineserver +Datei an, die automatisch von \fBwine\fR gestartet wird. Wenn diese +Variable nicht gesetzt ist wird \fBwine\fR versuchen +.I @bindir@/wineserver, +zu laden. Existiert dieser Pfad nicht wird nach einer Datei namens +\fIwineserver\fR im Pfad und ähnlichen Orten gesucht. +.SH DATEIEN +.TP +.B ~/.wine +Verzeichnis mit Benutzerspezifischen Daten die zu +.B wine +gehören. +.TP +.BI /tmp/.wine- uid +Das Verzeichnis enthält den Server Unix Socket und die lock-Datei. +Die Dateien werden in einem Unterverzeichnis angelegt welches sich aus +Geräte- und Inodenummer des WINEPREFIX zusammensetzt. +.SH AUTOREN +Der ursprüngliche Autor von +.B wineserver +ist Alexandre Julliard. Viele andere Leute haben neue Funktionen hinzugefügt +und Fehler behoben. Bitte für mehr Informationen die Datei Changelog lesen. +.SH FEHLER +Wenn Sie einen Fehler finden, melden Sie ihn bitte unter +.UR http://bugs.winehq.org +.B http://bugs.winehq.org. +.UE +.SH VERFÜGBARKEIT +.B wineserver +ist Teil der Wine Distribution, welche über WineHQ, dem Wine Entwicklungs Hauptquartier, +verfügbar ist unter +.UR http://www.winehq.org/ +.B http://www.winehq.org/. +.UE +.SH "SIEHE AUCH" +.BR wine (1).

1 0

André Hentschel : winedump: Update manpage.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: 01c406cf050a0a0df2b7d415b027806f14c0e72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c406cf050a0a0df2b7d415b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 2 18:03:01 2010 +0200 winedump: Update manpage. --- tools/winedump/winedump.man.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/winedump/winedump.man.in b/tools/winedump/winedump.man.in index fcc596d..d632ec5 100644 --- a/tools/winedump/winedump.man.in +++ b/tools/winedump/winedump.man.in @@ -211,9 +211,8 @@ This is a template for 'configure' to produce a makefile. It is designed for a DLL that will be inserted into the Wine source tree. .SH BUGS -C++ name demangling is currently under development. Since the -algorithm used is not documented, it must be decoded. Many simple -prototypes are already working however. +C++ name demangling is not fully in sync with the implementation in msvcrt. +It might be useful to submit your C++ name to the testsuite for msvcrt. .SH AUTHORS Jon P. Griffiths <jon_p_griffiths at yahoo dot com> .nf

1 0

André Hentschel : winemaker: Fix manpage.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: 84669a3920d56d1dc7ef53611f5e639522a6d4e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84669a3920d56d1dc7ef53611… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 2 18:02:53 2010 +0200 winemaker: Fix manpage. --- tools/winemaker.man.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker.man.in b/tools/winemaker.man.in index cdfd49a..ef78b4a 100644 --- a/tools/winemaker.man.in +++ b/tools/winemaker.man.in @@ -63,7 +63,7 @@ encounters something out of the ordinary, winemaker will warn you about it. .PP - winemaker can also scan a complete directory tree at once, guess what are the executables and libraries you are trying to build, match them with -source files, and generate the corresponding Makefile.in files. +source files, and generate the corresponding Makefile. .PP - finally winemaker will generate a global Makefile for normal use. .PP @@ -170,7 +170,7 @@ target specific options. Specifies that there is only one target, and that it is called "name". .TP .I --generated-files -Tells winemaker to generate the build the Makefile. This is the default. +Tells winemaker to generate the Makefile. This is the default. .TP .I --nogenerated-files Tells winemaker not to generate the Makefile.

1 0

Alexandre Julliard : rpcrt4: Replace the alignment macros by inline functions.
by Alexandre Julliard April 5, 2010

April 5, 2010

Module: wine Branch: master Commit: b91e5302a5cc2b5d8036367d4e42e4020a4c64a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91e5302a5cc2b5d8036367d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 21:54:55 2010 +0200 rpcrt4: Replace the alignment macros by inline functions. --- dlls/rpcrt4/ndr_marshall.c | 292 ++++++++++++++++++++++--------------------- 1 files changed, 149 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91e5302a5cc2b5d80363…

1 0

Alexandre Julliard : Wine release 1.1.42
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: website Branch: master Commit: acd530eaf1d44d611551cd900375a1477c964f72 URL: http://source.winehq.org/git/website.git/?a=commit;h=acd530eaf1d44d611551cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 2 19:51:35 2010 +0200 Wine release 1.1.42 --- news/en/2010040201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010040201.xml b/news/en/2010040201.xml new file mode 100644 index 0000000..3c45ef1 --- /dev/null +++ b/news/en/2010040201.xml @@ -0,0 +1,18 @@ +<news> +<date>April 2, 2010</date> +<title>Wine 1.1.42 Released</title> +<body> + The Wine development release 1.1.42 is now available. + <a href="{$root}/announce/1.1.42">What's new</a> in this release: +<ul> + <li>Support for shared 32/64-bit setups.</li> + <li>Dwarf debug info support for better backtraces.</li> + <li>More standard actions supported in MSI.</li> + <li>Support for TIFF image format in WinCodecs.</li> + <li>A number of Direct3D improvements.</li> + <li>Shell fixes for better Internet Explorer support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.42.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0