wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

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

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

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

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

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

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

André Hentschel : advapi32: Add CreatePrivateObjectSecurityEx.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: b83a5d78a485ffd2ec4a0d16509248f13c2681f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83a5d78a485ffd2ec4a0d165… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 7 22:15:30 2016 +0100 advapi32: Add CreatePrivateObjectSecurityEx. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 25 ++++++++++++---------- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- include/winbase.h | 1 + 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c38e92e..3f32aa3 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -120,7 +120,7 @@ @ stdcall CopySid(long ptr ptr) # @ stub CreateCodeAuthzLevel @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) -# @ stub CreatePrivateObjectSecurityEx +@ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c8a6579..92a1789 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5299,20 +5299,16 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( return FALSE; } -BOOL WINAPI CreatePrivateObjectSecurity( - PSECURITY_DESCRIPTOR ParentDescriptor, - PSECURITY_DESCRIPTOR CreatorDescriptor, - PSECURITY_DESCRIPTOR* NewDescriptor, - BOOL IsDirectoryObject, - HANDLE Token, - PGENERIC_MAPPING GenericMapping ) +BOOL WINAPI CreatePrivateObjectSecurityEx( + PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, PSECURITY_DESCRIPTOR *out, + GUID *objtype, BOOL is_directory, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping) { SECURITY_DESCRIPTOR_RELATIVE *relative; DWORD needed, offset; BYTE *buffer; - FIXME("%p %p %p %d %p %p - returns fake SECURITY_DESCRIPTOR\n", ParentDescriptor, - CreatorDescriptor, NewDescriptor, IsDirectoryObject, Token, GenericMapping); + FIXME("%p %p %p %p %d %u %p %p - returns fake SECURITY_DESCRIPTOR\n", parent, creator, out, + objtype, is_directory, flags, token, mapping); needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); needed += sizeof(sidWorld); @@ -5345,16 +5341,23 @@ BOOL WINAPI CreatePrivateObjectSecurity( GetWorldAccessACL( (ACL *)(buffer + offset) ); relative->Sacl = offset; - *NewDescriptor = relative; + *out = relative; return TRUE; } +BOOL WINAPI CreatePrivateObjectSecurity( + PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, PSECURITY_DESCRIPTOR *out, + BOOL is_container, HANDLE token, PGENERIC_MAPPING mapping) +{ + return CreatePrivateObjectSecurityEx(parent, creator, out, NULL, is_container, 0, token, mapping); +} + BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance( PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, PSECURITY_DESCRIPTOR *out, GUID **types, ULONG count, BOOL is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping) { FIXME(": semi-stub\n"); - return CreatePrivateObjectSecurity(parent, creator, out, is_container, token, mapping); + return CreatePrivateObjectSecurityEx(parent, creator, out, NULL, is_container, flags, token, mapping); } BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor ) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 80bc0ed..cfe2261 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -26,7 +26,7 @@ @ stub ConvertToAutoInheritPrivateObjecSecurity @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity -@ stub CreatePrivateObjectSecurityEx +@ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) advapi32.CreatePrivateObjectSecurityEx @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 083c921..b831e87 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -26,7 +26,7 @@ @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) advapi32.ConvertToAutoInheritPrivateObjectSecurity @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity -@ stub CreatePrivateObjectSecurityEx +@ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) advapi32.CreatePrivateObjectSecurityEx @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index fc3e5f4..93472ac 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -30,7 +30,7 @@ @ stdcall ConvertToAutoInheritPrivateObjectSecurity(ptr ptr ptr ptr long ptr) advapi32.ConvertToAutoInheritPrivateObjectSecurity @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity -@ stub CreatePrivateObjectSecurityEx +@ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) advapi32.CreatePrivateObjectSecurityEx @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid diff --git a/include/winbase.h b/include/winbase.h index 15edac3..c5332c0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1772,6 +1772,7 @@ WINBASEAPI HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,D #define CreateNamedPipe WINELIB_NAME_AW(CreateNamedPipe) WINBASEAPI BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD); WINADVAPI BOOL WINAPI CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOL,HANDLE,PGENERIC_MAPPING); +WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityEx(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID*,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON);

1 0

Austin English : api-ms-win-core-string-l2-1-0: Add dll.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 6827a97236c07e2e3957a5f5b275b6254599a73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6827a97236c07e2e3957a5f5b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 12:02:43 2016 -0600 api-ms-win-core-string-l2-1-0: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-string-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-string-l2-1-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index f19429a..c8e5e56 100755 --- a/configure +++ b/configure @@ -925,6 +925,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_string_l2_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 @@ -17367,6 +17368,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 diff --git a/configure.ac b/configure.ac index 8cbf9e1..77c54c8 100644 --- a/configure.ac +++ b/configure.ac @@ -2677,6 +2677,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) diff --git a/dlls/api-ms-win-core-string-l2-1-0/Makefile.in b/dlls/api-ms-win-core-string-l2-1-0/Makefile.in new file mode 100644 index 0000000..410f0a2 --- /dev/null +++ b/dlls/api-ms-win-core-string-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-string-l2-1-0.dll diff --git a/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec new file mode 100644 index 0000000..2220949 --- /dev/null +++ b/dlls/api-ms-win-core-string-l2-1-0/api-ms-win-core-string-l2-1-0.spec @@ -0,0 +1,10 @@ +@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW +@ stdcall CharLowerW(wstr) user32.CharLowerW +@ stdcall CharNextW(wstr) user32.CharNextW +@ stdcall CharPrevW(wstr wstr) user32.CharPrevW +@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW +@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharUpperW(long) user32.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index 69c68ff..a99595a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -249,6 +249,7 @@ my @dll_groups = ], [ "user32", + "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", ],

1 0

Austin English : api-ms-win-core-version-l1-1-0: Add dll.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 4b02c8bdbc5e55c3e9d3ce96c77ed5a0d0e752ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b02c8bdbc5e55c3e9d3ce96c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:54:51 2016 -0600 api-ms-win-core-version-l1-1-0: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-version-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-version-l1-1-0.spec | 4 ++++ tools/make_specfiles | 1 + 5 files changed, 9 insertions(+) diff --git a/configure b/configure index 1459255..f19429a 100755 --- a/configure +++ b/configure @@ -935,6 +935,7 @@ enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 +enable_api_ms_win_core_version_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 @@ -17376,6 +17377,7 @@ wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_co wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 +wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_winrt_error_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 diff --git a/configure.ac b/configure.ac index 3172c20..8cbf9e1 100644 --- a/configure.ac +++ b/configure.ac @@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) diff --git a/dlls/api-ms-win-core-version-l1-1-0/Makefile.in b/dlls/api-ms-win-core-version-l1-1-0/Makefile.in new file mode 100644 index 0000000..c88fcab --- /dev/null +++ b/dlls/api-ms-win-core-version-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-version-l1-1-0.dll diff --git a/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec new file mode 100644 index 0000000..0ac1e13 --- /dev/null +++ b/dlls/api-ms-win-core-version-l1-1-0/api-ms-win-core-version-l1-1-0.spec @@ -0,0 +1,4 @@ +@ stdcall GetFileVersionInfoExW(long wstr long long ptr) version.GetFileVersionInfoExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW +@ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW +@ stdcall VerQueryValueW(ptr wstr ptr ptr) version.VerQueryValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 442d22f..69c68ff 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -254,6 +254,7 @@ my @dll_groups = ], [ "version", + "api-ms-win-core-version-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ], [

1 0

Austin English : api-ms-win-core-memory-l1-1-2: Add dll.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 02f0e72bd79ef9409179517723ca57687b9dc446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0e72bd79ef940917951772… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:49:11 2016 -0600 api-ms-win-core-memory-l1-1-2: Add dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-memory-l1-1-2/Makefile.in | 1 + .../api-ms-win-core-memory-l1-1-2.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 4792246..1459255 100755 --- a/configure +++ b/configure @@ -908,6 +908,7 @@ enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 +enable_api_ms_win_core_memory_l1_1_2 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 @@ -17348,6 +17349,7 @@ wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_wi wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 +wine_fn_config_dll api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 diff --git a/configure.ac b/configure.ac index dc4f85b..3172c20 100644 --- a/configure.ac +++ b/configure.ac @@ -2660,6 +2660,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in b/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in new file mode 100644 index 0000000..d76aa0c --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-memory-l1-1-2.dll diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec new file mode 100644 index 0000000..cf10c20 --- /dev/null +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -0,0 +1,8 @@ +@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) kernel32.AllocateUserPhysicalPages +@ stub AllocateUserPhysicalPagesNuma +@ stub FreeUserPhysicalPages +@ stub GetMemoryErrorHandlingCapabilities +@ stub MapUserPhysicalPages +@ stub RegisterBadMemoryNotification +@ stub UnregisterBadMemoryNotification +@ stub VirtualAllocExNuma diff --git a/tools/make_specfiles b/tools/make_specfiles index b91ec93..442d22f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -197,6 +197,7 @@ my @dll_groups = "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", + "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0",

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2016