September 2018 - Wine-Commits

Gabriel Ivăncescu : shell32/tests: Test hijacking the edit control's procedure after AutoComplete.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: ea5db7dd12e22d53083f1ea6d04435b9b3b1e821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5db7dd12e22d53083f1ea6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Sep 22 17:53:46 2018 +0300 shell32/tests: Test hijacking the edit control's procedure after AutoComplete. Windows' AutoComplete seems to bypass hijacking in some cases. However, WM_GETTEXT seems to be able to get hijacked. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 82 +++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index b9c6374..e85e30c 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -236,6 +236,36 @@ static void createMainWnd(void) CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } +static WNDPROC HijackerWndProc_prev; +static const WCHAR HijackerWndProc_txt[] = {'H','i','j','a','c','k','e','d',0}; +static LRESULT CALLBACK HijackerWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case WM_GETTEXT: + { + size_t len = min(wParam, ARRAY_SIZE(HijackerWndProc_txt)); + memcpy((void*)lParam, HijackerWndProc_txt, len * sizeof(WCHAR)); + return len; + } + case WM_GETTEXTLENGTH: + return ARRAY_SIZE(HijackerWndProc_txt) - 1; + } + return CallWindowProcW(HijackerWndProc_prev, hWnd, msg, wParam, lParam); +} + +static LRESULT CALLBACK HijackerWndProc2(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) { + case EM_SETSEL: + lParam = wParam; + break; + case WM_SETTEXT: + lParam = (LPARAM)HijackerWndProc_txt; + break; + } + return CallWindowProcW(HijackerWndProc_prev, hWnd, msg, wParam, lParam); +} + struct string_enumerator { IEnumString IEnumString_iface; @@ -358,18 +388,29 @@ static HRESULT string_enumerator_create(void **ppv, WCHAR **suggestions, int cou return S_OK; } +static void dispatch_messages(void) +{ + MSG msg; + Sleep(33); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} + static void test_custom_source(void) { static WCHAR str_alpha[] = {'t','e','s','t','1',0}; static WCHAR str_alpha2[] = {'t','e','s','t','2',0}; static WCHAR str_beta[] = {'a','u','t','o',' ','c','o','m','p','l','e','t','e',0}; + static WCHAR str_au[] = {'a','u',0}; static WCHAR *suggestions[] = { str_alpha, str_alpha2, str_beta }; IUnknown *enumerator; IAutoComplete2 *autocomplete; HWND hwnd_edit; WCHAR buffer[20]; HRESULT hr; - MSG msg; ShowWindow(hMainWnd, SW_SHOW); @@ -385,16 +426,43 @@ static void test_custom_source(void) hr = IAutoComplete2_Init(autocomplete, hwnd_edit, enumerator, NULL, NULL); ok(hr == S_OK, "IAutoComplete_Init failed: %x\n", hr); + SetFocus(hwnd_edit); SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); SendMessageW(hwnd_edit, WM_CHAR, 'u', 1); - Sleep(100); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessageA(&msg); - } + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); + + /* hijack the window procedure */ + HijackerWndProc_prev = (WNDPROC)SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(HijackerWndProc_txt, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(HijackerWndProc_txt), wine_dbgstr_w(buffer)); + + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'u', 1); + SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc_prev); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(lstrcmpW(str_au, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_au), wine_dbgstr_w(buffer)); + SendMessageW(hwnd_edit, EM_SETSEL, 0, -1); + SendMessageW(hwnd_edit, WM_CHAR, '\b', 1); + dispatch_messages(); + SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); + ok(buffer[0] == '\0', "Expected empty string, got %s\n", wine_dbgstr_w(buffer)); + + HijackerWndProc_prev = (WNDPROC)SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc2); + SendMessageW(hwnd_edit, WM_CHAR, 'a', 1); + SendMessageW(hwnd_edit, WM_CHAR, 'u', 1); + SetWindowLongPtrW(hwnd_edit, GWLP_WNDPROC, (LONG_PTR)HijackerWndProc_prev); + dispatch_messages(); SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_beta, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_beta), wine_dbgstr_w(buffer)); + /* end of hijacks */ ShowWindow(hMainWnd, SW_HIDE); DestroyWindow(hwnd_edit);

1 0

Gijs Vermeulen : kernel32: Add GetQueuedCompletionStatusEx stub.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: f1be5c7861a43a363b202857014eb49dc5e53acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1be5c7861a43a363b202857… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Sep 23 21:05:32 2018 +0200 kernel32: Add GetQueuedCompletionStatusEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43878 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec | 2 +- .../api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 7 +++++++ 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec b/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec index f73e427..44d42d1 100644 --- a/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec +++ b/dlls/api-ms-win-core-io-l1-1-0/api-ms-win-core-io-l1-1-0.spec @@ -3,5 +3,5 @@ @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) kernel32.DeviceIoControl @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(long ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec index 73aae1a..d335efa 100644 --- a/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec +++ b/dlls/api-ms-win-core-io-l1-1-1/api-ms-win-core-io-l1-1-1.spec @@ -6,5 +6,5 @@ @ stdcall GetOverlappedResult(long ptr ptr long) kernel32.GetOverlappedResult @ stub GetOverlappedResultEx @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(long ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9db7d98..cb9c73a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -804,7 +804,7 @@ @ stdcall GetProfileStringA(str str str ptr long) @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -# @ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(long ptr long ptr long long) @ stub -i386 GetSLCallbackTarget @ stub -i386 GetSLCallbackTemplate @ stdcall GetShortPathNameA(str ptr long) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a855e95..58ecc09 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2377,6 +2377,18 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf return FALSE; } +/****************************************************************************** + * GetQueuedCompletionStatusEx (KERNEL32.@) + */ +BOOL WINAPI GetQueuedCompletionStatusEx(HANDLE completion_port, LPOVERLAPPED_ENTRY completion_port_entries, + ULONG count, ULONG *num_entries_removed, DWORD milliseconds, + BOOL alertable) +{ + FIXME("(%p, %p, %d, %p, %d, %d) stub!\n", + completion_port, completion_port_entries, count, num_entries_removed, milliseconds, alertable); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /****************************************************************************** * PostQueuedCompletionStatus (KERNEL32.@) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 2980576..7d8439f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -645,7 +645,7 @@ # @ stub GetPublisherCacheFolder # @ stub GetPublisherRootFolder @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) kernel32.GetQueuedCompletionStatus -@ stub GetQueuedCompletionStatusEx +@ stdcall GetQueuedCompletionStatusEx(long ptr long ptr long long) kernel32.GetQueuedCompletionStatusEx # @ stub GetRegistryExtensionFlags # @ stub GetRoamingLastObservedChangeTime @ stdcall GetSecurityDescriptorControl(ptr ptr ptr) advapi32.GetSecurityDescriptorControl diff --git a/include/winbase.h b/include/winbase.h index 4d959d0..de52e5a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -565,6 +565,13 @@ typedef struct _OVERLAPPED { HANDLE hEvent; } OVERLAPPED, *LPOVERLAPPED; +typedef struct _OVERLAPPED_ENTRY { + ULONG_PTR lpCompletionKey; + LPOVERLAPPED lpOverlapped; + ULONG_PTR Internal; + DWORD dwNumberOfBytesTransferred; +} OVERLAPPED_ENTRY, *LPOVERLAPPED_ENTRY; + typedef VOID (CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED); /* Process startup information.

1 0

Zebediah Figura : devenum: Only scan for devices for the requested filter category.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 9316d8ae864757429e71f1d3de34e7985800bdb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9316d8ae864757429e71f1d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 22 20:31:57 2018 -0500 devenum: Only scan for devices for the requested filter category. This matches native behaviour, and greatly reduces the overhead of IFilterMapper2_EnumMatchingFilters(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 70 ++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index fa096be..9b7ee3f 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -53,7 +53,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static void register_codecs(void); static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** @@ -828,31 +827,42 @@ static void register_avicap_devices(void) * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( - ICreateDevEnum * iface, - REFCLSID clsidDeviceClass, - IEnumMoniker **ppEnumMoniker, - DWORD dwFlags) + ICreateDevEnum *iface, REFCLSID class, IEnumMoniker **out, DWORD flags) { + WCHAR guidstr[CHARS_IN_GUID]; HRESULT hr; + HKEY key; - TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); + TRACE("iface %p, class %s, out %p, flags %#x.\n", iface, debugstr_guid(class), out, flags); - if (!ppEnumMoniker) + if (!out) return E_POINTER; - *ppEnumMoniker = NULL; + *out = NULL; - register_codecs(); - register_legacy_filters(); - hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); - if (FAILED(hr)) return hr; - register_waveout_devices(); - register_wavein_devices(); - register_midiout_devices(); - register_vfw_codecs(); - register_avicap_devices(); + if (!RegOpenKeyW(HKEY_CURRENT_USER, wszActiveMovieKey, &key)) + { + StringFromGUID2(class, guidstr, ARRAY_SIZE(guidstr)); + RegDeleteTreeW(key, guidstr); + } - return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); + if (IsEqualGUID(class, &CLSID_LegacyAmFilterCategory)) + register_legacy_filters(); + else if (IsEqualGUID(class, &CLSID_AudioRendererCategory)) + { + hr = DirectSoundEnumerateW(&register_dsound_devices, NULL); + if (FAILED(hr)) return hr; + register_waveout_devices(); + register_midiout_devices(); + } + else if (IsEqualGUID(class, &CLSID_AudioInputDeviceCategory)) + register_wavein_devices(); + else if (IsEqualGUID(class, &CLSID_VideoCompressorCategory)) + register_vfw_codecs(); + else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) + register_avicap_devices(); + + return create_EnumMoniker(class, out); } /********************************************************************** @@ -902,27 +912,3 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } - -static void register_codecs(void) -{ - WCHAR class[CHARS_IN_GUID]; - HKEY basekey; - - /* Since devices can change between session, for example because you just plugged in a webcam - * or switched from pulseaudio to alsa, delete all old devices first - */ - RegOpenKeyW(HKEY_CURRENT_USER, wszActiveMovieKey, &basekey); - StringFromGUID2(&CLSID_LegacyAmFilterCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - StringFromGUID2(&CLSID_AudioRendererCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - StringFromGUID2(&CLSID_AudioInputDeviceCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - StringFromGUID2(&CLSID_VideoInputDeviceCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - StringFromGUID2(&CLSID_MidiRendererCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - StringFromGUID2(&CLSID_VideoCompressorCategory, class, CHARS_IN_GUID); - RegDeleteTreeW(basekey, class); - RegCloseKey(basekey); -}

1 0

Zebediah Figura : devenum: Register AVI capture devices as codec devices.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: ec16a92b1d900858df7924289e815283c433b9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec16a92b1d900858df792428… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 22 20:31:56 2018 -0500 devenum: Register AVI capture devices as codec devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 139 +++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 85 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index ad1022e..fa096be 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -53,7 +53,7 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static HRESULT register_codecs(void); +static void register_codecs(void); static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** @@ -773,6 +773,57 @@ static void register_vfw_codecs(void) } } +static void register_avicap_devices(void) +{ + static const WCHAR vfwindexW[] = {'V','F','W','I','n','d','e','x',0}; + WCHAR friendlyname[] = {'v','i','d','e','o','0',0}; + IPropertyBag *prop_bag = NULL; + WCHAR name[32], version[32]; + REGFILTERPINS2 rgpins; + REGPINTYPES rgtypes; + REGFILTER2 rgf; + VARIANT var; + HRESULT hr; + int i = 0; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); + if (FAILED(hr)) + return; + + for (i = 0; i < 10; ++i) + { + if (!capGetDriverDescriptionW(i, name, sizeof(name), version, sizeof(version))) + break; + + friendlyname[5] = '0' + i; + + hr = register_codec(&CLSID_VideoInputDeviceCategory, name, + &CLSID_VfwCapture, friendlyname, &prop_bag); + if (FAILED(hr)) + continue; + + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 1; + rgf.u.s2.rgPins2 = &rgpins; + rgpins.dwFlags = 0; + rgpins.nMediaTypes = 1; + rgpins.lpMediaType = &rgtypes; + rgtypes.clsMajorType = &MEDIATYPE_Video; + rgtypes.clsMinorType = &MEDIASUBTYPE_None; + + write_filter_data(prop_bag, &rgf); + + /* write VFWIndex */ + V_VT(&var) = VT_I4; + V_I4(&var) = i; + IPropertyBag_Write(prop_bag, vfwindexW, &var); + + VariantClear(&var); + IPropertyBag_Release(prop_bag); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -799,6 +850,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_wavein_devices(); register_midiout_devices(); register_vfw_codecs(); + register_avicap_devices(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -851,14 +903,9 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } -static HRESULT register_codecs(void) +static void register_codecs(void) { - HRESULT res; WCHAR class[CHARS_IN_GUID]; - DWORD iDefaultDevice = -1; - IFilterMapper2 * pMapper = NULL; - REGFILTER2 rf2; - REGFILTERPINS2 rfp2; HKEY basekey; /* Since devices can change between session, for example because you just plugged in a webcam @@ -878,82 +925,4 @@ static HRESULT register_codecs(void) StringFromGUID2(&CLSID_VideoCompressorCategory, class, CHARS_IN_GUID); RegDeleteTreeW(basekey, class); RegCloseKey(basekey); - - rf2.dwVersion = 2; - rf2.dwMerit = MERIT_PREFERRED; - rf2.u.s2.cPins2 = 1; - rf2.u.s2.rgPins2 = &rfp2; - rfp2.cInstances = 1; - rfp2.nMediums = 0; - rfp2.lpMedium = NULL; - rfp2.clsPinCategory = &IID_NULL; - - res = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, - &IID_IFilterMapper2, (void **) &pMapper); - /* - * Fill in info for devices - */ - if (SUCCEEDED(res)) - { - UINT i; - REGPINTYPES * pTypes; - IPropertyBag * pPropBag = NULL; - - res = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); - if (SUCCEEDED(res)) - for (i = 0; i < 10; i++) - { - WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10]; - - if (capGetDriverDescriptionW (i, szDeviceName, ARRAY_SIZE(szDeviceName), - szDeviceVersion, ARRAY_SIZE(szDeviceVersion))) - { - IMoniker * pMoniker = NULL; - WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; - snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath), dprintf, i); - /* The above code prevents 1 device with a different ID overwriting another */ - - rfp2.nMediaTypes = 1; - pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * sizeof(REGPINTYPES)); - if (!pTypes) { - IFilterMapper2_Release(pMapper); - return E_OUTOFMEMORY; - } - - pTypes[0].clsMajorType = &MEDIATYPE_Video; - pTypes[0].clsMinorType = &MEDIASUBTYPE_None; - - rfp2.lpMediaType = pTypes; - - res = IFilterMapper2_RegisterFilter(pMapper, - &CLSID_VfwCapture, - szDeviceName, - &pMoniker, - &CLSID_VideoInputDeviceCategory, - szDevicePath, - &rf2); - - if (pMoniker) { - OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 }; - VARIANT var; - V_VT(&var) = VT_I4; - V_I4(&var) = i; - res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); - if (SUCCEEDED(res)) { - res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); - IPropertyBag_Release(pPropBag); - } - IMoniker_Release(pMoniker); - } - - if (i == iDefaultDevice) FIXME("Default device\n"); - CoTaskMemFree(pTypes); - } - } - } - - if (pMapper) - IFilterMapper2_Release(pMapper); - - return res; }

1 0

Zebediah Figura : devenum: Factor friendly name and CLSID registration into register_codec().
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 9ebbcb4f475243545394dfd1da32364e1505b929 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ebbcb4f475243545394dfd1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 22 20:31:55 2018 -0500 devenum: Factor friendly name and CLSID registration into register_codec(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 307 ++++++++++++++----------------------------- 1 file changed, 98 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ebbcb4f475243545394…

1 0

Henri Verbeet : wined3d: Move the OpenGL texture format to struct wined3d_format_gl.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 1606dd39e24cad61be49b744adeb7aac7eab2477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1606dd39e24cad61be49b744… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 22 03:14:09 2018 +0330 wined3d: Move the OpenGL texture format to struct wined3d_format_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +- dlls/wined3d/surface.c | 48 ++-- dlls/wined3d/texture.c | 93 ++++---- dlls/wined3d/utils.c | 485 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 30 +-- dlls/wined3d/wined3d_private.h | 11 +- 6 files changed, 349 insertions(+), 322 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1606dd39e24cad61be49…

1 0

Nikolay Sivov : d2d1: Implement GetDevice() for device context.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 31808b08db8f55f4611cabf68933f49ee0707c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=31808b08db8f55f4611cabf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 24 07:58:31 2018 +0300 d2d1: Implement GetDevice() for device context. 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/bitmap.c | 10 +++--- dlls/d2d1/bitmap_render_target.c | 4 +-- dlls/d2d1/brush.c | 2 +- dlls/d2d1/d2d1_private.h | 17 ++++----- dlls/d2d1/dc_render_target.c | 28 ++++++++++++--- dlls/d2d1/device.c | 74 ++++++++++++++++++++++------------------ dlls/d2d1/factory.c | 28 ++++++++++++--- dlls/d2d1/hwnd_render_target.c | 33 ++++++++++++++---- dlls/d2d1/tests/d2d1.c | 8 ++--- dlls/d2d1/wic_render_target.c | 33 ++++++++++++++---- 10 files changed, 161 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31808b08db8f55f4611c…

1 0

Józef Kucia : wined3d: Add remaining feature levels.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 13ec617654a942efdf1932bb049a0b1563f77000 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ec617654a942efdf1932bb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 24 01:09:30 2018 +0200 wined3d: Add remaining feature levels. We still don't have proper and exhaustive checks for feature levels capabilities. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/utils.c | 6 +++--- dlls/wined3d/adapter_gl.c | 6 +++++- include/wine/wined3d.h | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index e857a1f..009d351 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -626,11 +626,11 @@ static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEV switch (feature_level) { case D3D_FEATURE_LEVEL_11_1: - return WINED3D_FEATURE_LEVEL_11; + return WINED3D_FEATURE_LEVEL_11_1; case D3D_FEATURE_LEVEL_11_0: return WINED3D_FEATURE_LEVEL_11; case D3D_FEATURE_LEVEL_10_1: - return WINED3D_FEATURE_LEVEL_10; + return WINED3D_FEATURE_LEVEL_10_1; case D3D_FEATURE_LEVEL_10_0: return WINED3D_FEATURE_LEVEL_10; case D3D_FEATURE_LEVEL_9_3: @@ -638,7 +638,7 @@ static enum wined3d_feature_level wined3d_feature_level_from_d3d(D3D_FEATURE_LEV case D3D_FEATURE_LEVEL_9_2: return WINED3D_FEATURE_LEVEL_9_SM2; case D3D_FEATURE_LEVEL_9_1: - return WINED3D_FEATURE_LEVEL_9_SM2; + return WINED3D_FEATURE_LEVEL_9_1; default: FIXME("Unhandled feature level %#x.\n", feature_level); return 0; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0ee71fd..1d360d1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1256,10 +1256,14 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g if (shader_model >= 5 && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) - return WINED3D_FEATURE_LEVEL_11; + return WINED3D_FEATURE_LEVEL_11_1; if (shader_model >= 4) + { + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) + return WINED3D_FEATURE_LEVEL_10_1; return WINED3D_FEATURE_LEVEL_10; + } } if (shader_model >= 3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3c01f75..17b0fd4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -95,10 +95,13 @@ enum wined3d_feature_level WINED3D_FEATURE_LEVEL_6 = 0x6000, WINED3D_FEATURE_LEVEL_7 = 0x7000, WINED3D_FEATURE_LEVEL_8 = 0x8000, + WINED3D_FEATURE_LEVEL_9_1 = 0x9100, WINED3D_FEATURE_LEVEL_9_SM2 = 0x9200, WINED3D_FEATURE_LEVEL_9_SM3 = 0x9300, WINED3D_FEATURE_LEVEL_10 = 0xa000, + WINED3D_FEATURE_LEVEL_10_1 = 0xa100, WINED3D_FEATURE_LEVEL_11 = 0xb000, + WINED3D_FEATURE_LEVEL_11_1 = 0xb100, }; enum wined3d_degree_type

1 0

Gabriel Ivăncescu : shell32/autocomplete: Handle WM_SETTEXT for autocompletion.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 03fe2468976cb659ca03d817e21ea1f089e2994f URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fe2468976cb659ca03d817… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Sat Sep 22 17:53:44 2018 +0300 shell32/autocomplete: Handle WM_SETTEXT for autocompletion. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 2f63d88..1751401 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -370,6 +370,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) && wParam >= ' ' ? autoappend_flag_yes : autoappend_flag_no); return ret; + case WM_SETTEXT: case WM_CUT: case WM_CLEAR: case WM_UNDO:

1 0

Jim Mussared : comctl32/listview: Fix subitem invalidation.
by Alexandre Julliard Sept. 24, 2018

Sept. 24, 2018

Module: wine Branch: master Commit: 4a8a8bddda78f7863997e7f5d4e599d2c276bc96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a8a8bddda78f7863997e7f5… Author: Jim Mussared <jim.mussared(a)gmail.com> Date: Mon Sep 24 10:43:34 2018 +0300 comctl32/listview: Fix subitem invalidation. It's wrong to offset by item position, columns could be reordered. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 777b40f..95d619a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1753,7 +1753,7 @@ static inline void LISTVIEW_InvalidateSubItem(const LISTVIEW_INFO *infoPtr, INT LISTVIEW_GetHeaderRect(infoPtr, nSubItem, &rcBox); rcBox.top = 0; rcBox.bottom = infoPtr->nItemHeight; - OffsetRect(&rcBox, Origin.x + Position.x, Origin.y + Position.y); + OffsetRect(&rcBox, Origin.x, Origin.y + Position.y); LISTVIEW_InvalidateRect(infoPtr, &rcBox); }

1 0