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

Frédéric Delanoy : winedev: Use 'quote' tags instead of double quotes.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: docs Branch: master Commit: 362ce222bc2a9ad3f60dbd27dc95f06ffb9768c7 URL: http://source.winehq.org/git/docs.git/?a=commit;h=362ce222bc2a9ad3f60dbd27d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:38 2013 +0200 winedev: Use 'quote' tags instead of double quotes. This way they can be adapted e.g. for translations. Also use single quotes for individual characters --- en/winedev-architecture.sgml | 16 ++++++++-------- en/winedev-coding.sgml | 21 ++++++++++----------- en/winedev-debugger.sgml | 36 ++++++++++++++++++------------------ en/winedev-documentation.sgml | 34 ++++++++++++++++------------------ en/winedev-kernel.sgml | 14 +++++++------- en/winedev-ole.sgml | 32 ++++++++++++++++---------------- en/winedev-opengl.sgml | 16 ++++++++-------- en/winedev-otherdebug.sgml | 6 +++--- en/winedev-testing.sgml | 12 ++++++------ en/winedev-windowing.sgml | 8 ++++---- 10 files changed, 96 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=362ce222bc2a9ad3f60db…

1 0

Frédéric Delanoy : winedev: Use 'replaceable' tags for data placeholders.
by Alexandre Julliard Aug. 19, 2013

Aug. 19, 2013

Module: docs Branch: master Commit: f0d643aad55c32e34521be1c241ea17a92337ede URL: http://source.winehq.org/git/docs.git/?a=commit;h=f0d643aad55c32e34521be1c2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:41 2013 +0200 winedev: Use 'replaceable' tags for data placeholders. --- en/winedev-coding.sgml | 25 ++-- en/winedev-debugger.sgml | 407 +++++++++++++++++++---------------------- en/winedev-debugging.sgml | 34 ++-- en/winedev-documentation.sgml | 4 +- en/winedev-kernel.sgml | 99 +++++----- en/winedev-multimedia.sgml | 10 +- en/winedev-ole.sgml | 14 +- en/winedev-otherdebug.sgml | 34 ++-- en/winedev-testing.sgml | 2 +- 9 files changed, 302 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=f0d643aad55c32e34521b…

1 0

Jeremy Newman : CVS page removed, redirect to Git Wiki page
by Jeremy Newman Aug. 16, 2013

Aug. 16, 2013

Module: website Branch: master Commit: 647b56ff8ec101c5d6a60c6ad14ec58caa8300fa URL: http://source.winehq.org/git/website.git/?a=commit;h=647b56ff8ec101c5d6a60c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Aug 16 16:06:03 2013 -0500 CVS page removed, redirect to Git Wiki page --- templates/en/cvs.template | 21 --------------------- templates/he/cvs.template | 21 --------------------- templates/tr/cvs.template | 19 ------------------- templates/zh-cn/cvs.template | 21 --------------------- 4 files changed, 0 insertions(+), 82 deletions(-) diff --git a/templates/en/cvs.template b/templates/en/cvs.template deleted file mode 100644 index 202cf60..0000000 --- a/templates/en/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">The Wine CVS Tree</h1> - -<p><strong>Note: We have switched development from CVS to <a href="http://git.or.cz">Git</a>. - Wine can no longer be downloaded via CVS. - Instructions for using the <a href="{$root}/site/git">Wine Git tree</a> - can be found on the <a href="http://wiki.winehq.org/GitWine">GitWine</a> - page on the <a href="http://wiki.winehq.org">Wine Wiki</a>.</strong></p> - -<hr /> - -<h1 id="sourcetree">Source Tree Browsing via the Web</h1> - -<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) - cross-referenced and available for browsing, including a search engine. - This cross-references source is based on the snapshot-releases and is made available at:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/he/cvs.template b/templates/he/cvs.template deleted file mode 100644 index 5d500c8..0000000 --- a/templates/he/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">עץ ה־CVS של Wine</h1> - -<p><strong>נא לשים לב: הפיתוח הועבר ממערכת CVS ל־<a href="http://git.or.cz">Git</a>. - לא ניתן עוד להוריד את Wine דרך ה־CVS. - ניתן למצוא הנחיות לשימוש ב<a href="{$root}/site/git">עץ ה־Git של Wine</a> - בעמוד <a href="http://wiki.winehq.org/GitWine">GitWine</a> - שב<a href="http://wiki.winehq.org">וויקי של Wine</a>.</strong></p> - -<hr /> - -<h1 id="sourcetree">עיון בעץ המקור באמצעות דפדפן</h1> - -<p>קוד המקור של כל העץ של Wine (מבוסס <a href="http://lxr.linux.no/">LXR</a>) הוא בעל הפניות צולבות - וזמין לעיון לרבות מנוע חיפוש. - הקוד בעל ההפניות הצולבות מבוסס על הפצת הפיתוח אותה ניתן להוריד בכתובת:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/tr/cvs.template b/templates/tr/cvs.template deleted file mode 100644 index 0fff643..0000000 --- a/templates/tr/cvs.template +++ /dev/null @@ -1,19 +0,0 @@ - - - -<h1 class="title">Wine CVS Ağacı</h1> - -<p><strong>Not: Geliştirme olarak CVS'den <a href="http://git.or.cz">Git</a>'e geçtik. - Wine artık CVS ile indirilemez. - <a href="{$root}/site/git">Wine Git ağacı</a> kullanımı hakkında talimatlar <a href="http://wiki.winehq.org">Wine Wiki</a> içerisinde - <a href="http://wiki.winehq.org/GitWine">GitWine</a> sayfasında bulunabilir.</strong></p> - -<hr /> - -<h1 id="sourcetree">Web Yardımıyla Kaynak Ağaç Gezintisi</h1> - -<p>Tüm Wine ağacının kaynak kodu (<a href="http://lxr.linux.no/">LXR</a> tabanlıdır) arama motoru da dahil olan çapraz referanslı ve gezinti için kullanılabilir. - Bu çapraz referans kaynak, günlük dağıtım tabanlıdır ve şuradan bulunabilir:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul> diff --git a/templates/zh-cn/cvs.template b/templates/zh-cn/cvs.template deleted file mode 100644 index ba10a25..0000000 --- a/templates/zh-cn/cvs.template +++ /dev/null @@ -1,21 +0,0 @@ - - - -<h1 class="title">The Wine CVS Tree</h1> - -<p><strong>注意：我们已经把开发从 CVS 切换到 <a href="http://git.or.cz">Git</a> 了。 - 不可以再通过 CVS 来获取 Wine 了。 - <a href="{$root}/site/git">Wine Git tree</a> 的使用说明可以从 - <a href="http://wiki.winehq.org">Wine Wiki</a> 上的 - <a href="http://wiki.winehq.org/GitWine">GitWine</a> 页面找到。</strong></p> - -<hr /> - -<h1 id="sourcetree">通过 Web 方式浏览源码树</h1> - -<p>The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) - cross-referenced and available for browsing, including a search engine. - This cross-references source is based on the snapshot-releases and is made available at:</p> -<ul> - <li><a href="http://source.winehq.org/">source.winehq.org</a></li> -</ul>

1 0

Qian Hong : imm32/tests: Added tests for ImmDestroyContext.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: af058929ca2d849ee28008aac46d84721fb15f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af058929ca2d849ee28008aac… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:52 2013 +0800 imm32/tests: Added tests for ImmDestroyContext. --- dlls/imm32/tests/imm32.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 13b9bc1..62bdb64 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -774,6 +774,34 @@ static void test_ImmGetIMCCLockCount(void) ImmDestroyIMCC(imcc); } +static void test_ImmDestroyContext(void) +{ + HIMC imc; + DWORD ret, count; + INPUTCONTEXT *ic; + + imc = ImmCreateContext(); + count = ImmGetIMCLockCount(imc); + ok(count == 0, "expect 0, returned %d\n", count); + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + count = ImmGetIMCLockCount(imc); + ok(count == 1, "expect 1, returned %d\n", count); + ret = ImmDestroyContext(imc); + ok(ret == TRUE, "Destroy a locked IMC should success!\n"); + ic = ImmLockIMC(imc); + todo_wine ok(ic == NULL, "Lock a destroyed IMC should fail!\n"); + ret = ImmUnlockIMC(imc); + todo_wine ok(ret == FALSE, "Unlock a destroyed IMC should fail!\n"); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "Get lock count of a destroyed IMC should return 0!\n"); + SetLastError(0xdeadbeef); + ret = ImmDestroyContext(imc); + todo_wine ok(ret == FALSE, "Destroy a destroyed IMC should fail!\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmDestroyIMCC(void) { HIMCC imcc; @@ -967,6 +995,7 @@ START_TEST(imm32) { test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); + test_ImmDestroyContext(); test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */

1 0

Qian Hong : imm32/tests: Added more IMC lock count tests.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: b5b52371d1776b9fb0b44b7583e65fb0ddfbd757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b52371d1776b9fb0b44b758… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:42 2013 +0800 imm32/tests: Added more IMC lock count tests. --- dlls/imm32/tests/imm32.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0a511e6..13b9bc1 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -691,7 +691,7 @@ static void test_ImmDefaultHwnd(void) static void test_ImmGetIMCLockCount(void) { HIMC imc; - DWORD count, ret; + DWORD count, ret, i; INPUTCONTEXT *ic; imc = ImmCreateContext(); @@ -709,6 +709,23 @@ static void test_ImmGetIMCLockCount(void) ok(ret == TRUE, "expect TRUE, ret %d\n", ret); count = ImmGetIMCLockCount(imc); ok(count == 0, "expect 0, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) + { + ic = ImmLockIMC(imc); + ok(ic != NULL, "ImmLockIMC failed!\n"); + } + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 1, "expect 1, returned %d\n", count); + ImmUnlockIMC(imc); + count = ImmGetIMCLockCount(imc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyContext(imc); }

1 0

Qian Hong : imm32/tests: Added more IMCC lock count tests.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 7822398d275eb11b42f6e0050965901982d17e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7822398d275eb11b42f6e0050… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:09:54 2013 +0800 imm32/tests: Added more IMCC lock count tests. --- dlls/imm32/tests/imm32.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 26101a4..2cdc662 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -715,7 +715,8 @@ static void test_ImmGetIMCLockCount(void) static void test_ImmGetIMCCLockCount(void) { HIMCC imcc; - DWORD count, ret; + DWORD count, g_count, ret, i; + VOID *p; imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); count = ImmGetIMCCLockCount(imcc); @@ -731,6 +732,28 @@ static void test_ImmGetIMCCLockCount(void) ok(ret == FALSE, "expect FALSE, ret %d\n", ret); count = ImmGetIMCCLockCount(imcc); ok(count == 0, "expect 0, returned %d\n", count); + + p = ImmLockIMCC(imcc); + todo_wine ok(GlobalHandle(p) == imcc, "expect %p, returned %p\n", imcc, GlobalHandle(p)); + + for (i = 0; i < GMEM_LOCKCOUNT * 2; i++) + { + ImmLockIMCC(imcc); + count = ImmGetIMCCLockCount(imcc); + g_count = GlobalFlags(imcc) & GMEM_LOCKCOUNT; + todo_wine ok(count == g_count, "count %d, g_count %d\n", count, g_count); + } + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == GMEM_LOCKCOUNT, "expect GMEM_LOCKCOUNT, returned %d\n", count); + + for (i = 0; i < GMEM_LOCKCOUNT - 1; i++) + GlobalUnlock(imcc); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 1, "expect 1, returned %d\n", count); + GlobalUnlock(imcc); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "expect 0, returned %d\n", count); + ImmDestroyIMCC(imcc); }

1 0

Hans Leidekker : wbemdisp: Add a typelib.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 537d809189d9b921ba9523f352da3f5fad88d1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537d809189d9b921ba9523f35… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 16 14:20:49 2013 +0200 wbemdisp: Add a typelib. --- dlls/wbemdisp/Makefile.in | 2 + dlls/wbemdisp/wbemdisp_tlb.idl | 21 ++ include/wbemdisp.idl | 628 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 651 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537d809189d9b921ba952…

1 0

Nikolay Sivov : ntdll: Fix hash collision check condition for string keys.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 30425ece6cddc9427b456618bfa6425b50856317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30425ece6cddc9427b456618b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 17:40:30 2013 +0400 ntdll: Fix hash collision check condition for string keys. --- dlls/ntdll/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 7280b4c..56a28fa 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2336,7 +2336,7 @@ static struct string_index *find_string_index(const struct strsection_header *se { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break;

1 0

Alistair Leslie-Hughes : mscoree: Redirect .NET 1.0 to .NET 2.0.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 9dbeaf25867312266c0c1facd40ff5a8bc300507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dbeaf25867312266c0c1facd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 14:08:31 2013 +1000 mscoree: Redirect .NET 1.0 to .NET 2.0. --- dlls/mscoree/metahost.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index eabdcf5..519e991 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -50,9 +50,10 @@ static const WCHAR net_40_subdir[] = {'4','.','0',0}; static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; -#define NUM_RUNTIMES 3 +#define NUM_RUNTIMES 4 static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { + {{&CLRRuntimeInfoVtbl}, net_20_subdir, 1, 0, 3705, 0}, {{&CLRRuntimeInfoVtbl}, net_20_subdir, 1, 1, 4322, 0}, {{&CLRRuntimeInfoVtbl}, net_20_subdir, 2, 0, 50727, 0}, {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} @@ -1390,7 +1391,7 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, find_runtimes(); if (legacy) - i = 2; + i = 3; else i = NUM_RUNTIMES;

1 0

Nikolay Sivov : shell32: Remove unused parameters from conversion helper.
by Alexandre Julliard Aug. 16, 2013

Aug. 16, 2013

Module: wine Branch: master Commit: 15cd338d597cbf1323bf8754368e9a19bd2707f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cd338d597cbf1323bf87543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:33:38 2013 +0400 shell32: Remove unused parameters from conversion helper. --- dlls/shell32/shelllink.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3e59aef..9664df9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -208,10 +208,10 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ -static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static inline LPWSTR heap_strdupAtoW( LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); @@ -1420,7 +1420,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps if (pszName) { - descrW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszName); + descrW = heap_strdupAtoW(pszName); if (!descrW) return E_OUTOFMEMORY; } else @@ -1456,7 +1456,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA *iface, LPCS TRACE("(%p)->(dir=%s)\n",This, pszDir); - dirW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszDir); + dirW = heap_strdupAtoW(pszDir); if (!dirW) return E_OUTOFMEMORY; hr = IShellLinkW_SetWorkingDirectory(&This->IShellLinkW_iface, dirW); @@ -1490,7 +1490,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA if (pszArgs) { - argsW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszArgs); + argsW = heap_strdupAtoW(pszArgs); if (!argsW) return E_OUTOFMEMORY; } else @@ -1552,7 +1552,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); + pathW = heap_strdupAtoW(pszIconPath); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, pathW, iIcon); @@ -1570,7 +1570,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s %x)\n",This, pszPathRel, dwReserved); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); + pathW = heap_strdupAtoW(pszPathRel); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetRelativePath(&This->IShellLinkW_iface, pathW, dwReserved); @@ -1598,7 +1598,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) if (!pszFile) return E_INVALIDARG; - str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); + str = heap_strdupAtoW(pszFile); if( !str ) return E_OUTOFMEMORY;

1 0