January 2010 - Wine-Commits

Jacek Caban : mshtml: Create URL moniker after test initialization.
by Alexandre Julliard Jan. 22, 2010

Jan. 22, 2010

Module: wine Branch: master Commit: ab6f8f8b2e33ebc742f7a29e52d940ca306969dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6f8f8b2e33ebc742f7a29e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 20 21:44:05 2010 +0100 mshtml: Create URL moniker after test initialization. --- dlls/mshtml/tests/htmldoc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7dfd344..9d287ec 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4445,9 +4445,6 @@ static void test_HTMLDocument_http(void) trace("Testing HTMLDocument (http)...\n"); - hres = CreateURLMoniker(NULL, http_urlW, &http_mon); - ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); - init_test(LD_DOLOAD); ipsex = TRUE; @@ -4456,6 +4453,9 @@ static void test_HTMLDocument_http(void) return; doc_unk = (IUnknown*)doc; + hres = CreateURLMoniker(NULL, http_urlW, &http_mon); + ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); + test_ConnectionPointContainer(doc); test_GetCurMoniker((IUnknown*)doc, NULL, NULL); test_Persist(doc, http_mon);

1 0

Piotr Caban : jscript: Make Array.sort generic.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 8644a083a668ddc03d704a3d94d152ba0a04b710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8644a083a668ddc03d704a3d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 17:14:44 2010 +0100 jscript: Make Array.sort generic. --- dlls/jscript/array.c | 25 +++++++++++-------------- dlls/jscript/tests/api.js | 10 ++++++++++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 15a6e78..b6fcd3c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -685,10 +685,10 @@ static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VA } /* ECMA-262 3rd Edition 15.4.4.11 */ -static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, +static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - DispatchEx *cmp_func = NULL; + DispatchEx *jsthis, *cmp_func = NULL; VARIANT *vtab, **sorttab = NULL; DWORD length; DWORD i; @@ -696,12 +696,9 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA TRACE("\n"); - if(is_vclass(jsthis, JSCLASS_ARRAY)) { - length = array_from_vdisp(jsthis)->length; - }else { - FIXME("unsupported this not array\n"); - return E_NOTIMPL; - } + hres = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres)) + return hres; if(arg_cnt(dp) > 1) { WARN("invalid arg_cnt %d\n", arg_cnt(dp)); @@ -731,8 +728,8 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA jsdisp_release(cmp_func); if(retv) { V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = jsthis->u.disp; - IDispatch_AddRef(jsthis->u.disp); + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(jsthis); + IDispatch_AddRef(V_DISPATCH(retv)); } return S_OK; } @@ -740,7 +737,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA vtab = heap_alloc_zero(length * sizeof(VARIANT)); if(vtab) { for(i=0; i<length; i++) { - hres = jsdisp_propget_idx(jsthis->u.jsdisp, i, vtab+i, ei, caller); + hres = jsdisp_propget_idx(jsthis, i, vtab+i, ei, caller); if(FAILED(hres) && hres != DISP_E_UNKNOWNNAME) { WARN("Could not get elem %d: %08x\n", i, hres); break; @@ -817,7 +814,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA } for(i=0; SUCCEEDED(hres) && i < length; i++) - hres = jsdisp_propput_idx(jsthis->u.jsdisp, i, sorttab[i], ei, caller); + hres = jsdisp_propput_idx(jsthis, i, sorttab[i], ei, caller); } if(vtab) { @@ -834,8 +831,8 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(retv) { V_VT(retv) = VT_DISPATCH; - V_DISPATCH(retv) = jsthis->u.disp; - IDispatch_AddRef(jsthis->u.disp); + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(jsthis); + IDispatch_AddRef(V_DISPATCH(retv)); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c8caea8..2fba252 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -695,6 +695,15 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr = new Object(); +arr.length = 3; +arr[0] = 1; +arr[2] = "aa"; +arr.sort = Array.prototype.sort; +tmp = arr.sort(); +ok(arr === tmp, "tmp !== arr"); +ok(arr[0]===1 && arr[1]==="aa" && arr[2]===undefined, "arr is sorted incorectly"); + arr = ["1", "2", "3"]; arr.length = 1; ok(arr.length === 1, "arr.length = " + arr.length); @@ -1903,6 +1912,7 @@ testArrayHostThis("unshift"); testArrayHostThis("reverse"); testArrayHostThis("join"); testArrayHostThis("pop"); +testArrayHostThis("sort"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Piotr Caban : jscript: Add error handling to Array.reverse.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 81715d00cd8a0a54fd9b836eff4049e8574419b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81715d00cd8a0a54fd9b836ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 17:23:55 2010 +0100 jscript: Add error handling to Array.reverse. --- dlls/jscript/array.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b6fcd3c..fd1fe51 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -473,17 +473,35 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP l = length-k-1; hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); + if(FAILED(hres1)) + return hres1; + hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); + if(FAILED(hres2)) { + VariantClear(&v1); + return hres2; + } if(hres1 == DISP_E_UNKNOWNNAME) - jsdisp_delete_idx(jsthis, l); + hres1 = jsdisp_delete_idx(jsthis, l); else - jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + hres1 = jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + + if(FAILED(hres1)) { + VariantClear(&v1); + VariantClear(&v2); + return hres1; + } if(hres2 == DISP_E_UNKNOWNNAME) - jsdisp_delete_idx(jsthis, k); + hres2 = jsdisp_delete_idx(jsthis, k); else - jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + hres2 = jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + + if(FAILED(hres2)) { + VariantClear(&v2); + return hres2; + } } if(retv) {

1 0

Alexandre Julliard : wine.inf: Add entries for some of the global options.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 4ae9c2fe1f7152711d03087da2ce98dab62ecbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae9c2fe1f7152711d03087da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 20:06:08 2010 +0100 wine.inf: Add entries for some of the global options. --- tools/wine.inf.in | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d1d528c..5a9db4e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -39,7 +39,6 @@ AddReg=\ Desktop,\ Metrics,\ DirectX,\ - Environment,\ Fonts,\ MCI,\ Misc,\ @@ -47,6 +46,7 @@ AddReg=\ OLE,\ Printing,\ Services, \ + SessionMgr,\ Tapi,\ Timezones @@ -63,7 +63,6 @@ AddReg=\ Desktop,\ Metrics,\ DirectX,\ - Environment,\ Fonts,\ MCI,\ Misc,\ @@ -71,6 +70,7 @@ AddReg=\ OLE,\ Printing,\ Services, \ + SessionMgr,\ Tapi,\ Timezones,\ VersionInfo @@ -452,18 +452,25 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Guid",,"{0F1D6860-88D9-11cf-9C4E-00A0C905425E}" HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For DirectPlay,"Path",,"dpmodemx.dll" -[Environment] -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"CommonProgramFiles",,"%16427%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"windir",0x00020000,"%10%" -HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"winsysdir",,"%11%" +[SessionMgr] +HKLM,%Control%\Session Manager,CriticalSectionTimeout,0x00040002,0x00278d00 +HKLM,%Control%\Session Manager,GlobalFlag,0x00040002,0 +HKLM,%Control%\Session Manager,HeapDeCommitFreeBlockThreshold,0x00040002,0 +HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 +HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 +HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 +HKLM,%Control%\Session Manager\Environment,"CommonProgramFiles",,"%16427%" +HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" +HKLM,%Control%\Session Manager\Environment,"ProgramFiles",,"%16422%" +HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" +HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" +HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp" +HKLM,%Control%\Session Manager\Environment,"TMP",0x00020002,"%10%\temp" +HKLM,%Control%\Session Manager\Environment,"windir",0x00020000,"%10%" +HKLM,%Control%\Session Manager\Environment,"winsysdir",,"%11%" +HKLM,%Control%\Session Manager\Memory Management,WriteWatch,0x00040002,1 [Fonts] HKLM,%FontSubStr%,"Arial Baltic,186",,"Arial,186" @@ -539,7 +546,6 @@ HKLM,Software\Microsoft\Rpc\SecurityService,16,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" -HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,,""

1 0

Aric Stewart : oleaut32: Do not crash in logging if string is NULL.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 9a9c075ee9cd5cf5cf40de78fdd12d0876bb8e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a9c075ee9cd5cf5cf40de78f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 20 10:03:09 2010 -0600 oleaut32: Do not crash in logging if string is NULL. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9f10981..26babdb 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -961,7 +961,7 @@ deserialize_param( unsigned char *buffer; buffer = BSTR_UserUnmarshal(&flags, buf->base + buf->curoff, (BSTR *)arg); buf->curoff = buffer - buf->base; - if (debugout) TRACE_(olerelay)("%s",relaystr(*(BSTR *)arg)); + if (debugout) TRACE_(olerelay)("%s",debugstr_w(*(BSTR *)arg)); } return S_OK; }

1 0

Alexandre Julliard : ntdll: Implement LdrQueryImageFileExecutionOptions and use it to retrieve the per-process global flag .
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 1c119dad6dc9a5ca029e76e23ea64057bb31d2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c119dad6dc9a5ca029e76e23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 17:11:03 2010 +0100 ntdll: Implement LdrQueryImageFileExecutionOptions and use it to retrieve the per-process global flag. --- dlls/ntdll/loader.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 106 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e3d7adb..c16e0f6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2199,6 +2199,106 @@ NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, } +static NTSTATUS query_dword_option( HANDLE hkey, LPCWSTR name, ULONG *value ) +{ + NTSTATUS status; + UNICODE_STRING str; + ULONG size; + WCHAR buffer[64]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + + RtlInitUnicodeString( &str, name ); + + size = sizeof(buffer) - sizeof(WCHAR); + if ((status = NtQueryValueKey( hkey, &str, KeyValuePartialInformation, buffer, size, &size ))) + return status; + + if (info->Type != REG_DWORD) + { + buffer[size / sizeof(WCHAR)] = 0; + *value = strtoulW( (WCHAR *)info->Data, 0, 16 ); + } + else memcpy( value, info->Data, sizeof(*value) ); + return status; +} + +static NTSTATUS query_string_option( HANDLE hkey, LPCWSTR name, ULONG type, + void *data, ULONG in_size, ULONG *out_size ) +{ + NTSTATUS status; + UNICODE_STRING str; + ULONG size; + char *buffer; + KEY_VALUE_PARTIAL_INFORMATION *info; + static const int info_size = FIELD_OFFSET( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + RtlInitUnicodeString( &str, name ); + + size = info_size + in_size; + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return STATUS_NO_MEMORY; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + status = NtQueryValueKey( hkey, &str, KeyValuePartialInformation, buffer, size, &size ); + if (!status || status == STATUS_BUFFER_OVERFLOW) + { + if (out_size) *out_size = info->DataLength; + if (data && !status) memcpy( data, info->Data, info->DataLength ); + } + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return status; +} + + +/****************************************************************** + * LdrQueryImageFileExecutionOptions (NTDLL.@) + */ +NTSTATUS WINAPI LdrQueryImageFileExecutionOptions( const UNICODE_STRING *key, LPCWSTR value, ULONG type, + void *data, ULONG in_size, ULONG *out_size ) +{ + static const WCHAR optionsW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','m','a','g','e',' ','F','i','l','e',' ', + 'E','x','e','c','u','t','i','o','n',' ','O','p','t','i','o','n','s','\\'}; + WCHAR path[MAX_PATH + sizeof(optionsW)/sizeof(WCHAR)]; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name_str; + HANDLE hkey; + NTSTATUS status; + ULONG len; + WCHAR *p; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name_str; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if ((p = memrchrW( key->Buffer, '\\', key->Length / sizeof(WCHAR) ))) p++; + else p = key->Buffer; + len = key->Length - (p - key->Buffer) * sizeof(WCHAR); + name_str.Buffer = path; + name_str.Length = sizeof(optionsW) + len; + name_str.MaximumLength = name_str.Length; + memcpy( path, optionsW, sizeof(optionsW) ); + memcpy( path + sizeof(optionsW)/sizeof(WCHAR), p, len ); + if ((status = NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr ))) return status; + + if (type == REG_DWORD) + { + if (out_size) *out_size = sizeof(ULONG); + if (in_size >= sizeof(ULONG)) status = query_dword_option( hkey, value, data ); + else status = STATUS_BUFFER_OVERFLOW; + } + else status = query_string_option( hkey, value, type, data, in_size, out_size ); + + NtClose( hkey ); + return status; +} + + /****************************************************************** * RtlDllShutdownInProgress (NTDLL.@) */ @@ -2466,6 +2566,7 @@ static void start_process( void *kernel_start ) void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { + static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path; @@ -2487,6 +2588,9 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, peb->ProcessParameters->ImagePathName = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); + LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, + REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); + /* the main exe needs to be the first in the load order list */ RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0b3ebef..67a9d13 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -73,7 +73,7 @@ @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) @ stdcall LdrProcessRelocationBlock(ptr long ptr long) -@ stub LdrQueryImageFileExecutionOptions +@ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index 6860950..a4dd93b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1873,6 +1873,7 @@ NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); +NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void);

1 0

Alexandre Julliard : ntdll: Load the various PEB global options at startup.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 39a1227cdbd4dd160b201cbb3297a3c68a4bf83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a1227cdbd4dd160b201cbb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 20 17:30:00 2010 +0100 ntdll: Load the various PEB global options at startup. --- dlls/ntdll/loader.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 51 ----------------------------------------------- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c16e0f6..1172a86 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2552,6 +2552,59 @@ static NTSTATUS attach_process_dlls( void *wm ) /*********************************************************************** + * load_global_options + */ +static void load_global_options(void) +{ + static const WCHAR sessionW[] = {'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; + static const WCHAR critsectW[] = {'C','r','i','t','i','c','a','l','S','e','c','t','i','o','n','T','i','m','e','o','u','t',0}; + static const WCHAR heapresW[] = {'H','e','a','p','S','e','g','m','e','n','t','R','e','s','e','r','v','e',0}; + static const WCHAR heapcommitW[] = {'H','e','a','p','S','e','g','m','e','n','t','C','o','m','m','i','t',0}; + static const WCHAR decommittotalW[] = {'H','e','a','p','D','e','C','o','m','m','i','t','T','o','t','a','l','F','r','e','e','T','h','r','e','s','h','o','l','d',0}; + static const WCHAR decommitfreeW[] = {'H','e','a','p','D','e','C','o','m','m','i','t','F','r','e','e','B','l','o','c','k','T','h','r','e','s','h','o','l','d',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name_str; + HANDLE hkey; + ULONG value; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name_str; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name_str, sessionW ); + + if (NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) return; + + query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); + + query_dword_option( hkey, critsectW, &value ); + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + + query_dword_option( hkey, heapresW, &value ); + NtCurrentTeb()->Peb->HeapSegmentReserve = value; + + query_dword_option( hkey, heapcommitW, &value ); + NtCurrentTeb()->Peb->HeapSegmentCommit = value; + + query_dword_option( hkey, decommittotalW, &value ); + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + + query_dword_option( hkey, decommitfreeW, &value ); + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + + NtClose( hkey ); +} + + +/*********************************************************************** * start_process */ static void start_process( void *kernel_start ) @@ -2799,6 +2852,8 @@ void __wine_process_init(void) FILE_umask = umask(0777); umask( FILE_umask ); + load_global_options(); + /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 929d443..ef9183a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -183,54 +183,6 @@ done: } /*********************************************************************** - * get_global_flag - * - * This is called before the process heap is created, - * but after the connection to the server is established. - * No windows heap allocation is permitted. - */ -static DWORD get_global_flag(void) -{ - static const WCHAR sessionman_keyW[] = {'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; - static const WCHAR global_flagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW, valueW; - HANDLE hkey; - char tmp[32]; - DWORD count; - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)tmp; - NTSTATUS status; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, sessionman_keyW ); - - status = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ); - if (status != STATUS_SUCCESS) - return 0; - - RtlInitUnicodeString( &valueW, global_flagW ); - status = NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ); - if (status != STATUS_SUCCESS) - return 0; - - /* Some documents say this can be a string, so handle either type */ - if (info->Type == REG_DWORD) - return *(DWORD *)info->Data; - if (info->Type == REG_SZ) - return strtol((char *)info->Data, NULL, 16); - return 0; -} - -/*********************************************************************** * thread_init * * Setup the initial thread. @@ -310,9 +262,6 @@ HANDLE thread_init(void) server_init_process(); info_size = server_init_thread( peb ); - /* retrieve the global flags settings from the registry */ - peb->NtGlobalFlag = get_global_flag(); - /* create the process heap */ if (!(peb->ProcessHeap = RtlCreateHeap( HEAP_GROWABLE, NULL, 0, 0, NULL, NULL ))) {

1 0

Piotr Caban : jscript: Make Array.pop generic.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 91dcc245f98349e05aeb7b959472d23284d65418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91dcc245f98349e05aeb7b959… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 20 17:12:38 2010 +0100 jscript: Make Array.pop generic. --- dlls/jscript/array.c | 43 +++++++++++++++++-------------------------- dlls/jscript/tests/api.js | 12 ++++++++++++ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 5acfa01..15a6e78 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -372,52 +372,42 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR return hres; } -static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, +static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + DispatchEx *jsthis; VARIANT val; DWORD length; - WCHAR buf[14]; - DISPID id; HRESULT hres; - static const WCHAR formatW[] = {'%','d',0}; - TRACE("\n"); - if(is_vclass(jsthis, JSCLASS_ARRAY)) { - ArrayInstance *array = array_from_vdisp(jsthis); - length = array->length; - }else { - FIXME("not Array this\n"); - return E_NOTIMPL; - } + hres = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres)) + return hres; if(!length) { + hres = set_length(jsthis, ei, 0); + if(FAILED(hres)) + return hres; + if(retv) V_VT(retv) = VT_EMPTY; return S_OK; } - sprintfW(buf, formatW, --length); - hres = jsdisp_get_id(jsthis->u.jsdisp, buf, 0, &id); + length--; + hres = jsdisp_propget_idx(jsthis, length, &val, ei, caller); if(SUCCEEDED(hres)) { - hres = jsdisp_propget(jsthis->u.jsdisp, id, &val, ei, caller); - if(FAILED(hres)) - return hres; - - hres = IDispatchEx_DeleteMemberByDispID(jsthis->u.dispex, id); - }else if(hres == DISP_E_UNKNOWNNAME) { + hres = jsdisp_delete_idx(jsthis, length); + } else if(hres == DISP_E_UNKNOWNNAME) { V_VT(&val) = VT_EMPTY; hres = S_OK; - }else { + } else return hres; - } - if(SUCCEEDED(hres)) { - ArrayInstance *array = array_from_vdisp(jsthis); - array->length = length; - } + if(SUCCEEDED(hres)) + hres = set_length(jsthis, ei, length); if(FAILED(hres)) { VariantClear(&val); @@ -428,6 +418,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPAR *retv = val; else VariantClear(&val); + return S_OK; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 40193a7..c8caea8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -618,6 +618,12 @@ ok(arr.push(true, 'b', false) === 10, "arr.push(true, 'b', false) !== 10"); ok(arr[8] === "b", "arr[8] != 'b'"); ok(arr.length === 10, "arr.length != 10"); +arr.pop = Array.prototype.pop; +ok(arr.pop() === false, "arr.pop() !== false"); +ok(arr[8] === "b", "arr[8] !== 'b'"); +ok(arr.pop() === 'b', "arr.pop() !== 'b'"); +ok(arr[8] === undefined, "arr[8] !== undefined"); + arr = [3,4,5]; tmp = arr.pop(); ok(arr.length === 2, "arr.length = " + arr.length); @@ -633,6 +639,11 @@ for(tmp in arr) tmp = arr.pop(); ok(arr.length === 0, "arr.length = " + arr.length); ok(tmp === undefined, "tmp = " + tmp); +arr = new Object(); +arr.pop = Array.prototype.pop; +tmp = arr.pop(); +ok(arr.length === 0, "arr.length = " + arr.length); +ok(tmp === undefined, "tmp = " + tmp); arr = [,,,,,]; tmp = arr.pop(); ok(arr.length === 5, "arr.length = " + arr.length); @@ -1891,6 +1902,7 @@ testArrayHostThis("splice"); testArrayHostThis("unshift"); testArrayHostThis("reverse"); testArrayHostThis("join"); +testArrayHostThis("pop"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Henri Verbeet : wined3d: Set the query.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: d967973d8c4b18c3ca537aa54b0fcc0d126dd0b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d967973d8c4b18c3ca537aa54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 23:52:26 2010 +0100 wined3d: Set the query.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/query.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 753ed13..92e09e4 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -31,7 +31,7 @@ */ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* ******************************************* IWineD3DQuery IUnknown parts follow @@ -179,6 +179,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface, static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { IWineD3DQueryImpl *This = (IWineD3DQueryImpl *) iface; struct wined3d_event_query *query = This->extendedData; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BOOL *data = pData; @@ -204,15 +205,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void } context = context_acquire(This->device, query->context->current_rt, CTXUSAGE_RESOURCELOAD); + gl_info = context->gl_info; ENTER_GL(); - if (context->gl_info->supported[APPLE_FENCE]) + if (gl_info->supported[APPLE_FENCE]) { *data = GL_EXTCALL(glTestFenceAPPLE(query->id)); checkGLcall("glTestFenceAPPLE"); } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { *data = GL_EXTCALL(glTestFenceNV(query->id)); checkGLcall("glTestFenceNV"); @@ -255,6 +257,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD if (dwIssueFlags & WINED3DISSUE_END) { struct wined3d_event_query *query = This->extendedData; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; if (query->context) @@ -276,14 +279,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD context_alloc_event_query(context, query); } + gl_info = context->gl_info; + ENTER_GL(); - if (context->gl_info->supported[APPLE_FENCE]) + if (gl_info->supported[APPLE_FENCE]) { GL_EXTCALL(glSetFenceAPPLE(query->id)); checkGLcall("glSetFenceAPPLE"); } - else if (context->gl_info->supported[NV_FENCE]) + else if (gl_info->supported[NV_FENCE]) { GL_EXTCALL(glSetFenceNV(query->id, GL_ALL_COMPLETED_NV)); checkGLcall("glSetFenceNV");

1 0

Henri Verbeet : d3d9: Add a separate function for stateblock initialization .
by Alexandre Julliard Jan. 20, 2010

Jan. 20, 2010

Module: wine Branch: master Commit: 7f8ccf03426b7558852ade31744bafb5a549beca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8ccf03426b7558852ade317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 23:52:29 2010 +0100 d3d9: Add a separate function for stateblock initialization. --- dlls/d3d9/d3d9_private.h | 7 +-- dlls/d3d9/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/stateblock.c | 98 ++++++++++----------------------------------- 3 files changed, 115 insertions(+), 81 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c01da91..eb3a032 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -187,11 +187,6 @@ HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapte extern HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) DECLSPEC_HIDDEN; extern UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, - D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, - IDirect3DStateBlock9 **ppSB) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(IDirect3DDevice9Ex *iface, IDirect3DVertexDeclaration9 *pDecl) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9Ex *iface, @@ -467,6 +462,8 @@ typedef struct IDirect3DStateBlock9Impl { LPDIRECT3DDEVICE9EX parentDevice; } IDirect3DStateBlock9Impl; +HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, + D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) DECLSPEC_HIDDEN; /* --------------------------- */ /* IDirect3DVertexDeclaration9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 35eaf7c..79a9ba0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1414,6 +1414,97 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9EX return hr; } +static HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(IDirect3DDevice9Ex *iface, + D3DSTATEBLOCKTYPE type, IDirect3DStateBlock9 **stateblock) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IDirect3DStateBlock9Impl *object; + HRESULT hr; + + TRACE("iface %p, type %#x, stateblock %p.\n", iface, type, stateblock); + + if (type != D3DSBT_ALL && type != D3DSBT_PIXELSTATE && type != D3DSBT_VERTEXSTATE) + { + WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate stateblock memory.\n"); + return E_OUTOFMEMORY; + } + + hr = stateblock_init(object, This, type, NULL); + if (FAILED(hr)) + { + WARN("Failed to initialize stateblock, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created stateblock %p.\n", object); + *stateblock = (IDirect3DStateBlock9 *)object; + + return D3D_OK; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; + + TRACE("iface %p.\n", iface); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); + wined3d_mutex_unlock(); + + return hr; +} + +static HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDirect3DStateBlock9 **stateblock) +{ + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + IWineD3DStateBlock *wined3d_stateblock; + IDirect3DStateBlock9Impl *object; + HRESULT hr; + + TRACE("iface %p, stateblock %p.\n", iface, stateblock); + + wined3d_mutex_lock(); + hr = IWineD3DDevice_EndStateBlock(This->WineD3DDevice, &wined3d_stateblock); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("IWineD3DDevice_EndStateBlock() failed, hr %#x.\n", hr); + return hr; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate stateblock memory.\n"); + IWineD3DStateBlock_Release(wined3d_stateblock); + return E_OUTOFMEMORY; + } + + hr = stateblock_init(object, This, 0, wined3d_stateblock); + if (FAILED(hr)) + { + WARN("Failed to initialize stateblock, hr %#x.\n", hr); + IWineD3DStateBlock_Release(wined3d_stateblock); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created stateblock %p.\n", object); + *stateblock = (IDirect3DStateBlock9 *)object; + + return D3D_OK; +} + static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9EX iface, CONST D3DCLIPSTATUS9* pClipStatus) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 7cd3ba6..c4941db 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -123,87 +123,33 @@ static const IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = IDirect3DStateBlock9Impl_Apply }; - -/* IDirect3DDevice9 IDirect3DStateBlock9 Methods follow: */ -HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9EX iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9** ppStateBlock) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IDirect3DStateBlock9Impl* object; - HRESULT hrc = D3D_OK; - - TRACE("iface %p, type %#x, stateblock %p.\n", iface, Type, ppStateBlock); - - if(Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE && - Type != D3DSBT_VERTEXSTATE ) { - WARN("Unexpected stateblock type, returning D3DERR_INVALIDCALL\n"); - return D3DERR_INVALIDCALL; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock9Impl)); - if (NULL == object) return E_OUTOFMEMORY; - object->lpVtbl = &Direct3DStateBlock9_Vtbl; - object->ref = 1; - - wined3d_mutex_lock(); - hrc = IWineD3DDevice_CreateStateBlock(This->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)Type, &object->wineD3DStateBlock, (IUnknown*)object); - wined3d_mutex_unlock(); - - if(hrc != D3D_OK){ - FIXME("(%p) Call to IWineD3DDevice_CreateStateBlock failed.\n", This); - HeapFree(GetProcessHeap(), 0, object); - } else { - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppStateBlock = (IDirect3DStateBlock9*)object; - TRACE("(%p) : Created stateblock %p\n", This, object); - } - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, object); - return hrc; -} - -HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) +HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl *device, + D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); - wined3d_mutex_unlock(); - - return hr; -} + stateblock->lpVtbl = &Direct3DStateBlock9_Vtbl; + stateblock->ref = 1; -HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDirect3DStateBlock9 **ppSB) -{ - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - IWineD3DStateBlock *wineD3DStateBlock; - IDirect3DStateBlock9Impl *object; - HRESULT hr; - - TRACE("iface %p, stateblock %p.\n", iface, ppSB); - - /* Tell wineD3D to endstateblock before anything else (in case we run out - * of memory later and cause locking problems) */ - wined3d_mutex_lock(); - hr=IWineD3DDevice_EndStateBlock(This->WineD3DDevice,&wineD3DStateBlock); - wined3d_mutex_unlock(); - - if (hr!= D3D_OK) + if (wined3d_stateblock) { - WARN("IWineD3DDevice_EndStateBlock returned an error\n"); - return hr; + stateblock->wineD3DStateBlock = wined3d_stateblock; } - /* allocate a new IDirectD3DStateBlock */ - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DStateBlock9Impl)); - if (!object) return E_OUTOFMEMORY; - object->ref = 1; - object->lpVtbl = &Direct3DStateBlock9_Vtbl; - object->wineD3DStateBlock = wineD3DStateBlock; - - IDirect3DDevice9Ex_AddRef(iface); - object->parentDevice = iface; - *ppSB=(IDirect3DStateBlock9*)object; - TRACE("(%p) Returning *ppSB %p, wineD3DStateBlock %p\n", This, *ppSB, wineD3DStateBlock); + else + { + wined3d_mutex_lock(); + hr = IWineD3DDevice_CreateStateBlock(device->WineD3DDevice, (WINED3DSTATEBLOCKTYPE)type, + &stateblock->wineD3DStateBlock, (IUnknown *)stateblock); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to create wined3d stateblock, hr %#x.\n", hr); + return hr; + } + } + + stateblock->parentDevice = (IDirect3DDevice9Ex *)device; + IDirect3DDevice9Ex_AddRef(stateblock->parentDevice); + return D3D_OK; }

1 0