October 2016 - Wine-commits

Stefan Dösinger : ddraw: Use d3d buffers for executebuffer data.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: b7c9d14e8edfb42d4758a6892dcd42c4dcb1d3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c9d14e8edfb42d4758a6892… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Oct 30 07:02:21 2016 -0700 ddraw: Use d3d buffers for executebuffer data. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 5 +- dlls/ddraw/executebuffer.c | 128 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 102 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c9d14e8edfb42d4758a…

1 0

Nikolay Sivov : d2d1/tests: DrawTextLayout() ignores effects that are not brushes.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 7bce356ef4fefd83c636c6fa5fe5bf98e17370f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bce356ef4fefd83c636c6fa5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 20:01:52 2016 +0300 d2d1/tests: DrawTextLayout() ignores effects that are not brushes. 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/tests/d2d1.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b49ed7d..cf24841 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2637,6 +2637,8 @@ static void test_draw_text_layout(void) DWRITE_TEXT_RANGE range; D2D1_COLOR_F color; ID2D1SolidColorBrush *brush, *brush2; + ID2D1RectangleGeometry *geometry; + D2D1_RECT_F rect; if (!(device = create_device())) { @@ -2702,6 +2704,26 @@ static void test_draw_text_layout(void) todo_wine ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr); + /* Effect is d2d resource, but not a brush. */ + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 10.0f; + hr = ID2D1Factory_CreateRectangleGeometry(factory, &rect, &geometry); + ok(SUCCEEDED(hr), "Failed to geometry, hr %#x.\n", hr); + + range.startPosition = 0; + range.length = 4; + hr = IDWriteTextLayout_SetDrawingEffect(text_layout, (IUnknown*)geometry, range); + ok(SUCCEEDED(hr), "Failed to set drawing effect, hr %#x.\n", hr); + ID2D1RectangleGeometry_Release(geometry); + + ID2D1RenderTarget_BeginDraw(rt); + + origin.x = origin.y = 0.0f; + ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); + IDWriteTextFormat_Release(text_format); IDWriteTextLayout_Release(text_layout); IDWriteFactory_Release(dwrite_factory);

1 0

Nikolay Sivov : d2d1/tests: Test creating bitmap target from uninitialized dc target.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: c8eb7453a871076251af9308d98b9a7d5c56dd0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8eb7453a871076251af9308d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 20:01:53 2016 +0300 d2d1/tests: Test creating bitmap target from uninitialized dc target. 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/tests/d2d1.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cf24841..4409bb8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3001,6 +3001,7 @@ static void test_bitmap_target(void) ID2D1HwndRenderTarget *hwnd_rt; ID2D1Bitmap *bitmap, *bitmap2; ID2D1BitmapRenderTarget *rt; + ID2D1DCRenderTarget *dc_rt; D2D1_SIZE_F size, size2; ID2D1Factory *factory; ID3D10Device1 *device; @@ -3132,6 +3133,36 @@ static void test_bitmap_target(void) ok(!refcount, "Target should be released, got %u.\n", refcount); DestroyWindow(hwnd_rt_desc.hwnd); + + /* Compatible target created from a DC target without associated HDC */ + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 96.0f; + desc.dpiY = 96.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &dc_rt); + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); + + hr = ID2D1DCRenderTarget_CreateCompatibleRenderTarget(dc_rt, NULL, NULL, NULL, + D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + pixel_size = ID2D1BitmapRenderTarget_GetPixelSize(rt); +todo_wine + ok(pixel_size.width == 0 && pixel_size.height == 0, "Got wrong size\n"); + + hr = ID2D1BitmapRenderTarget_GetBitmap(rt, &bitmap); + ok(SUCCEEDED(hr), "GetBitmap() failed, hr %#x.\n", hr); + pixel_size = ID2D1Bitmap_GetPixelSize(bitmap); +todo_wine + ok(pixel_size.width == 0 && pixel_size.height == 0, "Got wrong size\n"); + ID2D1Bitmap_Release(bitmap); + + ID2D1BitmapRenderTarget_Release(rt); + ID2D1DCRenderTarget_Release(dc_rt); + ID2D1Factory_Release(factory); }

1 0

Józef Kucia : wined3d: Invalidate INDEXBUFFER device state when bound index buffer is unloaded.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 9fef0c49106ef717f0fa717928414f1b37d06f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fef0c49106ef717f0fa71792… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 31 12:48:31 2016 +0100 wined3d: Invalidate INDEXBUFFER device state when bound index buffer is unloaded. Fixes a regression introduced by commit e3a8cd20ced9f33db64a35f60bc8487ae8173e47. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a81cd64..13953c9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -665,7 +665,12 @@ static void buffer_unload(struct wined3d_resource *resource) * happens only once per changed vertexbuffer and should occur rather * rarely. */ if (resource->bind_count) + { device_invalidate_state(device, STATE_STREAMSRC); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) + device_invalidate_state(device, STATE_INDEXBUFFER); + } } resource_unload(resource);

1 0

Alexandre Julliard : Wine release 1.9.22
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: website Branch: master Commit: b574639070bdbd4c1aa81328fa133c3fccc27bb9 URL: http://source.winehq.org/git/website.git/?a=commit;h=b574639070bdbd4c1aa813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 20:47:16 2016 +0200 Wine release 1.9.22 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016102801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2016102801.xml b/news/en/2016102801.xml new file mode 100644 index 0000000..bad9816 --- /dev/null +++ b/news/en/2016102801.xml @@ -0,0 +1,16 @@ +<news> +<date>October 28, 2016</date> +<title>Wine 1.9.22 Released</title> +<body> + The Wine development release 1.9.22 is now available. + <a href="{$root}/announce/1.9.22">What's new</a> in this release: +<ul> + <li>macOS clipboard support adapted to the new design.</li> + <li>Initial implementation of bitmap rendering in Direct2D.</li> + <li>More WebServices implementation.</li> + <li>A few more steps towards HID support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: wine Branch: master Commit: f9699fe78fa2131113cc13624bcc9e60ee81ee21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9699fe78fa2131113cc13624… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 28 13:23:01 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index a834c13..c071cf2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-14 22:09+0300\n" +"PO-Revision-Date: 2016-10-28 10:09+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 1.8.10\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10513,10 +10513,8 @@ msgid "IPv6 address" msgstr "IPv6-адрес" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Конфигурация системы" +msgstr "Информация о системе" #: net.rc:30 msgid "" @@ -14506,10 +14504,8 @@ msgid "Error: Invalid query\n" msgstr "Ошибка: некорректный запрос\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: неверный синтаксис. " +msgstr "Ошибка: неверный синтаксис PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N"

1 0

Andrey Gusev : ext-ms-win-ntuser-uicontext-ext-l1-1-0: Add dll.
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: wine Branch: master Commit: 5ede16eb40ebb5c6b3abcb78ced391661331005c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ede16eb40ebb5c6b3abcb78c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 27 21:03:46 2016 +0300 ext-ms-win-ntuser-uicontext-ext-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 55 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 60 insertions(+) diff --git a/configure b/configure index 67adaf7..fda6fc7 100755 --- a/configure +++ b/configure @@ -1166,6 +1166,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_faultrep enable_fltlib @@ -17925,6 +17926,7 @@ wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_crea wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test diff --git a/configure.ac b/configure.ac index 413bd46..84316f9 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/Makefile.in new file mode 100644 index 0000000..4c50271 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec new file mode 100644 index 0000000..69488d1 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -0,0 +1,55 @@ +@ stdcall AdjustWindowRectEx(ptr long long long) user32.AdjustWindowRectEx +@ stdcall AllowSetForegroundWindow(long) user32.AllowSetForegroundWindow +@ stdcall AnimateWindow(long long long) user32.AnimateWindow +@ stdcall BringWindowToTop(long) user32.BringWindowToTop +@ stdcall CallNextHookEx(long long long long) user32.CallNextHookEx +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) user32.CreateWindowExA +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DefWindowProcA(long long long long) user32.DefWindowProcA +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumThreadWindows(long ptr long) user32.EnumThreadWindows +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowA(str str) user32.FindWindowA +@ stdcall FindWindowExW(long long wstr wstr) user32.FindWindowExW +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetAncestor(long long) user32.GetAncestor +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetGUIThreadInfo(long ptr) user32.GetGUIThreadInfo +@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) user32.GetLayeredWindowAttributes +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetShellWindow() user32.GetShellWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stub GetWindowDisplayAffinity +@ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo +@ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextLengthW(long) user32.GetWindowTextLengthW +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsIconic(long) user32.IsIconic +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall IsWindowUnicode(long) user32.IsWindowUnicode +@ stdcall IsWindowVisible(long) user32.IsWindowVisible +@ stub LogicalToPhysicalPoint +@ stdcall MoveWindow(long long long long long long) user32.MoveWindow +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetLayeredWindowAttributes(ptr long long long) user32.SetLayeredWindowAttributes +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stub SetWindowDisplayAffinity +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stub SoundSentry +@ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow +@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/tools/make_specfiles b/tools/make_specfiles index 649dec6..8e11529 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -267,6 +267,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", ], [

1 0

Jacek Caban : ntdll: Cache error information for cacheable handles with no fd.
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: wine Branch: master Commit: 3b30002aecf7cd55970979f7e02a53866fe66f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b30002aecf7cd55970979f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 24 17:48:49 2016 +0200 ntdll: Cache error information for cacheable handles with no fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 25c6473..59b9ab9 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -876,22 +876,25 @@ static BOOL add_fd_to_cache( HANDLE handle, int fd, enum server_fd_type type, /*********************************************************************** * get_cached_fd */ -static inline int get_cached_fd( HANDLE handle, enum server_fd_type *type, - unsigned int *access, unsigned int *options ) +static inline NTSTATUS get_cached_fd( HANDLE handle, int *fd, enum server_fd_type *type, + unsigned int *access, unsigned int *options ) { unsigned int entry, idx = handle_to_index( handle, &entry ); - int fd = -1; + union fd_cache_entry cache; - if (entry < FD_CACHE_ENTRIES && fd_cache[entry]) - { - union fd_cache_entry cache; - cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); - fd = cache.s.fd - 1; - if (type) *type = cache.s.type; - if (access) *access = cache.s.access; - if (options) *options = cache.s.options; - } - return fd; + if (entry >= FD_CACHE_ENTRIES || !fd_cache[entry]) return STATUS_INVALID_HANDLE; + + cache.data = interlocked_cmpxchg64( &fd_cache[entry][idx].data, 0, 0 ); + if (!cache.data) return STATUS_INVALID_HANDLE; + + /* if fd type is invalid, fd stores an error value */ + if (cache.s.type == FD_TYPE_INVALID) return cache.s.fd - 1; + + *fd = cache.s.fd - 1; + if (type) *type = cache.s.type; + if (access) *access = cache.s.access; + if (options) *options = cache.s.options; + return STATUS_SUCCESS; } @@ -907,7 +910,7 @@ int server_remove_fd_from_cache( HANDLE handle ) { union fd_cache_entry cache; cache.data = interlocked_xchg64( &fd_cache[entry][idx].data, 0 ); - fd = cache.s.fd - 1; + if (cache.s.type != FD_TYPE_INVALID) fd = cache.s.fd - 1; } return fd; @@ -924,19 +927,19 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, { sigset_t sigset; obj_handle_t fd_handle; - int ret = 0, fd; + int ret, fd = -1; unsigned int access = 0; *unix_fd = -1; *needs_close = 0; wanted_access &= FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA; - fd = get_cached_fd( handle, type, &access, options ); - if (fd != -1) goto done; + ret = get_cached_fd( handle, &fd, type, &access, options ); + if (ret != STATUS_INVALID_HANDLE) goto done; server_enter_uninterrupted_section( &fd_cache_section, &sigset ); - fd = get_cached_fd( handle, type, &access, options ); - if (fd == -1) + ret = get_cached_fd( handle, &fd, type, &access, options ); + if (ret == STATUS_INVALID_HANDLE) { SERVER_START_REQ( get_handle_fd ) { @@ -955,6 +958,10 @@ int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd, } else ret = STATUS_TOO_MANY_OPENED_FILES; } + else if (reply->cacheable) + { + add_fd_to_cache( handle, ret, FD_TYPE_INVALID, 0, 0 ); + } } SERVER_END_REQ; }

1 0

Jacek Caban : server: Allow caching device file handles.
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: wine Branch: master Commit: 5b2dc0830774bc5375a44ded6568c50ac206c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2dc0830774bc5375a44ded6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 24 17:48:56 2016 +0200 server: Allow caching device file handles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 2 ++ server/fd.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index e4f55c7..0bc798a 100644 --- a/server/device.c +++ b/server/device.c @@ -383,6 +383,8 @@ static struct object *device_open_file( struct object *obj, unsigned int access, return NULL; } + allow_fd_caching( file->fd ); + if (device->manager) { struct irp_call *irp; diff --git a/server/fd.c b/server/fd.c index 17b1b66..66d34d7 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2441,10 +2441,10 @@ DECL_HANDLER(get_handle_fd) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { int unix_fd = get_unix_fd( fd ); + reply->cacheable = fd->cacheable; if (unix_fd != -1) { reply->type = fd->fd_ops->get_fd_type( fd ); - reply->cacheable = fd->cacheable; reply->options = fd->options; reply->access = get_handle_access( current->process, req->handle ); send_client_fd( current->process, unix_fd, req->handle );

1 0

Alexandre Julliard : Release 1.9.22.
by Alexandre Julliard 28 Oct '16

28 Oct '16

Module: wine Branch: master Commit: 1316520a8029c0a99b358d1cd754294634d1855a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1316520a8029c0a99b358d1cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 20:41:36 2016 +0200 Release 1.9.22. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 517 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 +- VERSION | 2 +- configure | 18 +-- 5 files changed, 250 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1316520a8029c0a99b358…

1 0