September 2016 - Wine-commits

Julian Rüger : German translation for release 1.9.18
by Jeremy Newman 29 Sep '16

29 Sep '16

Module: website Branch: master Commit: a0fe9e82320908dffeeab1126c45212c09198a7d URL: http://source.winehq.org/git/website.git/?a=commit;h=a0fe9e82320908dffeeab1… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Sep 29 16:11:45 2016 +0200 German translation for release 1.9.18 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016090301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/de/2016090301.xml b/news/de/2016090301.xml new file mode 100644 index 0000000..a5d7792 --- /dev/null +++ b/news/de/2016090301.xml @@ -0,0 +1,19 @@ +<news> +<date>3. September 2016</date> +<title>Wine 1.9.18 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung mehrerer Kerneltreiber in einem einzlenen Prozess.</li> + <li>Weitere Unterstützung von WebServices-Reader.</li> + <li>Diverse Verbesserungen der Joystick-Unterstützung.</li> + <li>Ein wenig weitere Arbeit in Richtung Direct3D-Command-Stream.</li> + <li>GDI Performance-Verbesserungen.</li> + <li>Besseres IME-Window-Handling.</li> + <li>Kompatibilitätskorrekturen der Zwischenablagenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.18.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.19
by Jeremy Newman 29 Sep '16

29 Sep '16

Module: website Branch: master Commit: b1218c99e191b239b5f7bc7d42bfdf70eba66c37 URL: http://source.winehq.org/git/website.git/?a=commit;h=b1218c99e191b239b5f7bc… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Sep 29 16:15:18 2016 +0200 German translation for release 1.9.19 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016091701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016091701.xml b/news/de/2016091701.xml new file mode 100644 index 0000000..5913514 --- /dev/null +++ b/news/de/2016091701.xml @@ -0,0 +1,16 @@ +<news> +<date>17. September 2016</date> +<title>Wine 1.9.19 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anfänge eines Udev-Bustreibers für HID-Geräte.</li> + <li>Diverse Verbesserungen der Joystick-Unterstützung.</li> + <li>Anfängliche Implementierung von DC-Rendering in Direct2D.</li> + <li>Bessere Metafile-Unterstützung in GDI+.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.19.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Sebastian Lackner : webservices: Do not return uninitialized hr from write_headers_transport.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: 9ef108ad6a7cf040e2b7eb51ef0dcad6d651a8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef108ad6a7cf040e2b7eb51e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 28 18:45:06 2016 +0200 webservices: Do not return uninitialized hr from write_headers_transport. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index dfc85a5..8f44b40 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -451,7 +451,7 @@ static HRESULT write_headers( struct msg *msg, const WS_XML_STRING *ns_env, cons static HRESULT write_headers_transport( struct msg *msg, const WS_XML_STRING *ns_env, WS_XML_WRITER *writer ) { static const WS_XML_STRING prefix = {1, (BYTE *)"s"}, header = {6, (BYTE *)"Header"}; - HRESULT hr; + HRESULT hr = S_OK; ULONG i; if ((msg->header_count || !msg->action.length) &&

1 0

Sebastian Lackner : webservices: Correctly grow buffer size in receive_message.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: cece771b58d08c8b0a2b51d4dea9555622727c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cece771b58d08c8b0a2b51d4d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 28 18:45:20 2016 +0200 webservices: Correctly grow buffer size in receive_message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index e7fb52b..445d877 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -502,7 +502,7 @@ static HRESULT receive_message( struct channel *channel, ULONG max_len, char **r if (*ret_len + len > size) { char *tmp; - DWORD new_size = max( len, size * 2 ); + DWORD new_size = max( *ret_len + len, size * 2 ); if (!(tmp = heap_realloc( buf, new_size ))) { heap_free( buf );

1 0

Huw Davies : gdi32: Check that ExtFloodFill()' s initial co-ordinates lie within the dib.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: 04f8ecd95691b2536cac76663f9864f7caf450fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f8ecd95691b2536cac76663… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 29 09:57:47 2016 +0100 gdi32: Check that ExtFloodFill()'s initial co-ordinates lie within the dib. It might seem more natural to move this check inside is_interior(), but this would slow down the unclipped case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 +++ dlls/gdi32/tests/dib.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e6d65e1..cbfeccb 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1055,6 +1055,9 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || + y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; + if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index ffbd773..9db74fe 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2792,6 +2792,9 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + ret = ExtFloodFill( hdc, -1, -1, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE ); + ok (!ret, "got ret %d\n", ret); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(solid_brush);

1 0

Huw Davies : riched20: Embed PARAFORMAT2 in the paragraph struct rather than its ptr.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: b3b5c25628d868bc56fefc0eb0f01780b57711ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b5c25628d868bc56fefc0eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 29 10:13:11 2016 +0100 riched20: Embed PARAFORMAT2 in the paragraph struct rather than its ptr. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 ++--- dlls/riched20/editor.c | 16 ++++++------- dlls/riched20/editstr.h | 2 +- dlls/riched20/list.c | 1 - dlls/riched20/paint.c | 64 ++++++++++++++++++++++++------------------------- dlls/riched20/para.c | 51 +++++++++++++++++++-------------------- dlls/riched20/run.c | 2 +- dlls/riched20/table.c | 36 ++++++++++++++-------------- dlls/riched20/undo.c | 8 +++---- dlls/riched20/wrap.c | 38 ++++++++++++++--------------- dlls/riched20/writer.c | 18 +++++++------- 11 files changed, 120 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3b5c25628d868bc56fef…

1 0

Huw Davies : riched20: Add checks for allocation failures.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: 1acc6dcc58f08174a08c34fa5a884a1d3b2ee80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acc6dcc58f08174a08c34fa5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 29 10:13:12 2016 +0100 riched20: Add checks for allocation failures. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/string.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 44726b3..ef06bac 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -24,19 +24,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static int ME_GetOptimalBuffer(int nLen) { - /* FIXME: This seems wasteful for tabs and end of lines strings, - * since they have a small fixed length. */ return ((sizeof(WCHAR) * nLen) + 128) & ~63; } /* Create a buffer (uninitialized string) of size nMaxChars */ static ME_String *ME_MakeStringB(int nMaxChars) { - ME_String *s = ALLOC_OBJ(ME_String); + ME_String *s = heap_alloc( sizeof(*s) ); + if (!s) return NULL; s->nLen = nMaxChars; s->nBuffer = ME_GetOptimalBuffer(s->nLen + 1); - s->szData = ALLOC_N_OBJ(WCHAR, s->nBuffer); + s->szData = heap_alloc( s->nBuffer * sizeof(WCHAR) ); + if (!s->szData) + { + heap_free( s ); + return NULL; + } s->szData[s->nLen] = 0; return s; } @@ -44,7 +48,8 @@ static ME_String *ME_MakeStringB(int nMaxChars) ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) { ME_String *s = ME_MakeStringB(nMaxChars); - /* Native allows NULL chars */ + + if (!s) return NULL; memcpy(s->szData, szText, s->nLen * sizeof(WCHAR)); return s; } @@ -54,6 +59,8 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) { int i; ME_String *s = ME_MakeStringB(nMaxChars); + + if (!s) return NULL; for (i = 0; i < nMaxChars; i++) s->szData[i] = cRepeat; return s; @@ -62,20 +69,23 @@ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) void ME_DestroyString(ME_String *s) { if (!s) return; - FREE_OBJ(s->szData); - FREE_OBJ(s); + heap_free( s->szData ); + heap_free( s ); } BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) { DWORD new_len = s->nLen + len + 1; + WCHAR *new; + assert( ofs <= s->nLen ); if( new_len > s->nBuffer ) { s->nBuffer = ME_GetOptimalBuffer( new_len ); - s->szData = heap_realloc( s->szData, s->nBuffer * sizeof(WCHAR) ); - if (!s->szData) return FALSE; + new = heap_realloc( s->szData, s->nBuffer * sizeof(WCHAR) ); + if (!new) return FALSE; + s->szData = new; } memmove( s->szData + ofs + len, s->szData + ofs, (s->nLen - ofs + 1) * sizeof(WCHAR) ); @@ -101,6 +111,8 @@ ME_String *ME_VSplitString(ME_String *orig, int charidx) assert(charidx<=orig->nLen); s = ME_MakeStringN(orig->szData+charidx, orig->nLen-charidx); + if (!s) return NULL; + orig->nLen = charidx; orig->szData[charidx] = '\0'; return s; @@ -163,6 +175,7 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT int buffer_size = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); char *buffer = heap_alloc(buffer_size); + if (!buffer) return 0; WideCharToMultiByte(CP_ACP, 0, str, len, buffer, buffer_size, NULL, NULL); result = editor->pfnWordBreak((WCHAR*)buffer, start, buffer_size, code); @@ -187,7 +200,7 @@ LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) if(!nChars) return NULL; - if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if((tmp = heap_alloc( nChars * sizeof(WCHAR) )) != NULL) *len = MultiByteToWideChar(codepage, 0, psz, -1, tmp, nChars) - 1; return tmp; } @@ -196,5 +209,5 @@ LPWSTR ME_ToUnicode(LONG codepage, LPVOID psz, INT *len) void ME_EndToUnicode(LONG codepage, LPVOID psz) { if (codepage != CP_UNICODE) - FREE_OBJ(psz); + heap_free( psz ); }

1 0

Michael Stefaniuc : webservices/tests: Use IsEqualGUID() to compare GUIDs.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: 06072b447e28576006a1c7c738ac3f29e31fb6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06072b447e28576006a1c7c73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 29 12:19:53 2016 +0200 webservices/tests: Use IsEqualGUID() to compare GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4a1f8de..9d3cd75 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1590,7 +1590,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp( &val_guid, &guid1, sizeof(val_guid) ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid1 ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000a1</t>", @@ -1598,7 +1598,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); memset( &val_guid, 0, sizeof(val_guid) ); prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000A1</t>", @@ -1606,7 +1606,7 @@ static void test_WsReadType(void) hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + ok( IsEqualGUID( &val_guid, &guid2 ), "wrong guid\n" ); WsFreeReader( reader ); WsFreeHeap( heap );

1 0

Sebastian Lackner : services: Check for services without lpBinaryPathName in get_winedevice_process.
by Alexandre Julliard 29 Sep '16

29 Sep '16

Module: wine Branch: master Commit: 2035a8c7c84a5375144fdd70f951949ba7c5d818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2035a8c7c84a5375144fdd70f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 29 13:32:59 2016 +0200 services: Check for services without lpBinaryPathName in get_winedevice_process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/services.c b/programs/services/services.c index a12215e..f7c47b5 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -751,6 +751,7 @@ static struct process_entry *get_winedevice_process(struct service_entry *servic if (!winedevice_entry->process) continue; if (winedevice_entry->is_wow64 != is_wow64) continue; + if (!winedevice_entry->config.lpBinaryPathName) continue; if (strcmpW(winedevice_entry->config.lpBinaryPathName, path)) continue; if (!winedevice_entry->config.lpLoadOrderGroup) continue;

1 0

Piotr Caban : msvcp140: Add more missing exports.
by Alexandre Julliard 28 Sep '16

28 Sep '16

Module: wine Branch: master Commit: a401bb7f6a98d26a8d141829711878618778857c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a401bb7f6a98d26a8d1418297… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 28 07:24:52 2016 +0200 msvcp140: Add more missing exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 180 ++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a401bb7f6a98d26a8d141…

1 0