May 2019 - Wine-devel - list.winehq.org

[PATCH] setupapi: Avoid debugstr buffer overflow.
by Józef Kucia 12 May '19

12 May '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Alternatively, trace TRACE() could be removed. --- dlls/setupapi/parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c1086895d0dc..449ae002c55e 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1857,7 +1857,12 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, { TRACE( "%p/%p/%d/%d index %d returning", context->Inf, context->CurrentInf, context->Section, context->Line, index ); - for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] ); + for (i = index; i < line->nb_fields; i++) + { + TRACE( " %02x", buffer[i - index] ); + if (i % 100 == 0) + TRACE( "\n" ); + } TRACE( "\n" ); } return TRUE; -- 2.21.0

1 0

[PATCH v5 1/2] jscript: implement Enumerator()
by Andreas Maier 12 May '19

12 May '19

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 206 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 190 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index d0502f6afa..47140c617a 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -26,6 +26,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,9 +37,48 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This, + BOOL init) +{ + HRESULT hres; + VARIANT nextitem; + + /* not at end ... get next item */ + if ((init) || (!is_undefined(This->item))) + { + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (SUCCEEDED(hres)) + { + hres = variant_to_jsval(&nextitem, &This->item); + if (FAILED(hres)) + { + ERR("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + } + + } + else + This->item = jsval_undefined(); + VariantClear(&nextitem); + } + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { - TRACE("Enumerator_destructor\n"); + TRACE("\n"); heap_free(dispex); } @@ -43,33 +86,90 @@ static void Enumerator_destructor(jsdisp_t *dispex) static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; - return E_NOTIMPL; + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + if (r) + *r = jsval_bool(is_undefined(This->item)); + + TRACE("%s\n", debugstr_jsval(This->item)); + + return S_OK; } static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_item\n"); + EnumeratorInstance *This; + + TRACE("\n"); - return E_NOTIMPL; + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + return r ? jsval_copy(This->item, r) : S_OK; } static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveFirst\n"); + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + + TRACE("\n"); + + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } - return E_NOTIMPL; + if (This->enumvar) + { + hres = IEnumVARIANT_Reset(This->enumvar); + if (!FAILED(hres)) + hres = enumvar_get_next_item(This, TRUE); + } + else + hres = S_OK; + + if (r) + *r = jsval_undefined(); + + return hres; } static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveNext\n"); + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + + TRACE("\n"); + + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + if (This->enumvar) + hres = enumvar_get_next_item(This, FALSE); + else + hres = S_OK; - return E_NOTIMPL; + if (r) + *r = jsval_undefined(); + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -101,16 +201,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; - TRACE("EnumeratorConstr_value\n"); + TRACE("\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -118,7 +220,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl break; } default: - FIXME("unimplemented flags: %x\n", flags); + ERR("unimplemented flags: %x\n", flags); return E_NOTIMPL; } @@ -140,7 +242,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +283,82 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + + IEnumVARIANT *enumvar; + + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + + /* new Enumerator() */ + if (argv == NULL) + { + enumvar = NULL; + } + else if (is_object_instance(*argv)) + { + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + ERR("Enumerator: no DISPID_NEWENUM.\n"); + hres = E_INVALIDARG; + goto cleanuperr; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || + (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + if (FAILED(hres)) + { + hres = E_INVALIDARG; + goto cleanuperr; + } + } + else + { + ERR("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + goto cleanuperr; + } + VariantClear(&varresult); + } + else + { + ERR("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + + enumerator->enumvar = enumvar; + if (enumvar) + { + hres = enumvar_get_next_item(enumerator, TRUE); + if (FAILED(hres)) + goto cleanuperr; + } + else + enumerator->item = jsval_undefined(); *ret = &enumerator->dispex; + return S_OK; +cleanuperr: + VariantClear(&varresult); + if (enumerator) + heap_free(enumerator); + return hres; } -- 2.11.0

2 3

[PATCH 1/4] quartz: Make Parser_OutputPin_BreakConnect() a local helper.
by Zebediah Figura 11 May '19

11 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/parser.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9278a58bf7..d92161f1c2 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -46,7 +46,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IM static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { @@ -429,7 +428,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, Parser_OutputPin_DecideBufferSize, Parser_OutputPin_DecideAllocator, - Parser_OutputPin_BreakConnect + NULL, }; HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt) @@ -468,6 +467,22 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR return hr; } +static HRESULT WINAPI break_connection(IPin *iface) +{ + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + HRESULT hr; + + if (!pin->pin.pin.pConnectedTo || !pin->pin.pMemInputPin) + hr = VFW_E_NOT_CONNECTED; + else + { + hr = IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(iface); + } + + return hr; +} + static HRESULT Parser_RemoveOutputPins(ParserImpl * This) { /* NOTE: should be in critical section when calling this function */ @@ -483,7 +498,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) for (i = 0; i < This->cStreams; i++) { - hr = ((BaseOutputPin *)ppOldPins[i + 1])->pFuncsTable->pfnBreakConnect((BaseOutputPin *)ppOldPins[i + 1]); + hr = break_connection(ppOldPins[i + 1]); TRACE("Disconnect: %08x\n", hr); IPin_Release(ppOldPins[i + 1]); } @@ -609,26 +624,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe return hr; } -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - - static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface); -- 2.21.0

2 7

[PATCH v2 1/2] ntdll: Add test for environment variables in PEB block
by Fabian Maurer 11 May '19

11 May '19

Note that the test is interactive since it requires a reboot (on windows) and a rerun on wine. AFAIK there's no way around those limitations, so this is the test I came up with. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/tests/env.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4e2ef8222d..41cb44ecd2 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,59 @@ static void test_process_params(void) } } +static BOOL setup_environment(void) +{ + HKEY key; + LSTATUS status; + LPCSTR value1 = "%WINETESTVAR2%"; + LPCSTR value2 = "test ok"; + BOOL is_ready; + const char *path = "System\\CurrentControlSet\\Control\\Session Manager\\Environment"; + status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, path, 0, KEY_ALL_ACCESS, &key); + ok(status == ERROR_SUCCESS, "RegOpenKeyExA failed with %d\n", status); + + status = RegQueryValueExA(key, "WINETESTVAR1", NULL, NULL, NULL, NULL); + ok(status == ERROR_SUCCESS || status == ERROR_FILE_NOT_FOUND, "RegQueryValueExA failed with %d\n", status); + is_ready = (status == ERROR_SUCCESS); + if (!is_ready) + { + status = RegSetValueExA(key, "WINETESTVAR1", 0, REG_EXPAND_SZ,(LPBYTE)value1, strlen(value1) + 1); + ok(status == ERROR_SUCCESS, "RegSetValueExA failed with %d\n", status); + status = RegSetValueExA(key, "WINETESTVAR2", 0, REG_EXPAND_SZ,(LPBYTE)value2, strlen(value2) + 1); + ok(status == ERROR_SUCCESS, "RegSetValueExA failed with %d\n", status); + } + RegCloseKey(key); + + return is_ready; +} + +static void test_peb_environment(void) +{ + static const WCHAR result1[] = {'W','I','N','E','T','E','S','T','V','A','R','1','=','t','e','s','t',' ','o','k',0}; + static const WCHAR result2[] = {'W','I','N','E','T','E','S','T','V','A','R','2','=','t','e','s','t',' ','o','k',0}; + BOOL found1 = FALSE; + BOOL found2 = FALSE; + BOOL is_ready = setup_environment(); + if (is_ready) + { + WCHAR *env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + for (; *env; env += lstrlenW(env) + 1) + { + if (lstrcmpW(env, result1) == 0) + found1 = TRUE; + if (lstrcmpW(env, result2) == 0) + found2 = TRUE; + } + todo_wine + ok(found1, "Didn't find %s in the PEB environment variables\n", wine_dbgstr_w(result1)); + ok(found2, "Didn't find %s in the PEB environment variables\n", wine_dbgstr_w(result2)); + } + else + { + skip("Preparation finished. Restart when running windows, then rerun the test for the results.\n"); + } +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +588,8 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + if (winetest_interactive) + { + test_peb_environment(); + } } -- 2.21.0

1 1

[PATCH v4 1/2] jscript: implement Enumerator()
by Andreas Maier 11 May '19

11 May '19

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 206 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 190 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737ac52..3831990219 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -26,6 +26,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,9 +37,48 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This, + BOOL init) +{ + HRESULT hres; + VARIANT nextitem; + + /* not at end ... get next item */ + if ((init) || (!is_undefined(This->item))) + { + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (SUCCEEDED(hres)) + { + hres = variant_to_jsval(&nextitem, &This->item); + if (FAILED(hres)) + { + ERR("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + } + + } + else + This->item = jsval_undefined(); + VariantClear(&nextitem); + } + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { - TRACE("Enumerator_destructor\n"); + TRACE("\n"); heap_free(dispex); } @@ -43,33 +86,90 @@ static void Enumerator_destructor(jsdisp_t *dispex) HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; - return E_NOTIMPL; + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + if (r) + *r = jsval_bool(is_undefined(This->item)); + + TRACE("%s\n", debugstr_jsval(This->item)); + + return S_OK; } HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_item\n"); + EnumeratorInstance *This; + + TRACE("\n"); - return E_NOTIMPL; + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + return r ? jsval_copy(This->item, r) : S_OK; } HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveFirst\n"); + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + + TRACE("\n"); + + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } - return E_NOTIMPL; + if (This->enumvar) + { + hres = IEnumVARIANT_Reset(This->enumvar); + if (!FAILED(hres)) + hres = enumvar_get_next_item(This, TRUE); + } + else + hres = S_OK; + + if (r) + *r = jsval_undefined(); + + return hres; } HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveNext\n"); + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + + TRACE("\n"); + + if (!(This = enumerator_from_vdisp(jsthis))) + { + FIXME("we should throw an error..."); + return E_NOTIMPL; + } + + if (This->enumvar) + hres = enumvar_get_next_item(This, FALSE); + else + hres = S_OK; - return E_NOTIMPL; + if (r) + *r = jsval_undefined(); + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -101,16 +201,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; - TRACE("EnumeratorConstr_value\n"); + TRACE("\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -118,7 +220,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl break; } default: - FIXME("unimplemented flags: %x\n", flags); + ERR("unimplemented flags: %x\n", flags); return E_NOTIMPL; } @@ -140,7 +242,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +283,82 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + + IEnumVARIANT *enumvar; + + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + + /* new Enumerator() */ + if (argv == NULL) + { + enumvar = NULL; + } + else if (is_object_instance(*argv)) + { + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + ERR("Enumerator: no DISPID_NEWENUM.\n"); + hres = E_INVALIDARG; + goto cleanuperr; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || + (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + if (FAILED(hres)) + { + hres = E_INVALIDARG; + goto cleanuperr; + } + } + else + { + ERR("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + goto cleanuperr; + } + VariantClear(&varresult); + } + else + { + ERR("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + + enumerator->enumvar = enumvar; + if (enumvar) + { + hres = enumvar_get_next_item(enumerator, TRUE); + if (FAILED(hres)) + goto cleanuperr; + } + else + enumerator->item = jsval_undefined(); *ret = &enumerator->dispex; + return S_OK; +cleanuperr: + VariantClear(&varresult); + if (enumerator) + heap_free(enumerator); + return hres; } -- 2.11.0

2 3

Unsubscribe
by Ivan Peevski 11 May '19

11 May '19

On Sat., 11 May 2019, 1:19 am Alexandre Julliard, <julliard(a)winehq.org> wrote: > The Wine development release 4.8 is now available. > > What's new in this release (see below for details): > - Support building most programs in PE format. > - Unicode data updated to Unicode 12.0. > - Support for MSI patch files. > - Default to non-PIC builds on i386. > - Joystick support improvements. > - Asturian locale. > - Various bug fixes. > > The source is available from the following locations: > > https://dl.winehq.org/wine/source/4.x/wine-4.8.tar.xz > http://mirrors.ibiblio.org/wine/source/4.x/wine-4.8.tar.xz > > Binary packages for various distributions will be available from: > > https://www.winehq.org/download > > You will find documentation on https://www.winehq.org/documentation > > You can also get the current source directly from the git > repository. Check https://www.winehq.org/git for details. > > Wine is available thanks to the work of many people. See the file > AUTHORS in the distribution for the complete list. > > ---------------------------------------------------------------- > > Bugs fixed in 4.8 (total 38): > > 12332 Microsoft Windows Server 2003 DDK SP1 installer crashes > ('setupapi.SetupCloseFileQueue' should do proper handle validation before > accessing members) > 14695 Lifeforce demo misses codecs (msvideo1 needs to support 24 bpp > output) > 28196 Test Drive Unlimited: Water is always rendered on top of > everything. > 28254 Multiple kernel drivers crash during load/relocation (relocation > entry crosses page boundary)(PMP Exam Version 7 CrypKey, Age of Wushu > SDProtect DRM, StarForce v3) > 29460 Multiple kernel drivers crash in entry due to ntoskrnl.exe > IoGetCurrentProcess() being a stub (Ruijie Supplicant Su1xDriver.sys, > nProtect GameGuard/Tachyon Kernel Control Driver) > 31101 ScoobyRom v0.6.x-0.8.x (.NET 4.0 app) fails to start with > Wine-Mono > 31350 Multiple .NET 3.x WPF applications crash in Vista/Win7 mode due > to dwmapi.DwmGetTransportAttributes stub returning E_NOTIMPL (T-Online > Mediencenter Assistent, Valil.Chess, Zwift 1.0) > 34372 Multiple applications need AllocateAndGetTcpExTableFromStack > (cross compiled dbus, spamMonitor) > 37359 planetside 2 no mouseclicks registered > 37540 Multiple games and applications wrapped with Enigma v4 and GG DRM > schemes crash on startup (incompatible with use of position independent > code (PIC) in Wine dlls) > 38423 Python 3.5.x exe installer fails with Access denied error > 39614 Wine initialises a Critical Section for Mutexes by NULL instead > of (void*)-1 > 42420 MidiIllustrator Virtuoso 3 crashes when using any File open dialog > 44850 Microsoft Skype 8.x crashes on unimplemented function > iphlpapi.dll.GetBestRoute2 > 45155 OpenGL Window Z order in Truespace > 45213 Multiple applications using Microsoft Detours library crash on > startup after compiling Wine with GCC 8.x+ and -O2 (GOT/PIC code emitted at > Win32 API entries)(Microsoft Visual Studio 201x, Visual Assist plugin) > 45757 Visual Studio 2017 Installer - "The installer manifest failed > signature validation" > 45765 Universe Sandbox 2 unimplemented function > USER32.dll.GetPointerType > 45947 Native Access crashes on unimplemented function > virtdisk.dll.OpenVirtualDisk > 46861 TopoEdit crashes with unimplemented function > mf.dll.MFEnumDeviceSources > 46905 Multiple eventlog monitor applications go haywire (endless > console spam, live-loop CPU) due to advapi32.ReadEventLogA/W returning > lasterror ERROR_CALL_NOT_IMPLEMENTED > 46989 Grand Prix Legends: Wheel (Wheel, Gas, Brake) axes inputs aren't > recognized > 46993 ntoskrnl.exe tests don't compile when using -O0 > 47016 MS Office 365 installer needs mfplay.dll.MFPCreateMediaPlayer > 47023 Warframe in-game screenshot fails if screenshot directory already > exists > 47027 Wine built with GCC 8.x+ and -O2 causes apps and games using > madCodeHook/madExcept 3.x/4.x to crash (hook engine can't cope with GOT/ > PIC code emitted within 15-byte range at Win32 API entries)(EA Origin, > HeidiSQL 10.x) > 47032 valgrind shows uninitialized read in writev from call_req_handler > 47082 NI System Web Server crashes on unimplemented function > authz.dll.AuthzFreeResourceManager > 47096 World of Warships 0.8.3.x client (DirectX 11) crashes when > post-battle results screen is about to be displayed > 47097 Wine built with GCC 8.x+ and -O2 causes Steam games using In-Game > Overlay 'gameoverlayrenderer.dll' to crash (hook engine can't cope with > GOT/PIC code emitted at Win32 API entries) > 47107 Windows XP DDK installer fails to copy any files > 47122 Star Citizen stopped working on commit > 32d7838da73dd9bc3ee999d73a310da7adfb27dd > 47123 Starcitizen - joystick not recognized > 47129 Rendering glitch in Caste Siege/Ballerburg (invalid vertex count > in IDirect3DDevice3::DrawIndexedPrimitiveVB) > 47131 Esportal client 1.0 (CS:GO anti-cheat) fails to start, reporting > 'The procedure entry point InitiateShutdownW could not be located in the > dynamic link library ADVAPI32.dll' > 47138 Microsoft .NET Framework 2.x installer fails ('RegSvcs.exe' > bootstrapper needs unicode casing tables, 'l_intl.nls' no longer installed > in WINEPREFIX) > 47142 Esportal client 1.0 (CS:GO anti-cheat) fails to start, reporting > 'The procedure entry point NdrServerCallAll could not be located in the > dynamic link library RPCRT4.dll' > 47145 Esportal client 1.0 (CS:GO anti-cheat) fails to start, reporting > 'The procedure entry point K32GetWsChangesEx could not be located in the > dynamic link library KERNEL32.dll' > > ---------------------------------------------------------------- > > Changes since 4.7: > > Alexandre Julliard (85): > attrib: Build with msvcrt. > cabarc: Build with msvcrt. > clock: Build with msvcrt. > control: Build with msvcrt. > dxdiag: Build with msvcrt. > eject: Build with msvcrt. > expand: Build with msvcrt. > extrac32: Build with msvcrt. > hh: Build with msvcrt. > hostname: Build with msvcrt. > icinfo: Build with msvcrt. > iexplore: Build with msvcrt. > ipconfig: Build with msvcrt. > msidb: Build with msvcrt. > msiexec: Build with msvcrt. > net: Build with msvcrt. > netstat: Build with msvcrt. > oleview: Build with msvcrt. > progman: Build with msvcrt. > regsvr32: Build with msvcrt. > ntdll: Check for time conversion error to silence a compiler warning. > makefiles: Also pass -fPIC flag when linking. > rpcss: Build with msvcrt. > rundll32: Build with msvcrt. > sc: Build with msvcrt. > schtasks: Build with msvcrt. > services: Build with msvcrt. > start: Build with msvcrt. > svchost: Build with msvcrt. > taskkill: Build with msvcrt. > uninstaller: Build with msvcrt. > view: Build with msvcrt. > makefiles: Don't use custom LDFLAGS to link dlls. > configure: Disable stdcall fixups for PE builds. > include: Add DECLSPEC_IMPORT on OpenGL functions when not building > opengl32. > crypt32: Fix comparison of domain name components. > winedevice: Build with msvcrt. > winemine: Build with msvcrt. > winemsibuilder: Build with msvcrt. > winetest: Build with msvcrt. > winhlp32: Build with msvcrt. > wmic: Build with msvcrt. > write: Build with msvcrt. > wscript: Build with msvcrt. > ping: Avoid using getopt(). > ping: Build with msvcrt. > winefile: Get rid of the Unix filesystem support. > winefile: Build with msvcrt. > include: Use DECLSPEC_HIDDEN instead of DECLSPEC_IMPORT for dll > exports. > include: Move DECLSPEC_HOTPATCH definition out of config.h. > makefiles: Support delay imports for PE builds. > makefiles: Use a separate LDFLAGS variable for cross-compilation. > makefiles: Only cross-compile the import libraries that are actually > used. > makefiles: Only cross-compile the static libraries that are actually > used. > dxerr8: Don't use snprintf(). > dxerr9: Don't use snprintf(). > strmbase: Avoid using wine/unicode.h. > cmd: Build with msvcrt. > explorer: Move screen saver activation to the X11 driver. > explorer: Build with msvcrt. > cmd: Explicitly mark qsort() callback funtions cdecl. > services: Explicitly mark a qsort() callback funtion cdecl. > uninstaller: Explicitly mark a qsort() callback funtion cdecl. > winefile: Explicitly mark qsort() callback funtions cdecl. > winhttp/tests: Get a test file from the WineHQ tests subdirectory. > include/msvcrt: Add inttypes.h header. > advapi32: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > atl: Use strncmpiW instead of memicmpW for strings without embedded > nulls. > fusion: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > kernel32: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > kernelbase: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > mountmgr.sys: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > mshtml: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > msi: Use strncmpiW instead of memicmpW for strings without embedded > nulls. > kernel32: Reset stdio file descriptors when passed invalid handles. > ntdll: Reset stdio file descriptors when passed invalid handles. > netapi32: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > ntdll: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > pdh: Use strncmpiW instead of memicmpW for strings without embedded > nulls. > qmgr: Use strncmpiW instead of memicmpW for strings without embedded > nulls. > shlwapi: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > urlmon: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > userenv: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > wbemprox: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > webservices: Use strncmpiW instead of memicmpW for strings without > embedded nulls. > > Alistair Leslie-Hughes (12): > wintab32/tests: Improve WTInfoA tests. > authz: Add AuthzFreeResourceManager stub. > dinput: Don't return unsupported interfaces. > dinput: Return E_NOINTERFACE from IDirectInputDevice2 QueryInterface. > dinput: Don't report that we cannot open a device. > dinput: Improve EnumDevice tracing. > dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo. > dinput: Use a helper function to get device type. > dinput: Trace This pointer in a consistent way. > dinput: Ensure Cursor is visible on config dialog. > mspatcha/tests: Fix compile error on older compilers. > mspatcha/tests: Make functions static. > > Andrew Eikum (11): > winebus.sys: Fix some report descriptors. > winebus.sys: Fix udev report descriptor length. > winebus.sys: Remove some magic numbers. > winebus.sys: Fix ball value reporting. > hid: Shift usage values to LSB. > dinput: Use heuristics to guess if a device is a gamepad or a > joystick. > winebus.sys: Order axes before buttons. > winebus.sys: Report hatswitch values correctly. > winebus.sys: Report SDL controller dpad as hatswitch. > winebus.sys: Report SDL controller buttons in the right order. > winebus.sys: Pack hatswitch values into button bytes. > > Aric Stewart (2): > winemac.drv: Set done if macdrv_process_text_input is not processing > input. > winemac.drv: Allow mac IME to clear text in system input method. > > Austin English (2): > iphlpapi: Add GetBestRoute2 stub. > advapi32: In ReadEventLogA/W, return ERROR_HANDLE_EOF instead of > ERROR_CALL_NOT_IMPLEMENTED. > > Bryon Roche (1): > windowscodecs: Byte swap png read/write for 16-bpp data. > > Conor McCarthy (4): > mspatcha: Add functions to API header file. > mspatcha: Partially implement ApplyPatchToFileW and related > functions. > mspatcha/tests: Test implementations of ApplyPatchToFileW and > related functions. > mspatcha: Add stubs for signature and normalization functions. > > Damjan Jovanovic (1): > qcap/vfwcapture: Implement IPin::CheckMediaType(). > > Derek Lesho (2): > ntoskrnl.exe: Export and set PsInitialSystemProcess. > ntoskrnl.exe: Implement PsIsSystemThread. > > Dmitry Timoshkov (2): > crypt32: CryptMsgUpdate should skip broken certificates. > mshtml: Implement HTMLStyleSheetRulesCollection::item. > > Enol Puente (4): > wrc: Add Asturian locale. > wmc: Support Asturian. > kernel32: Add Asturian locale. > po: Add Asturian translation. > > Erich Hoover (2): > iphlpapi: Implement AllocateAndGetTcpExTableFromStack. > kernel32: Add SearchPath test demonstrating the priority of the > working directory. > > François Gouget (4): > ntoskrnl.exe: Make run_work_item_worker() static. > user32: Make WIN_SetOwner() static. > kernel32/tests: Use ok_() so the TestBot can correctly detect the > line. > jscript: Make the Enumerator_props functions static. > > Henri Verbeet (37): > wined3d: Introduce a debug helper for Vulkan return values. > wined3d: Use shader_glsl_append_imm_vec4() in > shader_glsl_get_register_name(). > wined3d: Get rid of the redundant "device" parameter to > context_destroy(). > wined3d: Introduce a separate structure for OpenGL context > information. > wined3d: Introduce wined3d_context_init(). > wined3d: Simplify wined3d_context_destroy(). > wined3d: Rename context_destroy_gl_resources() to > wined3d_context_cleanup(). > wined3d: Free the "texture_type" array in wined3d_context_cleanup(). > wined3d: Introduce wined3d_context_gl_destroy(). > wined3d: Free shader backend and fragment pipe context data in > device_context_remove(). > wined3d: Allocate shader backend and fragment pipe context data in > device_context_add(). > wined3d: Get rid of the "target" parameter to context_create(). > wined3d: Get rid of the "target" parameter to wined3d_context_init(). > wined3d: Get rid of the "target" parameter to > wined3d_adapter_gl_create_context(). > wined3d: Get rid of context_validate_onscreen_formats(). > winex11: Only handle errors from GLX requests in GLXErrorHandler(). > wined3d: Query Vulkan GPU memory. > wined3d: Get rid of a redundant initialisation in > wined3d_device_set_implicit_swapchain(). > wined3d: Share more swapchain setup with the "no3d" adapter in > wined3d_device_set_implicit_swapchain(). > wined3d: Determine the ORM_BACKBUFFER depth/stencil format in > wined3d_adapter_gl_create_context(). > wined3d: Make the adapter responsible for context destruction and > allocation. > wined3d: Pass a wined3d_context_gl structure to > context_bind_texture(). > wined3d: Move the "texture_type" field from struct wined3d_context > to struct wined3d_context_gl. > wined3d: Move the "dummy_arbfp_prog" field from struct > wined3d_context to struct wined3d_context_gl. > wined3d: Store the glEnableWINE and glDisableWINE pointers in the > wined3d_gl_info structure. > wined3d: Move the extension emulation fields from struct > wined3d_context to struct wined3d_context_gl. > wined3d: Pass a wined3d_context_gl structure to > context_load_tex_coords(). > wined3d: Pass a wined3d_context_gl structure to > context_get_tex_unit_mapping(). > wined3d: Pass a wined3d_context_gl structure to > context_bind_shader_resources(). > wined3d: Pass a wined3d_context_gl structure to > context_apply_blit_state(). > wined3d: Pass a wined3d_context_gl structure to > context_apply_ffp_blit_state(). > wined3d: Pass a wined3d_context_gl structure to > wined3d_texture_gl_bind_and_dirtify(). > wined3d: Pass a wined3d_context_gl structure to context_map_stage(). > wined3d: Pass a wined3d_context_gl structure to > context_map_fixed_function_samplers(). > wined3d: Pass a wined3d_context_gl structure to > context_map_psamplers(). > wined3d: Pass a wined3d_context_gl structure to > context_map_vsamplers(). > wined3d: Pass a wined3d_context_gl structure to > context_unit_free_for_vs(). > > Jacek Caban (26): > ntoskrnl.exe: Implement IoGetCurrentProcess. > ntoskrnl.exe: Implement PsGetProcessId. > ntoskrnl.exe: Implement PsGetThreadId. > ntoskrnl.exe: Implement ObOpenObjectByPointer. > ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel > object. > ntoskrnl.exe: Support SL_INVOKE_ON_CANCEL in IoCompleteRequest. > ntoskrnl.exe: Support NULL offset in IoBuildSynchronousFsdRequest. > ntoskrnl.exe: Use ObGetObjectType in kernel_object_from_handle. > ntoskrnl.exe: Implement IoAllocateWorkItem and IoFreeWorkItem. > ntoskrnl.exe: Implement IoQueueWorkItem. > ntoskrnl.exe: Add work item tests. > ntoskrnl.exe: Implement IoBuildAsynchronousFsdRequest. > ntoskrnl.exe/tests: Add IoCallDriver tests. > ntoskrnl.exe: Implement IoCancelIrp. > ntoskrnl.exe/tests: Add CancelIo tests. > ntoskrnl.exe: Set IRP DeviceObject in IoCallDriver. > ntoskrnl.exe: Support UserEvent in IoCompleteRequest. > server: Pass IRP output size in irp_params_t. > server: Don't use IRP_MJ_* constants for ntoskrnl.exe communication. > server: Store currently executed IRP call on server side. > server: Pass file object handle in IRP_CALL_CREATE request. > ntoskrnl.exe: Associate file object with server object before > calling IRP routine. > ntoskrnl.exe: Don't keep reference to driver created file objects on > client side. > ntoskrnl.exe/tests: Add more overlapped tests. > hidclass.sys: Make read IRP queue thread safe. > hidclass.sys: Support canceling read IRPs. > > Jactry Zeng (2): > kernel32/tests: Avoid a crash on WinXP and Win2K. > d3dcompiler: Implement D3DReadFileToBlob(). > > Jefferson Carpenter (1): > server: Add __pad member to pe_image_info_t and zero it. > > Julian Rüger (1): > po: Update German translation. > > Józef Kucia (20): > wined3d: Implement GPU description registry override for Vulkan > adapter. > wined3d: Factor out wined3d_copy_name(). > wined3d: Make wined3d_gpu_description from Vulkan physical device > properties. > wined3d: Assign *device in adapter_vk_create_device(). > dxgi: Avoid magic constants. > d3d11: Set more format support flags. > dxgi: Factor out d3d12_swapchain_record_swapchain_blit(). > dxgi: Make Vulkan swapchain image count independent of DXGI buffer > count. > dxgi: Add some asserts for Vulkan swapchains. > dxgi: Acquire Vulkan image just before present when we have user > images. > d3d11: Implement ID3D11Multithread. > d3d11/tests: Add test for creating deferred contexts. > d3d11/tests: Add test for ID3D11Multithread. > d3d10core/tests: Add test for ID3D11Multithread. > wined3d: Query Vulkan shared system memory. > wined3d: Store texture swizzle capability in struct wined3d_d3d_info. > d3d11: Report format support more accurately based on feature level. > wined3d: Make the adapter responsible for initialising and > de-initialising 3D. > wined3d: Propagate HRESULTs in context creation functions. > wined3d: Fix wined3d_get_wine_vk_version(). > > Louis Lenders (5): > user32: Added GetPointerType stub. > dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in > DwmGetTransportAttributes. > advapi32: Add InitiateShutdown{A,W} stub. > rpcrt4: Add NdrServerCallAll stub. > kernel32: Add K32GetWsChangesEx stub. > > Martin Storsjo (2): > avicap32: Fix compilation with older videodev2.h. > qcap: Fix compilation with older videodev2.h. > > Michael Müller (3): > version: Correctly return VFF_CURNEDEST in VerFindFileA. > include: Add dxva.h header file. > avifil32: Correctly handle compressed frames when desired format is > specified. > > Michael Stefaniuc (7): > ntdll/tests: Avoid the comma operator. > ntoskrnl.exe: Correctly initialize two CRITICAL_SECTION_DEBUGs. > wintrust: Use the ARRAY_SIZE() macro. > mscoree: Remove a redundant NULL check before heap_free(). > riched32/tests: Test the correct return value. > mfplat/tests: Remove a duplicated ok() check. > rpcrt4: Use CONTAINING_RECORD instead of an extra macro. > > Nikolay Sivov (32): > tools: Update to Unicode 12.0. > mfplat: Improve thread safety for IStream-based stream. > mfplat: Improve method traces. > mfreadwrite: Return sample timestamp from ReadSample(). > mf: Add stub scheme handler for local file urls. > ntdll: Account for null terminating char in unload traces (Coverity). > mfreadwrite: Wake waiting threads on stream states changes. > ntdll: Initialize critical section debug info with correct pointer > value. > mfplat: Copy attributes when cloning presentation descriptor. > mfplat: Add more attribute guids. > mf: Add MFEnumDeviceSources() stub. > dbgeng/tests: Fix event handle leak (Coverity). > mfplat: Implement async file stream creation API. > mf: Register file: scheme handler. > mfplat: Use file url scheme as a fallback. > mfplat/tests: Add some tests for calling scheme handler directly. > mf: Implement file scheme handler. > wmvcore: Return success from OpenStream(). > mf: Add a stub for sample grabber activation object. > mfplat: Add topology attributes guids. > mf: Implement SetObject()/GetObject() for topology node. > mfplat: Improve SetGUID() traces. > mfplat: Implement Read() for file-based stream. > mfplat: Implement IsEndOfStream() for file stream. > mfplat: Write attribute store when registering MFT. > mfplat: Write flags when registering MFT. > mf: Set preferred media types for nodes. > mf: Implement CloneFrom() for nodes. > mf: Implement node connections. > mf: Rework node collection implementation. > mf: Disconnect removed nodes. > mf: Add IMFGetService stub for media session. > > Paul Gofman (3): > wined3d: Check if destination texture is FBO attachable in > glsl_blitter_supported(). > ddraw: Fix vertex count in d3d_device3_DrawIndexedPrimitiveVB(). > wined3d: Apply stencil mask to stencil reference value. > > Piotr Caban (9): > winebus.sys: Add more traces on hidraw communication errors. > hid: Add HidP_SetUsages implementation. > hid: Add support for ranges in find_value. > hid: Only set first usage in an array in HidP_SetUsageValue. > hidclass.sys: Set LinkCollection field in build_elements function. > hidclass.sys: Set LinkUsagePage field in build_elements function. > hidclass.sys: Set LinkUsage field in build_elements function. > hidclass.sys: Treat all one-bit fields as buttons. > hidclass.sys: Fill some reserved fields when building > HIDP_{BUTTON,VALUE}_CAPS. > > Qian Hong (1): > server: Create primary group using DOMAIN_GROUP_RID_USERS. > > Rafał Harabień (1): > ntoskrnl.exe: Fix handling relocations on page boundary. > > Tim Schumacher (2): > winejoystick: Add support for wheel axes. > dinput: Map wheel, gas, and brake axes as well. > > Vijay Kiran Kamuju (4): > virtdisk: Add stub and tests for OpenVirtualDisk. > include: Add missing defines, enums and functions for dwmapi.h. > wpcap: Fix compile warnings for redefinition of > PCAP_OPENFLAG_PROMISCUOUS. > include: Add missing navigation and gamepad key definitions in > winuser.rh. > > Vincent Povirk (2): > mscoree: Accept old framework build in exe metadata. > windowscodecs: Treat 16-bit channels as little endian. > > Zebediah Figura (30): > quartz: Convert media type registration to IRegistrar mechanism. > quartz: Avoid importing shlwapi. > evr/tests: Rewrite test_evr_filter_aggregation(). > evr/tests: Add tests for filter interfaces. > winegcc: Add support for -fno-PIC. > makefiles: Build with -fno-PIC on i386. > setupapi: Extract individual files from cabinets. > setupapi/tests: Avoid assert(). > setupapi/tests: Add some tests for SetupInstallFilesFromInfSection(). > setupapi: Avoid passing a NULL source root path to > SetupQueueDefaultCopy() and SetupQueueCopySection(). > setupapi: Fill out all source file parameters in > SetupQueueCopySection(). > setupapi: Fill out all source file parameters in > SetupQueueDefaultCopy(). > setupapi: Implement SetupQueueCopyIndirectA() on top of the W > variant. > setupapi: Remove implementation for LayoutInf parameter of > SP_FILE_COPY_PARAMS. > setupapi: Separate the entire copy operation into a helper function. > setupapi: Keep track of source media in a separate list. > setupapi: Implement > SetupDefaultQueueCallback(SPFILENOTIFY_NEEDMEDIA). > setupapi: Implement W -> A mapping of SPFILENOTIFY_NEEDMEDIA. > setupapi: Properly null-terminate the path in concat_W(). > setupapi: Use the source file name if the destination file name is > NULL. > setupapi: Implement source media path resolution. > setupapi/tests: Add tests for source media path resolution. > setupapi: Add magic bytes to struct file_queue and validate them in > SetupCloseFileQueue(). > ntoskrnl.exe/tests: Use coarser waits for timer tests. > ntoskrnl.exe/tests: Avoid linking directly to CancelIoEx(). > msi: Remove registration for no longer used > WineMsiRemoteCustomAction coclass. > setupapi: Avoid passing a NULL source filename to > SetupQueueDefaultCopy(). > strmbase: Move some internal definitions to strmbase_private.h. > strmbase: Move "AttemptConnection" to the base source pin function > table. > strmbase: Get rid of the "pfnGetMediaTypeVersion" callback. > > Zhiyi Zhang (1): > include: Add more kernel mode graphics driver definitions. > > -- > Alexandre Julliard > julliard(a)winehq.org > >

1 0

Wine staging 4.8 release
by Alistair Leslie-Hughes 11 May '19

11 May '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.8 (XXXXXX patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. Upstreamed (Either directly from staging or fixed with a similar patch). * user32: Added GetPointerType stub. * virtdisk: Add stub for OpenVirtualDisk * iphlpapi: Implement AllocateAndGetTcpExTableFromStack. * server: Create primary group using DOMAIN_GROUP_RID_USERS. * winejoystick: Add support for wheel axes. * dinput: Map wheel, gas, and brake axes as well. * dwmapi: Return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes. * include: Add dxva.h header file. * iphlpapi: Add GetBestRoute2 stub. * kernel32: Add SearchPath test demonstrating the priority of the working directory. * version: Correctly return VFF_CURNEDEST in VerFindFileA. * avifil32: Correctly handle compressed frames when desired format is specified. * setupapi: Check handle type for HSPFILEQ handles. * ntoskrnl.exe: Avoid invalid memory access when relocation block addresses memory outside of the current page. * windowscodecs: Byte swap png read/write for 16-bpp data. Added: * [38780] AArch64 platforms: register X18 (TEB) must remain reserved for Wine to run 64-bit ARM Windows applications. * [34108] dinput: Improve support for user Joystick configuration. * [36764] dinput: Allow DirectX version 3 to enumerate joysticks. Updated: * ntdll-Junction_Points * eventfd_synchronization * ddraw-Rendering_Targets * winex11.drv-mouse-coorrds Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH resend v3 2/2] po: Update French translation.
by Isira Seneviratne 10 May '19

10 May '19

1 0

[PATCH resend v3 1/2] po: Update Sinhala translation.
by Isira Seneviratne 10 May '19

10 May '19

1 0

[PATCH 5/5] wined3d: Move the occlusion query fields from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet 10 May '19

10 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 58 ++++++++++++++++++++++-------------------- dlls/wined3d/query.c | 20 +++++++-------- dlls/wined3d/wined3d_private.h | 20 ++++++++------- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 443c6d509a3..d1ae2ceb513 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -808,13 +808,14 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target } /* Context activation is done by the caller. */ -void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) +void wined3d_context_gl_alloc_occlusion_query(struct wined3d_context_gl *context_gl, + struct wined3d_occlusion_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; - if (context->free_occlusion_query_count) + if (context_gl->free_occlusion_query_count) { - query->id = context->free_occlusion_queries[--context->free_occlusion_query_count]; + query->id = context_gl->free_occlusion_queries[--context_gl->free_occlusion_query_count]; } else { @@ -823,7 +824,7 @@ void context_alloc_occlusion_query(struct wined3d_context *context, struct wined GL_EXTCALL(glGenQueries(1, &query->id)); checkGLcall("glGenQueries"); - TRACE("Allocated occlusion query %u in context %p.\n", query->id, context); + TRACE("Allocated occlusion query %u in context %p.\n", query->id, context_gl); } else { @@ -832,26 +833,26 @@ void context_alloc_occlusion_query(struct wined3d_context *context, struct wined } } - query->context = context; - list_add_head(&context->occlusion_queries, &query->entry); + query->context_gl = context_gl; + list_add_head(&context_gl->occlusion_queries, &query->entry); } -void context_free_occlusion_query(struct wined3d_occlusion_query *query) +void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) { - struct wined3d_context *context = query->context; + struct wined3d_context_gl *context_gl = query->context_gl; list_remove(&query->entry); - query->context = NULL; + query->context_gl = NULL; - if (!wined3d_array_reserve((void **)&context->free_occlusion_queries, - &context->free_occlusion_query_size, context->free_occlusion_query_count + 1, - sizeof(*context->free_occlusion_queries))) + if (!wined3d_array_reserve((void **)&context_gl->free_occlusion_queries, + &context_gl->free_occlusion_query_size, context_gl->free_occlusion_query_count + 1, + sizeof(*context_gl->free_occlusion_queries))) { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context); + ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context_gl); return; } - context->free_occlusion_queries[context->free_occlusion_query_count++] = query->id; + context_gl->free_occlusion_queries[context_gl->free_occlusion_query_count++] = query->id; } /* Context activation is done by the caller. */ @@ -1318,7 +1319,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_so_statistics_query *so_statistics_query; struct wined3d_timestamp_query *timestamp_query; - struct wined3d_occlusion_query *occlusion_query; struct fbo_entry *entry, *entry2; struct wined3d_fence *fence; HGLRC restore_ctx; @@ -1356,13 +1356,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) timestamp_query->context = NULL; } - LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry) - { - if (context->valid && gl_info->supported[ARB_OCCLUSION_QUERY]) - GL_EXTCALL(glDeleteQueries(1, &occlusion_query->id)); - occlusion_query->context = NULL; - } - LIST_FOR_EACH_ENTRY(fence, &context->fences, struct wined3d_fence, entry) { if (context->valid) @@ -1419,9 +1412,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) if (gl_info->supported[ARB_TIMER_QUERY]) GL_EXTCALL(glDeleteQueries(context->free_timestamp_query_count, context->free_timestamp_queries)); - if (gl_info->supported[ARB_OCCLUSION_QUERY]) - GL_EXTCALL(glDeleteQueries(context->free_occlusion_query_count, context->free_occlusion_queries)); - if (gl_info->supported[ARB_SYNC]) { for (i = 0; i < context->free_fence_count; ++i) @@ -1450,7 +1440,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) heap_free(context->free_so_statistics_queries); heap_free(context->free_pipeline_statistics_queries); heap_free(context->free_timestamp_queries); - heap_free(context->free_occlusion_queries); heap_free(context->free_fences); context_restore_pixel_format(context); @@ -1475,6 +1464,7 @@ void wined3d_context_cleanup(struct wined3d_context *context) void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; + struct wined3d_occlusion_query *occlusion_query; HGLRC restore_ctx; HDC restore_dc; @@ -1494,8 +1484,19 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->blit_vbo) GL_EXTCALL(glDeleteBuffers(1, &context_gl->blit_vbo)); + if (context_gl->free_occlusion_query_count) + GL_EXTCALL(glDeleteQueries(context_gl->free_occlusion_query_count, context_gl->free_occlusion_queries)); + checkGLcall("context cleanup"); } + heap_free(context_gl->free_occlusion_queries); + + LIST_FOR_EACH_ENTRY(occlusion_query, &context_gl->occlusion_queries, struct wined3d_occlusion_query, entry) + { + if (context_gl->c.valid) + GL_EXTCALL(glDeleteQueries(1, &occlusion_query->id)); + occlusion_query->context_gl = NULL; + } heap_free(context_gl->texture_type); @@ -1914,7 +1915,6 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d DWORD state; list_init(&context->timestamp_queries); - list_init(&context->occlusion_queries); list_init(&context->fences); list_init(&context->so_statistics_queries); list_init(&context->pipeline_statistics_queries); @@ -1994,6 +1994,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info = context->gl_info; d3d_info = context->d3d_info; + list_init(&context_gl->occlusion_queries); + for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i) context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d4e7cf5b37e..fb119451e56 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -538,7 +538,7 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD TRACE("query %p, flags %#x.\n", query, flags); - if (!(context = context_reacquire(device, oq->context))) + if (!(context = context_reacquire(device, &oq->context_gl->c))) { FIXME("%p Wrong thread, returning 1.\n", query); oq->samples = 1; @@ -642,7 +642,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD { if (oq->started) { - if ((context = context_reacquire(device, oq->context))) + if ((context = context_reacquire(device, &oq->context_gl->c))) { gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); @@ -651,17 +651,17 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD else { FIXME("Wrong thread, can't restart query.\n"); - context_free_occlusion_query(oq); + wined3d_context_gl_free_occlusion_query(oq); context = context_acquire(device, NULL, 0); - context_alloc_occlusion_query(context, oq); + wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); } } else { - if (oq->context) - context_free_occlusion_query(oq); + if (oq->context_gl) + wined3d_context_gl_free_occlusion_query(oq); context = context_acquire(device, NULL, 0); - context_alloc_occlusion_query(context, oq); + wined3d_context_gl_alloc_occlusion_query(wined3d_context_gl(context), oq); } gl_info = context->gl_info; @@ -678,7 +678,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD * so avoid generating an error. */ if (oq->started) { - if ((context = context_reacquire(device, oq->context))) + if ((context = context_reacquire(device, &oq->context_gl->c))) { gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); @@ -1097,8 +1097,8 @@ static void wined3d_occlusion_query_ops_destroy(struct wined3d_query *query) { struct wined3d_occlusion_query *oq = wined3d_occlusion_query_from_query(query); - if (oq->context) - context_free_occlusion_query(oq); + if (oq->context_gl) + wined3d_context_gl_free_occlusion_query(oq); heap_free(oq); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c308b315716..13f8b570cc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1786,7 +1786,7 @@ struct wined3d_occlusion_query struct list entry; GLuint id; - struct wined3d_context *context; + struct wined3d_context_gl *context_gl; UINT64 samples; BOOL started; }; @@ -1982,11 +1982,6 @@ struct wined3d_context DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */ /* Queries */ - GLuint *free_occlusion_queries; - SIZE_T free_occlusion_query_size; - unsigned int free_occlusion_query_count; - struct list occlusion_queries; - union wined3d_gl_fence_object *free_fences; SIZE_T free_fence_size; unsigned int free_fence_count; @@ -2031,6 +2026,13 @@ struct wined3d_context_gl GLenum *texture_type; + /* Queries. */ + struct list occlusion_queries; + + GLuint *free_occlusion_queries; + SIZE_T free_occlusion_query_size; + unsigned int free_occlusion_query_count; + GLuint blit_vbo; unsigned int tex_unit_map[WINED3D_MAX_COMBINED_SAMPLERS]; @@ -2054,6 +2056,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +void wined3d_context_gl_alloc_occlusion_query(struct wined3d_context_gl *context_gl, + struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, @@ -2061,6 +2065,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, @@ -2209,8 +2214,6 @@ BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSP struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void context_alloc_fence(struct wined3d_context *context, struct wined3d_fence *fence) DECLSPEC_HIDDEN; -void context_alloc_occlusion_query(struct wined3d_context *context, - struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, @@ -2236,7 +2239,6 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; -void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; -- 2.11.0

2 1