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

Jacek Caban : urlmon: Avoid accessing an uninitialized variable (valgrind).
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 8ebf950b8fb2753c4587dc22f58cc84b814cbee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebf950b8fb2753c4587dc22f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:33 2011 +0200 urlmon: Avoid accessing an uninitialized variable (valgrind). --- dlls/urlmon/sec_mgr.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7b4bb35..e1763fc 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -256,18 +256,24 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone) /* See if the key contains a value for the scheme first. */ res = RegQueryValueExW(key, schema, NULL, &type, (BYTE*)zone, &size); - if(type != REG_DWORD) + if(res == ERROR_SUCCESS) { + if(type == REG_DWORD) + return TRUE; WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(schema)); + } + + /* Try to get the zone for the wildcard scheme. */ + size = sizeof(DWORD); + res = RegQueryValueExW(key, wildcardW, NULL, &type, (BYTE*)zone, &size); + if(res != ERROR_SUCCESS) + return FALSE; - if(res != ERROR_SUCCESS || type != REG_DWORD) { - /* Try to get the zone for the wildcard scheme. */ - size = sizeof(DWORD); - res = RegQueryValueExW(key, wildcardW, NULL, &type, (BYTE*)zone, &size); - if(type != REG_DWORD) - WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(wildcardW)); + if(type != REG_DWORD) { + WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(wildcardW)); + return FALSE; } - return res == ERROR_SUCCESS && type == REG_DWORD; + return TRUE; } /********************************************************************

1 0

Andrew Nguyen : ws2_32/tests: Avoid casting a WSAAccept function pointer parameter in test_accept.
by Alexandre Julliard June 3, 2011

June 3, 2011

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

Vincent Povirk : ole32: Avoid opening source storage in IStorage::CopyTo.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: c72ecb1de654cd3653ca0699fa2e9a8eee347038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72ecb1de654cd3653ca0699f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 2 14:34:53 2011 -0500 ole32: Avoid opening source storage in IStorage::CopyTo. --- dlls/ole32/storage32.c | 279 +++++++++++++++++++++++------------------ dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 157 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c72ecb1de654cd3653ca0…

1 0

Piotr Caban : msvcrt: Improved tolower_l and toupper_l implementation.
by Alexandre Julliard June 3, 2011

June 3, 2011

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

Piotr Caban : msvcrt: Fix pclmap and pcumap for "C" locale.
by Alexandre Julliard June 3, 2011

June 3, 2011

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

Jacek Caban : urlmon: Initialize PROTOCOLDATA structure before passing it to Switch.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 21f74fc1bb6c8606d2ac31bcb0a8285a8f85be71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f74fc1bb6c8606d2ac31bcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 11:40:05 2011 +0200 urlmon: Initialize PROTOCOLDATA structure before passing it to Switch. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index eb4d316..8766b1d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -434,7 +434,7 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface) static void test_switch_fail(void) { IInternetProtocolSink *binding_sink; - PROTOCOLDATA protocoldata; + PROTOCOLDATA protocoldata = {0}; HRESULT hres; static BOOL tested_switch_fail; @@ -455,7 +455,7 @@ static void test_switch_fail(void) static DWORD WINAPI thread_proc(PVOID arg) { - PROTOCOLDATA protocoldata; + PROTOCOLDATA protocoldata = {0}; HRESULT hres; if(!no_callback) {

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10EffectTechnique iface.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: f7214ada84d6fc2bb316d966c9661de0e0440bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7214ada84d6fc2bb316d966c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:14:35 2011 +0200 d3d10: COM cleanup for the ID3D10EffectTechnique iface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 33 ++++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1216ac4..7758dbe 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -160,7 +160,7 @@ struct d3d10_effect_pass /* ID3D10EffectTechnique */ struct d3d10_effect_technique { - const struct ID3D10EffectTechniqueVtbl *vtbl; + ID3D10EffectTechnique ID3D10EffectTechnique_iface; struct d3d10_effect *effect; char *name; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3d532fd..a258a99 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -58,7 +58,7 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ -static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; +static struct d3d10_effect_technique null_technique = {{&d3d10_effect_technique_vtbl}}; static struct d3d10_effect_pass null_pass = {{&d3d10_effect_pass_vtbl}}; static struct d3d10_effect_type null_type = {{&d3d10_effect_type_vtbl}}; static struct d3d10_effect_variable null_local_buffer = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, @@ -1618,7 +1618,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d { struct d3d10_effect_technique *t = &e->techniques[i]; - t->vtbl = &d3d10_effect_technique_vtbl; + t->ID3D10EffectTechnique_iface.lpVtbl = &d3d10_effect_technique_vtbl; t->effect = e; hr = parse_fx10_technique(t, &ptr, data); @@ -2190,14 +2190,14 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (index >= This->technique_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } t = &This->techniques[index]; TRACE("Returning technique %p, %s.\n", t, debugstr_a(t->name)); - return (ID3D10EffectTechnique *)t; + return &t->ID3D10EffectTechnique_iface; } static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, @@ -2211,7 +2211,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (!name) { WARN("Invalid name specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } for (i = 0; i < This->technique_count; ++i) @@ -2220,13 +2220,13 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu if (!strcmp(t->name, name)) { TRACE("Returning technique %p\n", t); - return (ID3D10EffectTechnique *)t; + return &t->ID3D10EffectTechnique_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectTechnique *)&null_technique; + return &null_technique.ID3D10EffectTechnique_iface; } static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) @@ -2267,17 +2267,24 @@ const struct ID3D10EffectVtbl d3d10_effect_vtbl = /* ID3D10EffectTechnique methods */ +static inline struct d3d10_effect_technique *impl_from_ID3D10EffectTechnique(ID3D10EffectTechnique *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_technique, ID3D10EffectTechnique_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechnique *iface) { + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); + TRACE("iface %p\n", iface); - return (struct d3d10_effect_technique *)iface != &null_technique; + return This != &null_technique; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, D3D10_TECHNIQUE_DESC *desc) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); TRACE("iface %p, desc %p\n", iface, desc); @@ -2303,7 +2310,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTech static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex( ID3D10EffectTechnique *iface, UINT index) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); struct d3d10_effect_variable *a; TRACE("iface %p, index %u\n", iface, index); @@ -2324,7 +2331,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName( ID3D10EffectTechnique *iface, LPCSTR name) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2347,7 +2354,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, UINT index) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); struct d3d10_effect_pass *p; TRACE("iface %p, index %u\n", iface, index); @@ -2368,7 +2375,7 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, LPCSTR name) { - struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_technique *This = impl_from_ID3D10EffectTechnique(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name));

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10EffectPass iface.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: c412353a0593880dbf63f3735ffe924b67874d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c412353a0593880dbf63f3735… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:13:06 2011 +0200 d3d10: COM cleanup for the ID3D10EffectPass iface. --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 5cf1a24..1216ac4 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -146,7 +146,7 @@ struct d3d10_effect_variable /* ID3D10EffectPass */ struct d3d10_effect_pass { - const struct ID3D10EffectPassVtbl *vtbl; + ID3D10EffectPass ID3D10EffectPass_iface; struct d3d10_effect_technique *technique; char *name; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 81384af..3d532fd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -59,7 +59,7 @@ static const struct ID3D10EffectTypeVtbl d3d10_effect_type_vtbl; /* null objects - needed for invalid calls */ static struct d3d10_effect_technique null_technique = {&d3d10_effect_technique_vtbl}; -static struct d3d10_effect_pass null_pass = {&d3d10_effect_pass_vtbl}; +static struct d3d10_effect_pass null_pass = {{&d3d10_effect_pass_vtbl}}; static struct d3d10_effect_type null_type = {{&d3d10_effect_type_vtbl}}; static struct d3d10_effect_variable null_local_buffer = {(const ID3D10EffectVariableVtbl *)&d3d10_effect_constant_buffer_vtbl, &null_local_buffer, &null_type}; @@ -1128,7 +1128,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char { struct d3d10_effect_pass *p = &t->passes[i]; - p->vtbl = &d3d10_effect_pass_vtbl; + p->ID3D10EffectPass_iface.lpVtbl = &d3d10_effect_pass_vtbl; p->technique = t; hr = parse_fx10_pass(p, ptr, data); @@ -2355,14 +2355,14 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas if (index >= This->pass_count) { WARN("Invalid index specified\n"); - return (ID3D10EffectPass *)&null_pass; + return &null_pass.ID3D10EffectPass_iface; } p = &This->passes[index]; TRACE("Returning pass %p, %s.\n", p, debugstr_a(p->name)); - return (ID3D10EffectPass *)p; + return &p->ID3D10EffectPass_iface; } static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, @@ -2381,13 +2381,13 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas if (!strcmp(p->name, name)) { TRACE("Returning pass %p\n", p); - return (ID3D10EffectPass *)p; + return &p->ID3D10EffectPass_iface; } } WARN("Invalid name specified\n"); - return (ID3D10EffectPass *)&null_pass; + return &null_pass.ID3D10EffectPass_iface; } static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_ComputeStateBlockMask(ID3D10EffectTechnique *iface, @@ -2412,16 +2412,24 @@ static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = /* ID3D10EffectPass methods */ +static inline struct d3d10_effect_pass *impl_from_ID3D10EffectPass(ID3D10EffectPass *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_pass, ID3D10EffectPass_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) { + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + TRACE("iface %p\n", iface); - return (struct d3d10_effect_pass *)iface != &null_pass; + return This != &null_pass; } -static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, + D3D10_PASS_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -2459,7 +2467,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2498,7 +2506,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10Eff static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2537,7 +2545,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, desc %p\n", iface, desc); @@ -2576,7 +2584,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10Effe static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface, UINT index) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); struct d3d10_effect_variable *a; TRACE("iface %p, index %u\n", iface, index); @@ -2597,7 +2605,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface, LPCSTR name) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2619,7 +2627,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnno static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { - struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); HRESULT hr = S_OK; unsigned int i;

1 0

Aric Stewart : usp10/tests: Add Malayalam shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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

Aric Stewart : usp10/tests: Add Tamil shape test.
by Alexandre Julliard June 3, 2011

June 3, 2011

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