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

Volkan Gezer : po: Updated Turkish Translation.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: ccdd2d99527c14ad1315519f414de84370fa21fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdd2d99527c14ad1315519f4… Author: Volkan Gezer <volkangezer(a)gmail.com> Date: Mon Jun 24 11:43:38 2013 +0200 po: Updated Turkish Translation. --- po/tr.po | 295 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 165 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccdd2d99527c14ad13155…

1 0

Dmitry Timoshkov : kernel32/tests: Add a test for VirtualAlloc called on a mapped PE section.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: e5c55c5a5aedb3898f8a0a1e8df232a19447009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c55c5a5aedb3898f8a0a1e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 24 21:36:49 2013 +0900 kernel32/tests: Add a test for VirtualAlloc called on a mapped PE section. --- dlls/kernel32/tests/loader.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index bd80508..ef1cde4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -374,6 +374,7 @@ static void test_Loader(void) if (hlib) { MEMORY_BASIC_INFORMATION info; + void *ptr; ok( td[i].errors[0] == ERROR_SUCCESS, "%d: should have failed\n", i ); @@ -394,6 +395,15 @@ static void test_Loader(void) ok(info.Type == SEC_IMAGE, "%d: %x != SEC_IMAGE\n", i, info.Type); SetLastError(0xdeadbeef); + ptr = VirtualAlloc(hlib, si.dwPageSize, MEM_COMMIT, info.Protect); + /* FIXME: Remove once Wine is fixed */ + if (ptr) todo_wine + ok(!ptr, "%d: VirtualAlloc should fail\n", i); + else ok(!ptr, "%d: VirtualAlloc should fail\n", i); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); size = VirtualQuery((char *)hlib + info.RegionSize, &info, sizeof(info)); ok(size == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); @@ -471,6 +481,17 @@ static void test_Loader(void) size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; ok(memcmp(start, filler, size), "%d: alignment should not be cleared\n", i); } + + SetLastError(0xdeadbeef); + ptr = VirtualAlloc((char *)hlib + section.VirtualAddress, si.dwPageSize, MEM_COMMIT, info.Protect); + /* FIXME: Remove once Wine is fixed */ + if (ptr) todo_wine + ok(!ptr, "%d: VirtualAlloc should fail\n", i); + else ok(!ptr, "%d: VirtualAlloc should fail\n", i); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_ADDRESS, + "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } SetLastError(0xdeadbeef);

1 0

Caibin Chen : po: Update Simplified Chinese Translation.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 96ab188f73da63a2628a4071d3082165ddf3aa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ab188f73da63a2628a4071d… Author: Caibin Chen <tigersoldi(a)gmail.com> Date: Mon Jun 24 09:04:12 2013 -0700 po: Update Simplified Chinese Translation. --- po/zh_CN.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index cc30abc..b9a7194 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-21 09:30-0700\n" +"PO-Revision-Date: 2013-06-24 09:18-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: Chinese (PRC)\n" @@ -11351,7 +11351,7 @@ msgstr "每一个 C&PU 各一张图" #: taskmgr.rc:76 taskmgr.rc:261 msgid "&Show Kernel Times" -msgstr "显示内核时间(&S)" +msgstr "显示内核耗时(&S)" #: taskmgr.rc:80 taskmgr.rc:96 taskmgr.rc:123 winefile.rc:73 msgid "Tile &Horizontally" @@ -11491,11 +11491,11 @@ msgstr "系统缓存" #: taskmgr.rc:406 msgid "Paged" -msgstr "已分页" +msgstr "可换页" #: taskmgr.rc:407 msgid "Nonpaged" -msgstr "未分页" +msgstr "不可换页" #: taskmgr.rc:414 msgid "CPU usage history" @@ -11670,7 +11670,7 @@ msgstr "&CPU 负载率" #: taskmgr.rc:527 msgid "CPU Tim&e" -msgstr "CPU 时间(&T)" +msgstr "CPU 耗时(&T)" #: taskmgr.rc:529 msgid "&Memory Usage" @@ -11718,11 +11718,11 @@ msgstr "虚拟内存大小(&V)" #: taskmgr.rc:551 msgid "Pa&ged Pool" -msgstr "已分页池(&G)" +msgstr "可换页池(&G)" #: taskmgr.rc:553 msgid "N&on-paged Pool" -msgstr "未分页池(&O)" +msgstr "不可换页池(&O)" #: taskmgr.rc:555 msgid "Base P&riority" @@ -11854,7 +11854,7 @@ msgstr "选择在“进程”标签页显示的列项" #: taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" -msgstr "在性能图上显示内核时间" +msgstr "在性能图上显示内核耗时" #: taskmgr.rc:219 msgid "A single history graph shows total CPU usage" @@ -11954,7 +11954,7 @@ msgstr "CPU" #: taskmgr.rc:275 msgid "CPU Time" -msgstr "CPU 时间" +msgstr "CPU 耗时" #: taskmgr.rc:276 msgid "Mem Usage" @@ -11994,11 +11994,11 @@ msgstr "虚拟内存大小" #: taskmgr.rc:287 msgid "Paged Pool" -msgstr "已分页池" +msgstr "可换页池" #: taskmgr.rc:288 msgid "NP Pool" -msgstr "未分页池" +msgstr "不可换页池" #: taskmgr.rc:289 msgid "Base Pri" @@ -12087,7 +12087,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\n" -"您想把这项卸载命令从注册表中删除吗？" +"您想把这项卸载条目从注册表中删除吗？" #: view.rc:33 msgid "&Pan" @@ -12144,8 +12144,8 @@ msgid "" "option) any later version." msgstr "" "本程序为自由软件，您可以遵照自由软件基金会出版的 GNU 较宽松通用公共许可证协议" -"（LGPL）\n" -"来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更高版本。" +"（LGPL）来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更" +"新的版本。" #: winecfg.rc:134 msgid "Windows registration information"

1 0

Marcus Meissner : msvf32: Fixed incorrect sizeof (Coverity).
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: cf2c506b1a7b3ce7aa6f6c6cd20c7a60f98929bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2c506b1a7b3ce7aa6f6c6cd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 22 18:14:10 2013 +0200 msvf32: Fixed incorrect sizeof (Coverity). --- dlls/msvfw32/msvideo_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index f418481..ea38e0f 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1373,7 +1373,7 @@ LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS pc, UINT uiFlags, LPVOID lpBits, BOOL icComp->lFrameNum = pc->lFrame++; icComp->lpOutput = pc->lpBitsOut; icComp->lpPrev = pc->lpBitsPrev; - ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(icComp)); + ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp)); if (icComp->dwFlags & AVIIF_KEYFRAME) {

1 0

Christian Costa : d3dxof: Add support for case sensitive legacy type indexColor.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: c6106428f6c83175006a99b9a2dbdb57408a4a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6106428f6c83175006a99b9a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jun 23 21:56:39 2013 +0200 d3dxof: Add support for case sensitive legacy type indexColor. --- dlls/d3dx9_36/tests/xfile.c | 2 +- dlls/d3dxof/d3dxof.c | 18 ++++++++++++++++-- dlls/d3dxof/parsing.c | 24 ++++++++++++++++-------- dlls/d3dxof/tests/d3dxof.c | 2 +- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index c47cffb..d105aee 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -237,7 +237,7 @@ static void test_type_index_color(void) /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); - todo_wine ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x instead of %#x\n", ret, D3DXFERR_PARSEERROR); diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index c0bea3c..f726170 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -46,6 +46,9 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** ppObj); static HRESULT IDirectXFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); +#define TOKEN_DWORD 41 +#define TOKEN_FLOAT 42 + HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) { IDirectXFileImpl* object; @@ -62,6 +65,17 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) object->IDirectXFile_iface.lpVtbl = &IDirectXFile_Vtbl; object->ref = 1; + /* Reserve first template to handle the case sensitive legacy type indexColor */ + object->nb_xtemplates = 1; + strcpy(object->xtemplates[0].name, "indexColor"); + object->xtemplates[0].nb_members = 2; + object->xtemplates[0].members[0].type = TOKEN_DWORD; + object->xtemplates[0].members[0].nb_dims = 0; + object->xtemplates[0].members[1].type = TOKEN_FLOAT; + object->xtemplates[0].members[1].nb_dims = 1; + object->xtemplates[0].members[1].dim_fixed[0] = TRUE; + object->xtemplates[0].members[1].dim_value[0] = 4; + *ppObj = &object->IDirectXFile_iface; return S_OK; @@ -252,7 +266,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); - for (i = 0; i < This->nb_xtemplates; i++) + for (i = 1; i < This->nb_xtemplates; i++) DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } @@ -330,7 +344,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP { ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); - for (i = 0; i < This->nb_xtemplates; i++) + for (i = 1; i < This->nb_xtemplates; i++) DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index fc7250c..fa992ce 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -961,17 +961,25 @@ static BOOL parse_template_members_list(parse_buffer * buf) if (check_TOKEN(buf) == TOKEN_NAME) { cur_member->type = get_TOKEN(buf); - cur_member->idx_template = 0; - while (cur_member->idx_template < buf->pdxf->nb_xtemplates) + if (!strcmp((char*)buf->value, "indexColor")) { - if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) - break; - cur_member->idx_template++; + /* Case sensitive legacy type indexColor is described in the first template */ + cur_member->idx_template = 0; } - if (cur_member->idx_template == buf->pdxf->nb_xtemplates) + else { - ERR("Reference to a nonexistent template '%s'\n", (char*)buf->value); - return FALSE; + cur_member->idx_template = 1; + while (cur_member->idx_template < buf->pdxf->nb_xtemplates) + { + if (!strcasecmp((char*)buf->value, buf->pdxf->xtemplates[cur_member->idx_template].name)) + break; + cur_member->idx_template++; + } + if (cur_member->idx_template == buf->pdxf->nb_xtemplates) + { + WARN("Reference to a nonexistent template '%s'\n", (char*)buf->value); + return FALSE; + } } } else if (is_primitive_type(check_TOKEN(buf))) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index d0f110d..f115eb3 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -1103,7 +1103,7 @@ static void test_type_index_color(void) /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); - todo_wine ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); ok(ret == DXFILEERR_PARSEERROR, "IDirectXFileImpl_RegisterTemplates returned %#x instead of %#x\n", ret, DXFILEERR_PARSEERROR);

1 0

Roger Koot : po: Updated Dutch translation.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 2b6c69c006c005f02c3434aa82b353619947a91c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6c69c006c005f02c3434aa8… Author: Roger Koot <roger.koot(a)gmail.com> Date: Sat Jun 22 18:52:59 2013 +0200 po: Updated Dutch translation. --- po/nl.po | 52 ++++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 28 deletions(-) diff --git a/po/nl.po b/po/nl.po index f1b533d..1802e27 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-21 15:34+0100\n" +"PO-Revision-Date: 2013-06-22 18:30+0100\n" "Last-Translator: Roger Koot <roger.koot(a)gmail.com>\n" "Language-Team: none\n" "Language: Dutch\n" @@ -2875,11 +2875,11 @@ msgstr "Het gespecifeerde bestand bestaat reeds. Wilt u het vervangen?" #: cryptui.rc:153 msgid "DER-Encoded Binary X.509 (*.cer)" -msgstr "DER-Encoded Binary X.509 (*.cer)" +msgstr "DER-geëncodeerde Binary X.509 (*.cer)" #: cryptui.rc:154 msgid "Base64-Encoded X.509 (*.cer)" -msgstr "Base64-geëncodeerd X.509 (*.cer)" +msgstr "Base64-geëncodeerde X.509 (*.cer)" #: cryptui.rc:157 msgid "CMS/PKCS #7 Messages (*.p7b)" @@ -3067,7 +3067,7 @@ msgstr "Hangul(Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "Symbol" +msgstr "Symbool" #: gdi32.rc:41 msgid "OEM/DOS" @@ -3300,11 +3300,11 @@ msgstr "Zoeken naar %s" #: ieframe.rc:79 msgid "Start downloading %s" -msgstr "Start downloaden van %s..." +msgstr "Start downloaden van %s" #: ieframe.rc:80 msgid "Downloading %s" -msgstr "%s downloaden..." +msgstr "%s downloaden" #: ieframe.rc:81 msgid "Asking for %s" @@ -3483,7 +3483,7 @@ msgstr "" #: joy.rc:47 msgid "Test Joystick" -msgstr "Test Joystick" +msgstr "Joystick testen" #: joy.rc:51 msgid "Buttons" @@ -3491,7 +3491,7 @@ msgstr "Knoppen" #: joy.rc:60 msgid "Test Force Feedback" -msgstr "Test Force Feedback" +msgstr "Force Feedback Testen" #: joy.rc:64 msgid "Available Effects" @@ -3643,7 +3643,7 @@ msgstr "De te decoderen URI is niet correct" #: jscript.rc:58 msgid "Number of fraction digits is out of range" -msgstr "Aantal getallen achter de komma buiten bereik." +msgstr "Aantal getallen achter de komma buiten bereik" #: jscript.rc:59 msgid "Precision is out of range" @@ -6738,7 +6738,7 @@ msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"Het opgegeven installatiepakket kon niet worden geopend. Verifieer het " +"Het opgegeven installatiepakket kon niet worden geopend. Verifieer het " "bestandspad en probeer opnieuw." #: msi.rc:28 @@ -8317,7 +8317,7 @@ msgstr " min" #: shlwapi.rc:30 msgctxt "time unit: seconds" msgid " sec" -msgstr "sec" +msgstr " sec" #: urlmon.rc:29 wininet.rc:74 msgid "Security Warning" @@ -10178,8 +10178,7 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"Volume in schijfstation %1!c! is %2\n" -"Het serienummer van het volume is %3!04x!-%4!04x!\n" +"Het Volume Serienummer is %1!04x!-%2!04x!\n" "\n" #: cmd.rc:345 @@ -10220,11 +10219,11 @@ msgstr "Volume in schijfstation %1!c! heeft geen label.\n" #: cmd.rc:354 msgid " (Yes|No)" -msgstr "(Ja|Nee)" +msgstr " (Ja|Nee)" #: cmd.rc:355 msgid " (Yes|No|All)" -msgstr "(Ja|Nee|Alles)" +msgstr " (Ja|Nee|Alles)" #: cmd.rc:356 msgid "" @@ -10536,7 +10535,7 @@ msgstr "Fouten" #: netstat.rc:40 msgid "Unknown protocols" -msgstr "Onbekende protocollen." +msgstr "Onbekende protocollen" #: netstat.rc:41 msgid "TCP Statistics for IPv4" @@ -10580,7 +10579,7 @@ msgstr "UDP Statistieken voor IPv4" #: netstat.rc:51 msgid "Datagrams Received" -msgstr "Ontvangen Datagrammen." +msgstr "Ontvangen Datagrammen" #: netstat.rc:52 msgid "No Ports" @@ -12743,7 +12742,7 @@ msgstr "" #: winecfg.rc:134 msgid "Windows registration information" -msgstr "Windows registratie-informatie " +msgstr "Windows registratie-informatie" #: winecfg.rc:135 msgid "&Owner:" @@ -12782,7 +12781,6 @@ msgid "&Windows Version:" msgstr "Windowsversie:" #: winecfg.rc:160 -#, fuzzy msgid "Window settings" msgstr " Vensterinstellingen " @@ -12808,7 +12806,7 @@ msgstr "Afmetingen:" #: winecfg.rc:171 msgid "Screen resolution" -msgstr " Schermresolutie " +msgstr "Schermresolutie " #: winecfg.rc:175 msgid "This is a sample text using 10 point Tahoma" @@ -12817,7 +12815,7 @@ msgstr "Dit is een tekstvoorbeeld in Tahoma met puntgrootte 10" #: winecfg.rc:182 #, fuzzy msgid "DLL overrides" -msgstr " DLL Overrides " +msgstr "DLL Overrides " #: winecfg.rc:183 msgid "" @@ -12851,7 +12849,7 @@ msgstr "Override bewerken" #: winecfg.rc:199 msgid "Load order" -msgstr " Laadvolgorde " +msgstr "Laadvolgorde " #: winecfg.rc:200 msgid "&Builtin (Wine)" @@ -12875,7 +12873,7 @@ msgstr "Selecteer Stationsletter" #: winecfg.rc:223 msgid "Drive mappings" -msgstr " Stations-toewijzingen" +msgstr "Stations-toewijzingen" #: winecfg.rc:224 msgid "" @@ -13338,9 +13336,8 @@ msgid "Command history" msgstr "Geschiedenis" #: wineconsole.rc:73 -#, fuzzy msgid "&Number of recalled commands:" -msgstr "&Aantal te bewaren opdrachten :" +msgstr "&Aantal te bewaren opdrachten:" #: wineconsole.rc:76 msgid "&Remove doubles" @@ -13679,7 +13676,6 @@ msgid "By File Type" msgstr "Per Bestandstype" #: winefile.rc:140 -#, fuzzy msgid "File type" msgstr "Bestandstype" @@ -14001,7 +13997,7 @@ msgstr "Fout: Commandoregel niet ondersteund\n" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Fout: Alias niet gevonden.\n" +msgstr "Fout: Alias niet gevonden\n" #: wmic.rc:27 msgid "Error: Invalid query\n" @@ -14339,7 +14335,7 @@ msgstr "Foutief nummerformaat." #: wordpad.rc:188 msgid "OLE storage documents are not supported." -msgstr "OLE opslag documenten worden niet ondersteund" +msgstr "OLE opslag documenten worden niet ondersteund." #: wordpad.rc:189 msgid "Could not save the file."

1 0

Alexandre Julliard : gdi32: Cache the font smoothing parameters.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: e4300d616500e1346e1935f14255f082e1097f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4300d616500e1346e1935f14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 24 12:41:40 2013 +0200 gdi32: Cache the font smoothing parameters. --- dlls/gdi32/font.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8fb101f..c6bd65b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -781,6 +781,7 @@ HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'D','e','s','k','t','o','p',0 }; + static int orientation = -1, smoothing = -1; LOGFONTW lf; HKEY key; @@ -797,14 +798,22 @@ HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) break; case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: - if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; - *aa_flags = get_subpixel_orientation( key ); - RegCloseKey( key ); + if (orientation == -1) + { + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; + orientation = get_subpixel_orientation( key ); + RegCloseKey( key ); + } + *aa_flags = orientation; break; default: - if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; - *aa_flags = get_default_smoothing( key ); - RegCloseKey( key ); + if (smoothing == -1) + { + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; + smoothing = get_default_smoothing( key ); + RegCloseKey( key ); + } + *aa_flags = smoothing; break; } return 0;

1 0

Marcus Meissner : gdi32: Close handle in error path (Coverity).
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 1cf9939dc00b0b2f929f862e69d355d412ecf172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf9939dc00b0b2f929f862e6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 22 17:21:39 2013 +0200 gdi32: Close handle in error path (Coverity). --- dlls/gdi32/enhmfdrv/init.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 57a4d18..18f9eae 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -409,6 +409,7 @@ HDC WINAPI CreateEnhMetaFileW( } if (!WriteFile( hFile, physDev->emh, size, NULL, NULL )) { free_dc_ptr( dc ); + CloseHandle( hFile ); return 0; } physDev->hFile = hFile;

1 0

Andrew Eikum : oleaut32: Load referenced typelibs in the same architecture.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 2fa16df55109bd01498c9cf572399dc288512a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa16df55109bd01498c9cf57… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:16 2013 -0500 oleaut32: Load referenced typelibs in the same architecture. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ dlls/oleaut32/typelib.c | 25 ++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1919ea8..30468c1 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1550,6 +1550,11 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unknown); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetTypeAttr(unknown, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeVft == 3 * sizeof(void*), "Got wrong cbSizeVft: %u\n", typeattr->cbSizeVft); + ITypeInfo_ReleaseTypeAttr(unknown, typeattr); + hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispatch); ok(hres == S_OK, "got %08x\n", hres); @@ -1684,6 +1689,17 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == 3, "hreftype = %d\n", hreftype); + hres = ITypeInfo_GetRefTypeInfo(interface1, hreftype, &ti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeVft == 12 || broken(typeattr->cbSizeVft == 24) /* xp64 */, + "retrieved IUnknown gave wrong cbSizeVft: %u\n", typeattr->cbSizeVft); + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + ITypeInfo_Release(ti); + hres = ITypeInfo_GetRefTypeOfImplType(interface1, -1, &hreftype); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index acf495f..24d250c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7433,18 +7433,21 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeLib_AddRef(pTLib); result = S_OK; } else { + BSTR libnam; + TRACE("typeinfo in imported typelib that isn't already loaded\n"); - result = LoadRegTypeLib( TLB_get_guid_null(ref_type->pImpTLInfo->guid), - ref_type->pImpTLInfo->wVersionMajor, - ref_type->pImpTLInfo->wVersionMinor, - ref_type->pImpTLInfo->lcid, - &pTLib); - - if(FAILED(result)) { - BSTR libnam=SysAllocString(ref_type->pImpTLInfo->name); - result=LoadTypeLib(libnam, &pTLib); - SysFreeString(libnam); - } + + result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), + ref_type->pImpTLInfo->wVersionMajor, + ref_type->pImpTLInfo->wVersionMinor, + This->pTypeLib->syskind, + ref_type->pImpTLInfo->lcid, &libnam); + if(FAILED(result)) + libnam = SysAllocString(ref_type->pImpTLInfo->name); + + result = LoadTypeLib(libnam, &pTLib); + SysFreeString(libnam); + if(SUCCEEDED(result)) { ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib); ITypeLib_AddRef(pTLib);

1 0

Andrew Eikum : oleaut32: Register the typelib' s path without WOW64 redirection.
by Alexandre Julliard June 24, 2013

June 24, 2013

Module: wine Branch: master Commit: 82376431e8ffd2456e7883ed5040b93ee2937a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82376431e8ffd2456e7883ed5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 21 14:27:11 2013 -0500 oleaut32: Register the typelib's path without WOW64 redirection. --- dlls/oleaut32/typelib.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bc7ee56..acf495f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -66,6 +66,7 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "winternl.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -3128,6 +3129,7 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath LPVOID pBase = NULL; DWORD dwTLBLength = 0; IUnknown *pFile = NULL; + HANDLE h; *ppTypeLib = NULL; @@ -3162,6 +3164,24 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath if(file != pszFileName) heap_free(file); + h = CreateFileW(pszPath, GENERIC_READ, 0, NULL, OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + if(h != INVALID_HANDLE_VALUE){ + FILE_NAME_INFORMATION *info; + char data[MAX_PATH * sizeof(WCHAR) + sizeof(info->FileNameLength)]; + BOOL br; + + info = (FILE_NAME_INFORMATION*)data; + /* GetFileInformationByHandleEx returns the path of the file without + * WOW64 redirection */ + br = GetFileInformationByHandleEx(h, FileNameInfo, data, sizeof(data)); + if(br){ + info->FileName[info->FileNameLength / sizeof(WCHAR)] = 0; + lstrcpynW(pszPath + 2, info->FileName, cchPath - 2); + } + CloseHandle(h); + } + TRACE_(typelib)("File %s index %d\n", debugstr_w(pszPath), index); /* We look the path up in the typelib cache. If found, we just addref it, and return the pointer. */

1 0