October 2012 - Wine-commits

Jacek Caban : mshtml: Moved remove_target_tasks to detach_inner_window.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 81e106cfa218ab09b9f7bb108546616bb6986ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e106cfa218ab09b9f7bb108… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:19:53 2012 +0200 mshtml: Moved remove_target_tasks to detach_inner_window. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 209a649..59b02ab 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -116,6 +116,7 @@ static void detach_inner_window(HTMLInnerWindow *window) if(window->doc) detach_events(window->doc); abort_window_bindings(window); + remove_target_tasks(window->task_magic); release_script_hosts(window); window->base.outer_window = NULL; @@ -233,7 +234,6 @@ static void release_inner_window(HTMLInnerWindow *This) TRACE("%p\n", This); detach_inner_window(This); - remove_target_tasks(This->task_magic); if(This->doc) { This->doc->window = NULL;

1 0

Jacek Caban : mshtml: Fixed trace message.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 1dae62f0a98968c1a962d8c0905af0d24061ba2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dae62f0a98968c1a962d8c09… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:20:06 2012 +0200 mshtml: Fixed trace message. --- dlls/mshtml/htmlscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index befc577..2dc25de 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -100,7 +100,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR nsAString src_str; nsresult nsres; - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->element.node.doc || !This->element.node.doc->window) { WARN("no windoow\n");

1 0

Jacek Caban : mshtml: Added IHTMLImgElement::get_complete implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 06ce49c81b2e893d286aeffe4e76394ccfb74ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ce49c81b2e893d286aeffe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 12:20:24 2012 +0200 mshtml: Added IHTMLImgElement::get_complete implementation. --- dlls/mshtml/htmlimg.c | 15 +++++++++++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 4ca02fc..e5f94d1 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -358,8 +358,19 @@ static HRESULT WINAPI HTMLImgElement_get_readyState(IHTMLImgElement *iface, BSTR static HRESULT WINAPI HTMLImgElement_get_complete(IHTMLImgElement *iface, VARIANT_BOOL *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool complete; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLImageElement_GetComplete(This->nsimg, &complete); + if(NS_FAILED(nsres)) { + ERR("GetComplete failed: %08x\n", nsres); + return E_FAIL; + } + + *p = complete ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_loop(IHTMLImgElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ea54b4d..ef036da 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2504,6 +2504,19 @@ static void _test_img_name(unsigned line, IUnknown *unk, const char *pValue) SysFreeString(sName); } +#define test_img_complete(a,b) _test_img_complete(__LINE__,a,b) +static void _test_img_complete(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLImgElement *img = _get_img_iface(line, (IUnknown*)elem); + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLImgElement_get_complete(img, &b); + ok_(__FILE__,line) (hres == S_OK, "get_complete failed: %08x\n", hres); + ok_(__FILE__,line) (b == exb, "complete = %x, expected %x\n", b, exb); + IHTMLImgElement_Release(img); +} + static void test_dynamic_properties(IHTMLElement *elem) { static const WCHAR attr1W[] = {'a','t','t','r','1',0}; @@ -5703,6 +5716,7 @@ static void test_elems(IHTMLDocument2 *doc) test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); + test_img_complete(elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

Christian Costa : krnl386.exe: Implement INT 33h function 15h.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 338dedef02f32705b98c6afa2e946e7c53ed32a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=338dedef02f32705b98c6afa2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 17 14:03:53 2012 +0200 krnl386.exe: Implement INT 33h function 15h. --- dlls/krnl386.exe16/int33.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c index b3411a7..7226816 100644 --- a/dlls/krnl386.exe16/int33.c +++ b/dlls/krnl386.exe16/int33.c @@ -184,6 +184,11 @@ void WINAPI DOSVM_Int33Handler( CONTEXT *context ) FIXME("Define screen region for update\n"); break; + case 0x0015: + TRACE("Get mouse driver state and memory requirements\n"); + SET_BX(context, sizeof(mouse_info)); + break; + case 0x0021: TRACE("Software reset\n"); INT33_ResetMouse( context );

1 0

Alexandre Julliard : server: Fix propagation of the pixel format flag when the parent window is changed .
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 29b39020f789fad042824822b5aa05ec0470438a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b39020f789fad042824822b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 17 15:35:00 2012 +0200 server: Fix propagation of the pixel format flag when the parent window is changed. --- server/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 2b4bc50..368171f 100644 --- a/server/window.c +++ b/server/window.c @@ -254,7 +254,8 @@ static int set_parent_window( struct window *win, struct window *parent ) if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) attach_thread_input( win->thread, parent->thread ); - if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); + if (win->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)) + update_pixel_format_flags( win ); } else /* move it to parent unlinked list */ {

1 0

Hans Leidekker : wbemprox: Add tests for Win32_Service methods.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: 7879326f8a96541d2b8a63382ed5118cf0b5e552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7879326f8a96541d2b8a63382… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:08:40 2012 +0200 wbemprox: Add tests for Win32_Service methods. --- dlls/wbemprox/tests/query.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e531b3c..07e8632 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -125,6 +125,93 @@ static void test_select( IWbemServices *services ) SysFreeString( query ); } +static void test_Win32_Service( IWbemServices *services ) +{ + static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; + static const WCHAR pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; + static const WCHAR resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; + static const WCHAR startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; + static const WCHAR stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0}; + static const WCHAR stateW[] = {'S','t','a','t','e',0}; + static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; + static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', + 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; + BSTR class = SysAllocString( serviceW ), method; + IWbemClassObject *service, *out; + VARIANT state, retval; + CIMTYPE type; + HRESULT hr; + + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + win_skip( "Win32_Service not available\n" ); + return; + } + type = 0xdeadbeef; + VariantInit( &state ); + hr = IWbemClassObject_Get( service, stateW, 0, &state, &type, NULL ); + ok( hr == S_OK, "failed to get service state %08x\n", hr ); + ok( V_VT( &state ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &state ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + + if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + { + out = NULL; + method = SysAllocString( startserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + IWbemClassObject_Release( out ); + } + out = NULL; + method = SysAllocString( pauseserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &retval ), "unexpected success\n" ); + IWbemClassObject_Release( out ); + + out = NULL; + method = SysAllocString( resumeserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &retval ), "unexpected success\n" ); + IWbemClassObject_Release( out ); + + if (!lstrcmpW( V_BSTR( &state ), stoppedW )) + { + out = NULL; + method = SysAllocString( stopserviceW ); + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, NULL, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + SysFreeString( method ); + + VariantInit( &retval ); + hr = IWbemClassObject_Get( out, returnvalueW, 0, &retval, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( !V_I4( &retval ), "unexpected error %u\n", V_UI4( &retval ) ); + IWbemClassObject_Release( out ); + } + VariantClear( &state ); + IWbemClassObject_Release( service ); + SysFreeString( class ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -327,6 +414,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_select( services ); + test_Win32_Service( services ); test_StdRegProv( services ); SysFreeString( path );

1 0

Hans Leidekker : mapi32: Forward WrapCompressedRTFStream to the registered provider, if any.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: ce2bd9eb1f426bbef9c9810b7ebce42ca8ab479a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2bd9eb1f426bbef9c9810b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:09:08 2012 +0200 mapi32: Forward WrapCompressedRTFStream to the registered provider, if any. --- dlls/mapi32/mapi32.spec | 4 ++-- dlls/mapi32/util.c | 13 +++++++++++++ dlls/mapi32/util.h | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index c84cfd4..f5a1bef 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -122,8 +122,8 @@ 182 stdcall FBadColumnSet(a)4(ptr) FBadColumnSet 183 stub RTFSync(a)12 184 stub RTFSync -185 stub WrapCompressedRTFStream(a)12 -186 stub WrapCompressedRTFStream +185 stdcall WrapCompressedRTFStream(a)12(ptr long ptr) WrapCompressedRTFStream +186 stdcall WrapCompressedRTFStream(ptr long ptr) 187 stub __ValidateParameters(a)8 188 stub __CPPValidateParameters(a)8 189 stub FBadSortOrderSet(a)4 diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 2b1957c..c94e3cf 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -935,6 +935,18 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, return MAPI_E_CALL_FAILED; } +/************************************************************************** + * WrapCompressedRTFStream (MAPI32.186) + */ +HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREAM *uncompressed) +{ + if (mapiFunctions.WrapCompressedRTFStream) + return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); + + FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + return MAPI_E_NO_SUPPORT; +} + static HMODULE mapi_provider; static HMODULE mapi_ex_provider; @@ -1099,6 +1111,7 @@ void load_mapi_providers(void) mapiFunctions.MAPIOpenLocalFormContainer = (void *) GetProcAddress(mapi_ex_provider, "MAPIOpenLocalFormContainer"); mapiFunctions.OpenStreamOnFile = (void*) GetProcAddress(mapi_ex_provider, "OpenStreamOnFile(a)24"); mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil(a)4"); + mapiFunctions.WrapCompressedRTFStream = (void*) GetProcAddress(mapi_ex_provider, "WrapCompressedRTFStream(a)12"); } cleanUp: diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 4582855..e8a5241 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -59,6 +59,7 @@ typedef struct MAPI_FUNCTIONS { HRESULT (WINAPI *HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet *); HRESULT (WINAPI *OpenStreamOnFile) (LPALLOCATEBUFFER, LPFREEBUFFER, ULONG, LPWSTR, LPWSTR, LPSTREAM *); SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); + HRESULT (WINAPI *WrapCompressedRTFStream) (LPSTREAM, ULONG, LPSTREAM *); } MAPI_FUNCTIONS; extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcp100: Added _Yarn<char> class implementation.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: f0a547595c3094f5ba2c0595eb02439db34b5bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a547595c3094f5ba2c0595e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:09 2012 +0200 msvcp100: Added _Yarn<char> class implementation. --- dlls/msvcp100/msvcp.h | 6 ++ dlls/msvcp100/msvcp100.spec | 44 +++++++++--------- dlls/msvcp100/string.c | 109 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a547595c3094f5ba2c0…

1 0

Piotr Caban : msvcp100/tests: Added _Yarn<char> class tests.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: bdac12949c689ae10dc3315c2811b822b6bf1a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdac12949c689ae10dc3315c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:37 2012 +0200 msvcp100/tests: Added _Yarn<char> class tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp100/tests/Makefile.in | 9 ++ dlls/msvcp100/tests/string.c | 168 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4350884..217d06e 100755 --- a/configure +++ b/configure @@ -15608,6 +15608,7 @@ wine_fn_config_dll msvcirt enable_msvcirt wine_fn_config_dll msvcm80 enable_msvcm80 wine_fn_config_dll msvcm90 enable_msvcm90 wine_fn_config_dll msvcp100 enable_msvcp100 +wine_fn_config_test dlls/msvcp100/tests msvcp100_test wine_fn_config_dll msvcp60 enable_msvcp60 wine_fn_config_dll msvcp70 enable_msvcp70 wine_fn_config_dll msvcp71 enable_msvcp71 diff --git a/configure.ac b/configure.ac index fc1d93c..d5d99f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2831,6 +2831,7 @@ WINE_CONFIG_DLL(msvcirt) WINE_CONFIG_DLL(msvcm80) WINE_CONFIG_DLL(msvcm90) WINE_CONFIG_DLL(msvcp100) +WINE_CONFIG_TEST(dlls/msvcp100/tests) WINE_CONFIG_DLL(msvcp60) WINE_CONFIG_DLL(msvcp70) WINE_CONFIG_DLL(msvcp71) diff --git a/dlls/msvcp100/tests/Makefile.in b/dlls/msvcp100/tests/Makefile.in new file mode 100644 index 0000000..fe92d54 --- /dev/null +++ b/dlls/msvcp100/tests/Makefile.in @@ -0,0 +1,9 @@ +TESTDLL = msvcp100.dll +APPMODE = -mno-cygwin +MODCFLAGS = @BUILTINFLAG@ +EXTRAINCL = -I$(top_srcdir)/include/msvcrt + +C_SRCS = \ + string.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c new file mode 100644 index 0000000..b33b145 --- /dev/null +++ b/dlls/msvcp100/tests/string.c @@ -0,0 +1,168 @@ +/* + * Copyright 2012 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#include <limits.h> + +#include <windef.h> +#include <winbase.h> +#include "wine/test.h" + +typedef struct +{ + char *str; + char null_str; +} _Yarn_char; + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +/* Emulate a __thiscall */ +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +static _Yarn_char* (__thiscall *_Yarn_char_ctor_cstr)(_Yarn_char *this, const char *str); +static _Yarn_char* (__thiscall *_Yarn_char_copy_ctor)(_Yarn_char *this, const _Yarn_char *copy); +static void (__thiscall *_Yarn_char_dtor)(_Yarn_char *this); +static const char* (__thiscall *_Yarn_char_c_str)(const _Yarn_char *this); +static char (__thiscall *_Yarn_char_empty)(const _Yarn_char *this); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE msvcp = LoadLibraryA("msvcp100.dll"); + if(!msvcp) { + win_skip("msvcp100.dll not installed\n"); + return FALSE; + } + + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QEAA(a)PEBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QEAA(a)AEBV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QEAA(a)XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QEBAPEBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QEBA_NXZ"); + }else { + SET(_Yarn_char_ctor_cstr, "??0?$_Yarn(a)D@std@@QAE(a)PBD@Z"); + SET(_Yarn_char_copy_ctor, "??0?$_Yarn(a)D@std@@QAE(a)ABV01@@Z"); + SET(_Yarn_char_dtor, "??1?$_Yarn(a)D@std@@QAE(a)XZ"); + SET(_Yarn_char_c_str, "?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ"); + SET(_Yarn_char_empty, "?_Empty@?$_Yarn(a)D@std@@QBE_NXZ"); + } + + init_thiscall_thunk(); + return TRUE; +} + +static void test__Yarn_char(void) +{ + _Yarn_char c1, c2; + char bool_ret; + const char *str; + + call_func2(_Yarn_char_ctor_cstr, &c1, NULL); + ok(!c1.str, "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 1, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == &c1.null_str, "str = %p, expected %p\n", str, &c1.null_str); + call_func1(_Yarn_char_dtor, &c1); + + call_func2(_Yarn_char_ctor_cstr, &c1, ""); + ok(c1.str != NULL, "c1.str = NULL\n"); + ok(!strcmp(c1.str, ""), "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 0, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == c1.str, "str = %p, expected %p\n", str, c1.str); + call_func1(_Yarn_char_dtor, &c1); + + call_func2(_Yarn_char_ctor_cstr, &c1, "test"); + ok(!strcmp(c1.str, "test"), "c1.str = %s\n", c1.str); + ok(!c1.null_str, "c1.null_str = %d\n", c1.null_str); + bool_ret = (char)(INT_PTR)call_func1(_Yarn_char_empty, &c1); + ok(bool_ret == 0, "ret = %d\n", bool_ret); + str = call_func1(_Yarn_char_c_str, &c1); + ok(str == c1.str, "str = %p, expected %p\n", str, c1.str); + + call_func2(_Yarn_char_copy_ctor, &c2, &c1); + ok(c1.str != c2.str, "c1.str = c2.str\n"); + ok(!strcmp(c2.str, "test"), "c2.str = %s\n", c2.str); + ok(!c2.null_str, "c2.null_str = %d\n", c2.null_str); + call_func1(_Yarn_char_dtor, &c2); + + c1.null_str = 'a'; + call_func2(_Yarn_char_copy_ctor, &c2, &c1); + ok(c1.str != c2.str, "c1.str = c2.str\n"); + ok(!strcmp(c2.str, "test"), "c2.str = %s\n", c2.str); + ok(!c2.null_str, "c2.null_str = %d\n", c2.null_str); + call_func1(_Yarn_char_dtor, &c2); + call_func1(_Yarn_char_dtor, &c1); +} + +START_TEST(string) +{ + if(!init()) + return; + + test__Yarn_char(); +}

1 0

Piotr Caban : msvcp100: Store locale string in _Yarn<char> class.
by Alexandre Julliard 17 Oct '12

17 Oct '12

Module: wine Branch: master Commit: db55f1cd83e7affa876273823abc5bea15aebc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db55f1cd83e7affa876273823… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 09:56:57 2012 +0200 msvcp100: Store locale string in _Yarn<char> class. --- dlls/msvcp100/locale.c | 86 ++++++++++++++++++++++++------------------------ dlls/msvcp100/msvcp.h | 5 +++ 2 files changed, 48 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db55f1cd83e7affa87627…

1 0