February 2014 - Wine-Commits

Frédéric Delanoy : kernel32/tests: Remove unused variable.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: cb167e8e18ed5483d595699c65e25f9a5933bb46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb167e8e18ed5483d595699c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 4 11:05:43 2014 +0100 kernel32/tests: Remove unused variable. --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 2f54968..67d838a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -42,7 +42,6 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE ULONG_PTR InheritedFromUniqueProcessId; }; -static BOOL is_child; static LONG *child_failures; static WORD cb_count; static DWORD page_size; @@ -2649,7 +2648,6 @@ START_TEST(loader) child_failures = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); if (*child_failures == -1) { - is_child = 1; *child_failures = 0; } else

1 0

Michael Stefaniuc : winmm/tests: Avoid spurious test failures on Windows.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: ff7ebba27f8aea62f09cabd8a8bf285baec6a938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7ebba27f8aea62f09cabd8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 4 13:30:57 2014 +0100 winmm/tests: Avoid spurious test failures on Windows. --- dlls/winmm/tests/mci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 1ce0260..6a68b41 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -986,14 +986,14 @@ static void test_asyncWAVE(HWND hwnd) /* Check that the 2s sound plays at a normal pace, giving a wide margin to * account for timing granularity and small delays. */ - todo_wine ok(400 <= p2 && p2 <= 600, "%ums is not in the expected 400-600ms range\n", p2); + todo_wine ok(350 <= p2 && p2 <= 600, "%ums is not in the expected 350-600ms range\n", p2); /* Wine's asynchronous thread needs some time to start up. Furthermore, it * uses 3 buffers per second, so that the positions reported will be 333ms, * 667ms etc. at best, which is why it fails the above test. So add a * second test specifically to prevent Wine from getting even worse. * FIXME: To be removed when Wine is fixed and passes the above test. */ - ok(400 <= p2 && p2 <= 1000, "%ums is not even in the expected 400-1000ms range\n", p2); + ok(350 <= p2 && p2 <= 1000, "%ums is not even in the expected 350-1000ms range\n", p2); test_notification(hwnd,"play (nowait)",0); err = mciSendStringA("pause mysound wait", NULL, 0, hwnd);

1 0

Alistair Leslie-Hughes : dpnet: Store information when Initialize is called.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 658a5f450bcdb3f564bdc0684a461033602e0f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=658a5f450bcdb3f564bdc0684… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jan 20 09:59:41 2014 +1100 dpnet: Store information when Initialize is called. --- dlls/dpnet/peer.c | 16 ++++++++++++++++ dlls/dpnet/tests/peer.c | 3 +++ 2 files changed, 19 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 1b287dd..7b962a4 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -43,6 +43,10 @@ typedef struct IDirectPlay8PeerImpl { IDirectPlay8Peer IDirectPlay8Peer_iface; LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; } IDirectPlay8PeerImpl; static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) @@ -96,8 +100,17 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { + IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + if(!pfn) + return DPNERR_INVALIDPARAM; + + This->usercontext = pvUserContext; + This->msghandler = pfn; + This->flags = dwFlags; + return DPN_OK; } @@ -502,6 +515,9 @@ HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, R Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; Client->ref = 1; + Client->usercontext = NULL; + Client->msghandler = NULL; + Client->flags = 0; ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index a9ab01d..8ae0afe 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -51,6 +51,9 @@ static void test_init_dp(void) hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, NULL, 0); + ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); }

1 0

André Hentschel : user32: Use boolean return values in boolean functions.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: bdc9b147b948b3476815c52f7fc53f4c29494800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc9b147b948b3476815c52f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:27 2014 +0100 user32: Use boolean return values in boolean functions. --- dlls/user32/input.c | 2 +- dlls/user32/nonclient.c | 2 +- dlls/user32/painting.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 078fa49..457e67c 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -266,7 +266,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) { BOOL ret; - if (!pci) return 0; + if (!pci) return FALSE; SERVER_START_REQ( get_thread_input ) { diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d8d0807..5ea26dc 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -360,7 +360,7 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (uFlags & 0x2000) FIXME("undocumented flag (0x2000)!\n"); - return 0; + return FALSE; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 11447da..63e09c5 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -486,7 +486,7 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam TRACE("hDC = %p, %u\n", hDC, code); - if (!dce) return 0; + if (!dce) return FALSE; assert( dce->hdc == hDC ); switch( code )

1 0

André Hentschel : wininet: Use boolean return value in boolean function.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: c8426495fcf9db0d5cfb73d7d8080d1a82c36e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8426495fcf9db0d5cfb73d7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 22:28:25 2014 +0100 wininet: Use boolean return value in boolean function. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3cf3ea6..a37606a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1765,7 +1765,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR if(!found_colon){ SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); - return 0; + return FALSE; } lpUC->nScheme = INTERNET_SCHEME_UNKNOWN;

1 0

Marcus Meissner : kernel32/tests: Initial threadpool test.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 5d58b92b73129459c82532d4d582bfc547d24e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d58b92b73129459c82532d4d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 29 20:13:28 2014 +0100 kernel32/tests: Initial threadpool test. --- dlls/kernel32/tests/thread.c | 46 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 964ad02..6cbf383 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -19,7 +19,7 @@ */ /* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */ -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0600 #include <assert.h> #include <stdarg.h> @@ -82,6 +82,11 @@ static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pGetCurrentActCtx)(HANDLE *); static void (WINAPI *pReleaseActCtx)(HANDLE); +static PTP_POOL (WINAPI *pCreateThreadpool)(PVOID); +static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); +static void (WINAPI *pSubmitThreadpoolWork)(PTP_WORK); +static void (WINAPI *pWaitForThreadpoolWorkCallbacks)(PTP_WORK,BOOL); +static void (WINAPI *pCloseThreadpoolWork)(PTP_WORK); static HANDLE create_target_process(const char *arg) { @@ -1599,6 +1604,37 @@ static void test_thread_actctx(void) pReleaseActCtx(context); } + +static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { + int *foo = (int*)context; + + (*foo)++; +} + + +static void test_threadpool(void) +{ + PTP_POOL pool; + PTP_WORK work; + int workcalled = 0; + + if (!pCreateThreadpool) { + todo_wine win_skip("thread pool apis not supported.\n"); + return; + } + + work = pCreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + ok (work != NULL, "Error %d in CreateThreadpoolWork\n", GetLastError()); + pSubmitThreadpoolWork(work); + pWaitForThreadpoolWorkCallbacks(work, FALSE); + pCloseThreadpoolWork(work); + + ok (workcalled == 1, "expected work to be called once, got %d\n", workcalled); + + pool = pCreateThreadpool(NULL); + todo_wine ok (pool != NULL, "CreateThreadpool failed\n"); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1622,6 +1658,12 @@ static void init_funcs(void) X(DeactivateActCtx); X(GetCurrentActCtx); X(ReleaseActCtx); + + X(CreateThreadpool); + X(CreateThreadpoolWork); + X(SubmitThreadpoolWork); + X(WaitForThreadpoolWorkCallbacks); + X(CloseThreadpoolWork); #undef X } @@ -1687,4 +1729,6 @@ START_TEST(thread) test_thread_fpu_cw(); #endif test_thread_actctx(); + + test_threadpool(); }

1 0

Nikolay Sivov : oleaut32: Fix RecordCopy()/RecordClear() behavior.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 60252ea65bbdf991938d919cd4c734809fb899bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=60252ea65bbdf991938d919cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 30 22:53:13 2014 +0400 oleaut32: Fix RecordCopy()/RecordClear() behavior. --- dlls/oleaut32/recinfo.c | 75 +++++++++++++++++++++- dlls/oleaut32/tests/test_tlb.idl | 6 +- dlls/oleaut32/tests/typelib.c | 3 +- dlls/oleaut32/tests/vartype.c | 130 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 3 +- dlls/oleaut32/variant.h | 2 +- 6 files changed, 212 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60252ea65bbdf991938d9…

1 0

Nikolay Sivov : wshom: Implement Arguments() property for a shortcut.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: f608c5d2ae7ee0dc82fbf2bae9ae82b7f8dbe5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f608c5d2ae7ee0dc82fbf2bae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 4 10:24:30 2014 +0400 wshom: Implement Arguments() property for a shortcut. --- dlls/wshom.ocx/shell.c | 24 ++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 11 ++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 385d2a3..2dc2bbe 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -394,15 +394,31 @@ static HRESULT WINAPI WshShortcut_get_FullName(IWshShortcut *iface, BSTR *name) static HRESULT WINAPI WshShortcut_get_Arguments(IWshShortcut *iface, BSTR *Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, Arguments); - return E_NOTIMPL; + WCHAR buffW[INFOTIPSIZE]; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, Arguments); + + if (!Arguments) + return E_POINTER; + + *Arguments = NULL; + + hr = IShellLinkW_GetArguments(This->link, buffW, sizeof(buffW)/sizeof(WCHAR)); + if (FAILED(hr)) + return hr; + + *Arguments = SysAllocString(buffW); + return S_OK; } static HRESULT WINAPI WshShortcut_put_Arguments(IWshShortcut *iface, BSTR Arguments) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Arguments)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(Arguments)); + + return IShellLinkW_SetArguments(This->link, Arguments); } static HRESULT WINAPI WshShortcut_get_Description(IWshShortcut *iface, BSTR *Description) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 50adb90..0e01304 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -40,8 +40,9 @@ static void test_wshshell(void) IDispatchEx *dispex; IWshCollection *coll; IDispatch *disp, *shortcut; - IUnknown *shell, *unk; + IUnknown *shell; IFolderCollection *folders; + IWshShortcut *shcut; ITypeInfo *ti; HRESULT hr; TYPEATTR *tattr; @@ -109,9 +110,13 @@ static void test_wshshell(void) hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); EXPECT_HR(hr, S_OK); SysFreeString(str); - hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&unk); + hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); EXPECT_HR(hr, S_OK); - IUnknown_Release(unk); + + hr = IWshShortcut_get_Arguments(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + IWshShortcut_Release(shcut); IDispatch_Release(shortcut); /* ExpandEnvironmentStrings */

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Client.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: 9b6832942931163472f5e1c6518c9577a945ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6832942931163472f5e1c65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 17 14:38:34 2014 +1100 dpnet: Cleanup IDirectPlay8Client. --- dlls/dpnet/client.c | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 637dcb8..9668a68 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -61,24 +61,24 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_QueryInterface(IDirectPlay8Client * static ULONG WINAPI IDirectPlay8ClientImpl_AddRef(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%u\n", This, ref); - return refCount; + return ref; } static ULONG WINAPI IDirectPlay8ClientImpl_Release(IDirectPlay8Client *iface) { IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%u\n", This, ref); - if (!refCount) { + if (!ref) { HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /* IDirectPlay8Client Interface follow: */ @@ -273,17 +273,27 @@ static const IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl = IDirectPlay8ClientImpl_RegisterLobby }; -HRESULT DPNET_CreateDirectPlay8Client(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8ClientImpl* client; - - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppobj); +HRESULT DPNET_CreateDirectPlay8Client(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + IDirectPlay8ClientImpl* client; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + *ppv = NULL; + + if(pUnkOuter) + return CLASS_E_NOAGGREGATION; + + client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8ClientImpl)); + if (!client) + return E_OUTOFMEMORY; + + client->IDirectPlay8Client_iface.lpVtbl = &DirectPlay8Client_Vtbl; + client->ref = 1; + + hr = IDirectPlay8ClientImpl_QueryInterface(&client->IDirectPlay8Client_iface, riid, ppv); + IDirectPlay8ClientImpl_Release(&client->IDirectPlay8Client_iface); + + return hr; }

1 0

Marcus Meissner : kernel32: Thread pool definitions and prototypes.
by Alexandre Julliard Feb. 4, 2014

Feb. 4, 2014

Module: wine Branch: master Commit: cef12abd4f7496ee6c21e80b6bf58b981876135f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef12abd4f7496ee6c21e80b6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 29 20:13:27 2014 +0100 kernel32: Thread pool definitions and prototypes. --- include/winbase.h | 5 +++++ include/winnt.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 2d01c45..889f018 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1572,6 +1572,8 @@ WINADVAPI BOOL WINAPI ClearEventLogW(HANDLE,LPCWSTR); #define ClearEventLog WINELIB_NAME_AW(ClearEventLog) WINADVAPI BOOL WINAPI CloseEventLog(HANDLE); WINBASEAPI BOOL WINAPI CloseHandle(HANDLE); +WINBASEAPI VOID WINAPI CloseThreadpool(PTP_POOL); +WINBASEAPI VOID WINAPI CloseThreadpoolWork(PTP_WORK); WINBASEAPI BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG); WINBASEAPI BOOL WINAPI CommConfigDialogW(LPCWSTR,HWND,LPCOMMCONFIG); #define CommConfigDialog WINELIB_NAME_AW(CommConfigDialog) @@ -1633,6 +1635,8 @@ 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); +WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); +WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION); WINBASEAPI BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION); #define CreateProcess WINELIB_NAME_AW(CreateProcess) @@ -2365,6 +2369,7 @@ WINBASEAPI VOID WINAPI Sleep(DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableCS(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); WINBASEAPI BOOL WINAPI SleepConditionVariableSRW(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); WINBASEAPI DWORD WINAPI SleepEx(DWORD,BOOL); +WINBASEAPI VOID WINAPI SubmitThreadpoolWork(PTP_WORK); WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID); WINBASEAPI BOOL WINAPI SwitchToThread(void); diff --git a/include/winnt.h b/include/winnt.h index f55f2fe..dd4ef63 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5699,6 +5699,71 @@ typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; +/* Threadpool things */ +typedef DWORD TP_VERSION,*PTP_VERSION; + +typedef struct _TP_CALLBACK_INSTANCE TP_CALLBACK_INSTANCE,*PTP_CALLBACK_INSTANCE; + +typedef VOID (CALLBACK *PTP_SIMPLE_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID); + +typedef struct _TP_POOL TP_POOL,*PTP_POOL; + +typedef enum _TP_CALLBACK_PRIORITY +{ + TP_CALLBACK_PRIORITY_HIGH, + TP_CALLBACK_PRIORITY_NORMAL, + TP_CALLBACK_PRIORITY_LOW, + TP_CALLBACK_PRIORITY_INVALID, + TP_CALLBACK_PRIORITY_COUNT = TP_CALLBACK_PRIORITY_INVALID +} TP_CALLBACK_PRIORITY; + +typedef struct _TP_POOL_STACK_INFORMATION +{ + SIZE_T StackReserve; + SIZE_T StackCommit; +} TP_POOL_STACK_INFORMATION,*PTP_POOL_STACK_INFORMATION; + +typedef struct _TP_CLEANUP_GROUP TP_CLEANUP_GROUP,*PTP_CLEANUP_GROUP; + +typedef VOID (CALLBACK *PTP_CLEANUP_GROUP_CANCEL_CALLBACK)(PVOID,PVOID); + +typedef struct _TP_CALLBACK_ENVIRON_V1 +{ + TP_VERSION Version; + PTP_POOL Pool; + PTP_CLEANUP_GROUP CleanupGroup; + PTP_CLEANUP_GROUP_CANCEL_CALLBACK CleanupGroupCancelCallback; + PVOID RaceDll; + struct _ACTIVATION_CONTEXT* ActivationContext; + PTP_SIMPLE_CALLBACK FinalizationCallback; + union + { + DWORD Flags; + struct + { + DWORD LongFunction:1; + DWORD Persistent:1; + DWORD Private:30; + } s; + } u; +} TP_CALLBACK_ENVIRON_V1; + +typedef struct _TP_WORK TP_WORK, *PTP_WORK; +typedef struct _TP_TIMER TP_TIMER, *PTP_TIMER; + +typedef DWORD TP_WAIT_RESULT; +typedef struct _TP_WAIT TP_WAIT, *PTP_WAIT; + +typedef struct _TP_IO TP_IO, *PTP_IO; + +typedef TP_CALLBACK_ENVIRON_V1 TP_CALLBACK_ENVIRON, *PTP_CALLBACK_ENVIRON; + +typedef VOID (CALLBACK *PTP_WORK_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WORK); +typedef VOID (CALLBACK *PTP_TIMER_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_TIMER); +typedef VOID (CALLBACK *PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WAIT,TP_WAIT_RESULT); +typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID,ULONG,ULONG_PTR,PTP_IO); + + NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); #ifdef __cplusplus

1 0