January 2016 - Wine-Commits

Sebastian Lackner : oleaut32: Fix invalid memory access on 64-bit when warn+heap is used.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: ed16704ceab9057df726f64b50b224140e5dfeed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed16704ceab9057df726f64b5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 22 07:03:08 2016 +0100 oleaut32: Fix invalid memory access on 64-bit when warn+heap is used. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 00e6daf..93c5fd3 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -309,7 +309,7 @@ void WINAPI SysFreeString(BSTR str) cache_entry->cnt++; if(WARN_ON(heap)) { - unsigned n = bstr_alloc_size(bstr->size) / sizeof(DWORD) - 1; + unsigned n = (alloc_size-FIELD_OFFSET(bstr_t, u.ptr))/sizeof(DWORD); for(i=0; i<n; i++) bstr->u.dwptr[i] = ARENA_FREE_FILLER; }

1 0

Tag wine-1.9.2 : Alexandre Julliard : Release 1.9.2
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: refs/tags/wine-1.9.2 Tag: 85b18e912a5fdf3bc07f09ebc1421dce8162701a URL: http://source.winehq.org/git/wine.git/?a=tag;h=85b18e912a5fdf3bc07f09ebc142… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 23:28:32 2016 +0900 Release 1.9.2

1 0

Alex Henrie : ntdll: Avoid double initialization.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: 48f3bacb0b3feda2947b031f70af694628b6041e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f3bacb0b3feda2947b031f7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 29 22:37:58 2015 -0700 ntdll: Avoid double initialization. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 12 ++++++------ dlls/ntdll/debugbuffer.c | 2 +- dlls/ntdll/directory.c | 2 +- dlls/ntdll/loader.c | 2 +- dlls/ntdll/reg.c | 2 +- dlls/ntdll/thread.c | 6 ++++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4407277..ee2a743 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -748,8 +748,8 @@ static NTSTATUS CDROM_GetDeviceNumber(int dev, STORAGE_DEVICE_NUMBER* devnum) static NTSTATUS CDROM_GetDriveGeometry(int dev, int fd, DISK_GEOMETRY* dg) { CDROM_TOC toc; - NTSTATUS ret = 0; - int fsize = 0; + NTSTATUS ret; + int fsize; if ((ret = CDROM_ReadTOC(dev, fd, &toc)) != 0) return ret; @@ -2432,7 +2432,7 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) { #if defined(linux) - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; dvd_struct dvd; dvd_authinfo auth_info; @@ -2460,7 +2460,7 @@ static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) dk_dvd_read_structure_t dvd; DVDRegionPlaybackControlInfo rpc; DVDCopyrightInfo copy; - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; key.format = kDVDKeyFormatRegionState; key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; @@ -2636,7 +2636,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, break; } #elif defined(__APPLE__) - NTSTATUS ret = STATUS_NOT_SUPPORTED; + NTSTATUS ret; dk_dvd_read_structure_t dvdrs; union { @@ -2771,7 +2771,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize) { #ifdef HAVE_SG_IO_HDR_T_INTERFACE_ID - PSCSI_INQUIRY_DATA pInquiryData = NULL; + PSCSI_INQUIRY_DATA pInquiryData; UCHAR sense_buffer[32]; int iochk, version; sg_io_hdr_t iocmd; diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index 0ad8882..ef8baeb 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -91,7 +91,7 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf) PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(IN ULONG iSize, IN BOOLEAN iEventPair) { - PDEBUG_BUFFER oBuf = NULL; + PDEBUG_BUFFER oBuf; FIXME("(%d, %d): stub\n", iSize, iEventPair); if (iSize < sizeof(DEBUG_BUFFER)) { iSize = sizeof(DEBUG_BUFFER); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f3c6aa2..04c8e26 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -993,7 +993,7 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) */ static int get_dir_case_sensitivity_attr( const char *dir ) { - char *mntpoint = NULL; + char *mntpoint; struct attrlist attr; struct vol_caps caps; struct get_fsid get_fsid; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 74feb97..5bcc03e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1865,7 +1865,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, char error[256], dllname[MAX_PATH]; const WCHAR *name, *p; DWORD len, i; - void *handle = NULL; + void *handle; struct builtin_load_info info, *prev_info; /* Fix the name in case we have a full path and extension */ diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 9223cb4..81885eb 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -532,7 +532,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, { NTSTATUS ret; UCHAR *data_ptr; - unsigned int fixed_size = 0, min_size = 0; + unsigned int fixed_size, min_size; TRACE( "(%p,%s,%d,%p,%d)\n", handle, debugstr_us(name), info_class, info, length ); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1455eb1..0b68185 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -463,7 +463,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_t pthread_id; pthread_attr_t attr; struct ntdll_thread_data *thread_data; - struct startup_info *info = NULL; + struct startup_info *info; HANDLE handle = 0, actctx = 0; TEB *teb = NULL; DWORD tid = 0; @@ -732,7 +732,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret; DWORD dummy, i; - BOOL self = FALSE; + BOOL self; #ifdef __i386__ /* on i386 debug registers always require a server call */ @@ -746,6 +746,8 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) ntdll_get_thread_data()->dr6 == context->Dr6 && ntdll_get_thread_data()->dr7 == context->Dr7); } +#else + self = FALSE; #endif if (!self)

1 0

Sebastian Lackner : server: Fix invalid memory accesss caused by destroying winstation before desktop.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: df398308463357e557bd4356b1bc5240690cc0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df398308463357e557bd4356b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 22 07:01:29 2016 +0100 server: Fix invalid memory accesss caused by destroying winstation before desktop. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/winstation.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/winstation.c b/server/winstation.c index 62d780f..ece65c3 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -253,6 +253,7 @@ static void desktop_destroy( struct object *obj ) if (desktop->global_hooks) release_object( desktop->global_hooks ); if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout ); list_remove( &desktop->entry ); + unlink_named_object( obj ); release_object( desktop->winstation ); }

1 0

Andrey Turkin : d3d11: Add the ID3D11VideoContext interface.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: 2841e180dc0ba7102003180dca7e92081ba30597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2841e180dc0ba7102003180dc… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Fri Jan 22 12:59:49 2016 +0100 d3d11: Add the ID3D11VideoContext interface. Signed-off-by: Andrey Turkin <andrey.turkin(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 510 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 507 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2841e180dc0ba71020031…

1 0

Alistair Leslie-Hughes : msi: Refreh controls after spawned dialog is closed.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: 434f0f7cb18cc5068be0d48c0c6c981f36c82bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434f0f7cb18cc5068be0d48c0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 22 20:49:30 2016 +1100 msi: Refreh controls after spawned dialog is closed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9b61937..245bfdc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -556,6 +556,17 @@ static void msi_dialog_update_controls( msi_dialog *dialog, LPCWSTR property ) } } +static void msi_dialog_update_all_controls( msi_dialog *dialog ) +{ + msi_control *control; + + LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + { + if ( control->property && control->update ) + control->update( dialog, control ); + } +} + static void msi_dialog_set_property( MSIPACKAGE *package, LPCWSTR property, LPCWSTR value ) { UINT r = msi_set_property( package->db, property, value, -1 ); @@ -4389,7 +4400,11 @@ static UINT event_spawn_dialog( msi_dialog *dialog, const WCHAR *argument ) { /* don't destroy a modeless dialogs that might be our parent */ event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) msi_dialog_end_dialog( dialog ); + if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + msi_dialog_end_dialog( dialog ); + else + msi_dialog_update_all_controls(dialog); + return ERROR_SUCCESS; }

1 0

Nikolay Sivov : dwrite: Return earlier from GetKerningPairAdjustments() when pair kerning is not supported.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: eae84e7ddecf838f8670f446aee05abe88792ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae84e7ddecf838f8670f446a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 21 21:58:41 2016 +0300 dwrite: Return earlier from GetKerningPairAdjustments() when pair kerning is not supported. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index dab7322..2ff3b8c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -880,6 +880,11 @@ static HRESULT WINAPI dwritefontface1_GetKerningPairAdjustments(IDWriteFontFace2 return E_INVALIDARG; } + if (!This->has_kerning_pairs) { + memset(adjustments, 0, count*sizeof(INT32)); + return S_OK; + } + for (i = 0; i < count-1; i++) adjustments[i] = freetype_get_kerning_pair_adjustment(iface, indices[i], indices[i+1]); adjustments[count-1] = 0;

1 0

Austin English : irprops.cpl: Add stub dll.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: c78f7a96e5420e115c8a17a70319221687f91949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78f7a96e5420e115c8a17a70… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 22 00:51:00 2016 -0600 irprops.cpl: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/irprops.cpl/Makefile.in | 1 + dlls/irprops.cpl/irprops.cpl.spec | 52 +++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 60 insertions(+) diff --git a/configure b/configure index e422437..c78dcd7 100755 --- a/configure +++ b/configure @@ -1133,6 +1133,7 @@ enable_initpki enable_inkobj enable_inseng enable_iphlpapi +enable_irprops_cpl enable_itircl enable_itss enable_joy_cpl @@ -17599,6 +17600,7 @@ wine_fn_config_dll inkobj enable_inkobj wine_fn_config_dll inseng enable_inseng clean wine_fn_config_dll iphlpapi enable_iphlpapi implib wine_fn_config_test dlls/iphlpapi/tests iphlpapi_test +wine_fn_config_dll irprops.cpl enable_irprops_cpl wine_fn_config_dll itircl enable_itircl wine_fn_config_dll itss enable_itss clean wine_fn_config_test dlls/itss/tests itss_test diff --git a/configure.ac b/configure.ac index 6db503c..2c18819 100644 --- a/configure.ac +++ b/configure.ac @@ -2969,6 +2969,7 @@ WINE_CONFIG_DLL(inkobj) WINE_CONFIG_DLL(inseng,,[clean]) WINE_CONFIG_DLL(iphlpapi,,[implib]) WINE_CONFIG_TEST(dlls/iphlpapi/tests) +WINE_CONFIG_DLL(irprops.cpl) WINE_CONFIG_DLL(itircl) WINE_CONFIG_DLL(itss,,[clean]) WINE_CONFIG_TEST(dlls/itss/tests) diff --git a/dlls/irprops.cpl/Makefile.in b/dlls/irprops.cpl/Makefile.in new file mode 100644 index 0000000..7270ca3 --- /dev/null +++ b/dlls/irprops.cpl/Makefile.in @@ -0,0 +1 @@ +MODULE = irprops.cpl diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec new file mode 100644 index 0000000..29828e2 --- /dev/null +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -0,0 +1,52 @@ +@ stub BluetoothAuthenticateDevice +@ stub BluetoothAuthenticateMultipleDevices +@ stub BluetoothAuthenticationAgent +@ stub BluetoothDisconnectDevice +@ stub BluetoothDisplayDeviceProperties +@ stub BluetoothEnableDiscovery +@ stub BluetoothEnableIncomingConnections +@ stub BluetoothEnumerateInstalledServices +@ stub BluetoothFindBrowseGroupClose +@ stub BluetoothFindClassIdClose +@ stub BluetoothFindDeviceClose +@ stub BluetoothFindFirstBrowseGroup +@ stub BluetoothFindFirstClassId +@ stub BluetoothFindFirstDevice +@ stub BluetoothFindFirstProfileDescriptor +@ stub BluetoothFindFirstProtocolDescriptorStack +@ stub BluetoothFindFirstProtocolEntry +@ stub BluetoothFindFirstRadio +@ stub BluetoothFindFirstService +@ stub BluetoothFindNextBrowseGroup +@ stub BluetoothFindNextClassId +@ stub BluetoothFindNextDevice +@ stub BluetoothFindNextProfileDescriptor +@ stub BluetoothFindNextProtocolDescriptorStack +@ stub BluetoothFindNextProtocolEntry +@ stub BluetoothFindNextRadio +@ stub BluetoothFindNextService +@ stub BluetoothFindProfileDescriptorClose +@ stub BluetoothFindProtocolDescriptorStackClose +@ stub BluetoothFindProtocolEntryClose +@ stub BluetoothFindRadioClose +@ stub BluetoothFindServiceClose +@ stub BluetoothGetDeviceInfo +@ stub BluetoothGetRadioInfo +@ stub BluetoothIsConnectable +@ stub BluetoothIsDiscoverable +@ stub BluetoothMapClassOfDeviceToImageIndex +@ stub BluetoothMapClassOfDeviceToString +@ stub BluetoothRegisterForAuthentication +@ stub BluetoothRemoveDevice +@ stub BluetoothSdpEnumAttributes +@ stub BluetoothSdpGetAttributeValue +@ stub BluetoothSdpGetContainerElementData +@ stub BluetoothSdpGetElementData +@ stub BluetoothSdpGetString +@ stub BluetoothSelectDevices +@ stub BluetoothSelectDevicesFree +@ stub BluetoothSendAuthenticationResponse +@ stub BluetoothSetServiceState +@ stub BluetoothUnregisterAuthentication +@ stub BluetoothUpdateDeviceRecord +#@ stub CPlApplet diff --git a/tools/make_specfiles b/tools/make_specfiles index 16db908..13748e7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -262,6 +262,10 @@ my @dll_groups = "api-ms-win-core-winrt-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0", ], + [ + "bthprops.cpl", + "irprops.cpl", + ], ); my $update_flags = 0;

1 0

Alex Henrie : ntdll: Return an error from CDROM_Open if fstat fails.
by Alexandre Julliard Jan. 22, 2016

Jan. 22, 2016

Module: wine Branch: master Commit: fab5ee65b6354944bdb45001839b0cd0ba1115be URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab5ee65b6354944bdb450018… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 29 22:37:59 2015 -0700 ntdll: Return an error from CDROM_Open if fstat fails. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index ee2a743..ee36045 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -667,7 +667,7 @@ static NTSTATUS CDROM_Open(int fd, int* dev) NTSTATUS ret = STATUS_SUCCESS; int empty = -1; - fstat(fd, &st); + if (fstat(fd, &st) == -1) return FILE_GetNtStatus(); RtlEnterCriticalSection( &cache_section ); for (*dev = 0; *dev < MAX_CACHE_ENTRIES; (*dev)++) @@ -2834,7 +2834,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, { DWORD sz = 0; NTSTATUS status = STATUS_SUCCESS; - int fd, needs_close, dev; + int fd, needs_close, dev = 0; TRACE("%p %s %p %d %p %d %p\n", hDevice, iocodex(dwIoControlCode), lpInBuffer, nInBufferSize,

1 0

Nikolay Sivov : d2d1: Block target creation on invalid dpi values.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: d309b843fb5870efe612df3a7ae51380c015f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d309b843fb5870efe612df3a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 21:31:57 2016 +0300 d2d1: Block target creation on invalid dpi values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 22 +++++++++----- dlls/d2d1/tests/d2d1.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 091954c..e4a4ad4 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -2038,6 +2038,18 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, 0.0f, 1.0f, 0.0f, 0.0f, }; + float dpi_x, dpi_y; + + dpi_x = desc->dpiX; + dpi_y = desc->dpiY; + + if (dpi_x == 0.0f && dpi_y == 0.0f) + { + dpi_x = 96.0f; + dpi_y = 96.0f; + } + else if (dpi_x <= 0.0f || dpi_y <= 0.0f) + return E_INVALIDARG; if (desc->type != D2D1_RENDER_TARGET_TYPE_DEFAULT && desc->type != D2D1_RENDER_TARGET_TYPE_HARDWARE) WARN("Ignoring render target type %#x.\n", desc->type); @@ -2228,14 +2240,8 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, goto err; } - render_target->dpi_x = desc->dpiX; - render_target->dpi_y = desc->dpiY; - - if (render_target->dpi_x == 0.0f && render_target->dpi_y == 0.0f) - { - render_target->dpi_x = 96.0f; - render_target->dpi_y = 96.0f; - } + render_target->dpi_x = dpi_x; + render_target->dpi_y = dpi_y; return S_OK; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 7c554d2..c7d67f1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2441,6 +2441,82 @@ static void test_opacity_brush(void) DestroyWindow(window); } +static void test_create_target(void) +{ + IDXGISwapChain *swapchain; + ID2D1Factory *factory; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + HWND window; + HRESULT hr; + static const struct + { + float dpi_x, dpi_y; + float rt_dpi_x, rt_dpi_y; + HRESULT hr; + } + create_dpi_tests[] = + { + { 0.0f, 0.0f, 96.0f, 96.0f, S_OK }, + { 192.0f, 0.0f, 96.0f, 96.0f, E_INVALIDARG }, + { 0.0f, 192.0f, 96.0f, 96.0f, E_INVALIDARG }, + { 192.0f, -10.0f, 96.0f, 96.0f, E_INVALIDARG }, + { -10.0f, 192.0f, 96.0f, 96.0f, E_INVALIDARG }, + { 48.0f, 96.0f, 48.0f, 96.0f, S_OK }, + }; + unsigned int i; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + for (i = 0; i < sizeof(create_dpi_tests) / sizeof(*create_dpi_tests); ++i) + { + D2D1_RENDER_TARGET_PROPERTIES desc; + float dpi_x, dpi_y; + + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = create_dpi_tests[i].dpi_x; + desc.dpiY = create_dpi_tests[i].dpi_y; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &rt); + ok(hr == create_dpi_tests[i].hr, "Wrong return code, hr %#x, expected %#x, test %u.\n", hr, + create_dpi_tests[i].hr, i); + + if (FAILED(hr)) + continue; + + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == create_dpi_tests[i].rt_dpi_x, "Wrong dpi_x %.8e, expected %.8e, test %u\n", + dpi_x, create_dpi_tests[i].rt_dpi_x, i); + ok(dpi_y == create_dpi_tests[i].rt_dpi_y, "Wrong dpi_y %.8e, expected %.8e, test %u\n", + dpi_y, create_dpi_tests[i].rt_dpi_y, i); + + ID2D1RenderTarget_Release(rt); + } + + ID2D1Factory_Release(factory); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -2453,4 +2529,5 @@ START_TEST(d2d1) test_shared_bitmap(); test_bitmap_updates(); test_opacity_brush(); + test_create_target(); }

1 0