January 2014 - Wine-commits

Nikolay Sivov : scrrun: Implement Skip() for file and folder collections.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 64c93f607055c76a5ed4fa8f6a8fa1b68b2b42e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c93f607055c76a5ed4fa8f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:29 2014 +0400 scrrun: Implement Skip() for file and folder collections. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1c0c6c3..eb9073a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,8 +545,16 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_dir_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) @@ -698,8 +706,16 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_file_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface)

1 0

Nikolay Sivov : scrrun: Store collection pointer directly in IEnumVARIANT data.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: c1b7a075cab3109cd684a376dbf19a3a348e55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b7a075cab3109cd684a376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:54 2014 +0400 scrrun: Store collection pointer directly in IEnumVARIANT data. --- dlls/scrrun/filesystem.c | 66 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index eb9073a..4802614 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -38,20 +38,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrrun); static const WCHAR bsW[] = {'\\',0}; +struct foldercollection { + IFolderCollection IFolderCollection_iface; + LONG ref; + BSTR path; +}; + +struct filecollection { + IFileCollection IFileCollection_iface; + LONG ref; + BSTR path; +}; + struct enumdata { union { struct { - IFolderCollection *coll; + struct foldercollection *coll; HANDLE find; - BSTR path; } foldercoll; struct { - IFileCollection *coll; + struct filecollection *coll; HANDLE find; - BSTR path; } filecoll; } u; }; @@ -63,18 +73,6 @@ struct enumvariant { struct enumdata data; }; -struct foldercollection { - IFolderCollection IFolderCollection_iface; - LONG ref; - BSTR path; -}; - -struct filecollection { - IFileCollection IFileCollection_iface; - LONG ref; - BSTR path; -}; - struct folder { IFolder IFolder_iface; LONG ref; @@ -459,8 +457,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { - IFolderCollection_Release(This->data.u.foldercoll.coll); - SysFreeString(This->data.u.foldercoll.path); + IFolderCollection_Release(&This->data.u.foldercoll.coll->IFolderCollection_iface); FindClose(This->data.u.foldercoll.find); heap_free(This); } @@ -484,7 +481,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel { static const WCHAR allW[] = {'*',0}; WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.foldercoll.path; + BSTR parent = This->data.u.foldercoll.coll->path; int len; strcpyW(pathW, parent); @@ -522,7 +519,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel HRESULT hr; BSTR str; - str = get_full_path(This->data.u.foldercoll.path, &data); + str = get_full_path(This->data.u.foldercoll.coll->path, &data); hr = create_folder(str, &folder); SysFreeString(str); if (FAILED(hr)) return hr; @@ -598,15 +595,8 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn This->IEnumVARIANT_iface.lpVtbl = &foldercollenumvariantvtbl; This->ref = 1; This->data.u.foldercoll.find = NULL; - This->data.u.foldercoll.path = SysAllocString(collection->path); - if (!This->data.u.foldercoll.path) - { - heap_free(This); - return E_OUTOFMEMORY; - } - - This->data.u.foldercoll.coll = &collection->IFolderCollection_iface; - IFolderCollection_AddRef(This->data.u.foldercoll.coll); + This->data.u.foldercoll.coll = collection; + IFolderCollection_AddRef(&collection->IFolderCollection_iface); *newenum = (IUnknown*)&This->IEnumVARIANT_iface; @@ -622,8 +612,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { - IFileCollection_Release(This->data.u.filecoll.coll); - SysFreeString(This->data.u.filecoll.path); + IFileCollection_Release(&This->data.u.filecoll.coll->IFileCollection_iface); heap_free(This); } @@ -646,7 +635,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, { static const WCHAR allW[] = {'*',0}; WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.filecoll.path; + BSTR parent = This->data.u.filecoll.coll->path; int len; strcpyW(pathW, parent); @@ -683,7 +672,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, HRESULT hr; BSTR str; - str = get_full_path(This->data.u.filecoll.path, &data); + str = get_full_path(This->data.u.filecoll.coll->path, &data); hr = create_file(str, &file); SysFreeString(str); if (FAILED(hr)) return hr; @@ -758,15 +747,8 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; - This->data.u.filecoll.path = SysAllocString(collection->path); - if (!This->data.u.filecoll.path) - { - heap_free(This); - return E_OUTOFMEMORY; - } - - This->data.u.filecoll.coll = &collection->IFileCollection_iface; - IFileCollection_AddRef(This->data.u.filecoll.coll); + This->data.u.filecoll.coll = collection; + IFileCollection_AddRef(&collection->IFileCollection_iface); *newenum = (IUnknown*)&This->IEnumVARIANT_iface;

1 0

Nikolay Sivov : scrrun: Implement Clone() for folder collection.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 844aa7959e3daf57cfdf5350106b7d3a3c7c761e URL: http://source.winehq.org/git/wine.git/?a=commit;h=844aa7959e3daf57cfdf53501… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:17 2014 +0400 scrrun: Implement Clone() for folder collection. --- dlls/scrrun/filesystem.c | 7 ++++--- dlls/scrrun/tests/filesystem.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4802614..2ed6469 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -144,6 +144,7 @@ static inline HRESULT create_error(DWORD err) static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); +static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -569,8 +570,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI foldercoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_foldercoll_enum(This->data.u.foldercoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { @@ -583,7 +584,7 @@ static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { foldercoll_enumvariant_Clone }; -static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) { struct enumvariant *This; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 00d7686..6942a3d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -863,12 +863,9 @@ static void test_FolderCollection(void) /* clone enumerator */ hr = IEnumVARIANT_Clone(enumvar, &clone); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { ok(clone != enumvar, "got %p, %p\n", enumvar, clone); IEnumVARIANT_Release(clone); -} hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : scrrun: Implement Clone() for file collection.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: c813ae2230d9a4776d1c09b0e17063ff9a52d9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c813ae2230d9a4776d1c09b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:42 2014 +0400 scrrun: Implement Clone() for file collection. --- dlls/scrrun/filesystem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 2ed6469..e0c9a34 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -145,6 +145,7 @@ static inline HRESULT create_error(DWORD err) static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); +static HRESULT create_filecoll_enum(struct filecollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -723,8 +724,8 @@ static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_filecoll_enum(This->data.u.filecoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl filecollenumvariantvtbl = { @@ -737,7 +738,7 @@ static const IEnumVARIANTVtbl filecollenumvariantvtbl = { filecoll_enumvariant_Clone }; -static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) { struct enumvariant *This;

1 0

Nikolay Sivov : scrrun: Fill find data on second Next() call before testing it.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: fac0d13ee74979bcfe954ebab66f291efa7eda5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac0d13ee74979bcfe954ebab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:59 2014 +0400 scrrun: Fill find data on second Next() call before testing it. --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e0c9a34..bfb201c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -510,6 +510,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do { @@ -663,6 +665,8 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, This->data.u.filecoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do {

1 0

Henri Verbeet : wined3d: Get rid of the unused screen_palents field in struct wined3d_palette.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 2401a82bdc99fe8daf00ca0683bc1c625cbcfb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2401a82bdc99fe8daf00ca068… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:14 2014 +0100 wined3d: Get rid of the unused screen_palents field in struct wined3d_palette. --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0cb5bb..0735116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2951,8 +2951,6 @@ struct wined3d_palette WORD palVersion; /*| */ WORD palNumEntries; /*| LOGPALETTE */ PALETTEENTRY palents[256]; /*| */ - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; DWORD flags; };

1 0

Henri Verbeet : wined3d: Fix up the backbuffer count on failure in swapchain_init().
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ddae20b6899e65456750981ba002e426e6d35539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddae20b6899e65456750981ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:15 2014 +0100 wined3d: Fix up the backbuffer count on failure in swapchain_init(). --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ff2ac64..40fabc6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -952,6 +952,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 parent, &surface_desc, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); + swapchain->desc.backbuffer_count = i; goto err; } surface_set_swapchain(swapchain->back_buffers[i], swapchain);

1 0

Henri Verbeet : d3d9/tests: Make sure create_device() returns NULL on failure.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 86ffd6c4eaacaadceaaa9b47e67c495fff8709e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ffd6c4eaacaadceaaa9b47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:16 2014 +0100 d3d9/tests: Make sure create_device() returns NULL on failure. --- dlls/d3d9/tests/visual.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4e7bd0..534d8bd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -177,7 +177,6 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - HRESULT hr; present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); @@ -188,14 +187,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - if (FAILED(hr)) - DestroyWindow(present_parameters.hDeviceWindow); + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + DestroyWindow(present_parameters.hDeviceWindow); + return NULL; } static IDirect3DDevice9 *init_d3d9(void)

1 0

Sebastian Lackner : ntdll: Implement condition variable functions using keyed events.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 5472b9f9ca1a393c0153e256da67798a3afe53c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5472b9f9ca1a393c0153e256d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:48:34 2014 +0100 ntdll: Implement condition variable functions using keyed events. --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/sync.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 +++- 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6418671..2e507bb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -672,6 +672,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) # @ stub RtlInitializeAtomPackage @ stdcall RtlInitializeBitMap(ptr long long) +@ stdcall RtlInitializeConditionVariable(ptr) @ stub RtlInitializeContext @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -867,6 +868,7 @@ @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) +@ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream @@ -932,6 +934,8 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWakeAllConditionVariable(ptr) +@ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b05bd19..c94d9c4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -63,6 +63,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; +static inline int interlocked_dec_if_nonzero( int *dest ) +{ + int val, tmp; + for (val = *dest;; val = tmp) + { + if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) + break; + } + return val; +} + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1410,3 +1421,85 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) { FIXME( "%p stub\n", lock ); } + +/*********************************************************************** + * RtlInitializeConditionVariable (NTDLL.@) + * + * Initializes the condition variable with NULL. + * + * PARAMS + * variable [O] condition variable + * + * RETURNS + * Nothing. + */ +void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + variable->Ptr = NULL; +} + +/*********************************************************************** + * RtlWakeConditionVariable (NTDLL.@) + * + * Wakes up one thread waiting on the condition variable. + * + * PARAMS + * variable [I/O] condition variable to wake up. + * + * RETURNS + * Nothing. + * + * NOTES + * The calling thread does not have to own any lock in order to call + * this function. + */ +void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlWakeAllConditionVariable (NTDLL.@) + * + * See WakeConditionVariable, wakes up all waiting threads. + */ +void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlSleepConditionVariableCS (NTDLL.@) + * + * Atomically releases the critical section and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the critical section again and returns. + * + * PARAMS + * variable [I/O] condition variable + * crit [I/O] critical section to leave temporarily + * timeout [I] timeout + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + */ +NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, + const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + RtlEnterCriticalSection( crit ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d93b37a..c840732 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2418,10 +2418,11 @@ NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); +NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); +NTSYSAPI void WINAPI RtlInitializeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount(RTL_CRITICAL_SECTION *,ULONG); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionEx(RTL_CRITICAL_SECTION *,ULONG,ULONG); -NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); NTSYSAPI void WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *); NTSYSAPI void WINAPI RtlInitializeResource(LPRTL_RWLOCK); NTSYSAPI void WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*); @@ -2501,6 +2502,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOL NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID); @@ -2544,6 +2546,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); +NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*);

1 0

Sebastian Lackner : kernel32: Forward condition variable functions to ntdll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: ddc7f300e2cd5dd2e17783739fabbf74491e9eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc7f300e2cd5dd2e17783739… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:53:12 2014 +0100 kernel32: Forward condition variable functions to ntdll. --- dlls/kernel32/kernel32.spec | 4 ++++ dlls/kernel32/sync.c | 18 ++++++++++++++++++ dlls/kernel32/tests/sync.c | 6 ++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7779a75..02b1bdb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -750,6 +750,7 @@ @ stdcall InitOnceComplete(ptr long ptr) @ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr) @ stdcall InitOnceInitialize(ptr) ntdll.RtlRunOnceInitialize +@ stdcall InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @ stdcall InitializeCriticalSectionEx(ptr long long) @@ -1194,6 +1195,7 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) +@ stdcall SleepConditionVariableCS(ptr ptr long) @ stdcall SleepEx(long long) @ stdcall SuspendThread(long) @ stdcall SwitchToFiber(ptr) @@ -1263,6 +1265,8 @@ @ stdcall WaitForSingleObjectEx(long long long) @ stdcall WaitNamedPipeA (str long) @ stdcall WaitNamedPipeW (wstr long) +@ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable @ stdcall WerRegisterFile(wstr long long) @ stdcall WerRegisterMemoryBlock(ptr long) @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5b7f810..2b7f4b0 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2321,3 +2321,21 @@ __ASM_STDCALL_FUNC(InterlockedDecrement, 4, "ret $4") #endif /* __i386__ */ + +/*********************************************************************** + * SleepConditionVariableCS (KERNEL32.@) + */ +BOOL WINAPI SleepConditionVariableCS( CONDITION_VARIABLE *variable, CRITICAL_SECTION *crit, DWORD timeout ) +{ + NTSTATUS status; + LARGE_INTEGER time; + + status = RtlSleepConditionVariableCS( variable, crit, get_nt_timeout( &time, timeout ) ); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; +} diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 84c44e0..d76aa16 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1477,8 +1477,7 @@ static void test_condvars_consumer_producer(void) if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; } @@ -1640,8 +1639,7 @@ static void test_condvars_base(void) { if (!pInitializeConditionVariable) { /* function is not yet in XP, only in newer Windows */ - /* and not yet implemented in Wine for some days/weeks */ - todo_wine win_skip("no condition variable support.\n"); + win_skip("no condition variable support.\n"); return; }

1 0