June 2010 - Wine-Commits - list.winehq.org

David Hedberg : shell32: Fix possible memory leak in CreateUnixFolder.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: c1682eb8eb42fa54c8f4c7860acef10de4eaa474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1682eb8eb42fa54c8f4c7860… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:44 2010 +0200 shell32: Fix possible memory leak in CreateUnixFolder. --- dlls/shell32/shfldr_unixfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 2951d6a..dfd7255 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -2158,13 +2158,15 @@ static const IDropTargetVtbl UnixFolder_IDropTarget_Vtbl = { static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const CLSID *pCLSID) { HRESULT hr = E_FAIL; - UnixFolder *pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder)); + UnixFolder *pUnixFolder; if (pUnkOuter) { FIXME("Aggregation not yet implemented!\n"); return CLASS_E_NOAGGREGATION; } + pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder)); + if(pUnixFolder) { pUnixFolder->lpIShellFolder2Vtbl = &UnixFolder_IShellFolder2_Vtbl; pUnixFolder->lpIPersistFolder3Vtbl = &UnixFolder_IPersistFolder3_Vtbl;

1 0

David Hedberg : include: Add SID_ExplorerPaneVisibility.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: cd659eb5470b67f851c223db599fa585d193626d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd659eb5470b67f851c223db5… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:46 2010 +0200 include: Add SID_ExplorerPaneVisibility. --- include/shobjidl.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 002ec3e..ddaaafc 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1644,6 +1644,8 @@ interface IExplorerBrowserEvents : IUnknown typedef GUID EXPLORERPANE; typedef EXPLORERPANE *REFEXPLORERPANE; +cpp_quote("#define SID_ExplorerPaneVisibility IID_IExplorerPaneVisibility") + /***************************************************************************** * IExplorerPaneVisibility interface */

1 0

Jose Rostagno : setupapi: Update Spanish translation.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 9ac6eaaa6674bc1786f4cfd71ea9df15b0e0d00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac6eaaa6674bc1786f4cfd71… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Mon May 31 11:34:08 2010 -0300 setupapi: Update Spanish translation. --- dlls/setupapi/Es.rc | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Es.rc b/dlls/setupapi/Es.rc index 658d2e8..aa8b128 100644 --- a/dlls/setupapi/Es.rc +++ b/dlls/setupapi/Es.rc @@ -2,6 +2,7 @@ * Spanish resources for SETUPAPI * * Copyright 2003 Jos� Manuel Ferrer Ortiz + * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,14 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "El archivo '%s' en %s es necesario" + IDS_UNKNOWN "Desconocido" + IDS_COPYFROM "Copiar archivos desde:" + IDS_INFO "Escriba la ruta en donde se encuentra el archivo, y luego haga clic en OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copiando archivos..." @@ -34,3 +43,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Archivos necesarios" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Inserte el disco de instalaci�n del fabricante, y a continuaci�n\ncompruebe que la unidad seleccionada abajo sea correcta", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copiar archivos del fabricante desde:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Buscar...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

David Hedberg : include: Update FOLDERVIEWMODE and FOLDERFLAGS.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 5858a3bc178511b47e92d624f4d9a038f11f2d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5858a3bc178511b47e92d624f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:47 2010 +0200 include: Update FOLDERVIEWMODE and FOLDERFLAGS. --- include/shobjidl.idl | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index ddaaafc..f022c78 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -409,11 +409,25 @@ typedef enum FWF_SINGLECLICKACTIVATE = 0x00008000, FWF_NOWEBVIEW = 0x00010000, FWF_HIDEFILENAMES = 0x00020000, - FWF_CHECKSELECT = 0x00040000 + FWF_CHECKSELECT = 0x00040000, + FWF_NOENUMREFRESH = 0x00080000, + FWF_NOGROUPING = 0x00100000, + FWF_FULLROWSELECT = 0x00200000, + FWF_NOFILTERS = 0x00400000, + FWF_NOCOLUMNHEADER = 0x00800000, + FWF_NOHEADERINALLVIEWS = 0x01000000, + FWF_EXTENDEDTILES = 0x02000000, + FWF_TRICHECKSELECT = 0x04000000, + FWF_AUTOCHECKSELECT = 0x08000000, + FWF_NOBROWSERVIEWSTATE = 0x10000000, + FWF_SUBSETGROUPS = 0x20000000, + FWF_USESEARCHFOLDER = 0x40000000, + FWF_ALLOWRTLREADING = 0x80000000 } FOLDERFLAGS; typedef enum { + FVM_AUTO =-1, FVM_ICON = 1, FVM_FIRST = FVM_ICON, FVM_SMALLICON = 2, @@ -422,7 +436,8 @@ typedef enum FVM_THUMBNAIL = 5, FVM_TILE = 6, FVM_THUMBSTRIP = 7, - FVM_LAST = FVM_THUMBSTRIP + FVM_CONTENT = 8, + FVM_LAST = FVM_CONTENT } FOLDERVIEWMODE; typedef struct

1 0

Dmitry Timoshkov : hhctrl.ocx: Add a trace for the resulting CHM offset to string conversion.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: a70e10d03dc40527418f6d96ccf9a74e0338c825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70e10d03dc40527418f6d96c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 1 15:26:02 2010 +0900 hhctrl.ocx: Add a trace for the resulting CHM offset to string conversion. --- dlls/hhctrl.ocx/chm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index cf5b8bf..4c85bd9 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); /* Reads a string from the #STRINGS section in the CHM file */ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) { + LPCSTR str; + if(!chm->strings_stream) return NULL; @@ -72,7 +74,9 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) } } - return chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); + str = chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); + TRACE("offset %#x => %s\n", offset, debugstr_a(str)); + return str; } static BOOL ReadChmSystem(CHMInfo *chm)

1 0

Nikolay Sivov : oleaut32: Copy bytes instead of WCHARs in VarBstrCat.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 9a5098bbb49c748a93c7a247697b2ac7220dd3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5098bbb49c748a93c7a2476… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 1 02:20:08 2010 +0400 oleaut32: Copy bytes instead of WCHARs in VarBstrCat. --- dlls/oleaut32/tests/vartype.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/vartype.c | 11 +++++---- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index c46ad8a..361342e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5486,12 +5486,17 @@ static void test_VarBstrCat(void) static const WCHAR s1[] = { 'a',0 }; static const WCHAR s2[] = { 'b',0 }; static const WCHAR s1s2[] = { 'a',0,'b',0 }; + static const char str1A[] = "Have "; + static const char str2A[] = "A Cigar"; HRESULT ret; BSTR str1, str2, res; + UINT len; - /* Crash +if (0) +{ + /* Crash */ ret = VarBstrCat(NULL, NULL, NULL); - */ +} /* Concatenation of two NULL strings works */ ret = VarBstrCat(NULL, NULL, &res); @@ -5543,6 +5548,43 @@ static void test_VarBstrCat(void) SysFreeString(str2); SysFreeString(str1); + + /* Concatenation of ansi BSTRs, both odd byte count not including termination */ + str1 = SysAllocStringByteLen(str1A, sizeof(str1A)-1); + str2 = SysAllocStringByteLen(str2A, sizeof(str2A)-1); + len = SysStringLen(str1); + ok(len == (sizeof(str1A)-1)/sizeof(WCHAR), "got length %u\n", len); + len = SysStringLen(str2); + ok(len == (sizeof(str2A)-1)/sizeof(WCHAR), "got length %u\n", len); + + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); + ok(res != NULL, "Expected a string\n"); + len = (sizeof(str1A) + sizeof(str2A) - 2)/sizeof(WCHAR); + ok(SysStringLen(res) == len, "got %d, expected %u\n", SysStringLen(res), len); + ok(!memcmp(res, "Have A Cigar", sizeof(str1A) + sizeof(str2A) - 1), "got (%s)\n", (char*)res); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); + + /* Concatenation of ansi BSTRs, both 1 byte length not including termination */ + str1 = SysAllocStringByteLen(str1A, 1); + str2 = SysAllocStringByteLen(str2A, 1); + len = SysStringLen(str1); + ok(len == 0, "got length %u\n", len); + len = SysStringLen(str2); + ok(len == 0, "got length %u\n", len); + + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08x\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == 1, "got %d, expected 1\n", SysStringLen(res)); + ok(!memcmp(res, "HA", 2), "got (%s)\n", (char*)res); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); } /* IUnknown */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 1aa71fb..8f54eae 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6932,20 +6932,21 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft, BSTR pbstrRight, BSTR *pbstrOut) if (!pbstrOut) return E_INVALIDARG; - lenLeft = pbstrLeft ? SysStringLen(pbstrLeft) : 0; - lenRight = pbstrRight ? SysStringLen(pbstrRight) : 0; + /* use byte length here to properly handle ansi-allocated BSTRs */ + lenLeft = pbstrLeft ? SysStringByteLen(pbstrLeft) : 0; + lenRight = pbstrRight ? SysStringByteLen(pbstrRight) : 0; - *pbstrOut = SysAllocStringLen(NULL, lenLeft + lenRight); + *pbstrOut = SysAllocStringByteLen(NULL, lenLeft + lenRight); if (!*pbstrOut) return E_OUTOFMEMORY; (*pbstrOut)[0] = '\0'; if (pbstrLeft) - memcpy(*pbstrOut, pbstrLeft, lenLeft * sizeof(WCHAR)); + memcpy(*pbstrOut, pbstrLeft, lenLeft); if (pbstrRight) - memcpy(*pbstrOut + lenLeft, pbstrRight, lenRight * sizeof(WCHAR)); + memcpy((CHAR*)*pbstrOut + lenLeft, pbstrRight, lenRight); TRACE("%s\n", debugstr_wn(*pbstrOut, SysStringLen(*pbstrOut))); return S_OK;

1 0

André Hentschel : winemenubuilder: Simplify switch cases.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: d6001be3483f8e7bd8fa5f39f4b686b0cc8ffe4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6001be3483f8e7bd8fa5f39f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:19:29 2010 +0200 winemenubuilder: Simplify switch cases. --- programs/winemenubuilder/winemenubuilder.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 413e5de..a40a657 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -505,11 +505,9 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, switch (pIcon->bmiHeader.biBitCount) { case 4: - return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); case 8: return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); case 24: - return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); case 32: return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); default:

1 0

Sven Baars : reg: Fix Dutch translation.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 9ad9012fcf6c37a7e07d9be063f19ef794a03760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad9012fcf6c37a7e07d9be06… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 23:01:47 2010 +0200 reg: Fix Dutch translation. --- programs/reg/Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index c34e395..22a72a4 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -30,8 +30,8 @@ STRINGTABLE STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" STRING_SUCCESS, "De bewerking is succesvol voltooid\n" - STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n" - STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n" + STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n" + STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n" STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" - STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n" + STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" }

1 0

Henri Verbeet : wined3d: Get rid of some dead code.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 1b5cc39a86256f5d3d582429924fcc6b6bd80400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5cc39a86256f5d3d5824299… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 31 20:40:26 2010 +0200 wined3d: Get rid of some dead code. --- dlls/wined3d/drawprim.c | 40 ---------- dlls/wined3d/surface.c | 162 ---------------------------------------- dlls/wined3d/surface_base.c | 9 -- dlls/wined3d/surface_gdi.c | 136 --------------------------------- dlls/wined3d/swapchain.c | 40 ---------- dlls/wined3d/wined3d_private.h | 34 -------- include/wine/wined3d.idl | 3 - 7 files changed, 0 insertions(+), 424 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5cc39a86256f5d3d582…

1 0

André Hentschel : winetest: Add an else case.
by Alexandre Julliard June 1, 2010

June 1, 2010

Module: wine Branch: master Commit: 99a24eaf48d06b37661225eaf11ccf029140ddf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a24eaf48d06b37661225eaf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:20:16 2010 +0200 winetest: Add an else case. --- programs/winetest/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 3eabf5f..01217d2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -212,6 +212,8 @@ static void print_version (void) static const char platform[] = "alpha"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; +#else +# error CPU unknown #endif OSVERSIONINFOEX ver; BOOL ext, wow64;

1 0