October 2012 - Wine-Commits

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

Oct. 17, 2012

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 Oct. 17, 2012

Oct. 17, 2012

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

Hans Leidekker : wbemprox: Implement Win32_Service.PauseService.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 8fe25b2b89b4b2e2ae23b079671426ae67fd70d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe25b2b89b4b2e2ae23b0796… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:07:17 2012 +0200 wbemprox: Implement Win32_Service.PauseService. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 30 +++++----- dlls/wbemprox/service.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 5 ++ 4 files changed, 135 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index b04bb64..bd96a99 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ main.c \ query.c \ reg.c \ + service.c \ services.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9e515ef..5138fde 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -65,8 +65,6 @@ static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR class_serviceW[] = - {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = @@ -132,8 +130,6 @@ static const WCHAR prop_methodW[] = {'M','e','t','h','o','d',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; -static const WCHAR prop_nameW[] = - {'N','a','m','e',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -295,7 +291,9 @@ static const struct column col_service[] = { prop_servicetypeW, CIM_STRING }, { prop_startmodeW, CIM_STRING }, { prop_stateW, CIM_STRING }, - { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + /* methods */ + { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_sounddevice[] = { @@ -473,6 +471,8 @@ struct record_service const WCHAR *startmode; const WCHAR *state; const WCHAR *systemname; + /* methods */ + class_method *pause_service; }; struct record_sounddevice { @@ -514,6 +514,7 @@ static const struct record_diskdrive data_diskdrive[] = }; static const struct record_params data_params[] = { + { class_serviceW, method_pauseserviceW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0, 0x80000002 }, { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32, VT_I4 }, @@ -1103,15 +1104,16 @@ static void fill_service( struct table *table ) status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); - rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; - rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; - rec->displayname = heap_strdupW( services[i].lpDisplayName ); - rec->name = heap_strdupW( services[i].lpServiceName ); - rec->process_id = status->dwProcessId; - rec->servicetype = get_service_type( status->dwServiceType ); - rec->startmode = get_service_startmode( config->dwStartType ); - rec->state = get_service_state( status->dwCurrentState ); - rec->systemname = heap_strdupW( sysnameW ); + rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; + rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->startmode = get_service_startmode( config->dwStartType ); + rec->state = get_service_state( status->dwCurrentState ); + rec->systemname = heap_strdupW( sysnameW ); + rec->pause_service = service_pause_service; heap_free( config ); offset += sizeof(*rec); num_rows++; diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c new file mode 100644 index 0000000..7c6aabf --- /dev/null +++ b/dlls/wbemprox/service.c @@ -0,0 +1,113 @@ +/* + * Win32_Service methods implementation + * + * Copyright 2012 Hans Leidekker 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 + */ + +#define COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" +#include "winsvc.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +static UINT map_error( DWORD error ) +{ + switch (error) + { + case ERROR_SUCCESS: return 0; + case ERROR_ACCESS_DENIED: return 2; + case ERROR_DEPENDENT_SERVICES_RUNNING: return 3; + case ERROR_INVALID_SERVICE_CONTROL: return 4; + case ERROR_SERVICE_CANNOT_ACCEPT_CTRL: return 5; + case ERROR_SERVICE_NOT_ACTIVE: return 6; + case ERROR_SERVICE_REQUEST_TIMEOUT: return 7; + case ERROR_SERVICE_ALREADY_RUNNING: return 10; + default: + WARN("unknown error %u\n", error); + break; + } + return 8; +} + +static HRESULT control_service( const WCHAR *name, DWORD control, VARIANT *retval ) +{ + SC_HANDLE manager, service = NULL; + SERVICE_STATUS status; + UINT error = 0; + + if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!(service = OpenServiceW( manager, name, SERVICE_STOP|SERVICE_START|SERVICE_PAUSE_CONTINUE ))) + { + error = map_error( GetLastError() ); + goto done; + } + if (!ControlService( service, control, &status )) error = map_error( GetLastError() ); + +done: + set_variant( VT_UI4, error, NULL, retval ); + CloseServiceHandle( service ); + CloseServiceHandle( manager ); + return S_OK; +} + +HRESULT service_pause_service( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + VARIANT name, retval; + IWbemClassObject *sig; + HRESULT hr; + + TRACE("%p, %p, %p\n", obj, in, out); + + hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( class_serviceW, method_pauseserviceW, PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &name ); + return hr; + } + hr = IWbemClassObject_SpawnInstance( sig, 0, out ); + if (hr != S_OK) + { + VariantClear( &name ); + IWbemClassObject_Release( sig ); + return hr; + } + hr = control_service( V_BSTR(&name), SERVICE_CONTROL_PAUSE, &retval ); + if (hr != S_OK) goto done; + hr = IWbemClassObject_Put( *out, param_returnvalueW, 0, &retval, CIM_UINT32 ); + +done: + VariantClear( &name ); + IWbemClassObject_Release( sig ); + if (hr != S_OK) IWbemClassObject_Release( *out ); + return hr; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 05da3c6..c2181c0 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -201,6 +201,7 @@ HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPE HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT service_pause_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len ) @@ -233,11 +234,15 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) return dst; } +static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; +static const WCHAR prop_nameW[] = {'N','a','m','e',0}; + static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; +static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; static const WCHAR param_defkeyW[] = {'h','D','e','f','K','e','y',0}; static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0};

1 0

Jacek Caban : vbscript: Use simplified builtin constants for more constants .
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 1d8763bbf9ba61763ecde7b1e30df5cf67d574ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8763bbf9ba61763ecde7b1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 09:54:45 2012 +0200 vbscript: Use simplified builtin constants for more constants. --- dlls/vbscript/global.c | 48 ++++++------------------------------------------ 1 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 87d2736..fa2d64f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1578,42 +1578,6 @@ static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned arg return E_NOTIMPL; } -static HRESULT Global_vbOKOnly(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_OK); -} - -static HRESULT Global_vbOKCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_OKCANCEL); -} - -static HRESULT Global_vbAbortRetryIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_ABORTRETRYIGNORE); -} - -static HRESULT Global_vbYesNoCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_YESNOCANCEL); -} - -static HRESULT Global_vbYesNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_YESNO); -} - -static HRESULT Global_vbRetryCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, MB_RETRYCANCEL); -} - static HRESULT Global_vbCritical(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -2029,12 +1993,12 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET}, {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET}, {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET}, - {DISPID_GLOBAL_VBOKONLY, Global_vbOKOnly, BP_GET}, - {DISPID_GLOBAL_VBOKCANCEL, Global_vbOKCancel, BP_GET}, - {DISPID_GLOBAL_VBABORTRETRYIGNORE, Global_vbAbortRetryIgnore, BP_GET}, - {DISPID_GLOBAL_VBYESNOCANCEL, Global_vbYesNoCancel, BP_GET}, - {DISPID_GLOBAL_VBYESNO, Global_vbYesNo, BP_GET}, - {DISPID_GLOBAL_VBRETRYCANCEL, Global_vbRetryCancel, BP_GET}, + {DISPID_GLOBAL_VBOKONLY, NULL, BP_GET, MB_OK}, + {DISPID_GLOBAL_VBOKCANCEL, NULL, BP_GET, MB_OKCANCEL}, + {DISPID_GLOBAL_VBABORTRETRYIGNORE, NULL, BP_GET, MB_ABORTRETRYIGNORE}, + {DISPID_GLOBAL_VBYESNOCANCEL, NULL, BP_GET, MB_YESNOCANCEL}, + {DISPID_GLOBAL_VBYESNO, NULL, BP_GET, MB_YESNO}, + {DISPID_GLOBAL_VBRETRYCANCEL, NULL, BP_GET, MB_RETRYCANCEL}, {DISPID_GLOBAL_VBCRITICAL, Global_vbCritical, BP_GET}, {DISPID_GLOBAL_VBQUESTION, Global_vbQuestion, BP_GET}, {DISPID_GLOBAL_VBEXCLAMATION, Global_vbExclamation, BP_GET},

1 0

Henri Verbeet : ddraw: Only restore the display mode if we changed it.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: bc3d767fda4f1cfa2763556f106915fd39858329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3d767fda4f1cfa2763556f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 22:43:11 2012 +0200 ddraw: Only restore the display mode if we changed it. --- dlls/ddraw/ddraw.c | 24 ++++++++++++++---------- dlls/ddraw/ddraw_private.h | 3 ++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8a554f3..003306c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1064,6 +1064,10 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW return DD_OK; } + if (!ddraw->restore_mode && FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, + WINED3DADAPTER_DEFAULT, &ddraw->original_mode, NULL))) + ERR("Failed to get current display mode, hr %#x.\n", hr); + switch (bpp) { case 8: format = WINED3DFMT_P8_UINT; break; @@ -1083,7 +1087,8 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW /* TODO: The possible return values from msdn suggest that the screen mode * can't be changed if a surface is locked or some drawing is in progress. */ /* TODO: Lose the primary surface. */ - hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); + if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + ddraw->restore_mode = TRUE; wined3d_mutex_unlock(); @@ -1155,13 +1160,20 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) wined3d_mutex_lock(); + if (!ddraw->restore_mode) + { + wined3d_mutex_unlock(); + return DD_OK; + } + if (exclusive_ddraw && exclusive_ddraw != ddraw) { wined3d_mutex_unlock(); return DDERR_NOEXCLUSIVEMODE; } - hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode); + if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode))) + ddraw->restore_mode = FALSE; wined3d_mutex_unlock(); @@ -5371,14 +5383,6 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) return E_OUTOFMEMORY; } - if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, - WINED3DADAPTER_DEFAULT, &ddraw->original_mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - wined3d_decref(ddraw->wined3d); - return hr; - } - hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0d15727..b092428 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -68,7 +68,8 @@ struct ddraw struct wined3d *wined3d; struct wined3d_device *wined3d_device; - BOOL d3d_initialized; + BOOL d3d_initialized; + BOOL restore_mode; struct ddraw_surface *primary; RECT primary_lock;

1 0

Henri Verbeet : wined3d: Handle WINED3DSPR_PRIMID in the GLSL shader backend.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 6c3595fba89ff9b6407a0909fd884c93fbd0dd79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3595fba89ff9b6407a0909f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 22:43:09 2012 +0200 wined3d: Handle WINED3DSPR_PRIMID in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 388f438..199695b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1562,6 +1562,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } break; + case WINED3DSPR_PRIMID: + sprintf(register_name, "uint(gl_PrimitiveIDIn)"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -1649,7 +1653,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); - if (wined3d_src->reg.type == WINED3DSPR_IMMCONST) + if (wined3d_src->reg.type == WINED3DSPR_IMMCONST || wined3d_src->reg.type == WINED3DSPR_PRIMID) { shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); }

1 0

Henri Verbeet : ddraw: Prevent mode changes when a different ddraw object is in exclusive mode.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 40d3a34004fcdbc4ba75d227214cfbcc40ceb912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d3a34004fcdbc4ba75d2272… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 22:43:10 2012 +0200 ddraw: Prevent mode changes when a different ddraw object is in exclusive mode. --- dlls/ddraw/ddraw.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9d2a78a..8a554f3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static const struct ddraw *exclusive_ddraw; + /* Device identifier. Don't relay it to WineD3D */ static const DDDEVICEIDENTIFIER2 deviceidentifier = { @@ -967,6 +969,11 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if(cooplevel & DDSCL_FPUSETUP) WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", This); + if (cooplevel & DDSCL_EXCLUSIVE) + exclusive_ddraw = This; + else if (exclusive_ddraw == This) + exclusive_ddraw = NULL; + /* Store the cooperative_level */ This->cooperative_level = cooplevel; TRACE("SetCooperativeLevel retuning DD_OK\n"); @@ -1044,6 +1051,12 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW wined3d_mutex_lock(); + if (exclusive_ddraw && exclusive_ddraw != ddraw) + { + wined3d_mutex_unlock(); + return DDERR_NOEXCLUSIVEMODE; + } + if (!width || !height) { /* It looks like Need for Speed Porsche Unleashed expects DD_OK here. */ @@ -1061,12 +1074,6 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW default: format = WINED3DFMT_UNKNOWN; break; } - /* Check the exclusive mode. - * if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - * return DDERR_NOEXCLUSIVEMODE; - * This is WRONG. Don't know if the SDK is completely wrong and if there - * are any conditions when DDERR_NOEXCLUSIVE is returned, but Half-Life - * 1.1.1.1 (Steam version) depends on this. */ mode.width = width; mode.height = height; mode.refresh_rate = refresh_rate; @@ -1148,6 +1155,12 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) wined3d_mutex_lock(); + if (exclusive_ddraw && exclusive_ddraw != ddraw) + { + wined3d_mutex_unlock(); + return DDERR_NOEXCLUSIVEMODE; + } + hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: When restoring the display mode, use the mode set before the first mode change on any ddraw object.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 698ff9ba4e9eabc9792a18a2cb8835176c0b66e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698ff9ba4e9eabc9792a18a2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 16 22:43:12 2012 +0200 ddraw: When restoring the display mode, use the mode set before the first mode change on any ddraw object. --- dlls/ddraw/ddraw.c | 25 +++++++++++-------------- dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 003306c..2998742 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -27,7 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +static struct wined3d_display_mode original_mode; static const struct ddraw *exclusive_ddraw; +static BOOL restore_mode; /* Device identifier. Don't relay it to WineD3D */ static const DDDEVICEIDENTIFIER2 deviceidentifier = @@ -1064,8 +1066,8 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW return DD_OK; } - if (!ddraw->restore_mode && FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, - WINED3DADAPTER_DEFAULT, &ddraw->original_mode, NULL))) + if (!restore_mode && FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, + WINED3DADAPTER_DEFAULT, &original_mode, NULL))) ERR("Failed to get current display mode, hr %#x.\n", hr); switch (bpp) @@ -1088,7 +1090,10 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW * can't be changed if a surface is locked or some drawing is in progress. */ /* TODO: Lose the primary surface. */ if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + { ddraw->restore_mode = TRUE; + restore_mode = TRUE; + } wined3d_mutex_unlock(); @@ -1135,17 +1140,6 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO * * Restores the display mode to what it was at creation time. Basically. * - * A problem arises when there are 2 DirectDraw objects using the same hwnd: - * -> DD_1 finds the screen at 1400x1050x32 when created, sets it to 640x480x16 - * -> DD_2 is created, finds the screen at 640x480x16, sets it to 1024x768x32 - * -> DD_1 is released. The screen should be left at 1024x768x32. - * -> DD_2 is released. The screen should be set to 1400x1050x32 - * This case is unhandled right now, but Empire Earth does it this way. - * (But perhaps there is something in SetCooperativeLevel to prevent this) - * - * The msdn says that this method resets the display mode to what it was before - * SetDisplayMode was called. What if SetDisplayModes is called 2 times?? - * * Returns * DD_OK on success * DDERR_NOEXCLUSIVE mode if the device isn't in fullscreen mode @@ -1172,8 +1166,11 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) return DDERR_NOEXCLUSIVEMODE; } - if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode))) + if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &original_mode))) + { ddraw->restore_mode = FALSE; + restore_mode = FALSE; + } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b092428..f1a2a2a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -79,7 +79,6 @@ struct ddraw /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; - struct wined3d_display_mode original_mode; /* D3D things */ HWND d3d_window;

1 0

Jacek Caban : vbscript: Pass arguments to builtin functions in natural order.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: d6d187c2b31b89f696a2e849cec461e7ee3250cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d187c2b31b89f696a2e849c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 09:54:12 2012 +0200 vbscript: Pass arguments to builtin functions in natural order. --- dlls/vbscript/global.c | 79 +++++++++++++++++++++++------------------------ dlls/vbscript/vbdisp.c | 33 +++++-------------- 2 files changed, 48 insertions(+), 64 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4a4dd8e..69686f5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -648,16 +648,16 @@ static HRESULT Global_Left(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VAR TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); - if(V_VT(args+1) == VT_BSTR) { - str = V_BSTR(args+1); + if(V_VT(args) == VT_BSTR) { + str = V_BSTR(args); }else { - hres = to_string(args+1, &conv_str); + hres = to_string(args, &conv_str); if(FAILED(hres)) return hres; str = conv_str; } - hres = to_int(args, &len); + hres = to_int(args+1, &len); if(FAILED(hres)) return hres; @@ -690,18 +690,18 @@ static HRESULT Global_Right(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA int len, str_len; HRESULT hres; - TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args)); + TRACE("(%s %s)\n", debugstr_variant(args), debugstr_variant(args+1)); if(V_VT(args+1) == VT_BSTR) { - str = V_BSTR(args+1); + str = V_BSTR(args); }else { - hres = to_string(args+1, &conv_str); + hres = to_string(args, &conv_str); if(FAILED(hres)) return hres; str = conv_str; } - hres = to_int(args, &len); + hres = to_int(args+1, &len); if(FAILED(hres)) return hres; @@ -734,11 +734,23 @@ static HRESULT Global_Mid(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI BSTR str; HRESULT hres; - TRACE("\n"); + TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1)); - switch(args_cnt) { - case 3: - hres = to_int(args, &len); + assert(args_cnt == 2 || args_cnt == 3); + + if(V_VT(args) != VT_BSTR) { + FIXME("args[0] = %s\n", debugstr_variant(args)); + return E_NOTIMPL; + } + + str = V_BSTR(args); + + hres = to_int(args+1, &start); + if(FAILED(hres)) + return hres; + + if(args_cnt == 3) { + hres = to_int(args+2, &len); if(FAILED(hres)) return hres; @@ -746,21 +758,6 @@ static HRESULT Global_Mid(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI FIXME("len = %d\n", len); return E_FAIL; } - /* fallthrough */ - case 2: - hres = to_int(args+args_cnt-2, &start); - if(FAILED(hres)) - return hres; - - if(V_VT(args+args_cnt-1) != VT_BSTR) { - FIXME("args[0] = %s\n", debugstr_variant(args+args_cnt-1)); - return E_NOTIMPL; - } - - str = V_BSTR(args+args_cnt-1); - break; - default: - assert(0); } @@ -987,16 +984,18 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA TRACE("\n"); + assert(2 <= args_cnt && args_cnt <= 4); + switch(args_cnt) { case 2: startv = NULL; - str1v = args+1; - str2v = args; + str1v = args; + str2v = args+1; break; case 3: - startv = args+2; + startv = args; str1v = args+1; - str2v = args; + str2v = args+2; break; case 4: FIXME("unsupported compare argument %s\n", debugstr_variant(args)); @@ -1227,7 +1226,7 @@ static HRESULT Global_InputBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } -static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { BSTR prompt; HRESULT hres; @@ -1239,7 +1238,7 @@ static HRESULT Global_MsgBox(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } - hres = to_string(arg, &prompt); + hres = to_string(args, &prompt); if(FAILED(hres)) return hres; @@ -1425,7 +1424,7 @@ static HRESULT Global_FormatDateTime(vbdisp_t *This, VARIANT *arg, unsigned args return E_NOTIMPL; } -static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { int weekday, first_day = 0, abbrev = 0; BSTR ret; @@ -1435,17 +1434,17 @@ static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *arg, unsigned args_cn assert(1 <= args_cnt && args_cnt <= 3); - hres = to_int(arg+args_cnt-1, &weekday); + hres = to_int(args, &weekday); if(FAILED(hres)) return hres; if(args_cnt > 1) { - hres = to_int(arg+args_cnt-2, &abbrev); + hres = to_int(args+1, &abbrev); if(FAILED(hres)) return hres; if(args_cnt == 3) { - hres = to_int(arg, &first_day); + hres = to_int(args+2, &first_day); if(FAILED(hres)) return hres; } @@ -1458,7 +1457,7 @@ static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *arg, unsigned args_cn return return_bstr(res, ret); } -static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { int month, abbrev = 0; BSTR ret; @@ -1468,12 +1467,12 @@ static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, assert(args_cnt == 1 || args_cnt == 2); - hres = to_int(arg+args_cnt-1, &month); + hres = to_int(args, &month); if(FAILED(hres)) return hres; if(args_cnt == 2) { - hres = to_int(arg, &abbrev); + hres = to_int(args+1, &abbrev); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 27c4aa3..aff9361 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -138,8 +138,8 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { - VARIANT *args, arg_buf[8]; - unsigned argn; + VARIANT args[8]; + unsigned argn, i; switch(flags) { case DISPATCH_PROPERTYGET: @@ -176,28 +176,13 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - args = dp->rgvarg; + assert(argn < sizeof(args)/sizeof(*args)); - if(argn == 1) { - if(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) - args = V_VARIANTREF(dp->rgvarg); - }else { - unsigned i; - - assert(argn < sizeof(arg_buf)/sizeof(*arg_buf)); - - for(i=0; i < argn; i++) { - if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) { - for(i=0; i < argn; i++) { - if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) - arg_buf[i] = *V_VARIANTREF(dp->rgvarg+i); - else - arg_buf[i] = dp->rgvarg[i]; - } - args = arg_buf; - break; - } - } + for(i=0; i < argn; i++) { + if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) + args[i] = *V_VARIANTREF(dp->rgvarg+dp->cArgs-i-1); + else + args[i] = dp->rgvarg[dp->cArgs-i-1]; } return prop->proc(This, args, dp->cArgs, res);

1 0

Hans Leidekker : wbemprox: Keep a reference to the table from uncommitted instances.
by Alexandre Julliard Oct. 17, 2012

Oct. 17, 2012

Module: wine Branch: master Commit: 2eb666d624d3729f25b8bc9a5f51be7e95d71829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb666d624d3729f25b8bc9a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 11:06:41 2012 +0200 wbemprox: Keep a reference to the table from uncommitted instances. --- dlls/wbemprox/class.c | 32 ++++++++++++-------------------- dlls/wbemprox/query.c | 3 ++- dlls/wbemprox/table.c | 9 +++++++-- dlls/wbemprox/wbemprox_private.h | 4 +++- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index dc03371..a3a06e1 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -202,8 +202,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; - ec->query = query; - addref_query( query ); + ec->query = addref_query( query ); ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; @@ -212,24 +211,25 @@ HRESULT EnumWbemClassObject_create( return S_OK; } -static struct record *create_record( const struct column *columns, UINT num_cols ) +static struct record *create_record( struct table *table ) { UINT i; struct record *record; if (!(record = heap_alloc( sizeof(struct record) ))) return NULL; - if (!(record->fields = heap_alloc( num_cols * sizeof(struct field) ))) + if (!(record->fields = heap_alloc( table->num_cols * sizeof(struct field) ))) { heap_free( record ); return NULL; } - for (i = 0; i < num_cols; i++) + for (i = 0; i < table->num_cols; i++) { - record->fields[i].type = columns[i].type; - record->fields[i].vartype = columns[i].vartype; + record->fields[i].type = table->columns[i].type; + record->fields[i].vartype = table->columns[i].vartype; record->fields[i].u.ival = 0; } - record->count = num_cols; + record->count = table->num_cols; + record->table = addref_table( table ); return record; } @@ -252,6 +252,7 @@ static void destroy_record( struct record *record ) UINT i; if (!record) return; + release_table( record->table ); for (i = 0; i < record->count; i++) { if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME) @@ -390,14 +391,10 @@ static HRESULT WINAPI class_object_Get( if (co->record) { - struct table *table = grab_table( co->name ); UINT index; HRESULT hr; - if (!table) return WBEM_E_FAILED; - hr = get_column_index( table, wszName, &index ); - release_table( table ); - if (hr != S_OK) return hr; + if ((hr = get_column_index( co->record->table, wszName, &index )) != S_OK) return hr; return record_get_value( co->record, index, pVal, pType ); } return get_propval( ec->query->view, co->index, wszName, pVal, pType, plFlavor ); @@ -450,14 +447,10 @@ static HRESULT WINAPI class_object_Put( if (co->record) { - struct table *table = grab_table( co->name ); UINT index; HRESULT hr; - if (!table) return WBEM_E_FAILED; - hr = get_column_index( table, wszName, &index ); - release_table( table ); - if (hr != S_OK) return hr; + if ((hr = get_column_index( co->record->table, wszName, &index )) != S_OK) return hr; return record_set_value( co->record, index, pVal ); } return put_propval( ec->query->view, co->index, wszName, pVal, Type ); @@ -650,8 +643,7 @@ static HRESULT WINAPI class_object_SpawnInstance( TRACE("%p, %08x, %p\n", iface, lFlags, ppNewInstance); - if (!(record = create_record( view->table->columns, view->table->num_cols ))) - return E_OUTOFMEMORY; + if (!(record = create_record( view->table ))) return E_OUTOFMEMORY; return create_class_object( co->name, NULL, 0, record, ppNewInstance ); } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 29026c9..3fdee00 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -290,9 +290,10 @@ static void free_query( struct query *query ) heap_free( query ); } -void addref_query( struct query *query ) +struct query *addref_query( struct query *query ) { InterlockedIncrement( &query->refs ); + return query; } void release_query( struct query *query ) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 277998b..43ab91d 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -321,6 +321,12 @@ void release_table( struct table *table ) if (!InterlockedDecrement( &table->refs )) free_table( table ); } +struct table *addref_table( struct table *table ) +{ + InterlockedIncrement( &table->refs ); + return table; +} + struct table *grab_table( const WCHAR *name ) { struct table *table; @@ -330,9 +336,8 @@ struct table *grab_table( const WCHAR *name ) if (!strcmpiW( table->name, name )) { if (table->fill && !table->data) table->fill( table ); - InterlockedIncrement( &table->refs ); TRACE("returning %p\n", table); - return table; + return addref_table( table ); } } return NULL; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 02fc919..05da3c6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -91,6 +91,7 @@ struct record { UINT count; struct field *fields; + struct table *table; }; enum operator @@ -154,7 +155,7 @@ struct query struct list mem; }; -void addref_query( struct query * ) DECLSPEC_HIDDEN; +struct query *addref_query( struct query * ) DECLSPEC_HIDDEN; void release_query( struct query *query ) DECLSPEC_HIDDEN; HRESULT exec_query( const WCHAR *, IEnumWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT parse_query( const WCHAR *, struct view **, struct list * ) DECLSPEC_HIDDEN; @@ -163,6 +164,7 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * void destroy_view( struct view * ) DECLSPEC_HIDDEN; void init_table_list( void ) DECLSPEC_HIDDEN; struct table *grab_table( const WCHAR * ) DECLSPEC_HIDDEN; +struct table *addref_table( struct table * ) DECLSPEC_HIDDEN; void release_table( struct table * ) DECLSPEC_HIDDEN; struct table *create_table( const WCHAR *, UINT, const struct column *, UINT, BYTE *, void (*)(struct table *)) DECLSPEC_HIDDEN;

1 0