January 2018 - Wine-Commits

Jacek Caban : schtasks: Ignore /tr and /ru options.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 23800d67e0732daa5bcb089bc03893b5d1c9051a URL: https://source.winehq.org/git/wine.git/?a=commit;h=23800d67e0732daa5bcb089b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 17:11:20 2018 +0100 schtasks: Ignore /tr and /ru options. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 81 +++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index c6b8586..2ac7544 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -31,7 +31,9 @@ static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; static const WCHAR f_optW[] = {'/','f',0}; +static const WCHAR ru_optW[] = {'/','r','u',0}; static const WCHAR tn_optW[] = {'/','t','n',0}; +static const WCHAR tr_optW[] = {'/','t','r',0}; static const WCHAR xml_optW[] = {'/','x','m','l',0}; static ITaskFolder *get_tasks_root_folder(void) @@ -133,49 +135,71 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) static int change_command(int argc, WCHAR *argv[]) { - const WCHAR *task_name; + BOOL have_option = FALSE, enable = FALSE; + const WCHAR *task_name = NULL; IRegisteredTask *task; HRESULT hres; - if (!argc) { - FIXME("Missing /tn option\n"); - return 1; - } + while (argc) { + if(!strcmpiW(argv[0], tn_optW)) { + if (argc < 2) { + FIXME("Missing /tn value\n"); + return 1; + } + + if (task_name) { + FIXME("Duplicated /tn argument\n"); + return 1; + } + + task_name = argv[1]; + argc -= 2; + argv += 2; + }else if (!strcmpiW(argv[0], enable_optW)) { + enable = TRUE; + have_option = TRUE; + argc--; + argv++; + }else if (!strcmpiW(argv[0], tr_optW)) { + if (argc < 2) { + FIXME("Missing /tr value\n"); + return 1; + } - if (strcmpiW(argv[0], tn_optW)) { - FIXME("Unsupported %s option\n", debugstr_w(argv[0])); - return 0; + FIXME("Unsupported /tr option %s\n", debugstr_w(argv[1])); + have_option = TRUE; + argc -= 2; + argv += 2; + }else { + FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); + return 1; + } } - if (argc < 2) { - FIXME("Missing /tn value\n"); + if (!task_name) { + FIXME("Missing /tn option\n"); return 1; } - task_name = argv[1]; - argc -= 2; - argv += 2; - if (!argc) { + if (!have_option) { FIXME("Missing change options\n"); return 1; } - if (strcmpiW(argv[0], enable_optW) || argc > 1) { - FIXME("Unsupported arguments %s\n", debugstr_w(argv[0])); - return 0; - } - task = get_registered_task(task_name); if (!task) return 1; - hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); - IRegisteredTask_Release(task); - if (FAILED(hres)) { - FIXME("put_Enabled failed: %08x\n", hres); - return 1; + if (enable) { + hres = IRegisteredTask_put_Enabled(task, VARIANT_TRUE); + if (FAILED(hres)) { + IRegisteredTask_Release(task); + FIXME("put_Enabled failed: %08x\n", hres); + return 1; + } } + IRegisteredTask_Release(task); return 0; } @@ -222,6 +246,15 @@ static int create_command(int argc, WCHAR *argv[]) flags = TASK_CREATE_OR_UPDATE; argc--; argv++; + }else if (!strcmpiW(argv[0], ru_optW)) { + if (argc < 2) { + FIXME("Missing /ru value\n"); + return 1; + } + + FIXME("Unsupported /ru option %s\n", debugstr_w(argv[1])); + argc -= 2; + argv += 2; }else { FIXME("Unsupported argument %s\n", debugstr_w(argv[0])); return 1;

1 0

Piotr Caban : msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4:: _Internal_push.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 4e863fa7c721ac5aadb36acb8e033938a8223570 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e863fa7c721ac5aadb36acb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:04:39 2018 +0100 msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4::_Internal_push. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- include/wine/exception.h | 2 +- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b3e546a..d9fe188 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); struct __Container_proxy; @@ -1397,6 +1398,12 @@ static MSVCP_size_t InterlockedIncrementSizeT(MSVCP_size_t volatile *dest) #define InterlockedIncrementSizeT(dest) InterlockedIncrement((LONG*)dest) #endif +static void CALLBACK queue_push_finally(BOOL normal, void *ctx) +{ + threadsafe_queue *queue = ctx; + InterlockedIncrementSizeT(&queue->tail_pos); +} + static void threadsafe_queue_push(threadsafe_queue *queue, MSVCP_size_t id, void *e, _Concurrent_queue_base_v4 *parent, BOOL copy) { @@ -1430,21 +1437,24 @@ static void threadsafe_queue_push(threadsafe_queue *queue, MSVCP_size_t id, p = queue->tail; } - /* TODO: Add exception handling */ - if(copy) - call__Concurrent_queue_base_v4__Copy_item(parent, p, id-page_id, e); - else - call__Concurrent_queue_base_v4__Move_item(parent, p, id-page_id, e); - p->_Mask |= 1 << (id - page_id); - InterlockedIncrementSizeT(&queue->tail_pos); + __TRY + { + if(copy) + call__Concurrent_queue_base_v4__Copy_item(parent, p, id-page_id, e); + else + call__Concurrent_queue_base_v4__Move_item(parent, p, id-page_id, e); + p->_Mask |= 1 << (id - page_id); + } + __FINALLY_CTX(queue_push_finally, queue); } -static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, +static BOOL threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, void *e, _Concurrent_queue_base_v4 *parent) { MSVCP_size_t page_id = id & ~(parent->alloc_count-1); int spin; _Page *p; + BOOL ret = FALSE; spin = 0; while(queue->tail_pos <= id) @@ -1455,8 +1465,12 @@ static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, spin_wait(&spin); p = queue->head; - /* TODO: Add exception handling */ - call__Concurrent_queue_base_v4__Assign_and_destroy_item(parent, e, p, id-page_id); + if(p->_Mask & (1 << (id-page_id))) + { + /* TODO: Add exception handling */ + call__Concurrent_queue_base_v4__Assign_and_destroy_item(parent, e, p, id-page_id); + ret = TRUE; + } if(id == page_id+parent->alloc_count-1) { @@ -1471,7 +1485,9 @@ static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, /* TODO: Add exception handling */ call__Concurrent_queue_base_v4__Deallocate_page(parent, p); } + InterlockedIncrementSizeT(&queue->head_pos); + return ret; } /* ?_Internal_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXPBX(a)Z */ @@ -1516,11 +1532,14 @@ MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_pop_if_present( do { - id = this->data->head_pos; - if(id == this->data->tail_pos) return FALSE; - } while(InterlockedCompareExchangePointer((void**)&this->data->head_pos, - (void*)(id+1), (void*)id) != (void*)id); - threadsafe_queue_pop(this->data->queues + id % QUEUES_NO, id / QUEUES_NO, e, this); + do + { + id = this->data->head_pos; + if(id == this->data->tail_pos) return FALSE; + } while(InterlockedCompareExchangePointer((void**)&this->data->head_pos, + (void*)(id+1), (void*)id) != (void*)id); + } while(!threadsafe_queue_pop(this->data->queues + id % QUEUES_NO, + id / QUEUES_NO, e, this)); return TRUE; } diff --git a/include/wine/exception.h b/include/wine/exception.h index 8e3f481..3b1a3cf 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -92,7 +92,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE_SETJMP_H) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Piotr Caban : msvcp100: Add _Concurrent_queue_base_v4 push/ pop implementation.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 411e3c51c01daa3c14e62220465b8829510e7981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411e3c51c01daa3c14e62220… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:03:56 2018 +0100 msvcp100: Add _Concurrent_queue_base_v4 push/pop implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 157 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ca85079..b3e546a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1236,9 +1236,24 @@ typedef struct extern const vtable_ptr MSVCP__Concurrent_queue_base_v4_vtable; #if _MSVCP_VER == 100 +#define call__Concurrent_queue_base_v4__Move_item call__Concurrent_queue_base_v4__Copy_item +#define call__Concurrent_queue_base_v4__Copy_item(this,dst,idx,src) CALL_VTBL_FUNC(this, \ + 0, void, (_Concurrent_queue_base_v4*,_Page*,MSVCP_size_t,const void*), (this,dst,idx,src)) +#define call__Concurrent_queue_base_v4__Assign_and_destroy_item(this,dst,src,idx) CALL_VTBL_FUNC(this, \ + 4, void, (_Concurrent_queue_base_v4*,void*,_Page*,MSVCP_size_t), (this,dst,src,idx)) +#define call__Concurrent_queue_base_v4__Allocate_page(this) CALL_VTBL_FUNC(this, \ + 12, _Page*, (_Concurrent_queue_base_v4*), (this)) #define call__Concurrent_queue_base_v4__Deallocate_page(this, page) CALL_VTBL_FUNC(this, \ 16, void, (_Concurrent_queue_base_v4*,_Page*), (this,page)) #else +#define call__Concurrent_queue_base_v4__Move_item(this,dst,idx,src) CALL_VTBL_FUNC(this, \ + 0, void, (_Concurrent_queue_base_v4*,_Page*,MSVCP_size_t,void*), (this,dst,idx,src)) +#define call__Concurrent_queue_base_v4__Copy_item(this,dst,idx,src) CALL_VTBL_FUNC(this, \ + 4, void, (_Concurrent_queue_base_v4*,_Page*,MSVCP_size_t,const void*), (this,dst,idx,src)) +#define call__Concurrent_queue_base_v4__Assign_and_destroy_item(this,dst,src,idx) CALL_VTBL_FUNC(this, \ + 8, void, (_Concurrent_queue_base_v4*,void*,_Page*,MSVCP_size_t), (this,dst,src,idx)) +#define call__Concurrent_queue_base_v4__Allocate_page(this) CALL_VTBL_FUNC(this, \ + 16, _Page*, (_Concurrent_queue_base_v4*), (this)) #define call__Concurrent_queue_base_v4__Deallocate_page(this, page) CALL_VTBL_FUNC(this, \ 20, void, (_Concurrent_queue_base_v4*,_Page*), (this,page)) #endif @@ -1344,13 +1359,134 @@ MSVCP_size_t __thiscall _Concurrent_queue_base_v4__Internal_size( return this->data->tail_pos - this->data->head_pos; } +static void spin_wait(int *counter) +{ + static int spin_limit = -1; + + if(spin_limit == -1) + { + SYSTEM_INFO si; + GetSystemInfo(&si); + spin_limit = si.dwNumberOfProcessors>1 ? 4000 : 0; + } + + if(*counter >= spin_limit) + { + *counter = 0; + Sleep(0); + } + else + { + (*counter)++; + } +} + +#ifdef _WIN64 +static MSVCP_size_t InterlockedIncrementSizeT(MSVCP_size_t volatile *dest) +{ + MSVCP_size_t v; + + do + { + v = *dest; + } while(InterlockedCompareExchange64((LONGLONG*)dest, v+1, v) != v); + + return v+1; +} +#else +#define InterlockedIncrementSizeT(dest) InterlockedIncrement((LONG*)dest) +#endif + +static void threadsafe_queue_push(threadsafe_queue *queue, MSVCP_size_t id, + void *e, _Concurrent_queue_base_v4 *parent, BOOL copy) +{ + MSVCP_size_t page_id = id & ~(parent->alloc_count-1); + int spin; + _Page *p; + + spin = 0; + while(queue->tail_pos != id) + spin_wait(&spin); + + if(page_id == id) + { + /* TODO: Add exception handling */ + p = call__Concurrent_queue_base_v4__Allocate_page(parent); + p->_Next = NULL; + p->_Mask = 0; + + spin = 0; + while(InterlockedCompareExchange(&queue->lock, 1, 0)) + spin_wait(&spin); + if(queue->tail) + queue->tail->_Next = p; + queue->tail = p; + if(!queue->head) + queue->head = p; + queue->lock = 0; + } + else + { + p = queue->tail; + } + + /* TODO: Add exception handling */ + if(copy) + call__Concurrent_queue_base_v4__Copy_item(parent, p, id-page_id, e); + else + call__Concurrent_queue_base_v4__Move_item(parent, p, id-page_id, e); + p->_Mask |= 1 << (id - page_id); + InterlockedIncrementSizeT(&queue->tail_pos); +} + +static void threadsafe_queue_pop(threadsafe_queue *queue, MSVCP_size_t id, + void *e, _Concurrent_queue_base_v4 *parent) +{ + MSVCP_size_t page_id = id & ~(parent->alloc_count-1); + int spin; + _Page *p; + + spin = 0; + while(queue->tail_pos <= id) + spin_wait(&spin); + + spin = 0; + while(queue->head_pos != id) + spin_wait(&spin); + + p = queue->head; + /* TODO: Add exception handling */ + call__Concurrent_queue_base_v4__Assign_and_destroy_item(parent, e, p, id-page_id); + + if(id == page_id+parent->alloc_count-1) + { + spin = 0; + while(InterlockedCompareExchange(&queue->lock, 1, 0)) + spin_wait(&spin); + queue->head = p->_Next; + if(!queue->head) + queue->tail = NULL; + queue->lock = 0; + + /* TODO: Add exception handling */ + call__Concurrent_queue_base_v4__Deallocate_page(parent, p); + } + InterlockedIncrementSizeT(&queue->head_pos); +} + /* ?_Internal_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXPBX(a)Z */ /* ?_Internal_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IEAAXPEBX(a)Z */ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_push, 8) void __thiscall _Concurrent_queue_base_v4__Internal_push( - _Concurrent_queue_base_v4 *this, const void *e) + _Concurrent_queue_base_v4 *this, void *e) { - FIXME("(%p %p) stub\n", this, e); + MSVCP_size_t id; + + TRACE("(%p %p)\n", this, e); + + id = InterlockedIncrementSizeT(&this->data->tail_pos)-1; + threadsafe_queue_push(this->data->queues + id % QUEUES_NO, + id / QUEUES_NO, e, this, TRUE); } /* ?_Internal_move_push(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXPAX(a)Z */ @@ -1359,7 +1495,13 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_move_push, 8) void __thiscall _Concurrent_queue_base_v4__Internal_move_push( _Concurrent_queue_base_v4 *this, void *e) { - FIXME("(%p %p) stub\n", this, e); + MSVCP_size_t id; + + TRACE("(%p %p)\n", this, e); + + id = InterlockedIncrementSizeT(&this->data->tail_pos)-1; + threadsafe_queue_push(this->data->queues + id % QUEUES_NO, + id / QUEUES_NO, e, this, FALSE); } /* ?_Internal_pop_if_present(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAE_NPAX(a)Z */ @@ -1368,8 +1510,18 @@ DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_pop_if_present, 8) MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_pop_if_present( _Concurrent_queue_base_v4 *this, void *e) { - FIXME("(%p %p) stub\n", this, e); - return 0; + MSVCP_size_t id; + + TRACE("(%p %p)\n", this, e); + + do + { + id = this->data->head_pos; + if(id == this->data->tail_pos) return FALSE; + } while(InterlockedCompareExchangePointer((void**)&this->data->head_pos, + (void*)(id+1), (void*)id) != (void*)id); + threadsafe_queue_pop(this->data->queues + id % QUEUES_NO, id / QUEUES_NO, e, this); + return TRUE; } /* ?_Internal_swap(a)_Concurrent_queue_base_v4@details(a)Concurrency@@IAEXAAV123@@Z */

1 0

Michael Stefaniuc : kernel32/tests: Fix the HeapReAlloc name in two comments.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 0efd18f45a1ce74d217eabcc70804b52299f02df URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efd18f45a1ce74d217eabcc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jan 21 22:05:33 2018 +0100 kernel32/tests: Fix the HeapReAlloc name in two comments. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2c91bb9..67dc8b6 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -568,7 +568,7 @@ static void test_HeapCreate(void) ok(HeapFree(heap,0,mem3),"HeapFree didn't pass successfully\n"); } - /* Check that HeapRealloc works */ + /* Check that HeapReAlloc works */ mem2a=HeapReAlloc(heap,HEAP_ZERO_MEMORY,mem2,memchunk+5*sysInfo.dwPageSize); ok(mem2a!=NULL,"HeapReAlloc failed\n"); if(mem2a) { @@ -582,7 +582,7 @@ static void test_HeapCreate(void) ok(!error,"HeapReAlloc should have zeroed out its allocated memory\n"); } - /* Check that HeapRealloc honours HEAP_REALLOC_IN_PLACE_ONLY */ + /* Check that HeapReAlloc honours HEAP_REALLOC_IN_PLACE_ONLY */ error=FALSE; mem1a=HeapReAlloc(heap,HEAP_REALLOC_IN_PLACE_ONLY,mem1,memchunk+sysInfo.dwPageSize); if(mem1a!=NULL) {

1 0

Zebediah Figura : quartz: Wait for the PullPin thread to terminate.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 55b37182056ed5a00b0a7796109d10265cc36492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b37182056ed5a00b0a7796… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 19 17:54:39 2018 -0600 quartz: Wait for the PullPin thread to terminate. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/pin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 355d87d..5197d5c 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -541,11 +541,7 @@ static void PullPin_Thread_Stop(PullPin *This) TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); - { - CloseHandle(This->hThread); - This->hThread = NULL; - SetEvent(This->hEventStateChanged); - } + SetEvent(This->hEventStateChanged); LeaveCriticalSection(This->pin.pCritSec); IBaseFilter_Release(This->pin.pinInfo.pFilter); @@ -831,6 +827,10 @@ HRESULT WINAPI PullPin_Disconnect(IPin *iface) } LeaveCriticalSection(This->pin.pCritSec); + WaitForSingleObject(This->hThread, INFINITE); + CloseHandle(This->hThread); + This->hThread = NULL; + return hr; }

1 0

Sergio Gómez Del Real : ole32: Prevent adding additional cache entries to static class caches.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 3bf32809b0dae5973d2185795044809c5af33550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf32809b0dae5973d218579… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Tue Jan 23 08:47:24 2018 +0000 ole32: Prevent adding additional cache entries to static class caches. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 ++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 8c5df32..60ddd38 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2453,6 +2453,8 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } + if (This->clsid_static) return DV_E_FORMATETC; + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7fcb1aa..d83ca00 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */

1 0

Huw Davies : gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 82973cfbd1e1ca04b73d0323d553043fff0db003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82973cfbd1e1ca04b73d0323… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 23 09:44:23 2018 +0000 gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitmap.c | 20 ++++++++++++++++---- dlls/gdi32/dibdrv/dc.c | 7 ------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c16793d..0ae5b20 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -145,6 +145,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; + INT dib_stride; + SIZE_T size; if (!bmp || bmp->bmType) { @@ -194,10 +196,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - /* XP doesn't allow creating bitmaps larger than 128 MB */ - if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) + + dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); + size = dib_stride * bm.bmHeight; + /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ + if (dib_stride != size / bm.bmHeight) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } @@ -209,10 +214,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = NULL; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + if (!bmpobj->dib.dsBm.bmBits) + { + HeapFree( GetProcessHeap(), 0, bmpobj ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { + HeapFree( GetProcessHeap(), 0, bmpobj->dib.dsBm.bmBits ); HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index aee305f..2447093 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -168,13 +168,6 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp) BITMAPINFO info; get_ddb_bitmapinfo( bmp, &info ); - if (!bmp->dib.dsBm.bmBits) - { - int width_bytes = get_dib_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); - bmp->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->dib.dsBm.bmHeight * width_bytes ); - if (!bmp->dib.dsBm.bmBits) return FALSE; - } init_dib_info_from_bitmapinfo( dib, &info, bmp->dib.dsBm.bmBits ); } else init_dib_info( dib, &bmp->dib.dsBmih, bmp->dib.dsBm.bmWidthBytes,

1 0

Jacek Caban : ole32: Don' t dispatch WM_QUIT messages in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 98b44e793aa1cc3ab3c81b95c1a50e28cdfba869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b44e793aa1cc3ab3c81b95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:05:40 2018 +0100 ole32: Don't dispatch WM_QUIT messages in CoWaitForMultipleHandles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 08455bf..d002887 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4559,18 +4559,21 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, * so after processing 100 messages we go back to checking the wait handles */ while (count++ < 100 && COM_PeekMessage(apt, &msg)) { - TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); - TranslateMessage(&msg); - DispatchMessageW(&msg); if (msg.message == WM_QUIT) { - TRACE("resending WM_QUIT to outer message loop\n"); + TRACE("received WM_QUIT message\n"); post_quit = TRUE; exit_code = msg.wParam; /* no longer need to process messages */ message_loop = FALSE; break; } + else + { + TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); + TranslateMessage(&msg); + DispatchMessageW(&msg); + } } continue; }

1 0

Jacek Caban : ole32: Don' t stop processing messages after WM_QUIT in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: 2e66aa59b22d490081f4fea576305ce1fa5c8174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e66aa59b22d490081f4fea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 22 17:05:51 2018 +0100 ole32: Don't stop processing messages after WM_QUIT in CoWaitForMultipleHandles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 3 --- dlls/ole32/tests/compobj.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d002887..598081b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4564,9 +4564,6 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, TRACE("received WM_QUIT message\n"); post_quit = TRUE; exit_code = msg.wParam; - /* no longer need to process messages */ - message_loop = FALSE; - break; } else { diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 83595cb..a36e791 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2971,10 +2971,8 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(success, "PeekMessageA failed, error %u\n", GetLastError()); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(!success, "PeekMessageA succeeded\n"); success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); - todo_wine ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n"); index = WaitForSingleObject(thread, 200); ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); @@ -2991,7 +2989,6 @@ static void test_CoWaitForMultipleHandles(void) success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(success, "PeekMessageA failed, error %u\n", GetLastError()); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); - todo_wine ok(!success, "PeekMessageA succeeded\n"); success = PeekMessageA(&msg, hWnd, WM_QUIT, WM_QUIT, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't remove WM_QUIT messages\n");

1 0

Guo Lv : user32: Make functions use display dc thread-safe.
by Alexandre Julliard Jan. 23, 2018

Jan. 23, 2018

Module: wine Branch: master Commit: daa832f4bf265e459e17d487453f3cc112f6e567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa832f4bf265e459e17d487… Author: Guo Lv <lvguo(a)deepin.com> Date: Fri Jan 12 13:07:52 2018 +0800 user32: Make functions use display dc thread-safe. Signed-off-by: Guo Lv <lvguo(a)deepin.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 68 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 97f6b57..4b66eb2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -233,6 +233,17 @@ static const WCHAR CSu[] = {'%','u',0}; static const WCHAR CSd[] = {'%','d',0}; static const WCHAR CSrgb[] = {'%','u',' ','%','u',' ','%','u',0}; +static HDC display_dc; +static CRITICAL_SECTION display_dc_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &display_dc_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": display_dc_section") } +}; +static CRITICAL_SECTION display_dc_section = { &critsect_debug, -1 ,0, 0, 0, 0 }; + + /* Indicators whether system parameter value is loaded */ static char spi_loaded[SPI_INDEX_COUNT]; @@ -604,7 +615,7 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) static inline HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; - static HDC display_dc; + EnterCriticalSection( &display_dc_section ); if (!display_dc) { display_dc = CreateICW( DISPLAY, NULL, NULL, NULL ); @@ -613,10 +624,21 @@ static inline HDC get_display_dc(void) return display_dc; } +static inline void release_display_dc( HDC hdc ) +{ + LeaveCriticalSection( &display_dc_section ); +} + static inline int get_display_dpi(void) { static int display_dpi; - if (!display_dpi) display_dpi = GetDeviceCaps( get_display_dc(), LOGPIXELSY ); + HDC hdc; + if (!display_dpi) + { + hdc = get_display_dc(); + display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); + release_display_dc( hdc ); + } return display_dpi; } @@ -629,33 +651,36 @@ static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *nt return 0; } -static void get_real_fontname(LOGFONTW *lf) +static void get_real_fontname( HDC hdc, LOGFONTW *lf ) { - EnumFontFamiliesExW(get_display_dc(), lf, real_fontname_proc, (LPARAM)lf, 0); + EnumFontFamiliesExW(hdc, lf, real_fontname_proc, (LPARAM)lf, 0); } /* adjust some of the raw values found in the registry */ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) { TEXTMETRICW tm; + HDC hdc = get_display_dc(); + if( pncm->iBorderWidth < 1) pncm->iBorderWidth = 1; if( pncm->iCaptionWidth < 8) pncm->iCaptionWidth = 8; if( pncm->iScrollWidth < 8) pncm->iScrollWidth = 8; if( pncm->iScrollHeight < 8) pncm->iScrollHeight = 8; /* adjust some heights to the corresponding font */ - get_text_metr_size( get_display_dc(), &pncm->lfMenuFont, &tm, NULL); + get_text_metr_size( hdc, &pncm->lfMenuFont, &tm, NULL); pncm->iMenuHeight = max( pncm->iMenuHeight, 2 + tm.tmHeight + tm.tmExternalLeading ); - get_real_fontname( &pncm->lfMenuFont ); - get_text_metr_size( get_display_dc(), &pncm->lfCaptionFont, &tm, NULL); + get_real_fontname( hdc, &pncm->lfMenuFont ); + get_text_metr_size( hdc, &pncm->lfCaptionFont, &tm, NULL); pncm->iCaptionHeight = max( pncm->iCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( &pncm->lfCaptionFont ); - get_text_metr_size( get_display_dc(), &pncm->lfSmCaptionFont, &tm, NULL); + get_real_fontname( hdc, &pncm->lfCaptionFont ); + get_text_metr_size( hdc, &pncm->lfSmCaptionFont, &tm, NULL); pncm->iSmCaptionHeight = max( pncm->iSmCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( &pncm->lfSmCaptionFont ); + get_real_fontname( hdc, &pncm->lfSmCaptionFont ); - get_real_fontname( &pncm->lfStatusFont ); - get_real_fontname( &pncm->lfMessageFont ); + get_real_fontname( hdc, &pncm->lfStatusFont ); + get_real_fontname( hdc, &pncm->lfMessageFont ); + release_display_dc( hdc ); } static BOOL CALLBACK enum_monitors( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) @@ -2378,14 +2403,21 @@ INT WINAPI GetSystemMetrics( INT index ) { NONCLIENTMETRICSW ncm; UINT ret; + HDC hdc; /* some metrics are dynamic */ switch (index) { case SM_CXSCREEN: - return GetDeviceCaps( get_display_dc(), HORZRES ); + hdc = get_display_dc(); + ret = GetDeviceCaps( hdc, HORZRES ); + release_display_dc( hdc ); + return ret; case SM_CYSCREEN: - return GetDeviceCaps( get_display_dc(), VERTRES ); + hdc = get_display_dc(); + ret = GetDeviceCaps( hdc, VERTRES ); + release_display_dc( hdc ); + return ret; case SM_CXVSCROLL: case SM_CYHSCROLL: get_entry( &entry_SCROLLWIDTH, 0, &ret ); @@ -2447,7 +2479,9 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_CXMIN: ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - get_text_metr_size( get_display_dc(), &ncm.lfCaptionFont, NULL, &ret ); + hdc = get_display_dc(); + get_text_metr_size( hdc, &ncm.lfCaptionFont, NULL, &ret ); + release_display_dc( hdc ); return 3 * ncm.iCaptionWidth + ncm.iCaptionHeight + 4 * ret + 2 * GetSystemMetrics(SM_CXFRAME) + 4; case SM_CYMIN: return GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME); @@ -2564,7 +2598,9 @@ INT WINAPI GetSystemMetrics( INT index ) TEXTMETRICW tm; ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); - get_text_metr_size( get_display_dc(), &ncm.lfMenuFont, &tm, NULL); + hdc = get_display_dc(); + get_text_metr_size( hdc, &ncm.lfMenuFont, &tm, NULL); + release_display_dc( hdc ); return tm.tmHeight <= 0 ? 13 : ((tm.tmHeight + tm.tmExternalLeading + 1) / 2) * 2 - 1; } case SM_SLOWMACHINE:

1 0