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

Francois Gouget : po: Tweak the Arabic license notice.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: 6fd49d3b710e685fea1b5d8254826670c3ed6c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd49d3b710e685fea1b5d825… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 15:57:47 2013 +0200 po: Tweak the Arabic license notice. Remove spaces before the linefeeds and restore the paragraph separation. Remove the translators notice. --- po/ar.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ar.po b/po/ar.po index ef7f05b..83a1775 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8184,14 +8184,14 @@ msgid "" msgstr "" "واين برنامج مجاني ، يمكنك إعادة نشره بصيغته الحالية أو معدّلًا وذلك تحت بنود " "الإصدار 2.1 أو اعلى من رخصة غنّو العمومية المنشورة بواسطة منظمة البرمجيات " -"الحرة \n" +"الحرة\n" +"\n" "تم نشر واين على أمل منفعتكم بدون اي ضمانات سواء كانت ضمانات للاستخدامات " -"الشخصية أو التجارية ، لمزيد من التفاصيل لا تنس مراجعة رخصة غنّو العمومية . \n" +"الشخصية أو التجارية ، لمزيد من التفاصيل لا تنس مراجعة رخصة غنّو العمومية.\n" +"\n" "من المفترض توفر نسخة من رخصة غنّو العمومية لديك وهي مرفقة مع واين ، في حال " "عدم عثورك عليها راسل منظمة البرمجيات الحرة 51 شارع فرنكلين الطابق الرابع " -"بوسطنMA 02110-1301 الولايات المتحدة الأمريكية\n" -"ترجمه للعربية أعضاء من فريق عيون العرب و مجتمع لينكس العربي\n" -"مع ملاحظة عدم تبني المترجمين لتسمية و رموز البرنامج" +"بوسطنMA 02110-1301 الولايات المتحدة الأمريكية." #: shell32.rc:253 msgid "Wine License"

1 0

Francois Gouget : po: Fix the French DEL, ERASE, RD and RMDIR usage messages.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: d818b019c99c8204a83ed3de705ca50f7c1cd6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d818b019c99c8204a83ed3de7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 12:34:26 2013 +0200 po: Fix the French DEL, ERASE, RD and RMDIR usage messages. --- po/fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1fed090..5eaddcb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9474,7 +9474,7 @@ msgstr "DATE affiche ou modifie la date système.\n" #: cmd.rc:48 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <fichiers> efface un fichier ou un groupe de fichiers.\n" +msgstr "DEL <fichier> efface un fichier ou un groupe de fichiers.\n" #: cmd.rc:49 msgid "DIR lists the contents of a directory.\n" @@ -9502,7 +9502,7 @@ msgstr "" #: cmd.rc:61 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <fichiers> efface un ou plusieurs fichiers.\n" +msgstr "ERASE <fichier> efface un ou plusieurs fichiers.\n" #: cmd.rc:69 msgid "" @@ -9719,11 +9719,11 @@ msgstr "RENAME <fichier> renomme un fichier.\n" #: cmd.rc:159 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" -msgstr "RD est la version courte de RMDIR. Elle efface un répertoire.\n" +msgstr "RD <rép> est la version courte de RMDIR. Elle efface un répertoire.\n" #: cmd.rc:160 msgid "RMDIR <dir> deletes a subdirectory.\n" -msgstr "RMDIR efface un sous-répertoire.\n" +msgstr "RMDIR <rép> efface un sous-répertoire.\n" #: cmd.rc:204 msgid ""

1 0

Francois Gouget : po: Some French translation tweaks.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: d42525ffc612ce818e424a24626d5a2436c71c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42525ffc612ce818e424a246… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 13:16:55 2013 +0200 po: Some French translation tweaks. --- po/fr.po | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5eaddcb..7d59eb4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2109,7 +2109,7 @@ msgstr "É&tat du certificat :" #: cryptui.rc:221 msgid "Disclaimer" -msgstr "Avis de non-responsabilité" +msgstr "Clause de non-responsabilité" #: cryptui.rc:228 msgid "More &Info" @@ -3476,7 +3476,8 @@ msgid "" "updated here until you restart this applet." msgstr "" "Après l'activation ou désactivation d'un périphérique, la liste des " -"joysticks connectés ne sera pas mise à jour à moins de redémarrer l'applet." +"joysticks connectés ne sera pas mise à jour à moins de redémarrer cette " +"applet." #: joy.rc:47 msgid "Test Joystick" @@ -8987,7 +8988,7 @@ msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"Aucun périphérique audio capable d'enregistrer des fichiers sous le format " +"Aucun périphérique audio capable d'enregistrer des fichiers dans le format " "en cours n'a été installé." #: winmm.rc:117 @@ -9647,7 +9648,8 @@ msgid "" "of a previous command before it scrolls off the screen.\n" msgstr "" "PAUSE affiche un message à l'écran demandant à l'utilisateur d'appuyer sur " -"une touche.\n" +"une\n" +"touche.\n" "\n" "Principalement utilisé dans des fichiers batchs pour permettre à " "l'utilisateur\n" @@ -11878,7 +11880,7 @@ msgstr "Erreur : impossible de terminer le processus « %1 ».\n" #: taskkill.rc:40 msgid "Error: Process self-termination is not permitted.\n" -msgstr "Erreur : un processus ne peut pas s'auto-terminer.\n" +msgstr "Erreur : un processus ne peut pas se terminer lui-même.\n" #: taskmgr.rc:37 taskmgr.rc:108 msgid "&New Task (Run...)" @@ -13171,7 +13173,7 @@ msgstr "Lettre" #: winecfg.rc:75 msgid "Drive Mapping" -msgstr "Assignation de lecteur" +msgstr "Dossier cible" #: winecfg.rc:76 msgid ""

1 0

Francois Gouget : po: Fix some typography issues in the Korean translation.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: 13fbed58dbf29df65ad393f842ff1692e47e2c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbed58dbf29df65ad393f84… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 14:10:45 2013 +0200 po: Fix some typography issues in the Korean translation. --- po/ko.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0c06c7a..2f76ff5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3530,7 +3530,7 @@ msgstr "끝나지 않은 문자열 상수" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "함수 밖에 'return'문장이 있음 " +msgstr "함수 밖에 'return'문장이 있음" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -9691,8 +9691,9 @@ msgstr "" "/node n 지정한 NUMA 노드로 프로그램을 시작합니다.\n" "/affinity 마스크 지정한 친화도 마스크로 프로그램을 시작합니다.\n" "/wait 시작된 프로그램이 끝나기를 기다리고,프로그램이 끝났을때 종료코드" -"로 끝납니다 /unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일" -"을 시작합니다.\n" +"로 끝납니다.\n" +"/unix 유닉스 파일이름을 사용하고, 윈도우즈 탐색기같이 파일을 시작합니" +"다.\n" "/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" "/? 도움말을 보여주고 끝냅니다.\n" @@ -10094,7 +10095,7 @@ msgstr "연산자가 요구됩니다.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "괄호가 일치하지 않습니다\n" +msgstr "괄호가 일치하지 않습니다.\n" #: cmd.rc:361 msgid ""

1 0

Francois Gouget : po: Fix the 'All key' Korean translation.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: 736192500b5a4e640a2914593bdab8075bf6c89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=736192500b5a4e640a2914593… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 14:26:46 2013 +0200 po: Fix the 'All key' Korean translation. --- po/ko.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ko.po b/po/ko.po index 2f76ff5..20f77ad 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10002,7 +10002,7 @@ msgstr "배치 스크립트 밖의 배치 라벨은 불러올수 없습니다\n" #: cmd.rc:338 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "A" +msgstr "모두" #: cmd.rc:339 msgid "Delete %1?"

1 0

Francois Gouget : po: Fix a couple of typography issues in the Japanese translation.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: 6ee76e1c3a86fc33f5e4c93fe38c80e1f3964ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee76e1c3a86fc33f5e4c93fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 14:19:59 2013 +0200 po: Fix a couple of typography issues in the Japanese translation. --- po/ja.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 645f2cd..96df7d5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2550,7 +2550,7 @@ msgstr "OID を 1.2.3.4 形式で入力してください" #: cryptui.rc:65 msgid "The OID you entered already exists." -msgstr "入力した OID はすでに存在します" +msgstr "入力した OID はすでに存在します。" #: cryptui.rc:67 msgid "Please select a certificate store." @@ -9705,7 +9705,7 @@ msgstr "" "\n" "オプション:\n" "\"タイトル\" 子ウィンドウのタイトルを指定します。\n" -"/d directory プログラムを指定したディレクトリで開始します。 \n" +"/d directory プログラムを指定したディレクトリで開始します。\n" "/b プログラムで新しいコンソールを作成しません。\n" "/i 初期の環境変数でプログラムを開始します。\n" "/min 最小化状態でプログラムを開始します。\n"

1 0

Francois Gouget : po: Fix some typography issues in the Traditional Chinese translation.
by Alexandre Julliard 12 Jul '13

12 Jul '13

Module: wine Branch: master Commit: 4b630f7762d88c8bc952e268db1714a48e1dee7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b630f7762d88c8bc952e268d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 12 14:30:30 2013 +0200 po: Fix some typography issues in the Traditional Chinese translation. --- po/zh_TW.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index debcb6a..e1c3e3e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9528,7 +9528,7 @@ msgid "" "if called from the command line.\n" msgstr "" "SHIFT 在批次檔中用來從參數列表的前端移除一個\n" -"參數，因此參數 2 會成為參數 1 ...等等。如果從命令列呼叫它，\n" +"參數，因此參數 2 會成為參數 1... 等等。如果從命令列呼叫它，\n" "將不會有任何效果。\n" #: cmd.rc:186 start.rc:50 @@ -9926,7 +9926,7 @@ msgstr "找不到 PATH\n" #: cmd.rc:347 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續..." +msgstr "按下任何鍵繼續... " #: cmd.rc:348 msgid "Wine Command Prompt"

1 0

Nikolay Sivov : kernel32/tests: Some tests for FindActCtxSectionGuid().
by Alexandre Julliard 12 Jul '13

12 Jul '13

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

Dmitry Timoshkov : gdiplus/tests: Add another set of clipping region tests.
by Alexandre Julliard 12 Jul '13

12 Jul '13

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

Dmitry Timoshkov : Revert "gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .".
by Alexandre Julliard 12 Jul '13

12 Jul '13

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