August 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement CopyPixels for GIF decoder.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 19e7803088099dfa5d16d86a0b1cb6a0cde99526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e7803088099dfa5d16d86a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 17 11:24:15 2009 -0500 windowscodecs: Implement CopyPixels for GIF decoder. --- dlls/windowscodecs/gifformat.c | 55 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 9423ec3..9f998d8 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -168,11 +168,62 @@ static HRESULT WINAPI GifFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, return S_OK; } +static HRESULT copy_interlaced_pixels(const BYTE *srcbuffer, + UINT srcwidth, UINT srcheight, INT srcstride, const WICRect *rc, + UINT dststride, UINT dstbuffersize, BYTE *dstbuffer) +{ + UINT row_offset; /* number of bytes into the source rows where the data starts */ + const BYTE *src; + BYTE *dst; + UINT y; + + if (rc->X < 0 || rc->Y < 0 || rc->X+rc->Width > srcwidth || rc->Y+rc->Height > srcheight) + return E_INVALIDARG; + + if (dststride < rc->Width) + return E_INVALIDARG; + + if ((dststride * rc->Height) > dstbuffersize) + return E_INVALIDARG; + + row_offset = rc->X; + + dst = dstbuffer; + for (y=rc->Y; y-rc->Y < rc->Height; y++) + { + if (y%8 == 0) + src = srcbuffer + srcstride * (y/8); + else if (y%4 == 0) + src = srcbuffer + srcstride * ((srcheight+7)/8 + y/8); + else if (y%2 == 0) + src = srcbuffer + srcstride * ((srcheight+3)/4 + y/4); + else /* y%2 == 1 */ + src = srcbuffer + srcstride * ((srcheight+1)/2 + y/2); + src += row_offset; + memcpy(dst, src, rc->Width); + dst += dststride; + } + return S_OK; +} + static HRESULT WINAPI GifFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + GifFrameDecode *This = (GifFrameDecode*)iface; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + if (This->frame->ImageDesc.Interlace) + { + return copy_interlaced_pixels(This->frame->RasterBits, This->frame->ImageDesc.Width, + This->frame->ImageDesc.Height, This->frame->ImageDesc.Width, + prc, cbStride, cbBufferSize, pbBuffer); + } + else + { + return copy_pixels(8, This->frame->RasterBits, This->frame->ImageDesc.Width, + This->frame->ImageDesc.Height, This->frame->ImageDesc.Width, + prc, cbStride, cbBufferSize, pbBuffer); + } } static HRESULT WINAPI GifFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface,

1 0

Francois Gouget : gdiplus/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 04105f7ff3f40d4ca759e4258dd2fc6666f5c55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04105f7ff3f40d4ca759e4258… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 19 09:12:40 2009 +0200 gdiplus/tests: Add a trailing '\n' to an ok() call. --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 54d9b32..62b4990 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1788,7 +1788,7 @@ static void test_GdipGetVisibleClipBounds_window(void) ok(hwnd != NULL, "Expected window to be created\n"); /* get client area size */ - ok(GetClientRect(hwnd, &wnd_rect), "GetClientRect should have succeeded"); + ok(GetClientRect(hwnd, &wnd_rect), "GetClientRect should have succeeded\n"); window.X = wnd_rect.left; window.Y = wnd_rect.top; window.Width = wnd_rect.right - wnd_rect.left;

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 544f882918026816549c848377a10b67dcaa1444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544f882918026816549c84837… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 19 09:12:30 2009 +0200 comctl32/tests: Add a trailing '\n' to ok() calls. --- dlls/comctl32/tests/imagelist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e1ad8da..9bb0253 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1014,14 +1014,14 @@ static void test_shell_imagelist(void) return; IImageList_GetImageCount(iml, &out); - todo_wine ok(out > 0, "IImageList_GetImageCount returned out <= 0"); + todo_wine ok(out > 0, "IImageList_GetImageCount returned out <= 0\n"); /* right and bottom should be 32x32 for large icons, or 48x48 if larger icons enabled in control panel */ IImageList_GetImageRect(iml, 0, &rect); todo_wine ok((((rect.right == 32) && (rect.bottom == 32)) || ((rect.right == 48) && (rect.bottom == 48))), - "IImageList_GetImageRect returned r:%d,b:%d", + "IImageList_GetImageRect returned r:%d,b:%d\n", rect.right, rect.bottom); IImageList_Release(iml);

1 0

Francois Gouget : windowscodecs: Add a trailing '\n' to a FIXME().
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 31e38f8d348cf3662071dd29da8b70438af32d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e38f8d348cf3662071dd29d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 19 09:12:10 2009 +0200 windowscodecs: Add a trailing '\n' to a FIXME(). --- dlls/windowscodecs/converter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bd06c5a..7db56ea 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -567,7 +567,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), dither, pIPalette, alphaThresholdPercent, paletteTranslate); - if (pIPalette && !fixme++) FIXME("ignoring palette"); + if (pIPalette && !fixme++) FIXME("ignoring palette\n"); if (This->source) return WINCODEC_ERR_WRONGSTATE;

1 0

Michael Stefaniuc : winspool.drv: Add the Romanian translation.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 2bbd5ed9c9637f978d3fd8d4a47ad7b0c863afce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbd5ed9c9637f978d3fd8d4a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 19 01:05:53 2009 +0200 winspool.drv: Add the Romanian translation. --- dlls/winspool.drv/Makefile.in | 1 + dlls/winspool.drv/Ro.rc | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index d0b6410..1d80880 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/dlls/winspool.drv/Ro.rc b/dlls/winspool.drv/Ro.rc new file mode 100644 index 0000000..ab3d9a6 --- /dev/null +++ b/dlls/winspool.drv/Ro.rc @@ -0,0 +1,42 @@ +/* + * Copyright 2005 Huw Davies + * Copyright 2009 Michael Stefaniuc + * + * 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 + */ + +#include "wspool.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Tipărire în fișier" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nume fișier de ieșire:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Renunță", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Port local" + IDS_FILE_EXISTS "Fișierul de ieșire există deja. Dați clic pe OK pentru al suprascrie." + IDS_CANNOT_OPEN "Nu am putut crea fișierul de ieșire." +}

1 0

Michael Stefaniuc : appwiz.cpl: Update the Romanian translation.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 984723d3b9fdd6b0ce4e9eb8d2214e123e860bb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984723d3b9fdd6b0ce4e9eb8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 19 01:05:45 2009 +0200 appwiz.cpl: Update the Romanian translation. --- dlls/appwiz.cpl/Ro.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Ro.rc b/dlls/appwiz.cpl/Ro.rc index 46c339b..c8cb119 100644 --- a/dlls/appwiz.cpl/Ro.rc +++ b/dlls/appwiz.cpl/Ro.rc @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Programe de instalare\0*instal*.exe;*setup*.exe;*.msi\0Programe (*.exe)\0*.exe\0Toate fișierele (*.*)\0*.*\0\0" IDS_REMOVE, "&Sterge..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Modifică/Șterge..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -56,7 +56,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Urmatoarele programe pot fi îndepărtate automat. Pentru a îndepărta un program sau pentru ai modifica componentele instalate, alegeți programul din listă și apăsați pe „Adaugă/&șterge”.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "Informații a&sistență...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 94, 198, 74, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Modifică...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Sterge...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Alexandre Julliard : ole32/tests: Skip a string that may not round-trip in all codepages.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 4770ba7bcccb93bc1dc203effb8387436b027e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4770ba7bcccb93bc1dc203eff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 10:02:50 2009 +0200 ole32/tests: Skip a string that may not round-trip in all codepages. --- dlls/ole32/tests/moniker.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 306a892..b172377 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1432,6 +1432,16 @@ static void test_file_monikers(void) for (i = 0; i < COUNTOF(wszFile); ++i) { int j ; + if (i == 2) + { + BOOL used; + WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, wszFile[i], -1, NULL, 0, NULL, &used ); + if (used) + { + skip("string 2 doesn't round trip in codepage %u\n", GetACP() ); + continue; + } + } for (j = lstrlenW(wszFile[i]); j > 0; --j) { wszFile[i][j] = 0;

1 0

Alexandre Julliard : rpcrt4: Assign a unique id to the connection instead of changing it for each message .
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: e01420d72a11b11b8091d772711660586a061bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01420d72a11b11b8091d7727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 20:15:01 2009 +0200 rpcrt4: Assign a unique id to the connection instead of changing it for each message. --- dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_message.c | 3 +-- dlls/rpcrt4/rpc_transport.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index c43b8f9..036b59a 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -67,6 +67,7 @@ typedef struct _RpcConnection TimeStamp exp; ULONG attr; RpcAuthInfo *AuthInfo; + ULONG auth_context_id; ULONG encryption_auth_len; ULONG signature_auth_len; RpcQualityOfService *QOS; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index cddfbd5..5e7c857 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -813,14 +813,13 @@ static RPC_STATUS RPCRT4_SendWithAuth(RpcConnection *Connection, RpcPktHdr *Head if (Connection->AuthInfo && packet_has_auth_verifier(Header)) { RpcAuthVerifier *auth_hdr = (RpcAuthVerifier *)&pkt[Header->common.frag_len - alen]; - static LONG next_id; auth_hdr->auth_type = Connection->AuthInfo->AuthnSvc; auth_hdr->auth_level = Connection->AuthInfo->AuthnLevel; auth_hdr->auth_pad_length = auth_pad_len; auth_hdr->auth_reserved = 0; /* a unique number... */ - auth_hdr->auth_context_id = InterlockedIncrement(&next_id); + auth_hdr->auth_context_id = Connection->auth_context_id; if (AuthLength) memcpy(auth_hdr + 1, Auth, AuthLength); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8e8ce16..cc43278 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2800,6 +2800,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) { + static LONG next_id; const struct connection_ops *ops; RpcConnection* NewConnection; @@ -2827,6 +2828,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->attr = 0; if (AuthInfo) RpcAuthInfo_AddRef(AuthInfo); NewConnection->AuthInfo = AuthInfo; + NewConnection->auth_context_id = InterlockedIncrement( &next_id ); NewConnection->encryption_auth_len = 0; NewConnection->signature_auth_len = 0; if (QOS) RpcQualityOfService_AddRef(QOS);

1 0

Alexandre Julliard : transl: Get rid of the source dir parameter in parse_resfiles.php.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: d29f4dd6970b6a832fd8ce2ea79a6d63e6821a39 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d29f4dd6970b6a832fd8ce2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 17:16:06 2009 +0200 transl: Get rid of the source dir parameter in parse_resfiles.php. --- transl/Master.sh | 2 +- transl/parse_resfiles.php | 52 +++++++++++++-------------------------------- winetest/make-winetest | 2 +- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/transl/Master.sh b/transl/Master.sh index 4c30ce1..b38d742 100755 --- a/transl/Master.sh +++ b/transl/Master.sh @@ -44,7 +44,7 @@ mkdir $WORKDIR/data mkdir $WORKDIR/data/res # Analyze all the Makefiles -php ./parse_resfiles.php -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR/data" 2>>"$WORKDIR/run.log" || exit +php ./parse_resfiles.php -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR/data" 2>>"$WORKDIR/run.log" || exit # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index 1911464..a6ec479 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -8,14 +8,13 @@ function resource_name2($resource) return "@RES($result[0]:$result[1])"; } -function create_resfiles($dir, $check) +function create_resfiles($dir, $files) { - global $objdir, $srcdir, $toolsdir, $workdir; + global $objdir, $toolsdir, $workdir; - $srcs = ""; $targets = ""; $objs = ""; - foreach (preg_split("/\s+/", $check['files']) as $file) + foreach (preg_split("/\s+/", $files) as $file) { if (preg_match("/^\s*$/", $file)) continue; @@ -29,11 +28,6 @@ function create_resfiles($dir, $check) if (preg_match("/.mc$/", $file)) { $file .= ".rc"; - $srcs .= " $objdir/$dir/$file"; - } - else - { - $srcs .= " $srcdir/$dir/$file"; } $targets .= preg_replace("/\.rc$/", ".res", $file). " "; $objs .= "$objdir/$dir/" . preg_replace("/\.rc$/", ".res", $file) . " "; @@ -41,13 +35,8 @@ function create_resfiles($dir, $check) if ($targets == "") return; - $defs = $check['defines']; - if (preg_match("/^dlls/", $dir)) - $defs .= "-D__WINESRC__"; - - fwrite(STDERR, "*** $dir [$defs]\n"); + fwrite(STDERR, "*** $dir\n"); - $incl = "-I$srcdir/$dir -I$objdir/$dir -I$srcdir/include -I$objdir/include"; $norm_fn = preg_replace("/[^a-zA-Z0-9]/", "-", $dir); system("make -C $objdir/$dir -s $targets"); @@ -59,9 +48,7 @@ array_shift($argv); while (count($argv) != 0 && preg_match("/^-/", $argv[0])) { $opt = array_shift($argv); - if ($opt == "-S") - $srcdir = array_shift($argv); - else if ($opt == "-T") + if ($opt == "-T") $objdir = array_shift($argv); else if ($opt == "-t") $toolsdir = array_shift($argv); @@ -70,7 +57,6 @@ while (count($argv) != 0 && preg_match("/^-/", $argv[0])) else { fwrite(STDERR, "Usage: $script [options] [makefiles]\n\n"); - fwrite(STDERR, " -S dir Set the top of the Wine source tree\n"); fwrite(STDERR, " -T dir Set the top of the Wine build tree\n"); fwrite(STDERR, " -t dir Set the Wine tools directory\n"); fwrite(STDERR, " -w dir Set the work directory\n"); @@ -78,32 +64,29 @@ while (count($argv) != 0 && preg_match("/^-/", $argv[0])) } } -if ($objdir == "") - $objdir = $srcdir; if ($toolsdir == "") $toolsdir = $objdir; -if ($srcdir == "" || $toolsdir == "" || $workdir == "") +if ($objdir == "" || $toolsdir == "" || $workdir == "") { - die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); + die("Config entry for BUILDROOT, WRCROOT or WORKDIR missing\n"); } $makefiles = array(); -exec("find $srcdir/ -name Makefile.in -print", $makefiles); +exec("find $objdir/ -name Makefile -print", $makefiles); // Parse the makefiles and create the .res files $checks = array(); sort($makefiles); foreach ($makefiles as $makefile) { - $path = str_replace("$srcdir/", "", dirname($makefile)); - if ($path == "programs/winetest" || $path == $srcdir || preg_match("/\/tests$/", $path)) + $path = str_replace("$objdir/", "", dirname($makefile)); + if ($path == "programs/winetest" || $path == $objdir || preg_match("/\/tests$/", $path)) { - echo "--- Ignoring: $path/Makefile.in\n"; + echo "--- Ignoring: $path/Makefile\n"; continue; } - $defs = ""; $files = ""; $file = fopen("$makefile", "r") or die("Cannot open $makefile"); while ($line = fgets($file, 4096)) @@ -114,12 +97,8 @@ foreach ($makefiles as $makefile) $line .= fgets($file, 4096); } - if (preg_match("/EXTRARCFLAGS\s*=\s*(.*)/", $line, $m)) - { - $defs = $m[1]; - if (preg_match("/res16/", $defs)) - break; - } + if (preg_match("/EXTRARCFLAGS\s*=.*res16/", $line)) + break; if (preg_match("/^(MC|RC)_SRCS\s*=\s*(.*)$/", $line, $m)) $files .= " $m[2]"; @@ -129,9 +108,8 @@ foreach ($makefiles as $makefile) if ($files == "") continue; - $checks[$path]['defines'] = $defs; - $checks[$path]['files'] = $files; - create_resfiles($path, $checks[$path]); + $checks[$path] = 1; + create_resfiles($path, $files); } // Get all the possible languages (from kernel32) and filter diff --git a/winetest/make-winetest b/winetest/make-winetest index bd56fd9..6e4b24c 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -132,7 +132,7 @@ umask 022 rm -rf data mkdir data data/res - php $toolsdir/transl/parse_resfiles.php -S ./wine -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log + php $toolsdir/transl/parse_resfiles.php -T ./build-mingw -t ./build-native -w ./data 2>>data/run.log mv -f $transldir/data $transldir/data.old mv -f data $transldir/data rm -rf $transldir/data.old

1 0

Paul Vriens : transl: Add the possibility to switch between 'Normal' and ' Pedantic'.
by Alexandre Julliard Aug. 18, 2009

Aug. 18, 2009

Module: tools Branch: master Commit: b730ab459a41acdb1cef34026130aad04a26e086 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b730ab459a41acdb1cef3402… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 14 16:25:44 2009 +0200 transl: Add the possibility to switch between 'Normal' and 'Pedantic'. --- transl/index.php | 9 +++++---- transl/lib.php | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/transl/index.php b/transl/index.php index 3249265..66071ad 100644 --- a/transl/index.php +++ b/transl/index.php @@ -40,10 +40,11 @@ while ($line = fgets($summary, 1024)) <?php echo $TITLE_DESCR ?> <p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. -Note that some resources marked as translated may be in fact in English - sometimes developers -add new English resources into every language file. This automatic tool doesn't detect this - -it needs to be found manually by the translators. If you would like to read about how to -improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. +Note that some resources marked as translated may in fact still be English. Sometimes developers +add new English resources into every language file. This automatic tool has a 'Pedantic' mode that +detects most of these but currently has a lot of false positives. If you would like to read about +how to improve Wine translations check +<?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> <table class="index"> diff --git a/transl/lib.php b/transl/lib.php index 11f3d52..aceee55 100644 --- a/transl/lib.php +++ b/transl/lib.php @@ -262,6 +262,12 @@ function dump_menu_root($link = TRUE) echo "Wine translations"; if ($link) echo "</a>"; + + if (strpos($_SERVER['PHP_SELF'], "index.php")) + { + $url = "index.php"; + dump_pedantic($url, TRUE); + } } function dump_menu_lang($lang, $link = TRUE) @@ -274,6 +280,12 @@ function dump_menu_lang($lang, $link = TRUE) echo get_lang_name($lang); if ($link) echo "</a>"; + + if (strpos($_SERVER['PHP_SELF'], "lang.php")) + { + $url = "lang.php?lang=".urlencode($lang); + dump_pedantic($url, FALSE); + } } function dump_menu_resfile($lang, $resfile, $link = TRUE) @@ -286,6 +298,12 @@ function dump_menu_resfile($lang, $resfile, $link = TRUE) echo get_resfile_name($resfile); if ($link) echo "</a>"; + + if (strpos($_SERVER['PHP_SELF'], "resfile.php")) + { + $url = "resfile.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile); + dump_pedantic($url, FALSE); + } } function dump_menu_resource($lang, $resfile, $type, $id) @@ -294,6 +312,28 @@ function dump_menu_resource($lang, $resfile, $type, $id) echo " > "; echo get_resource_name($type, $id); + + $url = "resource.php?lang=".urlencode($lang)."&resfile=".urlencode($resfile)."&type=".urlencode($type)."&id=".urlencode($id); + dump_pedantic($url, FALSE); +} + +function dump_pedantic($url, $highest_level = FALSE) +{ + echo "<a style=\"float: right; margin-top: -13px;\" href=\"".$url; + if (is_pedantic()) + { + echo "\" title=\"'Normal' mode will only show errors.\""; + echo ">Switch to 'Normal' mode</a>"; + } + else + { + if ($highest_level) + echo "?pedantic=\""; + else + echo "&pedantic=\""; + echo "title=\"'Pedantic' mode will show more potential translation issues.\""; + echo ">Switch to 'Pedantic' mode</a>"; + } } ?>

1 0