December 2007 - Wine-commits

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgA: Swap margins when changing orientation.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 74d99ac3ac913d3aa4d7d8e44bfbbc10ad6dd897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d99ac3ac913d3aa4d7d8e44… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 8 14:16:41 2007 +0100 comdlg32: PageSetupDlgA: Swap margins when changing orientation. --- dlls/comdlg32/printdlg.c | 35 ++++++++++++++++++++++------------- 1 files changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5baa90e..dcea25e 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2791,21 +2791,30 @@ PRINTDLG_PS_WMCommandA( } return TRUE; case rad1: - if (pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } - PRINTDLG_PS_ChangePaperPrev(pda); - break; case rad2: - if (pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x){ - DWORD tmp = pda->curdlg.ptPaperSize.x; - pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; - pda->curdlg.ptPaperSize.y = tmp; - } + if((id == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (id == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + char TmpText[25]; + char TmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.x; + + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + + GetDlgItemTextA(hDlg, edt4, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt5, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt5, TmpText); + SetDlgItemTextA(hDlg, edt4, TmpText2); + + GetDlgItemTextA(hDlg, edt6, TmpText, sizeof(TmpText)); + GetDlgItemTextA(hDlg, edt7, TmpText2, sizeof(TmpText2)); + SetDlgItemTextA(hDlg, edt7, TmpText); + SetDlgItemTextA(hDlg, edt6, TmpText2); + PRINTDLG_PS_ChangePaperPrev(pda); - break; + } + break; case cmb1: /* Printer combo */ if(msg == CBN_SELCHANGE){ char crPrinterName[256];

1 0

Alexander Nicolaysen Sørnes : comdlg32: PageSetupDlgW: Swap margins when changing orientation.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 507aeb6855a6e2be5730d924d602bc3ff3a74fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507aeb6855a6e2be5730d924d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 9 18:15:36 2007 +0100 comdlg32: PageSetupDlgW: Swap margins when changing orientation. --- dlls/comdlg32/printdlg.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index dcea25e..dd290d5 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2340,6 +2340,7 @@ typedef struct { typedef struct { LPPAGESETUPDLGW dlga; PRINTDLGW pdlg; + PAGESETUPDLGW curdlg; /* Current dialog state */ } PageSetupDataW; @@ -2930,6 +2931,30 @@ PRINTDLG_PS_WMCommandW( EndDialog(hDlg, FALSE); return FALSE ; + case rad1: + case rad2: + if((LOWORD(wParam) == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) || + (LOWORD(wParam) == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)) + { + WCHAR tmpText[25]; + WCHAR tmpText2[25]; + DWORD tmp = pda->curdlg.ptPaperSize.y; + + pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = tmp; + + GetDlgItemTextW(hDlg, edt4, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt5, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt5, tmpText); + SetDlgItemTextW(hDlg, edt4, tmpText2); + + GetDlgItemTextW(hDlg, edt6, tmpText, sizeof(tmpText)/sizeof(WCHAR)); + GetDlgItemTextW(hDlg, edt7, tmpText2, sizeof(tmpText2)/sizeof(WCHAR)); + SetDlgItemTextW(hDlg, edt7, tmpText); + SetDlgItemTextW(hDlg, edt6, tmpText2); + } + break; + case psh3: { pda->pdlg.Flags = 0; pda->pdlg.hwndOwner = hDlg; @@ -3283,6 +3308,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg==WM_INITDIALOG) { res = TRUE; pda = (PageSetupDataW*)lParam; + memcpy(&pda->curdlg, pda, sizeof(pda->curdlg)); SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); @@ -3304,15 +3330,31 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } + PRINTDLG_PS_ChangePrinterW(hDlg,pda); + if(pda->dlga->hDevMode) { + WCHAR PaperName[64]; + dm = GlobalLock(pda->dlga->hDevMode); /* Landscape orientation */ if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); else /* this is default if papersize is not set */ CheckRadioButton(hDlg, rad1, rad2, rad1); + + GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR)); + PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize); + pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x); + pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y); GlobalUnlock(pda->dlga->hDevMode); + + if(IsDlgButtonChecked(hDlg, rad2)) + { + DWORD tmp = pda->curdlg.ptPaperSize.x; + pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y; + pda->curdlg.ptPaperSize.y = tmp; + } } if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { @@ -3340,7 +3382,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) SetDlgItemTextW(hDlg,edt6,str); SetDlgItemTextW(hDlg,edt7,str); } - PRINTDLG_PS_ChangePrinterW(hDlg,pda); + if (pda->dlga->Flags & PSD_DISABLEPAPER) { EnableWindow(GetDlgItem(hDlg,cmb2),FALSE); EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);

1 0

Michael Stefaniuc : crypt32: Do not use an empty body in an else-statement as documentation.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 3e005ce91516f6a548a871cc735fef2b813f9b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e005ce91516f6a548a871cc7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 11:47:36 2007 +0100 crypt32: Do not use an empty body in an else-statement as documentation. --- dlls/crypt32/chain.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5724541..65ca674 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -523,8 +523,8 @@ static BOOL dns_name_matches(LPCWSTR constraint, LPCWSTR name, else if (lstrlenW(name) >= lstrlenW(constraint)) match = !lstrcmpiW(name + lstrlenW(name) - lstrlenW(constraint), constraint); - else - ; /* name is too short, no match */ + /* else: name is too short, no match */ + return match; } @@ -550,8 +550,8 @@ static BOOL ip_address_matches(const CRYPT_DATA_BLOB *constraint, */ match = (subnet & mask) == (addr & mask); } - else - ; /* name is wrong size, no match */ + /* else: name is wrong size, no match */ + return match; }

1 0

Alexander Dorofeyev : wined3d: Improve thread safety in IWineD3DSurfaceImpl_BltOverride.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 1dbc9d50c9737081196dec6829414229c88aa69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbc9d50c9737081196dec682… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Dec 10 03:39:51 2007 -0800 wined3d: Improve thread safety in IWineD3DSurfaceImpl_BltOverride. --- dlls/wined3d/surface.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b8a97d5..692b506 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3236,6 +3236,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * return WINED3DERR_INVALIDCALL; } + ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + TRACE("Calling GetSwapChain with mydevice = %p\n", myDevice); if(dstSwapchain && dstSwapchain->backBuffer && This == (IWineD3DSurfaceImpl*) dstSwapchain->backBuffer[0]) { glDrawBuffer(GL_BACK); @@ -3247,6 +3250,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glDrawBuffer(myDevice->offscreenBuffer); checkGLcall("glDrawBuffer(myDevice->offscreenBuffer3)"); } else { + LEAVE_GL(); TRACE("Surface is higher back buffer, falling back to software\n"); return WINED3DERR_INVALIDCALL; } @@ -3268,6 +3272,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glDrawBuffer(GL_BACK); } vcheckGLcall("glDrawBuffer"); + LEAVE_GL(); return WINED3D_OK; }

1 0

Alexandre Julliard : Make.rules: Added rules for building the dlldata. c file.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: b0585bf10fe02324ea2b3ff3af55115550cb1b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0585bf10fe02324ea2b3ff3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 14:26:13 2007 +0100 Make.rules: Added rules for building the dlldata.c file. --- .gitignore | 1 + Make.rules.in | 7 ++++++- tools/make_makefiles | 1 + tools/widl/widl.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 58fc2ab..cb7dc40 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ /tags /wine Makefile +dlldata.c dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules diff --git a/Make.rules.in b/Make.rules.in index 757fff5..24d34db 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -114,7 +114,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) \ +CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) @@ -193,6 +193,11 @@ filter: dummy .PHONY: all filter +# Rules for IDL files + +dlldata.c: $(WIDL) Makefile.in + $(WIDL) $(IDLFLAGS) --dlldata-only --dlldata=$@ $(IDL_P_SRCS) + # Rules for resources $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(IDL_TLB_SRCS:.idl=.tlb) diff --git a/tools/make_makefiles b/tools/make_makefiles index 847a45e..c988d74 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -77,6 +77,7 @@ my @ignores = ( "/TAGS", "/tags", "Makefile", + "dlldata.c", "include/config.h", "include/stamp-h" ); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0dcc069..7945694 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -225,7 +225,7 @@ typedef struct static void add_filename_node(struct list *list, const char *name) { filename_node_t *node = xmalloc(sizeof *node); - node->filename = xstrdup(name); + node->filename = dup_basename( name, ".idl" ); list_add_tail(list, &node->link); }

1 0

Alexandre Julliard : makedep: Added support for dlldata.c dependencies.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: b9966054cf9dccd030acf84ff2e79a492a8b5a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9966054cf9dccd030acf84ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 14:26:25 2007 +0100 makedep: Added support for dlldata.c dependencies. --- tools/makedep.c | 48 ++++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 20 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e96cdf6..2a8c14d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -242,24 +242,6 @@ static INCL_FILE *find_src_file( const char *name ) } /******************************************************************* - * add_src_file - * - * Add a source file to the list. - */ -static INCL_FILE *add_src_file( const char *name ) -{ - INCL_FILE *file; - - if (find_src_file( name )) return NULL; /* we already have it */ - file = xmalloc( sizeof(*file) ); - memset( file, 0, sizeof(*file) ); - file->name = xstrdup(name); - list_add_tail( &sources, &file->entry ); - return file; -} - - -/******************************************************************* * add_include * * Add an include file if it doesn't already exists. @@ -717,6 +699,11 @@ static void parse_generated_idl( INCL_FILE *source ) { add_include( source, header, 0, 0 ); } + else if (!strcmp( source->name, "dlldata.c" )) + { + add_include( source, "objbase.h", 0, 1 ); + add_include( source, "rpcproxy.h", 0, 1 ); + } free( header ); free( basename ); @@ -733,7 +720,8 @@ static void parse_file( INCL_FILE *pFile, int src ) if (strendswith( pFile->name, "_c.c" ) || strendswith( pFile->name, "_i.c" ) || strendswith( pFile->name, "_p.c" ) || - strendswith( pFile->name, "_s.c" )) + strendswith( pFile->name, "_s.c" ) || + !strcmp( pFile->name, "dlldata.c" )) { parse_generated_idl( pFile ); return; @@ -758,6 +746,25 @@ static void parse_file( INCL_FILE *pFile, int src ) /******************************************************************* + * add_src_file + * + * Add a source file to the list. + */ +static INCL_FILE *add_src_file( const char *name ) +{ + INCL_FILE *file; + + if (find_src_file( name )) return NULL; /* we already have it */ + file = xmalloc( sizeof(*file) ); + memset( file, 0, sizeof(*file) ); + file->name = xstrdup(name); + list_add_tail( &sources, &file->entry ); + parse_file( file, 1 ); + return file; +} + + +/******************************************************************* * output_include */ static void output_include( FILE *file, INCL_FILE *pFile, @@ -954,7 +961,8 @@ int main( int argc, char *argv[] ) for (i = 1; i < argc; i++) { - if ((pFile = add_src_file( argv[i] ))) parse_file( pFile, 1 ); + add_src_file( argv[i] ); + if (strendswith( argv[i], "_p.c" )) add_src_file( "dlldata.c" ); } LIST_FOR_EACH_ENTRY( pFile, &includes, INCL_FILE, entry ) parse_file( pFile, 0 ); output_dependencies();

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leaks.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: e3bfe193ca6a76b8a403191bbffed3552dc2610d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bfe193ca6a76b8a403191bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 9 20:50:39 2007 +1100 msxml3: Fix memory leaks. --- dlls/msxml3/tests/domdoc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index dd48824..d7afb19 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -568,6 +568,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_baseName( element, &str ); ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szlc) == 0, "basename was wrong\n"); + SysFreeString(str); /* check if nodename is correct */ r = IXMLDOMElement_get_nodeName( element, NULL ); @@ -1606,6 +1607,7 @@ static void test_cloneNode(void ) IXMLDOMNode *node_clone; HRESULT r; BSTR str; + static const WCHAR szSearch[] = { 'l', 'c', '/', 'p', 'r', 0 }; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); if( r != S_OK ) @@ -1619,9 +1621,11 @@ static void test_cloneNode(void ) if(!b) return; - r = IXMLDOMNode_selectSingleNode(doc, _bstr_("lc/pr"), &node); + str = SysAllocString( szSearch); + r = IXMLDOMNode_selectSingleNode(doc, str, &node); ok( r == S_OK, "ret %08x\n", r ); ok( node != NULL, "node %p\n", node ); + SysFreeString(str); if(!node) {

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 3fcc0cae51405d7ef55e40e3db42fb3d6e603582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fcc0cae51405d7ef55e40e3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 10 13:05:16 2007 +1100 msxml3: Fix memory leak. --- dlls/msxml3/tests/xmlelem.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index aee3bfb..61a2300 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -431,6 +431,7 @@ static void test_xmlelem_collection(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); ok(child == NULL, "Expected NULL child\n"); + IEnumVARIANT_Release(enumVar); IXMLElement_Release(element); IXMLElementCollection_Release(collection); IXMLDocument_Release(doc);

1 0

Alistair Leslie-Hughes : shdocvw: Fix memory leak.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 5c3dc64a874ff9dfb7a091053b815be60eb832ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3dc64a874ff9dfb7a091053… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 10 14:27:46 2007 +1100 shdocvw: Fix memory leak. --- dlls/shdocvw/tests/webbrowser.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 8e457fc..dacd6fd 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1405,6 +1405,7 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(SetStatusText); CHECK_CALLED(EnableModeless_TRUE); + VariantClear(&url); IWebBrowser2_Release(webbrowser); }

1 0

Alistair Leslie-Hughes : urlmon: Fix memory leaks.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 7f033ea06594f9b56d18308d034b9437c000e2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f033ea06594f9b56d18308d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 10 14:28:12 2007 +1100 urlmon: Fix memory leaks. --- dlls/urlmon/tests/misc.c | 1 + dlls/urlmon/tests/url.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 9f33f73..863e8a7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -608,6 +608,7 @@ static void test_FindMimeFromData(void) ok(!lstrcmpW(mime, mimeTextHtml), "[%d] wrong mime\n", i); else ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + CoTaskMemFree(mime); hres = FindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, mimeImagePjpeg, 0, &mime, 0); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cd8432d..935e92b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1496,6 +1496,7 @@ static void test_BindToStorage(int protocol, BOOL emul) hres = IMoniker_GetDisplayName(mon, bctx, NULL, &display_name); ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); + CoTaskMemFree(display_name); SET_EXPECT(GetBindInfo); SET_EXPECT(QueryInterface_IInternetProtocol);

1 0