May 2009 - Wine-Commits - list.winehq.org

Huw Davies : ole32: Add proxies and stubs for Read and Write.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: e8be59b8f83f86aa1db1f998ccd91d6fa54d59da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8be59b8f83f86aa1db1f998c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 17:14:29 2009 +0100 ole32: Add proxies and stubs for Read and Write. --- dlls/ole32/usrmarshal.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 07fd805..2669faa 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2297,8 +2297,15 @@ HRESULT CALLBACK ISequentialStream_Read_Proxy( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG read; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + + hr = ISequentialStream_RemoteRead_Proxy(This, pv, cb, &read); + if(pcbRead) *pcbRead = read; + + return hr; } HRESULT __RPC_STUB ISequentialStream_Read_Stub( @@ -2307,8 +2314,8 @@ HRESULT __RPC_STUB ISequentialStream_Read_Stub( ULONG cb, ULONG *pcbRead) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbRead); + return ISequentialStream_Read(This, pv, cb, pcbRead); } HRESULT CALLBACK ISequentialStream_Write_Proxy( @@ -2317,8 +2324,15 @@ HRESULT CALLBACK ISequentialStream_Write_Proxy( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG written; + HRESULT hr; + + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + + hr = ISequentialStream_RemoteWrite_Proxy(This, pv, cb, &written); + if(pcbWritten) *pcbWritten = written; + + return hr; } HRESULT __RPC_STUB ISequentialStream_Write_Stub( @@ -2327,8 +2341,8 @@ HRESULT __RPC_STUB ISequentialStream_Write_Stub( ULONG cb, ULONG *pcbWritten) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %d, %p)\n", This, pv, cb, pcbWritten); + return ISequentialStream_Write(This, pv, cb, pcbWritten); } HRESULT CALLBACK IStream_Seek_Proxy(

1 0

Jacek Caban : urlmon: Added BINDSTATUS_LOADINGMIMEHANDLER and BINDSTATUS_LOADINGMIMEHANDLER support to Binding object .
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 1912f0f4fdcb71c193054b6588b8bca54da953e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1912f0f4fdcb71c193054b658… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 03:06:08 2009 +0200 urlmon: Added BINDSTATUS_LOADINGMIMEHANDLER and BINDSTATUS_LOADINGMIMEHANDLER support to Binding object. --- dlls/urlmon/binding.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 2c6af73..d8e3e63 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -984,6 +984,12 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink heap_free(This->stgmed_buf->cache_file); This->stgmed_buf->cache_file = heap_strdupW(szStatusText); break; + case BINDSTATUS_DECODING: + IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_DECODING, szStatusText); + break; + case BINDSTATUS_LOADINGMIMEHANDLER: + on_progress(This, 0, 0, BINDSTATUS_LOADINGMIMEHANDLER, szStatusText); + break; case BINDSTATUS_DIRECTBIND: /* FIXME: Handle BINDSTATUS_DIRECTBIND in BindProtocol */ This->report_mime = FALSE; break;

1 0

Detlef Riekenberg : wininet/tests: Remove a duplicate test.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: c4e601832026e4705a95554371da39b5da33ead9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e601832026e4705a9555437… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri May 15 19:49:36 2009 +0200 wininet/tests: Remove a duplicate test. --- dlls/wininet/tests/urlcache.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index b7df03e..a87d9bd 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -242,9 +242,6 @@ static void test_GetDiskInfoA(void) ret = GetDiskInfoA(path, NULL, NULL, NULL); ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); - ret = GetDiskInfoA(path, NULL, NULL, NULL); - ok(ret, "GetDiskInfoA failed %u\n", GetLastError()); - SetLastError(0xdeadbeef); strcpy(p, "\\non\\existing\\path"); ret = GetDiskInfoA(path, NULL, NULL, NULL);

1 0

Jacek Caban : urlmon: Added GetBindString(BINDSTRING_URL) implementation.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 5b72526052c333744c9d08a10b240117f6c88fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b72526052c333744c9d08a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 03:05:39 2009 +0200 urlmon: Added GetBindString(BINDSTRING_URL) implementation. --- dlls/urlmon/binding.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 3ff4683..2c6af73 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1172,6 +1172,17 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, return hres; } + case BINDSTRING_URL: { + DWORD size = (strlenW(This->url)+1) * sizeof(WCHAR); + + if(!ppwzStr || !pcElFetched) + return E_INVALIDARG; + + *ppwzStr = CoTaskMemAlloc(size); + memcpy(*ppwzStr, This->url, size); + *pcElFetched = 1; + return S_OK; + } } FIXME("not supported string type %d\n", ulStringType);

1 0

Vitaliy Margolen : dxdiagn: DirectShowFilters should go under numbered sub-containers.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 806ea86be2f2f1bbea09d39b242816624bef2b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806ea86be2f2f1bbea09d39b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:22 2009 -0600 dxdiagn: DirectShowFilters should go under numbered sub-containers. --- dlls/dxdiagn/provider.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index a6d1066..d3f0a26 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -613,9 +613,11 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; - /*static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};*/ static const WCHAR szVersionFormat[] = {'v','%','d',0}; + static const WCHAR szIdFormat[] = {'%','d',0}; + int i = 0; + ICreateDevEnum* pCreateDevEnum = NULL; IEnumMoniker* pEmCat = NULL; @@ -676,28 +678,37 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD dwNOutputs = 0; DWORD dwNInputs = 0; WCHAR bufferW[10]; + IDxDiagContainer *pDShowSubCont = NULL; - add_prop_str(pSubCont, szCatName, wszCatName); - add_prop_str(pSubCont, ClsidCatW, wszCatClsid); + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + if (FAILED(DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDShowSubCont)) || + FAILED(IDxDiagContainerImpl_AddChildContainer(pSubCont, bufferW, pDShowSubCont))) + { + IPropertyBag_Release(pPropFilterBag); + if (pDShowSubCont) IUnknown_Release(pDShowSubCont); + continue; + } hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); + hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, szName, &v); TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); VariantClear(&v); hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, ClsidFilterW, &v); + hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, ClsidFilterW, &v); VariantClear(&v); + add_prop_str(pDShowSubCont, szCatName, wszCatName); + add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); + hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); prrf = (struct REG_RF*) pData; pCurrent = pData; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); - add_prop_str(pSubCont, szVersionW, bufferW); - add_prop_ui4(pSubCont, dwMerit, prrf->dwMerit); + add_prop_str(pDShowSubCont, szVersionW, bufferW); pCurrent += sizeof(struct REG_RF); for (it = 0; it < prrf->dwPins; ++it) { @@ -721,11 +732,13 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu } } - add_prop_ui4(pSubCont, dwInputs, dwNInputs); - add_prop_ui4(pSubCont, dwOutputs, dwNOutputs); + add_prop_ui4(pDShowSubCont, dwInputs, dwNInputs); + add_prop_ui4(pDShowSubCont, dwOutputs, dwNOutputs); + add_prop_ui4(pDShowSubCont, dwMerit, prrf->dwMerit); SafeArrayUnaccessData(V_UNION(&v, parray)); VariantClear(&v); + i++; } IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL; }

1 0

Vitaliy Margolen : dxdiagn: Correct version format property.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 136dc1fcaa3d8af2d84331fa9f830bb909154e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=136dc1fcaa3d8af2d84331fa9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:20 2009 -0600 dxdiagn: Correct version format property. --- dlls/dxdiagn/provider.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 86f9c6b..a6d1066 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -597,6 +597,7 @@ struct REG_TYPE { static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; + static const WCHAR szVersionW[] = {'s','z','V','e','r','s','i','o','n',0}; static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; @@ -614,6 +615,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; /*static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};*/ + static const WCHAR szVersionFormat[] = {'v','%','d',0}; + ICreateDevEnum* pCreateDevEnum = NULL; IEnumMoniker* pEmCat = NULL; IMoniker* pMCat = NULL; @@ -672,6 +675,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD it; DWORD dwNOutputs = 0; DWORD dwNInputs = 0; + WCHAR bufferW[10]; add_prop_str(pSubCont, szCatName, wszCatName); add_prop_str(pSubCont, ClsidCatW, wszCatClsid); @@ -691,7 +695,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu prrf = (struct REG_RF*) pData; pCurrent = pData; - add_prop_ui4(pSubCont, szName, prrf->dwVersion); + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); + add_prop_str(pSubCont, szVersionW, bufferW); add_prop_ui4(pSubCont, dwMerit, prrf->dwMerit); pCurrent += sizeof(struct REG_RF);

1 0

Aurimas Fišeras : notepad: Update Lithuanian translation.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 9f1daabd63200119c52bee32ae5d4b9f2b4765c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1daabd63200119c52bee32a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun May 17 19:20:55 2009 +0300 notepad: Update Lithuanian translation. --- programs/notepad/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 741c22a..ce289f2 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -54,6 +54,7 @@ POPUP "&Taisa" { POPUP "&Paieška" { MENUITEM "&Ieškoti...\tCtrl+F", CMD_SEARCH MENUITEM "Ieškoti k&ito\tF3", CMD_SEARCH_NEXT + MENUITEM "Pa&keisti...\tCtrl+H", CMD_REPLACE } POPUP "&Žinynas" { MENUITEM "&Turinys", CMD_HELP_CONTENTS

1 0

Francois Gouget : dplayx: cbDelete{Groups, Player}Elem() are unused so remove them.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 7422611cc9289ea21e3246150bda4fca10a0083c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7422611cc9289ea21e3246150… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:27:31 2009 +0200 dplayx: cbDelete{Groups,Player}Elem() are unused so remove them. --- dlls/dplayx/dplay.c | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1d57dba..0c33bb3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -338,33 +338,6 @@ DPQ_DECL_DELETECB( cbDeleteElemFromHeap, LPVOID ) HeapFree( GetProcessHeap(), 0, elem ); } -/* Function to delete the list of groups with this interface. Needs to - * delete the group and player lists associated with this group as well - * as the group data associated with this group. It should not delete - * player data as that is shared with the top player list and will be - * deleted with that. - */ -DPQ_DECL_DELETECB( cbDeleteGroupsElem, lpGroupList ); -DPQ_DECL_DELETECB( cbDeleteGroupsElem, lpGroupList ) -{ - DPQ_DELETEQ( elem->lpGData->groups, groups, - lpGroupList, cbDeleteElemFromHeap ); - DPQ_DELETEQ( elem->lpGData->players, players, - lpPlayerList, cbDeleteElemFromHeap ); - HeapFree( GetProcessHeap(), 0, elem->lpGData ); - HeapFree( GetProcessHeap(), 0, elem ); -} - -/* Function to delete the list of players with this interface. Needs to - * delete the player data for all players as well. - */ -DPQ_DECL_DELETECB( cbDeletePlayerElem, lpPlayerList ); -DPQ_DECL_DELETECB( cbDeletePlayerElem, lpPlayerList ) -{ - HeapFree( GetProcessHeap(), 0, elem->lpPData ); - HeapFree( GetProcessHeap(), 0, elem ); -} - static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) { IDirectPlay2AImpl *This = lpDP; @@ -404,11 +377,6 @@ static BOOL DP_DestroyDirectPlay2( LPVOID lpDP ) FreeLibrary( This->dp2->hDPLobbyProvider ); } -#if 0 - DPQ_DELETEQ( This->dp2->players, players, lpPlayerList, cbDeletePlayerElem ); - DPQ_DELETEQ( This->dp2->groups, groups, lpGroupList, cbDeleteGroupsElem ); -#endif - /* FIXME: Need to delete receive and send msgs queue contents */ NS_DeleteSessionCache( This->dp2->lpNameServerData );

1 0

Francois Gouget : winapi_test: Simplify the code that builds the list of headers to process.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: d537476894471dbae75044e8fc5d997f02806950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d537476894471dbae75044e8f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:26:16 2009 +0200 winapi_test: Simplify the code that builds the list of headers to process. --- tools/winapi/winapi_test | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 99a7276..cf3a2b6 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -47,32 +47,23 @@ if ($options->pack) { push @tests, "pack"; } -my @files = (); +my @files; { my %files; - my %test_dirs; - foreach my $test (@tests) { - my @test_dirs = $tests->get_test_dirs($test); - foreach my $test_dir (@test_dirs) { - my @headers = $tests->get_section($test_dir, $test, "header"); - foreach my $header (@headers) { - $files{"include/$header"} = 1; - } - } - } - - foreach my $test (@tests) { - my @test_dirs = $tests->get_test_dirs($test); - foreach my $test_dir (@test_dirs) { - my @headers = $tests->get_section($test_dir, $test, "header"); - foreach my $header (@headers) { - if($files{"include/$header"}) { + foreach my $test (@tests) + { + foreach my $test_dir ($tests->get_test_dirs($test)) + { + foreach my $header ($tests->get_section($test_dir, $test, "header")) + { + if (!$files{$header}) + { push @files, "include/$header"; - $files{"include/$header"} = 0; - } - } - } + $files{$header} = 1; + } + } + } } }

1 0

Michael Stefaniuc : msctf: Allocate memory only right before it's needed.
by Alexandre Julliard May 18, 2009

May 18, 2009

Module: wine Branch: master Commit: 850f6c796569e90907845eaabba19e07136baecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=850f6c796569e90907845eaab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 16 21:43:06 2009 +0200 msctf: Allocate memory only right before it's needed. Fixes a memory leak on an error path. Found by Smatch. --- dlls/msctf/msctf.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 55a8075..675e4d5 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -358,14 +358,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); if (!actsvr) return E_OUTOFMEMORY; - entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); - - if (!entry) - { - HeapFree(GetProcessHeap(),0,actsvr); - return E_OUTOFMEMORY; - } - ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); ITfClientId_Release(clientid); @@ -404,6 +396,14 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) if (activated > 0) activate_given_ts(actsvr, tm); + entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); + + if (!entry) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + entry->ats = actsvr; list_add_head(&AtsList, &entry->entry);

1 0