July 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntoskrnl: Forward IRP_MJ_CREATE and IRP_MJ_CLOSE requests to the loaded driver.
by Alexandre Julliard July 9, 2015

July 9, 2015

Module: wine Branch: master Commit: b45395f589277c2d2d6874a3409f4d32bf19d33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45395f589277c2d2d6874a34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 8 18:56:42 2015 +0900 ntoskrnl: Forward IRP_MJ_CREATE and IRP_MJ_CLOSE requests to the loaded driver. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bff3ca1..c2ffdf3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -183,6 +183,8 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ irp->UserEvent = NULL; + if (device->DriverObject->MajorFunction[IRP_MJ_CREATE]) return dispatch_irp( device, irp ); + irp->IoStatus.u.Status = STATUS_SUCCESS; IoCompleteRequest( irp, IO_NO_INCREMENT ); return STATUS_SUCCESS; @@ -226,8 +228,12 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->UserIosb = irp_handle; /* note: we abuse UserIosb to store the server irp handle */ irp->UserEvent = NULL; - irp->IoStatus.u.Status = STATUS_SUCCESS; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (!device->DriverObject->MajorFunction[IRP_MJ_CLOSE]) + { + irp->IoStatus.u.Status = STATUS_SUCCESS; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } + else dispatch_irp( device, irp ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ return STATUS_SUCCESS;

1 0

Jacek Caban : wincodec.idl: Added missing GUID_WICPixelFormat32bpp* declarations.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 47a11ec626dc8888442ab0f5eb943e1d33048114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a11ec626dc8888442ab0f5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:19:22 2015 +0200 wincodec.idl: Added missing GUID_WICPixelFormat32bpp* declarations. --- include/wincodec.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wincodec.idl b/include/wincodec.idl index 4e1d039..7216d07 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -193,6 +193,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGB, 0xd98c6b95,0x3efe,0x47d6,0xbb,0x25,0xeb,0x17,0x48,0xab,0x0c,0xf1);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA, 0xf5c7ad2d,0x6a8d,0x43dd,0xa7,0xa8,0xa2,0x99,0x35,0x26,0x1a,0xe9);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPRGBA, 0x3cc4a650,0xa527,0x4d37,0xa9,0x16,0x31,0x42,0xc7,0xeb,0xed,0xba);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);")

1 0

Jacek Caban : dvdmedia.h: Added AMINTERLACE_* defines.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 530a126139497b129aa0631dac3711940a77c0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=530a126139497b129aa0631da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:19:15 2015 +0200 dvdmedia.h: Added AMINTERLACE_* defines. --- include/dvdmedia.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/dvdmedia.h b/include/dvdmedia.h index 32c22fc..daf1c9d 100644 --- a/include/dvdmedia.h +++ b/include/dvdmedia.h @@ -51,4 +51,18 @@ typedef struct tagMPEG2VIDEOINFO { DWORD dwSequenceHeader[1]; } MPEG2VIDEOINFO; +#define AMINTERLACE_IsInterlaced 0x0001 +#define AMINTERLACE_1FieldPerSample 0x0002 +#define AMINTERLACE_Field1First 0x0004 +#define AMINTERLACE_UNUSED 0x0008 +#define AMINTERLACE_FieldPatField1Only 0x0000 +#define AMINTERLACE_FieldPatField2Only 0x0010 +#define AMINTERLACE_FieldPatBothRegular 0x0020 +#define AMINTERLACE_FieldPatBothIrregular 0x0030 +#define AMINTERLACE_FieldPatternMask 0x0030 +#define AMINTERLACE_DisplayModeBobOnly 0x0000 +#define AMINTERLACE_DisplayModeWeaveOnly 0x0040 +#define AMINTERLACE_DisplayModeBobOrWeave 0x0080 +#define AMINTERLACE_DisplayModeMask 0x00c0 + #endif /* __DVDMEDIA_H__ */

1 0

Zhenbo Li : mshtml/tests: Wait for the document to be completely loaded.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: f2669d6e9fddc266f48345e018c61f13359d7b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2669d6e9fddc266f48345e01… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Jul 7 22:49:42 2015 +0800 mshtml/tests: Wait for the document to be completely loaded. --- dlls/mshtml/tests/xmlhttprequest.c | 83 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index d3f682c..b857b45 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -279,6 +279,84 @@ static IDispatchExVtbl xmlhttprequest_onreadystatechangeFuncVtbl = { }; static IDispatchEx xmlhttprequest_onreadystatechange_obj = { &xmlhttprequest_onreadystatechangeFuncVtbl }; +static BOOL doc_complete; +static IHTMLDocument2 *notif_doc; + +static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, + REFIID riid, void**ppv) +{ + if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI PropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + return 2; +} + +static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + return 1; +} + +static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + if(dispID == DISPID_READYSTATE){ + BSTR state; + HRESULT hres; + + hres = IHTMLDocument2_get_readyState(notif_doc, &state); + ok(hres == S_OK, "get_readyState failed: %08x\n", hres); + + if(!strcmp_wa(state, "complete")) + doc_complete = TRUE; + + SysFreeString(state); + } + + return S_OK; +} + +static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PropertyNotifySink_QueryInterface, + PropertyNotifySink_AddRef, + PropertyNotifySink_Release, + PropertyNotifySink_OnChanged, + PropertyNotifySink_OnRequestEdit +}; + +static IPropertyNotifySink PropertyNotifySink = { &PropertyNotifySinkVtbl }; + +static void do_advise(IUnknown *unk, REFIID riid, IUnknown *unk_advise) +{ + IConnectionPointContainer *container; + IConnectionPoint *cp; + DWORD cookie; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&container); + ok(hres == S_OK, "QueryInterface(IID_IConnectionPointContainer) failed: %08x\n", hres); + + hres = IConnectionPointContainer_FindConnectionPoint(container, riid, &cp); + IConnectionPointContainer_Release(container); + ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + + hres = IConnectionPoint_Advise(cp, unk_advise, &cookie); + IConnectionPoint_Release(cp); + ok(hres == S_OK, "Advise failed: %08x\n", hres); +} + static void pump_msgs(BOOL *b) { MSG msg; @@ -611,6 +689,11 @@ static IHTMLDocument2 *create_doc_from_url(const char *start_url) IBindCtx_Release(bc); SysFreeString(url); + doc_complete = FALSE; + notif_doc = doc; + do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); + pump_msgs(&doc_complete); + return doc; }

1 0

André Hentschel : ntdll: Randomize security cookie when available.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 7e1c886fbfd362376b6aebe5381ab7d4433c3371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1c886fbfd362376b6aebe53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 7 19:50:25 2015 +0200 ntdll: Randomize security cookie when available. --- dlls/ntdll/virtual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index bc3f7cd..410e060 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1067,6 +1067,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz IMAGE_SECTION_HEADER sections[96]; IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; + ULONG loadcfg_size; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; @@ -1278,6 +1280,24 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } } + /* randomize security cookie */ + + loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); + if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) + { + static ULONG seed; + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; + + if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); + if (cookie) + { + *cookie = RtlRandom( &seed ); + if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */ + *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16; + } + } + /* set the image protections */ VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );

1 0

Bernhard Übelacker : advapi32: Fail in RegEnumValue on missing value or val_count parameters.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: eecd136cb703777fe0acc39ecc3f19cfaf06fe6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecd136cb703777fe0acc39ec… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:06 2015 +0200 advapi32: Fail in RegEnumValue on missing value or val_count parameters. --- dlls/advapi32/registry.c | 8 +++---- dlls/advapi32/tests/registry.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 30130b1..cf5a1ac 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1912,8 +1912,8 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n", hkey, index, value, val_count, reserved, type, data, count ); - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + if ((data && !count) || reserved || !value || !val_count) + return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); @@ -1997,8 +1997,8 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c TRACE("(%p,%d,%p,%p,%p,%p,%p,%p)\n", hkey, index, value, val_count, reserved, type, data, count ); - /* NT only checks count, not val_count */ - if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + if ((data && !count) || reserved || !value || !val_count) + return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; total_size = info_size + (MAX_PATH + 1) * sizeof(WCHAR); diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c801384..b8b7e1c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -643,6 +643,32 @@ static void test_enum_value(void) ok( !strcmp( value, "Test" ), "value is '%s' instead of Test\n", value ); ok( !strcmp( data, "foobar" ), "data is '%s' instead of foobar\n", data ); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + /* no value and no val_count parameter */ + data_count = 20; + type = 1234; + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no value parameter */ + val_count = 20; + data_count = 20; + type = 1234; + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no val_count parameter */ + data_count = 20; + type = 1234; + strcpy( value, "xxxxxxxxxx" ); + strcpy( data, "xxxxxxxxxx" ); + res = RegEnumValueA( test_key, 0, value, NULL, NULL, &type, (BYTE*)data, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + } + /* Unicode tests */ SetLastError(0xdeadbeef); @@ -710,6 +736,32 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + if (pRegGetValueA) /* avoid a crash on Windows 2000 */ + { + /* no valueW and no val_count parameter */ + data_count = 20; + type = 1234; + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no valueW parameter */ + val_count = 20; + data_count = 20; + type = 1234; + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, NULL, &val_count, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + + /* no val_count parameter */ + data_count = 20; + type = 1234; + memcpy( valueW, xxxW, sizeof(xxxW) ); + memcpy( dataW, xxxW, sizeof(xxxW) ); + res = RegEnumValueW( test_key, 0, valueW, NULL, NULL, &type, (BYTE*)dataW, &data_count ); + ok( res == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", res ); + } + cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

Bernhard Übelacker : regedit: Call RegEnumValueW with value and val_count parameters.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: cf6477ab27b0c01dea292ddc1984a1c676bd1d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6477ab27b0c01dea292ddc1… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Tue Jun 30 14:38:04 2015 +0200 regedit: Call RegEnumValueW with value and val_count parameters. --- programs/regedit/treeview.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 0ac5252..008e6a1 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -226,9 +226,10 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, if (mode & (SEARCH_VALUES | SEARCH_CONTENT)) { int i, adjust; - WCHAR valName[KEY_MAX_LEN], *KeyPath; + WCHAR *valName, *KeyPath; HKEY hKey, hRoot; - DWORD lenName; + DWORD lenName, lenNameMax, lenValueMax; + WCHAR *buffer = NULL; KeyPath = GetItemPath(hwndTV, hItem, &hRoot); @@ -241,7 +242,14 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, } HeapFree(GetProcessHeap(), 0, KeyPath); - lenName = KEY_MAX_LEN; + + if (ERROR_SUCCESS != RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &lenNameMax, &lenValueMax, NULL, NULL)) + return FALSE; + + lenName = ++lenNameMax; + if (!(valName = HeapAlloc(GetProcessHeap(), 0, lenName * sizeof(valName[0]) ))) + return FALSE; + adjust = 0; /* RegEnumValue won't return empty default value, so fake it when dealing with *row, which corresponds to list view rows, not value ids */ @@ -252,14 +260,16 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, if (i < 0) i = 0; while(1) { DWORD lenValue = 0, type = 0; - lenName = KEY_MAX_LEN; + lenName = lenNameMax; if (ERROR_SUCCESS != RegEnumValueW(hKey, - i, valName, &lenName, NULL, &type, NULL, &lenValue)) + i, valName, &lenName, NULL, &type, NULL, NULL)) break; if (mode & SEARCH_VALUES) { if (match_string(valName, sstring, mode)) { + HeapFree(GetProcessHeap(), 0, valName); + HeapFree(GetProcessHeap(), 0, buffer); RegCloseKey(hKey); *row = i+adjust; return TRUE; @@ -267,23 +277,27 @@ static BOOL match_item(HWND hwndTV, HTREEITEM hItem, LPCWSTR sstring, int mode, } if ((mode & SEARCH_CONTENT) && (type == REG_EXPAND_SZ || type == REG_SZ)) { - LPWSTR buffer; - buffer = HeapAlloc(GetProcessHeap(), 0, lenValue); + if (!buffer) + buffer = HeapAlloc(GetProcessHeap(), 0, lenValueMax); if (!buffer) break; - if (ERROR_SUCCESS != RegEnumValueW(hKey, i, NULL, NULL, NULL, &type, (LPBYTE)buffer, &lenValue)) + lenName = lenNameMax; + lenValue = lenValueMax; + if (ERROR_SUCCESS != RegEnumValueW(hKey, i, valName, &lenName, NULL, &type, (LPBYTE)buffer, &lenValue)) break; if (match_string(buffer, sstring, mode)) { + HeapFree(GetProcessHeap(), 0, valName); HeapFree(GetProcessHeap(), 0, buffer); RegCloseKey(hKey); *row = i+adjust; return TRUE; } - HeapFree(GetProcessHeap(), 0, buffer); } i++; } + HeapFree(GetProcessHeap(), 0, valName); + HeapFree(GetProcessHeap(), 0, buffer); RegCloseKey(hKey); } return FALSE;

1 0

Bernhard Übelacker : dwrite: Call RegEnumValueW with value and val_count parameters.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: 119501fee8bffcab6ced16282ed12ca7d0f564ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=119501fee8bffcab6ced16282… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Sun Jul 5 19:04:42 2015 +0200 dwrite: Call RegEnumValueW with value and val_count parameters. --- dlls/dwrite/font.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d9b6521..a0539ca 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1853,8 +1853,8 @@ static ULONG WINAPI systemfontfileenumerator_Release(IDWriteFontFileEnumerator * static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFileEnumerator *iface, IDWriteFontFile **file) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); - DWORD ret, type, count; - WCHAR *filename; + DWORD ret, type, val_count, count; + WCHAR *value, *filename; HRESULT hr; *file = NULL; @@ -1862,14 +1862,22 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil if (enumerator->index < 0) return E_FAIL; - if (RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, NULL, &count)) + ret = RegQueryInfoKeyW(enumerator->hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &val_count, &count, NULL, NULL); + if (ret != ERROR_SUCCESS) return E_FAIL; - if (!(filename = heap_alloc(count))) + val_count++; + value = heap_alloc( val_count * sizeof(value[0]) ); + filename = heap_alloc(count); + if (!value || !filename) { + heap_free(value); + heap_free(filename); return E_OUTOFMEMORY; + } - ret = RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, (BYTE*)filename, &count); + ret = RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, (BYTE*)filename, &count); if (ret) { + heap_free(value); heap_free(filename); return E_FAIL; } @@ -1888,6 +1896,7 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil else hr = IDWriteFactory2_CreateFontFileReference(enumerator->factory, filename, NULL, file); + heap_free(value); heap_free(filename); return hr; } @@ -1895,14 +1904,25 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerator *iface, BOOL *current) { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); + DWORD ret, max_val_count; + WCHAR *value; *current = FALSE; enumerator->index++; + ret = RegQueryInfoKeyW(enumerator->hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_val_count, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS) + return E_FAIL; + + max_val_count++; + if (!(value = heap_alloc( max_val_count * sizeof(value[0]) ))) + return E_OUTOFMEMORY; + /* iterate until we find next string value */ while (1) { - DWORD type = 0, count; - if (RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, NULL, &count)) + DWORD type = 0, count, val_count; + val_count = max_val_count; + if (RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, NULL, &count)) break; if (type == REG_SZ) { *current = TRUE; @@ -1912,6 +1932,7 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato } TRACE("index = %d, current = %d\n", enumerator->index, *current); + heap_free(value); return S_OK; }

1 0

Aric Stewart : include: Add HID_XFER_PACKET and HID_REVISION to hidclass.h.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: e485da13cea59eb759ddd191ff27b7be053a78de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e485da13cea59eb759ddd191f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 6 13:10:07 2015 -0500 include: Add HID_XFER_PACKET and HID_REVISION to hidclass.h. --- include/ddk/hidclass.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h index 09dc467..f5439ac 100644 --- a/include/ddk/hidclass.h +++ b/include/ddk/hidclass.h @@ -22,6 +22,8 @@ extern "C" { #endif +#define HID_REVISION 1 + DEFINE_GUID (GUID_DEVINTERFACE_HID, \ 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); @@ -65,6 +67,12 @@ typedef struct _HID_COLLECTION_INFORMATION { USHORT VersionNumber; } HID_COLLECTION_INFORMATION, *PHID_COLLECTION_INFORMATION; +typedef struct _HID_XFER_PACKET { + PUCHAR reportBuffer; + ULONG reportBufferLen; + UCHAR reportId; +} HID_XFER_PACKET, *PHID_XFER_PACKET; + #ifdef __cplusplus } #endif

1 0

Sebastian Lackner : ntdll: Add missing calls to RtlExitUserThread.
by Alexandre Julliard July 8, 2015

July 8, 2015

Module: wine Branch: master Commit: f65f645c3f7a4460266663fdf1722d80168379d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65f645c3f7a4460266663fdf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 8 07:07:41 2015 +0200 ntdll: Add missing calls to RtlExitUserThread. --- dlls/ntdll/threadpool.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 3f54208..a4e0619 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -968,6 +968,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) RtlDeleteCriticalSection(&q->cs); q->magic = 0; RtlFreeHeap(GetProcessHeap(), 0, q); + RtlExitUserThread( 0 ); } static void queue_destroy_timer(struct queue_timer *t) @@ -1361,6 +1362,7 @@ static void CALLBACK timerqueue_thread_proc( void *param ) RtlLeaveCriticalSection( &timerqueue.cs ); TRACE( "terminating timer queue thread\n" ); + RtlExitUserThread( 0 ); } /*********************************************************************** @@ -1585,6 +1587,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) NtClose( bucket->update_event ); RtlFreeHeap( GetProcessHeap(), 0, bucket ); + RtlExitUserThread( 0 ); } /*********************************************************************** @@ -2312,6 +2315,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "terminating worker thread for pool %p\n", pool ); tp_threadpool_release( pool ); + RtlExitUserThread( 0 ); } /***********************************************************************

1 0