October 2015 - Wine-Commits

Jacek Caban : kernel32: Pass SYNCHRONIZE flag to NtOpenFile.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: 8294722142dfa69dc1f1df81bb18b23635e32183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8294722142dfa69dc1f1df81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 30 12:54:18 2015 +0100 kernel32: Pass SYNCHRONIZE flag to NtOpenFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 6 +++--- dlls/kernel32/path.c | 6 +++--- dlls/kernel32/sync.c | 2 +- dlls/kernel32/volume.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 5ea024f..40fbd40 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2038,7 +2038,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &info->handle, GENERIC_READ, &attr, &io, + status = NtOpenFile( &info->handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); @@ -2440,7 +2440,7 @@ BOOL WINAPI SetFileAttributesW( LPCWSTR name, DWORD attributes ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &nt_name ); if (status == STATUS_SUCCESS) @@ -2572,7 +2572,7 @@ DWORD WINAPI GetCompressedFileSizeW( attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &nt_name ); if (status == STATUS_SUCCESS) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 271bcf4..9d5f25b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1280,7 +1280,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &source_handle, 0, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &source_handle, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) status = wine_nt_to_unix_file_name( &nt_name, &source_unix, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); @@ -1304,7 +1304,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE, &attr, &io, 0, + status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) /* destination exists */ { @@ -1643,7 +1643,7 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, DELETE, &attr, &io, + status = NtOpenFile( &handle, DELETE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a07ce97..13fb0f0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1547,7 +1547,7 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) pipe_dev_name.Length = sizeof(leadin); pipe_dev_name.MaximumLength = sizeof(leadin); InitializeObjectAttributes(&attr,&pipe_dev_name, OBJ_CASE_INSENSITIVE, NULL, NULL); - status = NtOpenFile( &pipe_dev, FILE_READ_ATTRIBUTES, &attr, + status = NtOpenFile( &pipe_dev, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); if (status != ERROR_SUCCESS) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7a1dc11..4f01c99 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -171,7 +171,7 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( handle, 0, &attr, &io, 0, + status = NtOpenFile( handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS) @@ -235,7 +235,7 @@ static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DW memcpy( name.Buffer, device->Buffer, device->Length ); memcpy( name.Buffer + device->Length / sizeof(WCHAR), labelW, sizeof(labelW) ); - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { char buffer[256], *p; @@ -275,7 +275,7 @@ static DWORD get_filesystem_serial( const UNICODE_STRING *device ) memcpy( name.Buffer, device->Buffer, device->Length ); memcpy( name.Buffer + device->Length / sizeof(WCHAR), serialW, sizeof(serialW) ); - if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + if (!NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) { char buffer[32]; @@ -765,7 +765,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, attr.SecurityQualityOfService = NULL; nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ - status = NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, + status = NtOpenFile( &handle, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); nt_name.Length += sizeof(WCHAR); @@ -811,7 +811,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, /* we couldn't open the device, fallback to default strategy */ - status = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) );

1 0

Piotr Caban : msvcp110: Fix 64-bit _Getcoll implementation.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: ef9a3be8b00b5dd4385408e9c546982b089d3ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9a3be8b00b5dd4385408e9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 30 13:17:47 2015 +0100 msvcp110: Fix 64-bit _Getcoll implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5bd10eb..f3ad140 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#include "assert.h" #include "locale.h" #include "errno.h" #include "limits.h" @@ -649,33 +650,43 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); } -/* _Getcoll */ -ULONGLONG __cdecl _Getcoll(void) +static _Collvec* getcoll(_Collvec *ret) { - union { - _Collvec collvec; - ULONGLONG ull; - } ret; - TRACE("\n"); - ret.collvec.page = ___lc_collate_cp_func(); + ret->page = ___lc_collate_cp_func(); #if _MSVCP_VER < 110 - ret.collvec.handle = ___lc_handle_func()[LC_COLLATE]; + ret->handle = ___lc_handle_func()[LC_COLLATE]; #else - ret.collvec.lc_name = ___lc_locale_name_func()[LC_COLLATE]; + ret->lc_name = ___lc_locale_name_func()[LC_COLLATE]; #endif - return ret.ull; + return ret; } +/* _Getcoll */ +#if defined(__i386__) || _MSVCP_VER<110 +ULONGLONG __cdecl _Getcoll(void) +{ + ULONGLONG ret; + + C_ASSERT(sizeof(_Collvec) <= sizeof(ULONGLONG)); + + getcoll((_Collvec*)&ret); + return ret; +} +#else +_Collvec* __cdecl _Getcoll(_Collvec *ret) +{ + return getcoll(ret); +} +#endif + /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 8) _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) { - ULONGLONG ull = _Getcoll(); - memcpy(ret, &ull, sizeof(ull)); - return ret; + return getcoll(ret); } /* _Getctype */

1 0

Alexandre Julliard : Release 1.7.54.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: cbaab82d086e36dacaa22c6adf80f9114bb820fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaab82d086e36dacaa22c6ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 22:20:44 2015 +0900 Release 1.7.54. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 921 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 441 insertions(+), 504 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbaab82d086e36dacaa22…

1 0

Alistair Leslie-Hughes : xmllite/tests: Fix memory leak (valgrind).
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: 3e9b4c1a1765f87b972a27be89d3df772b6f17c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9b4c1a1765f87b972a27be8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 17:48:38 2015 +1100 xmllite/tests: Fix memory leak (valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7c576f..9c0cdec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1431,6 +1431,7 @@ static void test_readvaluechunk(void) ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); IXmlReader_Release(reader); + IStream_Release(stream); } static struct test_entry cdata_tests[] = {

1 0

Alexandre Julliard : makefiles: Fix the source path for ttf font installs.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: a748b7bc47345f9fd3b10377da6817c3e6e29fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a748b7bc47345f9fd3b10377d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 14:57:45 2015 +0900 makefiles: Fix the source path for ttf font installs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2c2a97d..7af3bc9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2057,7 +2057,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t } if (source->file->flags & FLAG_INSTALL) { - strarray_add( &make->install_lib_rules, ttf_file ); + strarray_add( &make->install_lib_rules, strmake( "%s.ttf", obj )); strarray_add( &make->install_lib_rules, strmake( "D$(fontdir)/%s.ttf", obj )); } if (source->file->flags & FLAG_SFD_FONTS)

1 0

Aric Stewart : hid: Implement HidD_GetSerialNumberString.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: af3406ec610fcbada9aa0c7fd1c31ac9eb02c7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3406ec610fcbada9aa0c7fd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 29 14:23:06 2015 -0500 hid: Implement HidD_GetSerialNumberString. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index c7b056d..e416762 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -12,7 +12,7 @@ @ stub HidD_GetPhysicalDescriptor @ stdcall HidD_GetPreparsedData(ptr ptr) @ stdcall HidD_GetProductString(long ptr long) -@ stub HidD_GetSerialNumberString +@ stdcall HidD_GetSerialNumberString(long ptr long) @ stub HidD_Hello @ stub HidD_SetConfiguration @ stdcall HidD_SetFeature(long ptr long) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 1cb88d6..c6bdd85 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -99,6 +99,12 @@ BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); } +BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) +{ + TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL, NULL); +} + BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) { HID_COLLECTION_INFORMATION info;

1 0

Alistair Leslie-Hughes : d3dx10_43: Add D3DX10CreateEffectPoolFromMemory stub.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: ed5a375b8a567c53b560026871a057b48d260524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5a375b8a567c53b56002687… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 29 19:10:45 2015 +1100 d3dx10_43: Add D3DX10CreateEffectPoolFromMemory stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index ada1fa0..9edcf54 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -27,7 +27,7 @@ @ stub D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateFontA(ptr long long long long long long long long long str ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 0e4c580..6637af3 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -103,3 +103,16 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, + UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " + "device %p, pump %p, effectpool %p, errors %p, hresult %p.\n", + data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, + pump, effectpool, errors, hresult); + + return E_NOTIMPL; +}

1 0

Alistair Leslie-Hughes : msxml3/tests: Fix memory leaks (valgrind).
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: f912d85deb1da809c42afda88dbdaeec2626b736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f912d85deb1da809c42afda88… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 30 17:48:36 2015 +1100 msxml3/tests: Fix memory leaks (valgrind). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 75354c5..0958c03 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2391,6 +2391,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", TRUE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -2414,6 +2415,7 @@ static void test_saxreader(void) hr = ISAXXMLReader_parse(reader, var); EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "content test attributes", FALSE); + IStream_Release(stream); hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK);

1 0

Aric Stewart : hidclass.sys: Implement IOCTL_HID_GET_SERIALNUMBER_STRING.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: b70069a58eeb8e5e1d36e05e0ffbfe0887ef4a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70069a58eeb8e5e1d36e05e0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 29 14:59:17 2015 -0500 hidclass.sys: Implement IOCTL_HID_GET_SERIALNUMBER_STRING. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index e3c7121..53ec569 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -480,6 +480,11 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) rc = handle_minidriver_string(device, irp, HID_STRING_ID_IPRODUCT); break; } + case IOCTL_HID_GET_SERIALNUMBER_STRING: + { + rc = handle_minidriver_string(device, irp, HID_STRING_ID_ISERIALNUMBER); + break; + } case IOCTL_HID_GET_MANUFACTURER_STRING: { rc = handle_minidriver_string(device, irp, HID_STRING_ID_IMANUFACTURER);

1 0

Alexandre Julliard : makefiles: Don't add source dependency for symlinks.
by Alexandre Julliard Oct. 30, 2015

Oct. 30, 2015

Module: wine Branch: master Commit: cc5d07fc8a58f3f87137992247344cdbdad9ef8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5d07fc8a58f3f8713799224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 29 23:57:53 2015 +0900 makefiles: Don't add source dependency for symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 30bbc3e..2c2a97d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1796,7 +1796,7 @@ static void output_install_rules( struct makefile *make, struct strarray files, if (!files.count) return; for (i = 0; i < files.count; i += 2) - if (files.str[i + 1][0] >= 'a' && files.str[i + 1][0] <= 'z') /* only for files in object dir */ + if (strchr( "dps", files.str[i + 1][0] )) /* only for files copied from object dir */ strarray_add_uniq( &targets, files.str[i] ); output( "install %s::", target );

1 0