March 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : mpr: Implement WNetUseConnectionA().
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: e920b4ecffd6387e24dd046fd7fa97d13d418d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e920b4ecffd6387e24dd046fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 17:08:55 2016 +0300 mpr: Implement WNetUseConnectionA(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 223 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 177 insertions(+), 46 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 62e1479..fab91c7 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1563,57 +1563,80 @@ DWORD WINAPI WNetAddConnection3W( HWND hwndOwner, LPNETRESOURCEW lpNetResource, dwFlags, NULL, 0, NULL); } -/***************************************************************** - * WNetUseConnectionA [MPR.@] - */ -DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, LPNETRESOURCEA lpNetResource, - LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags, - LPSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) -{ - FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", - hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, - debugstr_a(lpAccessName), lpBufferSize, lpResult ); +struct use_connection_context +{ + HWND hwndOwner; + NETRESOURCEW *resource; + NETRESOURCEA *resourceA; /* only set for WNetUseConnectionA */ + WCHAR *password; + WCHAR *userid; + DWORD flags; + void *accessname; + DWORD *buffer_size; + DWORD *result; + DWORD (*pre_set_accessname)(struct use_connection_context*); + void (*set_accessname)(struct use_connection_context*); +}; + +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt) +{ + if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) + { + DWORD len; - SetLastError(WN_NO_NETWORK); - return WN_NO_NETWORK; + if (ctxt->resource->lpLocalName) + len = strlenW(ctxt->resource->lpLocalName); + else + len = strlenW(ctxt->resource->lpRemoteName); + + if (++len > *ctxt->buffer_size) + { + *ctxt->buffer_size = len; + return ERROR_MORE_DATA; + } + } + else + ctxt->accessname = NULL; + + return ERROR_SUCCESS; } -/***************************************************************** - * WNetUseConnectionW [MPR.@] - */ -DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, - LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt) +{ + WCHAR *accessname = ctxt->accessname; + if (ctxt->resource->lpLocalName) + strcpyW(accessname, ctxt->resource->lpLocalName); + else + strcpyW(accessname, ctxt->resource->lpRemoteName); +} + +static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; DWORD index, ret, caps; - TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", - hwndOwner, resource, password, debugstr_w(userid), flags, - accessname, buffer_size, result ); - if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; - if (!resource) + if (!ctxt->resource) return ERROR_INVALID_PARAMETER; - if (!resource->lpProvider) + if (!ctxt->resource->lpProvider) { FIXME("Networking provider selection is not implemented.\n"); return WN_NO_NETWORK; } - if (!resource->lpLocalName && (flags & CONNECT_REDIRECT)) + if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) { FIXME("Locale device selection is not implemented.\n"); return WN_NO_NETWORK; } - if (flags & CONNECT_INTERACTIVE) + if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(resource->lpProvider); + index = _findProviderIndexW(ctxt->resource->lpProvider); if (index == BAD_PROVIDER_INDEX) return ERROR_BAD_PROVIDER; @@ -1622,37 +1645,145 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) return ERROR_BAD_PROVIDER; - if (accessname && buffer_size && *buffer_size) + if ((ret = ctxt->pre_set_accessname(ctxt))) + return ret; + + ret = WN_ACCESS_DENIED; + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + + if (ret == WN_SUCCESS && ctxt->accessname) + ctxt->set_accessname(ctxt); + + return ret; +} + +/***************************************************************** + * WNetUseConnectionW [MPR.@] + */ +DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, + LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) +{ + struct use_connection_context ctxt; + + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + hwndOwner, resource, password, debugstr_w(userid), flags, + accessname, buffer_size, result ); + + ctxt.hwndOwner = hwndOwner; + ctxt.resource = resource; + ctxt.resourceA = NULL; + ctxt.password = (WCHAR*)password; + ctxt.userid = (WCHAR*)userid; + ctxt.flags = flags; + ctxt.accessname = accessname; + ctxt.buffer_size = buffer_size; + ctxt.result = result; + ctxt.pre_set_accessname = use_connection_pre_set_accessnameW; + ctxt.set_accessname = use_connection_set_accessnameW; + + return wnet_use_connection(&ctxt); +} + +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt) +{ + if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (resource->lpLocalName) - len = strlenW(resource->lpLocalName); + if (ctxt->resourceA->lpLocalName) + len = strlen(ctxt->resourceA->lpLocalName); else - len = strlenW(resource->lpRemoteName); + len = strlen(ctxt->resourceA->lpRemoteName); - if (++len > *buffer_size) + if (++len > *ctxt->buffer_size) { - *buffer_size = len; + *ctxt->buffer_size = len; return ERROR_MORE_DATA; } } else - accessname = NULL; + ctxt->accessname = NULL; - ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(hwndOwner, resource, (LPWSTR)password, (LPWSTR)userid, flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(resource, (LPWSTR)password, (LPWSTR)userid); + return ERROR_SUCCESS; +} - if (ret == WN_SUCCESS && accessname) - { - if (resource->lpLocalName) - strcpyW(accessname, resource->lpLocalName); - else - strcpyW(accessname, resource->lpRemoteName); - } +static void use_connection_set_accessnameA(struct use_connection_context *ctxt) +{ + char *accessname = ctxt->accessname; + if (ctxt->resourceA->lpLocalName) + strcpy(accessname, ctxt->resourceA->lpLocalName); + else + strcpy(accessname, ctxt->resourceA->lpRemoteName); +} + +static LPWSTR strdupAtoW( LPCSTR str ) +{ + LPWSTR ret; + INT len; + + if (!str) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (ret) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + return ret; +} + +static void netresource_a_to_w( NETRESOURCEA *resourceA, NETRESOURCEW *resourceW ) +{ + resourceW->dwScope = resourceA->dwScope; + resourceW->dwType = resourceA->dwType; + resourceW->dwDisplayType = resourceA->dwDisplayType; + resourceW->dwUsage = resourceA->dwUsage; + resourceW->lpLocalName = strdupAtoW(resourceA->lpLocalName); + resourceW->lpRemoteName = strdupAtoW(resourceA->lpRemoteName); + resourceW->lpComment = strdupAtoW(resourceA->lpComment); + resourceW->lpProvider = strdupAtoW(resourceA->lpProvider); +} + +static void free_netresourceW( NETRESOURCEW *resource ) +{ + HeapFree(GetProcessHeap(), 0, resource->lpLocalName); + HeapFree(GetProcessHeap(), 0, resource->lpRemoteName); + HeapFree(GetProcessHeap(), 0, resource->lpComment); + HeapFree(GetProcessHeap(), 0, resource->lpProvider); +} + +/***************************************************************** + * WNetUseConnectionA [MPR.@] + */ +DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource, + LPCSTR password, LPCSTR userid, DWORD flags, LPSTR accessname, + DWORD *buffer_size, DWORD *result ) +{ + struct use_connection_context ctxt; + NETRESOURCEW resourceW; + DWORD ret; + + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags, + accessname, buffer_size, result ); + + netresource_a_to_w(resource, &resourceW); + + ctxt.hwndOwner = hwndOwner; + ctxt.resource = &resourceW; + ctxt.resourceA = resource; + ctxt.password = strdupAtoW(password); + ctxt.userid = strdupAtoW(userid); + ctxt.flags = flags; + ctxt.accessname = accessname; + ctxt.buffer_size = buffer_size; + ctxt.result = result; + ctxt.pre_set_accessname = use_connection_pre_set_accessnameA; + ctxt.set_accessname = use_connection_set_accessnameA; + + ret = wnet_use_connection(&ctxt); + + free_netresourceW(&resourceW); + HeapFree(GetProcessHeap(), 0, ctxt.password); + HeapFree(GetProcessHeap(), 0, ctxt.userid); return ret; }

1 0

Nikolay Sivov : ieframe: Handle CreateView() failure in ActivateMe() ( Coverity).
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 2dc49eee2297e69b9c0a802a2a288adc6a627066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc49eee2297e69b9c0a802a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 16:07:46 2016 +0300 ieframe: Handle CreateView() failure in ActivateMe() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index dadbe13..d82195f 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -390,8 +390,10 @@ static HRESULT WINAPI OleDocumentSite_ActivateMe(IOleDocumentSite *iface, if(FAILED(hres)) return hres; - IOleDocument_CreateView(oledoc, (IOleInPlaceSite*) &This->IOleInPlaceSiteEx_iface, NULL, 0, &This->view); + hres = IOleDocument_CreateView(oledoc, (IOleInPlaceSite*) &This->IOleInPlaceSiteEx_iface, NULL, 0, &This->view); IOleDocument_Release(oledoc); + if(FAILED(hres)) + return hres; GetClientRect(This->hwnd, &rect); IOleDocumentView_SetRect(This->view, &rect);

1 0

Austin English : user32: Add GetGestureConfig stub.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 0cb983f8b8545a96b99abfb66e1a88ca79b7e417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb983f8b8545a96b99abfb66… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:08:41 2016 -0600 user32: Add GetGestureConfig stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 33016a1..4497621 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -729,6 +729,16 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) return TRUE; } +/***************************************************************************** + * GetGestureConfig (USER32.@) + */ +BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) +{ + FIXME("(%p %08x %08x %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /********************************************************************** * SetGestureConfig [USER32.@] */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 2f5d36f..9ff5525 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -291,6 +291,7 @@ @ stdcall GetDoubleClickTime() @ stdcall GetFocus() @ stdcall GetForegroundWindow() +@ stdcall GetGestureConfig(long long long ptr ptr long) @ stdcall GetGUIThreadInfo(long ptr) @ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) diff --git a/include/winuser.h b/include/winuser.h index fa3e661..9c4586f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3605,6 +3605,7 @@ WINUSERAPI UINT WINAPI GetDlgItemTextW(HWND,INT,LPWSTR,INT); WINUSERAPI UINT WINAPI GetDoubleClickTime(void); WINUSERAPI HWND WINAPI GetFocus(void); WINUSERAPI HWND WINAPI GetForegroundWindow(void); +WINUSERAPI BOOL WINAPI GetGestureConfig(HWND,DWORD,DWORD,UINT*,GESTURECONFIG*,UINT); WINUSERAPI BOOL WINAPI GetGUIThreadInfo(DWORD,GUITHREADINFO*); WINUSERAPI BOOL WINAPI GetIconInfo(HICON,PICONINFO); WINUSERAPI BOOL WINAPI GetIconInfoExA(HICON,ICONINFOEXA*);

1 0

Jacek Caban : kernel32: Don' t set unconditionally SECTION_QUERY flag in OpenFileMapping.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: e625e86ee126b923703ad3ca728acff09f1e8812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e625e86ee126b923703ad3ca7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 11 15:43:42 2016 +0100 kernel32: Don't set unconditionally SECTION_QUERY flag in OpenFileMapping. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++++++++++++-- dlls/kernel32/virtual.c | 1 - 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8b86d45..775e708 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5560,17 +5560,23 @@ static void test_filemap_security(void) char temp_path[MAX_PATH]; char file_name[MAX_PATH]; DWORD ret, i, access; - HANDLE file, mapping, dup; + HANDLE file, mapping, dup, created_mapping; static const struct { int generic, mapped; + BOOL open_only; } map[] = { { 0, 0 }, { GENERIC_READ, STANDARD_RIGHTS_READ | SECTION_QUERY | SECTION_MAP_READ }, { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE }, { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE }, - { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS } + { GENERIC_ALL, STANDARD_RIGHTS_REQUIRED | SECTION_ALL_ACCESS }, + { SECTION_MAP_READ | SECTION_MAP_WRITE, SECTION_MAP_READ | SECTION_MAP_WRITE }, + { SECTION_MAP_WRITE, SECTION_MAP_WRITE }, + { SECTION_MAP_READ | SECTION_QUERY, SECTION_MAP_READ | SECTION_QUERY }, + { SECTION_QUERY, SECTION_MAP_READ, TRUE }, + { SECTION_QUERY | SECTION_MAP_READ, SECTION_QUERY | SECTION_MAP_READ } }; static const struct { @@ -5599,6 +5605,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(prot_map)/sizeof(prot_map[0]); i++) { + if (map[i].open_only) continue; + SetLastError(0xdeadbeef); mapping = CreateFileMappingW(file, NULL, prot_map[i].prot, 0, 4096, NULL); if (prot_map[i].mapped) @@ -5645,6 +5653,8 @@ static void test_filemap_security(void) for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) { + if (map[i].open_only) continue; + SetLastError( 0xdeadbeef ); ret = DuplicateHandle(GetCurrentProcess(), mapping, GetCurrentProcess(), &dup, map[i].generic, FALSE, 0); @@ -5659,6 +5669,24 @@ static void test_filemap_security(void) CloseHandle(mapping); CloseHandle(file); DeleteFileA(file_name); + + created_mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, + "Wine Test Open Mapping"); + ok(created_mapping != NULL, "CreateFileMapping failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(map)/sizeof(map[0]); i++) + { + if (!map[i].generic) continue; + + mapping = OpenFileMappingA(map[i].generic, FALSE, "Wine Test Open Mapping"); + ok(mapping != NULL, "OpenFileMapping failed with error %d\n", GetLastError()); + access = get_obj_access(mapping); + ok(access == map[i].mapped, "%d: unexpected access flags %#x, expected %#x\n", + i, access, map[i].mapped); + CloseHandle(mapping); + } + + CloseHandle(created_mapping); } static void test_thread_security(void) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index cce707b..32f2d65 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -472,7 +472,6 @@ HANDLE WINAPI OpenFileMappingW( DWORD access, BOOL inherit, LPCWSTR name) RtlInitUnicodeString( &nameW, name ); if (access == FILE_MAP_COPY) access = SECTION_MAP_READ; - access |= SECTION_QUERY; if (GetVersion() & 0x80000000) {

1 0

Nikolay Sivov : xmllite: Support get/set for XmlResolver property.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: aaac0db600f1c241e2fef473908f69ed3e808201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaac0db600f1c241e2fef4739… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 09:37:46 2016 +0300 xmllite: Support get/set for XmlResolver property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 17 +++++++++++- dlls/xmllite/tests/reader.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8a078a4..d9ed7e8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -243,6 +243,7 @@ typedef struct XmlReaderResumeState resumestate; XmlNodeType nodetype; DtdProcessing dtdmode; + IXmlResolver *resolver; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ @@ -2472,6 +2473,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + if (This->resolver) IXmlResolver_Release(This->resolver); reader_clear_attrs(This); reader_clear_elements(This); reader_free_strvalues(This); @@ -2556,6 +2558,11 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO switch (property) { + case XmlReaderProperty_XmlResolver: + *value = (LONG_PTR)This->resolver; + if (This->resolver) + IXmlResolver_AddRef(This->resolver); + break; case XmlReaderProperty_DtdProcessing: *value = This->dtdmode; break; @@ -2574,10 +2581,17 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); + TRACE("(%p)->(%s 0x%lx)\n", This, debugstr_reader_prop(property), value); switch (property) { + case XmlReaderProperty_XmlResolver: + if (This->resolver) + IXmlResolver_Release(This->resolver); + This->resolver = (IXmlResolver*)value; + if (This->resolver) + IXmlResolver_AddRef(This->resolver); + break; case XmlReaderProperty_DtdProcessing: if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; This->dtdmode = value; @@ -2974,6 +2988,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->instate = XmlReadInState_Initial; reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; + reader->resolver = NULL; reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index a62f802..e51496c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -386,8 +386,51 @@ static BOOL init_pointers(void) return TRUE; } +static HRESULT WINAPI resolver_QI(IXmlResolver *iface, REFIID riid, void **obj) +{ + ok(0, "unexpected call, riid %s\n", wine_dbgstr_guid(riid)); + + if (IsEqualIID(riid, &IID_IXmlResolver) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IXmlResolver_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI resolver_AddRef(IXmlResolver *iface) +{ + return 2; +} + +static ULONG WINAPI resolver_Release(IXmlResolver *iface) +{ + return 1; +} + +static HRESULT WINAPI resolver_ResolveUri(IXmlResolver *iface, const WCHAR *base_uri, + const WCHAR *public_id, const WCHAR *system_id, IUnknown **input) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IXmlResolverVtbl resolvervtbl = +{ + resolver_QI, + resolver_AddRef, + resolver_Release, + resolver_ResolveUri +}; + +static IXmlResolver testresolver = { &resolvervtbl }; + static void test_reader_create(void) { + IXmlResolver *resolver; HRESULT hr; IXmlReader *reader; IUnknown *input; @@ -411,6 +454,26 @@ static void test_reader_create(void) ok(hr == S_FALSE, "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + resolver = (void*)0xdeadbeef; + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resolver == NULL, "got %p\n", resolver); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR)&testresolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + + resolver = NULL; + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_XmlResolver, (LONG_PTR*)&resolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resolver == &testresolver, "got %p\n", resolver); + IXmlResolver_Release(resolver); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_XmlResolver, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Accept VT_UNKNOWN input for IXMLDOMSchemaCollection::add().
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: d241788d28e15b6a58899585f906a6471bf9caf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d241788d28e15b6a58899585f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 10:11:02 2016 +0300 msxml3: Accept VT_UNKNOWN input for IXMLDOMSchemaCollection::add(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/schema.c | 10 +++++----- dlls/msxml3/tests/schema.c | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7a1f8b3..41d1640 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1226,12 +1226,13 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri break; case VT_DISPATCH: + case VT_UNKNOWN: { xmlDocPtr doc = NULL; cache_entry* entry; CacheEntryType type; IXMLDOMNode* domnode = NULL; - IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IXMLDOMNode, (void**)&domnode); + IUnknown_QueryInterface(V_UNKNOWN(&var), &IID_IXMLDOMNode, (void**)&domnode); if (domnode) doc = xmlNodePtr_from_domnode(domnode, XML_DOCUMENT_NODE)->doc; @@ -1275,10 +1276,9 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri break; default: - { - heap_free(name); - return E_INVALIDARG; - } + FIXME("arg type is not supported, %s\n", debugstr_variant(&var)); + heap_free(name); + return E_INVALIDARG; } heap_free(name); return S_OK; diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 43ddc3c..bd5c359 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -506,6 +506,7 @@ static void test_schema_refs(void) VARIANT_BOOL b; BSTR str; LONG len; + HRESULT hr; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) @@ -557,6 +558,24 @@ static void test_schema_refs(void) ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); ok(len == 0, "got %d\n", len); + /* same, but with VT_UNKNOWN type */ + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)doc; + hr = IXMLDOMSchemaCollection_add(cache, NULL, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 1, "got %d\n", len); + + hr = IXMLDOMSchemaCollection_remove(cache, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = -1; + hr = IXMLDOMSchemaCollection_get_length(cache, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %d\n", len); + str = SysAllocString(xdr_schema_uri); ole_check(IXMLDOMSchemaCollection_add(cache, str, _variantdoc_(doc)));

1 0

Michael Stefaniuc : winex11: Use debugstr_a to print strings that can be NULL.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 17169816cde37e1624892fc464edd190bdecb767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17169816cde37e1624892fc46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:38:02 2016 +0100 winex11: Use debugstr_a to print strings that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 3642a47..bb3fcb8 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -565,7 +565,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) WTI_CURSORS_INFO cursor; TRACE("Device %i: [id %d|name %s|type %s|num_classes %d|use %d]\n", - loop, (int) devices[loop].id, devices[loop].name, device_type ? device_type : "", + loop, (int) devices[loop].id, devices[loop].name, debugstr_a(device_type), devices[loop].num_classes, devices[loop].use ); switch (devices[loop].use) @@ -620,7 +620,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (! is_tablet_cursor(target->name, device_type)) { WARN("Skipping device %d [name %s|type %s]; not apparently a tablet cursor type device. If this is wrong, please report it to wine-devel(a)winehq.org\n", - loop, devices[loop].name, device_type ? device_type : ""); + loop, devices[loop].name, debugstr_a(device_type)); break; }

1 0

Nikolay Sivov : comctl32/monthcal: MCM_GETRANGE does not return BOOL values.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: c075d5aafda9308ec88ec8b640976fb73ec210d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c075d5aafda9308ec88ec8b64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 12:59:17 2016 +0300 comctl32/monthcal: MCM_GETRANGE does not return BOOL values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/monthcal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5accbe6..c68a073 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1503,7 +1503,7 @@ MONTHCAL_GetRange(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) { TRACE("%p\n", range); - if(!range) return FALSE; + if (!range) return 0; range[1] = infoPtr->maxDate; range[0] = infoPtr->minDate; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c0d296a..792f66e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -304,6 +304,9 @@ static void test_monthcal(void) expect(0, st[1].wSecond); expect(0, st[1].wMilliseconds); + limits = SendMessageA(hwnd, MCM_GETRANGE, 0, 0); + ok(limits == 0, "got %u\n", limits); + GetSystemTime(&st[0]); st[1] = st[0];

1 0

Nikolay Sivov : ole32: Use CoGetApartmentType() to implement IComThreadingInfo.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 6fd208b41ca33da5192fefae27172ac2793bccfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd208b41ca33da5192fefae2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 08:09:59 2016 +0300 ole32: Use CoGetApartmentType() to implement IComThreadingInfo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a7fe650..b095aeb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4631,7 +4631,6 @@ typedef struct Context IContextCallback IContextCallback_iface; IObjContext IObjContext_iface; LONG refs; - APTTYPE apttype; } Context; static inline Context *impl_from_IComThreadingInfo( IComThreadingInfo *iface ) @@ -4710,21 +4709,26 @@ static ULONG WINAPI Context_CTI_Release(IComThreadingInfo *iface) static HRESULT WINAPI Context_CTI_GetCurrentApartmentType(IComThreadingInfo *iface, APTTYPE *apttype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; TRACE("(%p)\n", apttype); - *apttype = This->apttype; - return S_OK; + return CoGetApartmentType(apttype, &qualifier); } static HRESULT WINAPI Context_CTI_GetCurrentThreadType(IComThreadingInfo *iface, THDTYPE *thdtype) { - Context *This = impl_from_IComThreadingInfo(iface); + APTTYPEQUALIFIER qualifier; + APTTYPE apttype; + HRESULT hr; + + hr = CoGetApartmentType(&apttype, &qualifier); + if (FAILED(hr)) + return hr; TRACE("(%p)\n", thdtype); - switch (This->apttype) + switch (apttype) { case APTTYPE_STA: case APTTYPE_MAINSTA: @@ -4945,12 +4949,6 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) context->IContextCallback_iface.lpVtbl = &Context_Callback_Vtbl; context->IObjContext_iface.lpVtbl = &Context_Object_Vtbl; context->refs = 1; - if (apt->multi_threaded) - context->apttype = APTTYPE_MTA; - else if (apt->main) - context->apttype = APTTYPE_MAINSTA; - else - context->apttype = APTTYPE_STA; hr = IComThreadingInfo_QueryInterface(&context->IComThreadingInfo_iface, riid, ppv); IComThreadingInfo_Release(&context->IComThreadingInfo_iface);

1 0

Józef Kucia : wined3d: Limit amount of video memory for older Windows versions.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 565a5715468fa990cf9e7cbfe38ac59ddcde1e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565a5715468fa990cf9e7cbfe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 11 13:28:03 2016 +0100 wined3d: Limit amount of video memory for older Windows versions. This should affect only 32-bit applications when the emulated Windows version is set to "Windows 2003" or older. 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/wined3d/directx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60fb5ac..1aea568 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1510,6 +1510,18 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver = DRIVER_UNKNOWN; } + /** + * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. + * In order to avoid this application bug we limit the amount of video memory + * to LONG_MAX for older Windows versions. + */ + if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 + && driver_info->vram_bytes > LONG_MAX) + { + TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); + driver_info->vram_bytes = LONG_MAX; + } + if (wined3d_settings.emulated_textureram) { TRACE("Overriding amount of video memory with 0x%s bytes.\n",

1 0