July 2013 - Wine-Commits - list.winehq.org

Francois Gouget : po: Don't abbreviate the Portuguese (Brazil) print preview button labels.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 1e664a42fed0d07e70c7fda7fbf7c9b89d133487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e664a42fed0d07e70c7fda7f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 12:30:16 2013 +0200 po: Don't abbreviate the Portuguese (Brazil) print preview button labels. They fit without trouble. --- po/pt_BR.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index c36e70d..aa04b0c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14193,11 +14193,11 @@ msgstr "Anterior" # Abreviated due to small space available #: wordpad.rc:165 msgid "Two pages" -msgstr "Duas pág." +msgstr "Duas páginas" #: wordpad.rc:166 msgid "One page" -msgstr "Uma pág." +msgstr "Uma página" #: wordpad.rc:167 msgid "Zoom in"

1 0

Francois Gouget : po: Tweak the French task manager's memory labels.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 00b59a609d3915bf1a716c6b6339d6e715f6eff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b59a609d3915bf1a716c6b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 13:18:38 2013 +0200 po: Tweak the French task manager's memory labels. Don't specify the unit, only the multiplier like in English. --- po/fr.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 796e87d..8fb2282 100644 --- a/po/fr.po +++ b/po/fr.po @@ -12042,15 +12042,15 @@ msgstr "Totaux" #: taskmgr.rc:375 msgid "Commit charge (K)" -msgstr "Charge dédiée (Kio)" +msgstr "Charge dédiée (K)" #: taskmgr.rc:376 msgid "Physical memory (K)" -msgstr "Mémoire physique (Kio)" +msgstr "Mémoire physique (K)" #: taskmgr.rc:377 msgid "Kernel memory (K)" -msgstr "Mémoire noyau (Kio)" +msgstr "Mémoire noyau (K)" #: taskmgr.rc:378 taskmgr.rc:290 msgid "Handles"

1 0

Francois Gouget : po: Tweak a couple of French translations regarding WLDAP leaf objects.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 7ad4ed3b3e38c4e0855b8dba2d9be9de68ccf376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad4ed3b3e38c4e0855b8dba2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 13:16:01 2013 +0200 po: Tweak a couple of French translations regarding WLDAP leaf objects. --- po/fr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 96286c9..796e87d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9193,7 +9193,7 @@ msgstr "Syntaxe DN invalide" #: wldap32.rc:62 msgid "Is Leaf" -msgstr "Est une feuille" +msgstr "L'objet est une feuille" #: wldap32.rc:63 msgid "Alias Dereference Problem" @@ -9245,7 +9245,7 @@ msgstr "Violation de classe d'objet" #: wldap32.rc:93 msgid "Not allowed on Non-leaf" -msgstr "Interdit sur des non-feuilles" +msgstr "Interdit sur les objets non-feuille" #: wldap32.rc:94 msgid "Not allowed on RDN"

1 0

Alexandre Julliard : po: Add missing strings to the English neutral translation.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 0faa80b30160f19d4398646bab363e0a0a2b6a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0faa80b30160f19d4398646ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 12 12:14:47 2013 +0200 po: Add missing strings to the English neutral translation. --- po/en.po | 65 +++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/po/en.po b/po/en.po index 14339e0..90e47cc 100644 --- a/po/en.po +++ b/po/en.po @@ -980,6 +980,8 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" +"This large number of copies is not supported by your printer.\n" +"Please enter a value between 1 and %d." #: comdlg32.rc:63 msgid "A printer error occurred." @@ -1059,7 +1061,7 @@ msgstr "Out of paper; " #: comdlg32.rc:85 msgid "Feed paper manual; " -msgstr "" +msgstr "Feed paper manual; " #: comdlg32.rc:86 msgid "Paper problem; " @@ -1131,7 +1133,7 @@ msgstr "The printer door is open; " #: comdlg32.rc:103 msgid "Print server unknown; " -msgstr "" +msgstr "Print server unknown; " #: comdlg32.rc:104 msgid "Power save mode; " @@ -1180,7 +1182,7 @@ msgstr "Connecting to %s" #: credui.rc:29 msgid "Logon unsuccessful" -msgstr "" +msgstr "Logon unsuccessful" #: credui.rc:30 msgid "" @@ -2415,7 +2417,7 @@ msgstr "" #: cryptui.rc:31 msgid "This certificate could not be validated to a trusted root certificate." -msgstr "" +msgstr "This certificate could not be validated to a trusted root certificate." #: cryptui.rc:32 msgid "This certificate's issuer could not be found." @@ -2871,7 +2873,7 @@ msgstr "File Format" #: cryptui.rc:161 msgid "Include all certificates in certificate path" -msgstr "" +msgstr "Include all certificates in certificate path" #: cryptui.rc:162 msgid "Export keys" @@ -6904,7 +6906,7 @@ msgstr "menu item" #: oleacc.rc:40 msgid "tool tip" -msgstr "" +msgstr "tool tip" #: oleacc.rc:41 msgid "application" @@ -6940,7 +6942,7 @@ msgstr "separator" #: oleacc.rc:49 msgid "tool bar" -msgstr "" +msgstr "tool bar" #: oleacc.rc:50 msgid "status bar" @@ -7052,7 +7054,7 @@ msgstr "dial" #: oleacc.rc:77 msgid "hot key field" -msgstr "" +msgstr "hot key field" #: oleacc.rc:78 msgid "slider" @@ -7076,7 +7078,7 @@ msgstr "equation" #: oleacc.rc:83 msgid "drop down button" -msgstr "" +msgstr "drop down button" #: oleacc.rc:84 msgid "menu button" @@ -7084,7 +7086,7 @@ msgstr "menu button" #: oleacc.rc:85 msgid "grid drop down button" -msgstr "" +msgstr "grid drop down button" #: oleacc.rc:86 msgid "white space" @@ -7363,6 +7365,8 @@ msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" +"Insert the manufacturer's installation disk, and then\n" +"make sure the correct drive is selected below" #: setupapi.rc:54 msgid "Copy manufacturer's files from:" @@ -8226,7 +8230,7 @@ msgstr "Wine Licence" #: shell32.rc:155 msgid "Trash" -msgstr "" +msgstr "Trash" #: shlwapi.rc:35 user32.rc:68 regedit.rc:176 winecfg.rc:84 winefile.rc:94 msgid "Error" @@ -8243,7 +8247,7 @@ msgstr "%d bytes" #: shlwapi.rc:28 msgctxt "time unit: hours" msgid " hr" -msgstr "" +msgstr " hr" #: shlwapi.rc:29 msgctxt "time unit: minutes" @@ -10094,11 +10098,11 @@ msgstr "The input line is too long.\n" #: cmd.rc:352 msgid "Volume in drive %1!c! is %2\n" -msgstr "" +msgstr "Volume in drive %1!c! is %2\n" #: cmd.rc:353 msgid "Volume in drive %1!c! has no label.\n" -msgstr "" +msgstr "Volume in drive %1!c! has no label.\n" #: cmd.rc:354 msgid " (Yes|No)" @@ -10902,7 +10906,7 @@ msgstr "Open a TypeLib file and view the contents" #: oleview.rc:105 msgid "Change machine wide Distributed COM settings" -msgstr "" +msgstr "Change machine wide Distributed COM settings" #: oleview.rc:106 msgid "Run the Wine registry editor" @@ -11052,7 +11056,7 @@ msgstr "Close window" #: oleview.rc:126 msgid "Group typeinfos by kind" -msgstr "" +msgstr "Group typeinfos by kind" #: progman.rc:30 msgid "&New..." @@ -11470,28 +11474,29 @@ msgstr "Edit Multi-String" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" -msgstr "" +msgstr "Contains commands for working with the whole registry" #: regedit.rc:135 msgid "Contains commands for editing values or keys" -msgstr "" +msgstr "Contains commands for editing values or keys" #: regedit.rc:136 msgid "Contains commands for customizing the registry window" -msgstr "" +msgstr "Contains commands for customizing the registry window" #: regedit.rc:137 msgid "Contains commands for accessing frequently used keys" -msgstr "" +msgstr "Contains commands for accessing frequently used keys" #: regedit.rc:138 msgid "" "Contains commands for displaying help and information about registry editor" msgstr "" +"Contains commands for displaying help and information about registry editor" #: regedit.rc:139 msgid "Contains commands for creating new keys or values" -msgstr "" +msgstr "Contains commands for creating new keys or values" #: regedit.rc:124 msgid "Data" @@ -11611,7 +11616,7 @@ msgstr "Prints all or part of the registry" #: regedit.rc:155 msgid "Displays program information, version number and copyright" -msgstr "" +msgstr "Displays program information, version number and copyright" #: regedit.rc:178 msgid "Can't query value '%s'" @@ -11627,7 +11632,7 @@ msgstr "Value is too big (%u)" #: regedit.rc:181 msgid "Confirm Value Delete" -msgstr "" +msgstr "Confirm Value Delete" #: regedit.rc:182 msgid "Are you sure you want to delete value '%s'?" @@ -11659,7 +11664,7 @@ msgstr "Adds a new multi-string value" #: regedit.rc:171 msgid "Exports selected branch of the registry to a text file" -msgstr "" +msgstr "Exports selected branch of the registry to a text file" #: start.rc:52 msgid "" @@ -11895,15 +11900,15 @@ msgstr "Totals" #: taskmgr.rc:375 msgid "Commit charge (K)" -msgstr "" +msgstr "Commit charge (K)" #: taskmgr.rc:376 msgid "Physical memory (K)" -msgstr "" +msgstr "Physical memory (K)" #: taskmgr.rc:377 msgid "Kernel memory (K)" -msgstr "" +msgstr "Kernel memory (K)" #: taskmgr.rc:378 taskmgr.rc:290 msgid "Handles" @@ -12245,7 +12250,7 @@ msgstr "Updates the display twice per second" #: taskmgr.rc:197 msgid "Updates the display every two seconds" -msgstr "" +msgstr "Updates the display every two seconds" #: taskmgr.rc:198 msgid "Updates the display every four seconds" @@ -12277,7 +12282,7 @@ msgstr "Cascades the windows diagonally on the desktop" #: taskmgr.rc:210 msgid "Brings the window front, but does not switch to it" -msgstr "" +msgstr "Brings the window front, but does not switch to it" #: taskmgr.rc:211 msgid "Displays Task Manager help topics" @@ -13292,7 +13297,7 @@ msgstr "Configuration error" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "" +msgstr "Screen buffer size must be greater or equal to the window's one" #: wineconsole.rc:34 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Ken Sharp : po: Update English neutral translation.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 1c41dcfb093516cd690bf6a69bf5a4be6cfcb335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c41dcfb093516cd690bf6a69… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Thu Jul 11 19:42:03 2013 +0100 po: Update English neutral translation. --- po/en.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/en.po b/po/en.po index 6ac19d1..14339e0 100644 --- a/po/en.po +++ b/po/en.po @@ -9307,7 +9307,7 @@ msgstr "" #: clock.rc:29 msgid "Ana&log" -msgstr "Ana&log" +msgstr "Ana&logue" #: clock.rc:30 msgid "Digi&tal"

1 0

Dmitry Timoshkov : Revert "gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .".
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 73f7b857b3a8b5a6638168ef8bc8c0d15552a7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f7b857b3a8b5a6638168ef8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 12 17:11:38 2013 +0900 Revert "gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region.". This reverts commit 61dafbb7012061fda7a737daf24340ce927ce2cc. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index dcdc29e..e0465ad 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -349,7 +349,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); + return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */

1 0

Dmitry Timoshkov : gdiplus/tests: Add another set of clipping region tests.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: ffd207850ca8eaa47348d27e84cb1702d0e052d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd207850ca8eaa47348d27e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 12 17:14:20 2013 +0900 gdiplus/tests: Add another set of clipping region tests. --- dlls/gdiplus/tests/graphics.c | 283 +++++++++++++++++++++++++++++++++-------- 1 files changed, 231 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffd207850ca8eaa47348d…

1 0

Nikolay Sivov : kernel32/tests: Some tests for FindActCtxSectionGuid().
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: bbb7358d1c4d88c47844211f19957c4dafd9a69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb7358d1c4d88c47844211f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 12 11:52:05 2013 +0400 kernel32/tests: Some tests for FindActCtxSectionGuid(). --- dlls/kernel32/tests/actctx.c | 125 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b021a4d..a9d5f29 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -24,6 +24,8 @@ #include <winnls.h> #include <stdio.h> +#include "initguid.h" + static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); @@ -32,6 +34,7 @@ static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static BOOL (WINAPI *pIsDebuggerPresent)(void); static BOOL (WINAPI *pQueryActCtxW)(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +static BOOL (WINAPI *pFindActCtxSectionGuid)(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA); static const char* strw(LPCWSTR x) { @@ -43,6 +46,18 @@ static const char* strw(LPCWSTR x) return buffer; } +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + #ifdef __i386__ #define ARCH "x86" #elif defined __x86_64__ @@ -68,12 +83,21 @@ static const char manifest2[] = "</dependency>" "</assembly>"; +DEFINE_GUID(IID_CoTest, 0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x11, 0x11, 0x22, 0x22, 0x33, 0x33); +DEFINE_GUID(IID_TlibTest, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); + static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" " publicKeyToken=\"6595b6414666f1df\" />" "<file name=\"testlib.dll\">" "<windowClass>wndClass</windowClass>" +" <comClass description=\"Test com class\"" +" clsid=\"{12345678-1234-5678-1234-111122223333}\"" +" tlbid=\"{99999999-8888-7777-6666-555555555555}\"" +" threadingModel=\"Neutral\"" +" progid=\"ProgId.ProgId\"" +" />" "</file>" "</assembly>"; @@ -965,6 +989,105 @@ static void test_basic_info(HANDLE handle, int line) } } +enum comclass_threadingmodel { + ThreadingModel_Apartment = 1, + ThreadingModel_Free = 2, + ThreadingModel_Both = 4, + ThreadingModel_Neutral = 5 +}; + +enum comclass_miscfields { + MiscStatus = 0x1, + MiscStatusIcon = 0x2, + MiscStatusContent = 0x4, + MiscStatusThumbnail = 0x8 +}; + +struct comclass_keyed_data { + DWORD size; + BYTE reserved; + BYTE miscmask; + BYTE unk[2]; + DWORD model; + GUID clsid; + GUID unkguid; + GUID clsid2; + GUID tlid; + DWORD modulename_len; + DWORD modulename_offset; + DWORD progid_len; + DWORD progid_offset; + DWORD res2[7]; + WCHAR strdata[1]; +}; + +static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GUID *tlid, ULONG exid, int line) +{ + struct comclass_keyed_data *comclass; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, + clsid, &data); +todo_wine + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + if(!ret) + { + skip("couldn't find guid %s\n", debugstr_guid(clsid)); + return; + } + + comclass = (struct comclass_keyed_data*)data.lpData; + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); + ok_(__FILE__, line)(comclass->size == FIELD_OFFSET(struct comclass_keyed_data, strdata), "got %d for header size\n", comclass->size); + if (data.lpData && comclass->size == FIELD_OFFSET(struct comclass_keyed_data, strdata)) + { + static const WCHAR progid[] = {'P','r','o','g','I','d','.','P','r','o','g','I','d',0}; + WCHAR *ptr; + ULONG len; + + ok_(__FILE__, line)(comclass->reserved == 0, "got reserved as %d\n", comclass->reserved); + ok_(__FILE__, line)(comclass->miscmask == 0, "got miscmask as %02x\n", comclass->miscmask); + ok_(__FILE__, line)(comclass->unk[0] == 0, "got unk[0] as %02x\n", comclass->unk[0]); + ok_(__FILE__, line)(comclass->unk[1] == 0, "got unk[1] as %02x\n", comclass->unk[1]); + ok_(__FILE__, line)(comclass->model == ThreadingModel_Neutral, "got model %d\n", comclass->model); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&comclass->clsid)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", debugstr_guid(&comclass->clsid2)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->tlid, tlid), "got wrong tlid %s\n", debugstr_guid(&comclass->tlid)); + ok_(__FILE__, line)(comclass->modulename_len > 0, "got modulename len %d\n", comclass->modulename_len); + ok_(__FILE__, line)(comclass->progid_offset == comclass->size, "got progid offset %d\n", comclass->progid_offset); + + ptr = (WCHAR*)((BYTE*)comclass + comclass->size); + ok_(__FILE__, line)(!lstrcmpW(ptr, progid), "got wrong progid %s, expected %s\n", wine_dbgstr_w(ptr), wine_dbgstr_w(progid)); + ok_(__FILE__, line)(lstrlenW(ptr)*sizeof(WCHAR) == comclass->progid_len, + "got progid name length %d, expected %d\n", comclass->progid_len, lstrlenW(ptr)); + + /* data length is simply header length + string data length including nulls */ + len = comclass->size + comclass->progid_len + sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + /* keyed data structure doesn't include module name, it's available from section data */ + ok_(__FILE__, line)(data.ulSectionTotalLength > comclass->modulename_offset, "got wrong offset %d\n", comclass->modulename_offset); + } + + ok_(__FILE__, line)(data.lpSectionGlobalData != NULL, "data.lpSectionGlobalData == NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength > 0, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", + data.ulAssemblyRosterIndex, exid); +} + static void test_actctx(void) { ULONG_PTR cookie; @@ -1104,6 +1227,7 @@ static void test_actctx(void) ok(b, "ActivateActCtx failed: %u\n", GetLastError()); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); + test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); test_find_string_fail(); b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); @@ -1278,6 +1402,7 @@ static BOOL init_funcs(void) X(IsDebuggerPresent); X(QueryActCtxW); X(ReleaseActCtx); + X(FindActCtxSectionGuid); #undef X return TRUE;

1 0

Francois Gouget : po: Fix a couple of linefeed issues in the Turkish translation.
by Alexandre Julliard July 12, 2013

July 12, 2013

Module: wine Branch: master Commit: 0d05f60987cc6989a39538886cde6a9642660283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d05f60987cc6989a39538886… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 13:03:42 2013 +0200 po: Fix a couple of linefeed issues in the Turkish translation. --- po/tr.po | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3341cdf..bae2163 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9622,9 +9622,7 @@ msgstr "" #: cmd.rc:157 msgid "RENAME <filename> renames a file.\n" -msgstr "" -"RENAME <dosyaadı> bir dosyayı yeniden adlandırır.\n" -"\n" +msgstr "RENAME <dosyaadı> bir dosyayı yeniden adlandırır.\n" #: cmd.rc:159 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" @@ -9842,8 +9840,7 @@ msgid "" msgstr "" "CHOICE bir metin görüntüler ve Kullanıcı seçilebilir listeden\n" "izin verilen bir tuşa basıncaya kadar bekler.\n" -"CHOICE çoğu zaman bir toplu dosyada menü seçimi inşası için\n" -"kullanılır.\n" +"CHOICE çoğu zaman bir toplu dosyada menü seçimi inşası için kullanılır.\n" #: cmd.rc:277 msgid ""

1 0

Francois Gouget : po: Tweak the Norwegian Bokmål translation for the task manager's affinity labels.
by Alexandre Julliard July 11, 2013

July 11, 2013

Module: wine Branch: master Commit: 12bb28f2e8be28e2670909849772b3eb62d6d13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bb28f2e8be28e2670909849… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 11 16:48:02 2013 +0200 po: Tweak the Norwegian Bokmål translation for the task manager's affinity labels. --- po/nb_NO.po | 64 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 97f9869..d721909 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -12323,131 +12323,131 @@ msgstr "" #: taskmgr.rc:446 msgid "CPU 0" -msgstr "Prosessor 0" +msgstr "CPU 0" #: taskmgr.rc:448 msgid "CPU 1" -msgstr "Prosessor 1" +msgstr "CPU 1" #: taskmgr.rc:450 msgid "CPU 2" -msgstr "Prosessor 2" +msgstr "CPU 2" #: taskmgr.rc:452 msgid "CPU 3" -msgstr "Prosessor 3" +msgstr "CPU 3" #: taskmgr.rc:454 msgid "CPU 4" -msgstr "Prosessor 4" +msgstr "CPU 4" #: taskmgr.rc:456 msgid "CPU 5" -msgstr "Prosessor 5" +msgstr "CPU 5" #: taskmgr.rc:458 msgid "CPU 6" -msgstr "Prosessor 6" +msgstr "CPU 6" #: taskmgr.rc:460 msgid "CPU 7" -msgstr "Prosessor 7" +msgstr "CPU 7" #: taskmgr.rc:462 msgid "CPU 8" -msgstr "Prosessor 8" +msgstr "CPU 8" #: taskmgr.rc:464 msgid "CPU 9" -msgstr "Prosessor 9" +msgstr "CPU 9" #: taskmgr.rc:466 msgid "CPU 10" -msgstr "Prosessor 10" +msgstr "CPU 10" #: taskmgr.rc:468 msgid "CPU 11" -msgstr "Prosessor 11" +msgstr "CPU 11" #: taskmgr.rc:470 msgid "CPU 12" -msgstr "Prosessor 12" +msgstr "CPU 12" #: taskmgr.rc:472 msgid "CPU 13" -msgstr "Prosessor 13" +msgstr "CPU 13" #: taskmgr.rc:474 msgid "CPU 14" -msgstr "Prosessor 14" +msgstr "CPU 14" #: taskmgr.rc:476 msgid "CPU 15" -msgstr "Prosessor 15" +msgstr "CPU 15" #: taskmgr.rc:478 msgid "CPU 16" -msgstr "Prosessor 16" +msgstr "CPU 16" #: taskmgr.rc:480 msgid "CPU 17" -msgstr "Prosessor 17" +msgstr "CPU 17" #: taskmgr.rc:482 msgid "CPU 18" -msgstr "Prosessor 18" +msgstr "CPU 18" #: taskmgr.rc:484 msgid "CPU 19" -msgstr "Prosessor 19" +msgstr "CPU 19" #: taskmgr.rc:486 msgid "CPU 20" -msgstr "Prosessor 20" +msgstr "CPU 20" #: taskmgr.rc:488 msgid "CPU 21" -msgstr "Prosessor 21" +msgstr "CPU 21" #: taskmgr.rc:490 msgid "CPU 22" -msgstr "Prosessor 22" +msgstr "CPU 22" #: taskmgr.rc:492 msgid "CPU 23" -msgstr "Prosessor 23" +msgstr "CPU 23" #: taskmgr.rc:494 msgid "CPU 24" -msgstr "Prosessor 24" +msgstr "CPU 24" #: taskmgr.rc:496 msgid "CPU 25" -msgstr "Prosessor 25" +msgstr "CPU 25" #: taskmgr.rc:498 msgid "CPU 26" -msgstr "Prosessor 26" +msgstr "CPU 26" #: taskmgr.rc:500 msgid "CPU 27" -msgstr "Prosessor 27" +msgstr "CPU 27" #: taskmgr.rc:502 msgid "CPU 28" -msgstr "Prosessor 28" +msgstr "CPU 28" #: taskmgr.rc:504 msgid "CPU 29" -msgstr "Prosessor 29" +msgstr "CPU 29" #: taskmgr.rc:506 msgid "CPU 30" -msgstr "Prosessor 30" +msgstr "CPU 30" #: taskmgr.rc:508 msgid "CPU 31" -msgstr "Prosessor 31" +msgstr "CPU 31" #: taskmgr.rc:514 msgid "Select Columns"

1 0