- wine-devel - winehq.org

[PATCH] testbot: Detect VM revert loops.
by Francois Gouget 16 May '18

16 May '18

VM revert loops typically happen when a VM is misconfigured such that the TestBot fails to access the TestAgent daemon after reverting it. This results in the VM being put offline until it is accessible again through Libvirt which is the case so that it is immediately put back online and reverted again leading to a new error. With this patch the VM is put in maintenance mode for an administrator to look at if it has too many consecutive errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This requires a database upgrade. testbot/bin/LibvirtTool.pl | 30 +++++++++++++++++++++++++----- testbot/ddl/update33.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/doc/winetestbot-schema.dia | 23 +++++++++++++++++++++++ testbot/lib/WineTestBot/Config.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 1 + testbot/web/admin/VMDetails.pl | 4 +++- 7 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 testbot/ddl/update33.sql diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index f9a43bb77..91fe05358 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -193,23 +193,42 @@ sub FatalError($) my ($ErrMessage) = @_; Error $ErrMessage; - # Put the VM offline if nobody else modified its status before us + # Put the VM offline or mark it for maintenance + my $Errors = ($VM->Errors || 0) + 1; + my $NewStatus = $Errors < $MaxVMErrors ? "offline" : "maintenance"; + $VM = CreateVMs()->GetItem($VMKey); - $VM->Status("offline") if ($VM->Status eq $CurrentStatus); - $VM->ChildDeadline(undef); - $VM->ChildPid(undef); + # Put the VM offline if nobody else modified its status before us + if ($VM->Status eq $CurrentStatus) + { + $VM->Status($NewStatus); + $VM->ChildDeadline(undef); + $VM->ChildPid(undef); + $VM->Errors($Errors); + } + else + { + $NewStatus = ""; + } my ($ErrProperty, $SaveErrMessage) = $VM->Save(); if (defined $SaveErrMessage) { LogMsg "Could not put the $VMKey VM offline: $SaveErrMessage ($ErrProperty)\n"; } - elsif ($VM->Status eq "offline") + elsif ($NewStatus eq "offline") { NotifyAdministrator("Putting the $VMKey VM offline", "Could not perform the $Action operation on the $VMKey VM:\n". "\n$ErrMessage\n". "The VM has been put offline and the TestBot will try to regain access to it."); } + elsif ($NewStatus eq "maintenance") + { + NotifyAdministrator("The $VMKey VM needs maintenance", + "Got ". $VM->Errors ." consecutive errors working on the $VMKey VM:\n". + "\n$ErrMessage\n". + "An administrator needs to look at it and to put it back online."); + } exit 1; } @@ -244,6 +263,7 @@ sub ChangeStatus($$;$) $VM->Status($To); if ($Done) { + $VM->Errors(undef) if ($To eq "idle"); $VM->ChildDeadline(undef); $VM->ChildPid(undef); } diff --git a/testbot/ddl/update33.sql b/testbot/ddl/update33.sql new file mode 100644 index 000000000..7239f1dba --- /dev/null +++ b/testbot/ddl/update33.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE VMs + ADD Errors INT(2) NULL + AFTER Status; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 89810ddc0..32eab4e3e 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -49,6 +49,7 @@ CREATE TABLE VMs Type ENUM('win32', 'win64', 'build') NOT NULL, Role ENUM('extra', 'base', 'winetest', 'retired', 'deleted') NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, + Errors INT(2) NULL, ChildPid INT(5) NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 61a722a21..2c720f2d2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -2452,6 +2452,29 @@ <dia:string>##</dia:string> </dia:attribute> </dia:composite> + <dia:composite type="table_attribute"> + <dia:attribute name="name"> + <dia:string>#Errors#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:string>#INT(2)#</dia:string> + </dia:attribute> + <dia:attribute name="comment"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="primary_key"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="nullable"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="unique"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="default_value"> + <dia:string>##</dia:string> + </dia:attribute> + </dia:composite> <dia:composite type="table_attribute"> <dia:attribute name="name"> <dia:string>#ChildPid#</dia:string> diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 2eb4f45a8..4f4c8d82a 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $DbDataSource $DbUsername $DbPassword $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail $RobotEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList $LDAPServer @@ -43,7 +43,7 @@ require Exporter; @EXPORT = qw($UseSSL $LogDir $DataDir $BinDir $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM - $VMToolTimeout $MaxTaskTries $AdminEMail + $VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout $BuildTimeout $ReconfigTimeout $TimeoutMargin $TagPrefix $MaxUnitSize $ProjectName $PatchesMailingList @@ -82,6 +82,9 @@ $SleepAfterRevert = 0; # Take into account $WaitForToolsInVM and $SleepAfterRevert $VMToolTimeout = 6 * 60; +# After three consecutive failures to revert a VM, put it in maintenance mode. +$MaxVMErrors = 3; + # How many times to run a test that fails before giving up. $MaxTaskTries = 3; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 9f5a2c78d..a29eebbba 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -667,6 +667,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Type", "Type of VM", !1, 1, ['win32', 'win64', 'build']), CreateEnumPropertyDescriptor("Role", "VM Role", !1, 1, ['extra', 'base', 'winetest', 'retired', 'deleted']), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), + CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 93e92763a..057147157 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -40,7 +40,7 @@ sub DisplayProperty($$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline)$/); + return "" if ($PropertyName =~ /^(?:ChildPid|ChildDeadline|Errors)$/); return $self->SUPER::DisplayProperty($PropertyDescriptor); } @@ -53,6 +53,8 @@ sub Save($) if ($OldStatus ne $self->{Item}->Status) { + # The administrator action resets the consecutive error count + $self->{Item}->Errors(undef); my ($ErrProperty, $ErrMessage) = $self->{Item}->Validate(); if (!defined $ErrMessage) { -- 2.17.0

1 0

[PATCH] msi/tests: Break out of the loop if both components are found in test_MsiEnumComponentsEx.
by Hans Leidekker 16 May '18

16 May '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/msi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 21a0358aa2..62afa6e747 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -13392,6 +13392,7 @@ static void test_MsiEnumComponentsEx(void) ok( !sid[0], "got \"%s\"\n", sid ); ok( !len, "unexpected length %u\n", len ); found1 = TRUE; + if (found2) break; } if (!strcmp( comp2, guid )) { @@ -13399,6 +13400,7 @@ static void test_MsiEnumComponentsEx(void) ok( sid[0], "empty sid\n" ); ok( len == strlen(sid), "unexpected length %u\n", len ); found2 = TRUE; + if (found1) break; } index++; guid[0] = 0; -- 2.11.0

1 0

[PATCH 1/4] msi: Handle the remote case directly in MsiFormatRecordA().
by Zebediah Figura 16 May '18

16 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/format.c | 59 ++++++++++++++++++++++++++----------------------- dlls/msi/install.c | 23 +++++++++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 8 +++---- 4 files changed, 59 insertions(+), 32 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 0533cc0..d34fb2b 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -952,52 +952,55 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, return r; } -UINT WINAPI MsiFormatRecordA( MSIHANDLE hInstall, MSIHANDLE hRecord, - LPSTR szResult, LPDWORD sz ) +UINT WINAPI MsiFormatRecordA(MSIHANDLE hinst, MSIHANDLE hrec, char *buf, DWORD *sz) { - UINT r; - DWORD len, save; + MSIPACKAGE *package; + MSIRECORD *rec; LPWSTR value; + DWORD len; + UINT r; - TRACE("%d %d %p %p\n", hInstall, hRecord, szResult, sz); + TRACE("%d %d %p %p\n", hinst, hrec, buf, sz); - if (!hRecord) + rec = msihandle2msiinfo(hrec, MSIHANDLETYPE_RECORD); + if (!rec) return ERROR_INVALID_HANDLE; - if (!sz) + package = msihandle2msiinfo(hinst, MSIHANDLETYPE_PACKAGE); + if (!package) { - if (szResult) - return ERROR_INVALID_PARAMETER; - else - return ERROR_SUCCESS; + LPWSTR value = NULL; + MSIHANDLE remote; + + if ((remote = msi_get_remote(hinst))) + { + r = remote_FormatRecord(remote, (struct wire_record *)&rec->count, &value); + + if (!r) + r = msi_strncpyWtoA(value, -1, buf, sz, TRUE); + + midl_user_free(value); + msiobj_release(&rec->hdr); + return r; + } } - r = MsiFormatRecordW( hInstall, hRecord, NULL, &len ); + r = MSI_FormatRecordW(package, rec, NULL, &len); if (r != ERROR_SUCCESS) return r; value = msi_alloc(++len * sizeof(WCHAR)); if (!value) - return ERROR_OUTOFMEMORY; - - r = MsiFormatRecordW( hInstall, hRecord, value, &len ); - if (r != ERROR_SUCCESS) goto done; - save = len + 1; - len = WideCharToMultiByte(CP_ACP, 0, value, len + 1, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, value, len, szResult, *sz, NULL, NULL); + r = MSI_FormatRecordW(package, rec, value, &len); + if (!r) + r = msi_strncpyWtoA(value, len, buf, sz, FALSE); - if (szResult && len > *sz) - { - if (*sz) szResult[*sz - 1] = '\0'; - r = ERROR_MORE_DATA; - } - - *sz = save - 1; - -done: msi_free(value); +done: + msiobj_release(&rec->hdr); + if (package) msiobj_release(&package->hdr); return r; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 45c5537..ca277d3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -168,6 +168,29 @@ UINT msi_strcpy_to_awstring( const WCHAR *str, int len, awstring *awbuf, DWORD * return r; } +UINT msi_strncpyWtoA(const WCHAR *str, int lenW, char *buf, DWORD *sz, BOOL remote) +{ + UINT r = ERROR_SUCCESS; + DWORD lenA; + + if (!sz) + return buf ? ERROR_INVALID_PARAMETER : ERROR_SUCCESS; + + if (lenW < 0) lenW = strlenW(str); + lenA = WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str, lenW + 1, buf, *sz, NULL, NULL); + lenA--; + if (buf && lenA >= *sz) + { + if (*sz) buf[*sz - 1] = 0; + r = ERROR_MORE_DATA; + } + if (remote && lenA >= *sz) + lenA *= 2; + *sz = lenA; + return r; +} + const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) { MSIFOLDER *folder = msi_get_loaded_folder( package, name ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 46cbb43..5c6cd40 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1045,6 +1045,7 @@ extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_get_error_message(MSIDATABASE *, int) DECLSPEC_HIDDEN; +extern UINT msi_strncpyWtoA(const WCHAR *str, int len, char *buf, DWORD *sz, BOOL remote) DECLSPEC_HIDDEN; /* media */ diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 04946d9..320aa6f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -785,28 +785,28 @@ static void test_format_record(MSIHANDLE hinst) sz = 0; r = MsiFormatRecordA(hinst, rec, NULL, &sz); ok(hinst, !r, "got %u\n", r); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 0; strcpy(buffer,"q"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 1; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !buffer[0], "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 7; strcpy(buffer,"x"); r = MsiFormatRecordA(hinst, rec, buffer, &sz); ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); ok(hinst, !strcmp(buffer, "foo 12"), "got \"%s\"\n", buffer); - todo_wine_ok(hinst, sz == 14, "got size %u\n", sz); + ok(hinst, sz == 14, "got size %u\n", sz); sz = 8; strcpy(buffer,"x"); -- 2.7.4

3 11

[PATCH] d3d11/tests: Add test for ClearRenderTargetView.
by Pablo Martin 16 May '18

16 May '18

I stumbled upon this testing problem, where the tested colour differs between wine and windows. Tested on ubuntu 17.10 and all windows versions on testbot. Signed-off-by: Pablo Martin <pmart-wine(a)riseup.net> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a461..307a966ac3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11581,6 +11581,7 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + todo_wine check_texture_color(test_context.backbuffer, 0x800000ff, 0); set_box(&box, 0, 0, 0, 2, 2, 1); ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, -- 2.14.1

2 3

[v2 PATCH 1/2] d2d1: Add ID2D1Device stub.
by Nikolay Sivov 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: renamed source file. dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 ++ dlls/d2d1/{render_target.c => device.c} | 121 ++++++++++++++++++++++++ dlls/d2d1/factory.c | 14 ++- include/d2d1_1.idl | 61 +++++++++++- 5 files changed, 204 insertions(+), 4 deletions(-) rename dlls/d2d1/{render_target.c => device.c} (97%) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 20d3f26f6f..4bfe3b5953 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -8,12 +8,12 @@ C_SRCS = \ bitmap_render_target.c \ brush.c \ dc_render_target.c \ + device.c \ factory.c \ geometry.c \ hwnd_render_target.c \ layer.c \ mesh.c \ - render_target.c \ state_block.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index dbfb83c249..21e2b8835a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,16 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *factory, IDXGIDevice *dxgi_device) DECLSPEC_HIDDEN; + static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { size_t new_capacity, max_capacity; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/device.c similarity index 97% rename from dlls/d2d1/render_target.c rename to dlls/d2d1/device.c index 7afbc84ec5..8321b2f6fa 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/device.c @@ -38,6 +38,11 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) { ID2D1Brush *brush = NULL; @@ -3289,3 +3294,119 @@ HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 return S_OK; } + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID2D1Device) + || IsEqualGUID(riid, &IID_ID2D1Resource) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c..7810e957d4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -375,9 +375,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd..8f8b40b1d9 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -77,6 +87,55 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + FLOAT rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +[ + object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), -- 2.17.0

1 1

[PATCH] kernel32: Check only the low word of CS when printing exceptions.
by Zebediah Figura 15 May '18

15 May '18

Fixes messages along the lines of wine: Unhandled page fault at address 0xf7bd0023:0x7b43d14c (thread 006c), starting debugger... Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/except.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index e00572f..bff8ce2 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -150,9 +150,9 @@ static int format_exception_msg( const EXCEPTION_POINTERS *ptr, char *buffer, in if ((len<0) || (len>=size)) return -1; #ifdef __i386__ - if (ptr->ContextRecord->SegCs != wine_get_cs()) + if (LOWORD(ptr->ContextRecord->SegCs) != wine_get_cs()) len2 = snprintf(buffer+len, size-len, " at address 0x%04x:0x%08x", - ptr->ContextRecord->SegCs, + LOWORD(ptr->ContextRecord->SegCs), (DWORD)ptr->ExceptionRecord->ExceptionAddress); else #endif -- 2.7.4

1 0

[PATCH] dsound: Use IDirectSoundBuffer8 to avoid unnecessary casts
by Alistair Leslie-Hughes 15 May '18

15 May '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/primary.c | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 887ee73..c64a6e7 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -513,24 +513,24 @@ out: /******************************************************************************* * PrimaryBuffer */ -static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer(IDirectSoundBuffer *iface) +static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSoundBuffer8 *iface) { /* IDirectSoundBuffer and IDirectSoundBuffer8 use the same iface. */ return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface); } /* This sets this format for the primary buffer only */ -static HRESULT WINAPI PrimaryBufferImpl_SetFormat(IDirectSoundBuffer *iface, +static HRESULT WINAPI PrimaryBufferImpl_SetFormat(IDirectSoundBuffer8 *iface, const WAVEFORMATEX *wfex) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%p)\n", iface, wfex); return primarybuffer_SetFormat(This->device, wfex); } -static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer *iface, LONG vol) +static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LONG vol) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; HRESULT hr; float fvol; @@ -589,9 +589,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume(IDirectSoundBuffer *iface, LON return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer *iface, LONG *vol) +static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer8 *iface, LONG *vol) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -633,9 +633,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume(IDirectSoundBuffer *iface, LON return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer *iface, DWORD freq) +static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer8 *iface, DWORD freq) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%d)\n",This,freq); /* You cannot set the frequency of the primary buffer */ @@ -643,10 +643,10 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFrequency(IDirectSoundBuffer *iface, return DSERR_CONTROLUNAVAIL; } -static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD reserved1, +static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer8 *iface, DWORD reserved1, DWORD reserved2, DWORD flags) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%08x,%08x,%08x)\n", iface, reserved1, reserved2, flags); @@ -660,9 +660,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD re return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) +static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p)\n", iface); @@ -671,9 +671,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) return DS_OK; } -static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer *iface) +static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); if(ref == 1) @@ -695,9 +695,9 @@ LONG capped_refcount_dec(LONG *out) return ref - 1; } -static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) +static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref; ref = capped_refcount_dec(&This->ref); @@ -709,13 +709,13 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface) return ref; } -static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *iface, +static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD *playpos, DWORD *writepos) { HRESULT hres = DS_OK; UINT32 pad = 0; UINT32 mixpos; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%p)\n", iface, playpos, writepos); @@ -748,9 +748,9 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWORD *status) +static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer8 *iface, DWORD *status) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, status); @@ -768,11 +768,11 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWO } -static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAVEFORMATEX *lpwf, +static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer8 *iface, WAVEFORMATEX *lpwf, DWORD wfsize, DWORD *wfwritten) { DWORD size; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); @@ -801,12 +801,12 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer *iface, DWORD writecursor, +static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer8 *iface, DWORD writecursor, DWORD writebytes, void **lplpaudioptr1, DWORD *audiobytes1, void **lplpaudioptr2, DWORD *audiobytes2, DWORD flags) { HRESULT hres; - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%d,%d,%p,%p,%p,%p,0x%08x) at %d\n", iface, @@ -874,9 +874,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Lock(IDirectSoundBuffer *iface, DWORD wr return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer *iface, DWORD newpos) +static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer8 *iface, DWORD newpos) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%d)\n",This,newpos); /* You cannot set the position of the primary buffer */ @@ -884,9 +884,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetCurrentPosition(IDirectSoundBuffer *i return DSERR_INVALIDCALL; } -static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer *iface, LONG pan) +static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer8 *iface, LONG pan) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -945,9 +945,9 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan(IDirectSoundBuffer *iface, LONG p return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer *iface, LONG *pan) +static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer8 *iface, LONG *pan) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; float fvol; HRESULT hr; @@ -989,10 +989,10 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan(IDirectSoundBuffer *iface, LONG * return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void *p1, DWORD x1, +static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer8 *iface, void *p1, DWORD x1, void *p2, DWORD x2) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p,%d,%p,%d)\n", iface, p1, x1, p2, x2); @@ -1008,16 +1008,16 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Restore(IDirectSoundBuffer *iface) +static HRESULT WINAPI PrimaryBufferImpl_Restore(IDirectSoundBuffer8 *iface) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); FIXME("(%p):stub\n",This); return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer *iface, DWORD *freq) +static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer8 *iface, DWORD *freq) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, freq); @@ -1037,17 +1037,17 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency(IDirectSoundBuffer *iface, return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_Initialize(IDirectSoundBuffer *iface, IDirectSound *dsound, +static HRESULT WINAPI PrimaryBufferImpl_Initialize(IDirectSoundBuffer8 *iface, IDirectSound *dsound, const DSBUFFERDESC *dbsd) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); WARN("(%p) already initialized\n", This); return DSERR_ALREADYINITIALIZED; } -static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer *iface, DSBCAPS *caps) +static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer8 *iface, DSBCAPS *caps) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, caps); @@ -1071,10 +1071,10 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps(IDirectSoundBuffer *iface, DSBCA return DS_OK; } -static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface, REFIID riid, +static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer8 *iface, REFIID riid, void **ppobj) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj); @@ -1126,7 +1126,7 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface(IDirectSoundBuffer *iface return E_NOINTERFACE; } -static const IDirectSoundBufferVtbl dspbvt = +static const IDirectSoundBuffer8Vtbl dspbvt = { PrimaryBufferImpl_QueryInterface, PrimaryBufferImpl_AddRef, @@ -1176,7 +1176,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->refiks = 0; dsb->numIfaces = 0; dsb->device = device; - dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; + dsb->IDirectSoundBuffer8_iface.lpVtbl = &dspbvt; dsb->IDirectSound3DListener_iface.lpVtbl = &ds3dlvt; dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; dsb->dsbd = *dsbd; -- 1.9.1

2 1

[PATCH] winmm: Fix superfluous MOM_DONE callback messages.
by Akihiro Sagawa 15 May '18

15 May '18

Fix Bug 44974. This is a regression introduced by 185d98bbfdbf7ef10ef52d0264a5a38aedd3b19d. Because midiOutLongMsg's MOM_DONE callback message confuses an application, we don't rely on midiOut callback routine anymore in MIDI stream processing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 18 ++++++++++++++++-- dlls/winmm/winmm.c | 13 +++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-)

2 1

[PATCH v2] d3d11/tests: Add test for depth clip.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..ca6130b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

1 0

[PATCH] d3d11: Return 0 for the class instance count from the shader getters.
by Henri Verbeet 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d87603df8..5bc5018d634 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a4614..9c12a768e20 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9684,6 +9684,7 @@ static void test_clear_state(void) float blend_factor[4]; ID3D11Device *device; BOOL predicate_value; + UINT instance_count; DXGI_FORMAT format; UINT sample_mask; UINT stencil_ref; @@ -9719,8 +9720,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9762,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9783,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9805,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9827,10 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + ok(!instance_count, "Got unexpected instance count %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 2.11.0

1 0

[PATCH] d2d1/tests: Adjust expected value for linear brush test.
by Józef Kucia 15 May '18

15 May '18

Fixes the test on Linux with Nvidia. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 9bd9e2b19d17..f8332946b953 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1754,7 +1754,7 @@ static void test_linear_brush(void) {200, 150, 0xffc03e00}, {240, 150, 0xffffffff}, {280, 150, 0xffffffff}, {320, 150, 0xffffffff}, {240, 180, 0xffffffff}, {280, 180, 0xffff4040}, {320, 180, 0xffff4040}, {380, 180, 0xffffffff}, {200, 210, 0xffffffff}, {240, 210, 0xffa99640}, {280, 210, 0xffb28d40}, {320, 210, 0xffbb8440}, - {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fd40}, + {360, 210, 0xffc47b40}, {400, 210, 0xffffffff}, {200, 240, 0xffffffff}, {280, 240, 0xff41fe40}, {320, 240, 0xff49f540}, {360, 240, 0xff52ec40}, {440, 240, 0xffffffff}, {240, 270, 0xffffffff}, {280, 270, 0xff408eb0}, {320, 270, 0xff4097a7}, {360, 270, 0xff40a19e}, {440, 270, 0xffffffff}, {280, 300, 0xffffffff}, {320, 300, 0xff4040ff}, {360, 300, 0xff4040ff}, {400, 300, 0xff406ad4}, -- 2.16.1

2 1

[PATCH 1/5] wined3d: Implement sampleinfo instruction.
by Józef Kucia 15 May '18

15 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c058737165ba..74d4d19d3795 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -162,6 +162,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, + {"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES}, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, @@ -3938,6 +3939,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, + {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eddf35d83a04..40d19d028ffe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6022,6 +6022,45 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) shader_addline(buffer, ")%s);\n", dst_swizzle); } +static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + enum wined3d_shader_resource_type resource_type; + enum wined3d_data_type dst_data_type; + unsigned int resource_idx, bind_idx; + char dst_swizzle[6]; + DWORD write_mask; + + if (!gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + { + FIXME("textureSamples() is not supported.\n"); + return; + } + + dst_data_type = ins->dst[0].reg.data_type; + if (ins->flags == WINED3DSI_SAMPLE_INFO_UINT) + dst_data_type = WINED3D_DATA_UINT; + else if (ins->flags) + FIXME("Unhandled flags %#x.\n", ins->flags); + + resource_idx = ins->src[0].reg.idx[0].offset; + resource_type = reg_maps->resource_info[resource_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + return; + } + bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, WINED3D_SAMPLER_DEFAULT); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], dst_data_type); + shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(textureSamples(%s_sampler%u), 0, 0, 0)%s);\n", + dst_data_type == WINED3D_DATA_UINT ? "uvec4" : "vec4", + shader_glsl_get_prefix(reg_maps->shader_version.type), bind_idx, dst_swizzle); +} + static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -7514,6 +7553,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); if (gl_info->supported[ARB_SHADER_STORAGE_BUFFER_OBJECT]) shader_addline(buffer, "#extension GL_ARB_shader_storage_buffer_object : enable\n"); + if (gl_info->supported[ARB_SHADER_TEXTURE_IMAGE_SAMPLES]) + shader_addline(buffer, "#extension GL_ARB_shader_texture_image_samples : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) shader_addline(buffer, "#extension GL_ARB_shading_language_420pack : enable\n"); if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) @@ -11309,7 +11350,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_INFO */ NULL, + /* WINED3DSIH_SAMPLE_INFO */ shader_glsl_sample_info, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_POS */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3750deea148a..be1b5962ed5d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1712,7 +1712,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); } - else if (ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + else if ((ins.handler_idx == WINED3DSIH_BUFINFO && ins.src[0].reg.type == WINED3DSPR_RESOURCE) + || ins.handler_idx == WINED3DSIH_SAMPLE_INFO) { shader_record_sample(reg_maps, ins.src[0].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT, reg_maps->sampler_map.count); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 49205f9c1205..db1929dbcbce 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -95,6 +95,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_LOAD_STORE, ARB_SHADER_IMAGE_SIZE, ARB_SHADER_STORAGE_BUFFER_OBJECT, + ARB_SHADER_TEXTURE_IMAGE_SAMPLES, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADING_LANGUAGE_420PACK, -- 2.16.1

2 8

[PATCH] dxgi: Allow setting maximum frame latency parameter.
by Nikolay Sivov 15 May '18

15 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/device.c | 24 ++++++++++++++++++------ dlls/dxgi/tests/device.c | 19 +++++++++++-------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2c85c1da6b..0341bb0e99 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -258,22 +258,34 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetGPUThreadPriority(IWineDXGIDevic static HRESULT STDMETHODCALLTYPE dxgi_device_SetMaximumFrameLatency(IWineDXGIDevice *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + + TRACE("iface %p, max_latency %u.\n", iface, max_latency); if (max_latency > DXGI_FRAME_LATENCY_MAX) return DXGI_ERROR_INVALID_CALL; - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDevice *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - if (max_latency) - *max_latency = DXGI_FRAME_LATENCY_DEFAULT; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + if (!max_latency) + return DXGI_ERROR_INVALID_CALL; + + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8172269e74..3ad968308e 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3426,26 +3426,29 @@ static void test_maximum_frame_latency(void) if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) { + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* 0 does not reset to the default frame latency on all Windows versions. */ ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), "Got unexpected maximum frame latency %u.\n", max_latency); -- 2.17.0

2 1

[PATCH 4/4] mshtml/tests: Added more COM aggregation tests.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/protocol.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)

1 0

[PATCH 3/4] mshtml: Properly support COM aggregation in about and res protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/main.c | 2 + dlls/mshtml/protocol.c | 146 ++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 76 deletions(-)

1 0

[PATCH 2/4] mshtml: Share more code between res and about protocol handlers.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 366 +++++++++++++++---------------------------------- 1 file changed, 112 insertions(+), 254 deletions(-)

1 0

[PATCH 1/4] mshtml: Share the same structure for about and res protocols.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/protocol.c | 106 +++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 61 deletions(-)

1 0

[PATCH 1/4] jscript: Support accessor properties in getOwnPropertyDescriptor.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 9 +++++++++ dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+)

2 1

[PATCH v2] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. v2: Replaced some Hungarian notation in winternl.h. dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..07f42cf00d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + const UNICODE_STRING *FullDllName; + const UNICODE_STRING *BaseDllName; + void *DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH 4/4] jscript: Support setting accessor property value.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 30 +++++++++++++++++++++--------- dlls/mshtml/tests/es5.js | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 9 deletions(-)

1 0

[PATCH 3/4] jscript: Move handling PROPF_WRITABLE to property type specific code.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)

1 0

[PATCH 2/4] jscript: Support getting value of accessor property.
by Jacek Caban 15 May '18

15 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 20 ++++++++++++++------ dlls/mshtml/tests/es5.js | 10 ++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-)

1 0

[PATCH 1/2] d2d1: Add ID2D1Device stub.
by Nikolay Sivov 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Comparing to what's in staging now, I renamed some things for consistency, and used existing source file. Same for device context, I think we should consider using render_target.c for it, or rename it to devicecontext.c. dlls/d2d1/factory.c | 143 +++++++++++++++++++++++++++++++++++++++++++- include/d2d1_1.idl | 61 ++++++++++++++++++- 2 files changed, 201 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 9bacc8583c..1ea27614e4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -30,6 +30,135 @@ struct d2d_settings d2d_settings = ~0u, /* No ID2D1Factory version limit by default. */ }; +struct d2d_device +{ + ID2D1Device ID2D1Device_iface; + LONG refcount; + ID2D1Factory1 *factory; + IDXGIDevice *dxgi_device; +}; + +static inline struct d2d_device *impl_from_ID2D1Device(ID2D1Device *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_device, ID2D1Device_iface); +} + +static HRESULT WINAPI d2d_device_QueryInterface(ID2D1Device *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ID2D1Device) + || IsEqualGUID(riid, &IID_ID2D1Resource) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID2D1Device_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d2d_device_AddRef(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI d2d_device_Release(ID2D1Device *iface) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (refcount == 0) + { + IDXGIDevice_Release(device->dxgi_device); + ID2D1Factory1_Release(device->factory); + heap_free(device); + } + + return refcount; +} + +static void WINAPI d2d_device_GetFactory(ID2D1Device *iface, ID2D1Factory **factory) +{ + struct d2d_device *device = impl_from_ID2D1Device(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + *factory = (ID2D1Factory *)device->factory; + ID2D1Factory1_AddRef(device->factory); +} + +static HRESULT WINAPI d2d_device_CreateDeviceContext(ID2D1Device *iface, D2D1_DEVICE_CONTEXT_OPTIONS options, + ID2D1DeviceContext **context) +{ + FIXME("iface %p, options %#x, context %p stub!\n", iface, options, context); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d2d_device_CreatePrintControl(ID2D1Device *iface, IWICImagingFactory *wic_factory, + IPrintDocumentPackageTarget *document_target, const D2D1_PRINT_CONTROL_PROPERTIES *desc, + ID2D1PrintControl **print_control) +{ + FIXME("iface %p, wic_factory %p, document_target %p, desc %p, print_control %p stub!\n", iface, wic_factory, + document_target, desc, print_control); + + return E_NOTIMPL; +} + +static void WINAPI d2d_device_SetMaximumTextureMemory(ID2D1Device *iface, UINT64 max_texture_memory) +{ + FIXME("iface %p, max_texture_memory %s stub!\n", iface, wine_dbgstr_longlong(max_texture_memory)); +} + +static UINT64 WINAPI d2d_device_GetMaximumTextureMemory(ID2D1Device *iface) +{ + FIXME("iface %p stub!\n", iface); + + return 0; +} + +static HRESULT WINAPI d2d_device_ClearResources(ID2D1Device *iface, UINT msec_since_use) +{ + FIXME("iface %p, msec_since_use %u stub!\n", iface, msec_since_use); + + return E_NOTIMPL; +} + +static const struct ID2D1DeviceVtbl d2d_device_vtbl = +{ + d2d_device_QueryInterface, + d2d_device_AddRef, + d2d_device_Release, + d2d_device_GetFactory, + d2d_device_CreateDeviceContext, + d2d_device_CreatePrintControl, + d2d_device_SetMaximumTextureMemory, + d2d_device_GetMaximumTextureMemory, + d2d_device_ClearResources, +}; + +static void d2d_device_init(struct d2d_device *device, ID2D1Factory1 *iface, IDXGIDevice *dxgi_device) +{ + device->ID2D1Device_iface.lpVtbl = &d2d_device_vtbl; + device->refcount = 1; + device->factory = iface; + ID2D1Factory1_AddRef(device->factory); + device->dxgi_device = dxgi_device; + IDXGIDevice_AddRef(device->dxgi_device); +} + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -375,9 +504,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, IDXGIDevice *dxgi_device, ID2D1Device **device) { - FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + struct d2d_device *object; - return E_NOTIMPL; + TRACE("iface %p, dxgi_device %p, device %p.\n", iface, dxgi_device, device); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_device_init(object, iface, dxgi_device); + + TRACE("Create device %p.\n", object); + *device = &object->ID2D1Device_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1fbbb301dd..8f8b40b1d9 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -18,12 +18,22 @@ import "d2d1.idl"; -interface ID2D1Device; +interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; +interface IPrintDocumentPackageTarget; +interface ID2D1PrintControl; +interface IWICImagingFactory; + +typedef enum D2D1_DEVICE_CONTEXT_OPTIONS +{ + D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, + D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS = 1, + D2D1_DEVICE_CONTEXT_OPTIONS_FORCE_DWORD = 0xffffffff, +} D2D1_DEVICE_CONTEXT_OPTIONS; typedef enum D2D1_STROKE_TRANSFORM_TYPE { @@ -77,6 +87,55 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); +typedef enum D2D1_PRINT_FONT_SUBSET_MODE +{ + D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, + D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, + D2D1_PRINT_FONT_SUBSET_MODE_NONE = 2, + D2D1_PRINT_FONT_SUBSET_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_PRINT_FONT_SUBSET_MODE; + +typedef enum D2D1_COLOR_SPACE +{ + D2D1_COLOR_SPACE_CUSTOM = 0, + D2D1_COLOR_SPACE_SRGB = 1, + D2D1_COLOR_SPACE_SCRGB = 2, + D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff, +} D2D1_COLOR_SPACE; + +typedef struct D2D1_PRINT_CONTROL_PROPERTIES +{ + D2D1_PRINT_FONT_SUBSET_MODE fontSubset; + FLOAT rasterDPI; + D2D1_COLOR_SPACE colorSpace; +} D2D1_PRINT_CONTROL_PROPERTIES; + +[ + object, + uuid(47dd575d-ac05-4cdd-8049-9b02cd16f44c), + local, +] +interface ID2D1Device : ID2D1Resource +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext **context + ); + HRESULT CreatePrintControl( + [in] IWICImagingFactory *wic_factory, + [in] IPrintDocumentPackageTarget *document_target, + [in] const D2D1_PRINT_CONTROL_PROPERTIES *desc, + [out] ID2D1PrintControl **print_control + ); + void SetMaximumTextureMemory( + [in] UINT64 max_texture_memory + ); + UINT64 GetMaximumTextureMemory(); + HRESULT ClearResources( + [in, defaultvalue(0)] UINT msec_since_use + ); +} + [ object, uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), -- 2.17.0

1 1

[PATCH] user32: Simplify CheckMenuRadioItem().
by Huw Davies 15 May '18

15 May '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/user32/menu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5b83703ace..8c541cc4f9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5253,27 +5253,19 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT flags) { - POPUPMENU *first_menu = NULL, *check_menu = NULL; - UINT i, first_pos, check_pos; + POPUPMENU *first_menu = NULL, *check_menu; + UINT i, check_pos; BOOL done = FALSE; for (i = first; i <= last; i++) { MENUITEM *item; - if (!first_menu) - { - if (!(first_menu = find_menu_item(hMenu, i, flags, &first_pos))) - continue; + if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) + continue; - check_pos = first_pos; - check_menu = grab_menu_ptr(first_menu->obj.handle); - } - else - { - if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos))) - continue; - } + if (!first_menu) + first_menu = grab_menu_ptr(check_menu->obj.handle); if (first_menu != check_menu) { -- 2.16.2

1 0

[PATCH 3/3] mstask: Implement ITask::GetExitCode().
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 4bf916660e..d487aeb5a5 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -59,10 +59,9 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; - UINT flags; HRESULT status; WORD idle_minutes, deadline_minutes; - DWORD priority, maxRunTime; + DWORD flags, priority, maxRunTime, exit_code; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -492,10 +491,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, exit_code); + TaskImpl *This = impl_from_ITask(iface); - *exit_code = 0; - return SCHED_S_TASK_HAS_NOT_RUN; + TRACE("(%p, %p)\n", iface, exit_code); + + *exit_code = This->exit_code; + return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) @@ -1073,6 +1074,7 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("maximum_runtime %u\n", fixed->maximum_runtime); This->maxRunTime = fixed->maximum_runtime; TRACE("exit_code %#x\n", fixed->exit_code); + This->exit_code = fixed->exit_code; TRACE("status %08x\n", fixed->status); This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); @@ -1428,7 +1430,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta fixed.idle_deadline = This->deadline_minutes; fixed.priority = This->priority; fixed.maximum_runtime = This->maxRunTime; - fixed.exit_code = 0; + fixed.exit_code = This->exit_code; if (This->status == SCHED_S_TASK_NOT_SCHEDULED && This->trigger_count) This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; @@ -1656,6 +1658,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->task_name = heap_strdupW(task_name); This->flags = 0; This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->exit_code = 0; This->idle_minutes = 10; This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS; -- 2.16.3

1 0

[PATCH 2/3] mstask: When writing triggers access the trigger data directly to avoid noise in the traces.
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5129d9a513..4bf916660e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1311,46 +1311,41 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) return WriteFile(hfile, data, data_size, &size, NULL); } -static HRESULT write_triggers(ITask *task, HANDLE hfile) +static HRESULT write_triggers(TaskImpl *This, HANDLE hfile) { WORD count, i, idx = 0xffff; DWORD size; - HRESULT hr; + HRESULT hr = S_OK; ITaskTrigger *trigger; - hr = ITask_GetTriggerCount(task, &count); - if (hr != S_OK) return hr; + count = This->trigger_count; /* Windows saves a .job with at least 1 trigger */ if (!count) { - hr = ITask_CreateTrigger(task, &idx, &trigger); + hr = ITask_CreateTrigger(&This->ITask_iface, &idx, &trigger); if (hr != S_OK) return hr; ITaskTrigger_Release(trigger); count = 1; } - if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); - - for (i = 0; i < count; i++) + if (WriteFile(hfile, &count, sizeof(count), &size, NULL)) { - TASK_TRIGGER task_trigger; - - hr = ITask_GetTrigger(task, i, &trigger); - if (hr != S_OK) return hr; - - hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); - ITaskTrigger_Release(trigger); - if (hr != S_OK) break; - - if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) + { + if (!WriteFile(hfile, &This->trigger[i], sizeof(This->trigger[0]), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + break; + } + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); if (idx != 0xffff) - ITask_DeleteTrigger(task, idx); + ITask_DeleteTrigger(&This->ITask_iface, idx); return hr; } @@ -1508,7 +1503,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta } /* Triggers */ - hr = write_triggers(task, hfile); + hr = write_triggers(This, hfile); if (hr != S_OK) goto failed; -- 2.16.3

1 0

[PATCH 1/3] mstask: Prefer built-in implementation.
by Dmitry Timoshkov 15 May '18

15 May '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/mstask_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c index e747af69e8..b028b151e8 100644 --- a/dlls/mstask/mstask_main.c +++ b/dlls/mstask/mstask_main.c @@ -41,8 +41,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL; -- 2.16.3

1 0

[PATCH v2 2/5] msi/tests: More accurately calculate estimated size.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: query for page size dlls/msi/tests/action.c | 113 +++++++++++------------------------------------- 1 file changed, 26 insertions(+), 87 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 8e72ff4..849975d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2321,45 +2321,6 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } -static void check_reg_dword4(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4, - "Expected %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, val); -} - -static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, - DWORD expected4, DWORD expected5, DWORD line) -{ - DWORD val, size, type; - LONG res; - - size = sizeof(DWORD); - res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); - - if (res != ERROR_SUCCESS || type != REG_DWORD) - { - ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); - return; - } - - ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3 || val == expected4 || - val == expected5, - "Expected %d, %d, %d, %d or %d, got %d\n", expected1, expected2, expected3, expected4, expected5, val); -} - #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); @@ -2387,24 +2348,6 @@ static void check_reg_dword5(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD e RegDeleteValueA(prodkey, name); \ } while(0) -#define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); - -#define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ - do { \ - check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - -#define CHECK_REG_DWORD4(prodkey, name, expected1, expected2, expected3, expected4) \ - check_reg_dword4(prodkey, name, expected1, expected2, expected3, expected4, __LINE__); - -#define CHECK_DEL_REG_DWORD5(prodkey, name, expected1, expected2, expected3, expected4 ,expected5) \ - do { \ - check_reg_dword5(prodkey, name, expected1, expected2, expected3, expected4, expected5, __LINE__); \ - RegDeleteValueA(prodkey, name); \ - } while(0) - static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2414,6 +2357,22 @@ static void get_date_str(LPSTR date) sprintf(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); } +/* EstimatedSize is the size in KiB of .msi + installed files, rounded up to page size. */ +static DWORD get_estimated_size(void) +{ + SYSTEM_INFO si; + HANDLE file; + DWORD size; + + GetSystemInfo(&si); + + file = CreateFileA(msifile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + size = ((GetFileSize(file, NULL) + si.dwPageSize - 1) / si.dwPageSize + 1); + size = size * si.dwPageSize / 1024; + CloseHandle(file); + return size; +} + static void test_register_product(void) { UINT r; @@ -2505,9 +2464,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2547,9 +2504,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -2616,9 +2571,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(hkey, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", get_estimated_size()); delete_key(hkey, "", access); RegCloseKey(hkey); @@ -2658,9 +2611,7 @@ static void test_register_product(void) CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine - { - CHECK_DEL_REG_DWORD5(props, "EstimatedSize", 12, -12, 4, 10, 24); - } + CHECK_DEL_REG_DWORD(props, "EstimatedSize", get_estimated_size()); delete_key(props, "", access); RegCloseKey(props); @@ -3525,9 +3476,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3631,9 +3580,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3714,9 +3661,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3774,9 +3719,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3834,9 +3777,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -20, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); @@ -3917,9 +3858,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "VersionMinor", 1); CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine - { - CHECK_REG_DWORD4(prodkey, "EstimatedSize", 12, -12, 10, 24); - } + CHECK_REG_DWORD(prodkey, "EstimatedSize", get_estimated_size()); RegCloseKey(prodkey); -- 2.7.4

2 1

[PATCH] testbot/Engine: Don't delete the old logs when requeuing a Task.
by Francois Gouget 15 May '18

15 May '18

This makes it possible to access its logs for diagnosis until it actually gets restarted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 0f8de82af..ce3509440 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -143,7 +143,6 @@ sub Cleanup($;$$) if ($Requeue) { LogMsg "Requeuing $TaskKey\n"; - $Task->RmTree(); $Task->Status("queued"); $Task->Started(undef); $Task->Ended(undef); -- 2.17.0

1 0

[PATCH] testbot: Keep the old logs around.
by Francois Gouget 15 May '18

15 May '18

This helps figure out why the test was rerun: was it because it timed out the first time around? Because there was a network glitch? Or because the TestBot script got stuck or died unexpectedly? The error message in the old logs will make it clear. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 27 +++++++++++- testbot/web/JobDetails.pl | 75 ++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 36cbfadbe..69d551b84 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -83,7 +83,32 @@ sub _SetupTask($$) my ($VM, $self) = @_; # Remove the previous run's files if any - $self->RmTree(); + my $Dir = $self->GetDir(); + if (-d $Dir) + { + mkpath("$Dir.new", 0, 0775); + rename "$Dir/log.old", "$Dir.new/log.old" if (-f "$Dir/log.old"); + rename "$Dir/err.old", "$Dir.new/err.old" if (-f "$Dir/err.old"); + foreach my $Filename ("log", "err") + { + if (open(my $Src, "<", "$Dir/$Filename")) + { + if (open(my $Dst, ">>", "$Dir.new/$Filename.old")) + { + print $Dst "----- Run ", ($self->TestFailures || 0), " $Filename\n"; + while (my $Line = <$Src>) + { + print $Dst $Line; + } + close($Dst); + } + close($Src); + } + } + + $self->RmTree(); + rename("$Dir.new", $Dir); + } # Capture Perl errors in the task's generic error log my $TaskDir = $self->CreateDir(); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 0213eb5e2..4d9a77a57 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -249,16 +249,21 @@ sub GenerateBody($) $self->CGI->escapeHTML($VM->Details || "No details!"), "</details>\n"; - my $ScreenshotParamName = "scrshot_$Key"; my $FullLogParamName = "log_$Key"; - my $LogName = "$TaskDir/log"; - my $ErrName = "$TaskDir/err"; + my $FullLog = $self->GetParam($FullLogParamName); + $FullLog = "" if ($FullLog !~ /^[12]$/); + + my $ScreenshotParamName = "scrshot_$Key"; + my $Screenshot = $self->GetParam($ScreenshotParamName); + $Screenshot = "" if ($Screenshot ne "1"); + + print "<div class='TaskMoreInfoLinks'>\n"; # FIXME: Disable live screenshots for now if (0 && $StepTask->Status eq "running" && ($StepTask->Type eq "single" || $StepTask->Type eq "suite")) { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?VMName=" . uri_escape($VM->Name); print "<div class='Screenshot'><img src='" . @@ -277,7 +282,7 @@ sub GenerateBody($) } elsif (-r "$TaskDir/screenshot.png") { - if (defined($self->GetParam($ScreenshotParamName))) + if ($Screenshot) { my $URI = "/Screenshot.pl?JobKey=" . uri_escape($self->{JobId}) . "&StepKey=" . uri_escape($StepTask->StepNo) . @@ -289,10 +294,7 @@ sub GenerateBody($) { my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . "&$ScreenshotParamName=1"; - if (defined($self->GetParam($FullLogParamName))) - { - $URI .= "&$FullLogParamName=1"; - } + $URI .= "&$FullLogParamName=$FullLog"; $URI .= "#k" . uri_escape($Key); print "<div class='TaskMoreInfoLink'><a href='" . $self->CGI->escapeHTML($URI) . @@ -300,29 +302,46 @@ sub GenerateBody($) print "\n"; } } - my $FullLog = !1; - if (-r $LogName) + + my $LogName = "$TaskDir/log"; + my $ErrName = "$TaskDir/err"; + if (-r $LogName and $FullLog != "1") { - if (defined($self->GetParam($FullLogParamName))) - { - $FullLog = 1; - } - else - { - my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . - "&$FullLogParamName=1"; - if (defined($self->GetParam($ScreenshotParamName))) - { - $URI .= "&$ScreenshotParamName=1"; - } - $URI .= "#k" . uri_escape($Key); - print "<div class='TaskMoreInfoLink'><a href='" . - $self->CGI->escapeHTML($URI) . - "'>Show full log</a></div>\n"; - } + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=1"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show full log</a></div>\n"; + } + if ((-r $LogName or -r $ErrName) and $FullLog == "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}); + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show latest log</a></div>\n"; + } + if ((-r "$LogName.old" or -r "$ErrName.old") and $FullLog != "2") + { + my $URI = $ENV{"SCRIPT_NAME"} . "?Key=" . uri_escape($self->{JobId}) . + "&$FullLogParamName=2"; + $URI .= "&$ScreenshotParamName=$Screenshot"; + $URI .= "#k" . uri_escape($Key); + print "<div class='TaskMoreInfoLink'><a href='" . + $self->CGI->escapeHTML($URI) . + "'>Show old logs</a></div>\n"; } print "</div>\n"; + if ($FullLog eq "2") + { + $LogName .= ".old"; + $ErrName .= ".old"; + } + if (open LOGFILE, "<$LogName") { my $HasLogEntries = !1; -- 2.17.0

1 0

[PATCH 2/2] d3d11: Return valid values for shader class instances
by Alistair Leslie-Hughes 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> Instead of returning garbage data for class instances, return 0 class instances. https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/device.c | 12 ++++++++++++ dlls/d3d11/tests/d3d11.c | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e4d8760..5bc5018 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1522,6 +1522,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) @@ -1577,6 +1579,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_VSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) @@ -1745,6 +1749,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) @@ -2187,6 +2193,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) @@ -2294,6 +2302,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_domain_shader(device->wined3d_device))) @@ -2426,6 +2436,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo if (class_instances || class_instance_count) FIXME("Dynamic linking not implemented yet.\n"); + if (class_instance_count) + *class_instance_count = 0; wined3d_mutex_lock(); if (!(wined3d_shader = wined3d_device_get_compute_shader(device->wined3d_device))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1345b0e..72ca70f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9722,7 +9722,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9744,7 +9743,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9766,7 +9764,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9788,7 +9785,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9811,7 +9807,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, @@ -9834,7 +9829,6 @@ static void test_clear_state(void) instance_count = 100; ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); - todo_wine ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) -- 1.9.1

1 0

[PATCH 1/2] d3d11: Test shader class instance count
by Alistair Leslie-Hughes 15 May '18

15 May '18

From: Lucian Poston <lucian.poston(a)gmail.com> https://bugs.winehq.org/show_bug.cgi?id=44052 Signed-off-by: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d11/tests/d3d11.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..1345b0e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -9688,7 +9688,7 @@ static void test_clear_state(void) UINT sample_mask; UINT stencil_ref; ULONG refcount; - UINT count, i; + UINT count, i, instance_count; HRESULT hr; device_desc.feature_level = &feature_level; @@ -9719,8 +9719,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_VSGetShader(context, &tmp_vs, NULL, &instance_count); ok(!tmp_vs, "Got unexpected vertex shader %p.\n", tmp_vs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_HSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9738,8 +9741,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_HSGetShader(context, &tmp_hs, NULL, &instance_count); ok(!tmp_hs, "Got unexpected hull shader %p.\n", tmp_hs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_DSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9757,8 +9763,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_DSGetShader(context, &tmp_ds, NULL, &instance_count); ok(!tmp_ds, "Got unexpected domain shader %p.\n", tmp_ds); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_GSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9776,8 +9785,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_GSGetShader(context, &tmp_gs, NULL, &instance_count); ok(!tmp_gs, "Got unexpected geometry shader %p.\n", tmp_gs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_PSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9796,8 +9808,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_PSGetShader(context, &tmp_ps, NULL, &instance_count); ok(!tmp_ps, "Got unexpected pixel shader %p.\n", tmp_ps); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetConstantBuffers(context, 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, tmp_buffer); @@ -9816,8 +9831,11 @@ static void test_clear_state(void) { ok(!tmp_sampler[i], "Got unexpected sampler %p in slot %u.\n", tmp_sampler[i], i); } - ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, 0); + instance_count = 100; + ID3D11DeviceContext_CSGetShader(context, &tmp_cs, NULL, &instance_count); ok(!tmp_cs, "Got unexpected compute shader %p.\n", tmp_cs); + todo_wine + ok(instance_count == 0, "Expected 0 instances, got %u.\n", instance_count); ID3D11DeviceContext_CSGetUnorderedAccessViews(context, 0, D3D11_PS_CS_UAV_REGISTER_COUNT, tmp_uav); for (i = 0; i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { -- 1.9.1

1 0

[PATCH] ntdll: Add LdrRegisterDllNotification stub
by Alex Henrie 15 May '18

15 May '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=45205 Based on a Wine Staging patch by Michael Müller. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1a3dd801a1..01d7db7c0c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1461,6 +1461,16 @@ NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, return STATUS_SUCCESS; } +/****************************************************************** + * LdrRegisterDllNotification (NTDLL.@) + */ +NTSTATUS WINAPI LdrRegisterDllNotification(ULONG flags, PLDR_DLL_NOTIFICATION_FUNCTION callback, + void *context, void **cookie) +{ + FIXME( "(%04x, %p, %p, %p) stub!\n", flags, callback, context, cookie ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * LdrLockLoaderLock (NTDLL.@) * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 7a58d7e37d..73b3103ba1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -83,6 +83,7 @@ @ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stdcall LdrQueryImageFileExecutionOptions(ptr wstr long ptr long ptr) @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) +@ stdcall LdrRegisterDllNotification(long ptr ptr ptr) @ stdcall LdrResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) @ stub LdrSetAppCompatDllRedirectionCallback @ stub LdrSetDllManifestProber diff --git a/include/winternl.h b/include/winternl.h index c84e6d7f88..308bd5818e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,32 @@ typedef struct _LDR_MODULE HANDLE ActivationContext; } LDR_MODULE, *PLDR_MODULE; +typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_LOADED_NOTIFICATION_DATA, *PLDR_DLL_LOADED_NOTIFICATION_DATA; + +typedef struct _LDR_DLL_UNLOADED_NOTIFICATION_DATA +{ + ULONG Flags; + PCUNICODE_STRING FullDllName; + PCUNICODE_STRING BaseDllName; + PVOID DllBase; + ULONG SizeOfImage; +} LDR_DLL_UNLOADED_NOTIFICATION_DATA, *PLDR_DLL_UNLOADED_NOTIFICATION_DATA; + +typedef union _LDR_DLL_NOTIFICATION_DATA +{ + LDR_DLL_LOADED_NOTIFICATION_DATA Loaded; + LDR_DLL_UNLOADED_NOTIFICATION_DATA Unloaded; +} LDR_DLL_NOTIFICATION_DATA, *PLDR_DLL_NOTIFICATION_DATA; + +typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICATION_DATA*, void*); + /* those defines are (some of the) regular LDR_MODULE.Flags values */ #define LDR_IMAGE_IS_DLL 0x00000004 #define LDR_LOAD_IN_PROGRESS 0x00001000 -- 2.17.0

1 0

[PATCH] d3d11/tests: Add test for depth clip.
by Zebediah Figura 15 May '18

15 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 63f964a..ca6130b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26567,6 +26567,79 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_RASTERIZER_DESC rs_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int count; + D3D11_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D11DeviceContext_RSGetViewports(context, &count, &vp); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rs); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + set_viewport(context, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D11DepthStencilView_Release(dsv); + ID3D11Texture2D_Release(texture); + ID3D11RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -26704,4 +26777,5 @@ START_TEST(d3d11) test_unbound_multisample_texture(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

1 0

[PATCH] wsdapi/tests: Expand ProbeHandler tests.
by Owen Rudge 14 May '18

14 May '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 118 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 107 insertions(+), 11 deletions(-)

2 1

[PATCH 1/4] gdiplus: Use ARRAY_SIZE() macro.
by Nikolay Sivov 14 May '18

14 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/image.c | 6 +++--- dlls/gdiplus/metafile.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0114a510ca..3aeb654086 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -232,7 +232,7 @@ static const char HatchBrushes[][8] = { GpStatus get_hatch_data(GpHatchStyle hatchstyle, const char **result) { - if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) + if (hatchstyle < ARRAY_SIZE(HatchBrushes)) { *result = HatchBrushes[hatchstyle]; return Ok; diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f99b026b25..64778bb226 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1367,7 +1367,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_PLATFORM_MACINTOSH: if (!IsValidCodePage( get_mac_code_page( name ))) return 0; name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; case TT_PLATFORM_APPLE_UNICODE: @@ -1377,7 +1377,7 @@ static int match_name_table_language( const tt_name_record *name, LANGID lang ) case TT_APPLE_ID_ISO_10646: case TT_APPLE_ID_UNICODE_2_0: name_lang = GET_BE_WORD(name->language_id); - if (name_lang >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + if (name_lang >= ARRAY_SIZE(mac_langid_table)) return 0; name_lang = mac_langid_table[name_lang]; break; default: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ea79f1183c..9fff578a28 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -35,6 +35,8 @@ #include "gdiplus.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b03630c55c..9841857e63 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2554,7 +2554,7 @@ static UINT vt_to_itemtype(UINT vt) { VT_BLOB, PropertyTagTypeUndefined } }; UINT i; - for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + for (i = 0; i < ARRAY_SIZE(vt2type); i++) { if (vt2type[i].vt == vt) return vt2type[i].type; } @@ -3454,10 +3454,10 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { if (name.vt == VT_LPSTR) { - for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + for (j = 0; j < ARRAY_SIZE(keywords); j++) if (!strcmp(keywords[j].name, name.u.pszVal)) break; - if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + if (j < ARRAY_SIZE(keywords) && !keywords[j].seen) { keywords[j].seen = TRUE; item = create_prop(keywords[j].propid, &value); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 77673a7ea3..08dde2fec6 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -606,7 +606,7 @@ void METAFILE_Free(GpMetafile *metafile) if (metafile->record_stream) IStream_Release(metafile->record_stream); - for (i = 0; i < sizeof(metafile->objtable)/sizeof(metafile->objtable[0]); i++) + for (i = 0; i < ARRAY_SIZE(metafile->objtable); i++) metafile_free_object_table_entry(metafile, i); } -- 2.17.0

4 13

[PATCH] winemac: Transform the process to a GUI app on an attempt to change the display mode.
by Ken Thomases 14 May '18

14 May '18

It had only been done when a window is shown. Some games change the display mode before showing their first window. Following Mac conventions, the Mac driver does not apply display mode changes when it's not the active GUI app. If such a game were to change the mode and then query display-mode-related info, it would get info for the original mode, not the requested mode. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 46176f7..239c11f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -843,7 +843,6 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID } else { - BOOL active = [NSApp isActive]; CGDisplayModeRef currentMode; NSArray* modes; @@ -866,6 +865,10 @@ - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID if (!modes.count) return FALSE; + [self transformProcessToForeground]; + + BOOL active = [NSApp isActive]; + if ([originalDisplayModes count] || displaysCapturedForFullscreen || !active || CGCaptureAllDisplays() == CGDisplayNoErr) { -- 2.10.2

1 0

[PATCH Wine Translations] Update Korean translations.
by 김건우 14 May '18

14 May '18

1 0

[PATCH] winebus: Print SDL error message when SDL cannot be initialized.
by Józef Kucia 14 May '18

14 May '18

SDL_Init(SDL_INIT_HAPTIC) fails if SDL is built without haptic support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 03e7cb3e2ba2..159727f6bce4 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -910,7 +910,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) { - ERR("Can't Init SDL\n"); + ERR("Can't init SDL: %s\n", pSDL_GetError()); return STATUS_UNSUCCESSFUL; } -- 2.16.1

2 1

[PATCH] po: Update Czech translation
by AsciiWolf 14 May '18

14 May '18

Hello, I have updated the Czech translation. The last time it was updated was in 2013. Feel free to merge this patch. Regards, Daniel Rusek

1 1

[PATCH 1/5] msi/tests: Add a header for some common functions.
by Zebediah Figura 14 May '18

14 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 469 +---------------------------------------- dlls/msi/tests/install.c | 72 +++---- dlls/msi/tests/msi.c | 527 +++-------------------------------------------- dlls/msi/tests/utils.h | 60 ++++++ 4 files changed, 117 insertions(+), 1011 deletions(-) create mode 100644 dlls/msi/tests/utils.h diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 31cc981..8e72ff4 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -34,6 +34,7 @@ #include <winsvc.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); @@ -46,9 +47,7 @@ static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) static UINT (WINAPI *pMsiQueryFeatureStateExA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE *); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR *); -static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -60,11 +59,6 @@ static BOOL is_wow64; static const BOOL is_64bit = sizeof(void *) > sizeof(int); static const char *msifile = "msitest.msi"; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; /* msi database data */ @@ -1679,15 +1673,6 @@ static const char rep_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; -typedef struct _msi_table -{ - const char *filename; - const char *data; - unsigned int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table env_tables[] = { ADD_TABLE(component), @@ -2152,110 +2137,6 @@ cleanup: /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF -#define FOLDER_THRESHOLD 900000 - -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; - - dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} static void init_functionpointers(void) { @@ -2274,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiGetComponentPathExA); GET_PROC(hmsi, MsiQueryFeatureStateExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) @@ -2287,44 +2166,6 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - static char *get_user_sid(void) { HANDLE token; @@ -2349,185 +2190,6 @@ static char *get_user_sid(void) return usersid; } -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - -static BOOL get_user_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_CURRENT_USER, - "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "AppData", 0, &type, (LPBYTE)APP_DATA_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - return TRUE; -} - -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - - RegCloseKey(hkey); - - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) - return FALSE; - - return TRUE; -} - -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2549,20 +2211,6 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -2578,89 +2226,6 @@ static void delete_test_files(void) RemoveDirectoryA("msitest"); } -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - static BOOL notify_system_change(DWORD event_type, STATEMGRSTATUS *status) { RESTOREPOINTINFOA spec; @@ -2689,22 +2254,6 @@ static LONG delete_key( HKEY key, LPCSTR subkey, REGSAM access ) return RegDeleteKeyA( key, subkey ); } -static BOOL file_exists(LPCSTR file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(LPCSTR file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - return file_exists(path); -} - static void delete_pfmsitest_files(void) { SHFILEOPSTRUCTA shfl; @@ -4615,22 +4164,6 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) -{ - CHAR path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - if (is_file) - create_file_data(path, data, 500); - else - CreateDirectoryA(path, NULL); -} - -#define create_pf(file, is_file) create_pf_data(file, file, is_file) - static void test_remove_files(void) { UINT r; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ac2c837..a2b95d1 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -35,6 +35,7 @@ #include <shellapi.h> #include "wine/test.h" +#include "utils.h" static UINT (WINAPI *pMsiQueryComponentStateA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, INSTALLSTATE*); @@ -43,9 +44,7 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA) (LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(void **); @@ -65,12 +64,12 @@ static const char *mstfile = "winetest.mst"; static const WCHAR msifileW[] = {'m','s','i','t','e','s','t','.','m','s','i',0}; static const WCHAR msifile2W[] = {'w','i','n','e','t','e','s','t','2','.','m','s','i',0}; -static CHAR CURR_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR[MAX_PATH]; -static CHAR PROG_FILES_DIR_NATIVE[MAX_PATH]; -static CHAR COMMON_FILES_DIR[MAX_PATH]; -static CHAR APP_DATA_DIR[MAX_PATH]; -static CHAR WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; static const char *customdll; @@ -1348,15 +1347,6 @@ static const CHAR x64_directory_dat[] = "ProgramFiles64Folder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(component), @@ -2084,8 +2074,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING; @@ -2166,9 +2155,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiGetComponentPathExA); - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA); - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) GET_PROC(hkernel32, Wow64DisableWow64FsRedirection); @@ -2181,18 +2168,16 @@ static void init_functionpointers(void) #undef GET_PROC } -static BOOL is_process_limited(void) +BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; PSID Group = NULL; BOOL IsInGroup; HANDLE token; - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) + !CheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); FreeSid(Group); @@ -2206,7 +2191,7 @@ static BOOL is_process_limited(void) return TRUE; } - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) { BOOL ret; TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; @@ -2303,7 +2288,7 @@ static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_siz lstrcpyA(pCabParams->szCab, name); } -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) +void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) { CCAB cabParams; LPCSTR ptr; @@ -2334,7 +2319,7 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL get_user_dirs(void) +BOOL get_user_dirs(void) { HKEY hkey; DWORD type, size; @@ -2353,7 +2338,7 @@ static BOOL get_user_dirs(void) return TRUE; } -static BOOL get_system_dirs(void) +BOOL get_system_dirs(void) { HKEY hkey; DWORD type, size; @@ -2390,7 +2375,7 @@ static BOOL get_system_dirs(void) return TRUE; } -static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) +void create_file_data(LPCSTR name, LPCSTR data, DWORD size) { HANDLE file; DWORD written; @@ -2410,8 +2395,6 @@ static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) CloseHandle(file); } -#define create_file(name, size) create_file_data(name, name, size) - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); @@ -2432,7 +2415,7 @@ static void create_test_files(void) DeleteFileA("five.txt"); } -static BOOL delete_pf(const CHAR *rel_path, BOOL is_file) +BOOL delete_pf(const CHAR *rel_path, BOOL is_file) { CHAR path[MAX_PATH]; @@ -2568,17 +2551,8 @@ static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, MsiCloseHandle(summary); } -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template, \ - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template, const char *packagecode) +void create_database_wordcount(const CHAR *name, const msi_table *tables, int num_tables, + INT version, INT wordcount, const char *template, const char *packagecode) { MSIHANDLE db; UINT r; @@ -3018,7 +2992,7 @@ static void create_cc_test_files(void) DeleteFileA("caesar"); } -static void delete_cab_files(void) +void delete_cab_files(void) { SHFILEOPSTRUCTA shfl; CHAR path[MAX_PATH+10]; @@ -3536,12 +3510,12 @@ error: RemoveDirectoryA("msitest"); } -static BOOL file_exists(LPCSTR file) +BOOL file_exists(const char *file) { return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; } -static BOOL pf_exists(LPCSTR file) +BOOL pf_exists(const char *file) { CHAR path[MAX_PATH]; @@ -3574,7 +3548,7 @@ static void delete_pfmsitest_files(void) RemoveDirectoryA(path); } -static UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query) { MSIHANDLE hview = 0; UINT r; @@ -3976,7 +3950,7 @@ error: RemoveDirectoryA("msitest"); } -static void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) +void create_pf_data(LPCSTR file, LPCSTR data, BOOL is_file) { CHAR path[MAX_PATH]; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 85ab7ba..3778019 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -32,19 +32,13 @@ #include <objidl.h> #include "wine/test.h" +#include "utils.h" static BOOL is_wow64; static const char msifile[] = "winetest.msi"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; -static char CURR_DIR[MAX_PATH]; -static char PROG_FILES_DIR[MAX_PATH]; -static char PROG_FILES_DIR_NATIVE[MAX_PATH]; -static char COMMON_FILES_DIR[MAX_PATH]; -static char WINDOWS_DIR[MAX_PATH]; -static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); -static BOOL (WINAPI *pOpenProcessToken)( HANDLE, DWORD, PHANDLE ); static LONG (WINAPI *pRegDeleteKeyExA)(HKEY, LPCSTR, REGSAM, DWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -110,328 +104,19 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiEnumComponentsExA) GET_PROC(hmsi, MsiSourceListGetInfoA) - GET_PROC(hadvapi32, CheckTokenMembership); GET_PROC(hadvapi32, ConvertSidToStringSidA) - GET_PROC(hadvapi32, OpenProcessToken); GET_PROC(hadvapi32, RegDeleteKeyExA) GET_PROC(hkernel32, IsWow64Process) #undef GET_PROC } -static BOOL get_system_dirs(void) -{ - HKEY hkey; - DWORD type, size; - - if (RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey)) - return FALSE; - - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir (x86)", 0, &type, (LPBYTE)PROG_FILES_DIR, &size) && - RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir (x86)", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size) && - RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR_NATIVE, &size)) - { - RegCloseKey(hkey); - return FALSE; - } - RegCloseKey(hkey); - if (!GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH)) return FALSE; - return TRUE; -} - -static BOOL file_exists(const char *file) -{ - return GetFileAttributesA(file) != INVALID_FILE_ATTRIBUTES; -} - -static BOOL pf_exists(const char *file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - return file_exists(path); -} - -static BOOL delete_pf(const char *rel_path, BOOL is_file) -{ - char path[MAX_PATH]; - - lstrcpyA(path, PROG_FILES_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, rel_path); - - if (is_file) - return DeleteFileA(path); - else - return RemoveDirectoryA(path); -} - -static BOOL is_process_limited(void) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group = NULL; - BOOL IsInGroup; - HANDLE token; - - if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - FreeSid(Group); - return FALSE; - } - FreeSid(Group); - - if (!IsInGroup) - { - /* Only administrators have enough privileges for these tests */ - return TRUE; - } - - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; -} - /* cabinet definitions */ /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 0x7FFFFFFF #define FOLDER_THRESHOLD 900000 -/* the FCI callbacks */ - -static void * CDECL mem_alloc(ULONG cb) -{ - return HeapAlloc(GetProcessHeap(), 0, cb); -} - -static void CDECL mem_free(void *memory) -{ - HeapFree(GetProcessHeap(), 0, memory); -} - -static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) -{ - sprintf(pccab->szCab, pv, pccab->iCab); - return TRUE; -} - -static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) -{ - return 0; -} - -static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, - BOOL fContinuation, void *pv) -{ - return 0; -} - -static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) -{ - HANDLE handle; - DWORD dwAccess = 0; - DWORD dwShareMode = 0; - DWORD dwCreateDisposition = OPEN_EXISTING; - - dwAccess = GENERIC_READ | GENERIC_WRITE; - /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; - - if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) - dwCreateDisposition = OPEN_EXISTING; - else - dwCreateDisposition = CREATE_NEW; - - handle = CreateFileA(pszFile, dwAccess, dwShareMode, NULL, - dwCreateDisposition, 0, NULL); - - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszFile); - - return (INT_PTR)handle; -} - -static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwRead; - BOOL res; - - res = ReadFile(handle, memory, cb, &dwRead, NULL); - ok(res, "Failed to ReadFile\n"); - - return dwRead; -} - -static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD dwWritten; - BOOL res; - - res = WriteFile(handle, memory, cb, &dwWritten, NULL); - ok(res, "Failed to WriteFile\n"); - - return dwWritten; -} - -static int CDECL fci_close(INT_PTR hf, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - ok(CloseHandle(handle), "Failed to CloseHandle\n"); - - return 0; -} - -static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) -{ - HANDLE handle = (HANDLE)hf; - DWORD ret; - - ret = SetFilePointer(handle, dist, NULL, seektype); - ok(ret != INVALID_SET_FILE_POINTER, "Failed to SetFilePointer\n"); - - return ret; -} - -static int CDECL fci_delete(char *pszFile, int *err, void *pv) -{ - BOOL ret = DeleteFileA(pszFile); - ok(ret, "Failed to DeleteFile %s\n", pszFile); - - return 0; -} - -static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) -{ - LPSTR tempname; - - tempname = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); - GetTempFileNameA(".", "xx", 0, tempname); - - if (tempname && (strlen(tempname) < (unsigned)cbTempName)) - { - lstrcpyA(pszTempName, tempname); - HeapFree(GetProcessHeap(), 0, tempname); - return TRUE; - } - - HeapFree(GetProcessHeap(), 0, tempname); - - return FALSE; -} - -static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) -{ - BY_HANDLE_FILE_INFORMATION finfo; - FILETIME filetime; - HANDLE handle; - DWORD attrs; - BOOL res; - - handle = CreateFileA(pszName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL); - ok(handle != INVALID_HANDLE_VALUE, "Failed to CreateFile %s\n", pszName); - - res = GetFileInformationByHandle(handle, &finfo); - ok(res, "Expected GetFileInformationByHandle to succeed\n"); - - FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); - FileTimeToDosDateTime(&filetime, pdate, ptime); - - attrs = GetFileAttributesA(pszName); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Failed to GetFileAttributes\n"); - - return (INT_PTR)handle; -} - -static BOOL add_file(HFCI hfci, const char *file, TCOMP compress) -{ - char path[MAX_PATH]; - char filename[MAX_PATH]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\"); - lstrcatA(path, file); - - lstrcpyA(filename, file); - - return FCIAddFile(hfci, path, filename, FALSE, get_next_cabinet, - progress, get_open_info, compress); -} - -static void set_cab_parameters(PCCAB pCabParams, const CHAR *name, DWORD max_size) -{ - ZeroMemory(pCabParams, sizeof(CCAB)); - - pCabParams->cb = max_size; - pCabParams->cbFolderThresh = FOLDER_THRESHOLD; - pCabParams->setID = 0xbeef; - pCabParams->iCab = 1; - lstrcpyA(pCabParams->szCabPath, CURR_DIR); - lstrcatA(pCabParams->szCabPath, "\\"); - lstrcpyA(pCabParams->szCab, name); -} - -static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) -{ - CCAB cabParams; - LPCSTR ptr; - HFCI hfci; - ERF erf; - BOOL res; - - set_cab_parameters(&cabParams, name, max_size); - - hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, - fci_read, fci_write, fci_close, fci_seek, fci_delete, - get_temp_file, &cabParams, NULL); - - ok(hfci != NULL, "Failed to create an FCI context\n"); - - ptr = files; - while (*ptr) - { - res = add_file(hfci, ptr, tcompTYPE_MSZIP); - ok(res, "Failed to add file: %s\n", ptr); - ptr += lstrlenA(ptr) + 1; - } - - res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); - ok(res, "Failed to flush the cabinet\n"); - - res = FCIDestroy(hfci); - ok(res, "Failed to destroy the cabinet\n"); -} - static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) { WCHAR dbW[MAX_PATH], cabinetW[MAX_PATH]; @@ -469,24 +154,6 @@ static BOOL add_cabinet_storage(LPCSTR db, LPCSTR cabinet) return TRUE; } -static void delete_cab_files(void) -{ - SHFILEOPSTRUCTA shfl; - CHAR path[MAX_PATH+10]; - - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\*.cab"); - path[strlen(path) + 1] = '\0'; - - shfl.hwnd = NULL; - shfl.wFunc = FO_DELETE; - shfl.pFrom = path; - shfl.pTo = NULL; - shfl.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_NORECURSION | FOF_SILENT; - - SHFileOperationA(&shfl); -} - /* msi database data */ static const char directory_dat[] = @@ -908,15 +575,6 @@ static const char cl_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallFinalize\t\t5000\n"; -typedef struct _msi_table -{ - const CHAR *filename; - const CHAR *data; - int size; -} msi_table; - -#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} - static const msi_table tables[] = { ADD_TABLE(directory), @@ -1043,107 +701,6 @@ static const msi_table cl_tables[] = ADD_TABLE(property) }; -static void write_file(const CHAR *filename, const char *data, int data_size) -{ - DWORD size; - - HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hf, data, data_size, &size, NULL); - CloseHandle(hf); -} - -static void write_msi_summary_info(MSIHANDLE db, INT version, INT wordcount, const char *template) -{ - MSIHANDLE summary; - UINT r; - - r = MsiGetSummaryInformationA(db, NULL, 5, &summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TEMPLATE, VT_LPSTR, 0, NULL, template); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_REVNUMBER, VT_LPSTR, 0, NULL, - "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_PAGECOUNT, VT_I4, version, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, wordcount, NULL, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - r = MsiSummaryInfoSetPropertyA(summary, PID_TITLE, VT_LPSTR, 0, NULL, "MSITEST"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* write the summary changes back to the stream */ - r = MsiSummaryInfoPersist(summary); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(summary); -} - -#define create_database(name, tables, num_tables) \ - create_database_wordcount(name, tables, num_tables, 100, 0, ";1033"); - -#define create_database_template(name, tables, num_tables, version, template) \ - create_database_wordcount(name, tables, num_tables, version, 0, template); - -static void create_database_wordcount(const CHAR *name, const msi_table *tables, - int num_tables, INT version, INT wordcount, - const char *template) -{ - MSIHANDLE db; - UINT r; - WCHAR *nameW; - int j, len; - - len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); - if (!(nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return; - MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); - - r = MsiOpenDatabaseW(nameW, MSIDBOPEN_CREATE, &db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - /* import the tables into the database */ - for (j = 0; j < num_tables; j++) - { - const msi_table *table = &tables[j]; - - write_file(table->filename, table->data, (table->size - 1) * sizeof(char)); - - r = MsiDatabaseImportA(db, CURR_DIR, table->filename); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - DeleteFileA(table->filename); - } - - write_msi_summary_info(db, version, wordcount, template); - - r = MsiDatabaseCommit(db); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - - MsiCloseHandle(db); - HeapFree( GetProcessHeap(), 0, nameW ); -} - -static UINT run_query(MSIHANDLE hdb, const char *query) -{ - MSIHANDLE hview = 0; - UINT r; - - r = MsiDatabaseOpenViewA(hdb, query, &hview); - if (r != ERROR_SUCCESS) - return r; - - r = MsiViewExecute(hview, 0); - if (r == ERROR_SUCCESS) - r = MsiViewClose(hview); - MsiCloseHandle(hview); - return r; -} - static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode) { UINT res; @@ -1207,7 +764,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) set_summary_info(hdb, prodcode); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Directory` ( " "`Directory` CHAR(255) NOT NULL, " "`Directory_Parent` CHAR(255), " @@ -1215,7 +772,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) "PRIMARY KEY `Directory`)"); ok(res == ERROR_SUCCESS , "Failed to create directory table\n"); - res = run_query(hdb, + res = run_query(hdb, 0, "CREATE TABLE `Property` ( " "`Property` CHAR(72) NOT NULL, " "`Value` CHAR(255) " @@ -1225,7 +782,7 @@ static MSIHANDLE create_package_db(LPSTR prodcode) sprintf(query, "INSERT INTO `Property` " "(`Property`, `Value`) " "VALUES( 'ProductCode', '%s' )", prodcode); - res = run_query(hdb, query); + res = run_query(hdb, 0, query); ok(res == ERROR_SUCCESS , "Failed\n"); res = MsiDatabaseCommit(hdb); @@ -1428,39 +985,21 @@ static void test_getcomponentpath(void) ok( r == INSTALLSTATE_UNKNOWN, "wrong return value\n"); } -static void create_file(LPCSTR name, LPCSTR data, DWORD size) -{ - HANDLE file; - DWORD written; - - file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, data, strlen(data), &written, NULL); - - if (size) - { - SetFilePointer(file, size, NULL, FILE_BEGIN); - SetEndOfFile(file); - } - - CloseHandle(file); -} - static void create_test_files(void) { CreateDirectoryA("msitest", NULL); - create_file("msitest\\one.txt", "msitest\\one.txt", 100); + create_file("msitest\\one.txt", 100); CreateDirectoryA("msitest\\first", NULL); - create_file("msitest\\first\\two.txt", "msitest\\first\\two.txt", 100); + create_file("msitest\\first\\two.txt", 100); CreateDirectoryA("msitest\\second", NULL); - create_file("msitest\\second\\three.txt", "msitest\\second\\three.txt", 100); + create_file("msitest\\second\\three.txt", 100); - create_file("four.txt", "four.txt", 100); - create_file("five.txt", "five.txt", 100); + create_file("four.txt", 100); + create_file("five.txt", 100); create_cab_file("msitest.cab", MEDIA_SIZE, "four.txt\0five.txt\0"); - create_file("msitest\\filename", "msitest\\filename", 100); - create_file("msitest\\service.exe", "msitest\\service.exe", 100); + create_file("msitest\\filename", 100); + create_file("msitest\\service.exe", 100); DeleteFileA("four.txt"); DeleteFileA("five.txt"); @@ -1559,7 +1098,7 @@ static void test_MsiGetFileHash(void) { int ret; - create_file(name, hash_data[i].data, hash_data[i].size); + create_file_data(name, hash_data[i].data, hash_data[i].size); memset(&hash, 0, sizeof(MSIFILEHASHINFO)); hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); @@ -3030,7 +2569,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 'a'; @@ -3134,7 +2673,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3244,7 +2783,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3326,7 +2865,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3403,7 +2942,7 @@ static void test_MsiGetComponentPath(void) ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); - create_file("C:\\imapath", "C:\\imapath", 11); + create_file("C:\\imapath", 11); /* file exists */ path[0] = 0; @@ -3537,7 +3076,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3600,7 +3139,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath"), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3676,7 +3215,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "C:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3731,7 +3270,7 @@ static void test_MsiGetComponentPathEx(void) ok( !lstrcmpA( path, "c:\\testcomponentpath" ), "got %s\n", path ); ok( size == 20, "got %u\n", size ); - create_file( "c:\\testcomponentpath", "c:\\testcomponentpath", 21 ); + create_file( "c:\\testcomponentpath", 21 ); /* file exists */ path[0] = 0; @@ -3773,7 +3312,7 @@ static void test_MsiProvideComponent(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -3957,7 +3496,7 @@ static void test_MsiProvideQualifiedComponentEx(void) lstrcatA( path, "\\msitest" ); CreateDirectoryA( path, NULL ); lstrcatA( path, "\\test.txt" ); - create_file( path, "test", 100 ); + create_file_data( path, "test", 100 ); res = RegSetValueExA( hkey5, prod_squashed, 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1 ); ok( res == ERROR_SUCCESS, "got %d\n", res ); @@ -4600,7 +4139,7 @@ static void test_MsiGetFileVersion(void) ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); - create_file("ver.txt", "ver.txt", 20); + create_file("ver.txt", 20); /* file exists, no version information */ r = MsiGetFileVersionA("ver.txt", NULL, NULL, NULL, NULL); @@ -13543,7 +13082,7 @@ static void test_MsiGetFileSignatureInformation(void) hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); todo_wine ok(hr == CRYPT_E_FILE_ERROR, "expected CRYPT_E_FILE_ERROR got 0x%08x\n", hr); - create_file( "signature.bin", "signature", sizeof("signature") ); + create_file_data( "signature.bin", "signature", sizeof("signature") ); hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, NULL ); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); @@ -13901,9 +13440,9 @@ static void test_MsiConfigureProductEx(void) } CreateDirectoryA("msitest", NULL); - create_file("msitest\\hydrogen", "hydrogen", 500); - create_file("msitest\\helium", "helium", 500); - create_file("msitest\\lithium", "lithium", 500); + create_file_data("msitest\\hydrogen", "hydrogen", 500); + create_file_data("msitest\\helium", "helium", 500); + create_file_data("msitest\\lithium", "lithium", 500); create_database(msifile, mcp_tables, sizeof(mcp_tables) / sizeof(msi_table)); @@ -14444,7 +13983,7 @@ static void test_lastusedsource(void) } CreateDirectoryA("msitest", NULL); - create_file("maximus", "maximus", 500); + create_file("maximus", 500); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); DeleteFileA("maximus"); @@ -14568,7 +14107,7 @@ static void test_setpropertyfolder(void) lstrcatA(path, "\\msitest\\added"); CreateDirectoryA("msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); + create_file("msitest\\maximus", 500); create_database(msifile, spf_tables, sizeof(spf_tables) / sizeof(msi_table)); @@ -14612,7 +14151,7 @@ static void test_sourcedir_props(void) } create_test_files(); - create_file("msitest\\sourcedir.txt", "msitest\\sourcedir.txt", 1000); + create_file("msitest\\sourcedir.txt", 1000); create_database(msifile, sd_tables, sizeof(sd_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); @@ -14677,8 +14216,8 @@ static void test_concurrentinstall(void) CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest\\msitest", NULL); - create_file("msitest\\maximus", "msitest\\maximus", 500); - create_file("msitest\\msitest\\augustus", "msitest\\msitest\\augustus", 500); + create_file("msitest\\maximus", 500); + create_file("msitest\\msitest\\augustus", 500); create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h new file mode 100644 index 0000000..f16e2d5 --- /dev/null +++ b/dlls/msi/tests/utils.h @@ -0,0 +1,60 @@ +/* + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +char PROG_FILES_DIR[MAX_PATH]; +char PROG_FILES_DIR_NATIVE[MAX_PATH]; +char COMMON_FILES_DIR[MAX_PATH]; +char APP_DATA_DIR[MAX_PATH]; +char WINDOWS_DIR[MAX_PATH]; +char CURR_DIR[MAX_PATH]; + +BOOL get_system_dirs(void); +BOOL get_user_dirs(void); + +typedef struct _msi_table +{ + const char *filename; + const char *data; + int size; +} msi_table; + +#define ADD_TABLE(x) {#x".idt", x##_dat, sizeof(x##_dat)} + +/* in install.c */ +void create_database_wordcount(const char *name, const msi_table *tables, int num_tables, + int version, int wordcount, const char *template, const char *packagecode); + +#define create_database(name, tables, num_tables) \ + create_database_wordcount(name, tables, num_tables, 100, 0, ";1033", \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +#define create_database_template(name, tables, num_tables, version, template) \ + create_database_wordcount(name, tables, num_tables, version, 0, template, \ + "{004757CA-5092-49C2-AD20-28E1CE0DF5F2}"); + +void create_cab_file(const char *name, DWORD max_size, const char *files); +void create_file_data(const char *name, const char *data, DWORD size); +#define create_file(name, size) create_file_data(name, name, size) +void create_pf_data(const char *file, const char *data, BOOL is_file); +#define create_pf(file, is_file) create_pf_data(file, file, is_file) +void delete_cab_files(void); +BOOL delete_pf(const char *rel_path, BOOL is_file); +BOOL file_exists(const char *file); +BOOL pf_exists(const char *file); +BOOL is_process_limited(void); +UINT run_query(MSIHANDLE hdb, MSIHANDLE hrec, const char *query); -- 2.7.4

3 13

[PATCH] d3d11: Partially implement d3d11_immediate_context_UpdateSubresource1().
by Henri Verbeet 14 May '18

14 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 18fa670b333..e4d87603df8 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2603,11 +2603,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopySubresourceRegion1(ID3 } static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource1(ID3D11DeviceContext1 *iface, - ID3D11Resource *resource, UINT subresource, const D3D11_BOX *box, const void *data, - UINT rowpitch, UINT depth_pitch, UINT flags) + ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, + UINT row_pitch, UINT depth_pitch, UINT flags) { - FIXME("iface %p, resource %p, subresource %u, box %p, data %p, rowpitch %u, depth_pitch %u, flags %#x stub!\n", - iface, resource, subresource, box, data, rowpitch, depth_pitch, flags); + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u, flags %#x.\n", + iface, resource, subresource_idx, box, data, row_pitch, depth_pitch, flags); + + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + d3d11_immediate_context_UpdateSubresource(iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); } static void STDMETHODCALLTYPE d3d11_immediate_context_DiscardResource(ID3D11DeviceContext1 *iface, -- 2.11.0

1 0

[PATCH] d3d9: Implement setting the maximum frame latency.
by Henri Verbeet 14 May '18

14 May '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 20 +++++++++++++++----- dlls/d3d9/tests/d3d9ex.c | 10 +++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 21342575434..e3562c7c57a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3762,21 +3762,31 @@ static HRESULT WINAPI d3d9_device_CheckResourceResidency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + TRACE("iface %p, max_latency %u.\n", iface, max_latency); - if (max_latency) - FIXME("Ignoring max_latency %u.\n", max_latency); + if (max_latency > 30) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + wined3d_device_set_max_frame_latency(device->wined3d_device, max_latency); + wined3d_mutex_unlock(); return S_OK; } static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - *max_latency = 2; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); - return E_NOTIMPL; + wined3d_mutex_lock(); + *max_latency = wined3d_device_get_max_frame_latency(device->wined3d_device); + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7c36e6ee643..d210b8baedf 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4060,31 +4060,27 @@ static void test_frame_latency(void) } hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 1); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 1, "Unexpected max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 0); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_GetMaximumFrameLatency(device, &latency); -todo_wine { ok(SUCCEEDED(hr), "Failed to get max frame latency, hr %#x.\n", hr); ok(latency == 3, "Unexpected default max frame latency %u.\n", latency); -} + hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 30); ok(SUCCEEDED(hr), "Failed to set max frame latency, hr %#x.\n", hr); hr = IDirect3DDevice9Ex_SetMaximumFrameLatency(device, 31); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); refcount = IDirect3DDevice9Ex_Release(device); -- 2.11.0

1 0

[PATCH] wined3d: Recognize Titan V
by Christian Inci 14 May '18

14 May '18

Signed-off-by: Christian Inci <chris.wine(a)broke-the-inter.net> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7deefaf82d..fdd4e124dc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1400,6 +1400,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1888,6 +1889,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b297799f82..bb20842342 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2438,6 +2438,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, + CARD_NVIDIA_TITANV = 0x1d81, CARD_VMWARE_SVGA3D = 0x0405, -- 2.17.0

2 1

[PATCH] wined3d: Fix memory leak in shader_glsl_init_transform_feedback().
by Józef Kucia 14 May '18

14 May '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a9af9acd31f4..eddf35d83a04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -950,6 +950,7 @@ static void shader_glsl_init_transform_feedback(const struct wined3d_context *co { FIXME("No varyings to record, disabling transform feedback.\n"); shader->u.gs.so_desc.element_count = 0; + string_buffer_release(&priv->string_buffers, buffer); return; } -- 2.16.1

2 1

[PATCH 1/5] wined3d: Don't add pixel center offset twice.
by Matteo Bruni 14 May '18

14 May '18

Fixes cf312011c0e1f43123682f7f2e783174fea65425. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/state.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 87c734685c..175fd14a0e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4091,13 +4091,10 @@ static void viewport_miscpart_cc(struct wined3d_context *context, for (i = 0; i < state->viewport_count; ++i) { - vp[i].x += pixel_center_offset; - vp[i].y += pixel_center_offset; - depth_ranges[i * 2] = vp[i].min_z; depth_ranges[i * 2 + 1] = vp[i].max_z; - viewports[i * 4 ] = vp[i].x + pixel_center_offset; + viewports[i * 4] = vp[i].x + pixel_center_offset; viewports[i * 4 + 1] = vp[i].y + pixel_center_offset; viewports[i * 4 + 2] = vp[i].width; viewports[i * 4 + 3] = vp[i].height; -- 2.16.1

2 9

[PATCH] d3d10core/tests: Add test for depth clip.
by Zebediah Figura 14 May '18

14 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d10core/tests/device.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a1924f9..65f610d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16750,6 +16750,77 @@ static void test_multisample_resolve(void) release_test_context(&test_context); } +static void test_depth_clip(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_RASTERIZER_DESC rs_desc; + ID3D10DepthStencilView *dsv; + ID3D10RasterizerState *rs; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int count; + D3D10_VIEWPORT vp; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, dsv); + + count = 1; + ID3D10Device_RSGetViewports(device, &count, &vp); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); + check_texture_float(texture, 1.0f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); + check_texture_float(texture, 0.5f, 1); + + rs_desc.FillMode = D3D10_FILL_SOLID; + rs_desc.CullMode = D3D10_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = FALSE; + rs_desc.ScissorEnable = FALSE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D10Device_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_RSSetState(device, rs); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + set_viewport(device, vp.TopLeftX, vp.TopLeftY, vp.Width, vp.Height, 0.4f, 0.6f); + draw_quad_z(&test_context, 2.0f); +todo_wine + check_texture_float(texture, 0.6f, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_float(texture, 0.5f, 1); + draw_quad_z(&test_context, -1.0f); +todo_wine + check_texture_float(texture, 0.4f, 1); + + ID3D10DepthStencilView_Release(dsv); + ID3D10Texture2D_Release(texture); + ID3D10RasterizerState_Release(rs); + release_test_context(&test_context); +} + START_TEST(device) { unsigned int argc, i; @@ -16853,4 +16924,5 @@ START_TEST(device) test_alpha_to_coverage(); test_multiple_viewports(); test_multisample_resolve(); + test_depth_clip(); } -- 2.7.4

2 1

[v2 PATCH] dxgi: Add IDXGIDevice2 stub.
by Nikolay Sivov 14 May '18

14 May '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixed a typo in trace message. Thanks, Pablo. dlls/dxgi/device.c | 30 ++++++++++++++++++++++++++++++ include/wine/winedxgi.idl | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5a810fa810..2c85c1da6b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -41,6 +41,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IDXGIDevice) || IsEqualGUID(riid, &IID_IDXGIDevice1) + || IsEqualGUID(riid, &IID_IDXGIDevice2) || IsEqualGUID(riid, &IID_IWineDXGIDevice)) { IUnknown_AddRef(iface); @@ -275,6 +276,31 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetMaximumFrameLatency(IWineDXGIDev return E_NOTIMPL; } +static HRESULT STDMETHODCALLTYPE dxgi_device_OfferResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, DXGI_OFFER_RESOURCE_PRIORITY priority) +{ + FIXME("iface %p, resource_count %u, resources %p, priority %u stub!\n", iface, resource_count, + resources, priority); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_ReclaimResources(IWineDXGIDevice *iface, UINT resource_count, + IDXGIResource * const *resources, BOOL *discarded) +{ + FIXME("iface %p, resource_count %u, resources %p, discarded %p stub!\n", iface, resource_count, + resources, discarded); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE dxgi_device_EnqueueSetEvent(IWineDXGIDevice *iface, HANDLE event) +{ + FIXME("iface %p, event %p stub!\n", iface, event); + + return E_NOTIMPL; +} + /* IWineDXGIDevice methods */ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *iface, @@ -355,6 +381,10 @@ static const struct IWineDXGIDeviceVtbl dxgi_device_vtbl = /* IDXGIDevice1 methods */ dxgi_device_SetMaximumFrameLatency, dxgi_device_GetMaximumFrameLatency, + /* IDXGIDevice2 methods */ + dxgi_device_OfferResources, + dxgi_device_ReclaimResources, + dxgi_device_EnqueueSetEvent, /* IWineDXGIDevice methods */ dxgi_device_create_surface, dxgi_device_create_swapchain, diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 2c5734280c..3a1d6fa064 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -25,7 +25,7 @@ import "dxgi1_5.idl"; local, uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) ] -interface IWineDXGIDevice : IDXGIDevice1 +interface IWineDXGIDevice : IDXGIDevice2 { HRESULT create_surface( [in] struct wined3d_texture *wined3d_texture, -- 2.17.0

2 1

[PATCH 7/7] jscript: Added support for accessor properties in defineProperty.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 121 +++++++++++++++++++++++++++++++++++++---------- dlls/mshtml/tests/es5.js | 81 +++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 25 deletions(-)

1 0

[PATCH 6/7] jscript: Added Object.defineProperties stub.
by Jacek Caban 14 May '18

14 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/object.c | 10 ++++++++++ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 11 insertions(+)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel