March 2017 - Wine-commits - list.winehq.org

Jacek Caban : server: Use no_fd_queue_async for named pipe ends in server I/O mode.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ae5684479e4936a47036679f3b4badb63d4769b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5684479e4936a47036679f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:42 2017 +0100 server: Use no_fd_queue_async for named pipe ends in server I/O mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0f6cf3d..8113b18 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -143,6 +143,9 @@ static const struct object_ops named_pipe_ops = named_pipe_destroy /* destroy */ }; +/* common server and client pipe end functions */ +static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); + /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); @@ -183,7 +186,7 @@ static const struct fd_ops pipe_server_fd_ops = no_fd_write, /* write */ pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ - default_fd_queue_async, /* queue_async */ + pipe_end_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -226,7 +229,7 @@ static const struct fd_ops pipe_client_fd_ops = no_fd_write, /* write */ pipe_client_flush, /* flush */ default_fd_ioctl, /* ioctl */ - default_fd_queue_async, /* queue_async */ + pipe_end_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -611,6 +614,13 @@ static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int b return 0; } +static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) +{ + struct pipe_end *pipe_end = get_fd_user( fd ); + if (use_server_io( pipe_end )) no_fd_queue_async( fd, async, type, count ); + else default_fd_queue_async( fd, async, type, count ); +} + static inline int is_overlapped( unsigned int options ) { return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT));

1 0

Hugh McMaster : regedit: Re-implement processRegLinesW().
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 6b6e2cb92448dff4420a767abc43af50247b8f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6e2cb92448dff4420a767ab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 16 12:05:00 2017 +0000 regedit: Re-implement processRegLinesW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 163 +++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 102 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 25c0240..a88f632 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -793,120 +793,79 @@ static void processRegLinesA(FILE *in, char* first_chars) HeapFree(GetProcessHeap(), 0, buf); } -static void processRegLinesW(FILE *in) +static WCHAR *get_lineW(FILE *fp) { - WCHAR* buf = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; - size_t CharsInBuf = -1; + static size_t size; + static WCHAR *buf, *next; + WCHAR *line; - WCHAR* s; /* The pointer into buf for where the current fgets should read */ - WCHAR* line; /* The start of the current line */ - - buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(buf); - - s = buf; - line = buf; - - while(!feof(in)) { - size_t size_remaining; - int size_to_get; - WCHAR *s_eol = NULL; /* various local uses */ + if (!size) + { + size = REG_VAL_BUF_SIZE; + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(buf); + *buf = 0; + next = buf; + } + line = next; - /* Do we need to expand the buffer ? */ - assert (s >= buf && s <= buf + lineSize); - size_remaining = lineSize - (s-buf); - if (size_remaining < 2) /* room for 1 character and the \0 */ + while (next) + { + static const WCHAR line_endings[] = {'\r','\n',0}; + WCHAR *p = strpbrkW(line, line_endings); + if (!p) { - WCHAR *new_buffer; - size_t new_size = lineSize + (REG_VAL_BUF_SIZE / sizeof(WCHAR)); - if (new_size > lineSize) /* no arithmetic overflow */ - new_buffer = HeapReAlloc (GetProcessHeap(), 0, buf, new_size * sizeof(WCHAR)); - else - new_buffer = NULL; - CHECK_ENOUGH_MEMORY(new_buffer); - buf = new_buffer; + size_t len, count; + len = strlenW(next); + memmove(buf, next, (len + 1) * sizeof(WCHAR)); + if (size - len < 3) + { + WCHAR *new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, (size * 2) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(new_buf); + buf = new_buf; + size *= 2; + } + if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) + { + next = NULL; + return buf; + } + buf[len + count] = 0; + next = buf; line = buf; - s = buf + lineSize - size_remaining; - lineSize = new_size; - size_remaining = lineSize - (s-buf); + continue; } - - /* Get as much as possible into the buffer, terminated either by - * eof, error or getting the maximum amount. Abort on error. - */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - - CharsInBuf = fread(s, sizeof(WCHAR), size_to_get - 1, in); - s[CharsInBuf] = 0; - - if (CharsInBuf == 0) { - if (ferror(in)) { - perror ("While reading input"); - exit (IO_ERROR); - } else { - assert (feof(in)); - *s = '\0'; - /* It is not clear to me from the definition that the - * contents of the buffer are well defined on detecting - * an eof without managing to read anything. - */ - } + next = p + 1; + if (*p == '\r' && *(p + 1) == '\n') next++; + *p = 0; + if (*(p - 1) == '\\') + { + *(--p) = 0; + while (*next && (*next == ' ' || *next == '\t')) next++; + memmove(p, next, (strlenW(next) + 1) * sizeof(WCHAR)); + next = line; + continue; } - - /* If we didn't read the eol nor the eof go around for the rest */ - while(1) + if (*line == ';' || *line == '#') { - const WCHAR line_endings[] = {'\r','\n',0}; - s_eol = strpbrkW(line, line_endings); - - if(!s_eol) { - /* Move the stub of the line to the start of the buffer so - * we get the maximum space to read into, and so we don't - * have to recalculate 'line' if the buffer expands */ - MoveMemory(buf, line, (strlenW(line)+1) * sizeof(WCHAR)); - line = buf; - s = strchrW(line, '\0'); - break; - } - - /* If it is a comment line then discard it and go around again */ - if (*line == '#' || *line == ';') { - if (*s_eol == '\r' && *(s_eol+1) == '\n') - line = s_eol + 2; - else - line = s_eol + 1; - continue; - } - - /* If there is a concatenating \\ then go around again */ - if (*(s_eol-1) == '\\') { - WCHAR* NextLine = s_eol + 1; - - if(*s_eol == '\r' && *(s_eol+1) == '\n') - NextLine++; - - while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') - NextLine++; - - MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); - CharsInBuf -= NextLine - s_eol + 1; - continue; - } - - /* Remove any line feed. Leave s_eol on the last \0 */ - if (*s_eol == '\r' && *(s_eol + 1) == '\n') - *s_eol++ = '\0'; - *s_eol = '\0'; - - processRegEntry(line, TRUE); - line = s_eol + 1; + line = next; + continue; } + return line; } + HeapFree( GetProcessHeap(), 0, buf ); + size = 0; + return NULL; +} - closeKey(); +static void processRegLinesW(FILE *fp) +{ + WCHAR *line; - HeapFree(GetProcessHeap(), 0, buf); + while ((line = get_lineW(fp))) + processRegEntry(line, TRUE); + + closeKey(); } /******************************************************************************

1 0

Daniel Lehman : msvcrt100/tests: Add tests for concurrency::event.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ee0337f800c353c4c3ff1640828fd2799f8bb217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0337f800c353c4c3ff16408… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 2 05:11:09 2017 -0800 msvcrt100/tests: Add tests for concurrency::event. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index cdac1b9..ac167fc 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -138,6 +138,10 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +typedef struct { + char pad[64]; +} event; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -178,6 +182,13 @@ static void (__thiscall *p_NonReentrantBlockingLock__Acquire)(_ReentrantBlocking static void (__thiscall *p_NonReentrantBlockingLock__Release)(_ReentrantBlockingLock*); static MSVCRT_bool (__thiscall *p_NonReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); +static event* (__thiscall *p_event_ctor)(event*); +static void (__thiscall *p_event_dtor)(event*); +static void (__thiscall *p_event_reset)(event*); +static void (__thiscall *p_event_set)(event*); +static size_t (__thiscall *p_event_wait)(event*, unsigned int); +static int (__cdecl *p_event_wait_for_multiple)(event**, size_t, MSVCRT_bool, unsigned int); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -237,6 +248,13 @@ static BOOL init(void) SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); + + SET(p_event_ctor, "??0event(a)Concurrency@@QEAA(a)XZ"); + SET(p_event_dtor, "??1event(a)Concurrency@@QEAA(a)XZ"); + SET(p_event_reset, "?reset(a)event@Concurrency@@QEAAXXZ"); + SET(p_event_set, "?set(a)event@Concurrency@@QEAAXXZ"); + SET(p_event_wait, "?wait(a)event@Concurrency@@QEAA_KI(a)Z"); + SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SA_KPEAPEAV12(a)_K_NI@Z"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -264,6 +282,13 @@ static BOOL init(void) SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); + + SET(p_event_ctor, "??0event(a)Concurrency@@QAE(a)XZ"); + SET(p_event_dtor, "??1event(a)Concurrency@@QAE(a)XZ"); + SET(p_event_reset, "?reset(a)event@Concurrency@@QAEXXZ"); + SET(p_event_set, "?set(a)event@Concurrency@@QAEXXZ"); + SET(p_event_wait, "?wait(a)event@Concurrency@@QAEII(a)Z"); + SET(p_event_wait_for_multiple, "?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z"); } init_thiscall_thunk(); @@ -705,6 +730,112 @@ static void test__ReentrantBlockingLock(void) call_func1(p_NonReentrantBlockingLock_dtor, &rbl); } +static DWORD WINAPI test_event_thread(void *arg) +{ + event *evt = arg; + call_func1(p_event_set, evt); + return 0; +} + +static DWORD WINAPI multiple_events_thread(void *arg) +{ + event **events = arg; + + Sleep(50); + call_func1(p_event_set, events[0]); + call_func1(p_event_reset, events[0]); + call_func1(p_event_set, events[1]); + call_func1(p_event_reset, events[1]); + return 0; +} + +static void test_event(void) +{ + int i; + int ret; + event evt; + event *evts[70]; + HANDLE thread; + HANDLE threads[NUMELMS(evts)]; + + call_func1(p_event_ctor, &evt); + + ret = call_func2(p_event_wait, &evt, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + call_func1(p_event_set, &evt); + ret = call_func2(p_event_wait, &evt, 100); + ok(!ret, "expected 0, got %d\n", ret); + + ret = call_func2(p_event_wait, &evt, 100); + ok(!ret, "expected 0, got %d\n", ret); + + call_func1(p_event_reset, &evt); + ret = call_func2(p_event_wait, &evt, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + thread = CreateThread(NULL, 0, test_event_thread, (void*)&evt, 0, NULL); + ret = call_func2(p_event_wait, &evt, 5000); + ok(!ret, "expected 0, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + if (0) /* crashes on Windows */ + p_event_wait_for_multiple(NULL, 10, TRUE, 0); + + for (i = 0; i < NUMELMS(evts); i++) { + evts[i] = malloc(sizeof(evt)); + call_func1(p_event_ctor, evts[i]); + } + + ret = p_event_wait_for_multiple(evts, 0, TRUE, 100); + ok(!ret, "expected 0, got %d\n", ret); + + ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 100); + ok(ret == -1, "expected -1, got %d\n", ret); + + /* reset and test wait for multiple with all */ + for (i = 0; i < NUMELMS(evts); i++) + threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); + + ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 5000); + ok(ret != -1, "didn't expect -1\n"); + + for (i = 0; i < NUMELMS(evts); i++) { + WaitForSingleObject(threads[i], INFINITE); + CloseHandle(threads[i]); + } + + /* reset and test wait for multiple with any */ + call_func1(p_event_reset, evts[0]); + + thread = CreateThread(NULL, 0, test_event_thread, (void*)evts[0], 0, NULL); + ret = p_event_wait_for_multiple(evts, 1, FALSE, 5000); + ok(!ret, "expected 0, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + call_func1(p_event_reset, evts[0]); + call_func1(p_event_reset, evts[1]); + thread = CreateThread(NULL, 0, multiple_events_thread, (void*)evts, 0, NULL); + ret = p_event_wait_for_multiple(evts, 2, TRUE, 500); + ok(ret == -1, "expected -1, got %d\n", ret); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + call_func1(p_event_reset, evts[0]); + call_func1(p_event_set, evts[1]); + ret = p_event_wait_for_multiple(evts, 2, FALSE, 0); + ok(ret == 1, "expected 1, got %d\n", ret); + + for (i = 0; i < NUMELMS(evts); i++) { + call_func1(p_event_dtor, evts[i]); + free(evts[i]); + } + + call_func1(p_event_dtor, &evt); +} + START_TEST(msvcr100) { if (!init()) @@ -718,4 +849,5 @@ START_TEST(msvcr100) test__SpinWait(); test_reader_writer_lock(); test__ReentrantBlockingLock(); + test_event(); }

1 0

Huw Davies : kernel32/tests: Always retrieve the output mode.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: bdf50d883da4c7bf73712921c6ad3fbfcb998583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf50d883da4c7bf73712921c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 21:40:10 2017 +0000 kernel32/tests: Always retrieve the output mode. Fixes a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 68d6b64..04feb71 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1520,8 +1520,8 @@ static void test_Console(void) startup.hStdError = startup.hStdOutput; ok(GetConsoleScreenBufferInfo(startup.hStdOutput, &sbi), "Getting sb info\n"); - ok(GetConsoleMode(startup.hStdInput, &modeIn) && - GetConsoleMode(startup.hStdOutput, &modeOut), "Getting console modes\n"); + ok(GetConsoleMode(startup.hStdInput, &modeIn), "Getting console in mode\n"); + ok(GetConsoleMode(startup.hStdOutput, &modeOut), "Getting console out mode\n"); cpIn = GetConsoleCP(); cpOut = GetConsoleOutputCP(); @@ -1536,8 +1536,8 @@ static void test_Console(void) /* now get the modification the child has made, and resets parents expected values */ ok(GetConsoleScreenBufferInfo(startup.hStdOutput, &sbiC), "Getting sb info\n"); - ok(GetConsoleMode(startup.hStdInput, &modeInC) && - GetConsoleMode(startup.hStdOutput, &modeOutC), "Getting console modes\n"); + ok(GetConsoleMode(startup.hStdInput, &modeInC), "Getting console in mode\n"); + ok(GetConsoleMode(startup.hStdOutput, &modeOutC), "Getting console out mode\n"); SetConsoleMode(startup.hStdInput, modeIn); SetConsoleMode(startup.hStdOutput, modeOut);

1 0

Huw Davies : winedbg: Return after raising an exception.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: eba6bf44b3577ff98591a57e525a1da8dd736291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba6bf44b3577ff98591a57e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 17 21:40:31 2017 +0000 winedbg: Return after raising an exception. Fixes a compiler warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/types.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 5b24715..2df7572 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -80,11 +80,13 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, { WINE_ERR("Couldn't get information\n"); RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); + return rtn; } if (size > sizeof(rtn)) { WINE_ERR("Size too large (%s)\n", wine_dbgstr_longlong(size)); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); + return rtn; } switch (bt) {

1 0

Piotr Caban : msvcrt: Optimize Concurrency::event implementation.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 41dd0eb457c26ff956c247bcc8493dd4ad0fb34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dd0eb457c26ff956c247bcc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 20 10:42:38 2017 +0100 msvcrt: Optimize Concurrency::event implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 60 +++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 8ae9511..edfefdb 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -584,24 +584,19 @@ static inline PLARGE_INTEGER evt_timeout(PLARGE_INTEGER pTime, unsigned int time static void evt_add_queue(thread_wait_entry **head, thread_wait_entry *entry) { - if(*head) { - entry->next = *head; - entry->prev = (*head)->prev; - (*head)->prev->next = entry; - (*head)->prev = entry; - } else { - entry->next = entry; - entry->prev = entry; - *head = entry; - } + entry->next = *head; + entry->prev = NULL; + if(*head) (*head)->prev = entry; + *head = entry; } -static void evt_remove(thread_wait_entry **head, thread_wait_entry *entry) +static void evt_remove_queue(thread_wait_entry **head, thread_wait_entry *entry) { - entry->next->prev = entry->prev; - entry->prev->next = entry->next; - if(*head == entry) - *head = entry->next == entry ? NULL : entry->next; + if(entry == *head) + *head = entry->next; + else if(entry->prev) + entry->prev->next = entry->next; + if(entry->next) entry->next->prev = entry->prev; } static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) @@ -611,7 +606,7 @@ static MSVCRT_size_t evt_end_wait(thread_wait *wait, event **events, int count) for(i = 0; i < count; i++) { critical_section_lock(&events[i]->cs); if(events[i] == wait->signaled) ret = i; - evt_remove(&events[i]->waiters, &wait->entries[i]); + evt_remove_queue(&events[i]->waiters, &wait->entries[i]); critical_section_unlock(&events[i]->cs); } @@ -698,13 +693,8 @@ void __thiscall event_reset(event *this) critical_section_lock(&this->cs); if(this->signaled) { this->signaled = FALSE; - if(this->waiters) { - entry = this->waiters; - do { - InterlockedIncrement(&entry->wait->pending_waits); - entry = entry->next; - } while (entry != this->waiters); - } + for(entry=this->waiters; entry; entry = entry->next) + InterlockedIncrement(&entry->wait->pending_waits); } critical_section_unlock(&this->cs); } @@ -714,25 +704,31 @@ void __thiscall event_reset(event *this) DEFINE_THISCALL_WRAPPER(event_set, 4) void __thiscall event_set(event *this) { - thread_wait_entry *entry; + thread_wait_entry *wakeup = NULL; + thread_wait_entry *entry, *next; TRACE("(%p)\n", this); critical_section_lock(&this->cs); if(!this->signaled) { this->signaled = TRUE; - if(this->waiters) { - entry = this->waiters; - do { - if(!InterlockedDecrement(&entry->wait->pending_waits)) { - if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) - NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + for(entry=this->waiters; entry; entry=next) { + next = entry->next; + if(!InterlockedDecrement(&entry->wait->pending_waits)) { + if(InterlockedExchangePointer(&entry->wait->signaled, this) == EVT_WAITING) { + evt_remove_queue(&this->waiters, entry); + evt_add_queue(&wakeup, entry); } - entry = entry->next; - } while (entry != this->waiters); + } } } critical_section_unlock(&this->cs); + + for(entry=wakeup; entry; entry=next) { + next = entry->next; + entry->next = entry->prev = NULL; + NtReleaseKeyedEvent(keyed_event, entry->wait, 0, NULL); + } } /* ?wait(a)event@Concurrency@@QAEII(a)Z */

1 0

Henri Verbeet : usp10/tests: Explicitly skip tests when required fonts are not available.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 6e2161670d36e03753bf1211d9875b9456e3b8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2161670d36e03753bf1211d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:43 2017 +0100 usp10/tests: Explicitly skip tests when required fonts are not available. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e8a72cb..1b2ba6f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1264,6 +1264,8 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co rc = 1; } } + if (!rc) + winetest_skip("Font %s is not available.\n", recommended); } if (!*hfont)

1 0

Henri Verbeet : usp10: Pass const metrics to GPOS_convert_design_units_to_device().
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: cd9db34e51d727f0166c23b970fa5e7e579903b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9db34e51d727f0166c23b97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:44 2017 +0100 usp10: Pass const metrics to GPOS_convert_design_units_to_device(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e531f3a..a1c4485 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1579,15 +1579,16 @@ static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) } } -static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, int desX, int desY, double *devX, double *devY) +static void GPOS_convert_design_units_to_device(const OUTLINETEXTMETRICW *otm, const LOGFONTW *logfont, + int desX, int desY, double *devX, double *devY) { - int emHeight = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + int emHeight = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent - otm->otmTextMetrics.tmInternalLeading; - TRACE("emHeight %i lfWidth %i\n",emHeight, lplogfont->lfWidth); - *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; - *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; - if (lplogfont->lfWidth) - FIXME("Font with lfWidth set not handled properly\n"); + TRACE("emHeight %i lfWidth %i\n",emHeight, logfont->lfWidth); + *devX = (desX * emHeight) / (double)otm->otmEMSquare; + *devY = (desY * emHeight) / (double)otm->otmEMSquare; + if (logfont->lfWidth) + FIXME("Font with lfWidth set not handled properly.\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record)

1 0

Henri Verbeet : usp10: Make the script cache parameter to GPOS_apply_MarkToBase() const.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: c8f87ad3ed8cebf4b2d4ea2f07d40ade23c10951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f87ad3ed8cebf4b2d4ea2f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:45 2017 +0100 usp10: Make the script cache parameter to GPOS_apply_MarkToBase() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a1c4485..3eb3bf3 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1838,19 +1838,21 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP return; } -static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) +static int GPOS_apply_MarkToBase(const ScriptCache *script_cache, const OT_LookupTable *look, + const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, unsigned int glyph_index, + unsigned int glyph_count, unsigned int ppem, POINT *pt) { int j; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; - void *glyph_class_table = NULL; + const void *glyph_class_table = NULL; int rc = -1; - if (psc->GDEF_Table) + if (script_cache->GDEF_Table) { - const GDEF_Header *header = psc->GDEF_Table; + const GDEF_Header *header = script_cache->GDEF_Table; WORD offset = GET_BE_WORD( header->GlyphClassDef ); if (offset) - glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + glyph_class_table = (const BYTE *)script_cache->GDEF_Table + offset; } TRACE("MarkToBase Attachment Positioning Subtable\n");

1 0

Henri Verbeet : usp10: Make the script cache parameter to get_opentype_script() const.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: df212474917a0dd63b982791843a7afe841a2b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df212474917a0dd63b9827918… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 19 22:59:46 2017 +0100 usp10: Make the script cache parameter to get_opentype_script() const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c37e0a0..f39c7ea 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -565,19 +565,21 @@ static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature return out_index; } -static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, BOOL tryNew) +static OPENTYPE_TAG get_opentype_script(HDC hdc, const SCRIPT_ANALYSIS *psa, + const ScriptCache *script_cache, BOOL try_new) { UINT charset; - if (psc->userScript != 0) + if (script_cache->userScript) { - if (tryNew && ShapingData[psa->eScript].newOtTag != 0 && psc->userScript == scriptInformation[psa->eScript].scriptTag) + if (try_new && ShapingData[psa->eScript].newOtTag + && script_cache->userScript == scriptInformation[psa->eScript].scriptTag) return ShapingData[psa->eScript].newOtTag; - else - return psc->userScript; + + return script_cache->userScript; } - if (tryNew && ShapingData[psa->eScript].newOtTag != 0) + if (try_new && ShapingData[psa->eScript].newOtTag) return ShapingData[psa->eScript].newOtTag; if (scriptInformation[psa->eScript].scriptTag)

1 0