October 2012 - Wine-Commits

Francois Gouget : testbot/lib: Use IO::Socket::INET as a fallback for IO:: Socket::IP.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: c1c9d2d028e2d9b04527a71205d2634d53c4c321 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1c9d2d028e2d9b04527a712… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:14:06 2012 +0200 testbot/lib: Use IO::Socket::INET as a fallback for IO::Socket::IP. The latter provides transparent support for IPv6 but is missing on older Linux distributions. --- testbot/doc/INSTALL.txt | 2 +- testbot/lib/WineTestBot/TestAgent.pm | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 1cbfd83..b01aa48 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -8,7 +8,7 @@ Dependencies: - Sendmail - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) -- IO::Socket::IP (libio-socket-ip-perl) +- Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) MySQL setup: - Create a new 'winetestbot' database and its tables using the diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 513b50f..7b6eb56 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -21,14 +21,33 @@ package TestAgent; use strict; -use IO::Socket::IP; - use WineTestBot::Config; use WineTestBot::Log; my $DONE_READING = 0; my $DONE_WRITING = 1; + +sub create_ip_socket(@) +{ + my $socket; + eval { $socket = IO::Socket::IP->new(@_); }; + return $socket; +} + +sub create_inet_socket(@) +{ + return IO::Socket::INET->new(@_); +} + +my $create_socket = \&create_ip_socket; +eval "use IO::Socket::IP"; +if ($@) +{ + use IO::Socket::INET; + $create_socket = \&create_inet_socket; +} + sub _Connect($;$) { my ($Hostname, $Timeout) = @_; @@ -38,10 +57,8 @@ sub _Connect($;$) while (1) { my $ConnectTimeout = $Timeout < 30 ? $Timeout : 30; - my $socket = IO::Socket::IP->new(PeerHost => $Hostname, - PeerPort => $AgentPort, - Type => SOCK_STREAM, - Timeout => $ConnectTimeout); + my $socket = &$create_socket(PeerHost => $Hostname, PeerPort => $AgentPort, + Type => SOCK_STREAM, Timeout => $ConnectTimeout); return $socket if ($socket); $Timeout = $Deadline - time();

1 0

Francois Gouget : testbot/Engine: Simplify the client command dispatching.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: 3708ce43194501b05a1d65c316ad16414e535c17 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3708ce43194501b05a1d65c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:13:23 2012 +0200 testbot/Engine: Simplify the client command dispatching. --- testbot/bin/Engine.pl | 66 +++++++++++++----------------------------------- 1 files changed, 18 insertions(+), 48 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f453927..7834619 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -440,57 +440,27 @@ sub HandleGetScreenshot return "1" . $ImageBytes; } +my %Handlers=( + "expectwinetestupdate" => \&HandleExpectWinetestUpdate, + "foundwinetestupdate" => \&HandleFoundWinetestUpdate, + "getscreenshot" => \&HandleGetScreenshot, + "jobcancel" => \&HandleJobCancel, + "jobstatuschange" => \&HandleJobStatusChange, + "jobsubmit" => \&HandleJobSubmit, + "ping" => \&HandlePing, + "taskcomplete" => \&HandleTaskComplete, + "vmstatuschange" => \&HandleVMStatusChange, + "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, + "winepatchwebnotification" => \&HandleWinePatchWebNotification, + "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + ); + sub HandleClientCmd { my $Cmd = shift; - if ($Cmd eq "ping") - { - return HandlePing(@_); - } - if ($Cmd eq "jobsubmit") - { - return HandleJobSubmit(@_); - } - if ($Cmd eq "jobstatuschange") - { - return HandleJobStatusChange(@_); - } - if ($Cmd eq "jobcancel") - { - return HandleJobCancel(@_); - } - if ($Cmd eq "taskcomplete") - { - return HandleTaskComplete(@_); - } - if ($Cmd eq "vmstatuschange") - { - return HandleVMStatusChange(@_); - } - if ($Cmd eq "expectwinetestupdate") - { - return HandleExpectWinetestUpdate(@_); - } - if ($Cmd eq "foundwinetestupdate") - { - return HandleFoundWinetestUpdate(@_); - } - if ($Cmd eq "winepatchmlsubmission") - { - return HandleWinePatchMLSubmission(@_); - } - if ($Cmd eq "winepatchwebnotification") - { - return HandleWinePatchWebNotification(@_); - } - if ($Cmd eq "winepatchwebsubmission") - { - return HandleWinePatchWebSubmission(@_); - } - if ($Cmd eq "getscreenshot") - { - return HandleGetScreenshot(@_); - } + + my $handler = $Handlers{$Cmd}; + return &$handler(@_) if (defined $handler); LogMsg "Unknown command $Cmd\n"; return "0Unknown command $Cmd\n";

1 0

Francois Gouget : testbot/web: Link the Patches page to the corresponding job details pages.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: 894854ea0711fe9646fb048cda83bbda2a7f512b URL: http://source.winehq.org/git/tools.git/?a=commit;h=894854ea0711fe9646fb048c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:01 2012 +0200 testbot/web: Link the Patches page to the corresponding job details pages. --- testbot/web/PatchesList.pl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 0936019..4e3437a 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -20,6 +20,7 @@ use strict; package PatchesListPage; +use URI::Escape; use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; @@ -78,6 +79,25 @@ sub GeneratePage $self->SUPER::GeneratePage(@_); } +sub GenerateDataCell +{ + my $self = shift; + my ($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Disposition" and $Item->Disposition =~ /job ([0-9]+)$/) + { + my $JobId = $1; + my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); + print "<td><a href='" . $self->escapeHTML($URI) . "'>" . + "Job " . $self->escapeHTML($JobId) . "</a></td>\n"; + } + else + { + $self->SUPER::GenerateDataCell(@_); + } +} + package main; my $Request = shift;

1 0

Francois Gouget : testbot/web: Make it possible for web pages to set their page title.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: c1d75ee839c357dfb32b2ce0b13e39fb7daa4011 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1d75ee839c357dfb32b2ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:57 2012 +0200 testbot/web: Make it possible for web pages to set their page title. Previously they could set their header but not the label that appears in the Web browser's tab or title bar. --- testbot/lib/ObjectModel/CGI/Page.pm | 14 ++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a21ad36..0661519 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -102,6 +102,20 @@ sub SetCookies $self->{PageBase}->SetCookies($self); } +sub GetPageTitle +{ + my $self = shift; + + return $self->{PageBase}->GetPageTitle($self); +} + +sub GetTitle +{ + my $self = shift; + + return undef; +} + sub GenerateHeader { my $self = shift; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 141833f..5439ebf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -195,16 +195,28 @@ sub SetCookies } } +sub GetPageTitle +{ + my $self = shift; + my $Page = $_[0]; + + my $Title = $Page->GetTitle() || ""; + $Title .= " - " if ($Title ne ""); + $Title .= "${ProjectName} Test Bot"; + return $Title; +} + sub GenerateHeader { my $self = shift; my $Page = $_[0]; + my $Title = $Page->CGI->escapeHTML($Page->GetPageTitle()); print <<EOF; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>${ProjectName} Test Bot</title> + <title>$Title</title> <link rel='icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='shortcut icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'>

1 0

Francois Gouget : testbot/web: Get rid of startup.pl.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: c1d7e86c75382181b12204ce962f3e9ed9006217 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1d7e86c75382181b12204ce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:13:49 2012 +0200 testbot/web: Get rid of startup.pl. We can do the setup in the Apache configuration file instead. This way there's one less file containing the installation path. Also CheckWineTestBot.pl does not actually hardcode the installation path these days so remove this INSTALL.txt section altogether. --- testbot/doc/INSTALL.txt | 4 ---- testbot/doc/vhost_winetestbot.conf | 8 +++++++- testbot/lib/startup.pl | 26 -------------------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 76f9aca..1cbfd83 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -45,10 +45,6 @@ General setup for the web site: mkdir jobs latest patches socket staging sudo chown WWWRUN:winehq staging chmod g+w * -- If the installation path is different from the default, then some paths - in the following files will need to be modified: - testbot/lib/startup.pl - testbot/scripts/CheckWineTestBot.pl - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. (typically "chkconfig winetestbot on" or "service winetestbot start") diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index ca55933..9c53876 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -4,8 +4,14 @@ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com - PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw + <Perl> + use strict; + use lib qw(/home/winehq/tools/testbot/lib); + use ObjectModel::CGI::Page; + use WineTestBot::CGI::PageBase; + SetPageBaseCreator(\&CreatePageBase); + </Perl> <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl diff --git a/testbot/lib/startup.pl b/testbot/lib/startup.pl deleted file mode 100644 index ca67505..0000000 --- a/testbot/lib/startup.pl +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2009 Ge van Geldorp -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -use lib qw(/home/winehq/tools/testbot/lib); - -use ObjectModel::CGI::Page; -use WineTestBot::CGI::PageBase; - -SetPageBaseCreator(\&CreatePageBase); - -1;

1 0

Francois Gouget : testbot/lib: Standardize a few LogMsg statements.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: tools Branch: master Commit: d1dbbfc9d7bee8ddd0d1ccf3d8201f97fdad66bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=d1dbbfc9d7bee8ddd0d1ccf3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:35:17 2012 +0200 testbot/lib: Standardize a few LogMsg statements. --- testbot/lib/WineTestBot/TestAgent.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7b6eb56..f2fa888 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -138,7 +138,7 @@ sub _Copy($$) sub SendFile($$$) { my ($Hostname, $HostPathName, $GuestPathName) = @_; - LogMsg("SendFile $HostPathName -> $Hostname $GuestPathName\n"); + LogMsg "SendFile $HostPathName -> $Hostname $GuestPathName\n"; my $fh; if (!open($fh, "<", $HostPathName)) @@ -171,7 +171,7 @@ sub SendFile($$$) sub GetFile($$$) { my ($Hostname, $GuestPathName, $HostPathName) = @_; - LogMsg("GetFile $Hostname $GuestPathName -> $HostPathName\n"); + LogMsg "GetFile $Hostname $GuestPathName -> $HostPathName\n"; my $fh; if (!open($fh, ">", $HostPathName)) @@ -227,7 +227,7 @@ sub GetFile($$$) sub RunScript($$$) { my ($Hostname, $ScriptText, $Timeout) = @_; - LogMsg("RunScript $Hostname ", ($Timeout || 0), " [$ScriptText]\n"); + LogMsg "RunScript $Hostname ", ($Timeout || 0), " [$ScriptText]\n"; my $Err; my $nc = _Connect($Hostname);

1 0

André Hentschel : netapi32: Fix copy-paste error ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 0b05d4cab1fd557df39187676e836eed4f70191a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b05d4cab1fd557df39187676… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:10 2012 +0200 netapi32: Fix copy-paste error (coverity). --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 404fbd9..3cd8a61 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1003,7 +1003,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout)); } - if (ncb->ncb_rto > 0) + if (ncb->ncb_sto > 0) { timeout = ncb->ncb_sto * 500; setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout,

1 0

André Hentschel : windowscodecs: Fix copy-paste error (coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 8683250033e3c728b6f9ee9d03980fc4c874b214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8683250033e3c728b6f9ee9d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:15 2012 +0200 windowscodecs: Fix copy-paste error (coverity). --- dlls/windowscodecs/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 626887f..e424819 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -817,7 +817,7 @@ static HRESULT register_metadatareaders(struct regsvr_metadatareader const *list if (res != ERROR_SUCCESS) goto error_close_clsid_key; } - if (list->vendor) { + if (list->metadata_format) { StringFromGUID2(list->metadata_format, buf, 39); res = RegSetValueExW(clsid_key, metadataformat_valuename, 0, REG_SZ, (CONST BYTE*)(buf), 78);

1 0

André Hentschel : rpcrt4: Fix copy-paste error ( coverity).
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: c60a0b857d70ba918b8bf8d085977fea59523c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60a0b857d70ba918b8bf8d08… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:23 2012 +0200 rpcrt4: Fix copy-paste error (coverity). --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index d7a81bd..9c07f4e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -853,7 +853,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (comm_fault_offsets->FaultOffset == -1) fault_status = (ULONG *)&RetVal; else if (comm_fault_offsets->FaultOffset >= 0) - fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->CommOffset); + fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->FaultOffset); else fault_status = NULL;

1 0

Nikolay Sivov : dwrite: Derive some format data for text layout from specified text format.
by Alexandre Julliard Oct. 24, 2012

Oct. 24, 2012

Module: wine Branch: master Commit: 2250f0e5336382bb4f344d54fe189a9c7234c878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2250f0e5336382bb4f344d54f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 23 08:48:17 2012 -0400 dwrite: Derive some format data for text layout from specified text format. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/layout.c | 12 +++++++++++- dlls/dwrite/main.c | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7216393..ef50b54 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -70,7 +70,7 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; -extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextLayout**) DECLSPEC_HIDDEN; +extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e793e49..8567c6a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -664,7 +664,7 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; -HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layout) +HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; @@ -678,6 +678,16 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextLayout **layo This->str = heap_strdupnW(str, len); memset(&This->format, 0, sizeof(This->format)); + /* reference is not kept here, instead copy all underlying data */ + if (format) + { + IDWriteTextFormat_GetFontCollection(format, &This->format.collection); + This->format.weight = IDWriteTextFormat_GetFontWeight(format); + This->format.style = IDWriteTextFormat_GetFontStyle(format); + This->format.stretch = IDWriteTextFormat_GetFontStretch(format); + This->format.size = IDWriteTextFormat_GetFontSize(format); + } + *layout = &This->IDWriteTextLayout_iface; return S_OK; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 09ed3f2..7514492 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -506,10 +506,10 @@ static HRESULT WINAPI dwritefactory_GetGdiInterop(IDWriteFactory *iface, IDWrite static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory *iface, WCHAR const* string, UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) { - FIXME("(%s %u %p %f %f %p): stub\n", debugstr_w(string), len, format, max_width, max_height, layout); + TRACE("(%s %u %p %f %f %p)\n", debugstr_w(string), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; - return create_textlayout(string, len, layout); + return create_textlayout(string, len, format, layout); } static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory *iface, WCHAR const* string, @@ -520,7 +520,7 @@ static HRESULT WINAPI dwritefactory_CreateGdiCompatibleTextLayout(IDWriteFactory pixels_per_dip, transform, use_gdi_natural, layout); if (!format) return E_INVALIDARG; - return create_textlayout(string, len, layout); + return create_textlayout(string, len, format, layout); } static HRESULT WINAPI dwritefactory_CreateEllipsisTrimmingSign(IDWriteFactory *iface, IDWriteTextFormat *format,

1 0