November 2018 - Wine-Commits

Zebediah Figura : oleaut32/tests: Add some tests for marshalling safe arrays.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 9d1b5fd44f1c25615ddf8790ba89bef1c92e7ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1b5fd44f1c25615ddf8790… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 10:20:01 2018 -0500 oleaut32/tests: Add some tests for marshalling safe arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 74 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 +++ 2 files changed, 78 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f219742..e3656d6 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1248,6 +1248,56 @@ static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, V return S_OK; } +static SAFEARRAY *make_safearray(ULONG len) +{ + SAFEARRAY *sa = SafeArrayCreateVector(VT_I4, 0, len); + int i, *data; + + SafeArrayAccessData(sa, (void **)&data); + for (i = 0; i < len; ++i) + data[i] = len + i; + SafeArrayUnaccessData(sa); + + return sa; +} + +static void check_safearray(SAFEARRAY *sa, LONG expect) +{ + LONG len, i, *data; + HRESULT hr; + + hr = SafeArrayGetUBound(sa, 1, &len); + len++; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == expect, "Expected len %d, got %d.\n", expect, len); + + hr = SafeArrayAccessData(sa, (void **)&data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < len; ++i) + ok(data[i] == len + i, "Expected data %d at %d, got %d.\n", len + i, i, data[i]); + + SafeArrayUnaccessData(sa); +} + +static HRESULT WINAPI Widget_safearray(IWidget *iface, SAFEARRAY *in, SAFEARRAY **out, SAFEARRAY **in_ptr, SAFEARRAY **in_out) +{ + HRESULT hr; + + check_safearray(in, 3); + ok(!*out, "Got array %p.\n", *out); + check_safearray(*in_ptr, 7); + check_safearray(*in_out, 9); + + hr = SafeArrayDestroy(*in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + *out = make_safearray(4); + *in_out = make_safearray(6); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1297,6 +1347,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_ptr, Widget_bstr, Widget_variant, + Widget_safearray, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2160,6 +2211,28 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); } +static void test_marshal_safearray(IWidget *widget, IDispatch *disp) +{ + SAFEARRAY *in, *out, *in_ptr, *in_out; + HRESULT hr; + + in = make_safearray(3); + out = make_safearray(5); + in_ptr = make_safearray(7); + in_out = make_safearray(9); + hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_safearray(in, 3); + check_safearray(out, 4); + check_safearray(in_ptr, 7); + check_safearray(in_out, 6); + + SafeArrayDestroy(in); + SafeArrayDestroy(out); + SafeArrayDestroy(in_ptr); + SafeArrayDestroy(in_out); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2758,6 +2831,7 @@ todo_wine test_marshal_iface(pWidget, pDispatch); test_marshal_bstr(pWidget, pDispatch); test_marshal_variant(pWidget, pDispatch); + test_marshal_safearray(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 16d2f9d..d630091 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -63,6 +63,7 @@ enum IWidget_dispids DISPID_TM_IFACE_PTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, + DISPID_TM_SAFEARRAY, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -267,6 +268,9 @@ library TestTypelib [id(DISPID_TM_VARIANT)] HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out); + + [id(DISPID_TM_SAFEARRAY)] + HRESULT safearray([in] SAFEARRAY(int) in, [out] SAFEARRAY(int) *out, [in] SAFEARRAY(int) *in_ptr, [in, out] SAFEARRAY(int) *in_out); } [

1 0

Nikolay Sivov : gdiplus: Return actual code on failed attempt to add a font.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 4aaa94111bbd56ee2bd3f6dd3bae9c4085f9b806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaa94111bbd56ee2bd3f6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:28 2018 +0300 gdiplus: Return actual code on failed attempt to add a font. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64778bb..74cd29b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1493,6 +1493,12 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) return NULL; } +struct add_font_param +{ + GpFontCollection *collection; + GpStatus stat; +}; + static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam); /***************************************************************************** @@ -1520,6 +1526,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, ret = InvalidParameter; else { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1533,8 +1540,9 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - ret = OutOfMemory; + param.collection = fontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) + ret = param.stat; DeleteDC(hdc); } @@ -1606,10 +1614,14 @@ void free_installed_fonts(void) static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - GpFontCollection* fonts = (GpFontCollection*)lParam; + struct add_font_param *param = (struct add_font_param *)lParam; + GpFontCollection *fonts = param->collection; GpFontFamily* family; + GpStatus stat; int i; + param->stat = Ok; + if (type == RASTER_FONTTYPE) return 1; @@ -1626,7 +1638,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) + { + param->stat = OutOfMemory; return 0; + } memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); heap_free(fonts->FontFamilies); @@ -1634,8 +1649,11 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) + if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) + { + param->stat = stat; return 0; + } /* skip duplicates */ for (i=0; i<fonts->count; i++) @@ -1662,6 +1680,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (installedFontCollection.count == 0) { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1671,11 +1690,12 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfFaceName[0] = 0; lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) + param.collection = &installedFontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts(); DeleteDC(hdc); - return OutOfMemory; + return param.stat; } DeleteDC(hdc);

1 0

Jacek Caban : widl: Add __int32 type support.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 2761fc91d0f23406b8ed8930325915eaa41ef6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2761fc91d0f23406b8ed8930… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 15:02:28 2018 +0100 widl: Add __int32 type support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 2 ++ tools/widl/header.c | 7 +++++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 7 +++++-- tools/widl/typegen.c | 4 +++- tools/widl/typelib.c | 1 + tools/widl/typetree.c | 1 + tools/widl/widltypes.h | 1 + 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index b461aee..2ed4aff 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -50,6 +50,7 @@ static int is_integer_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: @@ -82,6 +83,7 @@ static int is_signed_integer_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: return type_basic_get_sign(type) < 0; case TYPE_BASIC_CHAR: return TRUE; diff --git a/tools/widl/header.c b/tools/widl/header.c index 7681a3f..b8e11bb 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -369,6 +369,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_BASIC: if (type_basic_get_type(t) != TYPE_BASIC_INT32 && type_basic_get_type(t) != TYPE_BASIC_INT64 && + type_basic_get_type(t) != TYPE_BASIC_LONG && type_basic_get_type(t) != TYPE_BASIC_HYPER) { if (type_basic_get_sign(t) < 0) fprintf(h, "signed "); @@ -389,6 +390,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_BASIC_HANDLE: fprintf(h, "handle_t"); break; case TYPE_BASIC_INT32: if (type_basic_get_sign(t) > 0) + fprintf(h, "UINT32"); + else + fprintf(h, "INT32"); + break; + case TYPE_BASIC_LONG: + if (type_basic_get_sign(t) > 0) fprintf(h, "ULONG"); else fprintf(h, "LONG"); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a57ac64..342109e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -250,6 +250,7 @@ static const struct keyword keywords[] = { {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, + {"__int32", tINT32}, {"__int3264", tINT3264}, {"__int64", tINT64}, {"__pascal", tPASCAL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1cb9ab9..0f85498 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -208,7 +208,7 @@ static typelib_t *current_typelib; %token tIMPORT tIMPORTLIB %token tIN tIN_LINE tINLINE %token tINPUTSYNC -%token tINT tINT3264 tINT64 +%token tINT tINT32 tINT3264 tINT64 %token tINTERFACE %token tLCID %token tLENGTHIS tLIBRARY @@ -815,10 +815,11 @@ m_int: int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } | tSHORT m_int { $$ = type_new_int(TYPE_BASIC_INT16, 0); } | tSMALL { $$ = type_new_int(TYPE_BASIC_INT8, 0); } - | tLONG m_int { $$ = type_new_int(TYPE_BASIC_INT32, 0); } + | tLONG m_int { $$ = type_new_int(TYPE_BASIC_LONG, 0); } | tHYPER m_int { $$ = type_new_int(TYPE_BASIC_HYPER, 0); } | tINT64 { $$ = type_new_int(TYPE_BASIC_INT64, 0); } | tCHAR { $$ = type_new_int(TYPE_BASIC_CHAR, 0); } + | tINT32 { $$ = type_new_int(TYPE_BASIC_INT32, 0); } | tINT3264 { $$ = type_new_int(TYPE_BASIC_INT3264, 0); } ; @@ -1408,6 +1409,7 @@ static int is_allowed_range_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_BYTE: case TYPE_BASIC_CHAR: case TYPE_BASIC_WCHAR: @@ -2399,6 +2401,7 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_BASIC_INT32: case TYPE_BASIC_INT64: case TYPE_BASIC_INT: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6151b1c..ce4c578 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -208,7 +208,8 @@ unsigned char get_basic_fc(const type_t *type) { case TYPE_BASIC_INT8: return (sign <= 0 ? FC_SMALL : FC_USMALL); case TYPE_BASIC_INT16: return (sign <= 0 ? FC_SHORT : FC_USHORT); - case TYPE_BASIC_INT32: return (sign <= 0 ? FC_LONG : FC_ULONG); + case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: return (sign <= 0 ? FC_LONG : FC_ULONG); case TYPE_BASIC_INT64: return FC_HYPER; case TYPE_BASIC_INT: return (sign <= 0 ? FC_LONG : FC_ULONG); case TYPE_BASIC_INT3264: return (sign <= 0 ? FC_INT3264 : FC_UINT3264); @@ -234,6 +235,7 @@ static unsigned char get_basic_fc_signed(const type_t *type) case TYPE_BASIC_INT64: return FC_HYPER; case TYPE_BASIC_INT: return FC_LONG; case TYPE_BASIC_INT3264: return FC_INT3264; + case TYPE_BASIC_LONG: return FC_LONG; case TYPE_BASIC_BYTE: return FC_BYTE; case TYPE_BASIC_CHAR: return FC_CHAR; case TYPE_BASIC_WCHAR: return FC_WCHAR; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 3083839..9b1de2c 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -156,6 +156,7 @@ unsigned short get_type_vt(type_t *t) else return VT_INT; case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: case TYPE_BASIC_ERROR_STATUS_T: if (type_basic_get_sign(t) > 0) return VT_UI4; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index baf53a1..10657b0 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -377,6 +377,7 @@ static int is_valid_bitfield_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7891a1d..b4eb003 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -265,6 +265,7 @@ enum type_basic_type TYPE_BASIC_INT64, TYPE_BASIC_INT, TYPE_BASIC_INT3264, + TYPE_BASIC_LONG, TYPE_BASIC_CHAR, TYPE_BASIC_HYPER, TYPE_BASIC_BYTE,

1 0

Hans Leidekker : webservices: Don't use MSG_PEEK.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 481ee636c1cc627fb7b6c20263fea778dde000cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=481ee636c1cc627fb7b6c202… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 1 10:16:32 2018 +0100 webservices: Don't use MSG_PEEK. As suggested by Jacek. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 94c3dc1..b945c7f 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1150,27 +1150,21 @@ static void set_blocking( SOCKET socket, BOOL blocking ) ioctlsocket( socket, FIONBIO, &state ); } -static int sock_peek( SOCKET socket ) +static int sock_recv( SOCKET socket, char *buf, int len ) { - int ret; - char byte; + int count, ret; - set_blocking( socket, FALSE ); - ret = recv( socket, &byte, 1, MSG_PEEK ); - set_blocking( socket, TRUE ); - return ret; -} + if ((ret = recv( socket, buf, len, 0 )) <= 0) return ret; + len -= ret; -static int sock_recv( SOCKET socket, char *buf, int len ) -{ - int count, ret = 0; + set_blocking( socket, FALSE ); for (;;) { if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; ret += count; len -= count; - if (sock_peek( socket ) != 1) break; } + set_blocking( socket, TRUE ); return ret; }

1 0

Zebediah Figura : widl: Only mark simple [out] pointers as on-stack if they are [ref] pointers.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 481c408a0246de51fa5a2cacf0057bce109877be URL: https://source.winehq.org/git/wine.git/?a=commit;h=481c408a0246de51fa5a2cac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 30 18:23:21 2018 -0500 widl: Only mark simple [out] pointers as on-stack if they are [ref] pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0301024..9cee15b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2145,7 +2145,7 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, else fc = get_basic_fc(ref); - if (out_attr && !in_attr) + if (out_attr && !in_attr && pointer_fc == FC_RP) flags |= FC_ALLOCED_ON_STACK; print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n",

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in ffp_blit_supported().
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: ae0f03bac5963aa2a72fde36d627a475bb02d048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0f03bac5963aa2a72fde36… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:29 2018 +0330 wined3d: Prefer bind flags over usage flags in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e419097..133055b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2016,7 +2016,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 } } - if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE;

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in fbo_blitter_supported().
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 12d7bd5607ab5ad6d58d5ec6c34d435fad8cfebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d7bd5607ab5ad6d58d5ec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:28 2018 +0330 wined3d: Prefer bind flags over usage flags in fbo_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 40d8974..e419097 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -312,10 +312,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->bind_flags & WINED3D_BIND_RENDER_TARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->bind_flags & WINED3D_BIND_RENDER_TARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup)))

1 0

Jacek Caban : widl: Ignore -robust command line option.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 511b50e7bff5c67c9c928e47f4fbab66ddc0295c URL: https://source.winehq.org/git/wine.git/?a=commit;h=511b50e7bff5c67c9c928e47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 15:02:42 2018 +0100 widl: Ignore -robust command line option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index a38f917..96fb240 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,6 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" +" -robust Ignored, present for midl compatibility\n" " --winrt Enable Windows Runtime mode\n" " --ns_prefix Prefix namespaces with ABI namespace\n" " -s Generate server stub\n" @@ -163,7 +164,8 @@ enum { WIN64_OPTION, WIN32_ALIGN_OPTION, WIN64_ALIGN_OPTION, - APP_CONFIG_OPTION + APP_CONFIG_OPTION, + ROBUST_OPTION }; static const char short_options[] = @@ -179,6 +181,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "robust", 0, NULL, ROBUST_OPTION }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, @@ -609,6 +612,9 @@ int main(int argc,char *argv[]) /* widl does not distinguish between app_mode and default mode, but we ignore this option for midl compatibility */ break; + case ROBUST_OPTION: + /* FIXME: Support robust option */ + break; case 'b': set_target( optarg ); break;

1 0

Jacek Caban : ntdll: Remove no longer needed event handle from async_irp.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 9ee34a5d92510ea2899940036b035a6fb6c4fb04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ee34a5d92510ea289994003… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:41:11 2018 +0100 ntdll: Remove no longer needed event handle from async_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2b62206..4d2fa7a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -375,7 +375,6 @@ struct async_fileio_write struct async_irp { struct async_fileio io; - HANDLE event; /* async event */ void *buffer; /* buffer for output */ ULONG size; /* size of buffer */ }; @@ -568,7 +567,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = buffer; async->size = size; @@ -612,7 +610,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = NULL; async->size = 0; @@ -1522,7 +1519,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -3321,7 +3317,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, hFile ))) return STATUS_NO_MEMORY; - async->event = NULL; async->buffer = NULL; async->size = 0;

1 0

Jacek Caban : server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support.
by Alexandre Julliard Nov. 1, 2018

Nov. 1, 2018

Module: wine Branch: master Commit: 3dacf82173a142fbcf26dec59614481f27f91d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dacf82173a142fbcf26dec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:40:04 2018 +0100 server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/pipe.c | 4 ---- server/fd.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 622b5de..2b62206 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2661,8 +2661,8 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { FILE_IO_COMPLETION_NOTIFICATION_INFORMATION *info = ptr; - if (info->Flags & ~FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) - FIXME( "Unsupported completion flags %x\n", info->Flags ); + if (info->Flags & FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) + FIXME( "FILE_SKIP_SET_USER_EVENT_ON_FAST_IO not supported\n" ); SERVER_START_REQ( set_fd_completion_mode ) { diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 08bde6d..406d555 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1423,12 +1423,10 @@ static void test_completion(void) info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE; status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok(!is_signaled(client), "client is not signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf)); @@ -1439,12 +1437,10 @@ static void test_completion(void) ret = WriteFile(client, buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); CloseHandle(port); diff --git a/server/fd.c b/server/fd.c index 119fae6..fa174f5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1964,6 +1964,7 @@ int is_fd_removable( struct fd *fd ) /* set or clear the fd signaled state */ void set_fd_signaled( struct fd *fd, int signaled ) { + if (fd->comp_flags & FILE_SKIP_SET_EVENT_ON_HANDLE) return; fd->signaled = signaled; if (signaled) wake_up( fd->user, 0 ); } @@ -2647,7 +2648,9 @@ DECL_HANDLER(set_fd_completion_mode) { if (is_fd_overlapped( fd )) { - /* removing COMPLETION_SKIP_ON_SUCCESS is not allowed */ + if (req->flags & FILE_SKIP_SET_EVENT_ON_HANDLE) + set_fd_signaled( fd, 0 ); + /* removing flags is not allowed */ fd->comp_flags |= req->flags & ( FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_SET_USER_EVENT_ON_FAST_IO );

1 0