October 2006 - Wine-Commits

Marcus Meissner : iphlpapi: NetBSD needs sys/param.h.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 2c8aeb6db1495e6d9802aca55274b5c954356d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8aeb6db1495e6d9802aca55… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 22 21:15:46 2006 +0200 iphlpapi: NetBSD needs sys/param.h. --- dlls/iphlpapi/ifenum.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 8e7e929..8a9135b 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -39,6 +39,9 @@ #include <unistd.h> #endif #include <sys/types.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h>

1 0

Detlef Riekenberg : localspl: Remember hInstance, needed for resources.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: b8a2b17af657122ebc09cad17d1b49f8f5828249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a2b17af657122ebc09cad17… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 21 18:45:53 2006 +0200 localspl: Remember hInstance, needed for resources. --- dlls/localspl/localspl_main.c | 5 ++++- dlls/localspl/localspl_private.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index b9ce877..9fd72e0 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -35,10 +35,12 @@ #include "winspool.h" #include "ddk/winsplp.h" #include "wine/debug.h" - +#include "localspl_private.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); +HINSTANCE LOCALSPL_hInstance = NULL; + /***************************************************** * DllMain */ @@ -53,6 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); + LOCALSPL_hInstance = hinstDLL; break; } return TRUE; diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h new file mode 100644 index 0000000..63ca891 --- /dev/null +++ b/dlls/localspl/localspl_private.h @@ -0,0 +1,29 @@ +/* + * Implementation of the Local Printmonitor: internal include file + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_LOCALSPL_PRIVATE__ +#define __WINE_LOCALSPL_PRIVATE__ + + +/* ## DLL-wide Globals ## */ +extern HINSTANCE LOCALSPL_hInstance; + + +#endif /* __WINE_LOCALSPL_PRIVATE__ */

1 0

Detlef Riekenberg : localspl/tests: Fallback to localmon.dll on NT4.0.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 73d36423f3515fe9848dce002a8102cd8895dc49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d36423f3515fe9848dce002… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 21 18:41:04 2006 +0200 localspl/tests: Fallback to localmon.dll on NT4.0. --- dlls/localspl/tests/localmon.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index ca5ee97..d71fb64 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -36,6 +36,7 @@ #include "wine/test.h" /* ##### */ static HMODULE hdll; +static HMODULE hlocalmon; static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR); static LPMONITOREX pm; @@ -74,16 +75,18 @@ static void test_InitializePrintMonitor( SetLastError(0xdeadbeef); res = pInitializePrintMonitor(NULL); - ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %d\n (expected NULL with " \ + /* The Parameter was unchecked before w2k */ + ok( res || (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %p with %d\n (expected '!= NULL' or: NULL with " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); SetLastError(0xdeadbeef); res = pInitializePrintMonitor(emptyW); - ok( (res == NULL) && (GetLastError() == ERROR_INVALID_PARAMETER), - "returned %p with %d\n (expected NULL with " \ + ok( res || (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %p with %d\n (expected '!= NULL' or: NULL with " \ "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + /* Every call with a non-empty string returns the same Pointer */ SetLastError(0xdeadbeef); res = pInitializePrintMonitor(Monitors_LocalPortW); @@ -107,6 +110,13 @@ START_TEST(localmon) if (!hdll) return; pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); + if (!pInitializePrintMonitor) { + /* The Monitor for "Local Ports" was in a seperate dll before w2k */ + hlocalmon = LoadLibraryA("localmon.dll"); + if (hlocalmon) { + pInitializePrintMonitor = (void *) GetProcAddress(hlocalmon, "InitializePrintMonitor"); + } + } if (!pInitializePrintMonitor) return; /* Native localmon.dll / localspl.dll need a vaild Port-Entry in:

1 0

Alexandre Julliard : user: Fixed MonitorFromWindow behavior for an invalid window handle.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: 75fb678070ac4b43b01444e56682f5b83a425f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fb678070ac4b43b01444e56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 23 18:03:16 2006 +0200 user: Fixed MonitorFromWindow behavior for an invalid window handle. --- dlls/user/dialog.c | 7 +------ dlls/user/dialog16.c | 7 +------ dlls/user/misc.c | 7 ++++++- dlls/user/tests/monitor.c | 18 ++++++++++++++++++ dlls/user/win.c | 12 +----------- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index d43247c..4021151 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -543,12 +543,7 @@ static HWND DIALOG_CreateIndirect( HINST mon_info.cbSize = sizeof(mon_info); if (template.style & DS_CENTER) { - if (!(monitor = MonitorFromWindow( owner ? owner : GetActiveWindow(), - MONITOR_DEFAULTTOPRIMARY ))) - { - pos.x = pos.y = 0; /* default to primary monitor */ - monitor = MonitorFromPoint( pos, MONITOR_DEFAULTTOPRIMARY ); - } + monitor = MonitorFromWindow( owner ? owner : GetActiveWindow(), MONITOR_DEFAULTTOPRIMARY ); GetMonitorInfoW( monitor, &mon_info ); pos.x = (mon_info.rcWork.left + mon_info.rcWork.right - size.cx) / 2; pos.y = (mon_info.rcWork.top + mon_info.rcWork.bottom - size.cy) / 2; diff --git a/dlls/user/dialog16.c b/dlls/user/dialog16.c index 2df59fc..3208b34 100644 --- a/dlls/user/dialog16.c +++ b/dlls/user/dialog16.c @@ -375,12 +375,7 @@ static HWND DIALOG_CreateIndirect16( HIN mon_info.cbSize = sizeof(mon_info); if (template.style & DS_CENTER) { - if (!(monitor = MonitorFromWindow( owner ? owner : GetActiveWindow(), - MONITOR_DEFAULTTOPRIMARY ))) - { - pos.x = pos.y = 0; /* default to primary monitor */ - monitor = MonitorFromPoint( pos, MONITOR_DEFAULTTOPRIMARY ); - } + monitor = MonitorFromWindow( owner ? owner : GetActiveWindow(), MONITOR_DEFAULTTOPRIMARY ); GetMonitorInfoW( monitor, &mon_info ); pos.x = (mon_info.rcWork.left + mon_info.rcWork.right - size.cx) / 2; pos.y = (mon_info.rcWork.top + mon_info.rcWork.bottom - size.cy) / 2; diff --git a/dlls/user/misc.c b/dlls/user/misc.c index 114a042..4cc1105 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -430,7 +430,12 @@ HMONITOR WINAPI MonitorFromWindow(HWND h if (IsIconic(hWnd) && GetWindowPlacement(hWnd, &wp)) return MonitorFromRect( &wp.rcNormalPosition, dwFlags ); - GetWindowRect( hWnd, &rect ); + if (GetWindowRect( hWnd, &rect )) + return MonitorFromRect( &rect, dwFlags ); + + if (!(dwFlags & (MONITOR_DEFAULTTOPRIMARY|MONITOR_DEFAULTTONEAREST))) return 0; + /* retrieve the primary */ + SetRect( &rect, 0, 0, 1, 1 ); return MonitorFromRect( &rect, dwFlags ); } diff --git a/dlls/user/tests/monitor.c b/dlls/user/tests/monitor.c index ad3165f..787ac2e 100644 --- a/dlls/user/tests/monitor.c +++ b/dlls/user/tests/monitor.c @@ -146,10 +146,28 @@ static void test_ChangeDisplaySettingsEx ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %d\n", res); } +static void test_monitors(void) +{ + HMONITOR monitor, primary; + POINT pt; + + pt.x = pt.y = 0; + primary = MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); + ok( primary != 0, "couldn't get primary monitor\n" ); + + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONULL ); + ok( !monitor, "got %p, should not get a monitor for an invalid window\n", monitor ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); + monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); + ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); +} + START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); + test_monitors(); } diff --git a/dlls/user/win.c b/dlls/user/win.c index d52cac0..91a9f09 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -706,20 +706,10 @@ #define IS_DEFAULT(x) ((x) == CW_USEDEF HMONITOR monitor; MONITORINFO mon_info; STARTUPINFOW info; - POINT pt; if (!IS_DEFAULT(cs->x) && !IS_DEFAULT(cs->cx) && !IS_DEFAULT(cs->cy)) return; - if (!(monitor = MonitorFromWindow( cs->hwndParent, MONITOR_DEFAULTTOPRIMARY ))) - { - pt.x = pt.y = 0; /* default to primary monitor */ - if (!IS_DEFAULT(cs->x)) - { - pt.x = cs->x; - pt.y = cs->y; - } - monitor = MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); - } + monitor = MonitorFromWindow( cs->hwndParent, MONITOR_DEFAULTTOPRIMARY ); mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info ); GetStartupInfoW( &info );

1 0

Detlef Riekenberg : localspl: Add version resource.
by Alexandre Julliard Oct. 24, 2006

Oct. 24, 2006

Module: wine Branch: master Commit: c9dc7ccda271dde072252fe403c434e107271f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9dc7ccda271dde072252fe40… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 21 18:45:01 2006 +0200 localspl: Add version resource. --- dlls/localspl/Makefile.in | 2 ++ dlls/localspl/localspl.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 0e74179..1e468b9 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -9,6 +9,8 @@ C_SRCS = \ localmon.c \ localspl_main.c +RC_SRCS = localspl.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc new file mode 100644 index 0000000..4098452 --- /dev/null +++ b/dlls/localspl/localspl.rc @@ -0,0 +1,36 @@ +/* + * Top level resource file for localspl + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winver.h" + +#define WINE_FILENAME_STR "localspl.dll" +#define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Francois Gouget : msi/tests: Fix compilation with gcc 2.95.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: a99095135883a9e575baf9aa99435d1143c3b882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99095135883a9e575baf9aa9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 23 13:57:15 2006 +0200 msi/tests: Fix compilation with gcc 2.95. --- dlls/msi/tests/suminfo.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index d8825b9..0122936 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -300,59 +300,51 @@ static void test_create_database_binary( ok( r == S_OK, "failed to set class\n"); PropVariantClear( &propvar[0] ); - propspec[0].lpwstr = NULL; propspec[0].ulKind = PRSPEC_PROPID; - propspec[0].propid = PID_TITLE; + U(propspec[0]).propid = PID_TITLE; propvar[0].vt = VT_LPSTR; U(propvar[0]).pszVal = LOSE_CONST("test title"); PropVariantClear( &propvar[1] ); - propspec[1].lpwstr = NULL; propspec[1].ulKind = PRSPEC_PROPID; - propspec[1].propid = PID_SUBJECT; + U(propspec[1]).propid = PID_SUBJECT; propvar[1].vt = VT_LPSTR; U(propvar[1]).pszVal = LOSE_CONST("msi suminfo / property storage test"); PropVariantClear( &propvar[2] ); - propspec[2].lpwstr = NULL; propspec[2].ulKind = PRSPEC_PROPID; - propspec[2].propid = PID_AUTHOR; + U(propspec[2]).propid = PID_AUTHOR; propvar[2].vt = VT_LPSTR; U(propvar[2]).pszVal = LOSE_CONST("mike_m"); PropVariantClear( &propvar[3] ); - propspec[3].lpwstr = NULL; propspec[3].ulKind = PRSPEC_PROPID; - propspec[3].propid = PID_TEMPLATE; + U(propspec[3]).propid = PID_TEMPLATE; propvar[3].vt = VT_LPSTR; U(propvar[3]).pszVal = LOSE_CONST(";1033"); /* actually the string table's codepage */ PropVariantClear( &propvar[4] ); - propspec[4].lpwstr = NULL; propspec[4].ulKind = PRSPEC_PROPID; - propspec[4].propid = PID_REVNUMBER; + U(propspec[4]).propid = PID_REVNUMBER; propvar[4].vt = VT_LPSTR; U(propvar[4]).pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); PropVariantClear( &propvar[5] ); - propspec[5].lpwstr = NULL; propspec[5].ulKind = PRSPEC_PROPID; - propspec[5].propid = PID_PAGECOUNT; + U(propspec[5]).propid = PID_PAGECOUNT; propvar[5].vt = VT_I4; U(propvar[5]).lVal = 100; PropVariantClear( &propvar[6] ); - propspec[6].lpwstr = NULL; propspec[6].ulKind = PRSPEC_PROPID; - propspec[6].propid = PID_WORDCOUNT; + U(propspec[6]).propid = PID_WORDCOUNT; propvar[6].vt = VT_I4; U(propvar[6]).lVal = 0; /* MSDN says that PID_LASTPRINTED should be a VT_FILETIME... */ PropVariantClear( &propvar[7] ); - propspec[7].lpwstr = NULL; propspec[7].ulKind = PRSPEC_PROPID; - propspec[7].propid = PID_LASTPRINTED; + U(propspec[7]).propid = PID_LASTPRINTED; propvar[7].vt = VT_LPSTR; U(propvar[7]).pszVal = LOSE_CONST("7/1/1999 5:17");

1 0

Francois Gouget : oleview: Fix compilation with gcc 2.95.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 58294b818ccbb1564eb1b7f56853dd39cc538725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58294b818ccbb1564eb1b7f56… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 23 13:55:49 2006 +0200 oleview: Fix compilation with gcc 2.95. --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index e91a613..fd9c44d 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -537,7 +537,7 @@ int EnumFuncs(ITypeInfo *pTypeInfo, int } bFirst = TRUE; #define ENUM_PARAM_FLAG(x)\ - if(pFuncDesc->lprgelemdescParam[j].paramdesc.wParamFlags & x)\ + if(U(pFuncDesc->lprgelemdescParam[j]).paramdesc.wParamFlags & x) \ {\ if(bFirst) AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam),\ wszOpenBrackets1);\

1 0

Rob Shearman : oleaut32: Fix a missing ITypeInfo:: ReleaseTypeAttr in the typelib marshaling code.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 053f69acedd9a389f9d022d51126df799ad95eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=053f69acedd9a389f9d022d51… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:46:08 2006 +0100 oleaut32: Fix a missing ITypeInfo::ReleaseTypeAttr in the typelib marshaling code. --- dlls/oleaut32/tmarshal.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9749120..ee35076 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1201,8 +1201,12 @@ _get_funcdesc( } hres = _get_funcdesc(tinfo2,iMethod,tactual,fdesc,iname,fname); ITypeInfo_Release(tinfo2); - if (!hres) return S_OK; + if (!hres) { + ITypeInfo_ReleaseTypeAttr(tinfo, attr); + return S_OK; + } } + ITypeInfo_ReleaseTypeAttr(tinfo, attr); return hres; } if (((*fdesc)->oVft/4) == iMethod) {

1 0

Rob Shearman : oleaut32: Fix two more leaks on type info destruction.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 053b6b21b66b11c2a5d9d05f7fd0267d74c60240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053b6b21b66b11c2a5d9d05f7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:44:50 2006 +0100 oleaut32: Fix two more leaks on type info destruction. --- dlls/oleaut32/typelib.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e09a5d5..d866b9b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1816,7 +1816,7 @@ MSFT_DoFuncs(TLBContext* pcx, { if ( pFuncRec->FKCCIC & 0x2000 ) { - (*pptfd)->Entry = (WCHAR*) pFuncRec->OptAttr[2] ; + (*pptfd)->Entry = SysAllocString((WCHAR*)pFuncRec->OptAttr[2]); } else { @@ -3593,6 +3593,8 @@ static ULONG WINAPI ITypeLib2_fnRelease( for (pImpLib = This->pImpLibs; pImpLib; pImpLib = pImpLibNext) { + if (pImpLib->pImpTypeLib) + ITypeLib_Release((ITypeLib *)pImpLib->pImpTypeLib); TLB_Free(pImpLib->name); pImpLibNext = pImpLib->next; @@ -4433,6 +4435,7 @@ static ULONG WINAPI ITypeInfo_fnRelease( pCustDataNext = pCustData->next; TLB_Free(pCustData); } + SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->HelpString); SysFreeString(pFInfo->Name);

1 0

Rob Shearman : oleaut32: Rewrite MSFT_ReadName and MSFT_ReadString to need one less allocation and to fix a memory leak .
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: b5c78d0dffaf9212dfa1db35404501a127e57bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c78d0dffaf9212dfa1db354… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:39:43 2006 +0100 oleaut32: Rewrite MSFT_ReadName and MSFT_ReadString to need one less allocation and to fix a memory leak. --- dlls/oleaut32/typelib.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cdf2fe1..e09a5d5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1511,7 +1511,6 @@ static BSTR MSFT_ReadName( TLBContext *p char * name; MSFT_NameIntro niName; int lengthInChars; - WCHAR* pwstring = NULL; BSTR bstrName = NULL; if (offset < 0) @@ -1532,15 +1531,12 @@ static BSTR MSFT_ReadName( TLBContext *p /* no invalid characters in string */ if (lengthInChars) { - pwstring = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*lengthInChars); + bstrName = SysAllocStringByteLen(NULL, lengthInChars * sizeof(WCHAR)); /* don't check for invalid character since this has been done previously */ - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, pwstring, lengthInChars); - - bstrName = SysAllocStringLen(pwstring, lengthInChars); - lengthInChars = SysStringLen(bstrName); - HeapFree(GetProcessHeap(), 0, pwstring); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, bstrName, lengthInChars); } + TLB_Free(name); TRACE_(typelib)("%s %d\n", debugstr_w(bstrName), lengthInChars); return bstrName; @@ -1566,15 +1562,12 @@ static BSTR MSFT_ReadString( TLBContext /* no invalid characters in string */ if (lengthInChars) { - WCHAR* pwstring = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*lengthInChars); + bstr = SysAllocStringByteLen(NULL, lengthInChars * sizeof(WCHAR)); /* don't check for invalid character since this has been done previously */ - MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, string, -1, pwstring, lengthInChars); - - bstr = SysAllocStringLen(pwstring, lengthInChars); - lengthInChars = SysStringLen(bstr); - HeapFree(GetProcessHeap(), 0, pwstring); + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, string, -1, bstr, lengthInChars); } + TLB_Free(string); TRACE_(typelib)("%s %d\n", debugstr_w(bstr), lengthInChars); return bstr;

1 0