January 2015 - Wine-commits

Nikolay Sivov : dwrite/tests: Fix buffer overflow when filling test string.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: de09e9b94ed340c8004a0919157a52fd90cb9f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de09e9b94ed340c8004a09191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 6 19:45:04 2015 +0300 dwrite/tests: Fix buffer overflow when filling test string. --- dlls/dwrite/tests/layout.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index b90d7af..1a1cfd9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -927,7 +927,7 @@ todo_wine { static void test_SetLocaleName(void) { static const WCHAR strW[] = {'a','b','c','d',0}; - WCHAR buffW[LOCALE_NAME_MAX_LENGTH+5]; + WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; @@ -971,10 +971,8 @@ if (0) /* crashes on native */ /* name is too long */ lstrcpyW(buffW, strW); - while (lstrlenW(buffW) < LOCALE_NAME_MAX_LENGTH) { + while (lstrlenW(buffW) <= LOCALE_NAME_MAX_LENGTH) lstrcatW(buffW, strW); - } - lstrcatW(buffW, strW); range.startPosition = 0; range.length = 1;

1 0

Bruno Jesus : cmd: Ensure environment variables fit in memory.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 5a469f1b87e58fd96dfb68f1e892c0d3cae5a97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a469f1b87e58fd96dfb68f1e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 6 14:55:01 2015 -0200 cmd: Ensure environment variables fit in memory. --- programs/cmd/batch.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 294a153..1a78b55 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -496,15 +496,23 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR *begin = strchrW(firstModifier, '$') + 1; WCHAR *end = strchrW(firstModifier, ':'); WCHAR env[MAX_PATH]; - WCHAR fullpath[MAX_PATH]; + DWORD size; /* Extract the env var */ memcpy(env, begin, (end-begin) * sizeof(WCHAR)); env[(end-begin)] = 0x00; - /* If env var not found, return empty string */ - if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) || - (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) { + size = GetEnvironmentVariableW(env, NULL, 0); + if (size > 0) { + WCHAR *fullpath = heap_alloc(size * sizeof(WCHAR)); + if (!fullpath || (GetEnvironmentVariableW(env, fullpath, size) == 0) || + (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) + size = 0; + heap_free(fullpath); + } + + if (!size) { + /* If env var not found, return empty string */ finaloutput[0] = 0x00; outputparam[0] = 0x00; skipFileParsing = TRUE;

1 0

André Hentschel : Update copyright info for 2015.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 25f24f2b0093ca14f8ac0a7878462c50b1c5a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f24f2b0093ca14f8ac0a787… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 6 18:47:53 2015 +0100 Update copyright info for 2015. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 429646c..6dbf8c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index d8aeaf8..5938582 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2014 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2015 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Francois Gouget : mshtml: Make create_document_fragment() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: ec8002425a6aee1d3369bdbf63ffece634d332e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8002425a6aee1d3369bdbf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:28:45 2015 +0100 mshtml: Make create_document_fragment() static. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 77af21f..907e2bd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret); + HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret) { nsIDOMNodeList *nsnode_list; @@ -4652,7 +4654,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob return S_OK; } -HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret) +static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret) { HTMLDocumentNode *doc_frag; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 459be99..1f391a4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -759,7 +759,6 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; -HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : winex11.drv: Make X11DRV_PALETTE_ComputeColorShifts() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: b1ac59b9e9600a8293a6601bb50d77e4e701d511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ac59b9e9600a8293a6601bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:30:44 2015 +0100 winex11.drv: Make X11DRV_PALETTE_ComputeColorShifts() static. --- dlls/winex11.drv/palette.c | 116 ++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 1 - 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cf049c5..a399ec9 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -127,6 +127,64 @@ static void palette_set_mapping( HPALETTE hpal, int *mapping ) /*********************************************************************** + * X11DRV_PALETTE_ComputeChannelShift + * + * Calculate conversion parameters for a given color mask + */ +static void X11DRV_PALETTE_ComputeChannelShift(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) +{ + int i; + + if (maskbits==0) + { + physical->shift=0; + physical->scale=0; + physical->max=0; + to_logical->shift=0; + to_logical->scale=0; + to_logical->max=0; + return; + } + + for(i=0;!(maskbits&1);i++) + maskbits >>= 1; + + physical->shift = i; + physical->max = maskbits; + + for(i=0;maskbits!=0;i++) + maskbits >>= 1; + physical->scale = i; + + if (physical->scale>8) + { + /* On FreeBSD, VNC's default 32bpp mode is bgrabb (ffc00000,3ff800,7ff)! + * So we adjust the shifts to also normalize the color fields to + * the Win32 standard of 8 bits per color. + */ + to_logical->shift=physical->shift+(physical->scale-8); + to_logical->scale=8; + to_logical->max=0xff; + } else { + to_logical->shift=physical->shift; + to_logical->scale=physical->scale; + to_logical->max=physical->max; + } +} + +/*********************************************************************** + * X11DRV_PALETTE_ComputeColorShifts + * + * Calculate conversion parameters for a given color + */ +static void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) +{ + X11DRV_PALETTE_ComputeChannelShift(redMask, &shifts->physicalRed, &shifts->logicalRed); + X11DRV_PALETTE_ComputeChannelShift(greenMask, &shifts->physicalGreen, &shifts->logicalGreen); + X11DRV_PALETTE_ComputeChannelShift(blueMask, &shifts->physicalBlue, &shifts->logicalBlue); +} + +/*********************************************************************** * COLOR_Init * * Initialize color management. @@ -211,64 +269,6 @@ int X11DRV_PALETTE_Init(void) } /*********************************************************************** - * X11DRV_PALETTE_ComputeChannelShift - * - * Calculate conversion parameters for a given color mask - */ -static void X11DRV_PALETTE_ComputeChannelShift(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) -{ - int i; - - if (maskbits==0) - { - physical->shift=0; - physical->scale=0; - physical->max=0; - to_logical->shift=0; - to_logical->scale=0; - to_logical->max=0; - return; - } - - for(i=0;!(maskbits&1);i++) - maskbits >>= 1; - - physical->shift = i; - physical->max = maskbits; - - for(i=0;maskbits!=0;i++) - maskbits >>= 1; - physical->scale = i; - - if (physical->scale>8) - { - /* On FreeBSD, VNC's default 32bpp mode is bgrabb (ffc00000,3ff800,7ff)! - * So we adjust the shifts to also normalize the color fields to - * the Win32 standard of 8 bits per color. - */ - to_logical->shift=physical->shift+(physical->scale-8); - to_logical->scale=8; - to_logical->max=0xff; - } else { - to_logical->shift=physical->shift; - to_logical->scale=physical->scale; - to_logical->max=physical->max; - } -} - -/*********************************************************************** - * X11DRV_PALETTE_ComputeColorShifts - * - * Calculate conversion parameters for a given color - */ -void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) -{ - X11DRV_PALETTE_ComputeChannelShift(redMask, &shifts->physicalRed, &shifts->logicalRed); - X11DRV_PALETTE_ComputeChannelShift(greenMask, &shifts->physicalGreen, &shifts->logicalGreen); - X11DRV_PALETTE_ComputeChannelShift(blueMask, &shifts->physicalBlue, &shifts->logicalBlue); -} - -/*********************************************************************** * X11DRV_PALETTE_BuildPrivateMap * * Allocate colorcells and initialize mapping tables. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index bcbfe14..0adf7f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -267,7 +267,6 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) DECLSPEC_HIDDEN; extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) DECLSPEC_HIDDEN; -extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) DECLSPEC_HIDDEN; /* GDI escapes */

1 0

Francois Gouget : combase: Remove an unused default debug channel.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 25faba157e78b979b29ba53d31c2886e956ce6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25faba157e78b979b29ba53d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:33:32 2015 +0100 combase: Remove an unused default debug channel. --- dlls/combase/string.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 5fe4321..9ec05c6 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -21,9 +21,7 @@ #include "windows.h" #include "winerror.h" #include "hstring.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(combase); struct hstring_private {

1 0

Francois Gouget : dwrite: Make free_glyph_outline() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 3b87dbe062136d193303413e752f6eaf32897e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b87dbe062136d193303413e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:34:07 2015 +0100 dwrite: Make free_glyph_outline() static. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 907a1c3..5227762 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -142,7 +142,6 @@ struct glyph_outline { }; extern HRESULT new_glyph_outline(UINT32,struct glyph_outline**) DECLSPEC_HIDDEN; -extern void free_glyph_outline(struct glyph_outline*) DECLSPEC_HIDDEN; /* FreeType integration */ extern BOOL init_freetype(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 80b7f07..d0c109d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -451,7 +451,7 @@ HRESULT new_glyph_outline(UINT32 count, struct glyph_outline **ret) return S_OK; } -void free_glyph_outline(struct glyph_outline *outline) +static void free_glyph_outline(struct glyph_outline *outline) { heap_free(outline->points); heap_free(outline->tags);

1 0

Francois Gouget : riched20: Move DestroyIRichEditOle() into IRichEditOle: Release().
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: c9c2692d8edba7208f32b01edf6635751045dcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c2692d8edba7208f32b01ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:42:20 2015 +0100 riched20: Move DestroyIRichEditOle() into IRichEditOle:Release(). --- dlls/riched20/editor.h | 1 - dlls/riched20/richole.c | 28 ++++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d8abe4e..e4c13a9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -241,7 +241,6 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void DestroyIRichEditOle(IRichEditOle *iface) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0788125..1280016 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -143,7 +143,18 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) TRACE ("%p ref=%u\n", This, ref); if (!ref) - DestroyIRichEditOle(&This->IRichEditOle_iface); + { + ITextRangeImpl *txtRge; + + TRACE("Destroying %p\n", This); + This->txtSel->reOle = NULL; + This->editor->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) + txtRge->reOle = NULL; + heap_free(This); + } return ref; } @@ -2365,21 +2376,6 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p return 1; } -void DestroyIRichEditOle(IRichEditOle *iface) -{ - IRichEditOleImpl *This = impl_from_IRichEditOle(iface); - ITextRangeImpl *txtRge; - - TRACE("Destroying %p\n", This); - This->txtSel->reOle = NULL; - This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); - LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) - txtRge->reOle = NULL; - heap_free(This); -} - static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */

1 0

Bruno Jesus : secur32: Always tell the user that libgnutls could not be loaded.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 54b5660378892ded5bde507f540928be58b7f4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b5660378892ded5bde507f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 01:02:25 2014 -0200 secur32: Always tell the user that libgnutls could not be loaded. --- dlls/secur32/schannel_gnutls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 638b3c5..1173574 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -39,6 +39,7 @@ #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -480,7 +481,7 @@ BOOL schan_imp_init(void) libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); if (!libgnutls_handle) { - WARN("Failed to load libgnutls.\n"); + ERR_(winediag)("Failed to load libgnutls, secure connections will not be available.\n"); return FALSE; }

1 0

Nikolay Sivov : dwrite: Release FreeType resources on dll unload.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 102d8936cc1798e5236f54a07d37b8c492147d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=102d8936cc1798e5236f54a07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 5 22:17:14 2015 +0300 dwrite: Release FreeType resources on dll unload. --- dlls/dwrite/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 8ad5097..a63f48f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -48,6 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; release_shared_factory(shared_factory); + release_freetype(); } return TRUE; }

1 0