June 2011 - Wine-commits - list.winehq.org

Andrew Nguyen : ws2_32/tests: Avoid casting a WSAAccept function pointer parameter in test_accept.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e9e0df23b83093cddfb62b3e37affd48c85b7cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e0df23b83093cddfb62b3e3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:36:54 2011 -0500 ws2_32/tests: Avoid casting a WSAAccept function pointer parameter in test_accept. --- dlls/ws2_32/socket.c | 4 ++-- dlls/ws2_32/tests/sock.c | 2 +- include/winsock2.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 40151f1..e1a32fb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5825,7 +5825,7 @@ INT WINAPI WSCDeinstallProvider(LPGUID lpProviderId, LPINT lpErrno) * WSAAccept (WS2_32.26) */ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, - LPCONDITIONPROC lpfnCondition, DWORD dwCallbackData) + LPCONDITIONPROC lpfnCondition, DWORD_PTR dwCallbackData) { int ret = 0, size = 0; @@ -5835,7 +5835,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, SOCKET cs; SOCKADDR src_addr, dst_addr; - TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %d\n", + TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87cd308..7853a8c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2467,7 +2467,7 @@ static void test_accept(void) ret = connect(connector, (struct sockaddr*)&address, sizeof(address)); ok(ret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); - accepted = WSAAccept(server_socket, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); + accepted = WSAAccept(server_socket, NULL, NULL, AlwaysDeferConditionFunc, 0); ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); accepted = accept(server_socket, NULL, 0); diff --git a/include/winsock2.h b/include/winsock2.h index c346473..5e1f489 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -401,7 +401,7 @@ typedef int (CALLBACK *LPCONDITIONPROC) LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, GROUP *g, - DWORD dwCallbackData + DWORD_PTR dwCallbackData ); typedef void (CALLBACK *LPWSAOVERLAPPED_COMPLETION_ROUTINE) @@ -604,7 +604,7 @@ typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int); * "Winsock2 Function Typedefs" section below. */ #if WS_API_PROTOTYPES -SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD); +SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); INT WINAPI WSAAddressToStringA(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); INT WINAPI WSAAddressToStringW(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define WSAAddressToString WINELIB_NAME_AW(WSAAddressToString) @@ -678,7 +678,7 @@ DWORD WINAPI WSAWaitForMultipleEvents(DWORD,const WSAEVENT*,BOOL,DWORD,BOOL); * "Winsock2 Prototypes" section above. */ #if WS_API_TYPEDEFS -typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD); +typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define LPFN_WSAADDRESSTOSTRING WINELIB_NAME_AW(LPFN_WSAADDRESSTOSTRING)

1 0

Andrew Nguyen : ws2_32/tests: Fix some test thread procedure prototypes.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: a282c150fa14242b04482808e0a3344c00d6b082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a282c150fa14242b04482808e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:37:03 2011 -0500 ws2_32/tests: Fix some test thread procedure prototypes. --- dlls/ws2_32/tests/sock.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7853a8c..28d5db3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1550,7 +1550,7 @@ static void test_UDP(void) } } -static void WINAPI do_getservbyname( HANDLE *starttest ) +static DWORD WINAPI do_getservbyname( void *param ) { struct { const char *name; @@ -1558,6 +1558,7 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) int port; } serv[2] = { {"domain", "udp", 53}, {"telnet", "tcp", 23} }; + HANDLE *starttest = param; int i, j; struct servent *pserv[2]; @@ -1579,6 +1580,8 @@ static void WINAPI do_getservbyname( HANDLE *starttest ) ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); } + + return 0; } static void test_getservbyname(void) @@ -1591,7 +1594,7 @@ static void test_getservbyname(void) /* create threads */ for ( i = 0; i < NUM_THREADS; i++ ) { - thread[i] = CreateThread ( NULL, 0, (LPTHREAD_START_ROUTINE) &do_getservbyname, &starttest, 0, &thread_id[i] ); + thread[i] = CreateThread ( NULL, 0, do_getservbyname, &starttest, 0, &thread_id[i] ); } /* signal threads to start */ @@ -2235,8 +2238,9 @@ static void test_WSAStringToAddressW(void) } -static VOID WINAPI SelectReadThread(select_thread_params *par) +static DWORD WINAPI SelectReadThread(void *param) { + select_thread_params *par = param; fd_set readfds; int ret; struct sockaddr_in addr; @@ -2256,6 +2260,8 @@ static VOID WINAPI SelectReadThread(select_thread_params *par) SetEvent(server_ready); ret = select(par->s+1, &readfds, NULL, NULL, &select_timeout); par->ReadKilled = (ret == 1); + + return 0; } static void test_errors(void) @@ -2344,7 +2350,7 @@ static void test_select(void) thread_params.s = fdRead; thread_params.ReadKilled = FALSE; server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); - thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, &id ); + thread_handle = CreateThread (NULL, 0, SelectReadThread, &thread_params, 0, &id ); ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); WaitForSingleObject (server_ready, INFINITE); @@ -2396,8 +2402,9 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); } -static DWORD WINAPI AcceptKillThread(select_thread_params *par) +static DWORD WINAPI AcceptKillThread(void *param) { + select_thread_params *par = param; struct sockaddr_in address; int len = sizeof(address); SOCKET client_socket; @@ -2482,8 +2489,7 @@ static void test_accept(void) thread_params.s = server_socket; thread_params.ReadKilled = FALSE; - thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) AcceptKillThread, - &thread_params, 0, &id); + thread_handle = CreateThread(NULL, 0, AcceptKillThread, &thread_params, 0, &id); if (thread_handle == NULL) { trace("error creating thread: %d\n", GetLastError());

1 0

Piotr Caban : msvcrt: Fix mingw compilation issues.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: f9de4eef75ecfc074f726f39e54a77211eca2e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9de4eef75ecfc074f726f39e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:32 2011 +0200 msvcrt: Fix mingw compilation issues. --- dlls/msvcrt/ctype.c | 52 +++++++------- dlls/msvcrt/data.c | 6 +- dlls/msvcrt/dir.c | 42 ++++++------ dlls/msvcrt/environ.c | 6 +- dlls/msvcrt/errno.c | 6 +- dlls/msvcrt/file.c | 74 ++++++++++---------- dlls/msvcrt/locale.c | 10 ++-- dlls/msvcrt/math.c | 36 +++++----- dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 24 ++++---- dlls/msvcrt/msvcrt.spec | 168 +++++++++++++++++++++++----------------------- dlls/msvcrt/process.c | 16 ++-- dlls/msvcrt/string.c | 10 ++-- dlls/msvcrt/time.c | 16 ++-- dlls/msvcrt/wcs.c | 20 +++--- 15 files changed, 245 insertions(+), 245 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9de4eef75ecfc074f726…

1 0

Piotr Caban : msvcrt: Fix pclmap and pcumap for "C" locale.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 2b9d946aeaf3223b36d9ff3f3cb02aa100ed64a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9d946aeaf3223b36d9ff3f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:46 2011 +0200 msvcrt: Fix pclmap and pcumap for "C" locale. --- dlls/msvcrt/locale.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 96a80c1..64960d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -826,10 +826,17 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } - LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, buf, 256, - (char*)loc->locinfo->pclmap, 256); - LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, - (char*)loc->locinfo->pcumap, 256); + if(lcid[MSVCRT_LC_CTYPE]) { + LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, buf, 256, + (char*)loc->locinfo->pclmap, 256); + LCMapStringA(lcid[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, buf, 256, + (char*)loc->locinfo->pcumap, 256); + } else { + for(i=0; i<256; i++) { + loc->locinfo->pclmap[i] = (i>='A' && i<='Z' ? i-'A'+'a' : i); + loc->locinfo->pcumap[i] = (i>='a' && i<='z' ? i-'a'+'A' : i); + } + } loc->mbcinfo->refcount = 1; loc->mbcinfo->mbcodepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage;

1 0

Piotr Caban : msvcrt: Improved tolower_l and toupper_l implementation.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e398b93900c45cc5d1457ee4d33866c4e0116bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e398b93900c45cc5d1457ee4d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 3 15:28:56 2011 +0200 msvcrt: Improved tolower_l and toupper_l implementation. --- dlls/msvcrt/ctype.c | 4 +- dlls/msvcrt/string.c | 4 +- dlls/msvcrt/tests/string.c | 45 +++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 75c9b38..2805afb 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -345,7 +345,7 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) locinfo = locale->locinfo; if(c < 256) - return locinfo->pcumap[c]; + return locinfo->pcumap[(unsigned char)c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) { @@ -400,7 +400,7 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) locinfo = locale->locinfo; if(c < 256) - return locinfo->pclmap[c]; + return locinfo->pclmap[(unsigned char)c]; if(locinfo->pctype[(c>>8)&255] & MSVCRT__LEADBYTE) { diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 58d6150..31ba8d4 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -79,7 +79,7 @@ int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) while (*str) { - *str = MSVCRT__tolower_l(*str, locale); + *str = MSVCRT__tolower_l((unsigned char)*str, locale); str++; } @@ -140,7 +140,7 @@ int CDECL _strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale) while (*str) { - *str = MSVCRT__toupper_l(*str, locale); + *str = MSVCRT__toupper_l((unsigned char)*str, locale); str++; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 06a4178..6eaa74a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -80,6 +80,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static int (__cdecl *p_tolower)(int); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -1326,6 +1327,7 @@ static void test_mbstowcs(void) ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); if(!pmbstowcs_s || !pwcstombs_s) { + setlocale(LC_ALL, "C"); win_skip("mbstowcs_s or wcstombs_s not available\n"); return; } @@ -1359,6 +1361,7 @@ static void test_mbstowcs(void) ok(ret == 5, "wcstombs_s did not return 5\n"); if(!pwcsrtombs) { + setlocale(LC_ALL, "C"); win_skip("wcsrtombs not available\n"); return; } @@ -1376,6 +1379,8 @@ static void test_mbstowcs(void) ok(ret == 4, "wcsrtombs did not return 4\n"); ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + + setlocale(LC_ALL, "C"); } static void test_gcvt(void) @@ -1854,7 +1859,6 @@ static void test__mbslwr_s(void) ok(!memcmp(buffer, "abcdefgh\0IJKLMNOP", sizeof("abcdefgh\0IJKLMNOP")), "Expected the output buffer to be \"abcdefgh\\0IJKLMNOP\", got \"%s\"\n", buffer); - } static void test__ultoa_s(void) @@ -1969,6 +1973,41 @@ static void test_wctob(void) ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } +static void test_tolower(void) +{ + int ret; + + ret = p_tolower(0x41); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_tolower(0xF4); + ok(ret == 0xF4, "ret = %x\n", ret); + + ret = p_tolower((char)0xF4); + ok(ret==0xF4/*Vista+*/ || ret==(char)0xF4, "ret = %x\n", ret); + + /* is it using different locale (CP_ACP) for negative values?? */ + /* current implementation matches msvcr90 behaviour */ + ret = p_tolower((char)0xD0); + todo_wine ok(ret==0xF0/*Vista+*/ || ret==(char)0xD0, "ret = %x\n", ret); + + ret = p_tolower(0xD0); + ok(ret == 0xD0, "ret = %x\n", ret); + + if(!setlocale(LC_ALL, "us")) { + win_skip("skipping tolower tests that depends on locale\n"); + return; + } + + ret = p_tolower((char)0xD0); + ok(ret == 0xF0, "ret = %x\n", ret); + + ret = p_tolower(0xD0); + ok(ret == 0xF0, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2005,6 +2044,7 @@ START_TEST(string) p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); + p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -2047,7 +2087,6 @@ START_TEST(string) test__wcslwr_s(); test__mbsupr_s(); test__mbslwr_s(); - - /* This test is changing locale */ test_wctob(); + test_tolower(); }

1 0

Aric Stewart : usp10/tests: Add Tamil shape test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: bdb3a5326994ee835378c9975708725a79ecd89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb3a5326994ee835378c9975… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:44 2011 -0500 usp10/tests: Add Tamil shape test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 322710c..497932c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -804,6 +804,15 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Tamil */ + static const WCHAR test_tamil[] = {0x0ba4, 0x0bae, 0x0bbf, 0x0bb4, 0x0bcd}; + static const shapeTest_char tamil_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph tamil_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -940,6 +949,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Latha", 20, test_tamil[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_tamil, 5, &Control, &State, 0, 4, tamil_c, tamil_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Telugu shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: e3f92669ed701bab5b405ef329bc1c3d2e22426f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f92669ed701bab5b405ef32… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:51 2011 -0500 usp10/tests: Add Telugu shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 497932c..cc4c1bf 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -813,6 +813,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Telugu */ + static const WCHAR test_telugu[] = {0x0c24, 0x0c46, 0x0c32, 0x0c41, 0x0c17, 0x0c41}; + static const shapeTest_char telugu_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph telugu_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -957,6 +968,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Gautami", 21, test_telugu[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_telugu, 6, &Control, &State, 0, 6, telugu_c, telugu_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10/tests: Add Malayalam shaping test.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 687b030c85bb94bbb7e65c90f5f56685fa989ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687b030c85bb94bbb7e65c90f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:56 2011 -0500 usp10/tests: Add Malayalam shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cc4c1bf..20772d6 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -824,6 +824,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Malayalam */ + static const WCHAR test_malayalam[] = {0x0d2e, 0x0d32, 0x0d2f, 0x0d3e, 0x0d33, 0x0d02}; + static const shapeTest_char malayalam_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph malayalam_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -976,6 +987,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Kartika", 23, test_malayalam[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_malayalam, 6, &Control, &State, 0, 6, malayalam_c, malayalam_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in tab tests.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 16945559420182a53d6405e61bc3949d15cdb914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16945559420182a53d6405e61… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Jun 2 17:31:30 2011 +0200 comctl32/tests: Removed sign comparison warning in tab tests. --- dlls/comctl32/tests/tab.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7f5bbb7..c82f128 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1254,7 +1254,7 @@ static void test_removeimage(void) static void test_delete_selection(void) { HWND hTab; - DWORD ret; + INT ret; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); ok(hTab != NULL, "Failed to create tab control\n"); @@ -1312,8 +1312,8 @@ static void test_TCM_SETITEMEXTRA(void) static void test_TCS_OWNERDRAWFIXED(void) { - LPARAM lparam, lparam2; - ULONG_PTR itemdata; + LPARAM lparam; + ULONG_PTR itemdata, itemdata2; TCITEMA item; HWND hTab; BOOL ret; @@ -1338,7 +1338,7 @@ static void test_TCS_OWNERDRAWFIXED(void) itemdata = 0; memset(&itemdata, 0xde, 4); - ok(g_drawitem.itemData == itemdata, "got %lx, expected %lx\n", g_drawitem.itemData, itemdata); + ok(g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1368,7 +1368,8 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - ok(*(ULONG_PTR*)g_drawitem.itemData == lparam, "got %lx, expected %lx\n", g_drawitem.itemData, lparam); + memset(&itemdata, 0xde, sizeof(ULONG_PTR)); + ok(*(ULONG_PTR*)g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1397,11 +1398,11 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - lparam = 0; - memset(&lparam, 0xde, 4); - memset(&lparam2, 0xde, sizeof(LPARAM)-1); - ok(g_drawitem.itemData == lparam || broken(g_drawitem.itemData == lparam2) /* win98 */, - "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, lparam); + itemdata = itemdata2 = 0; + memset(&itemdata, 0xde, 4); + memset(&itemdata2, 0xde, sizeof(LPARAM)-1); + ok(g_drawitem.itemData == itemdata || broken(g_drawitem.itemData == itemdata2) /* win98 */, + "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); }

1 0

Austin English : imm32: Add a stub for ImmEnumInputContext.
by Alexandre Julliard 03 Jun '11

03 Jun '11

Module: wine Branch: master Commit: 8f85b054290e805e5830c8f9c838d543392c7366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f85b054290e805e5830c8f9c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 2 16:53:13 2011 -0500 imm32: Add a stub for ImmEnumInputContext. --- dlls/imm32/imm.c | 10 ++++++++++ dlls/imm32/imm32.spec | 2 +- include/imm.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3122115..cc68305 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2821,3 +2821,13 @@ BOOL WINAPI ImmDisableTextFrameService(DWORD idThread) FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmEnumInputContext(IMM32.@) + */ + +BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) +{ + FIXME("Stub\n"); + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0d05362..03f64a5 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -12,7 +12,7 @@ @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stdcall ImmDisableTextFrameService(long) -@ stub ImmEnumInputContext +@ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) @ stdcall ImmEscapeA(long long long ptr) diff --git a/include/imm.h b/include/imm.h index 57658de..eff9887 100644 --- a/include/imm.h +++ b/include/imm.h @@ -127,6 +127,8 @@ typedef struct _tagCOMPOSITIONFORM RECT rcArea; } COMPOSITIONFORM, *LPCOMPOSITIONFORM; +typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008 @@ -482,6 +484,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); #define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord)

1 0