October 2010 - Wine-Commits

Alexandre Julliard : shell32: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 22b7fedff59684e6fc8e366a19e24fa12e875a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b7fedff59684e6fc8e366a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:02:35 2010 +0200 shell32: Fix incorrect use of the ScreenToClient function. --- dlls/shell32/shlfileop.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 702a6c0..f022faf 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -94,15 +94,13 @@ static void confirm_msg_move_button(HWND hDlg, INT iId, INT *xPos, INT yOffset, RECT r; if (bShow) { - POINT pt; int width; GetWindowRect(hButton, &r); + MapWindowPoints( 0, hDlg, (POINT *)&r, 2 ); width = r.right - r.left; - pt.x = r.left; - pt.y = r.top; - ScreenToClient(hDlg, &pt); - MoveWindow(hButton, *xPos - width, pt.y - yOffset, width, r.bottom - r.top, FALSE); + SetWindowPos(hButton, 0, *xPos - width, r.top - yOffset, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); *xPos -= width + 5; } else

1 0

Stefan Leichter : setupapi: Add partial implementation of SetupDiGetINFClassW.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 803b81c1b7e299692c18f73d6125f3737f159dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803b81c1b7e299692c18f73d6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Oct 4 18:16:25 2010 +0200 setupapi: Add partial implementation of SetupDiGetINFClassW. --- dlls/setupapi/devinst.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 10 ------ 2 files changed, 72 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 31269ff..110f36c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -46,6 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* Unicode constants */ +static const WCHAR Chicago[] = {'$','C','h','i','c','a','g','o','$',0}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; @@ -54,6 +55,7 @@ static const WCHAR NoInstallClass[] = {'N','o','I','n','s','t','a','l','l','C', static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; +static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0}; @@ -3984,3 +3986,73 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, GlobalUnlock((HANDLE)dnDevInst); return CR_SUCCESS; } + +/*********************************************************************** + * SetupDiGetINFClassW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, + DWORD size, PDWORD required_size) +{ + BOOL have_guid, have_name; + DWORD dret; + WCHAR buffer[MAX_PATH]; + + if (!inf) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(inf)) + { + FIXME("%s not found. Searching via DevicePath not implemented\n", debugstr_w(inf)); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (!class_guid || !class_name || !size) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) + return FALSE; + + if (lstrcmpiW(buffer, Chicago)) + return FALSE; + + buffer[0] = '\0'; + have_guid = 0 < GetPrivateProfileStringW(Version, ClassGUID, NULL, buffer, MAX_PATH, inf); + if (have_guid) + { + buffer[lstrlenW(buffer)-1] = 0; + if (RPC_S_OK != UuidFromStringW(buffer + 1, class_guid)) + { + FIXME("failed to convert \"%s\" into a guid\n", debugstr_w(buffer)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + + buffer[0] = '\0'; + dret = GetPrivateProfileStringW(Version, Class, NULL, buffer, MAX_PATH, inf); + have_name = 0 < dret; + + if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); + if (have_guid && !have_name) FIXME("class name lookup via guid not implemented\n"); + + if (have_name) + { + if (dret < size) lstrcpyW(class_name, buffer); + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + have_name = FALSE; + } + } + + if (required_size) *required_size = dret + ((dret) ? 1 : 0); + + return (have_guid || have_name); +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 643d2df..f191854 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -241,16 +241,6 @@ BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, } /*********************************************************************** - * SetupDiGetINFClassW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, - DWORD size, PDWORD required_size) -{ - FIXME("%s %p %p %d %p\n", debugstr_w(inf), class_guid, class_name, size, required_size); - return FALSE; -} - -/*********************************************************************** * SetupDiDestroyClassImageList (SETUPAPI.@) */ BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassListImageData)

1 0

Nikolay Sivov : msxml3: Implemented ::get_status().
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 7e7b2a3f82200f927d350498af1b42310b6fdf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7b2a3f82200f927d350498a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 22:09:02 2010 +0400 msxml3: Implemented ::get_status(). --- dlls/msxml3/httprequest.c | 20 +++++++++++++++----- dlls/msxml3/tests/domdoc.c | 26 +++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3e69722..f1a93f6 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -2,6 +2,7 @@ * IXMLHTTPRequest implementation * * Copyright 2008 Alistair Leslie-Hughes + * Copyright 2010 Nikolay Sivov for Codeweavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -74,6 +75,7 @@ typedef struct /* bind callback */ BindStatusCallback *bsc; + LONG status; } httprequest; static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) @@ -88,7 +90,7 @@ struct BindStatusCallback LONG ref; IBinding *binding; - const httprequest *request; + httprequest *request; }; static inline BindStatusCallback *impl_from_IBindStatusCallback( IBindStatusCallback *iface ) @@ -349,6 +351,8 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c TRACE("(%p)->(%d %s %s %p)\n", This, code, debugstr_w(resp_headers), debugstr_w(req_headers), add_reqheaders); + This->request->status = code; + return S_OK; } @@ -362,7 +366,7 @@ static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_OnResponse }; -static HRESULT BindStatusCallback_create(const httprequest* This, BindStatusCallback **obj) +static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback **obj) { BindStatusCallback *bsc; IBindCtx *pbc; @@ -693,13 +697,18 @@ static HRESULT WINAPI httprequest_abort(IXMLHTTPRequest *iface) return E_NOTIMPL; } -static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *plStatus) +static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *status) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub %p %p\n", This, plStatus); + TRACE("(%p)->(%p)\n", This, status); - return E_NOTIMPL; + if (!status) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + *status = This->status; + + return S_OK; } static HRESULT WINAPI httprequest_get_statusText(IXMLHTTPRequest *iface, BSTR *pbstrStatus) @@ -812,6 +821,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->url = req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED; req->bsc = NULL; + req->status = 0; req->reqheader_size = 0; list_init(&req->reqheaders); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 07ef5a9..2c261fe 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3082,7 +3082,7 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; - LONG state; + LONG state, status; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, (void **)&pXMLHttpRequest); @@ -3108,6 +3108,15 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_send(pXMLHttpRequest, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + /* initial status code */ + hr = IXMLHttpRequest_get_status(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + status = 0xdeadbeef; + hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(status == 0xdeadbeef, "got %d\n", status); + /* invalid parameters */ hr = IXMLHttpRequest_open(pXMLHttpRequest, NULL, NULL, async, dummy, dummy); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); @@ -3141,6 +3150,12 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); ok(hr == S_OK, "got 0x%08x\n", hr); + /* status code after ::open() */ + status = 0xdeadbeef; + hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); + ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); + ok(status == 0xdeadbeef, "got %d\n", status); + state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3167,6 +3182,15 @@ static void test_XMLHTTP(void) } todo_wine ok(hr == S_OK, "IXMLHttpRequest_send should have succeeded instead of failing with 0x%08x\n", hr); + /* status code after ::send() */ + status = 0xdeadbeef; + hr = IXMLHttpRequest_get_status(pXMLHttpRequest, &status); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == 200, "got %d\n", status); +} + + /* another ::send() after completed request */ hr = IXMLHttpRequest_send(pXMLHttpRequest, varbody); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr);

1 0

Stefan Leichter : setupapi: Implement SetupDiGetINFClassA on top of SetupDiGetINFClassW.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 05a1416c9324dfee9fb0ff8854718fda46d9a0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a1416c9324dfee9fb0ff885… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Oct 4 18:16:34 2010 +0200 setupapi: Implement SetupDiGetINFClassA on top of SetupDiGetINFClassW. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- dlls/setupapi/tests/devinst.c | 1 + 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 110f36c..1d318fe 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3988,6 +3988,37 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG pulLen, DEVINST dnDevInst, } /*********************************************************************** + * SetupDiGetINFClassA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, + DWORD size, PDWORD required_size) +{ + BOOL retval; + DWORD required_sizeA, required_sizeW; + PWSTR class_nameW = NULL; + UNICODE_STRING infW; + + if (inf) RtlCreateUnicodeStringFromAsciiz(&infW, inf); + else infW.Buffer = NULL; + if (class_name && size) + class_nameW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + + retval = SetupDiGetINFClassW(infW.Buffer, class_guid, class_nameW, size, &required_sizeW); + + if (retval) + { + required_sizeA = WideCharToMultiByte( CP_ACP, 0, class_nameW, required_sizeW, + class_name, size, NULL, NULL); + + if(required_size) *required_size = required_sizeA; + } + else + if(required_size) *required_size = required_sizeW; + + return retval; +} + +/*********************************************************************** * SetupDiGetINFClassW (SETUPAPI.@) */ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f191854..2354d84 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -230,17 +230,6 @@ BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) } /*********************************************************************** - * SetupDiGetINFClassA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiGetINFClassA(PCSTR inf, LPGUID class_guid, PSTR class_name, - DWORD size, PDWORD required_size) -{ - FIXME("%s %p %p %d %p\n", debugstr_a(inf), class_guid, class_name, size, required_size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * SetupDiDestroyClassImageList (SETUPAPI.@) */ BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA ClassListImageData) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7005ef0..4449d72 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1509,6 +1509,7 @@ static void testSetupDiGetINFClassA(void) count = 0xdeadbeef; retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); ok(retval, "expected SetupDiGetINFClassA to succeed! error %u\n", GetLastError()); + todo_wine ok(count == 4, "expected count==4, got %u(%s)\n", count, cn); DeleteFileA(filename);

1 0

Nikolay Sivov : msxml3: Store user defined request headers on transaction beginning.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: b36fe07a4df30efe5cc3e85bf192b36cbfc57419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36fe07a4df30efe5cc3e85bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 21:58:01 2010 +0400 msxml3: Store user defined request headers on transaction beginning. --- dlls/msxml3/httprequest.c | 53 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 8820e68..e280304 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -41,6 +41,9 @@ static const WCHAR MethodGetW[] = {'G','E','T',0}; static const WCHAR MethodPutW[] = {'P','U','T',0}; static const WCHAR MethodPostW[] = {'P','O','S','T',0}; +static const WCHAR colspaceW[] = {':',' ',0}; +static const WCHAR crlfW[] = {'\r','\n',0}; + typedef struct BindStatusCallback BindStatusCallback; struct reqheader @@ -62,6 +65,8 @@ typedef struct BSTR url; BOOL async; struct list reqheaders; + /* cached resulting custom request headers string length in WCHARs */ + LONG reqheader_size; /* credentials */ BSTR user; @@ -120,6 +125,10 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa { *ppv = &This->lpBindStatusCallbackVtbl; } + else if (IsEqualGUID(&IID_IHttpNegotiate, riid)) + { + *ppv = &This->lpHttpNegotiateVtbl; + } else if (IsEqualGUID(&IID_IServiceProvider, riid) || IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) { @@ -297,12 +306,37 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate *ifac LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR *add_headers) { BindStatusCallback *This = impl_from_IHttpNegotiate(iface); + const struct reqheader *entry; + WCHAR *buff, *ptr; - FIXME("(%p)->(%s %s %d %p): stub\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers); + TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(url), debugstr_w(headers), reserved, add_headers); *add_headers = NULL; - return E_NOTIMPL; + if (list_empty(&This->request->reqheaders)) return S_OK; + + buff = CoTaskMemAlloc(This->request->reqheader_size*sizeof(WCHAR)); + if (!buff) return E_OUTOFMEMORY; + + ptr = buff; + LIST_FOR_EACH_ENTRY(entry, &This->request->reqheaders, struct reqheader, entry) + { + lstrcpyW(ptr, entry->header); + ptr += SysStringLen(entry->header); + + lstrcpyW(ptr, colspaceW); + ptr += sizeof(colspaceW)/sizeof(WCHAR)-1; + + lstrcpyW(ptr, entry->value); + ptr += SysStringLen(entry->value); + + lstrcpyW(ptr, crlfW); + ptr += sizeof(crlfW)/sizeof(WCHAR)-1; + } + + *add_headers = buff; + + return S_OK; } static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD code, @@ -583,7 +617,15 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR { if (lstrcmpW(entry->header, header) == 0) { - return SysReAllocString(&entry->value, value) ? S_OK : E_OUTOFMEMORY; + LONG length = SysStringLen(entry->value); + HRESULT hr; + + hr = SysReAllocString(&entry->value, value) ? S_OK : E_OUTOFMEMORY; + + if (hr == S_OK) + This->reqheader_size += (SysStringLen(entry->value) - length); + + return hr; } } @@ -594,6 +636,10 @@ static HRESULT WINAPI httprequest_setRequestHeader(IXMLHTTPRequest *iface, BSTR entry->header = SysAllocString(header); entry->value = SysAllocString(value); + /* header length including null terminator */ + This->reqheader_size += SysStringLen(entry->header) + sizeof(colspaceW)/sizeof(WCHAR) + + SysStringLen(entry->value) + sizeof(crlfW)/sizeof(WCHAR) - 1; + list_add_head(&This->reqheaders, &entry->entry); return S_OK; @@ -764,6 +810,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->url = req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED; req->bsc = NULL; + req->reqheader_size = 0; list_init(&req->reqheaders); *ppObj = &req->lpVtbl;

1 0

Nikolay Sivov : msxml3: Silence more failed urlmon interface queries.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 1441dc9400cbe965b18d23b4cf82c7021a8875c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1441dc9400cbe965b18d23b4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 4 22:01:00 2010 +0400 msxml3: Silence more failed urlmon interface queries. --- dlls/msxml3/httprequest.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index e280304..3e69722 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -130,7 +130,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallback *ifa *ppv = &This->lpHttpNegotiateVtbl; } else if (IsEqualGUID(&IID_IServiceProvider, riid) || - IsEqualGUID(&IID_IBindStatusCallbackEx, riid)) + IsEqualGUID(&IID_IBindStatusCallbackEx, riid) || + IsEqualGUID(&IID_IInternetProtocol, riid) || + IsEqualGUID(&IID_IHttpNegotiate2, riid)) { return E_NOINTERFACE; }

1 0

Alexandre Julliard : cryptui: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 1019c2fe5d3620996de274989a7a525f5ef0e782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1019c2fe5d3620996de274989… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:02:29 2010 +0200 cryptui: Fix incorrect use of the ScreenToClient function. --- dlls/cryptui/main.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index abda52a..339ad61 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4284,7 +4284,6 @@ static BOOL init_hierarchy_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) { RECT rc; - POINT topLeft; TRACE("(%p, %08x, %08lx)\n", hwnd, msg, lp); @@ -4293,17 +4292,12 @@ static int CALLBACK cert_prop_sheet_proc(HWND hwnd, UINT msg, LPARAM lp) case PSCB_INITIALIZED: /* Get cancel button's position.. */ GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rc); - topLeft.x = rc.left; - topLeft.y = rc.top; - ScreenToClient(hwnd, &topLeft); + MapWindowPoints( 0, hwnd, (POINT *)&rc, 2 ); /* hide the cancel button.. */ ShowWindow(GetDlgItem(hwnd, IDCANCEL), FALSE); - /* get the OK button's size.. */ - GetWindowRect(GetDlgItem(hwnd, IDOK), &rc); /* and move the OK button to the cancel button's original position. */ - MoveWindow(GetDlgItem(hwnd, IDOK), topLeft.x, topLeft.y, - rc.right - rc.left, rc.bottom - rc.top, FALSE); - GetWindowRect(GetDlgItem(hwnd, IDOK), &rc); + SetWindowPos(GetDlgItem(hwnd, IDOK), 0, rc.left, rc.top, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); break; } return 0;

1 0

Maarten Lankhorst : quartz: Add additional notifications to transform filter.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 781cb486534145ca39c97c22185a4114057819b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781cb486534145ca39c97c221… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 12 17:10:04 2010 +0200 quartz: Add additional notifications to transform filter. --- dlls/quartz/transform.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/quartz/transform.h | 4 +++ 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index b6ec768..e8056b0 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -515,6 +515,60 @@ static HRESULT WINAPI TransformFilter_InputPin_Disconnect(IPin * iface) return IPinImpl_Disconnect(iface); } +static HRESULT WINAPI TransformFilter_InputPin_BeginFlush(IPin * iface) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnBeginFlush) + hr = pTransform->pFuncsTable->pfnBeginFlush(This); + if (SUCCEEDED(hr)) + hr = InputPin_BeginFlush(iface); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + +static HRESULT WINAPI TransformFilter_InputPin_EndFlush(IPin * iface) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnEndFlush) + hr = pTransform->pFuncsTable->pfnEndFlush(This); + if (SUCCEEDED(hr)) + hr = InputPin_EndFlush(iface); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + +static HRESULT WINAPI TransformFilter_InputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +{ + InputPin* This = (InputPin*) iface; + TransformFilterImpl* pTransform; + HRESULT hr = S_OK; + + TRACE("(%p)->()\n", iface); + + pTransform = (TransformFilterImpl*)This->pin.pinInfo.pFilter; + EnterCriticalSection(&pTransform->csFilter); + if (pTransform->pFuncsTable->pfnNewSegment) + hr = pTransform->pFuncsTable->pfnNewSegment(This, tStart, tStop, dRate); + if (SUCCEEDED(hr)) + hr = InputPin_NewSegment(iface, tStart, tStop, dRate); + LeaveCriticalSection(&pTransform->csFilter); + return hr; +} + static const IPinVtbl TransformFilter_InputPin_Vtbl = { InputPin_QueryInterface, @@ -532,9 +586,9 @@ static const IPinVtbl TransformFilter_InputPin_Vtbl = IPinImpl_EnumMediaTypes, IPinImpl_QueryInternalConnections, TransformFilter_InputPin_EndOfStream, - InputPin_BeginFlush, - InputPin_EndFlush, - InputPin_NewSegment + TransformFilter_InputPin_BeginFlush, + TransformFilter_InputPin_EndFlush, + TransformFilter_InputPin_NewSegment }; static HRESULT WINAPI TransformFilter_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) diff --git a/dlls/quartz/transform.h b/dlls/quartz/transform.h index 8d3a3a0..e2486cd 100644 --- a/dlls/quartz/transform.h +++ b/dlls/quartz/transform.h @@ -29,6 +29,10 @@ typedef struct TransformFuncsTable { HRESULT (*pfnQueryConnect) (TransformFilterImpl *This, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnConnectInput) (InputPin *pin, const AM_MEDIA_TYPE * pmt); HRESULT (*pfnCleanup) (InputPin *pin); + HRESULT (*pfnEndOfStream) (InputPin *pin); + HRESULT (*pfnBeginFlush) (InputPin *pin); + HRESULT (*pfnEndFlush) (InputPin *pin); + HRESULT (*pfnNewSegment) (InputPin *pin, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); } TransformFuncsTable; struct TransformFilterImpl

1 0

Maarten Lankhorst : quartz: Remove forwarding from base class.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: b6c523252dfe39bce4481853df50b5085ecb7f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c523252dfe39bce4481853d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat May 22 17:17:43 2010 +0200 quartz: Remove forwarding from base class. --- dlls/quartz/control.c | 189 +------------------------------------------------ 1 files changed, 2 insertions(+), 187 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index bf5a46f..b1485a4 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -224,81 +224,6 @@ HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) return S_OK; } -typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); - -static HRESULT ForwardCmdSeek( PCRITICAL_SECTION crit_sect, IBaseFilter* from, SeekFunc fnSeek, LPVOID arg ) -{ - HRESULT hr = S_OK; - HRESULT hr_return = S_OK; - IEnumPins *enumpins = NULL; - BOOL foundend = FALSE, allnotimpl = TRUE; - - hr = IBaseFilter_EnumPins( from, &enumpins ); - if (FAILED(hr)) - goto out; - - hr = IEnumPins_Reset( enumpins ); - while (hr == S_OK) { - IPin *pin = NULL; - hr = IEnumPins_Next( enumpins, 1, &pin, NULL ); - if (hr == VFW_E_ENUM_OUT_OF_SYNC) - { - hr = IEnumPins_Reset( enumpins ); - continue; - } - if (pin) - { - PIN_DIRECTION dir; - - IPin_QueryDirection( pin, &dir ); - if (dir == PINDIR_INPUT) - { - IPin *connected = NULL; - - IPin_ConnectedTo( pin, &connected ); - if (connected) - { - HRESULT hr_local; - IMediaSeeking *seek = NULL; - - hr_local = IPin_QueryInterface( connected, &IID_IMediaSeeking, (void**)&seek ); - if (hr_local == S_OK) - { - foundend = TRUE; - if (crit_sect) - { - LeaveCriticalSection( crit_sect ); - hr_local = fnSeek( seek , arg ); - EnterCriticalSection( crit_sect ); - } - else - hr_local = fnSeek( seek , arg ); - - if (hr_local != E_NOTIMPL) - allnotimpl = FALSE; - - hr_return = updatehres( hr_return, hr_local ); - IMediaSeeking_Release( seek ); - } - IPin_Release(connected); - } - } - IPin_Release( pin ); - } - } - IEnumPins_Release( enumpins ); - - if (foundend && allnotimpl) - hr = E_NOTIMPL; - else - hr = hr_return; - -out: - TRACE("Returning: %08x\n", hr); - return hr; -} - - HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, CHANGEPROC fnChangeCurrent, CHANGEPROC fnChangeRate, MediaSeekingImpl * pSeeking, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeCurrent && fnChangeRate); @@ -319,93 +244,9 @@ HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, C pSeeking->dRate = 1.0; pSeeking->timeformat = TIME_FORMAT_MEDIA_TIME; pSeeking->crst = crit_sect; - return S_OK; } -struct pos_args { - LONGLONG* current, *stop; - DWORD curflags, stopflags; -}; - -static HRESULT fwd_setposition(IMediaSeeking *seek, LPVOID pargs) -{ - struct pos_args *args = (void*)pargs; - - return IMediaSeeking_SetPositions(seek, args->current, args->curflags, args->stop, args->stopflags); -} - -static HRESULT fwd_checkcaps(IMediaSeeking *iface, LPVOID pcaps) -{ - DWORD *caps = pcaps; - return IMediaSeeking_CheckCapabilities(iface, caps); -} - -static HRESULT fwd_settimeformat(IMediaSeeking *iface, LPVOID pformat) -{ - const GUID *format = pformat; - return IMediaSeeking_SetTimeFormat(iface, format); -} - -static HRESULT fwd_getduration(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetDuration(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_getstopposition(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetStopPosition(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_getcurposition(IMediaSeeking *iface, LPVOID pdur) -{ - LONGLONG *duration = pdur; - LONGLONG mydur = *duration; - HRESULT hr; - - hr = IMediaSeeking_GetCurrentPosition(iface, &mydur); - if (FAILED(hr)) - return hr; - - if ((mydur < *duration) || (*duration < 0 && mydur > 0)) - *duration = mydur; - return hr; -} - -static HRESULT fwd_setrate(IMediaSeeking *iface, LPVOID prate) -{ - double *rate = prate; - - HRESULT hr; - - hr = IMediaSeeking_SetRate(iface, *rate); - if (FAILED(hr)) - return hr; - - return hr; -} - - HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; @@ -428,12 +269,6 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * if (!pCapabilities) return E_POINTER; - EnterCriticalSection(This->crst); - hr = ForwardCmdSeek(This->crst, This->pUserData, fwd_checkcaps, pCapabilities); - LeaveCriticalSection(This->crst); - if (FAILED(hr) && hr != E_NOTIMPL) - return hr; - dwCommonCaps = *pCapabilities & This->dwCapabilities; if (!dwCommonCaps) @@ -441,7 +276,6 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * else hr = (*pCapabilities == dwCommonCaps) ? S_OK : S_FALSE; *pCapabilities = dwCommonCaps; - return hr; } @@ -487,17 +321,11 @@ HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const G return hr; } - HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { MediaSeekingImpl *This = (MediaSeekingImpl *)iface; - TRACE("(%s)\n", qzdebugstr_guid(pFormat)); - - EnterCriticalSection(This->crst); - ForwardCmdSeek(This->crst, This->pUserData, fwd_settimeformat, (LPVOID)pFormat); - LeaveCriticalSection(This->crst); - - return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : S_FALSE); + TRACE("%p %s\n", This, qzdebugstr_guid(pFormat)); + return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : E_INVALIDARG); } @@ -509,7 +337,6 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD EnterCriticalSection(This->crst); *pDuration = This->llDuration; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getduration, pDuration); LeaveCriticalSection(This->crst); return S_OK; @@ -523,7 +350,6 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG EnterCriticalSection(This->crst); *pStop = This->llStop; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getstopposition, pStop); LeaveCriticalSection(This->crst); return S_OK; @@ -538,7 +364,6 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO EnterCriticalSection(This->crst); *pCurrent = This->llCurrent; - ForwardCmdSeek(This->crst, This->pUserData, fwd_getcurposition, pCurrent); LeaveCriticalSection(This->crst); return S_OK; @@ -577,15 +402,8 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; - struct pos_args args; TRACE("(%p, %x, %p, %x)\n", pCurrent, dwCurrentFlags, pStop, dwStopFlags); - - args.current = pCurrent; - args.stop = pStop; - args.curflags = dwCurrentFlags; - args.stopflags = dwStopFlags; - EnterCriticalSection(This->crst); llNewCurrent = Adjust(This->llCurrent, pCurrent, dwCurrentFlags); @@ -605,8 +423,6 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p *pCurrent = llNewCurrent; if (pStop && (dwStopFlags & AM_SEEKING_ReturnTime)) *pStop = llNewStop; - - ForwardCmdSeek(This->crst, This->pUserData, fwd_setposition, &args); LeaveCriticalSection(This->crst); if (bChangeCurrent) @@ -663,7 +479,6 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) This->dRate = dRate; if (bChangeRate) hr = This->fnChangeRate(This->pUserData); - ForwardCmdSeek(This->crst, This->pUserData, fwd_setrate, &dRate); LeaveCriticalSection(This->crst); return hr;

1 0

Maarten Lankhorst : quartz: Handle passthru calls better.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 8296cc7eb9ae6ac713bbf9305fee03073008894e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8296cc7eb9ae6ac713bbf9305… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Oct 1 14:38:23 2010 +0200 quartz: Handle passthru calls better. --- dlls/quartz/control.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 84e7dd7..bf5a46f 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -724,7 +724,7 @@ static HRESULT get_connected(PassThruImpl *This, IMediaSeeking **seek) { *seek = NULL; hr = IPin_ConnectedTo(This->pin, &pin); if (FAILED(hr)) - return hr; + return VFW_E_NOT_CONNECTED; hr = IPin_QueryInterface(pin, &IID_IMediaSeeking, (void**)seek); IPin_Release(pin); if (FAILED(hr)) @@ -743,6 +743,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetCapabilities(IMediaSeeking * iface hr = IMediaSeeking_GetCapabilities(seek, pCapabilities); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -757,6 +759,8 @@ static HRESULT WINAPI MediaSeekingPassThru_CheckCapabilities(IMediaSeeking * ifa hr = IMediaSeeking_CheckCapabilities(seek, pCapabilities); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -771,6 +775,8 @@ static HRESULT WINAPI MediaSeekingPassThru_IsFormatSupported(IMediaSeeking * ifa hr = IMediaSeeking_IsFormatSupported(seek, pFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -785,6 +791,8 @@ static HRESULT WINAPI MediaSeekingPassThru_QueryPreferredFormat(IMediaSeeking * hr = IMediaSeeking_QueryPreferredFormat(seek, pFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -799,6 +807,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetTimeFormat(IMediaSeeking * iface, hr = IMediaSeeking_GetTimeFormat(seek, pFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -813,6 +823,8 @@ static HRESULT WINAPI MediaSeekingPassThru_IsUsingTimeFormat(IMediaSeeking * ifa hr = IMediaSeeking_IsUsingTimeFormat(seek, pFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -827,6 +839,8 @@ static HRESULT WINAPI MediaSeekingPassThru_SetTimeFormat(IMediaSeeking * iface, hr = IMediaSeeking_SetTimeFormat(seek, pFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -841,6 +855,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetDuration(IMediaSeeking * iface, LO hr = IMediaSeeking_GetDuration(seek, pDuration); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -855,6 +871,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetStopPosition(IMediaSeeking * iface hr = IMediaSeeking_GetStopPosition(seek, pStop); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -881,6 +899,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetCurrentPosition(IMediaSeeking * if hr = IMediaSeeking_GetCurrentPosition(seek, pCurrent); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -895,6 +915,8 @@ static HRESULT WINAPI MediaSeekingPassThru_ConvertTimeFormat(IMediaSeeking * ifa hr = IMediaSeeking_ConvertTimeFormat(seek, pTarget, pTargetFormat, Source, pSourceFormat); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -908,7 +930,8 @@ static HRESULT WINAPI MediaSeekingPassThru_SetPositions(IMediaSeeking * iface, L if (SUCCEEDED(hr)) { hr = IMediaSeeking_SetPositions(seek, pCurrent, dwCurrentFlags, pStop, dwStopFlags); IMediaSeeking_Release(seek); - } + } else if (hr == VFW_E_NOT_CONNECTED) + hr = S_OK; return hr; } @@ -923,6 +946,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPositions(IMediaSeeking * iface, L hr = IMediaSeeking_GetPositions(seek, pCurrent, pStop); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -937,6 +962,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetAvailable(IMediaSeeking * iface, L hr = IMediaSeeking_GetAvailable(seek, pEarliest, pLatest); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -951,6 +978,8 @@ static HRESULT WINAPI MediaSeekingPassThru_SetRate(IMediaSeeking * iface, double hr = IMediaSeeking_SetRate(seek, dRate); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -965,6 +994,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetRate(IMediaSeeking * iface, double hr = IMediaSeeking_GetRate(seek, dRate); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; } @@ -979,6 +1010,8 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON hr = IMediaSeeking_GetPreroll(seek, pPreroll); IMediaSeeking_Release(seek); } + else + return E_NOTIMPL; return hr; }

1 0