May 2018 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp100: Add Concurrency::details:: _Concurrent_queue_base_v4 class stub.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: a770e4cd1eb86386b0dec7a441051f627a8a8075 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a770e4cd1eb86386b0dec7a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 23 17:02:31 2018 +0100 msvcp100: Add Concurrency::details::_Concurrent_queue_base_v4 class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9799de8d2d3fbb04eac8e26691cb5642ea56522b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 40 ++++----- dlls/msvcp100/msvcp100.spec | 32 +++---- dlls/msvcp110/msvcp110.spec | 60 ++++++------- dlls/msvcp120/msvcp120.spec | 60 ++++++------- dlls/msvcp120_app/msvcp120_app.spec | 60 ++++++------- dlls/msvcp90/misc.c | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 296 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a770e4cd1eb86386b0de…

1 0

Nikolay Sivov : wevtapi: Add EvtNext() stub.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: b31248e68bbf8505650b370856c204530d4e4fc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b31248e68bbf8505650b3708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 26 16:57:21 2018 +0300 wevtapi: Add EvtNext() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aaf4e1d93d9c25273a1d5af2be8ab7f41f418cdc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 5b9949b..a978437 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -115,3 +115,10 @@ BOOL WINAPI EvtClose(EVT_HANDLE handle) FIXME("(%p) stub\n", handle); return TRUE; } + +BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD timeout, DWORD flags, DWORD *ret_count) +{ + FIXME("(%p %u %p %u %#x %p) stub!\n", result_set, size, array, timeout, flags, ret_count); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index e2bec57..ddd2f32 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -25,7 +25,7 @@ @ stub EvtIntRetractConfig @ stub EvtIntSysprepCleanup @ stub EvtIntWriteXmlEventToLocalLogfile -@ stub EvtNext +@ stdcall EvtNext(ptr long ptr long long ptr) @ stdcall EvtNextChannelPath(ptr long ptr ptr) @ stub EvtNextEventMetadata @ stub EvtNextPublisherId

1 0

Zebediah Figura : server: Fix pointer arithmetic in get_selector_entry().
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 6a6b6ba69cf6f78028c2a2144c0e168847ff793f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6b6ba69cf6f78028c2a214… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:07 2018 -0600 server: Fix pointer arithmetic in get_selector_entry(). The selector table is exclusively 32-bit, so trying to get selector entries with a 64-bit wineserver will return the wrong values due to the different size of (long *). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c6dfce272309c1ad869886a0fce186c795f3e5b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/ptrace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index a647df9..704b17d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -517,13 +517,13 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[sizeof(long)]; - long *addr = (long *)(unsigned long)thread->process->ldt_copy + entry; - if (read_thread_long( thread, addr, (long *)base ) == -1) goto done; - if (read_thread_long( thread, addr + 8192, (long *)limit ) == -1) goto done; - addr = (long *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry / sizeof(long)); - if (read_thread_long( thread, addr, (long *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry % sizeof(long)]; + unsigned char flags_buf[4]; + unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4); + if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done; + if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done; + addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3); + if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done; + *flags = flags_buf[entry % 4]; done: resume_after_ptrace( thread ); }

1 0

Andrew Eikum : advapi32: Also wait on services without a control thread during shutdown.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 3e06acc95cfaee3121e8db6681828f2317aed951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e06acc95cfaee3121e8db66… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 6 10:43:57 2018 -0600 advapi32: Also wait on services without a control thread during shutdown. Tested service messages during OS shutdown manually on Windows 7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e5294a7414ca81c4761c00421cd7d59d9b83caa8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/service.c | 94 +++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ddd6a21..21693fe 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -516,6 +516,63 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) return 1; } +/* wait for services which accept this type of message to become STOPPED */ +static void handle_shutdown_msg(DWORD msg, DWORD accept) +{ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD i, n = 0, sz, timeout = 2000; + ULONGLONG stop_time; + BOOL res, done = TRUE; + SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); + + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + res = QueryServiceStatus( services[i]->full_access_handle, &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) + continue; + + done = FALSE; + + if (accept == SERVICE_ACCEPT_PRESHUTDOWN) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&spi, sizeof(spi), &sz ); + if (res) + { + FIXME( "service should be able to delay shutdown\n" ); + timeout = max( spi.dwPreshutdownTimeout, timeout ); + } + } + + service_handle_control( services[i], msg, NULL, 0 ); + wait_handles[n++] = services[i]->full_access_handle; + } + LeaveCriticalSection( &service_cs ); + + /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ + timeout = min( timeout, 3000 ); + stop_time = GetTickCount64() + timeout; + + while (!done && GetTickCount64() < stop_time) + { + done = TRUE; + for (i = 0; i < n; i++) + { + res = QueryServiceStatus( wait_handles[i], &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED) + continue; + + done = FALSE; + Sleep( 100 ); + break; + } + } + + HeapFree( GetProcessHeap(), 0, wait_handles ); +} + /****************************************************************************** * service_run_main_thread */ @@ -570,41 +627,8 @@ static BOOL service_run_main_thread(void) ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { - SERVICE_STATUS st; - SERVICE_PRESHUTDOWN_INFO spi; - DWORD timeout = 5000; - BOOL res; - - EnterCriticalSection( &service_cs ); - n = 0; - for (i = 0; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) - { - if (!services[i]->thread) continue; - - res = QueryServiceStatus(services[i]->full_access_handle, &st); - ret = ERROR_SUCCESS; - if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_PRESHUTDOWN)) - { - res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, - (LPBYTE)&spi, sizeof(spi), &i ); - if (res) - { - FIXME("service should be able to delay shutdown\n"); - timeout += spi.dwPreshutdownTimeout; - ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) - { - ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - LeaveCriticalSection( &service_cs ); - - TRACE("last user process exited, shutting down (timeout: %d)\n", timeout); - WaitForMultipleObjects( n, wait_handles, TRUE, timeout ); + handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); + handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); ExitProcess(0); } else if (ret == 1)

1 0

Hans Leidekker : dnsapi: Use default server list if passed in array is empty.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 3d5b42d7267cf3053e936e85a5d0f190a4cec827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d5b42d7267cf3053e936e85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 22 10:19:05 2018 +0100 dnsapi: Use default server list if passed in array is empty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dfe48bab07aee196284b2c02641d353eb390f08d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a66db37..74b7096 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { int i; + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; if (addrs->AddrCount > MAXNS) { WARN( "too many servers: %d only using the first: %d\n", @@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser initialise_resolver(); _res.options |= dns_map_options( options ); - if (servers && (ret = dns_set_serverlist( servers ))) - return ret; + if ((ret = dns_set_serverlist( servers ))) return ret; ret = dns_do_query( name, type, options, result );

1 0

Zebediah Figura : winedbg/gdbproxy: Replace memory read over a breakpoint with the real value.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 668161b4fe83800fc439cd12019959a56ce8702d URL: https://source.winehq.org/git/wine.git/?a=commit;h=668161b4fe83800fc439cd12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 14 19:01:15 2018 -0600 winedbg/gdbproxy: Replace memory read over a breakpoint with the real value. Normally, when we hit a breakpoint, we remove it before stopping and add it after continuing. gdb, however, reads the process memory before requesting that the breakpoint be removed, and apparently caches it until the `stepi` instruction is executed; as a result, it thinks that the interrupt byte that is present in the code is an actual interrupt and not a breakpoint, and so tries to step over it as one byte instead of executing the real instruction at that location. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb63a5f3c3c1851f212bd14f91da329bf3166e42) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 2561702..a87fe02 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1499,6 +1499,28 @@ static enum packet_return packet_thread(struct gdb_context* gdbctx) } } +static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SIZE_T blk_len, SIZE_T *r) +{ + /* Wrapper around process_io->read() that replaces values displaced by breakpoints. */ + + BOOL ret; + + ret = gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, r); + if (ret) + { + struct gdb_ctx_Xpoint *xpt; + + for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) + { + char *xpt_addr = xpt->addr; + + if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + buffer[xpt_addr - addr] = xpt->val; + } + } + return ret; +} + static enum packet_return packet_read_memory(struct gdb_context* gdbctx) { char *addr; @@ -1515,8 +1537,7 @@ static enum packet_return packet_read_memory(struct gdb_context* gdbctx) for (nread = 0; nread < len; nread += r, addr += r) { blk_len = min(sizeof(buffer), len - nread); - if (!gdbctx->process->process_io->read(gdbctx->process->handle, addr, buffer, blk_len, &r) || - r == 0) + if (!read_memory(gdbctx, addr, buffer, blk_len, &r) || r == 0) { /* fail at first address, return error */ if (nread == 0) return packet_reply_error(gdbctx, EFAULT);

1 0

Nikolay Sivov : comctl32/listview: Always return zero state mask for subitems.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 6c992bb34285f615eca9aa1b570ecda244f91406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c992bb34285f615eca9aa1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 21 19:53:30 2018 +0300 comctl32/listview: Always return zero state mask for subitems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6b2675dc8fefde3d12675762581f23b1f544f6c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 11 +++++++---- dlls/comctl32/tests/listview.c | 43 ++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 589d5c4..c085578 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6679,16 +6679,19 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* make a local copy */ isubitem = lpLVItem->iSubItem; + if (isubitem && (lpLVItem->mask & LVIF_STATE)) + lpLVItem->state = 0; + /* a quick optimization if all we're asked is the focus state * these queries are worth optimising since they are common, * and can be answered in constant time, without the heavy accesses */ if ( (lpLVItem->mask == LVIF_STATE) && (lpLVItem->stateMask == LVIS_FOCUSED) && !(infoPtr->uCallbackMask & LVIS_FOCUSED) ) { - lpLVItem->state = 0; - if (infoPtr->nFocusedItem == lpLVItem->iItem) - lpLVItem->state |= LVIS_FOCUSED; - return TRUE; + lpLVItem->state = 0; + if (infoPtr->nFocusedItem == lpLVItem->iItem && isubitem == 0) + lpLVItem->state |= LVIS_FOCUSED; + return TRUE; } ZeroMemory(&dispInfo, sizeof(dispInfo)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8efd3da..18e874a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6152,16 +6152,17 @@ static void test_state_image(void) insert_column(hwnd, 0); insert_column(hwnd, 1); - item.mask = LVIF_TEXT; + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = 0; item.iSubItem = 0; item.pszText = text; + item.lParam = 123456; r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(r == 0, "Failed to insert an item.\n"); item.mask = LVIF_STATE; - item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.state = INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED; + item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED | LVIS_FOCUSED; item.iItem = 0; item.iSubItem = 0; r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); @@ -6174,27 +6175,49 @@ static void test_state_image(void) r = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); ok(r, "Failed to set subitem text.\n"); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; item.state = 0; item.iItem = 0; item.iSubItem = 0; + item.lParam = 0; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get item state.\n"); - ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED), "Unexpected item state %#x.\n", item.state); + ok(item.state == (INDEXTOSTATEIMAGEMASK(1) | LVIS_SELECTED | LVIS_FOCUSED), + "Unexpected item state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); - item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.mask = 0; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 1; r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); ok(r, "Failed to get subitem state.\n"); - todo_wine + ok(item.state == INDEXTOSTATEIMAGEMASK(2), "Unexpected state %#x.\n", item.state); + + item.mask = LVIF_STATE | LVIF_PARAM; + item.stateMask = ~0u; + item.state = INDEXTOSTATEIMAGEMASK(2); + item.iItem = 0; + item.iSubItem = 1; + item.lParam = 0; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); + ok(item.state == 0, "Unexpected state %#x.\n", item.state); + ok(item.lParam == 123456, "Unexpected lParam %ld.\n", item.lParam); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM)&item); + ok(r, "Failed to get subitem state.\n"); ok(item.state == 0, "Unexpected state %#x.\n", item.state); item.mask = LVIF_STATE; - item.stateMask = LVIS_STATEIMAGEMASK | LVIS_SELECTED; + item.stateMask = ~0u; item.state = INDEXTOSTATEIMAGEMASK(2); item.iItem = 0; item.iSubItem = 2;

1 0

Paul Graham : kernel32: Fix failure reporting in WritePrivateProfile* and add tests.
by Alexandre Julliard May 14, 2018

May 14, 2018

Module: wine Branch: stable Commit: 623c7dd50375a9e00621d4f4d7cedca0c5274a24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=623c7dd50375a9e00621d4f4… Author: Paul Graham <development(a)omega-software.com> Date: Sat Jan 27 21:11:10 2018 +0100 kernel32: Fix failure reporting in WritePrivateProfile* and add tests. Conformance tests based on work by Fabian Maurer, with some adaptations. Signed-off-by: Paul Graham <development(a)omega-software.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 39899fd11a8ff9228a587adf5e9aeaf2ded93c5c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/profile.c | 9 ++++----- dlls/kernel32/tests/profile.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index aad3ba3..721808c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1391,7 +1391,7 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } } @@ -1447,11 +1447,10 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); - PROFILE_FlushFile(); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; - while(*string) { + while(*string && ret) { LPWSTR buf = HeapAlloc( GetProcessHeap(), 0, (strlenW(string)+1) * sizeof(WCHAR) ); strcpyW( buf, string ); if((p = strchrW( buf, '='))) { @@ -1461,8 +1460,8 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, HeapFree( GetProcessHeap(), 0, buf ); string += strlenW(string)+1; } - PROFILE_FlushFile(); } + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1744,7 +1743,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); - PROFILE_FlushFile(); + if (ret) ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2eb90a8..17ba124 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "windows.h" +#include "sddl.h" #define KEY "ProfileInt" #define SECTION "Test" @@ -534,6 +535,41 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) return TRUE; } +static void test_profile_directory_readonly(void) +{ + BOOL ret; + CHAR path_folder[MAX_PATH]; + CHAR path_file[MAX_PATH]; + const char *sddl_string_everyone_readonly = "D:PAI(A;;0x1200a9;;;WD)"; + SECURITY_ATTRIBUTES attributes = {0}; + char lpStruct[] = { 's', 't', 'r', 'i', 'n', 'g' }; + + attributes.nLength = sizeof(attributes); + ret = ConvertStringSecurityDescriptorToSecurityDescriptorA(sddl_string_everyone_readonly, SDDL_REVISION_1, &attributes.lpSecurityDescriptor, NULL); + ok(ret == TRUE, "ConvertStringSecurityDescriptorToSecurityDescriptor failed: %d\n", GetLastError()); + + GetTempPathA(MAX_PATH, path_folder); + lstrcatA(path_folder, "wine-test"); + + strcpy(path_file, path_folder); + lstrcatA(path_file, "\\tmp.ini"); + + ret = CreateDirectoryA(path_folder, &attributes); + ok(ret == TRUE, "CreateDirectoryA failed: %d\n", GetLastError()); + + ret = WritePrivateProfileStringA("App", "key", "string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileSectionA("App", "key=string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileStructA("App", "key", lpStruct, sizeof(lpStruct), path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = RemoveDirectoryA(path_folder); + ok(ret == TRUE, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_GetPrivateProfileString(const char *content, const char *descript) { DWORD ret, len; @@ -1132,6 +1168,7 @@ START_TEST(profile) test_profile_existing(); test_profile_delete_on_close(); test_profile_refresh(); + test_profile_directory_readonly(); test_GetPrivateProfileString( "[section1]\r\n" "name1=val1\r\n"

1 0

Alexandre Julliard : Wine release 3.8
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: website Branch: master Commit: 82c409a44c077ed34238bfb063ed071fe2c26dd2 URL: https://source.winehq.org/git/website.git/?a=commit;h=82c409a44c077ed34238b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 20:22:47 2018 +0200 Wine release 3.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018051101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2018051101.xml b/news/en/2018051101.xml new file mode 100644 index 0000000..cf4341c --- /dev/null +++ b/news/en/2018051101.xml @@ -0,0 +1,17 @@ +<news> +<date>May 11, 2018</date> +<title>Wine 3.8 Released</title> +<body> + The Wine development release 3.8 is now available. + <a href="{$root}/announce/3.8">What's new</a> in this release: +<ul> + <li>Infrastructure for writing kernel driver tests.</li> + <li>Support for showing file properties in the Shell browser.</li> + <li>MP3 decoder as a DirectX Media Object.</li> + <li>More support for the Task Scheduler.</li> + <li>Support for COM aggregation in UrlMon.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : gdiplus: Convert actually used points for anchored round caps.
by Alexandre Julliard May 11, 2018

May 11, 2018

Module: wine Branch: master Commit: 5436cfc9b67c51d88a1525c661db24a88ec68d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5436cfc9b67c51d88a1525c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 11 11:01:46 2018 +0300 gdiplus: Convert actually used points for anchored round caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6635dea..478039e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1634,9 +1634,9 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s ptf[1].X = x2 + dx; ptf[1].Y = y2 + dy; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, ptf, 2); - round_points(pt, ptf, 3); + round_points(pt, ptf, 2); Ellipse(graphics->hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);

1 0