November 2019 - Wine-Devel - list.winehq.org

[PATCH] dmscript: Script track IPersistStream IsDirty return S_FALSE
by Alistair Leslie-Hughes Nov. 10, 2019

Nov. 10, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmscript/scripttrack.c | 2 +- dlls/dmscript/tests/dmscript.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index bc8e8ce595..47fe3ef0d2 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -277,7 +277,7 @@ static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID static HRESULT WINAPI IPersistStreamImpl_IsDirty(IPersistStream *iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index ef2c17c3ca..d372f39d9e 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -227,7 +227,7 @@ static void test_scripttrack(void) /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE); -- 2.24.0

2 1

[PATCH v2] dmband: Rename IDirectMusicTrack8Impl to band_track.
by Michael Stefaniuc Nov. 10, 2019

Nov. 10, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Reformat some parameter lists dlls/dmband/bandtrack.c | 79 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index eb62ec11ce..a0305bdb28 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -40,7 +40,7 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicBandTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, +static HRESULT WINAPI band_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * return S_OK; } -static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) return ref; } -static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref); @@ -88,15 +88,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) return ref; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, - IDirectMusicSegment *pSegment) +static HRESULT WINAPI band_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_InitPlay(IDirectMusicTrack8 *iface, IDirectMusicSegmentState *segment_state, IDirectMusicPerformance *performance, void **state_data, DWORD virtual_track8id, DWORD flags) { @@ -107,14 +106,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) +static HRESULT WINAPI band_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_Play(IDirectMusicTrack8 *iface, void *state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -133,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -141,7 +140,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, +static HRESULT WINAPI band_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -149,8 +148,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, - REFGUID rguidType) +static HRESULT WINAPI band_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -178,8 +176,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID notiftype) +static HRESULT WINAPI band_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -187,7 +184,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -196,7 +193,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, +static HRESULT WINAPI band_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -204,7 +201,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *state_data, +static HRESULT WINAPI band_track_PlayEx(IDirectMusicTrack8 *iface, void *state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD virtual_id) @@ -217,7 +214,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, +static HRESULT WINAPI band_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *rtNext, void *param, void *state_data, DWORD flags) { @@ -229,8 +226,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, - REFGUID rguidType, REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) +static HRESULT WINAPI band_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType, + REFERENCE_TIME rtTime, void *param, void *state_data, DWORD flags) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -240,7 +237,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac return S_OK; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, +static HRESULT WINAPI band_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **track) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -249,8 +246,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, - IDirectMusicTrack *pNewTrack, MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, +static HRESULT WINAPI band_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, + MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); @@ -259,24 +256,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { - IDirectMusicTrack8Impl_QueryInterface, - IDirectMusicTrack8Impl_AddRef, - IDirectMusicTrack8Impl_Release, - IDirectMusicTrack8Impl_Init, - IDirectMusicTrack8Impl_InitPlay, - IDirectMusicTrack8Impl_EndPlay, - IDirectMusicTrack8Impl_Play, - IDirectMusicTrack8Impl_GetParam, - IDirectMusicTrack8Impl_SetParam, - IDirectMusicTrack8Impl_IsParamSupported, - IDirectMusicTrack8Impl_AddNotificationType, - IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicTrack8Impl_Clone, - IDirectMusicTrack8Impl_PlayEx, - IDirectMusicTrack8Impl_GetParamEx, - IDirectMusicTrack8Impl_SetParamEx, - IDirectMusicTrack8Impl_Compose, - IDirectMusicTrack8Impl_Join + band_track_QueryInterface, + band_track_AddRef, + band_track_Release, + band_track_Init, + band_track_InitPlay, + band_track_EndPlay, + band_track_Play, + band_track_GetParam, + band_track_SetParam, + band_track_IsParamSupported, + band_track_AddNotificationType, + band_track_RemoveNotificationType, + band_track_Clone, + band_track_PlayEx, + band_track_GetParamEx, + band_track_SetParamEx, + band_track_Compose, + band_track_Join }; /* IDirectMusicBandTrack IPersistStream part: */ -- 2.20.1

1 0

[PATCH] wintrust/tests: Initialize cbStruct in the ObjectTrust tests.
by Sven Baars Nov. 10, 2019

Nov. 10, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This seems to fix the test failures on Windows 10. dlls/wintrust/tests/softpub.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 2a4f4f4b25..5a150e684d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -317,6 +317,8 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(NULL); */ + + data.cbStruct = sizeof(data); data.pSigState = &sig_state; data.pWintrustData = &wintrust_data; data.padwTrustStepErrors = -- 2.17.1

1 0

[PATCH] dinput: Mouse device doesn't support property DIPROP_VIDPID.
by Alistair Leslie-Hughes Nov. 10, 2019

Nov. 10, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/mouse.c | 3 ++- dlls/dinput/tests/mouse.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 52a766b2a1..08ace2f4e9 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -652,7 +652,8 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } - + case (DWORD_PTR) DIPROP_VIDPID: + return DIERR_UNSUPPORTED; default: return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph); } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 19d1c3708b..2e0b8cdf2e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,6 +198,14 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) /* Granularity of Y axis should be 1! */ ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + di_op.diph.dwHow = DIPH_DEVICE; + di_op.diph.dwObj = 0; + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_VIDPID, &di_op.diph); + ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr); + IUnknown_Release(pMouse); DestroyWindow( hwnd2 ); -- 2.24.0

2 1

[PATCH] dinput: Keyboard device doesn't support property DIPROP_VIDPID.
by Alistair Leslie-Hughes Nov. 10, 2019

Nov. 10, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/keyboard.c | 1 + dlls/dinput/tests/keyboard.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b5e665933e..47f28cac52 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -577,6 +577,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } + case (DWORD_PTR) DIPROP_VIDPID: case (DWORD_PTR) DIPROP_RANGE: return DIERR_UNSUPPORTED; default: diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 84e6fed078..1cd31e0318 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -258,6 +258,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) HRESULT hr; IDirectInputDeviceA *pKeyboard = NULL; DIPROPRANGE diprg; + DIPROPDWORD vidpid; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); @@ -272,6 +273,15 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); + memset(&vidpid, 0, sizeof(vidpid)); + vidpid.diph.dwSize = sizeof(DIPROPDWORD); + vidpid.diph.dwHeaderSize = sizeof(DIPROPHEADER); + vidpid.diph.dwHow = DIPH_DEVICE; + vidpid.diph.dwObj = 0; + + hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_VIDPID, &vidpid.diph); + ok(hr == DIERR_UNSUPPORTED, "got %08x\n", hr); + IUnknown_Release(pKeyboard); } -- 2.24.0

2 1

[PATCH] comctl32: cchTextMax in TVN_ENDLABELEDIT should be the full buffer size
by Damjan Jovanovic Nov. 9, 2019

Nov. 9, 2019

In Password Safe, when the user edits a tree view label, and removes brackets, the application wants to restore the original, longer string. It does this by editing pszText within the TVITEM. It determines the length of the buffer from cchTextMax. Windows passes 260 and all is well. Wine passes strlenW(pszText)+1, which is of minimal length, and trying to copy a longer string into it causes the MSVC runtime to falsely detect a buffer overflow and raise an exception, crashing the application. Let's pass 260 like Windows. Closes #16808. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/comctl32/tests/treeview.c | 8 +++++++- dlls/comctl32/treeview.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)

2 1

[PATCH] urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.
by Sven Baars Nov. 9, 2019

Nov. 9, 2019

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/urlmon/tests/protocol.c | 10 +++++++++- include/urlmon.idl | 4 +++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 85ef7d05c2..6ca13a1eff 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -92,6 +92,7 @@ DEFINE_EXPECT(GetBindString_USER_AGENT); DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(GetBindString_URL); DEFINE_EXPECT(GetBindString_ROOTDOC_URL); +DEFINE_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); DEFINE_EXPECT(QueryService_HttpSecurity); @@ -1508,6 +1509,10 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS case BINDSTRING_ENTERPRISE_ID: ok(cEl == 1, "cEl=%d, expected 1\n", cEl); return E_NOTIMPL; + case BINDSTRING_SAMESITE_COOKIE_LEVEL: + CHECK_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); + ok(cEl == 1, "cEl=%d, expected 1\n", cEl); + return E_NOTIMPL; default: ok(0, "unexpected ulStringType %d\n", ulStringType); } @@ -3375,8 +3380,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym SET_EXPECT(ReportProgress_CONNECTING); } SET_EXPECT(ReportProgress_SENDINGREQUEST); - if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) { SET_EXPECT(ReportProgress_REDIRECTING); + SET_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */ + } SET_EXPECT(ReportProgress_PROXYDETECTING); if(prot == HTTP_TEST) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); @@ -3439,6 +3446,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym CHECK_CALLED(ReportData); if(prot == HTTPS_TEST) CLEAR_CALLED(QueryService_HttpSecurity); + CLEAR_CALLED(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */ while(1) { if(bindf & BINDF_FROMURLMON) diff --git a/include/urlmon.idl b/include/urlmon.idl index f1088e7c99..fd8d6ce7bc 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -766,7 +766,9 @@ interface IInternetBindInfo : IUnknown BINDSTRING_INITIAL_FILENAME, BINDSTRING_PROXY_USERNAME, BINDSTRING_PROXY_PASSWORD, - BINDSTRING_ENTERPRISE_ID + BINDSTRING_ENTERPRISE_ID, + BINDSTRING_DOC_URL, + BINDSTRING_SAMESITE_COOKIE_LEVEL } BINDSTRING; HRESULT GetBindInfo( -- 2.17.1

2 2

Wineconf 2019
by paulo lesgaz Nov. 9, 2019

Nov. 9, 2019

Hello, will videos of wineconf 2019 be available? Thanks in advance

4 4

[PATCH v6 1/6] vbscript: Avoid special casing the global function when compiling a function's variables.
by Gabriel Ivăncescu Nov. 9, 2019

Nov. 9, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 79 ++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7b6649e..674b59e 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -56,7 +56,6 @@ typedef struct { dim_decl_t *dim_decls; dim_decl_t *dim_decls_tail; - dynamic_var_t *global_vars; const_decl_t *const_decls; const_decl_t *global_consts; @@ -1479,43 +1478,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(func->var_cnt) { dim_decl_t *dim_decl; + unsigned i; - if(func->type == FUNC_GLOBAL) { - dynamic_var_t *new_var; - - func->var_cnt = 0; - - for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { - new_var = compiler_alloc(ctx->code, sizeof(*new_var)); - if(!new_var) - return E_OUTOFMEMORY; - - new_var->name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!new_var->name) - return E_OUTOFMEMORY; - - V_VT(&new_var->v) = VT_EMPTY; - new_var->is_const = FALSE; - new_var->array = NULL; - - new_var->next = ctx->global_vars; - ctx->global_vars = new_var; - } - }else { - unsigned i; + func->vars = compiler_alloc(ctx->code, func->var_cnt * sizeof(var_desc_t)); + if(!func->vars) + return E_OUTOFMEMORY; - func->vars = compiler_alloc(ctx->code, func->var_cnt * sizeof(var_desc_t)); - if(!func->vars) + for(dim_decl = ctx->dim_decls, i=0; dim_decl; dim_decl = dim_decl->next, i++) { + func->vars[i].name = compiler_alloc_string(ctx->code, dim_decl->name); + if(!func->vars[i].name) return E_OUTOFMEMORY; - - for(dim_decl = ctx->dim_decls, i=0; dim_decl; dim_decl = dim_decl->next, i++) { - func->vars[i].name = compiler_alloc_string(ctx->code, dim_decl->name); - if(!func->vars[i].name) - return E_OUTOFMEMORY; - } - - assert(i == func->var_cnt); } + + assert(i == func->var_cnt); } if(func->array_cnt) { @@ -1809,12 +1784,13 @@ static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifi static HRESULT check_script_collisions(compile_ctx_t *ctx, script_ctx_t *script) { + unsigned i, var_cnt = ctx->code->main_code.var_cnt; + var_desc_t *vars = ctx->code->main_code.vars; class_desc_t *class; - dynamic_var_t *var; - for(var = ctx->global_vars; var; var = var->next) { - if(lookup_script_identifier(script, var->name)) { - FIXME("%s: redefined\n", debugstr_w(var->name)); + for(i = 0; i < var_cnt; i++) { + if(lookup_script_identifier(script, vars[i].name)) { + FIXME("%s: redefined\n", debugstr_w(vars[i].name)); return E_FAIL; } } @@ -1891,13 +1867,14 @@ static void release_compiler(compile_ctx_t *ctx) HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { + dynamic_var_t *global_vars, *var_iter; function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; - dynamic_var_t *var_iter; compile_ctx_t ctx; vbscode_t *code; size_t cnt; + unsigned i; HRESULT hres; if (!src) src = L""; @@ -1912,7 +1889,6 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli ctx.funcs = NULL; ctx.func_decls = NULL; - ctx.global_vars = NULL; ctx.classes = NULL; ctx.labels = NULL; ctx.global_consts = NULL; @@ -1952,9 +1928,24 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return compile_error(script, hres); } - cnt = script->global_vars_cnt; - for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) - cnt++; + global_vars = NULL; + for(i = ctx.code->main_code.var_cnt; i--;) { + dynamic_var_t *var = compiler_alloc(ctx.code, sizeof(*var)); + if(!var) { + release_compiler(&ctx); + return compile_error(script, E_OUTOFMEMORY); + } + + var->name = ctx.code->main_code.vars[i].name; + V_VT(&var->v) = VT_EMPTY; + var->is_const = FALSE; + var->array = NULL; + + var->next = global_vars; + global_vars = var; + } + + cnt = script->global_vars_cnt + ctx.code->main_code.var_cnt; if(cnt > script->global_vars_size) { dynamic_var_t **new_vars; if(script->global_vars) @@ -1982,7 +1973,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs_size = cnt; } - for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + for(var_iter = global_vars; var_iter; var_iter = var_iter->next) script->global_vars[script->global_vars_cnt++] = var_iter; for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { -- 2.21.0

2 8

Running make crosstest
by Thales Nov. 9, 2019

Nov. 9, 2019

Hello, I can't get the crosstest to be recognized by the configure script. I installed mingw-w64, and then ran configure in the wine64 (and wine32) build directories assuming it would create a "crosstest" target in the Makefiles. As it says here: https://wiki.winehq.org/Wine_Developer%27s_Guide/Writing_Conformance_Tests "When you have a MinGW-w64 environment installed all you need to do is rerun configure and it should detect the MinGW-w64 compiler and tools. Then run make crosstest to start building the tests." I've already created a little test for the comobox, but can't get the cross-compiler to work. I hope that I'm not asking too many questions! :-) Thanks for any feedback. Regards,...John Alway

2 1