June 2021 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 5bb151ebabc421986fbebb8a94a1678c725af43d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb151ebabc421986fbebb8a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:58 2021 +0100 wbemprox: Flesh out a bit SystemRestore::Enable() implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d2baf148a14b41d0347dfdc2bc6cf9efc4f63242) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5c..d59077381fb 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4e..67c0b218ce1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL );

1 0

Henri Verbeet : ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: c13940de055c863da6491501c4ce0af8099f181f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13940de055c863da6491501… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:55 2021 +0100 ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4ce1d7f93a35322d149cbde29d619e2580159a80) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/surface.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd788a96ac0..0ca19d4f8a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,6 +39,16 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) && (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost); } +static BOOL ddraw_gdi_is_front(struct ddraw *ddraw) +{ + struct ddraw_surface *surface; + + if (!ddraw->gdi_surface || !(surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) + return FALSE; + + return surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -46,6 +56,7 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) { + struct ddraw *ddraw = surface->ddraw; struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; @@ -53,9 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; - if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + if (ddraw->flags & DDRAW_SWAPPED && !read) { - surface->ddraw->flags &= ~DDRAW_SWAPPED; + ddraw->flags &= ~DDRAW_SWAPPED; rect = NULL; } @@ -73,7 +84,23 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; - if (surface->ddraw->swapchain_window) + /* The interaction between ddraw and GDI drawing is not all that well + * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws + * seemingly go to the *original* frontbuffer/primary surface, while ddraw + * draws/flips go to the *current* frontbuffer surface. The bottom line is + * that if the current frontbuffer is not the GDI frontbuffer, and there's + * e.g. a popup window in front of the ddraw swapchain window, we can't + * use wined3d_swapchain_present() to get the ddraw contents to the screen + * while in exclusive mode, since it would get obscured by the popup + * window. On the other hand, if the current frontbuffer *is* the GDI + * frontbuffer, that's what's supposed to happen; the popup should obscure + * (oart of) the ddraw swapchain window. + * + * This affects the "Deer Hunter" demo, which uses a popup window and GDI + * draws to draw part of the user interface. See also the "fswindow" + * sample is the DirectX 7 SDK. */ + if (ddraw->swapchain_window && (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) + || ddraw->swapchain_window == GetForegroundWindow() || ddraw_gdi_is_front(ddraw))) { /* Nothing to do, we control the frontbuffer, or at least the parts we * care about. */ @@ -81,15 +108,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, return DD_OK; if (swap_interval) - dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = surface->ddraw->wined3d_frontbuffer; + dst_texture = ddraw->wined3d_frontbuffer; if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) { - hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); - surface->ddraw->flags |= DDRAW_SWAPPED; + hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + ddraw->flags |= DDRAW_SWAPPED; } return hr; }

1 0

Dmitry Timoshkov : wbemprox: Add class SystemRestore stub implementation.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 35fb24069560faeae24d4717b2c6f5a183330103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35fb24069560faeae24d4717… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 20 11:15:57 2021 +0100 wbemprox: Add class SystemRestore stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50033 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e0cb4d509338f5d1d6db71584722731d38b0d837) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 38 ++++++++++++++++++++++++ dlls/wbemprox/sysrestore.c | 62 ++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 7 +++-- dlls/wbemprox/wbemprox_private.h | 5 ++++ 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a26c833878f..ed2710f8855 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ security.c \ service.c \ services.c \ + sysrestore.c \ table.c \ wbemlocator.c diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9bd58ca77e6..39166a21171 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -406,6 +406,20 @@ static const struct column col_systemsecurity[] = { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; +static const struct column col_sysrestore[] = +{ + { L"CreationTime", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EventType", CIM_UINT32 }, + { L"RestorePointType", CIM_UINT32 }, + { L"SequenceNumber", CIM_UINT32 }, + /* methods */ + { L"CreateRestorePoint", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Disable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Enable", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetLastRestoreStatus", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"Restore", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, +}; static const struct column col_videocontroller[] = { { L"AdapterCompatibility", CIM_STRING }, @@ -783,6 +797,19 @@ struct record_stdregprov class_method *enumvalues; class_method *getstringvalue; }; +struct record_sysrestore +{ + const WCHAR *creation_time; + const WCHAR *description; + UINT32 event_type; + UINT32 restore_point_type; + UINT32 sequence_number; + class_method *create_restore_point; + class_method *disable_restore; + class_method *enable_restore; + class_method *get_last_restore_status; + class_method *restore; +}; struct record_systemsecurity { class_method *getsd; @@ -865,6 +892,10 @@ static const struct record_param data_param[] = { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"SystemRestore", L"Disable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Disable", -1, L"ReturnValue", CIM_UINT32 }, + { L"SystemRestore", L"Enable", 1, L"Drive", CIM_STRING }, + { L"SystemRestore", L"Enable", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, @@ -895,6 +926,12 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } }; + +static const struct record_sysrestore data_sysrestore[] = +{ + { NULL, NULL, 0, 0, 0, create_restore_point, disable_restore, enable_restore, get_last_restore_status, restore } +}; + static UINT16 systemenclosure_chassistypes[] = { 1, @@ -3981,6 +4018,7 @@ static struct table builtin_classes[] = { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c new file mode 100644 index 00000000000..b840d220b5c --- /dev/null +++ b/dlls/wbemprox/sysrestore.c @@ -0,0 +1,62 @@ +/* + * SystemRestore implementation + * + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +HRESULT create_restore_point( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} + +HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +HRESULT restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 37b6fb4e8dc..1c7a615dd4e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1772,16 +1772,19 @@ static void test_SystemRestore( IWbemServices *services ) hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); if (hr != S_OK) { - skip( "SystemRestore not available\n" ); + win_skip( "SystemRestore not available\n" ); SysFreeString( class ); return; } check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); check_property( service, L"Description", VT_NULL, CIM_STRING ); + if (0) /* FIXME */ + { check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + } method = SysAllocString( L"Enable" ); sig_in = NULL; @@ -1802,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK) + if (hr == S_OK && out) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 30649257641..ff9a7f6ff82 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -253,6 +253,11 @@ HRESULT service_start_service(IWbemClassObject *, IWbemClassObject *, IWbemClass HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT create_restore_point(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT disable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT enable_restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT get_last_restore_status(IWbemClassObject *, IWbemClassObject *in, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT restore(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW( const WCHAR *src ) {

1 0

Nikolay Sivov : dcomp: Add DCompositionCreateDevice2().
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: d104f037855a08238b3685a279fdb0390cb7bcac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d104f037855a08238b3685a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 14 22:45:04 2021 +0300 dcomp: Add DCompositionCreateDevice2(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50357 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9a0006e4fda676239b1db0b322dda83cc7f141c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dcomp/Makefile.in | 1 + dlls/dcomp/dcomp.spec | 2 +- dlls/dcomp/device.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 6d75a87980f..436b88993ab 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -3,6 +3,7 @@ MODULE = dcomp.dll EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + device.c \ main.c RC_SRCS = version.rc diff --git a/dlls/dcomp/dcomp.spec b/dlls/dcomp/dcomp.spec index 03801ebba6f..10e9f49a412 100644 --- a/dlls/dcomp/dcomp.spec +++ b/dlls/dcomp/dcomp.spec @@ -13,7 +13,7 @@ @ stub CreateEffectDescription @ stub DCompositionAttachMouseDragToHwnd @ stub DCompositionAttachMouseWheelToHwnd -@ stub DCompositionCreateDevice2 +@ stdcall DCompositionCreateDevice2(ptr ptr ptr) @ stub DCompositionCreateDevice3 @ stub DCompositionCreateDevice @ stub DCompositionCreateSurfaceHandle diff --git a/dlls/dcomp/device.c b/dlls/dcomp/device.c new file mode 100644 index 00000000000..efc6bacdb08 --- /dev/null +++ b/dlls/dcomp/device.c @@ -0,0 +1,32 @@ +/* + * Copyright 2020 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objidl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dcomp); + +HRESULT WINAPI DCompositionCreateDevice2(IUnknown *rendering_device, REFIID iid, void **device) +{ + FIXME("%p, %s, %p.\n", rendering_device, debugstr_guid(iid), device); + + return E_NOTIMPL; +}

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.GUID.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: a06928cfdd4b6b81fd2415914c25ff27907763de URL: https://source.winehq.org/git/wine.git/?a=commit;h=a06928cfdd4b6b81fd241591… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:39 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.GUID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ebff7de0c986f68b9c065e513c7a6bd125f3f616) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 27 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 39166a21171..d33cf1d03cc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -197,6 +197,7 @@ static const struct column col_networkadapter[] = { L"AdapterTypeID", CIM_UINT16 }, { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"GUID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Index", CIM_UINT32 }, { L"InterfaceIndex", CIM_UINT32 }, { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -603,6 +604,7 @@ struct record_networkadapter UINT16 adaptertypeid; const WCHAR *description; const WCHAR *device_id; + const WCHAR *guid; UINT32 index; UINT32 interface_index; const WCHAR *mac_address; @@ -2651,6 +2653,24 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) } } +#define GUID_SIZE 39 +static WCHAR *guid_to_str( const GUID *ptr ) +{ + WCHAR *ret; + if (!(ret = heap_alloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; + swprintf( ret, GUID_SIZE, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + ptr->Data1, ptr->Data2, ptr->Data3, ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], + ptr->Data4[3], ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); + return ret; +} + +static WCHAR *get_networkadapter_guid( const IF_LUID *luid ) +{ + GUID guid; + if (ConvertInterfaceLuidToGuid( luid, &guid )) return NULL; + return guid_to_str( &guid ); +} + static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { WCHAR device_id[11]; @@ -2689,6 +2709,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); rec->device_id = heap_strdupW( device_id ); + rec->guid = get_networkadapter_guid( &aa->Luid ); rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); @@ -2877,13 +2898,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) static WCHAR *get_settingid( UINT32 index ) { GUID guid; - WCHAR *ret, *str; memset( &guid, 0, sizeof(guid) ); guid.Data1 = index; - UuidToStringW( &guid, &str ); - ret = heap_strdupW( str ); - RpcStringFreeW( &str ); - return ret; + return guid_to_str( &guid ); } static enum fill_status fill_networkadapterconfig( struct table *table, const struct expr *cond ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 67c0b218ce1..5a59f0a8f8f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1144,6 +1144,32 @@ static void test_SystemSecurity( IWbemServices *services ) SysFreeString( class ); } +static void test_Win32_NetworkAdapter( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_NetworkAdapter" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + check_property( obj, L"Index", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_OperatingSystem( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); @@ -1874,6 +1900,7 @@ START_TEST(query) test_Win32_DiskDrive( services ); test_Win32_DisplayControllerConfiguration( services ); test_Win32_IP4RouteTable( services ); + test_Win32_NetworkAdapter( services ); test_Win32_OperatingSystem( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services );

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.ServiceName.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 74d58e6e272b97c9f9a229cd01b54587b54e0d56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d58e6e272b97c9f9a229cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 12:36:42 2021 +0100 wbemprox: Implement Win32_NetworkAdapter.ServiceName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50256 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4c5dee872be0c6a5d5df089bcf15e49edfd00d43) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d33cf1d03cc..9ae34a50c0d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -206,6 +206,7 @@ static const struct column col_networkadapter[] = { L"NetConnectionStatus", CIM_UINT16 }, { L"PhysicalAdapter", CIM_BOOLEAN }, { L"PNPDeviceID", CIM_STRING }, + { L"ServiceName", CIM_STRING|COL_FLAG_DYNAMIC }, { L"Speed", CIM_UINT64 }, }; static const struct column col_networkadapterconfig[] = @@ -613,6 +614,7 @@ struct record_networkadapter UINT16 netconnection_status; int physicaladapter; const WCHAR *pnpdevice_id; + const WCHAR *servicename; UINT64 speed; }; struct record_networkadapterconfig @@ -2718,6 +2720,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; + rec->servicename = heap_strdupW( aa->FriendlyName ); rec->speed = 1000000; if (!match_row( table, row, cond, &status )) { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5d7559afe56..a0488f40e52 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1160,12 +1160,26 @@ static void test_Win32_NetworkAdapter( IWbemServices *services ) for (;;) { + VARIANT val; + CIMTYPE type; + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); check_property( obj, L"Index", VT_I4, CIM_UINT32 ); check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, L"ServiceName", 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get service name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR || broken(V_VT( &val ) == VT_NULL) /* win2k8 */, + "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + IWbemClassObject_Release( obj ); }

1 0

Henri Verbeet : wined3d: Implement the "precise" flag in the GLSL shader backend.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 15f4d9c60e1ce111220951b6489368b3438fa8a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15f4d9c60e1ce111220951b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:53 2021 +0100 wined3d: Implement the "precise" flag in the GLSL shader backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7a54209d4bb5df18ac8fcdf26d8aa73e770403c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7423b2003a6..b3bbd6f9f7f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2540,6 +2540,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + if (gl_info->supported[ARB_GPU_SHADER5]) + shader_addline(buffer, "precise vec4 tmp_precise;\n"); + else + shader_addline(buffer, "/* precise */ vec4 tmp_precise;\n"); if (!shader->load_local_constsF) { @@ -3268,6 +3272,9 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { + if (ins->flags & WINED3DSI_PRECISE_XYZW) + sprintf(glsl_dst.reg_name, "tmp_precise"); + switch (data_type) { case WINED3D_DATA_FLOAT: @@ -3309,6 +3316,13 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in if (!ins->dst_count) return; + if (ins->flags & WINED3DSI_PRECISE_XYZW) + { + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + shader_addline(ins->ctx->buffer, "%s%s = tmp_precise%s;\n", + dst_param.reg_name, dst_param.mask_str, dst_param.mask_str); + } + modifiers = ins->dst[0].modifiers; if (!modifiers) return;

1 0

Alistair Leslie-Hughes : dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers.
by Alexandre Julliard June 7, 2021

June 7, 2021

Module: wine Branch: stable Commit: 50fdd5e2b5c6347ccffb19efe31f271feca92de0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50fdd5e2b5c6347ccffb19ef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:18 2021 +1100 dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21014 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e8bd2682a1c5335465ed891ea1063d82c346577) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/buffer.c | 2 ++ dlls/dsound/tests/dsound8.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc30a8a5448..fafa6fc6015 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -420,6 +420,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + if (This->dsbd.dwFlags & DSBCAPS_LOCDEFER) + *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 81c5710dbaf..85272dd9b55 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1809,6 +1809,79 @@ static void test_effects(void) ok(!ref, "Got outstanding refcount %u.\n", ref); } +static void test_AcquireResources(void) +{ + IDirectSound8 *dsound; + IDirectSoundBuffer *primary, *secondary; + DSBUFFERDESC bufdesc; + WAVEFORMATEX fmt; + HRESULT hr; + + hr = DirectSoundCreate8(NULL, &dsound, NULL); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; + bufdesc.dwBufferBytes = 0; + bufdesc.dwReserved = 0; + bufdesc.lpwfxFormat = NULL; + bufdesc.guid3DAlgorithm = GUID_NULL; + + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); + ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + if(hr != S_OK) { + IDirectSound_Release(dsound); + return; + } + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 48000; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = 0; + + bufdesc.lpwfxFormat = &fmt; + bufdesc.dwBufferBytes = fmt.nSamplesPerSec * fmt.nBlockAlign / 10; + bufdesc.dwFlags = DSBCAPS_LOCDEFER | DSBCAPS_CTRLVOLUME; + + /* see if we can create one more */ + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + if(hr == S_OK) { + DWORD status; + IDirectSoundBuffer8 *buffer8; + + hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + todo_wine ok(status == 0, "got: %08x\n", status); + + hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + + IDirectSoundBuffer8_Release(buffer8); + IDirectSoundBuffer_Release(secondary); + } + + IDirectSoundBuffer_Release(primary); + IDirectSound_Release(dsound); +} + START_TEST(dsound8) { DWORD cookie; @@ -1822,6 +1895,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_primary_flags(); + test_AcquireResources(); hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie);

1 0

Alexandre Julliard : Wine release 6.10
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: website Branch: master Commit: bcae802c219cd9df61ca50fa61511c66672eb7fc URL: https://source.winehq.org/git/website.git/?a=commit;h=bcae802c219cd9df61ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 4 21:32:44 2021 +0200 Wine release 6.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021060401.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021060401.xml b/news/en/2021060401.xml new file mode 100644 index 00000000..73a8b3c9 --- /dev/null +++ b/news/en/2021060401.xml @@ -0,0 +1,17 @@ +<news> +<date>June 4, 2021</date> +<title>Wine 6.10 Released</title> +<body> + The Wine development release 6.10 is now available. + <a href="{$root}/announce/6.10">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 6.2.0, with upstream updates.</li> + <li>Shell folders naming scheme follows recent Windows.</li> + <li>WinePulse library converted to PE.</li> + <li>More math functions from Musl in the C runtime.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.10.tar.xz">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

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard June 4, 2021

June 4, 2021

Module: wine Branch: master Commit: 5d2d2c3264b2d6039950b36bc5b59458b5842860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2d2c3264b2d6039950b36b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Jun 4 19:56:52 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 75 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/po/nl.po b/po/nl.po index 03a6b7a1f3e..cd8fbce0f44 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-05-20 14:10+0200\n" +"PO-Revision-Date: 2021-06-04 19:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4515,7 +4515,7 @@ msgstr "Pad is ongeldig.\n" #: dlls/kernel32/winerror.mc:678 msgid "Signal pending.\n" -msgstr "Signaal wachtende.\n" +msgstr "Signaal in behandeling.\n" #: dlls/kernel32/winerror.mc:683 msgid "Max system-wide thread count reached.\n" @@ -4527,7 +4527,7 @@ msgstr "Vergrendelen mislukt.\n" #: dlls/kernel32/winerror.mc:693 msgid "Resource in use.\n" -msgstr "Resource in gebruik.\n" +msgstr "Bron in gebruik.\n" #: dlls/kernel32/winerror.mc:698 msgid "Cancel violation.\n" @@ -6088,11 +6088,11 @@ msgstr "Geen systeembronnen.\n" #: dlls/kernel32/winerror.mc:2653 msgid "No non-paged system resources.\n" -msgstr "Geen nonpaged systeembronnen.\n" +msgstr "Geen niet-wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "Geen paged systeembronnen.\n" +msgstr "Geen wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6112,7 +6112,7 @@ msgstr "Menu-item niet gevonden.\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "Ongeldige toestenbordhandle.\n" +msgstr "Ongeldige toestenbordbeschrijving.\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" @@ -6124,15 +6124,15 @@ msgstr "Interactief windowstation vereist.\n" #: dlls/kernel32/winerror.mc:2698 msgid "Timeout.\n" -msgstr "Timeout.\n" +msgstr "Time-out.\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "Ongeldige monitorhandle.\n" +msgstr "Ongeldige monitorbeschrijving.\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" -msgstr "Gebeurtenislogbestand corrupt.\n" +msgstr "Gebeurtenislogbestand beschadigd.\n" #: dlls/kernel32/winerror.mc:2713 msgid "Event log can't start.\n" @@ -6384,7 +6384,7 @@ msgstr "Onbekende interface.\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" -msgstr "Geen bindings.\n" +msgstr "Geen bindingen.\n" #: dlls/kernel32/winerror.mc:3028 msgid "No protocol sequences.\n" @@ -6392,11 +6392,11 @@ msgstr "Geen protocol volgordes.\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "Kan eindpunt niet creëren.\n" +msgstr "Kan eindpunt niet aanmaken.\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" -msgstr "Resources zijn op.\n" +msgstr "Onvoldoende bronnen.\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" @@ -6412,15 +6412,15 @@ msgstr "Ongeldige netwerkopties.\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "Geen RPC-call actief.\n" +msgstr "Geen RPC-oproep actief.\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" -msgstr "RPC-call mislukt.\n" +msgstr "RPC-oproep mislukt.\n" #: dlls/kernel32/winerror.mc:3068 msgid "RPC call failed and didn't execute.\n" -msgstr "RPC-call mislukt en niet uitgevoerd.\n" +msgstr "RPC-oproep mislukt en niet uitgevoerd.\n" #: dlls/kernel32/winerror.mc:3073 msgid "RPC protocol error.\n" @@ -6740,23 +6740,23 @@ msgstr "Server heeft open handles.\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" -msgstr "Resourcedata niet gevonden.\n" +msgstr "Brongegevens niet gevonden.\n" #: dlls/kernel32/winerror.mc:3478 msgid "Resource type not found.\n" -msgstr "Resourcetype niet gevonden.\n" +msgstr "Brontype niet gevonden.\n" #: dlls/kernel32/winerror.mc:3483 msgid "Resource name not found.\n" -msgstr "Resourcenaam niet gevonden.\n" +msgstr "Bronnaam niet gevonden.\n" #: dlls/kernel32/winerror.mc:3488 msgid "Resource language not found.\n" -msgstr "Resourcetaal niet gevonden.\n" +msgstr "Brontaal niet gevonden.\n" #: dlls/kernel32/winerror.mc:3493 msgid "Not enough quota.\n" -msgstr "Niet genoeg quota.\n" +msgstr "Onvoldoende quota.\n" #: dlls/kernel32/winerror.mc:3498 msgid "No interfaces.\n" @@ -9573,55 +9573,55 @@ msgstr "Terugspoelen" #: dlls/shdoclc/shdoclc.rc:199 msgid "Trace Tags" -msgstr "Traceer Labels" +msgstr "Markeringen" #: dlls/shdoclc/shdoclc.rc:200 msgid "Resource Failures" -msgstr "Resource Fouten" +msgstr "Bronfouten" #: dlls/shdoclc/shdoclc.rc:201 msgid "Dump Tracking Info" -msgstr "Log Tracerings Informatie" +msgstr "Traceerinformatie Dumpen" #: dlls/shdoclc/shdoclc.rc:202 msgid "Debug Break" -msgstr "Debug Onderbreking" +msgstr "Foutopsporing Onderbreking" #: dlls/shdoclc/shdoclc.rc:203 msgid "Debug View" -msgstr "Debug Beeld" +msgstr "Foutopsporingsbeeld" #: dlls/shdoclc/shdoclc.rc:204 msgid "Dump Tree" -msgstr "Log Gehele Boom" +msgstr "Boom Dumpen" #: dlls/shdoclc/shdoclc.rc:205 msgid "Dump Lines" -msgstr "Log Regels" +msgstr "Regels Dumpen" #: dlls/shdoclc/shdoclc.rc:206 msgid "Dump DisplayTree" -msgstr "Log Beeld Boom" +msgstr "BeeldBoom Dumpen" #: dlls/shdoclc/shdoclc.rc:207 msgid "Dump FormatCaches" -msgstr "Log Formaat Caches" +msgstr "FormaatCaches Dumpen" #: dlls/shdoclc/shdoclc.rc:208 msgid "Dump LayoutRects" -msgstr "Log Layout Rects" +msgstr "LayoutRects Dumpen" #: dlls/shdoclc/shdoclc.rc:209 msgid "Memory Monitor" -msgstr "Geheugen Monitor" +msgstr "Geheugenmonitor" #: dlls/shdoclc/shdoclc.rc:210 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "Prestatiemeters" #: dlls/shdoclc/shdoclc.rc:211 msgid "Save HTML" -msgstr "Sla HTML op" +msgstr "HTML Opslaan" #: dlls/shdoclc/shdoclc.rc:213 msgid "&Browse View" @@ -13810,7 +13810,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 Open resources: %4!u!\n" +msgstr "%1 %2 %3 Open bronnen: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -15263,15 +15263,14 @@ msgstr "reg: Foutieve opdrachtregel-parameters\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: De bron- en de doelsleutel kunnen niet hetzelfde zijn\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" +msgstr "" +"De waarde '%1\\%2' komt al voor in de doelsleutel. Wilt u het overschrijven?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0