October 2019 - Wine-Commits

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetRenderState().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: c9ee1b0b88043c390634eb266126854afaec6c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ee1b0b88043c390634eb26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:06 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ee5de2f06f..3d16812d59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2273,14 +2273,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi { wined3d_color_from_d3dcolor(&factor, value); wined3d_mutex_lock(); - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); + wined3d_stateblock_set_blend_factor(device->update_state, &factor); + if (!device->recording) + wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); wined3d_mutex_unlock(); return D3D_OK; } wined3d_mutex_lock(); - wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_stateblock_set_render_state(device->update_state, state, value); + if (!device->recording) + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_render_state().
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: d66b8592faab40ff3272880dde60f7c8da15122c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66b8592faab40ff3272880d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:04 2019 -0500 wined3d: Introduce wined3d_stateblock_set_render_state(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dae95ae46e..42d1d9d4d8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1419,6 +1419,21 @@ void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock * stateblock->changed.vertexDecl = TRUE; } +void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value) +{ + TRACE("stateblock %p, state %s (%#x), value %#x.\n", stateblock, debug_d3drenderstate(state), state, value); + + if (state > WINEHIGHEST_RENDER_STATE) + { + WARN("Unhandled render state %#x.\n", state); + return; + } + + stateblock->stateblock_state.rs[state] = value; + stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b65681f210..488b1c4e65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) +@ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f79cd212a1..8d13a245ad 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,8 @@ HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *st unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Jacek Caban : vbscript: Use global object property to expose Err object.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 087adea7dc503dadf55046622adf05d43555e822 URL: https://source.winehq.org/git/wine.git/?a=commit;h=087adea7dc503dadf5504662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:03 2019 +0200 vbscript: Use global object property to expose Err object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 16 ++++++++++++++++ dlls/vbscript/interp.c | 8 -------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 50f54f38a6..0f85f66bad 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2486,6 +2486,21 @@ static HRESULT Global_GetRef(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, return E_NOTIMPL; } +static HRESULT Global_Err(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +{ + TRACE("\n"); + + if(args_cnt) { + FIXME("Setter not supported\n"); + return E_NOTIMPL; + } + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = &This->ctx->err_obj->IDispatch_iface; + IDispatch_AddRef(V_DISPATCH(res)); + return S_OK; +} + static const string_constant_t vbCr = {1, {'\r'}}; static const string_constant_t vbCrLf = {2, {'\r','\n'}}; static const string_constant_t vbNewLine = {2, {'\r','\n'}}; @@ -2526,6 +2541,7 @@ static const builtin_prop_t global_props[] = { {L"DateValue", Global_DateValue, 0, 1}, {L"Day", Global_Day, 0, 1}, {L"Erase", Global_Erase, 0, 1}, + {L"Err", Global_Err, BP_GETPUT}, {L"Escape", Global_Escape, 0, 1}, {L"Eval", Global_Eval, 0, 1}, {L"Execute", Global_Execute, 0, 1}, diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45dcb45303..251fd785cf 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -104,8 +104,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - static const WCHAR errW[] = {'e','r','r',0}; - if(invoke_type == VBDISP_LET && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) && !wcsicmp(name, ctx->func->name)) { @@ -175,12 +173,6 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(!wcsicmp(name, errW)) { - ref->type = REF_OBJ; - ref->u.obj = &ctx->script->err_obj->IDispatch_iface; - return S_OK; - } - hres = get_builtin_id(ctx->script->global_obj, name, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP;

1 0

Jacek Caban : vbscript: Fix NULL IDispatch handling in get_disp_value.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 79f39c2a8c450ece6f128a27182373971ef1246d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f39c2a8c450ece6f128a27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:09 2019 +0200 vbscript: Fix NULL IDispatch handling in get_disp_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 23 ++++++++++++++--------- dlls/vbscript/tests/lang.vbs | 22 ++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 2 ++ dlls/vbscript/vbscript.rc | 1 + dlls/vbscript/vbscript_defs.h | 1 + 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 251fd785cf..80ecc41699 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -319,7 +319,7 @@ static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *r) HRESULT hres; hres = get_disp_value(ctx->script, V_DISPATCH(r->v), &r->store); - if(r->owned) + if(r->owned && V_DISPATCH(r->v)) IDispatch_Release(V_DISPATCH(r->v)); if(FAILED(hres)) return hres; @@ -350,7 +350,8 @@ static HRESULT stack_assume_val(exec_ctx_t *ctx, unsigned n) disp = V_DISPATCH(v); hres = get_disp_value(ctx->script, disp, v); - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; } @@ -688,23 +689,27 @@ static HRESULT interp_mcallv(exec_ctx_t *ctx) static HRESULT assign_value(exec_ctx_t *ctx, VARIANT *dst, VARIANT *src, WORD flags) { + VARIANT value; HRESULT hres; - hres = VariantCopyInd(dst, src); + V_VT(&value) = VT_EMPTY; + hres = VariantCopyInd(&value, src); if(FAILED(hres)) return hres; - if(V_VT(dst) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { - VARIANT value; + if(V_VT(&value) == VT_DISPATCH && !(flags & DISPATCH_PROPERTYPUTREF)) { + IDispatch *disp = V_DISPATCH(&value); - hres = get_disp_value(ctx->script, V_DISPATCH(dst), &value); - IDispatch_Release(V_DISPATCH(dst)); + V_VT(&value) = VT_EMPTY; + hres = get_disp_value(ctx->script, disp, &value); + if(disp) + IDispatch_Release(disp); if(FAILED(hres)) return hres; - - *dst = value; } + VariantClear(dst); + *dst = value; return S_OK; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5d9fb80617..6ddb2e79f5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1354,6 +1354,28 @@ end class set x = new RegExp Call ok(x.Global = false, "x.Global = " & x.Global) +sub test_nothing_errors + dim x + on error resume next + + x = 1 + err.clear + x = nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = not nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) + + err.clear + x = "" & nothing + call ok(err.number = 91, "err.number = " & err.number) + call ok(x = 1, "x = " & x) +end sub +call test_nothing_errors() + sub test_identifiers ' test keywords that can also be a declared identifier Dim default diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index cb902b9bc5..1dd6d4ed05 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -967,6 +967,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, HRESULT get_disp_value(script_ctx_t *ctx, IDispatch *disp, VARIANT *v) { DISPPARAMS dp = {NULL}; + if(!disp) + return MAKE_VBSERROR(VBSE_OBJECT_VARIABLE_NOT_SET); return disp_call(ctx, disp, DISPID_VALUE, &dp, v); } diff --git a/dlls/vbscript/vbscript.rc b/dlls/vbscript/vbscript.rc index e1d84501ba..360b1006d6 100644 --- a/dlls/vbscript/vbscript.rc +++ b/dlls/vbscript/vbscript.rc @@ -37,6 +37,7 @@ STRINGTABLE VBSE_PERMISSION_DENIED "Permission denied" VBSE_PATH_FILE_ACCESS "Path/File access error" VBSE_PATH_NOT_FOUND "Path not found" + VBSE_OBJECT_VARIABLE_NOT_SET "Object variable not set" VBSE_ILLEGAL_NULL_USE "Invalid use of Null" VBSE_CANT_CREATE_TMP_FILE "Can't create necessary temporary file" VBSE_CANT_CREATE_OBJECT "ActiveX component can't create object" diff --git a/dlls/vbscript/vbscript_defs.h b/dlls/vbscript/vbscript_defs.h index 42c1ff5786..44f005b640 100644 --- a/dlls/vbscript/vbscript_defs.h +++ b/dlls/vbscript/vbscript_defs.h @@ -250,6 +250,7 @@ #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_OBJECT_VARIABLE_NOT_SET 91 #define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_CANT_CREATE_TMP_FILE 322 #define VBSE_CANT_CREATE_OBJECT 429

1 0

Jacek Caban : vbscript: Store safety options only in script context.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: ad8917c6b709572b442b25a09fb48b6b99cdfb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8917c6b709572b442b25a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:18 2019 +0200 vbscript: Store safety options only in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/vbscript.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 976e751919..ae36e91588 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -51,7 +51,6 @@ struct VBScript { LONG ref; - DWORD safeopt; SCRIPTSTATE state; IActiveScriptSite *site; script_ctx_t *ctx; @@ -752,7 +751,6 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_UNEXPECTED; This->is_initialized = TRUE; - This->ctx->safeopt = This->safeopt; return This->site ? set_ctx_site(This) : S_OK; } @@ -914,7 +912,7 @@ static HRESULT WINAPI VBScriptSafety_GetInterfaceSafetyOptions(IObjectSafety *if return E_POINTER; *pdwSupportedOptions = SUPPORTED_OPTIONS; - *pdwEnabledOptions = This->safeopt; + *pdwEnabledOptions = This->ctx->safeopt; return S_OK; } @@ -928,7 +926,7 @@ static HRESULT WINAPI VBScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *if if(dwOptionSetMask & ~SUPPORTED_OPTIONS) return E_FAIL; - This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; + This->ctx->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->ctx->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; return S_OK; } @@ -960,7 +958,6 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->ref = 1; ret->state = SCRIPTSTATE_UNINITIALIZED; - ret->safeopt = INTERFACE_USES_DISPEX; ctx = ret->ctx = heap_alloc_zero(sizeof(*ctx)); if(!ctx) {

1 0

Jacek Caban : vbscript/tests: Add more named items tests.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: f449c361ce4e05025adc1a339033a6c761f3ed43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f449c361ce4e05025adc1a33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 16:20:50 2019 +0200 vbscript/tests: Add more named items tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/vbscript.c | 206 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f449c361ce4e05025adc…

1 0

Paul Gofman : wined3d: Upload 3d GL textures per-slice when conversion is involved.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 06909230c42e5e9533a2d75ef54cb91b0efc1ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06909230c42e5e9533a2d75e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:55 2019 +0300 wined3d: Upload 3d GL textures per-slice when conversion is involved. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 62 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d103581b8d..17b71c5738 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1975,8 +1975,6 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, unsigned int update_h = src_box->bottom - src_box->top; unsigned int update_d = src_box->back - src_box->front; struct wined3d_bo_address bo; - void *converted_mem = NULL; - struct wined3d_format_gl f; unsigned int level; BOOL decompress; GLenum target; @@ -2050,7 +2048,10 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, { const struct wined3d_format *compressed_format = src_format; unsigned int dst_row_pitch, dst_slice_pitch; - void *src_mem; + struct wined3d_format_gl f; + void *converted_mem; + unsigned int z; + BYTE *src_mem; if (decompress) { @@ -2068,9 +2069,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - /* Note that uploading 3D textures may require quite some address - * space; it may make sense to upload them per-slice instead. */ - if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) + if (!(converted_mem = heap_alloc(dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); return; @@ -2078,35 +2077,40 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (decompress) - compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - else - src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); - bo.buffer_object = 0; - bo.addr = converted_mem; - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - } + for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) + { + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + else + src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); - checkGLcall("glBindBuffer"); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, + dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + } + + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + heap_free(converted_mem); } + else + { + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); + checkGLcall("glBindBuffer"); + } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, + dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } } - heap_free(converted_mem); if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) {

1 0

Alistair Leslie-Hughes : include: Add COM_DECLSPEC_NOTHROW define.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 2ef00173e1d770b336597f9618f8272cefec727b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef00173e1d770b336597f96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 18 02:48:15 2019 +0000 include: Add COM_DECLSPEC_NOTHROW define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/basetyps.h | 11 +++++++++-- include/objbase.h | 14 ++++++++++---- include/winnt.h | 10 ++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/include/basetyps.h b/include/basetyps.h index 94875334b0..82b25b7a17 100644 --- a/include/basetyps.h +++ b/include/basetyps.h @@ -40,9 +40,16 @@ #define STDMETHODIMPV_(t) t STDMETHODVCALLTYPE #if defined(__cplusplus) && !defined(CINTERFACE) + +#ifdef COM_STDMETHOD_CAN_THROW +# define COM_DECLSPEC_NOTHROW +#else +# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW +#endif + # define interface struct -# define STDMETHOD(m) virtual HRESULT STDMETHODCALLTYPE m -# define STDMETHOD_(t,m) virtual t STDMETHODCALLTYPE m +# define STDMETHOD(m) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE m +# define STDMETHOD_(t,m) virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE m # define PURE =0 # define THIS_ # define THIS void diff --git a/include/objbase.h b/include/objbase.h index a241b71199..78ec6d366d 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -172,12 +172,18 @@ #if defined(__cplusplus) && !defined(CINTERFACE) +#ifdef COM_STDMETHOD_CAN_THROW +# define COM_DECLSPEC_NOTHROW +#else +# define COM_DECLSPEC_NOTHROW DECLSPEC_NOTHROW +#endif + /* C++ interface */ -#define STDMETHOD(method) virtual HRESULT STDMETHODCALLTYPE method -#define STDMETHOD_(type,method) virtual type STDMETHODCALLTYPE method -#define STDMETHODV(method) virtual HRESULT STDMETHODVCALLTYPE method -#define STDMETHODV_(type,method) virtual type STDMETHODVCALLTYPE method +#define STDMETHOD(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODCALLTYPE method +#define STDMETHOD_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODCALLTYPE method +#define STDMETHODV(method) virtual COM_DECLSPEC_NOTHROW HRESULT STDMETHODVCALLTYPE method +#define STDMETHODV_(type,method) virtual COM_DECLSPEC_NOTHROW type STDMETHODVCALLTYPE method #define PURE = 0 #define THIS_ diff --git a/include/winnt.h b/include/winnt.h index 3f59bd9f30..9c39eb7e4d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -76,6 +76,16 @@ extern "C" { # endif #endif +#ifndef DECLSPEC_NOTHROW +# if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) +# define DECLSPEC_NOTHROW __declspec(nothrow) +# elif defined(__GNUC__) +# define DECLSPEC_NOTHROW __attribute__((nothrow)) +# else +# define DECLSPEC_NOTHROW +# endif +#endif + #ifndef DECLSPEC_CACHEALIGN # define DECLSPEC_CACHEALIGN DECLSPEC_ALIGN(128) #endif

1 0

Vijay Kiran Kamuju : msvcrt: Implement %u format for strftime.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: 679cdc4010e8ab7d500b43d19a4a1d04e392c0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=679cdc4010e8ab7d500b43d1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 18 11:58:59 2019 +0200 msvcrt: Implement %u format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 5 +++++ dlls/ucrtbase/tests/misc.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0eecfd6796..cf79e5971e 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -653,6 +653,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%u", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b299976d3f..588f724cf7 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,6 +1264,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; + case 'u': + tmp = mstm->tm_wday ? mstm->tm_wday : 7; + if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) + return 0; + break; #endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fe59e30062..da2e7d34ca 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -901,6 +901,7 @@ static void test_asctime(void) static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; @@ -948,6 +949,10 @@ static void test_strftime(void) ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%u", &tm1); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "7"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);

1 0

Sven Baars : kernel32/tests: Remove a test that shows inconsistent results.
by Alexandre Julliard Oct. 18, 2019

Oct. 18, 2019

Module: wine Branch: master Commit: aaaaec86426c8a51fe242dad96a3457bac76d942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaaaec86426c8a51fe242dad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 18 14:38:38 2019 +0200 kernel32/tests: Remove a test that shows inconsistent results. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index cba0a3f281..f181536e7a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2455,11 +2455,6 @@ static void test_IsProcessInJob(void) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); - out = TRUE; - ret = pIsProcessInJob(pi.hProcess, NULL, &out); - ok(ret, "IsProcessInJob error %u\n", GetLastError()); - ok(!out, "IsProcessInJob returned out=%u\n", out); - ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());

1 0