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

Nikolay Sivov : dwrite: Update cached bitmap size on Resize() as well.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: 5178c8b111673161167b2c6d12ac6a9e20eb7c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5178c8b111673161167b2c6d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 22 11:54:53 2015 +0300 dwrite: Update cached bitmap size on Resize() as well. --- dlls/dwrite/gdiinterop.c | 16 ++++++++-------- dlls/dwrite/tests/font.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index c3f19ac..aeb61eb 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -47,12 +47,15 @@ struct rendertarget { HDC hdc; }; -static HRESULT create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) +static HRESULT create_target_dibsection(struct rendertarget *target, UINT32 width, UINT32 height) { char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; BITMAPINFO *bmi = (BITMAPINFO*)bmibuf; HBITMAP hbm; + target->size.cx = width; + target->size.cy = height; + memset(bmi, 0, sizeof(bmibuf)); bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); bmi->bmiHeader.biHeight = -height; @@ -61,11 +64,11 @@ static HRESULT create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + hbm = CreateDIBSection(target->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); if (!hbm) hbm = CreateBitmap(1, 1, 1, 1, NULL); - DeleteObject(SelectObject(hdc, hbm)); + DeleteObject(SelectObject(target->hdc, hbm)); return S_OK; } @@ -199,7 +202,7 @@ static HRESULT WINAPI rendertarget_Resize(IDWriteBitmapRenderTarget1 *iface, UIN if (This->size.cx == width && This->size.cy == height) return S_OK; - return create_target_dibsection(This->hdc, width, height); + return create_target_dibsection(This, width, height); } static DWRITE_TEXT_ANTIALIAS_MODE WINAPI rendertarget_GetTextAntialiasMode(IDWriteBitmapRenderTarget1 *iface) @@ -251,11 +254,8 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite target->IDWriteBitmapRenderTarget1_iface.lpVtbl = &rendertargetvtbl; target->ref = 1; - target->size.cx = width; - target->size.cy = height; - target->hdc = CreateCompatibleDC(hdc); - hr = create_target_dibsection(target->hdc, width, height); + hr = create_target_dibsection(target, width, height); if (FAILED(hr)) { IDWriteBitmapRenderTarget1_Release(&target->IDWriteBitmapRenderTarget1_iface); return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c85193a..0565e09 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -849,18 +849,36 @@ if (0) /* crashes on native */ hr = IDWriteBitmapRenderTarget_Resize(target, 5, 5); ok(hr == S_OK, "got 0x%08x\n", hr); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size.cx == 5, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); hr = IDWriteBitmapRenderTarget_Resize(target, 20, 5); ok(hr == S_OK, "got 0x%08x\n", hr); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size.cx == 20, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); hr = IDWriteBitmapRenderTarget_Resize(target, 1, 5); ok(hr == S_OK, "got 0x%08x\n", hr); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size.cx == 1, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm); @@ -876,6 +894,12 @@ if (0) /* crashes on native */ hr = IDWriteBitmapRenderTarget_Resize(target, 0, 5); ok(hr == S_OK, "got 0x%08x\n", hr); + size.cx = size.cy = -1; + hr = IDWriteBitmapRenderTarget_GetSize(target, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size.cx == 0, "got %d\n", size.cx); + ok(size.cy == 5, "got %d\n", size.cy); + hbm2 = GetCurrentObject(hdc, OBJ_BITMAP); ok(hbm2 != hbm, "got %p, %p\n", hbm2, hbm);

1 0

Nikolay Sivov : dwrite: Bitmap render target uses top-down DIB.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: a66ba8957ebf8f52971048f26da6619c40881097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66ba8957ebf8f52971048f26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 22 11:54:02 2015 +0300 dwrite: Bitmap render target uses top-down DIB. --- dlls/dwrite/gdiinterop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 83a245a..c3f19ac 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -55,7 +55,7 @@ static HRESULT create_target_dibsection(HDC hdc, UINT32 width, UINT32 height) memset(bmi, 0, sizeof(bmibuf)); bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); - bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biHeight = -height; bmi->bmiHeader.biWidth = width; bmi->bmiHeader.biBitCount = 32; bmi->bmiHeader.biPlanes = 1;

1 0

Huw Davies : winhttp: Implement WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: 1709635f29a2179cb687c1b11d90976b7aee4d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1709635f29a2179cb687c1b11… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 22 09:02:01 2015 +0100 winhttp: Implement WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT. --- dlls/winhttp/session.c | 6 ++++ dlls/winhttp/tests/notification.c | 69 ++++++++++++++++++++++++++++++++++++--- dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 2fae530..3dbbad3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -98,6 +98,8 @@ static void session_destroy( object_header_t *hdr ) TRACE("%p\n", session); + if (session->unload_event) SetEvent( session->unload_event ); + LIST_FOR_EACH_SAFE( item, next, &session->cookie_cache ) { domain = LIST_ENTRY( item, domain_t, entry ); @@ -199,6 +201,10 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); return TRUE; + case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: + TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); + session->unload_event = *(HANDLE *)buffer; + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER ); diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index e14af6d..5db8fe3 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -158,9 +158,9 @@ static void setup_test( struct info *info, enum api function, unsigned int line static void test_connection_cache( void ) { - HANDLE ses, con, req; + HANDLE ses, con, req, event; DWORD size, status; - BOOL ret; + BOOL ret, unload = TRUE; struct info info, *context = &info; info.test = cache_test; @@ -171,6 +171,14 @@ static void test_connection_cache( void ) ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); + if (!ret) + { + win_skip("Unload event not supported\n"); + unload = FALSE; + } + WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -236,15 +244,33 @@ static void test_connection_cache( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok(status == WAIT_TIMEOUT, "got %08x\n", status); + } + WinHttpCloseHandle( ses ); Sleep(2000); /* make sure connection is evicted from cache */ + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok(status == WAIT_OBJECT_0, "got %08x\n", status); + } info.index = 0; ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + if (unload) + { + ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); + ok(ret, "failed to set unload option\n"); + } + WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -311,9 +337,23 @@ static void test_connection_cache( void ) done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok(status == WAIT_TIMEOUT, "got %08x\n", status); + } + WinHttpCloseHandle( ses ); Sleep(2000); /* make sure connection is evicted from cache */ + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok(status == WAIT_OBJECT_0, "got %08x\n", status); + } + + CloseHandle( event ); } static const struct notification redirect_test[] = @@ -433,9 +473,9 @@ static const struct notification async_test[] = static void test_async( void ) { - HANDLE ses, con, req; + HANDLE ses, con, req, event; DWORD size, status; - BOOL ret; + BOOL ret, unload = TRUE; struct info info, *context = &info; char buffer[1024]; @@ -447,6 +487,14 @@ static void test_async( void ) ses = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ret = WinHttpSetOption( ses, WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT, &event, sizeof(event) ); + if (!ret) + { + win_skip("Unload event not supported\n"); + unload = FALSE; + } + WinHttpSetStatusCallback( ses, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -501,9 +549,22 @@ static void test_async( void ) setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + + if (unload) + { + status = WaitForSingleObject( event, 0 ); + ok(status == WAIT_TIMEOUT, "got %08x\n", status); + } WinHttpCloseHandle( ses ); WaitForSingleObject( info.wait, INFINITE ); + + if (unload) + { + status = WaitForSingleObject( event, 2000 ); + ok(status == WAIT_OBJECT_0, "got %08x\n", status); + } + CloseHandle( event ); CloseHandle( info.wait ); } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 6a7dd3e..b3e28d2 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -110,6 +110,7 @@ typedef struct LPWSTR proxy_username; LPWSTR proxy_password; struct list cookie_cache; + HANDLE unload_event; } session_t; typedef struct

1 0

Alistair Leslie-Hughes : include: Correct spelling of Tessellate.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: a6749d527ffed0744db882d3d8b58bf85b96dea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6749d527ffed0744db882d3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 21 09:46:08 2015 +1000 include: Correct spelling of Tessellate. --- include/d3dx9mesh.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 8777749..47b0a3f 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -836,11 +836,11 @@ HRESULT WINAPI D3DXSimplifyMesh(ID3DXMesh *mesh_in, const DWORD *adjacency, HRESULT WINAPI D3DXSplitMesh(ID3DXMesh *mesh_in, const DWORD *adjacency_in, const DWORD max_size, const DWORD flags, DWORD *mesh_out_count, ID3DXBuffer **mesh_out, ID3DXBuffer **adjacency_out, ID3DXBuffer **face_remap_out, ID3DXBuffer **vertex_remap_out); -HRESULT WINAPI D3DXTesselateNPatches(ID3DXMesh *mesh_in, const DWORD *adjacency_in, float segment_count, +HRESULT WINAPI D3DXTessellateNPatches(ID3DXMesh *mesh_in, const DWORD *adjacency_in, float segment_count, BOOL quad_interp, ID3DXMesh **mesh_out, ID3DXBuffer **adjacency_out); -HRESULT WINAPI D3DXTesselateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, +HRESULT WINAPI D3DXTessellateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, const D3DVERTEXELEMENT9 *declaration, const D3DRECTPATCH_INFO *patch_info, struct ID3DXMesh *mesh); -HRESULT WINAPI D3DXTesselateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, +HRESULT WINAPI D3DXTessellateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, const D3DVERTEXELEMENT9 *declaration, const D3DTRIPATCH_INFO *patch_info, struct ID3DXMesh *mesh); HRESULT WINAPI D3DXTriPatchSize(const FLOAT *segment_count, DWORD *num_triangles, DWORD *num_vertices);

1 0

André Hentschel : winedump: Dump load config when available.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: ddf57d26affbe15286284bd6be867909a03b58b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf57d26affbe15286284bd6b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 23:19:31 2015 +0200 winedump: Dump load config when available. --- tools/winedump/main.c | 2 +- tools/winedump/pe.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index dfd15b0..a4ebb43 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -228,7 +228,7 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, clr, reloc, except)"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {NULL, NONE, 0, NULL, NULL} diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index dbe5d8f..54250e4 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1266,6 +1266,52 @@ static void dump_dir_imported_functions(void) printf("\n"); } +static void dump_dir_loadconfig(void) +{ + const IMAGE_LOAD_CONFIG_DIRECTORY32 *loadcfg32 = get_dir(IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG); + const IMAGE_LOAD_CONFIG_DIRECTORY64 *loadcfg64 = (void*)loadcfg32; + + if (!loadcfg32) return; + + printf( "Loadconfig\n" ); + print_dword( "Size", loadcfg32->Size ); + print_dword( "TimeDateStamp", loadcfg32->TimeDateStamp ); + print_word( "MajorVersion", loadcfg32->MajorVersion ); + print_word( "MinorVersion", loadcfg32->MinorVersion ); + print_dword( "GlobalFlagsClear", loadcfg32->GlobalFlagsClear ); + print_dword( "GlobalFlagsSet", loadcfg32->GlobalFlagsSet ); + print_dword( "CriticalSectionDefaultTimeout", loadcfg32->CriticalSectionDefaultTimeout ); + + if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + print_longlong( "DeCommitFreeBlockThreshold", loadcfg64->DeCommitFreeBlockThreshold ); + print_longlong( "DeCommitTotalFreeThreshold", loadcfg64->DeCommitTotalFreeThreshold ); + print_longlong( "MaximumAllocationSize", loadcfg64->MaximumAllocationSize ); + print_longlong( "VirtualMemoryThreshold", loadcfg64->VirtualMemoryThreshold ); + print_dword( "ProcessHeapFlags", loadcfg64->ProcessHeapFlags ); + print_longlong( "ProcessAffinityMask", loadcfg64->ProcessAffinityMask ); + print_word( "CSDVersion", loadcfg64->CSDVersion ); + print_word( "Reserved", loadcfg64->Reserved1 ); + print_longlong( "SecurityCookie", loadcfg64->SecurityCookie ); + print_longlong( "SEHandlerTable", loadcfg64->SEHandlerTable ); + print_longlong( "SEHandlerCount", loadcfg64->SEHandlerCount ); + } + else + { + print_dword( "DeCommitFreeBlockThreshold", loadcfg32->DeCommitFreeBlockThreshold ); + print_dword( "DeCommitTotalFreeThreshold", loadcfg32->DeCommitTotalFreeThreshold ); + print_dword( "MaximumAllocationSize", loadcfg32->MaximumAllocationSize ); + print_dword( "VirtualMemoryThreshold", loadcfg32->VirtualMemoryThreshold ); + print_dword( "ProcessHeapFlags", loadcfg32->ProcessHeapFlags ); + print_dword( "ProcessAffinityMask", loadcfg32->ProcessAffinityMask ); + print_word( "CSDVersion", loadcfg32->CSDVersion ); + print_word( "Reserved", loadcfg32->Reserved1 ); + print_dword( "SecurityCookie", loadcfg32->SecurityCookie ); + print_dword( "SEHandlerTable", loadcfg32->SEHandlerTable ); + print_dword( "SEHandlerCount", loadcfg32->SEHandlerCount ); + } +} + static void dump_dir_delay_imported_functions(void) { unsigned directorySize; @@ -1930,6 +1976,8 @@ void pe_dump(void) dump_dir_resource(); if (all || !strcmp(globals.dumpsect, "tls")) dump_dir_tls(); + if (all || !strcmp(globals.dumpsect, "loadcfg")) + dump_dir_loadconfig(); if (all || !strcmp(globals.dumpsect, "clr")) dump_dir_clr_header(); if (all || !strcmp(globals.dumpsect, "reloc"))

1 0

Qian Hong : kernel32: Fix GetComputerName buffer overflow.
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: 34c7a72d145b822492e903b9766291aa1b19e947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c7a72d145b822492e903b97… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jul 22 10:28:06 2015 +0800 kernel32: Fix GetComputerName buffer overflow. --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1cd6e47..b0c06e3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -517,7 +517,7 @@ static void set_additional_environment(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR *profile_dir = NULL, *all_users_dir = NULL; - WCHAR buf[MAX_COMPUTERNAME_LENGTH]; + WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; HANDLE hkey; DWORD len;

1 0

André Hentschel : dwrite: Remove unused initializer ( Clang).
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: b4b65d828488188f6669876169410f8ef0494eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b65d828488188f666987616… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 20:31:45 2015 +0200 dwrite: Remove unused initializer (Clang). --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 7e608a6..22c36a3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1423,7 +1423,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->clustermetrics[i].isNewline || /* always wrap on new line */ i == layout->cluster_count - 1) /* end of the text */ { - UINT32 strlength, last_cluster = i, index; + UINT32 strlength, last_cluster, index; FLOAT descent, trailingspacewidth; if (!overflow) {

1 0

André Hentschel : winedbg: Remove dead variable ( Clang).
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: 3549810faad4b3be7c44159d2649fbd600e6b8b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3549810faad4b3be7c44159d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 20:31:34 2015 +0200 winedbg: Remove dead variable (Clang). --- programs/winedbg/gdbproxy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index dd63f7d..7f0a8c9 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1400,13 +1400,12 @@ static enum packet_return packet_read_registers(struct gdb_context* gdbctx) { int i; CONTEXT ctx; - CONTEXT* pctx = &gdbctx->context; assert(gdbctx->in_trap); if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread) { - if (!fetch_context(gdbctx, gdbctx->other_thread->handle, pctx = &ctx)) + if (!fetch_context(gdbctx, gdbctx->other_thread->handle, &ctx)) return packet_error; }

1 0

André Hentschel : krnl386.exe16: Remove unused initializers (Clang).
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: da88dac29317c27699660ff2198a4587c06e2980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da88dac29317c27699660ff21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 20:31:36 2015 +0200 krnl386.exe16: Remove unused initializers (Clang). --- dlls/krnl386.exe16/local.c | 2 +- dlls/krnl386.exe16/resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/local.c b/dlls/krnl386.exe16/local.c index 4e69a90..a39316a 100644 --- a/dlls/krnl386.exe16/local.c +++ b/dlls/krnl386.exe16/local.c @@ -998,7 +998,7 @@ notify_done: */ static BOOL16 LOCAL_NewHTable( HANDLE16 ds ) { - char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); + char *ptr; LOCALHEAPINFO *pInfo; LOCALHANDLEENTRY *pEntry; HLOCAL16 handle; diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index 9b5c2c4..e05ea41 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -1084,7 +1084,7 @@ LPVOID WINAPI LockResource16( HGLOBAL16 handle ) */ DWORD WINAPI SizeofResource16( HMODULE16 hModule, HRSRC16 hRsrc ) { - NE_MODULE *pModule = NE_GetPtr( hModule ); + NE_MODULE *pModule; TRACE("(%x, %x)\n", hModule, hRsrc );

1 0

André Hentschel : widl: Remove unused initializer ( Clang).
by Alexandre Julliard July 22, 2015

July 22, 2015

Module: wine Branch: master Commit: 04a9c942508126ad0c8e9e69d36dfe912c0de1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a9c942508126ad0c8e9e69d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 20:31:30 2015 +0200 widl: Remove unused initializer (Clang). --- tools/widl/write_msft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4c85849..88f1546 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1267,7 +1267,7 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, any default value. */ static int get_defaultvalue_vt(type_t *type) { - int vt = get_type_vt(type); + int vt; if (type_get_type(type) == TYPE_ENUM) vt = VT_I4; else

1 0