July 2017 - Wine-commits - list.winehq.org

Sebastian Lackner : webservices: Remove dead code in read_attribute_value_bin.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f53b6bfde09f5f0d7893fe788f2556b1697702d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53b6bfde09f5f0d7893fe788… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:02:43 2017 +0200 webservices: Remove dead code in read_attribute_value_bin. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 63de1ad..6d1d68f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1582,11 +1582,6 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE return WS_E_NOT_SUPPORTED; } - if (type >= RECORD_INT8_TEXT && type <= RECORD_INT64_TEXT) - { - attr->value = &text_int64->text; - return S_OK; - } if (type >= RECORD_BYTES8_TEXT && type <= RECORD_BYTES32_TEXT) { attr->value = &text_base64->text;

1 0

Sebastian Lackner : reg/tests: Don' t call RegCloseKey on uninitialized memory.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: db11f739ea73d7c2d7d6cc09c5a40cc8b0d76dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db11f739ea73d7c2d7d6cc09c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 12 15:03:19 2017 +0200 reg/tests: Don't call RegCloseKey on uninitialized memory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index af09290..941d325 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -793,7 +793,7 @@ static void test_import(void) DWORD r, dword = 0x123, type, size; char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; char test_string[] = "Test string", buffer[24]; - HKEY hkey, subkey; + HKEY hkey, subkey = NULL; LONG err; BYTE hex[8];

1 0

Hugh McMaster : regedit: Update the status bar text when a treeview node is renamed.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 182b6fb545f49ca52200e199a2f947452c70f5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=182b6fb545f49ca52200e199a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:08:46 2017 +0000 regedit: Update the status bar text when a treeview node is renamed. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 0e4ed57..37f4261 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -454,18 +454,20 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa LPNMTVDISPINFOW dispInfo = (LPNMTVDISPINFOW)lParam; LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); BOOL res = RenameKey(hWnd, hRootKey, path, dispInfo->item.pszText); + HeapFree(GetProcessHeap(), 0, path); if (res) { - TVITEMEXW item; - LPWSTR fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, - dispInfo->item.pszText); + TVITEMW item; + WCHAR *fullPath; item.mask = TVIF_HANDLE | TVIF_TEXT; - item.hItem = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + item.hItem = dispInfo->item.hItem; item.pszText = dispInfo->item.pszText; SendMessageW( g_pChildWnd->hTreeWnd, TVM_SETITEMW, 0, (LPARAM)&item ); + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); + HeapFree(GetProcessHeap(), 0, path); } - HeapFree(GetProcessHeap(), 0, path); SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); return res; }

1 0

Hugh McMaster : regedit: Update the listview path when renaming a treeview node.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 7d0f2deca303468ed67582caa2a0fa56d4eb4cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0f2deca303468ed67582caa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:08:54 2017 +0000 regedit: Update the listview path when renaming a treeview node. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + programs/regedit/listview.c | 19 +++++++++++++------ programs/regedit/main.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 37f4261..2a646ef 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -466,6 +466,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa fullPath = GetPathFullPath(g_pChildWnd->hTreeWnd, path); SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); + update_listview_path(path); HeapFree(GetProcessHeap(), 0, path); } SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index dc3152d..9e271ad 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -91,6 +91,17 @@ LPCWSTR GetValueName(HWND hwndLV) return g_valueName; } +BOOL update_listview_path(const WCHAR *path) +{ + HeapFree(GetProcessHeap(), 0, g_currentPath); + + g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR)); + if (!g_currentPath) return FALSE; + lstrcpyW(g_currentPath, path); + + return TRUE; +} + /* convert '\0' separated string list into ',' separated string list */ static void MakeMULTISZDisplayable(LPWSTR multi) { @@ -557,12 +568,8 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot; - if (keyPath != g_currentPath) { - HeapFree(GetProcessHeap(), 0, g_currentPath); - g_currentPath = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(keyPath) + 1) * sizeof(WCHAR)); - if (!g_currentPath) goto done; - lstrcpyW(g_currentPath, keyPath); - } + if (keyPath != g_currentPath && !update_listview_path(keyPath)) + goto done; result = TRUE; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 5331189..f3fbf86 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -117,6 +117,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); /* listview.c */ +extern BOOL update_listview_path(const WCHAR *path); extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id);

1 0

Hugh McMaster : regedit: Output an error message and exit with error code zero instead of calling exit (1).
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: ae147a5bf68bf65511ee4711ab237de5293fa672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae147a5bf68bf65511ee4711a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 12 11:09:05 2017 +0000 regedit: Output an error message and exit with error code zero instead of calling exit(1). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 29 +++++++++++++++++++++-------- programs/regedit/regproc.c | 23 +++++++++-------------- programs/regedit/regproc.h | 1 + 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 47fec63..c563628 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -83,6 +83,23 @@ void __cdecl output_message(unsigned int id, ...) __ms_va_end(va_args); } +void __cdecl error_exit(unsigned int id, ...) +{ + WCHAR fmt[1536]; + __ms_va_list va_args; + + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(*fmt))) + { + WINE_FIXME("LoadString failed with %u\n", GetLastError()); + return; + } + __ms_va_start(va_args, id); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); + + exit(0); /* regedit.exe always terminates with error code zero */ +} + typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; @@ -147,8 +164,7 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) break; } default: - output_message(STRING_UNHANDLED_ACTION); - exit(1); + error_exit(STRING_UNHANDLED_ACTION); break; } } @@ -184,8 +200,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) switch (toupperW(argv[i][1])) { case '?': - output_message(STRING_USAGE); - exit(0); + error_exit(STRING_USAGE); break; case 'D': action = ACTION_DELETE; @@ -204,8 +219,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) break; default: output_message(STRING_INVALID_SWITCH, argv[i]); - output_message(STRING_HELP); - exit(1); + error_exit(STRING_HELP); } } @@ -221,8 +235,7 @@ BOOL ProcessCmdLine(WCHAR *cmdline) output_message(STRING_NO_REG_KEY); break; } - output_message(STRING_HELP); - exit(1); + error_exit(STRING_HELP); } for (; i < argc; i++) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ea0b6f8..9ebe2fa 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1421,8 +1421,7 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) file = _wfopen(file_name, wb_mode); if (!file) { _wperror(regedit); - output_message(STRING_CANNOT_OPEN_FILE, file_name); - exit(1); + error_exit(STRING_CANNOT_OPEN_FILE, file_name); } } if(unicode) @@ -1478,10 +1477,9 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) lstrcpyW(reg_key_name_buf, reg_key_name); /* open the specified key */ - if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) { - output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); - exit(1); - } + if (!(reg_key_class = parse_key_name(reg_key_name, &branch_name))) + error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name); + if (!branch_name || !*branch_name) { /* no branch - registry class is specified */ file = REGPROC_open_export_file(file_name, unicode); @@ -1591,14 +1589,11 @@ void delete_registry_key(WCHAR *reg_key_name) if (!reg_key_name || !reg_key_name[0]) return; - if (!(key_class = parse_key_name(reg_key_name, &key_name))) { - output_message(STRING_INCORRECT_REG_CLASS, reg_key_name); - exit(1); - } - if (!*key_name) { - output_message(STRING_DELETE_REG_CLASS_FAILED, reg_key_name); - exit(1); - } + if (!(key_class = parse_key_name(reg_key_name, &key_name))) + error_exit(STRING_INCORRECT_REG_CLASS, reg_key_name); + + if (!*key_name) + error_exit(STRING_DELETE_REG_CLASS_FAILED, reg_key_name); RegDeleteTreeW(key_class, key_name); } diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 72e6b38..81ac3e3 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -34,6 +34,7 @@ if (!(p)) \ } void __cdecl output_message(unsigned int id, ...); +void __cdecl error_exit(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); BOOL import_registry_file(FILE *in);

1 0

Alexandre Julliard : gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 474f9ff1fa2ebf4ae6c4ef3b0d4987062b30d838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474f9ff1fa2ebf4ae6c4ef3b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 11:43:50 2017 +0200 gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 3d8c128..1b057f7 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -857,7 +857,19 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = CreateCompatibleDC(hdcDest); - bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); + if (GetObjectType( hdcDest ) != OBJ_MEMDC && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + { + /* screen DCs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ + BITMAPINFO info; + info.bmiHeader.biSize = sizeof(info.bmiHeader); + info.bmiHeader.biWidth = widthDest; + info.bmiHeader.biHeight = heightDest; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 24; + info.bmiHeader.biCompression = BI_RGB; + bmpWork = CreateDIBSection( 0, &info, DIB_RGB_COLORS, NULL, NULL, 0 ); + } + else bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); oldWork = SelectObject(hdcWork, bmpWork); if(!StretchBlt(hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY)) { TRACE("Failed to stretch\n");

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 465feb7a9ef971717f338fec9ae2682ac8723fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465feb7a9ef971717f338fec9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 06:48:14 2017 +0000 wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index c4d8115..4369748 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -136,7 +136,7 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index f7fa6e9..2969668 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -69,6 +69,7 @@ typedef struct { IWMReaderAccelerator IWMReaderAccelerator_iface; IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; IWMReaderStreamClock IWMReaderStreamClock_iface; + IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; LONG ref; } WMReader; @@ -117,6 +118,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); *ppv = &This->IWMReaderStreamClock_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { + TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); + *ppv = &This->IWMReaderTypeNegotiation_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1190,6 +1194,44 @@ static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = readclock_KillTimer }; +static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); +} + +static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + FIXME("%p, %d, %p\n", This, output, props); + return E_NOTIMPL; +} + +static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = +{ + negotiation_QueryInterface, + negotiation_AddRef, + negotiation_Release, + negotiation_TryOutputProps +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1205,6 +1247,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Alistair Leslie-Hughes : mfplat/tests: Add MFCreateAttributes tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: a324786b9e2aab5fce13238b59cdc01c2ce596b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a324786b9e2aab5fce13238b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 05:22:19 2017 +0000 mfplat/tests: Add MFCreateAttributes tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index edbce46..13853c5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -32,11 +32,14 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "mfreadwrite.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); + DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); @@ -217,6 +220,30 @@ if(0) MFShutdown(); } +static void test_MFCreateAttributes(void) +{ + IMFAttributes *attributes; + HRESULT hr; + UINT32 count; + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 88; + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(count == 1, "got %d\n", count); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { @@ -227,6 +254,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); test_MFCreateMediaType(); + test_MFCreateAttributes(); CoUninitialize(); }

1 0

Kimmo Myllyvirta : ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 32334704e882eb225b4738a34d46c6407af12514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32334704e882eb225b4738a34… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Wed Jul 12 03:17:18 2017 +0000 ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f212ec2..3f4691f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4907,6 +4907,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { TRACE("-> got %s\n", guid_funcs[i].name); *(void **)out_buff = guid_funcs[i].func_ptr; + total = sizeof(void *); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index efe10b3..e975ea4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7677,6 +7677,7 @@ static void test_ConnectEx(void) goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { @@ -7684,6 +7685,8 @@ static void test_ConnectEx(void) goto end; } + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError());

1 0

Jacek Caban : winhttp/tests: Make notification tests more strict.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: bbb2f363a0d8a1503d1faebe67c294fe0bc07847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb2f363a0d8a1503d1faebe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 11 15:09:17 2017 +0200 winhttp/tests: Make notification tests more strict. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 200 +++++++++++++++++++------------------- 1 file changed, 101 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb2f363a0d8a1503d1fa…

1 0