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

Austin English : api-ms-win-core-memory-l1-1-2: Add dll.
by Alexandre Julliard March 14, 2016

March 14, 2016

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

Piotr Caban : user32: Call window procedure even if we' re out of winproc handles.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: c9ae38e4c77023eeb3e3bd49dd4506943e19d37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ae38e4c77023eeb3e3bd49d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:37 2016 +0100 user32: Call window procedure even if we're out of winproc handles. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 507a36a..aa71c8e 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -876,6 +876,7 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, WND *wndPtr; WNDPROC func; WINDOWPROC *proc; + BOOL unicode_win; if (!(wndPtr = WIN_GetPtr( hwnd ))) return FALSE; if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; @@ -886,10 +887,9 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } func = wndPtr->winproc; proc = handle_to_proc( wndPtr->winproc ); + unicode_win = wndPtr->flags & WIN_ISUNICODE; WIN_ReleasePtr( wndPtr ); - if (!proc) return TRUE; - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; thread_info->recursion_count++; @@ -897,19 +897,27 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, { if (proc == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, hwnd, msg, wParam, lParam, result, func ); - else if (proc->procW) + else if (proc && proc->procW) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procW ); - else + else if (proc) WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procA ); + else if (unicode_win) + call_window_proc( hwnd, msg, wParam, lParam, result, func ); + else + WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, func ); } else { if (proc == WINPROC_PROC16) wow_handlers.call_window_proc( hwnd, msg, wParam, lParam, result, func ); - else if (proc->procA) + else if (proc && proc->procA) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procA ); - else + else if (proc) WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procW, mapping ); + else if (unicode_win) + WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, func, mapping ); + else + call_window_proc( hwnd, msg, wParam, lParam, result, func ); } thread_info->recursion_count--; return TRUE;

1 0

Piotr Caban : user32/tests: Add initial out of window procedure slots test.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 55a5bac50037cd0f31c084d6e0898fcd8ccfb2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a5bac50037cd0f31c084d6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:31 2016 +0100 user32/tests: Add initial out of window procedure slots test. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 44f0557..e121809 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8677,6 +8677,114 @@ static void test_activateapp(HWND window1) DestroyWindow(window2); } +static LRESULT WINAPI winproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if(!hwnd) { + int *count = (int*)lparam; + (*count)++; + } + return 0; +} + +static LRESULT WINAPI winproc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return 0; +} + +static void test_winproc_handles(const char *argv0) +{ + static const WCHAR winproc_testW[] = {'w','i','n','p','r','o','c','_','t','e','s','t',0}; + + HINSTANCE hinst = GetModuleHandleA(NULL); + WNDCLASSA wnd_classA; + WNDCLASSW wnd_classW; + int count; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + + memset(&wnd_classA, 0, sizeof(wnd_classA)); + wnd_classA.lpszClassName = "winproc_test"; + wnd_classA.lpfnWndProc = winproc; + ok(RegisterClassA(&wnd_classA), + "RegisterClass failed with error %d\n", GetLastError()); + + ok(GetClassInfoW(hinst, winproc_testW, &wnd_classW), + "GetClassInfoW failed with error %d\n", GetLastError()); + ok(wnd_classA.lpfnWndProc != wnd_classW.lpfnWndProc, + "winproc pointers should not be identical\n"); + + count = 0; + CallWindowProcA(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + ok(count == 1, "winproc should be called once (%d)\n", count); + count = 0; + CallWindowProcW(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + ok(count == 1, "winproc should be called once (%d)\n", count); + + ok(UnregisterClassW(winproc_testW, hinst), + "UnregisterClass failed with error %d\n", GetLastError()); + /* crashes on 64-bit windows because lpfnWndProc handle is already freed */ + if (sizeof(void*) == 4) + { + count = 0; + CallWindowProcA(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + todo_wine ok(!count, "winproc should not be called (%d)\n", count); + CallWindowProcW(wnd_classW.lpfnWndProc, 0, 0, 0, (LPARAM)&count); + todo_wine ok(!count, "winproc should not be called (%d)\n", count); + } + + sprintf(cmd, "%s win winproc_limit", argv0); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); +} + +static void test_winproc_limit(void) +{ + WNDPROC winproc_handle; + HWND hwnd; + int i; + + hwnd = CreateWindowExA(0, "static", "test", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc), + "SetWindowLongPtr failed\n"); + winproc_handle = (WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC); + ok(winproc_handle != winproc, "winproc pointers should not be identical\n"); + + /* run out of winproc slots */ + for(i = 2; i<0xffff; i++) + { + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, i), "SetWindowLongPtr failed (%d)\n", i); + if(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == i) + break; + } + ok(i != 0xffff, "unable to run out of winproc slots\n"); + ok(SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)winproc2), + "SetWindowLongPtr failed with error %d\n", GetLastError()); + + i = 0; + CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + i = 0; + CallWindowProcW(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + + DestroyWindow(hwnd); + + i = 0; + CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); + i = 0; + CallWindowProcW(winproc_handle, 0, 0, 0, (LPARAM)&i); + ok(i == 1, "winproc should be called once (%d)\n", i); +} + START_TEST(win) { char **argv; @@ -8711,6 +8819,12 @@ START_TEST(win) return; } + if (argc==3 && !strcmp(argv[2], "winproc_limit")) + { + test_winproc_limit(); + return; + } + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", @@ -8812,6 +8926,7 @@ START_TEST(win) test_smresult(); test_GetMessagePos(); test_activateapp(hwndMain); + test_winproc_handles(argv[0]); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Nikolay Sivov : xmllite: Support get/set for XmlResolver property.
by Alexandre Julliard March 14, 2016

March 14, 2016

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 : mpr: Implement WNetUseConnectionA().
by Alexandre Julliard March 14, 2016

March 14, 2016

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 March 14, 2016

March 14, 2016

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 March 14, 2016

March 14, 2016

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-file-l1-2-1: Add dll.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: c78a7b419cc49c01ff49e79ea808db7868a98b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78a7b419cc49c01ff49e79ea… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:41:33 2016 -0600 api-ms-win-core-file-l1-2-1: 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-file-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-file-l1-2-1.spec | 82 ++++++++++++++++++++++ tools/make_specfiles | 5 +- 5 files changed, 89 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0985314..4792246 100755 --- a/configure +++ b/configure @@ -886,6 +886,7 @@ enable_api_ms_win_core_fibers_l1_1_0 enable_api_ms_win_core_fibers_l1_1_1 enable_api_ms_win_core_file_l1_1_0 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_file_l1_2_1 enable_api_ms_win_core_file_l2_1_0 enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 @@ -17325,6 +17326,7 @@ wine_fn_config_dll api-ms-win-core-fibers-l1-1-0 enable_api_ms_win_core_fibers_l wine_fn_config_dll api-ms-win-core-fibers-l1-1-1 enable_api_ms_win_core_fibers_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-1-0 enable_api_ms_win_core_file_l1_1_0 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-file-l1-2-1 enable_api_ms_win_core_file_l1_2_1 wine_fn_config_dll api-ms-win-core-file-l2-1-0 enable_api_ms_win_core_file_l2_1_0 wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 diff --git a/configure.ac b/configure.ac index ffcb01f..dc4f85b 100644 --- a/configure.ac +++ b/configure.ac @@ -2638,6 +2638,7 @@ WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) diff --git a/dlls/api-ms-win-core-file-l1-2-1/Makefile.in b/dlls/api-ms-win-core-file-l1-2-1/Makefile.in new file mode 100644 index 0000000..0c7dafe --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l1-2-1.dll diff --git a/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec new file mode 100644 index 0000000..c7691a4 --- /dev/null +++ b/dlls/api-ms-win-core-file-l1-2-1/api-ms-win-core-file-l1-2-1.spec @@ -0,0 +1,82 @@ +@ stdcall CompareFileTime(ptr ptr) kernel32.CompareFileTime +@ stdcall CreateDirectoryA(str ptr) kernel32.CreateDirectoryA +@ stdcall CreateDirectoryW(wstr ptr) kernel32.CreateDirectoryW +@ stdcall CreateFile2(wstr long long long ptr) kernel32.CreateFile2 +@ stdcall CreateFileA(str long long ptr long long long) kernel32.CreateFileA +@ stdcall CreateFileW(wstr long long ptr long long long) kernel32.CreateFileW +@ stdcall DefineDosDeviceW(long wstr wstr) kernel32.DefineDosDeviceW +@ stdcall DeleteFileA(str) kernel32.DeleteFileA +@ stdcall DeleteFileW(wstr) kernel32.DeleteFileW +@ stdcall DeleteVolumeMountPointW(wstr) kernel32.DeleteVolumeMountPointW +@ stdcall FileTimeToLocalFileTime(ptr ptr) kernel32.FileTimeToLocalFileTime +@ stdcall FindClose(long) kernel32.FindClose +@ stdcall FindCloseChangeNotification(long) kernel32.FindCloseChangeNotification +@ stdcall FindFirstChangeNotificationA(str long long) kernel32.FindFirstChangeNotificationA +@ stdcall FindFirstChangeNotificationW(wstr long long) kernel32.FindFirstChangeNotificationW +@ stdcall FindFirstFileA(str ptr) kernel32.FindFirstFileA +@ stdcall FindFirstFileExA(str long ptr long ptr long) kernel32.FindFirstFileExA +@ stdcall FindFirstFileExW(wstr long ptr long ptr long) kernel32.FindFirstFileExW +@ stdcall FindFirstFileW(wstr ptr) kernel32.FindFirstFileW +@ stdcall FindFirstVolumeW(ptr long) kernel32.FindFirstVolumeW +@ stdcall FindNextChangeNotification(long) kernel32.FindNextChangeNotification +@ stdcall FindNextFileA(long ptr) kernel32.FindNextFileA +@ stdcall FindNextFileW(long ptr) kernel32.FindNextFileW +@ stdcall FindNextVolumeW(long ptr long) kernel32.FindNextVolumeW +@ stdcall FindVolumeClose(ptr) kernel32.FindVolumeClose +@ stdcall FlushFileBuffers(long) kernel32.FlushFileBuffers +@ stdcall GetCompressedFileSizeA(long ptr) kernel32.GetCompressedFileSizeA +@ stdcall GetCompressedFileSizeW(long ptr) kernel32.GetCompressedFileSizeW +@ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceA +@ stdcall GetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA +@ stdcall GetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW +@ stdcall GetDiskFreeSpaceW(wstr ptr ptr ptr ptr) kernel32.GetDiskFreeSpaceW +@ stdcall GetDriveTypeA(str) kernel32.GetDriveTypeA +@ stdcall GetDriveTypeW(wstr) kernel32.GetDriveTypeW +@ stdcall GetFileAttributesA(str) kernel32.GetFileAttributesA +@ stdcall GetFileAttributesExA(str long ptr) kernel32.GetFileAttributesExA +@ stdcall GetFileAttributesExW(wstr long ptr) kernel32.GetFileAttributesExW +@ stdcall GetFileAttributesW(wstr) kernel32.GetFileAttributesW +@ stdcall GetFileInformationByHandle(long ptr) kernel32.GetFileInformationByHandle +@ stdcall GetFileSize(long ptr) kernel32.GetFileSize +@ stdcall GetFileSizeEx(long ptr) kernel32.GetFileSizeEx +@ stdcall GetFileTime(long ptr ptr ptr) kernel32.GetFileTime +@ stdcall GetFileType(long) kernel32.GetFileType +@ stub GetFinalPathNameByHandleA +@ stub GetFinalPathNameByHandleW +@ stdcall GetFullPathNameA(str long ptr ptr) kernel32.GetFullPathNameA +@ stdcall GetFullPathNameW(wstr long ptr ptr) kernel32.GetFullPathNameW +@ stdcall GetLogicalDriveStringsW(long ptr) kernel32.GetLogicalDriveStringsW +@ stdcall GetLogicalDrives() kernel32.GetLogicalDrives +@ stdcall GetLongPathNameA(str long long) kernel32.GetLongPathNameA +@ stdcall GetLongPathNameW(wstr long long) kernel32.GetLongPathNameW +@ stdcall GetShortPathNameW(wstr ptr long) kernel32.GetShortPathNameW +@ stdcall GetTempFileNameW(wstr wstr long ptr) kernel32.GetTempFileNameW +@ stdcall GetTempPathW(long ptr) kernel32.GetTempPathW +@ stub GetVolumeInformationByHandleW +@ stdcall GetVolumeInformationW(wstr ptr long ptr ptr ptr ptr long) kernel32.GetVolumeInformationW +@ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) kernel32.GetVolumeNameForVolumeMountPointW +@ stdcall GetVolumePathNameW(wstr ptr long) kernel32.GetVolumePathNameW +@ stdcall GetVolumePathNamesForVolumeNameW(wstr ptr long ptr) kernel32.GetVolumePathNamesForVolumeNameW +@ stdcall LocalFileTimeToFileTime(ptr ptr) kernel32.LocalFileTimeToFileTime +@ stdcall LockFile(long long long long long) kernel32.LockFile +@ stdcall LockFileEx(long long long long long ptr) kernel32.LockFileEx +@ stdcall QueryDosDeviceW(wstr ptr long) kernel32.QueryDosDeviceW +@ stdcall ReadFile(long ptr long ptr ptr) kernel32.ReadFile +@ stdcall ReadFileEx(long ptr long ptr ptr) kernel32.ReadFileEx +@ stdcall ReadFileScatter(long ptr long ptr ptr) kernel32.ReadFileScatter +@ stdcall RemoveDirectoryA(str) kernel32.RemoveDirectoryA +@ stdcall RemoveDirectoryW(wstr) kernel32.RemoveDirectoryW +@ stdcall SetEndOfFile(long) kernel32.SetEndOfFile +@ stdcall SetFileAttributesA(str long) kernel32.SetFileAttributesA +@ stdcall SetFileAttributesW(wstr long) kernel32.SetFileAttributesW +@ stdcall SetFileInformationByHandle(long long ptr long) kernel32.SetFileInformationByHandle +@ stub SetFileIoOverlappedRange +@ stdcall SetFilePointer(long long ptr long) kernel32.SetFilePointer +@ stdcall SetFilePointerEx(long int64 ptr long) kernel32.SetFilePointerEx +@ stdcall SetFileTime(long ptr ptr ptr) kernel32.SetFileTime +@ stdcall SetFileValidData(ptr int64) kernel32.SetFileValidData +@ stdcall UnlockFile(long long long long long) kernel32.UnlockFile +@ stdcall UnlockFileEx(long long long long ptr) kernel32.UnlockFileEx +@ stdcall WriteFile(long ptr long ptr ptr) kernel32.WriteFile +@ stdcall WriteFileEx(long ptr long ptr ptr) kernel32.WriteFileEx +@ stdcall WriteFileGather(long ptr long ptr ptr) kernel32.WriteFileGather diff --git a/tools/make_specfiles b/tools/make_specfiles index 223af07..b91ec93 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -181,7 +181,10 @@ my @dll_groups = "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-1-0", + "api-ms-win-core-file-l1-2-1", "api-ms-win-core-file-l1-2-0", + "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-file-l2-1-1", "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0", @@ -200,12 +203,10 @@ my @dll_groups = "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", - "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0", "api-ms-win-core-fibers-l1-1-1", - "api-ms-win-core-file-l2-1-0", "api-ms-win-core-localization-l1-2-1", "api-ms-win-core-datetime-l1-1-0", "api-ms-win-core-datetime-l1-1-1",

1 0

Austin English : wmasf: Add stub dll.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: 1d5a95ba20eb3dbe69a33a6a1e57dccdc336f6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5a95ba20eb3dbe69a33a6a1… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 7 11:29:48 2016 -0600 wmasf: Add stub 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/wmasf/Makefile.in | 4 ++++ dlls/wmasf/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wmasf/wmasf.spec | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) diff --git a/configure b/configure index bee8e6b..0985314 100755 --- a/configure +++ b/configure @@ -1387,6 +1387,7 @@ enable_wintab32 enable_wintrust enable_wlanapi enable_wldap32 +enable_wmasf enable_wmi enable_wmiutils enable_wmp @@ -18053,6 +18054,7 @@ wine_fn_config_test dlls/wintrust/tests wintrust_test wine_fn_config_dll wlanapi enable_wlanapi wine_fn_config_dll wldap32 enable_wldap32 clean,implib wine_fn_config_test dlls/wldap32/tests wldap32_test +wine_fn_config_dll wmasf enable_wmasf wine_fn_config_dll wmi enable_wmi wine_fn_config_dll wmiutils enable_wmiutils clean wine_fn_config_test dlls/wmiutils/tests wmiutils_test diff --git a/configure.ac b/configure.ac index 09e0f53..ffcb01f 100644 --- a/configure.ac +++ b/configure.ac @@ -3367,6 +3367,7 @@ WINE_CONFIG_TEST(dlls/wintrust/tests) WINE_CONFIG_DLL(wlanapi) WINE_CONFIG_DLL(wldap32,,[clean,implib]) WINE_CONFIG_TEST(dlls/wldap32/tests) +WINE_CONFIG_DLL(wmasf) WINE_CONFIG_DLL(wmi) WINE_CONFIG_DLL(wmiutils,,[clean]) WINE_CONFIG_TEST(dlls/wmiutils/tests) diff --git a/dlls/wmasf/Makefile.in b/dlls/wmasf/Makefile.in new file mode 100644 index 0000000..6fec158 --- /dev/null +++ b/dlls/wmasf/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wmasf.dll + +C_SRCS = \ + main.c diff --git a/dlls/wmasf/main.c b/dlls/wmasf/main.c new file mode 100644 index 0000000..baf7619 --- /dev/null +++ b/dlls/wmasf/main.c @@ -0,0 +1,44 @@ +/* + * WMASF.dll + * + * Copyright 2016 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wmasf); + +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + TRACE("(0x%p, %d, %p)\n", dll, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(dll); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/wmasf/wmasf.spec b/dlls/wmasf/wmasf.spec new file mode 100644 index 0000000..80624e9 --- /dev/null +++ b/dlls/wmasf/wmasf.spec @@ -0,0 +1,35 @@ +@ stub ASFCreateLibrary +@ stub ASFGetHeaderObject +@ stub ASFGetRootObject +@ stub ASFGetStreamPropertiesObject +@ stub ASFFindHeaderObject +@ stub ASFFindRootObject +@ stub ASFFindStreamPropertiesObject +@ stub CreateAsfCellPoolAllocator +@ stub ASFCreateIndexMaker +@ stub ASFCreateIndexMakerFileSink +@ stub ASFAddPresDelta +@ stub ASFAddSendDelta +@ stub ASFGUIDFromCodecID +@ stub ASFGUIDToCodecID +@ stub ASFReadHeaderFromFile +@ stub ASFCalculatePresDelta +@ stub ASFCreateBitrateTracker +@ stub ASFWriteHeaderToFile +@ stub ASFCreateIOMonitor +@ stub ASFGetDataUnitInfo +@ stub ASFCreateMediaObjectIndexMaker +@ stub ASFCreateStreamSelector +@ stub ASFGetTimeBase +@ stub ASFPresDeltaTimeToTime +@ stub ASFPresDeltaToFull +@ stub ASFPresFullToDelta +@ stub ASFPresTimeToSendTime +@ stub ASFPresTimeToTime +@ stub ASFReadHeaderFromFileHandle +@ stub ASFSendTimeToPresTime +@ stub ASFSendTimeToTime +@ stub ASFSetDataUnitInfo +@ stub ASFTimeToPresDeltaTime +@ stub ASFTimeToPresTime +@ stub ASFTimeToSendTime

1 0

Piotr Caban : user32/tests: Show that messages are not converted when function pointer is passed to CallWindowProc.
by Alexandre Julliard March 14, 2016

March 14, 2016

Module: wine Branch: master Commit: f729e62a27e2e6fdeb05d01511b85302e96d3054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f729e62a27e2e6fdeb05d0151… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:47 2016 +0100 user32/tests: Show that messages are not converted when function pointer is passed to CallWindowProc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cf7ddc8..957e8a1d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8798,6 +8798,12 @@ static void test_winproc_limit(void) ok(SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)"text"), "WM_SETTEXT failed\n"); ok(SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW), "WM_SETTEXT with conversion failed\n"); + /* Show that there's no message conversion when CallWindowProc is used */ + ok(CallWindowProcA(winproc_convW, hwnd, WM_SETTEXT, 0, (LPARAM)textW) == 1, + "winproc_convW returned error\n"); + ok(CallWindowProcW(winproc_convW, hwnd, WM_SETTEXT, 0, (LPARAM)textW) == 1, + "winproc_convW returned error\n"); + i = 0; CallWindowProcA(winproc_handle, 0, 0, 0, (LPARAM)&i); ok(i == 1, "winproc should be called once (%d)\n", i);

1 0