August 2018 - Wine-commits - list.winehq.org

Michael Stefaniuc : sane.ds: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 7d550de26391cfe4234568ddffab6a942319dc6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d550de26391cfe4234568dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:25 2018 +0200 sane.ds: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 45c54a1..094bb93 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -844,7 +844,6 @@ static const supported_size_t supported_sizes[] = { TWSS_USEXECUTIVE, 184.15, 266.7 }, { TWSS_A3, 297, 420 }, }; -#define SUPPORTED_SIZE_COUNT (sizeof(supported_sizes) / sizeof(supported_sizes[0])) static TW_UINT16 get_default_paper_size(const supported_size_t *s, int n) { @@ -920,11 +919,11 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 TW_UINT16 twCC = TWCC_BADCAP; #ifdef SONAME_LIBSANE - static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; + static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)]; unsigned int i; TW_UINT32 val; - TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); - TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); + TW_UINT16 default_size = get_default_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); + TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); TRACE("ICAP_SUPPORTEDSIZES\n"); @@ -946,7 +945,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -960,7 +959,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_RESET: twCC = TWCC_BADCAP; - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == default_size) { twCC = set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -976,7 +975,6 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; } -#undef SUPPORTED_SIZE_COUNT #endif return twCC; }

1 0

Michael Stefaniuc : sane.ds: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 4e18649c4873f467acca37ff372d83ddd0abfa73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e18649c4873f467acca37ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:26 2018 +0200 sane.ds: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 14 +++++++------- dlls/sane.ds/ui.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 094bb93..9157cae 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -174,7 +174,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) TW_UINT32 i; a = GlobalLock (pCapability->hContainer); a->ItemType = TWTY_UINT16; - a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); + a->NumItems = ARRAY_SIZE(supported_caps); u = (UINT16 *) a->ItemList; for (i = 0; i < a->NumItems; i++) u[i] = supported_caps[i]; @@ -203,7 +203,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.capXferMech, TWSX_NATIVE); break; @@ -482,7 +482,7 @@ static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.sane_param.depth, activeDS.sane_param.depth); break; @@ -536,7 +536,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, TWCP_NONE, TWCP_NONE); FIXME("Partial stub: We don't attempt to support compression\n"); break; @@ -731,7 +731,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, flavor, flavor); break; @@ -935,9 +935,9 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; case MSG_GET: - for (i = 0; i < sizeof(supported_sizes) / sizeof(supported_sizes[0]); i++) + for (i = 0; i < ARRAY_SIZE(supported_sizes); i++) possible_values[i] = supported_sizes[i].size; - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, current_size, default_size); WARN("Partial Stub: our supported size selection is a bit thin.\n"); break; diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index fe1988a..8a2890c 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -639,7 +639,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else return; buffer[len++] = ' '; - LoadStringW( SANE_instance, opt->unit, buffer + len, sizeof(buffer)/sizeof(WCHAR) - len ); + LoadStringW( SANE_instance, opt->unit, buffer + len, ARRAY_SIZE( buffer ) - len ); edit_w = GetDlgItem(hwnd,index+ID_BASE+ID_EDIT_BASE); if (edit_w) SetWindowTextW(edit_w,buffer);

1 0

Michael Stefaniuc : ieframe: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 5e96cd7244f686433017bfb0df1f9387e0276f54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e96cd7244f686433017bfb0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:29 2018 +0200 ieframe: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe_main.c | 2 +- dlls/ieframe/iexplore.c | 10 +++++----- dlls/ieframe/intshcut.c | 4 ++-- dlls/ieframe/navigate.c | 10 +++++----- dlls/ieframe/oleobject.c | 2 +- dlls/ieframe/shellbrowser.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 424868d..d22ad3d 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -428,7 +428,7 @@ static void update_travellog(DocHost *This) static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; - if(This->url && !strncmpiW(This->url, about_schemeW, sizeof(about_schemeW)/sizeof(*about_schemeW))) { + if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { TRACE("Skipping about URL\n"); return; } diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index a862f9a..e207ce0 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -91,7 +91,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + for(i=0; i < ARRAY_SIZE(typeinfos); i++) { if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); } diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index aac1436..1a83ee3 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -263,7 +263,7 @@ static void add_tbs_to_menu(HMENU menu) WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; WCHAR guid[39]; - DWORD value_len = sizeof(guid)/sizeof(guid[0]); + DWORD value_len = ARRAY_SIZE(guid); int i; if(SHRegOpenUSKeyW(classes_key, KEY_READ, NULL, &classes_handle, TRUE) != ERROR_SUCCESS) @@ -276,11 +276,11 @@ static void add_tbs_to_menu(HMENU menu) for(i = 0; SHRegEnumUSValueW(toolbar_handle, i, guid, &value_len, NULL, NULL, NULL, SHREGENUM_HKLM) == ERROR_SUCCESS; i++) { WCHAR tb_name[100]; - DWORD tb_name_len = sizeof(tb_name)/sizeof(tb_name[0]); + DWORD tb_name_len = ARRAY_SIZE(tb_name); HUSKEY tb_class_handle; MENUITEMINFOW item; LSTATUS ret; - value_len = sizeof(guid)/sizeof(guid[0]); + value_len = ARRAY_SIZE(guid); if(lstrlenW(guid) != 38) { @@ -418,7 +418,7 @@ static void add_tb_button(InternetExplorer *ie, int bmp, int cmd, int strId) TBBUTTON btn; WCHAR buf[30]; - LoadStringW(ieframe_instance, strId, buf, sizeof(buf)/sizeof(buf[0])); + LoadStringW(ieframe_instance, strId, buf, ARRAY_SIZE(buf)); btn.iBitmap = bmp; btn.idCommand = cmd; @@ -445,7 +445,7 @@ static void create_rebar(InternetExplorer *ie) HIMAGELIST imagelist; SIZE toolbar_size; - LoadStringW(ieframe_instance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0])); + LoadStringW(ieframe_instance, IDS_ADDRESS, addr, ARRAY_SIZE(addr)); hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, 0, 0, 0, 0, diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 2376b1b..4331bb9 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -93,7 +93,7 @@ static BOOL run_winemenubuilder( const WCHAR *args ) WCHAR app[MAX_PATH]; void *redir; - GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder )); strcatW( app, menubuilder ); len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); @@ -278,7 +278,7 @@ static HRESULT WINAPI UniformResourceLocatorW_InvokeCommand(IUniformResourceLoca return E_NOTIMPL; } - hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, app, ARRAY_SIZE(app), NULL, 0); if(FAILED(hres)) return E_FAIL; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 658857f..96fb083 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -111,7 +111,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR fmt[0] = 0; /* the format string must have one "%s" for the str */ LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN); - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), fmt, str); + snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str); } V_VT(&arg) = VT_BSTR; @@ -576,7 +576,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data DISPPARAMS dispparams; VARIANTARG params[7]; WCHAR file_path[MAX_PATH]; - DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); + DWORD file_path_len = ARRAY_SIZE(file_path); dispparams.cArgs = 7; dispparams.cNamedArgs = 0; @@ -642,7 +642,7 @@ static BOOL try_application_url(LPCWSTR url) static const WCHAR wszURLProtocol[] = {'U','R','L',' ','P','r','o','t','o','c','o','l',0}; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, app, ARRAY_SIZE(app), NULL, 0); if(FAILED(hres)) return FALSE; @@ -674,7 +674,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) if(PathIsURLW(url)) return CreateURLMoniker(NULL, url, mon); - size = sizeof(new_url)/sizeof(WCHAR); + size = ARRAY_SIZE(new_url); hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); if(FAILED(hres)) { @@ -978,7 +978,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, }else { DWORD size; - size = sizeof(new_url)/sizeof(WCHAR); + size = ARRAY_SIZE(new_url); hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); if(FAILED(hres)) { diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 1ff9a92..22fe4b1 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -385,7 +385,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB if(pceltFetched) *pceltFetched = 0; - if(This->iter == sizeof(verbs)/sizeof(*verbs)) + if(This->iter == ARRAY_SIZE(verbs)) return S_FALSE; if(celt) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index f75689e..78e0e85 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -658,7 +658,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( VARIANT_BOOL cancel = VARIANT_FALSE; SAFEARRAY *post_data; WCHAR file_path[MAX_PATH]; - DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); + DWORD file_path_len = ARRAY_SIZE(file_path); TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData,

1 0

Michael Stefaniuc : wineandroid.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: ccf6211c0ae6e86218f7e6c1f2fe725a23e568b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf6211c0ae6e86218f7e6c1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Aug 16 20:19:30 2018 +0200 wineandroid.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/keyboard.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 0ccae11..20519e2 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1363,7 +1363,7 @@ static int perform( ANativeWindow *window, int operation, ... ) case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: default: FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, - operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + operation < ARRAY_SIZE( names ) ? names[operation] : "???" ); break; } va_end( args ); @@ -1419,7 +1419,7 @@ void release_ioctl_window( struct ANativeWindow *window ) if (InterlockedDecrement( &win->ref ) > 0) return; TRACE( "%p %p\n", win, win->hwnd ); - for (i = 0; i < sizeof(win->buffers)/sizeof(win->buffers[0]); i++) + for (i = 0; i < ARRAY_SIZE( win->buffers ); i++) if (win->buffers[i]) win->buffers[i]->buffer.common.decRef( &win->buffers[i]->buffer.common ); destroy_ioctl_window( win->hwnd, win->opengl ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 0dd3e5e..da8fba3 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -677,7 +677,7 @@ static BOOL process_attach(void) load_android_libs(); (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); class = (*jni_env)->GetObjectClass( jni_env, object ); - (*jni_env)->RegisterNatives( jni_env, class, methods, sizeof(methods)/sizeof(methods[0]) ); + (*jni_env)->RegisterNatives( jni_env, class, methods, ARRAY_SIZE( methods )); (*jni_env)->DeleteLocalRef( jni_env, class ); #ifdef __i386__ wine_set_fs( old_fs ); /* the Java VM hijacks %fs for its own purposes, restore it */ diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3167d54..2c37c42 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -638,7 +638,7 @@ static UINT scancode_to_vkey( UINT scan ) { UINT j; - for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_to_scancode ); j++) if (vkey_to_scancode[j] == scan) return j; return 0; @@ -648,7 +648,7 @@ static const char* vkey_to_name( UINT vkey ) { UINT j; - for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_names ); j++) if (vkey_names[j].vkey == vkey) return vkey_names[j].name; return NULL; @@ -724,7 +724,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k { union event_data data; - if ((unsigned int)keycode >= sizeof(keycode_to_vkey)/sizeof(keycode_to_vkey[0]) || + if ((unsigned int)keycode >= ARRAY_SIZE( keycode_to_vkey ) || !keycode_to_vkey[keycode]) { p__android_log_print( ANDROID_LOG_WARN, "wine", @@ -931,7 +931,7 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) code = VK_LMENU; break; } - if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX: @@ -993,7 +993,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) { SHORT ret = -1; - if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + if (ch < ARRAY_SIZE( char_vkey_map )) ret = char_vkey_map[ch]; TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); return ret; }

1 0

Jacek Caban : kernel32: Add AttachConsole implementation.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 57212f64f8e4fef0c63c633940e13d407c0f2069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57212f64f8e4fef0c63c6339… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 9 18:40:49 2018 +0200 kernel32: Add AttachConsole implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41573 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43910 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 +++++- dlls/kernel32/tests/console.c | 131 ++++++++++++++++++++++++++++++++++++++--- include/wine/server_protocol.h | 21 ++++++- server/console.c | 43 ++++++++++++++ server/protocol.def | 10 ++++ server/request.h | 8 +++ server/trace.c | 17 ++++++ 7 files changed, 238 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57212f64f8e4fef0c63c…

1 0

Nikolay Sivov : d2d1: Fix scaling when rendering text in bitmap mode.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 32b35f8000c03de7ca4e30be4d1b54605530562a URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b35f8000c03de7ca4e30be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 16 16:43:28 2018 +0430 d2d1: Fix scaling when rendering text in bitmap mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 67b3fab..cb7e8a5 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1107,10 +1107,9 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { - D2D1_MATRIX_3X2_F prev_transform, *transform; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1119,10 +1118,11 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; IDWriteFactory2 *dwrite_factory; - DWRITE_GLYPH_RUN scaled_run; + D2D1_MATRIX_3X2_F *transform, m; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; + float scale_x, scale_y; D2D1_RECT_F run_rect; RECT bounds; HRESULT hr; @@ -1134,12 +1134,21 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - scaled_run = *glyph_run; - scaled_run.fontEmSize *= ppd; - hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, - (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, - baseline_origin.y, &analysis); + transform = &render_target->drawing_state.transform; + + scale_x = render_target->desc.dpiX / 96.0f; + m._11 = transform->_11 * scale_x; + m._21 = transform->_21 * scale_x; + m._31 = transform->_31 * scale_x; + + scale_y = render_target->desc.dpiY / 96.0f; + m._12 = transform->_12 * scale_y; + m._22 = transform->_22 * scale_y; + m._32 = transform->_32 * scale_y; + + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m, + rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, + baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) { @@ -1194,13 +1203,16 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + d2d_rect_set(&run_rect, bounds.left / scale_x, bounds.top / scale_y, + bounds.right / scale_x, bounds.bottom / scale_y); + brush_desc.opacity = 1.0f; brush_desc.transform._11 = 1.0f; brush_desc.transform._12 = 0.0f; brush_desc.transform._21 = 0.0f; brush_desc.transform._22 = 1.0f; - brush_desc.transform._31 = bounds.left; - brush_desc.transform._32 = bounds.top; + brush_desc.transform._31 = run_rect.left; + brush_desc.transform._32 = run_rect.top; if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { @@ -1208,19 +1220,17 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } - d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom); if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr); goto done; } - transform = &render_target->drawing_state.transform; - prev_transform = *transform; + m = *transform; *transform = identity; d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), unsafe_impl_from_ID2D1Brush((ID2D1Brush *)opacity_brush)); - *transform = prev_transform; + *transform = m; done: if (geometry) @@ -1242,7 +1252,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; HRESULT hr; - float ppd; TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode); @@ -1298,11 +1307,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg ; } - ppd = max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f; if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) { if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - ppd, measuring_mode, rendering_params, &rendering_mode))) + max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f, + measuring_mode, rendering_params, &rendering_mode))) { ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; @@ -1313,7 +1322,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode, antialias_mode); + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface,

1 0

Nikolay Sivov : dwrite: Multiply run analysis transform by dpi scale factor.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 7e0d10250c17457d9b73118ef6eba066e9e71daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0d10250c17457d9b73118e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 16 13:34:44 2018 +0300 dwrite: Multiply run analysis transform by dpi scale factor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 +-- dlls/dwrite/font.c | 17 ++++++----- dlls/dwrite/main.c | 67 +++++++++++++++++++++++++++----------------- 3 files changed, 50 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 31b977a..a19380a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -117,9 +117,7 @@ struct glyphrunanalysis_desc DWRITE_MEASURING_MODE measuring_mode; DWRITE_GRID_FIT_MODE gridfit_mode; DWRITE_TEXT_ANTIALIAS_MODE aa_mode; - FLOAT origin_x; - FLOAT origin_y; - FLOAT ppdip; + D2D_POINT_2F origin; }; struct fontface_desc diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9556fd3..5fc0de7 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5397,7 +5397,6 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->max_glyph_bitmap_size = 0; SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; - analysis->run.fontEmSize *= desc->ppdip; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_alloc(desc->run->glyphCount * sizeof(*analysis->glyphs)); analysis->origins = heap_alloc(desc->run->glyphCount * sizeof(*analysis->origins)); @@ -5433,14 +5432,14 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit if (FAILED(hr = IDWriteFontFace_QueryInterface(desc->run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); - origin.x = desc->origin_x * desc->ppdip; - origin.y = desc->origin_y * desc->ppdip; + origin.x = desc->origin.x; + origin.y = desc->origin.y; for (i = 0; i < desc->run->glyphCount; i++) { FLOAT advance; /* Use nominal advances if not provided by caller. */ if (desc->run->glyphAdvances) - advance = rtl_factor * desc->run->glyphAdvances[i] * desc->ppdip; + advance = rtl_factor * desc->run->glyphAdvances[i]; else { INT32 a; @@ -5450,14 +5449,14 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit case DWRITE_MEASURING_MODE_NATURAL: if (SUCCEEDED(IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, desc->run->glyphIndices + i, &a, desc->run->isSideways))) - advance = rtl_factor * get_scaled_advance_width(a, desc->run->fontEmSize, &metrics) * desc->ppdip; + advance = rtl_factor * get_scaled_advance_width(a, desc->run->fontEmSize, &metrics); break; case DWRITE_MEASURING_MODE_GDI_CLASSIC: case DWRITE_MEASURING_MODE_GDI_NATURAL: if (SUCCEEDED(IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, desc->run->fontEmSize, - desc->ppdip, desc->transform, desc->measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, + 1.0f, desc->transform, desc->measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, desc->run->isSideways, 1, desc->run->glyphIndices + i, &a))) - advance = rtl_factor * floorf(a * desc->run->fontEmSize * desc->ppdip / metrics.designUnitsPerEm + 0.5f); + advance = rtl_factor * floorf(a * desc->run->fontEmSize / metrics.designUnitsPerEm + 0.5f); break; default: ; @@ -5468,8 +5467,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit /* Offsets are optional, appled to pre-transformed origin. */ if (desc->run->glyphOffsets) { - FLOAT advanceoffset = rtl_factor * desc->run->glyphOffsets[i].advanceOffset * desc->ppdip; - FLOAT ascenderoffset = -desc->run->glyphOffsets[i].ascenderOffset * desc->ppdip; + FLOAT advanceoffset = rtl_factor * desc->run->glyphOffsets[i].advanceOffset; + FLOAT ascenderoffset = -desc->run->glyphOffsets[i].ascenderOffset; if (desc->run->isSideways) { analysis->origins[i].x += ascenderoffset; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c4d2a5f..522bac8 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1222,12 +1222,25 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory5 *if return create_numbersubstitution(method, locale, ignore_user_override, substitution); } +static inline void dwrite_matrix_multiply(DWRITE_MATRIX *a, const DWRITE_MATRIX *b) +{ + DWRITE_MATRIX tmp = *a; + + a->m11 = tmp.m11 * b->m11 + tmp.m12 * b->m21; + a->m12 = tmp.m11 * b->m12 + tmp.m12 * b->m22; + a->m21 = tmp.m21 * b->m11 + tmp.m22 * b->m21; + a->m22 = tmp.m21 * b->m12 + tmp.m22 * b->m22; + a->dx = tmp.dx * b->m11 + tmp.dy * b->m21 + b->dx; + a->dy = tmp.dy * b->m12 + tmp.dy * b->m22 + b->dx; +} + static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory5 *iface, DWRITE_GLYPH_RUN const *run, FLOAT ppdip, DWRITE_MATRIX const* transform, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory5(iface); struct glyphrunanalysis_desc desc; + DWRITE_MATRIX m, scale = { 0 }; TRACE("(%p)->(%p %.2f %p %d %d %.2f %.2f %p)\n", This, run, ppdip, transform, rendering_mode, measuring_mode, originX, originY, analysis); @@ -1237,15 +1250,18 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory5 *ifac return E_INVALIDARG; } + m = transform ? *transform : identity; + scale.m11 = ppdip; + scale.m22 = ppdip; + dwrite_matrix_multiply(&m, &scale); desc.run = run; - desc.ppdip = ppdip; - desc.transform = transform; + desc.transform = &m; desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; desc.measuring_mode = measuring_mode; desc.gridfit_mode = DWRITE_GRID_FIT_MODE_DEFAULT; desc.aa_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; - desc.origin_x = originX; - desc.origin_y = originY; + desc.origin.x = originX; + desc.origin.y = originY; return create_glyphrunanalysis(&desc, analysis); } @@ -1363,27 +1379,35 @@ static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory5 return hr; } +static HRESULT factory_create_glyphrun_analysis(const DWRITE_GLYPH_RUN *run, const DWRITE_MATRIX *transform, + DWRITE_RENDERING_MODE1 rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GRID_FIT_MODE gridfit_mode, + DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) +{ + struct glyphrunanalysis_desc desc; + + desc.run = run; + desc.transform = transform; + desc.rendering_mode = rendering_mode; + desc.measuring_mode = measuring_mode; + desc.gridfit_mode = gridfit_mode; + desc.aa_mode = aa_mode; + desc.origin.x = originX; + desc.origin.y = originY; + return create_glyphrunanalysis(&desc, analysis); +} + static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory5 *iface, const DWRITE_GLYPH_RUN *run, const DWRITE_MATRIX *transform, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory5(iface); - struct glyphrunanalysis_desc desc; TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - desc.run = run; - desc.ppdip = 1.0f; - desc.transform = transform; - desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; - desc.measuring_mode = measuring_mode; - desc.gridfit_mode = gridfit_mode; - desc.aa_mode = aa_mode; - desc.origin_x = originX; - desc.origin_y = originY; - return create_glyphrunanalysis(&desc, analysis); + return factory_create_glyphrun_analysis(run, transform, (DWRITE_RENDERING_MODE1)rendering_mode, measuring_mode, + gridfit_mode, aa_mode, originX, originY, analysis); } static HRESULT WINAPI dwritefactory3_CreateGlyphRunAnalysis(IDWriteFactory5 *iface, DWRITE_GLYPH_RUN const *run, @@ -1392,21 +1416,12 @@ static HRESULT WINAPI dwritefactory3_CreateGlyphRunAnalysis(IDWriteFactory5 *ifa IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory5(iface); - struct glyphrunanalysis_desc desc; TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, gridfit_mode, aa_mode, originX, originY, analysis); - desc.run = run; - desc.ppdip = 1.0f; - desc.transform = transform; - desc.rendering_mode = rendering_mode; - desc.measuring_mode = measuring_mode; - desc.gridfit_mode = gridfit_mode; - desc.aa_mode = aa_mode; - desc.origin_x = originX; - desc.origin_y = originY; - return create_glyphrunanalysis(&desc, analysis); + return factory_create_glyphrun_analysis(run, transform, rendering_mode, measuring_mode, gridfit_mode, + aa_mode, originX, originY, analysis); } static HRESULT WINAPI dwritefactory3_CreateCustomRenderingParams(IDWriteFactory5 *iface, FLOAT gamma, FLOAT contrast,

1 0

Jacek Caban : kernel32/tests: Add more pipe tests.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: a9ef1dd5dc31199683d23618b54e241f30ed4485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ef1dd5dc31199683d23618… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:09:49 2018 +0200 kernel32/tests: Add more pipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index d724e00..3c7fcd1 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1448,6 +1448,11 @@ static int test_DisconnectNamedPipe(void) ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe while messages waiting\n"); ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL) == 0 && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "WriteFile to disconnected pipe\n"); + ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL) == 0 + && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "WriteFile to disconnected pipe\n"); + ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL) == 0 + && GetLastError() == ERROR_PIPE_NOT_CONNECTED, + "ReadFile from disconnected pipe with bytes waiting\n"); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL) == 0 && GetLastError() == ERROR_PIPE_NOT_CONNECTED, "ReadFile from disconnected pipe with bytes waiting\n");

1 0

Jacek Caban : ntdll/tests: Add more NtQueryInformationFile tests.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: 59dd8baeac54f0739ba9bbb089ab037298e04775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59dd8baeac54f0739ba9bbb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:10:15 2018 +0200 ntdll/tests: Add more NtQueryInformationFile tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index cb31956..e28628b 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1349,7 +1349,7 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) FILE_PIPE_INFORMATION pipe_info; FILE_PIPE_PEEK_BUFFER peek_buf; IO_STATUS_BLOCK io; - char buf[] = "test"; + char buf[256] = "test"; NTSTATUS status, expected_status; memset(&io, 0xcc, sizeof(io)); @@ -1379,6 +1379,15 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) "NtQueryInformationFile(FilePipeInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); + status = NtQueryInformationFile(pipe, &io, buf, sizeof(buf), FileNameInformation); + if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) + ok(status == STATUS_PIPE_DISCONNECTED, + "NtQueryInformationFile(FileNameInformation) failed: %x\n", status); + else + todo_wine_if(!is_server && state == FILE_PIPE_CLOSING_STATE) + ok(status == STATUS_SUCCESS, + "NtQueryInformationFile(FileNameInformation) failed: %x\n", status); + memset(&peek_buf, 0xcc, sizeof(peek_buf)); memset(&io, 0xcc, sizeof(io)); status = NtFsControlFile(pipe, NULL, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); @@ -1492,6 +1501,154 @@ static void pipe_for_each_state(HANDLE (*create_server)(void), CloseHandle(event); } +static HANDLE create_local_info_test_pipe(void) +{ + IO_STATUS_BLOCK iosb; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + LARGE_INTEGER timeout; + HANDLE pipe; + NTSTATUS status; + + pRtlInitUnicodeString(&name, testpipe_nt); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + timeout.QuadPart = -100000000; + + status = pNtCreateNamedPipeFile(&pipe, FILE_READ_ATTRIBUTES | SYNCHRONIZE | GENERIC_WRITE, + &attr, &iosb, FILE_SHARE_READ, FILE_CREATE, 0, 1, 0, 0, 1, + 100, 200, &timeout); + ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %x\n", status); + + return pipe; +} + +static HANDLE connect_pipe_reader(HANDLE server) +{ + HANDLE client; + + client = CreateFileW(testpipe, GENERIC_READ, 0, 0, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, 0); + ok(client != INVALID_HANDLE_VALUE, "can't open pipe: %u\n", GetLastError()); + + return client; +} + +static void test_pipe_local_info(HANDLE pipe, BOOL is_server, DWORD state) +{ + FILE_PIPE_LOCAL_INFORMATION local_info; + FILE_PIPE_INFORMATION pipe_info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + LARGE_INTEGER timeout; + HANDLE new_pipe; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + memset(&iosb, 0xcc, sizeof(iosb)); + memset(&local_info, 0xcc, sizeof(local_info)); + status = pNtQueryInformationFile(pipe, &iosb, &local_info, sizeof(local_info), FilePipeLocalInformation); + if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) + todo_wine + ok(status == STATUS_PIPE_DISCONNECTED, + "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", + is_server ? "server" : "client", state, status); + else + ok(status == STATUS_SUCCESS, + "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", + is_server ? "server" : "client", state, status); + if (!status) + { + ok(local_info.NamedPipeType == 1, "NamedPipeType = %u\n", local_info.NamedPipeType); + todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) + ok(local_info.NamedPipeConfiguration == 1, "NamedPipeConfiguration = %u\n", + local_info.NamedPipeConfiguration); + todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) + ok(local_info.MaximumInstances == 1, "MaximumInstances = %u\n", local_info.MaximumInstances); + if (!is_server && state == FILE_PIPE_CLOSING_STATE) + ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */), + "CurrentInstances = %u\n", local_info.CurrentInstances); + else + todo_wine_if(!is_server && state == FILE_PIPE_DISCONNECTED_STATE) + ok(local_info.CurrentInstances == 1, + "CurrentInstances = %u\n", local_info.CurrentInstances); + todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) + ok(local_info.InboundQuota == 100, "InboundQuota = %u\n", local_info.InboundQuota); + ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable = %u\n", + local_info.ReadDataAvailable); + todo_wine_if(!is_server && (state == FILE_PIPE_CLOSING_STATE || state == FILE_PIPE_DISCONNECTED_STATE)) + ok(local_info.OutboundQuota == 200, "OutboundQuota = %u\n", local_info.OutboundQuota); + todo_wine + ok(local_info.WriteQuotaAvailable == (is_server ? 200 : 100), "WriteQuotaAvailable = %u\n", + local_info.WriteQuotaAvailable); + todo_wine + ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n", + is_server ? "server" : "client", local_info.NamedPipeState, state); + ok(local_info.NamedPipeEnd == is_server, "NamedPipeEnd = %u\n", local_info.NamedPipeEnd); + + /* try to create another, incompatible, instance of pipe */ + pRtlInitUnicodeString(&name, testpipe_nt); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + timeout.QuadPart = -100000000; + + status = pNtCreateNamedPipeFile(&new_pipe, FILE_READ_ATTRIBUTES | SYNCHRONIZE | GENERIC_READ, + &attr, &iosb, FILE_SHARE_WRITE, FILE_CREATE, 0, 0, 0, 0, 1, + 100, 200, &timeout); + if (!local_info.CurrentInstances) + todo_wine_if(status) /* FIXME */ + ok(status == STATUS_SUCCESS, "NtCreateNamedPipeFile failed: %x\n", status); + else + ok(status == STATUS_INSTANCE_NOT_AVAILABLE, "NtCreateNamedPipeFile failed: %x\n", status); + if (!status) CloseHandle(new_pipe); + + memset(&iosb, 0xcc, sizeof(iosb)); + status = pNtQueryInformationFile(pipe, &iosb, &local_info, sizeof(local_info), + FilePipeLocalInformation); + ok(status == STATUS_SUCCESS, + "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", + is_server ? "server" : "client", state, status); + + if (!is_server && state == FILE_PIPE_CLOSING_STATE) + ok(local_info.CurrentInstances == 0 || broken(local_info.CurrentInstances == 1 /* winxp */), + "CurrentInstances = %u\n", local_info.CurrentInstances); + else + todo_wine_if(!is_server && state == FILE_PIPE_DISCONNECTED_STATE) + ok(local_info.CurrentInstances == 1, + "CurrentInstances = %u\n", local_info.CurrentInstances); + } + + memset(&iosb, 0xcc, sizeof(iosb)); + status = pNtQueryInformationFile(pipe, &iosb, &pipe_info, sizeof(pipe_info), FilePipeInformation); + if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) + todo_wine + ok(status == STATUS_PIPE_DISCONNECTED, + "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", + is_server ? "server" : "client", state, status); + else + ok(status == STATUS_SUCCESS, + "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", + is_server ? "server" : "client", state, status); + + if (!status) + { + ok(pipe_info.ReadMode == 0, "ReadMode = %u\n", pipe_info.ReadMode); + ok(pipe_info.CompletionMode == 0, "CompletionMode = %u\n", pipe_info.CompletionMode); + } +} + static void test_file_info(void) { HANDLE server, client; @@ -1771,4 +1928,5 @@ START_TEST(pipe) pipe_for_each_state(create_pipe_server, connect_pipe, test_pipe_state); pipe_for_each_state(create_pipe_server, connect_and_write_pipe, test_pipe_with_data_state); + pipe_for_each_state(create_local_info_test_pipe, connect_pipe_reader, test_pipe_local_info); }

1 0

Jacek Caban : server: Store named_pipe reference in pipe_end struct.
by Alexandre Julliard 16 Aug '18

16 Aug '18

Module: wine Branch: master Commit: ba40a0db8a7bd05b2e6e2763041875bcbc5af1b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba40a0db8a7bd05b2e6e2763… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 16 15:10:33 2018 +0200 server: Store named_pipe reference in pipe_end struct. Allows pipe clients to access named_pipe object after server is closed without disconnecting. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 768567f..ab71f36 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -67,6 +67,7 @@ struct pipe_end struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ unsigned int state; /* pipe state */ + struct named_pipe *pipe; struct pipe_end *connection; /* the other end of the pipe */ process_id_t client_pid; /* process that created the client */ process_id_t server_pid; /* process that created the server */ @@ -416,14 +417,20 @@ static void pipe_end_destroy( struct pipe_end *pipe_end ) free_async_queue( &pipe_end->read_q ); free_async_queue( &pipe_end->write_q ); if (pipe_end->fd) release_object( pipe_end->fd ); + if (pipe_end->pipe) release_object( pipe_end->pipe ); } static void pipe_server_destroy( struct object *obj) { struct pipe_server *server = (struct pipe_server *)obj; + struct named_pipe *pipe = server->pipe_end.pipe; assert( obj->ops == &pipe_server_ops ); + assert( pipe->instances ); + if (!--pipe->instances) unlink_named_object( &pipe->obj ); + list_remove( &server->entry ); + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); pipe_end_destroy( &server->pipe_end ); @@ -433,11 +440,7 @@ static void pipe_server_destroy( struct object *obj) server->client = NULL; } - assert( server->pipe->instances ); - server->pipe->instances--; - - list_remove( &server->entry ); - release_object( server->pipe ); + release_object( pipe ); } static void pipe_client_destroy( struct object *obj) @@ -573,6 +576,12 @@ static void pipe_end_get_file_info( struct fd *fd, struct named_pipe *pipe, unsi } name = get_object_name( &pipe->obj, &name_len ); + /* FIXME: We should be able to return on unlinked pipe */ + if (!name) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } reply_size = offsetof( FILE_NAME_INFORMATION, FileName[name_len/sizeof(WCHAR) + 1] ); if (reply_size > get_reply_max_size()) { @@ -1043,7 +1052,10 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as case ps_connected_server: assert( server->client ); - /* dump the client and server fds - client loses all waiting data */ + /* dump the client connection - all data is lost */ + release_object( server->pipe_end.connection->pipe ); + server->pipe_end.connection->pipe = NULL; + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); server->client->server = NULL; server->client = NULL; @@ -1092,8 +1104,10 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, return (struct pipe_server *) obj; } -static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags, data_size_t buffer_size ) +static void init_pipe_end( struct pipe_end *pipe_end, struct named_pipe *pipe, + unsigned int pipe_flags, data_size_t buffer_size ) { + pipe_end->pipe = (struct named_pipe *)grab_object( pipe ); pipe_end->fd = NULL; pipe_end->flags = pipe_flags; pipe_end->connection = NULL; @@ -1115,7 +1129,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->pipe = pipe; server->client = NULL; server->options = options; - init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); + init_pipe_end( &server->pipe_end, pipe, pipe_flags, pipe->insize ); server->pipe_end.state = FILE_PIPE_LISTENING_STATE; server->pipe_end.server_pid = get_process_id( current->process ); @@ -1132,7 +1146,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } -static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags, +static struct pipe_client *create_pipe_client( unsigned int flags, struct named_pipe *pipe, data_size_t buffer_size, unsigned int options ) { struct pipe_client *client; @@ -1143,7 +1157,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; - init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); + init_pipe_end( &client->pipe_end, pipe, pipe->flags, buffer_size ); client->pipe_end.state = FILE_PIPE_CONNECTED_STATE; client->pipe_end.client_pid = get_process_id( current->process ); @@ -1217,7 +1231,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) + if ((client = create_pipe_client( options, pipe, pipe->outsize, options ))) { if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS );

1 0