October 2007 - Wine-commits

Detlef Riekenberg : comdlg32: Improve stub for PrintDlgEx.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 429d7a27e068431cc274d630d1b80947e63c77c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429d7a27e068431cc274d630d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 26 00:31:47 2007 +0200 comdlg32: Improve stub for PrintDlgEx. --- dlls/comdlg32/printdlg.c | 53 +++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 009af2a..e6c22cd 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3568,25 +3568,33 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { } /*********************************************************************** - * PrintDlgExA (COMDLG32.@) + * PrintDlgExA (COMDLG32.@) * * See PrintDlgExW. * - * FIXME - * Stub + * BUGS + * Only a Stub + * */ -HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA) +HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd) { - FIXME("stub\n"); - return E_NOTIMPL; + + FIXME("(%p) stub\n", lppd); + if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) { + return E_INVALIDARG; + } + + if (!IsWindow(lppd->hwndOwner)) { + return E_HANDLE; + } + + return E_NOTIMPL; } /*********************************************************************** - * PrintDlgExW (COMDLG32.@) + * PrintDlgExW (COMDLG32.@) * - * Displays the PRINT dialog box, which enables the user to specify - * specific properties of the print job. The property sheet can also have - * additional application-specific and driver-specific property pages. + * Display the property sheet style PRINT dialog box * * PARAMS * lppd [IO] ptr to PRINTDLGEX struct @@ -3600,11 +3608,26 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA) * E_HANDLE Invalid handle. * E_FAIL Unspecified error. * - * FIXME - * Stub + * NOTES + * This Dialog enables the user to specify specific properties of the print job. + * The property sheet can also have additional application-specific and + * driver-specific property pages. + * + * BUGS + * Only a Stub + * */ -HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lpPrintDlgExW) +HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd) { - FIXME("stub\n"); - return E_NOTIMPL; + + FIXME("(%p) stub\n", lppd); + if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXW))) { + return E_INVALIDARG; + } + + if (!IsWindow(lppd->hwndOwner)) { + return E_HANDLE; + } + + return E_NOTIMPL; }

1 0

Detlef Riekenberg : comdlg32/tests: Initial tests for PrintDlgExW.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 23d78ff2b89ee8831a9edc2765138289aa581815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d78ff2b89ee8831a9edc276… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 26 00:33:48 2007 +0200 comdlg32/tests: Initial tests for PrintDlgExW. --- dlls/comdlg32/tests/printdlg.c | 100 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index e458a2f..9842b17 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -33,12 +33,40 @@ #include "wine/test.h" -/* ######## */ +/* ########################### */ + +static HMODULE hcomdlg32; +static HRESULT (WINAPI * pPrintDlgExA)(LPPRINTDLGEXA); +static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); + +/* ########################### */ static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; -/* ######## */ +/* ########################### */ + +static LPCSTR load_functions(void) +{ + LPCSTR ptr; + + ptr = "comdlg32.dll"; + hcomdlg32 = LoadLibraryA(ptr); + if (!hcomdlg32) return ptr; + + ptr = "PrintDlgExA"; + pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr); + if (!pPrintDlgExA) return ptr; + + ptr = "PrintDlgExW"; + pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, ptr); + if (!pPrintDlgExW) return ptr; + + return NULL; + +} + +/* ########################### */ static void test_PageSetupDlgA(void) { @@ -98,7 +126,7 @@ static void test_PageSetupDlgA(void) } -/* ##### */ +/* ########################### */ static void test_PrintDlgA(void) { @@ -210,10 +238,76 @@ static void test_PrintDlgA(void) } +/* ########################### */ + +static void test_PrintDlgExW(void) +{ + LPPRINTDLGEXW pDlg; + HRESULT res; + + /* Set CommDlgExtendedError != 0 */ + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(NULL); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); + if (!pDlg) return; + + /* lStructSize must be exact */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW) - 1; + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW) + 1; + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_HANDLE), + "got 0x%x with %u and %u (expected 'E_HANDLE')\n", + res, GetLastError(), CommDlgExtendedError()); + + + HeapFree(GetProcessHeap(), 0, pDlg); + return; + +} + +/* ########################### */ START_TEST(printdlg) { + LPCSTR ptr; + + ptr = load_functions(); + test_PageSetupDlgA(); test_PrintDlgA(); + /* PrintDlgEx not present before w2k */ + if (ptr) { + skip("%s\n", ptr); + return; + } + + test_PrintDlgExW(); }

1 0

Jacek Caban : itss: Fixed test crash on IE7.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: cecc7ab7479cff31be089936bdba5ddaab2160ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cecc7ab7479cff31be089936b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 26 01:22:20 2007 +0200 itss: Fixed test crash on IE7. --- dlls/itss/tests/protocol.c | 58 +++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 16 deletions(-) diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 680a867..05825be 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -48,10 +48,13 @@ called_ ## func = TRUE; \ }while(0) +#define SET_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + #define CHECK_CALLED(func) \ do { \ ok(called_ ## func, "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ + SET_CALLED(func); \ }while(0) DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6); @@ -278,7 +281,8 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL expect_mime) +#define protocol_start(p,u,e) _protocol_start(__LINE__,p,u,e) +static HRESULT _protocol_start(unsigned line, IInternetProtocol *protocol, LPCWSTR url, BOOL expect_mime) { HRESULT hres; @@ -297,20 +301,37 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL expect expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); - ok(hres == S_OK, "Start failed: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Start failed: %08x\n", hres); + + if(FAILED(hres)) { + SET_CALLED(GetBindInfo); + if(test_protocol == MK_PROTOCOL) + SET_CALLED(ReportProgress_DIRECTBIND); + SET_CALLED(ReportProgress_SENDINGREQUEST); + if(expect_mime) + SET_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(test_protocol == MK_PROTOCOL) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + SET_CALLED(ReportData); + if(test_protocol == ITS_PROTOCOL) + SET_CALLED(ReportProgress_BEGINDOWNLOADDATA); + SET_CALLED(ReportResult); + }else { + CHECK_CALLED(GetBindInfo); + if(test_protocol == MK_PROTOCOL) + CHECK_CALLED(ReportProgress_DIRECTBIND); + CHECK_CALLED(ReportProgress_SENDINGREQUEST); + if(expect_mime) + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(test_protocol == MK_PROTOCOL) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); + CHECK_CALLED(ReportData); + if(test_protocol == ITS_PROTOCOL) + CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA); + CHECK_CALLED(ReportResult); + } - CHECK_CALLED(GetBindInfo); - if(test_protocol == MK_PROTOCOL) - CHECK_CALLED(ReportProgress_DIRECTBIND); - CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(expect_mime) - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - if(test_protocol == MK_PROTOCOL) - SET_EXPECT(ReportProgress_CACHEFILENAMEAVAIABLE); - CHECK_CALLED(ReportData); - if(test_protocol == ITS_PROTOCOL) - CHECK_CALLED(ReportProgress_BEGINDOWNLOADDATA); - CHECK_CALLED(ReportResult); + return hres; } static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_mime) @@ -325,7 +346,12 @@ static void test_protocol_url(IClassFactory *factory, LPCWSTR url, BOOL expect_m if(FAILED(hres)) return; - protocol_start(protocol, url, expect_mime); + hres = protocol_start(protocol, url, expect_mime); + if(FAILED(hres)) { + IInternetProtocol_Release(protocol); + return; + } + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); ok(hres == S_OK, "Read failed: %08x\n", hres); ok(cb == 13, "cb=%u expected 13\n", cb);

1 0

Rob Shearman : credui: Add a banner and message box to the dialog presented by CredUIPromptForCredentials .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: ce5b6c84109c66fbd12f5ee06140c055b8ac06a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5b6c84109c66fbd12f5ee06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 19:17:45 2007 +0100 credui: Add a banner and message box to the dialog presented by CredUIPromptForCredentials. --- dlls/credui/Makefile.in | 2 +- dlls/credui/banner.bmp | Bin 0 -> 9718 bytes dlls/credui/credui.rc | 3 ++ dlls/credui/credui_De.rc | 24 +++++++----- dlls/credui/credui_En.rc | 30 ++++++++++----- dlls/credui/credui_Ko.rc | 24 +++++++----- dlls/credui/credui_No.rc | 24 +++++++----- dlls/credui/credui_Pl.rc | 24 +++++++----- dlls/credui/credui_Sv.rc | 24 +++++++----- dlls/credui/credui_main.c | 76 ++++++++++++++++++++++++++++++---------- dlls/credui/credui_resources.h | 8 ++++- 11 files changed, 158 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce5b6c84109c66fbd12f5…

1 0

Dan Kegel : winmm: Avoid testing linecontrols if can't get line info.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 3d9b69f5a32ee0778fa337c6471fe4b8fda8c3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9b69f5a32ee0778fa337c64… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 25 11:46:32 2007 -0700 winmm: Avoid testing linecontrols if can't get line info. --- dlls/winmm/tests/mixer.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 0163537..2352be3 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -436,7 +436,8 @@ static void mixer_test_deviceA(int device) mmsys_error(rc)); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); - else if (rc==MMSYSERR_NOERROR && winetest_interactive) { + else if (rc==MMSYSERR_NOERROR) { + if (winetest_interactive) { trace(" %d: \"%s\" (%s) Destination=%d Source=%d\n", d,mixerlineA.szShortName, mixerlineA.szName, mixerlineA.dwDestination,mixerlineA.dwSource); @@ -456,9 +457,9 @@ static void mixer_test_deviceA(int device) mixerlineA.Target.vDriverVersion >> 8, mixerlineA.Target.vDriverVersion & 0xff, mixerlineA.Target.wMid, mixerlineA.Target.wPid); - } - ns=mixerlineA.cConnections; - for(s=0;s<ns;s++) { + } + ns=mixerlineA.cConnections; + for(s=0;s<ns;s++) { mixerlineA.cbStruct = sizeof(mixerlineA); mixerlineA.dwDestination=d; mixerlineA.dwSource=s; @@ -552,6 +553,7 @@ static void mixer_test_deviceA(int device) } } } + } } } rc=mixerClose(mix);

1 0

Jacek Caban : urlmon: Use QueryInterface in get_callback.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: fe04ba0aab7a20d91d7d02f2c7d58333b0b7488f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe04ba0aab7a20d91d7d02f2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 26 00:21:21 2007 +0200 urlmon: Use QueryInterface in get_callback. --- dlls/urlmon/binding.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index eb48bfa..ae58503 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1035,15 +1035,18 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) { + IUnknown *unk; HRESULT hres; static WCHAR wszBSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; - hres = IBindCtx_GetObjectParam(pbc, wszBSCBHolder, (IUnknown**)callback); - if(FAILED(hres)) - return MK_E_SYNTAX; + hres = IBindCtx_GetObjectParam(pbc, wszBSCBHolder, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)callback); + IUnknown_Release(unk); + } - return S_OK; + return SUCCEEDED(hres) ? S_OK : MK_E_SYNTAX; } static HRESULT get_protocol(Binding *This, LPCWSTR url)

1 0

Jacek Caban : mshtml: More IE7 test fixes.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 6f8bb3256e9a2c9f63c4b558abf1c530eb23f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8bb3256e9a2c9f63c4b558a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 26 01:06:33 2007 +0200 mshtml: More IE7 test fixes. --- dlls/mshtml/olecmd.c | 9 ++++++++- dlls/mshtml/tests/htmldoc.c | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index c56dce2..96cccae 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -401,6 +401,12 @@ static HRESULT exec_stop_download(HTMLDocument *This, DWORD nCmdexecopt, VARIANT return E_NOTIMPL; } +static HRESULT exec_find(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); + return E_NOTIMPL; +} + static HRESULT exec_delete(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); @@ -689,7 +695,8 @@ static const struct { { OLECMDF_SUPPORTED|OLECMDF_ENABLED, exec_stop }, /* OLECMDID_STOP */ {0},{0},{0},{0},{0},{0}, { OLECMDF_SUPPORTED, exec_stop_download }, /* OLECMDID_STOPDOWNLOAD */ - {0},{0}, + {0}, + { OLECMDF_SUPPORTED|OLECMDF_ENABLED, exec_find }, /* OLECMDID_FIND */ { OLECMDF_SUPPORTED, exec_delete }, /* OLECMDID_DELETE */ {0},{0}, { OLECMDF_SUPPORTED, exec_enable_interaction }, /* OLECMDID_ENABLE_INTERACTION */ diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index b3224a3..853047d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -114,6 +114,8 @@ DEFINE_EXPECT(OnChanged_READYSTATE); DEFINE_EXPECT(OnChanged_1005); DEFINE_EXPECT(GetDisplayName); DEFINE_EXPECT(BindToStorage); +DEFINE_EXPECT(IsSystemMoniker); +DEFINE_EXPECT(GetBindResult); DEFINE_EXPECT(Abort); DEFINE_EXPECT(Read); DEFINE_EXPECT(CreateInstance); @@ -213,7 +215,14 @@ static void test_timer(DWORD flags) static HRESULT WINAPI External_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -811,7 +820,7 @@ static HRESULT WINAPI Binding_GetPriority(IBinding *iface, LONG *pnPriority) static HRESULT WINAPI Binding_GetBindResult(IBinding *iface, CLSID *pclsidProtocol, DWORD *pdwResult, LPOLESTR *pszResult, DWORD *pdwReserved) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(GetBindResult); return E_NOTIMPL; } @@ -831,7 +840,8 @@ static IBinding Binding = { &BindingVtbl }; static HRESULT WINAPI Moniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + *ppv = NULL; + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1052,7 +1062,7 @@ static HRESULT WINAPI Moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI Moniker_IsSystemMoniker(IMoniker *iface, DWORD *pdwMksys) { - ok(0, "unexpected call\n"); + CHECK_EXPECT(IsSystemMoniker); return E_NOTIMPL; } @@ -2137,7 +2147,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID if(IsEqualGUID(&CGID_DocHostCmdPriv, pguidCmdGroup)) return E_FAIL; /* TODO */ - ok(0, "unexpected call\n"); + ok(0, "unexpected pguidCmdGroup: %s\n", debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; } @@ -2795,10 +2805,15 @@ static void test_OleCommandTarget(IUnknown *unk) for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %x\n", i, cmds[i].cmdID); + if(i+1 == OLECMDID_FIND) + continue; ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%x, expected %x\n", i+1, cmds[i].cmdf, expect_cmds[i+1]); } + ok(!cmds[OLECMDID_FIND-1].cmdf || cmds[OLECMDID_FIND-1].cmdf == (OLECMDF_SUPPORTED|OLECMDF_ENABLED), + "cmds[OLECMDID_FIND].cmdf=%x\n", cmds[OLECMDID_FIND-1].cmdf); + IOleCommandTarget_Release(cmdtrg); } @@ -3492,7 +3507,7 @@ static void test_external(IUnknown *unk, BOOL initialized) external = (void*)0xdeadbeef; hres = IHTMLWindow2_get_external(htmlwin, &external); if(initialized) { - ok(hres == S_FALSE, "get_external failed: %08x\n", hres); + ok(hres == S_FALSE || hres == S_OK, "get_external failed: %08x\n", hres); CHECK_CALLED(GetExternal); ok(external != NULL, "external == NULL\n"); }else {

1 0

Lionel Debroux : msvcrt/tests: Fix memory leak (found by Smatch).
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: efebe8b29bc2c984cf07e38c7048689120217a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=efebe8b29bc2c984cf07e38c7… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Fri Oct 26 11:15:26 2007 +0200 msvcrt/tests: Fix memory leak (found by Smatch). --- dlls/msvcrt/tests/string.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 6dabc61..66b018a 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -388,7 +388,7 @@ static void test_strdup(void) START_TEST(string) { - void *mem; + char mem[100]; static const char xilstring[]="c:/xilinx"; int nLen; @@ -401,13 +401,11 @@ START_TEST(string) /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ - mem = malloc(100); - ok(mem != NULL, "memory not allocated for size 0\n"); - strcpy((char*)mem,xilstring); + strcpy(mem,xilstring); nLen=strlen(xilstring); - pmemcpy((char*)mem+5, mem,nLen+1); - ok(pmemcmp((char*)mem+5,xilstring, nLen) == 0, - "Got result %s\n",(char*)mem+5); + pmemcpy(mem+5, mem,nLen+1); + ok(pmemcmp(mem+5,xilstring, nLen) == 0, + "Got result %s\n",mem+5); /* Test _swab function */ test_swab();

1 0

James Hawkins : msi: Use package_from_db instead of opening the package with MsiOpenPackage.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 4d2e148fb0d6bd9a07e4f474f2959cafd38fad69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2e148fb0d6bd9a07e4f474f… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:29:55 2007 -0500 msi: Use package_from_db instead of opening the package with MsiOpenPackage. --- dlls/msi/tests/db.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c620768..8e96d77 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2249,6 +2249,24 @@ static MSIHANDLE create_package_db(LPCSTR filename) return hdb; } +static MSIHANDLE package_from_db(MSIHANDLE hdb) +{ + UINT res; + CHAR szPackage[10]; + MSIHANDLE hPackage; + + sprintf(szPackage,"#%li",hdb); + res = MsiOpenPackage(szPackage,&hPackage); + if (res != ERROR_SUCCESS) + return 0; + + res = MsiCloseHandle(hdb); + if (res != ERROR_SUCCESS) + return 0; + + return hPackage; +} + static void test_try_transform(void) { MSIHANDLE hdb, hview, hrec, hpkg; @@ -2258,11 +2276,10 @@ static void test_try_transform(void) char buffer[MAX_PATH]; DeleteFile(msifile); - DeleteFile(msifile2); DeleteFile(mstfile); /* create the database */ - hdb = create_package_db(msifile2); + hdb = create_package_db(msifile); ok(hdb, "Failed to create package db\n"); query = "CREATE TABLE `MOO` ( `NOO` SHORT NOT NULL, `OOO` CHAR(255) PRIMARY KEY `NOO`)"; @@ -2315,7 +2332,7 @@ static void test_try_transform(void) else generate_transform_manual(); - r = MsiOpenDatabase(msifile2, MSIDBOPEN_DIRECT, &hdb ); + r = MsiOpenDatabase(msifile, MSIDBOPEN_DIRECT, &hdb ); ok( r == ERROR_SUCCESS , "Failed to create database\n" ); r = MsiDatabaseApplyTransform( hdb, mstfile, 0 ); @@ -2423,11 +2440,10 @@ static void test_try_transform(void) MsiCloseHandle(hrec); MsiCloseHandle(hview); - MsiCloseHandle(hdb); /* check that the property was added */ - r = MsiOpenPackage(msifile2, &hpkg); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + hpkg = package_from_db(hdb); + ok(hpkg != 0, "Expected non-NULL hpkg\n"); sz = MAX_PATH; r = MsiGetProperty(hpkg, "prop", buffer, &sz); @@ -2435,9 +2451,9 @@ static void test_try_transform(void) ok(!lstrcmp(buffer, "val"), "Expected val, got %s\n", buffer); MsiCloseHandle(hpkg); + MsiCloseHandle(hdb); DeleteFile(msifile); - DeleteFile(msifile2); DeleteFile(mstfile); }

1 0

Andrew Talbot : winhelp: Fix a memory leak.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: ac524986df2a207b563fc6ef296c89744b7163c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac524986df2a207b563fc6ef2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 25 20:07:47 2007 +0100 winhelp: Fix a memory leak. --- programs/winhelp/hlpfile.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 8882a1a..3c34a06 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -860,7 +860,7 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne HLPFILE_PARAGRAPH *paragraph, **paragraphptr; UINT textsize; BYTE *format, *format_end; - char *text, *text_end; + char *text, *text_base, *text_end; long size; unsigned short bits; unsigned nc, ncol = 1; @@ -874,7 +874,7 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne if (buf + 0x19 > end) {WINE_WARN("header too small\n"); return FALSE;}; size = GET_UINT(buf, 0x4); - text = HeapAlloc(GetProcessHeap(), 0, size); + text = text_base = HeapAlloc(GetProcessHeap(), 0, size); if (!text) return FALSE; if (hlpfile->hasPhrases) { @@ -1164,8 +1164,7 @@ static BOOL HLPFILE_AddParagraph(HLPFILE *hlpfile, BYTE *buf, BYTE *end, unsigne } } } - if (text_end != (char*)buf + GET_UINT(buf, 0x10) + size) - HeapFree(GetProcessHeap(), 0, text_end - size); + HeapFree(GetProcessHeap(), 0, text_base); return TRUE; }

1 0