wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Frédéric Delanoy : winedev: Add/fix some ' filename' tags.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: docs Branch: master Commit: c909823806246b3c4cd77a9ef609db6ccd96b7e6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c909823806246b3c4cd77a9ef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 17 09:28:40 2013 +0200 winedev: Add/fix some 'filename' tags. --- en/winedev-architecture.sgml | 8 ++++---- en/winedev-debugger.sgml | 13 +++++++------ en/winedev-documentation.sgml | 18 ++++++++++-------- en/winedev-kernel.sgml | 8 ++++---- en/winedev-multimedia.sgml | 18 +++++++++--------- en/winedev-ole.sgml | 10 +++++----- en/winedev-opengl.sgml | 10 +++++----- en/winedev-testing.sgml | 21 +++++++++++---------- en/winedev-windowing.sgml | 6 +++--- 9 files changed, 58 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=c909823806246b3c4cd77…

1 0

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

19 Aug '13

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

Jeremy Newman : CVS page removed, redirect to Git Wiki page
by Jeremy Newman 16 Aug '13

16 Aug '13

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

Álvaro Nieto : msvrct: Fix strncpy to fill the buffer.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: e3e12845572dce7b35660814c44dedf069de1dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e12845572dce7b35660814c… Author: Álvaro Nieto <alvaro.nieto(a)gmail.com> Date: Tue Aug 13 21:47:20 2013 +0200 msvrct: Fix strncpy to fill the buffer. --- dlls/msvcrt/string.c | 2 ++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c5d0e18..082029d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -581,6 +581,8 @@ char* __cdecl MSVCRT_strncpy(char *dst, const char *src, MSVCRT_size_t len) for(i=0; i<len; i++) if((dst[i] = src[i]) == '\0') break; + while (i < len) dst[i++] = 0; + return dst; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6e3f962..dc90b38 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2574,6 +2574,36 @@ static void test_atoi(void) ok(r == 0, "atoi(4294967296) = %d\n", r); } +static void test_strncpy(void) +{ +#define TEST_STRNCPY_LEN 10 + char *ret; + char dst[TEST_STRNCPY_LEN + 1]; + char not_null_terminated[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'}; + + /* strlen(src) > TEST_STRNCPY_LEN */ + ret = strncpy(dst, "01234567890123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* without null-terminated */ + ret = strncpy(dst, not_null_terminated, TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); + + /* strlen(src) < TEST_STRNCPY_LEN */ + strcpy(dst, "0123456789"); + ret = strncpy(dst, "012345", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strcmp(dst, "012345"), "dst != 012345\n"); + ok(dst[TEST_STRNCPY_LEN - 1] == '\0', "dst[TEST_STRNCPY_LEN - 1] != 0\n"); + + /* strlen(src) == TEST_STRNCPY_LEN */ + ret = strncpy(dst, "0123456789", TEST_STRNCPY_LEN); + ok(ret == dst, "ret != dst\n"); + ok(!strncmp(dst, "0123456789", TEST_STRNCPY_LEN), "dst != 0123456789\n"); +} + START_TEST(string) { char mem[100]; @@ -2675,4 +2705,5 @@ START_TEST(string) test__stricmp(); test__wcstoi64(); test_atoi(); + test_strncpy(); }

1 0

Qian Hong : imm32/tests: Added tests for ImmDestroyContext.
by Alexandre Julliard 16 Aug '13

16 Aug '13

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 16 Aug '13

16 Aug '13

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: Fixed IMCC implementation.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 134935e714db87a0dcd7318d0efd4127d7321d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134935e714db87a0dcd7318d0… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:26 2013 +0800 imm32: Fixed IMCC implementation. --- dlls/imm32/imm.c | 52 ++++++--------------------------------------- dlls/imm32/tests/imm32.c | 22 +++++++++--------- 2 files changed, 18 insertions(+), 56 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5aee6ea..bc7caba 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -37,12 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -typedef struct tagIMCCInternal -{ - DWORD dwLock; - DWORD dwSize; -} IMCCInternal; - #define MAKE_FUNCPTR(f) typeof(f) * p##f typedef struct _tagImmHkl{ struct list entry; @@ -2625,15 +2619,7 @@ DWORD WINAPI ImmGetIMCLockCount(HIMC hIMC) */ HIMCC WINAPI ImmCreateIMCC(DWORD size) { - IMCCInternal *internal; - int real_size = size + sizeof(IMCCInternal); - - internal = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, real_size); - if (internal == NULL) - return NULL; - - internal->dwSize = size; - return internal; + return GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE, size); } /*********************************************************************** @@ -2641,8 +2627,7 @@ HIMCC WINAPI ImmCreateIMCC(DWORD size) */ HIMCC WINAPI ImmDestroyIMCC(HIMCC block) { - HeapFree(GetProcessHeap(),0,block); - return NULL; + return GlobalFree(block); } /*********************************************************************** @@ -2650,11 +2635,7 @@ HIMCC WINAPI ImmDestroyIMCC(HIMCC block) */ LPVOID WINAPI ImmLockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - internal->dwLock ++; - return internal + 1; + return GlobalLock(imcc); } /*********************************************************************** @@ -2662,12 +2643,7 @@ LPVOID WINAPI ImmLockIMCC(HIMCC imcc) */ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - if (internal->dwLock) - internal->dwLock --; - return (internal->dwLock!=0); + return GlobalUnlock(imcc); } /*********************************************************************** @@ -2675,10 +2651,7 @@ BOOL WINAPI ImmUnlockIMCC(HIMCC imcc) */ DWORD WINAPI ImmGetIMCCLockCount(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwLock; + return GlobalFlags(imcc) & GMEM_LOCKCOUNT; } /*********************************************************************** @@ -2686,15 +2659,7 @@ DWORD WINAPI ImmGetIMCCLockCount(HIMCC imcc) */ HIMCC WINAPI ImmReSizeIMCC(HIMCC imcc, DWORD size) { - IMCCInternal *internal,*newone; - int real_size = size + sizeof(IMCCInternal); - - internal = imcc; - - newone = HeapReAlloc(GetProcessHeap(), 0, internal, real_size); - newone->dwSize = size; - - return newone; + return GlobalReAlloc(imcc, size, GMEM_ZEROINIT | GMEM_MOVEABLE); } /*********************************************************************** @@ -2702,10 +2667,7 @@ HIMCC WINAPI ImmReSizeIMCC(HIMCC imcc, DWORD size) */ DWORD WINAPI ImmGetIMCCSize(HIMCC imcc) { - IMCCInternal *internal; - internal = imcc; - - return internal->dwSize; + return GlobalSize(imcc); } /*********************************************************************** diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 308b3d3..0a511e6 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -734,25 +734,25 @@ static void test_ImmGetIMCCLockCount(void) 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)); + 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); + 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); + 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); + 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); + ok(count == 0, "expect 0, returned %d\n", count); ImmDestroyIMCC(imcc); } @@ -775,18 +775,18 @@ static void test_ImmDestroyIMCC(void) p = ImmDestroyIMCC(imcc); ok(p == NULL, "Destroy a locked IMCC should success!\n"); p = ImmLockIMCC(imcc); - todo_wine ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); + ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); ret = ImmUnlockIMCC(imcc); - todo_wine ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); + ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); count = ImmGetIMCCLockCount(imcc); - todo_wine ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); + ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); size = ImmGetIMCCSize(imcc); - todo_wine ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); + ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); SetLastError(0xdeadbeef); p = ImmDestroyIMCC(imcc); - todo_wine ok(p != NULL, "returned NULL\n"); + ok(p != NULL, "returned NULL\n"); ret = GetLastError(); - todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); + ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); } static void test_ImmMessages(void)

1 0

Qian Hong : imm32/tests: Added tests for ImmDestroyIMCC.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 1448d95fa416de1c75909044c75b19f4b4c62875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1448d95fa416de1c75909044c… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Aug 12 22:10:10 2013 +0800 imm32/tests: Added tests for ImmDestroyIMCC. --- dlls/imm32/tests/imm32.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 2cdc662..308b3d3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -757,6 +757,38 @@ static void test_ImmGetIMCCLockCount(void) ImmDestroyIMCC(imcc); } +static void test_ImmDestroyIMCC(void) +{ + HIMCC imcc; + DWORD ret, count, size; + VOID *p; + + imcc = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + count = ImmGetIMCCLockCount(imcc); + ok(count == 0, "expect 0, returned %d\n", count); + p = ImmLockIMCC(imcc); + ok(p != NULL, "ImmLockIMCC failed!\n"); + count = ImmGetIMCCLockCount(imcc); + ok(count == 1, "expect 1, returned %d\n", count); + size = ImmGetIMCCSize(imcc); + ok(size == sizeof(CANDIDATEINFO), "returned %d\n", size); + p = ImmDestroyIMCC(imcc); + ok(p == NULL, "Destroy a locked IMCC should success!\n"); + p = ImmLockIMCC(imcc); + todo_wine ok(p == NULL, "Lock a destroyed IMCC should fail!\n"); + ret = ImmUnlockIMCC(imcc); + todo_wine ok(ret == FALSE, "Unlock a destroyed IMCC should return FALSE!\n"); + count = ImmGetIMCCLockCount(imcc); + todo_wine ok(count == 0, "Get lock count of a destroyed IMCC should return 0!\n"); + size = ImmGetIMCCSize(imcc); + todo_wine ok(size == 0, "Get size of a destroyed IMCC should return 0!\n"); + SetLastError(0xdeadbeef); + p = ImmDestroyIMCC(imcc); + todo_wine ok(p != NULL, "returned NULL\n"); + ret = GetLastError(); + todo_wine ok(ret == ERROR_INVALID_HANDLE, "wrong last error %08x!\n", ret); +} + static void test_ImmMessages(void) { CANDIDATEFORM cf; @@ -918,6 +950,7 @@ START_TEST(imm32) { test_ImmDefaultHwnd(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); + test_ImmDestroyIMCC(); msg_spy_cleanup(); /* Reinitialize the hooks to capture all windows */ msg_spy_init(NULL);

1 0

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

16 Aug '13

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

Alexandre Julliard : gdi32: Use Microsoft and Unicode encodings in priority for font names.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 87c2581c54fe8b28586b1958942dc5832155e126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c2581c54fe8b28586b19589… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 16 19:11:33 2013 +0200 gdi32: Use Microsoft and Unicode encodings in priority for font names. --- dlls/gdi32/freetype.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e6f4e1..2a2bde1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1306,10 +1306,12 @@ static inline WORD get_mac_code_page( const FT_SfntName *name ) static int match_name_table_language( const FT_SfntName *name, LANGID lang ) { LANGID name_lang; + int res = 0; switch (name->platform_id) { case TT_PLATFORM_MICROSOFT: + res += 5; /* prefer the Microsoft name */ switch (name->encoding_id) { case TT_MS_ID_UNICODE_CS: @@ -1326,6 +1328,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) name_lang = mac_langid_table[name->language_id]; break; case TT_PLATFORM_APPLE_UNICODE: + res += 2; /* prefer Unicode encodings */ switch (name->encoding_id) { case TT_APPLE_ID_DEFAULT: @@ -1341,10 +1344,10 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) default: return 0; } - if (name_lang == lang) return 3; - if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) return 2; - if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) return 1; - return 0; + if (name_lang == lang) res += 30; + else if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) res += 20; + else if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) res += 10; + return res; } static WCHAR *copy_name_table_string( const FT_SfntName *name )

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013