July 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : wineconsole: Consistently return nonzero exitcode on error.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 29b55a5cae70c270a2b02b0ab25a4674f0ebea5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b55a5cae70c270a2b02b0ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:34:34 2015 +0200 wineconsole: Consistently return nonzero exitcode on error. --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 32 +++++++++++++++++--------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 2903b80..7413c8f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1018,7 +1018,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) WCCURSES_Resize(data); - if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 0; + if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 5c8c2c0..4725ebd 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1382,7 +1382,7 @@ static int WCUSER_MainLoop(struct inner_data* data) * so GetMessage would lead to delayed processing */ while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_QUIT) return 0; + if (msg.message == WM_QUIT) return 1; WINE_TRACE("dispatching msg %04x\n", msg.message); DispatchMessageW(&msg); } diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bdd5629..b8b517a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -720,7 +720,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna * * Spawn the child process when invoked with wineconsole foo bar */ -static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) +static int WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) { PROCESS_INFORMATION info; STARTUPINFOW startup; @@ -743,20 +743,22 @@ static BOOL WINECON_Spawn(struct inner_data* data, LPWSTR cmdLine) { WINE_ERR("Can't dup handles\n"); /* no need to delete handles, we're exiting the program anyway */ - return FALSE; + return 1; } done = CreateProcessW(NULL, cmdLine, NULL, NULL, TRUE, 0L, NULL, NULL, &startup, &info); + if (done) + { + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } /* we no longer need the handles passed to the child for the console */ CloseHandle(startup.hStdInput); CloseHandle(startup.hStdOutput); CloseHandle(startup.hStdError); - CloseHandle(info.hProcess); - CloseHandle(info.hThread); - - return done; + return !done; } struct wc_init { @@ -852,9 +854,9 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh { case from_event: /* case of wineconsole <evt>, signal process that created us that we're up and running */ - if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 0; - ret = SetEvent(wci.event); - if (!ret) WINE_ERR("SetEvent failed.\n"); + if (!(data = WINECON_Init(hInst, 0, NULL, wci.backend, nCmdShow))) return 1; + ret = !SetEvent(wci.event); + if (ret != 0) WINE_ERR("SetEvent failed.\n"); break; case from_process_name: { @@ -865,30 +867,30 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!buffer) - return 0; + return 1; MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) { HeapFree(GetProcessHeap(), 0, buffer); - return 0; + return 1; } ret = WINECON_Spawn(data, buffer); HeapFree(GetProcessHeap(), 0, buffer); - if (!ret) + if (ret != 0) { WINECON_Delete(data); printf_res(IDS_CMD_LAUNCH_FAILED, wine_dbgstr_a(wci.ptr)); - return 0; + return ret; } } break; default: - return 0; + return 1; } - if (ret) + if (!ret) { WINE_TRACE("calling MainLoop.\n"); ret = data->fnMainLoop(data);

1 0

Henri Verbeet : d2d1: Properly handle D2D1_ALPHA_MODE_PREMULTIPLIED on render targets.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: c2135dd498dc729deb5ad9f525f7b52c87c7d9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2135dd498dc729deb5ad9f52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:56 2015 +0200 d2d1: Properly handle D2D1_ALPHA_MODE_PREMULTIPLIED on render targets. --- dlls/d2d1/render_target.c | 18 +++++-- dlls/d2d1/tests/d2d1.c | 117 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 124 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 925db33..a25b8ea 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1165,7 +1165,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa if (color) c = *color; - c.a = 1.0f; + if (render_target->format.alphaMode == D2D1_ALPHA_MODE_IGNORE) + c.a = 1.0f; + c.r *= c.a; + c.g *= c.a; + c.b *= c.a; buffer_desc.ByteWidth = sizeof(c); buffer_data.pSysMem = &c; @@ -1794,8 +1798,16 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, blend_desc.SrcBlend = D3D10_BLEND_ONE; blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; blend_desc.BlendOp = D3D10_BLEND_OP_ADD; - blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + if (desc->pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) + { + blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + } + else + { + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_INV_SRC_ALPHA; + } blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; if (FAILED(hr = ID3D10Device_CreateBlendState(render_target->device, &blend_desc, &render_target->bs))) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a7c720b..a0c9b11 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -438,29 +438,34 @@ static IDXGISwapChain *create_swapchain(ID3D10Device1 *device, HWND window, BOOL return swapchain; } -static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) +static ID2D1RenderTarget *create_render_target_desc(IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { - D2D1_RENDER_TARGET_PROPERTIES desc; ID2D1RenderTarget *render_target; ID2D1Factory *factory; HRESULT hr; hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, desc, &render_target); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + ID2D1Factory_Release(factory); + + return render_target; +} + +static ID2D1RenderTarget *create_render_target(IDXGISurface *surface) +{ + D2D1_RENDER_TARGET_PROPERTIES desc; desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; - desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; desc.dpiX = 0.0f; desc.dpiY = 0.0f; desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; - hr = ID2D1Factory_CreateDxgiSurfaceRenderTarget(factory, surface, &desc, &render_target); - ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); - ID2D1Factory_Release(factory); - - return render_target; + return create_render_target_desc(surface, &desc); } static void test_clip(void) @@ -1611,6 +1616,7 @@ static void test_bitmap_formats(void) static void test_alpha_mode(void) { + D2D1_RENDER_TARGET_PROPERTIES rt_desc; D2D1_BITMAP_PROPERTIES bitmap_desc; ID2D1SolidColorBrush *color_brush; ID2D1BitmapBrush *bitmap_brush; @@ -1672,6 +1678,101 @@ static void test_alpha_mode(void) ID2D1RenderTarget_Clear(rt, NULL); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "48c41aff3a130a17ee210866b2ab7d36763934d5"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 1.0f, 0.0f, 0.0f, 0.25f); + ID2D1RenderTarget_Clear(rt, &color); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "6487e683730fb5a77c1911388d00b04664c5c4e4"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.0f, 0.0f, 1.0f, 0.75f); + ID2D1RenderTarget_Clear(rt, &color); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "7a35ba09e43cbaf591388ff1ef8de56157630c98"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); + + set_rect(&rect, 0.0f, 0.0f, 160.0f, 120.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 160.0f, 0.0f, 320.0f, 120.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 320.0f, 0.0f, 480.0f, 120.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + ID2D1Bitmap_Release(bitmap); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap); + + set_rect(&rect, 0.0f, 120.0f, 160.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 1.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 160.0f, 120.0f, 320.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + set_rect(&rect, 320.0f, 120.0f, 480.0f, 240.0f); + ID2D1BitmapBrush_SetOpacity(bitmap_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)bitmap_brush); + + set_rect(&rect, 0.0f, 240.0f, 160.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 160.0f, 240.0f, 320.0f, 360.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.75f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + set_rect(&rect, 320.0f, 240.0f, 480.0f, 360.0f); + ID2D1SolidColorBrush_SetOpacity(color_brush, 0.25f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)color_brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "14f8ac64b70966c7c3c6281c59aaecdb17c3b16a"); + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_Release(rt); + rt_desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + rt_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + rt_desc.dpiX = 0.0f; + rt_desc.dpiY = 0.0f; + rt_desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + rt_desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + rt = create_render_target_desc(surface, &rt_desc); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + ID2D1Bitmap_Release(bitmap); + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + ID2D1BitmapBrush_SetBitmap(bitmap_brush, bitmap); + + ID2D1BitmapBrush_Release(bitmap_brush); + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, &bitmap_brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1BitmapBrush_SetInterpolationMode(bitmap_brush, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + ID2D1BitmapBrush_SetExtendModeX(bitmap_brush, D2D1_EXTEND_MODE_WRAP); + ID2D1BitmapBrush_SetExtendModeY(bitmap_brush, D2D1_EXTEND_MODE_WRAP); + + ID2D1SolidColorBrush_Release(color_brush); + set_color(&color, 0.0f, 1.0f, 0.0f, 0.75f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &color_brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); match = compare_surface(surface, "b44510bf2d2e61a8d7c0ad862de49a471f1fd13f"); ok(match, "Surface does not match.\n");

1 0

Henri Verbeet : d2d1: Bitmap values are always premultiplied in practice.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 52c412492faba134f5753ee60cce3040a8e37169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c412492faba134f5753ee60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:55 2015 +0200 d2d1: Bitmap values are always premultiplied in practice. Since creating bitmaps with D2D1_ALPHA_MODE_UNKNOWN or D2D1_ALPHA_MODE_STRAIGHT is not possible, and D2D1_ALPHA_MODE_IGNORE behaves as if alpha == 1.0f. --- dlls/d2d1/brush.c | 3 ++ dlls/d2d1/render_target.c | 16 +++--- dlls/d2d1/tests/d2d1.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c412492faba134f5753…

1 0

Sebastian Lackner : server: Store correct entry point for first thread.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 905bf79337e04ed31d2823508e90169298049697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905bf79337e04ed31d2823508… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:16:36 2015 +0200 server: Store correct entry point for first thread. --- dlls/ntdll/tests/info.c | 12 ++++++++++-- server/process.c | 1 + server/thread.c | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 83e8757..4111be4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1713,18 +1713,26 @@ static DWORD WINAPI start_address_thread(void *arg) static void test_thread_start_address(void) { - PRTL_THREAD_START_ROUTINE entry; + PRTL_THREAD_START_ROUTINE entry, expected_entry; + IMAGE_NT_HEADERS *nt; NTSTATUS status; HANDLE thread; + void *module; DWORD ret; + module = GetModuleHandleA(0); + ok(module != NULL, "expected non-NULL address for module\n"); + nt = RtlImageNtHeader(module); + ok(nt != NULL, "expected non-NULL address for NT header\n"); + entry = NULL; ret = 0xdeadbeef; status = pNtQueryInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, &entry, sizeof(entry), &ret); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(ret == sizeof(entry), "NtQueryInformationThread returned %u bytes\n", ret); - ok(entry != NULL, "expected non-NULL entry point\n"); + expected_entry = (void *)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); + ok(entry == expected_entry, "expected %p, got %p\n", expected_entry, entry); entry = (void *)0xdeadbeef; status = pNtSetInformationThread(GetCurrentThread(), ThreadQuerySetWin32StartAddress, diff --git a/server/process.c b/server/process.c index 0bf7194..7252497 100644 --- a/server/process.c +++ b/server/process.c @@ -1295,6 +1295,7 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; + current->entry_point = req->entry; generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE ); diff --git a/server/thread.c b/server/thread.c index 981bcc1..e1696ba 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1287,7 +1287,7 @@ DECL_HANDLER(init_thread) current->unix_pid = req->unix_pid; current->unix_tid = req->unix_tid; current->teb = req->teb; - current->entry_point = req->entry; + current->entry_point = process->peb ? req->entry : 0; if (!process->peb) /* first thread, initialize the process too */ {

1 0

Sebastian Lackner : ntdll: Validate SecurityCookie pointer before accessing cookie value.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 6e66c12c68c6b35ec6ff037e032979fb1dacbe26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e66c12c68c6b35ec6ff037e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:14:23 2015 +0200 ntdll: Validate SecurityCookie pointer before accessing cookie value. --- dlls/ntdll/virtual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 479ca79..2fd8198 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1320,9 +1320,11 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && - loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) + if (loadcfg && loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie) && + (ULONG_PTR)ptr <= loadcfg->SecurityCookie && loadcfg->SecurityCookie <= (ULONG_PTR)ptr + total_size - sizeof(ULONG_PTR)) + { set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); + } /* set the image protections */

1 0

Sebastian Lackner : ntdll: Mark newly spawned worker threads as busy.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 5bd9d58016236da3142e030add2efbb2789fa2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd9d58016236da3142e030ad… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 29 22:10:01 2015 +0200 ntdll: Mark newly spawned worker threads as busy. --- dlls/ntdll/threadpool.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index ad4951f..8605a22 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -379,6 +379,8 @@ NTSTATUS WINAPI RtlQueueWorkItem( PRTL_WORK_ITEM_ROUTINE function, PVOID context struct rtl_work_item *item; NTSTATUS status; + TRACE( "%p %p %u\n", function, context, flags ); + item = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*item) ); if (!item) return STATUS_NO_MEMORY; @@ -1716,6 +1718,7 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -1915,6 +1918,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -2070,6 +2074,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) TRACE( "starting worker thread for pool %p\n", pool ); RtlEnterCriticalSection( &pool->cs ); + pool->num_busy_workers--; for (;;) { while ((ptr = list_head( &pool->pool ))) @@ -2412,6 +2417,7 @@ NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) { interlocked_inc( &pool->refcount ); pool->num_workers++; + pool->num_busy_workers++; NtClose( thread ); } } @@ -2699,6 +2705,7 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) interlocked_inc( &this->refcount ); this->num_workers++; + this->num_busy_workers++; NtClose( thread ); }

1 0

Martin Storsjo : ntdll: Handle partial image load config structs.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 2a904d3bb379282831035e76bf9d30d347511bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a904d3bb379282831035e76b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Jul 23 10:36:06 2015 +0300 ntdll: Handle partial image load config structs. --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ff947da..479ca79 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1320,7 +1320,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (loadcfg && loadcfg_size >= sizeof(*loadcfg)) + if (loadcfg && + loadcfg_size >= offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); /* set the image protections */

1 0

Daniel Lehman : msvcr110: Add Concurrency::details::_GetConcurrency.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: a7c7bc9180f8ac6e4f1ef9d7a9f53d4eaa5a4e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c7bc9180f8ac6e4f1ef9d7a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 24 00:13:19 2015 -0700 msvcr110: Add Concurrency::details::_GetConcurrency. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 13 +++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 18 ++++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3faca07..51eddfb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -533,7 +533,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5077a67..c2aacac 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -524,7 +524,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() _GetConcurrency @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index d334b51..330c6b1 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -64,6 +64,7 @@ static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wc static int (CDECL *p__dsign)(double); static int (CDECL *p__fdsign)(float); static wchar_t** (CDECL *p____lc_locale_name_func)(void); +static unsigned int (CDECL *p__GetConcurrency)(void); static BOOL init(void) { @@ -82,6 +83,7 @@ static BOOL init(void) p__dsign = (void*)GetProcAddress(module, "_dsign"); p__fdsign = (void*)GetProcAddress(module, "_fdsign"); p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); + p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); return TRUE; } @@ -221,10 +223,21 @@ static void test____lc_locale_name_func(void) ok(!lc_names[1], "___lc_locale_name_func()[1] = %s\n", wine_dbgstr_w(lc_names[1])); } +static void test__GetConcurrency(void) +{ + SYSTEM_INFO si; + unsigned int c; + + GetSystemInfo(&si); + c = (*p__GetConcurrency)(); + ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); +} + START_TEST(msvcr120) { if (!init()) return; test_lconv(); test__dsign(); test____lc_locale_name_func(); + test__GetConcurrency(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 3ff423d..392c3f7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -522,7 +522,7 @@ @ stub ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ -@ stub ?_GetConcurrency(a)details@Concurrency@@YAIXZ +@ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency(a)details@Concurrency@@YAIXZ @ stub -arch=win32 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAAIXZ @ stub -arch=win64 ?_GetCurrentInlineDepth(a)_StackGuard@details(a)Concurrency@@CAAEA_KXZ @ stub ?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 6d903dc..e69e1b9 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -537,6 +537,24 @@ void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock * TRACE("(%p)\n", this); critical_section_unlock(this->cs); } + +/* ?_GetConcurrency(a)details@Concurrency@@YAIXZ */ +unsigned int __cdecl _GetConcurrency(void) +{ + static unsigned int val = -1; + + TRACE("()\n"); + + if(val == -1) { + SYSTEM_INFO si; + + GetSystemInfo(&si); + val = si.dwNumberOfProcessors; + } + + return val; +} + #endif /**********************************************************************

1 0

Dmitry Timoshkov : setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: afa912b4f2bd31b2ba58a607f310ab3b761b58e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa912b4f2bd31b2ba58a607f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 22 17:57:14 2015 +0800 setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error. --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index b084a5e..5a18937 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2340,7 +2340,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p if (!(flags & DIGCF_ALLCLASSES) && !class) { SetLastError(ERROR_INVALID_PARAMETER); - return NULL; + return INVALID_HANDLE_VALUE; } if (flags & unsupportedFlags) WARN("unsupported flags %08x\n", flags & unsupportedFlags);

1 0

Dmitry Timoshkov : setupapi: Avoid shadowing devInst variable.
by Alexandre Julliard July 29, 2015

July 29, 2015

Module: wine Branch: master Commit: 14650b939cf4ccae964337a3e0ff07945fb4f84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=14650b939cf4ccae964337a3e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 22 17:57:07 2015 +0800 setupapi: Avoid shadowing devInst variable. --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2a97eab..b084a5e 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -535,7 +535,7 @@ static void SETUPDI_FreeDeviceInfo(struct DeviceInfo *devInfo) */ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, const GUID *guid, - DWORD devInst, + DWORD dev_inst, LPCWSTR instanceId, BOOL phantom, SP_DEVINFO_DATA **dev) @@ -544,7 +544,7 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices, instanceId, phantom); - TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst, + TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), dev_inst, debugstr_w(instanceId), phantom); if (devInfo)

1 0