October 2006 - Wine-commits

Louis. Lenders : shlwapi: Update info in DllGetVersion.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 8b4c7327d4f39439f19d798cb8a2f29089938253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4c7327d4f39439f19d798cb… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 6 16:53:48 2006 +0100 shlwapi: Update info in DllGetVersion. --- dlls/shlwapi/shlwapi_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 5102957..504a5dc 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -115,13 +115,13 @@ HRESULT WINAPI DllGetVersion (DLLVERSION { case sizeof(DLLVERSIONINFO2): pdvi2->dwFlags = 0; - pdvi2->ullVersion = MAKEDLLVERULL(5, 0, 2314, 0); + pdvi2->ullVersion = MAKEDLLVERULL(6, 0, 2800, 1612); /* Fall through */ case sizeof(DLLVERSIONINFO): - pdvi2->info1.dwMajorVersion = 5; + pdvi2->info1.dwMajorVersion = 6; pdvi2->info1.dwMinorVersion = 0; - pdvi2->info1.dwBuildNumber = 2314; - pdvi2->info1.dwPlatformID = 1000; + pdvi2->info1.dwBuildNumber = 2800; + pdvi2->info1.dwPlatformID = DLLVER_PLATFORM_WINDOWS; return S_OK; } if (pdvi)

1 0

Mike McCormack : d3d8: Don't crash if d3d8 can't be loaded.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 7d0f8a32e242d50c927886e4cce7b79ab16266ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0f8a32e242d50c927886e4c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Oct 7 00:49:03 2006 +0900 d3d8: Don't crash if d3d8 can't be loaded. --- dlls/d3d8/tests/d3d8_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c index 48d2436..f70b6d8 100644 --- a/dlls/d3d8/tests/d3d8_main.c +++ b/dlls/d3d8/tests/d3d8_main.c @@ -106,6 +106,8 @@ static void test_ValidatePixelShader(voi START_TEST(d3d8_main) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + if (!d3d8_handle) + return; ValidateVertexShader = (void*)GetProcAddress (d3d8_handle, "ValidateVertexShader" ); ValidatePixelShader = (void*)GetProcAddress (d3d8_handle, "ValidatePixelShader" ); test_ValidateVertexShader();

1 0

James Hawkins : shdocvw: Return S_OK in PersistStorage_InitNew.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: e55ed113faee6c3d52cdd5043069f041c34c7bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55ed113faee6c3d52cdd5043… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 18:11:46 2006 -0700 shdocvw: Return S_OK in PersistStorage_InitNew. --- dlls/shdocvw/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index 04afb42..b4fecbb 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -67,7 +67,7 @@ static HRESULT WINAPI PersistStorage_Ini { WebBrowser *This = PERSTORAGE_THIS(iface); FIXME("(%p)->(%p)\n", This, pStg); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI PersistStorage_Load(IPersistStorage *iface, LPSTORAGE pStg)

1 0

James Hawkins : janitorial: Remove redundant NULL checks before SHFree.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 7b89ff88e85a95f1e16420d25654887c71adcc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b89ff88e85a95f1e16420d25… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 18:06:26 2006 -0700 janitorial: Remove redundant NULL checks before SHFree. --- dlls/shell32/brsfolder.c | 4 +--- dlls/shell32/changenotify.c | 4 ++-- dlls/shell32/cpanelfolder.c | 3 +-- dlls/shell32/dataobject.c | 5 +---- dlls/shell32/pidl.c | 13 ++++--------- dlls/shell32/shell.c | 8 ++++---- dlls/shell32/shell32_main.c | 3 +-- dlls/shell32/shfldr_desktop.c | 6 ++---- dlls/shell32/shfldr_fs.c | 16 +++++----------- dlls/shell32/shfldr_mycomp.c | 3 +-- dlls/shell32/shlexec.c | 14 +++++++------- dlls/shell32/shlmenu.c | 11 +++-------- dlls/shell32/shlview.c | 8 ++------ dlls/shell32/shv_item_cmenu.c | 3 +-- dlls/shell32/trash.c | 3 +-- 15 files changed, 36 insertions(+), 68 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 30ee718..aa53ff0 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -354,9 +354,7 @@ static void FillTreeView( browse_info *i done: ReleaseCapture(); SetCursor(LoadCursorW(0, (LPWSTR)IDC_ARROW)); - - if (pidlTemp) - SHFree(pidlTemp); + SHFree(pidlTemp); } static inline BOOL PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 3f3b612..e257aa2 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -402,8 +402,8 @@ void WINAPI SHChangeNotify(LONG wEventId /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) { - if (Pidls[0]) SHFree((LPITEMIDLIST)Pidls[0]); - if (Pidls[1]) SHFree((LPITEMIDLIST)Pidls[1]); + SHFree((LPITEMIDLIST)Pidls[0]); + SHFree((LPITEMIDLIST)Pidls[1]); } } diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7767b8d..7601e8d 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -203,8 +203,7 @@ static ULONG WINAPI ISF_ControlPanel_fnR if (!refCount) { TRACE("-- destroying IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree(This->pidlRoot); + SHFree(This->pidlRoot); LocalFree((HLOCAL) This); } return refCount; diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 0dcd9b4..1d9c2c3 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -97,10 +97,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRel if (!refCount) { TRACE(" destroying IEnumFORMATETC(%p)\n",This); - if (This->pFmt) - { - SHFree (This->pFmt); - } + SHFree (This->pFmt); HeapFree(GetProcessHeap(),0,This); return 0; } diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 10d87bb..b5a59af 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -291,11 +291,8 @@ HRESULT WINAPI ILLoadFromStream (IStream TRACE_(shell)("%p %p\n", pStream , ppPidl); - if (*ppPidl) - { - SHFree(*ppPidl); - *ppPidl = NULL; - } + SHFree(*ppPidl); + *ppPidl = NULL; IStream_AddRef (pStream); @@ -865,8 +862,7 @@ LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIS if (_ILIsDesktop(pidl)) { idlRet = ILClone(item); - if (pidl) - SHFree (pidl); + SHFree (pidl); return idlRet; } @@ -896,8 +892,7 @@ LPITEMIDLIST WINAPI ILAppend(LPITEMIDLIS void WINAPI ILFree(LPITEMIDLIST pidl) { TRACE("(pidl=%p)\n",pidl); - if (pidl) - SHFree(pidl); + SHFree(pidl); } /************************************************************************* diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 533ccdb..eaa1974 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -628,10 +628,10 @@ HINSTANCE16 WINAPI ShellExecute16( HWND1 SHELL_execute( &seiW, SHELL_Execute16 ); - if (wVerb) SHFree(wVerb); - if (wFile) SHFree(wFile); - if (wParameters) SHFree(wParameters); - if (wDirectory) SHFree(wDirectory); + SHFree(wVerb); + SHFree(wFile); + SHFree(wParameters); + SHFree(wDirectory); return HINSTANCE_16(seiW.hInstApp); } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 5c6dc61..641e263 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -614,8 +614,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR if (hr != S_OK) ret = FALSE; - if (pidlLast) - SHFree(pidlLast); + SHFree(pidlLast); #ifdef MORE_DEBUG TRACE ("icon=%p index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n", diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 3d717d9..f2be4be 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -137,10 +137,8 @@ static ULONG WINAPI ISF_Desktop_fnReleas if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree (This->pidlRoot); - if (This->sPathTarget) - SHFree (This->sPathTarget); + SHFree (This->pidlRoot); + SHFree (This->sPathTarget); LocalFree ((HLOCAL) This); return 0; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 8bd6eaf..3c05e71 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -194,10 +194,8 @@ static ULONG WINAPI IUnknown_fnRelease ( if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree (This->pidlRoot); - if (This->sPathTarget) - SHFree (This->sPathTarget); + SHFree (This->pidlRoot); + SHFree (This->sPathTarget); LocalFree ((HLOCAL) This); } return refCount; @@ -1380,15 +1378,11 @@ IFSFldr_PersistFolder3_Initialize (IPers TRACE ("(%p)->(%p)\n", This, pidl); - if (This->pidlRoot) - SHFree (This->pidlRoot); /* free the old pidl */ + SHFree (This->pidlRoot); /* free the old pidl */ This->pidlRoot = ILClone (pidl); /* set my pidl */ - if (This->sPathTarget) - { - SHFree (This->sPathTarget); - This->sPathTarget = NULL; - } + SHFree (This->sPathTarget); + This->sPathTarget = NULL; /* set my path */ if (SHGetPathFromIDListW (pidl, wszTemp)) { diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index c9a5c07..c842c7e 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -186,8 +186,7 @@ static ULONG WINAPI ISF_MyComputer_fnRel if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); - if (This->pidlRoot) - SHFree (This->pidlRoot); + SHFree (This->pidlRoot); LocalFree ((HLOCAL) This); } return refCount; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 6ca0b19..f5704c3 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -882,8 +882,8 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR retval = FindExecutableW(wFile, wDirectory, wResult); WideCharToMultiByte(CP_ACP, 0, wResult, -1, lpResult, MAX_PATH, NULL, NULL); - if (wFile) SHFree( wFile ); - if (wDirectory) SHFree( wDirectory ); + SHFree( wFile ); + SHFree( wDirectory ); TRACE("returning %s\n", lpResult); return retval; @@ -1580,11 +1580,11 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXEC if (sei->fMask & SEE_MASK_NOCLOSEPROCESS) sei->hProcess = seiW.hProcess; - if (wVerb) SHFree(wVerb); - if (wFile) SHFree(wFile); - if (wParameters) SHFree(wParameters); - if (wDirectory) SHFree(wDirectory); - if (wClass) SHFree(wClass); + SHFree(wVerb); + SHFree(wFile); + SHFree(wParameters); + SHFree(wDirectory); + SHFree(wClass); return ret; } diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 42cec7a..065e3c1 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -115,9 +115,7 @@ static LPFMINFO FM_SetMenuParameter( menudata = FM_GetMenuInfo(hmenu); - if ( menudata->pidl) - { SHFree(menudata->pidl); - } + SHFree(menudata->pidl); menudata->uID = uID; menudata->pidl = ILClone(pidl); @@ -299,9 +297,7 @@ void WINAPI FileMenu_Destroy (HMENU hmen menudata = FM_GetMenuInfo(hmenu); - if ( menudata->pidl) - { SHFree( menudata->pidl); - } + SHFree( menudata->pidl); HeapFree(GetProcessHeap(), 0, menudata); DestroyMenu (hmenu); @@ -692,8 +688,7 @@ BOOL WINAPI FileMenu_DeleteAllItems (HME for (i = 0; i < GetMenuItemCount( hmenu ); i++) { GetMenuItemInfoW(hmenu, i, TRUE, &mii ); - if (mii.dwItemData) - SHFree((LPFMINFO)mii.dwItemData); + SHFree((LPFMINFO)mii.dwItemData); if (mii.hSubMenu) FileMenu_Destroy(mii.hSubMenu); diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d605fca..914071b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -811,10 +811,7 @@ static UINT ShellView_GetSelections(IShe LVITEMA lvItem; UINT i = 0; - if (This->apidl) - { - SHFree(This->apidl); - } + SHFree(This->apidl); This->cidl = ListView_GetSelectedCount(This->hWndList); This->apidl = (LPITEMIDLIST*)SHAlloc(This->cidl * sizeof(LPITEMIDLIST)); @@ -1713,8 +1710,7 @@ static ULONG WINAPI IShellView_fnRelease if(This->pSF2Parent) IShellFolder2_Release(This->pSF2Parent); - if(This->apidl) - SHFree(This->apidl); + SHFree(This->apidl); if(This->pAdvSink) IAdviseSink_Release(This->pAdvSink); diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 7d3d08c..ca2d593 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -166,8 +166,7 @@ static ULONG WINAPI ISvItemCm_fnRelease( if(This->pSFParent) IShellFolder_Release(This->pSFParent); - if(This->pidl) - SHFree(This->pidl); + SHFree(This->pidl); /*make sure the pidl is freed*/ _ILFreeaPidl(This->apidl, This->cidl); diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index fc0ce42..4fe43e5 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -377,8 +377,7 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID i void TRASH_DisposeElement(TRASH_ELEMENT *element) { - if (element) - SHFree(element->filename); + SHFree(element->filename); } HRESULT TRASH_GetDetails(const TRASH_ELEMENT *element, WIN32_FIND_DATAW *data)

1 0

James Hawkins : janitorial: Remove redundant NULL checks before CoTaskMemFree (found by Smatch).
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 99e2c6dff20f1692d70073b38e8fad43722269ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e2c6dff20f1692d70073b38… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 18:05:08 2006 -0700 janitorial: Remove redundant NULL checks before CoTaskMemFree (found by Smatch). --- dlls/devenum/devenum_main.c | 4 +-- dlls/devenum/parsedisplayname.c | 3 +- dlls/msdmo/dmort.c | 7 ++--- dlls/oleaut32/usrmarshal.c | 3 +- dlls/qcap/enummedia.c | 8 ++---- dlls/quartz/filesource.c | 17 +++++-------- dlls/quartz/filtermapper.c | 51 +++++++++++++-------------------------- 7 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index b61e0f8..4a45971 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -278,9 +278,7 @@ HRESULT WINAPI DllRegisterServer(void) if (hkeyClsid) RegCloseKey(hkeyClsid); - if (pszClsidDevMon) - CoTaskMemFree(pszClsidDevMon); - + CoTaskMemFree(pszClsidDevMon); CoUninitialize(); return res; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 310ea95..091ad08 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -147,8 +147,7 @@ static HRESULT WINAPI DEVENUM_IParseDisp if (pEm) IEnumMoniker_Release(pEm); - if (pszClass) - CoTaskMemFree(pszClass); + CoTaskMemFree(pszClass); TRACE("-- returning: %lx\n", res); return res; diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index bf788a5..d72d376 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -121,11 +121,8 @@ HRESULT WINAPI MoFreeMediaType(DMO_MEDIA pmedia->pUnk = NULL; } - if (pmedia->pbFormat) - { - CoTaskMemFree(pmedia->pbFormat); - pmedia->pbFormat = NULL; - } + CoTaskMemFree(pmedia->pbFormat); + pmedia->pbFormat = NULL; return S_OK; } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 90782c7..04b64b9 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1726,8 +1726,7 @@ void CALLBACK ITypeInfo_ReleaseVarDesc_P { TRACE("(%p, %p)\n", This, pVarDesc); - if(pVarDesc->lpstrSchema) - CoTaskMemFree(pVarDesc->lpstrSchema); + CoTaskMemFree(pVarDesc->lpstrSchema); if(pVarDesc->varkind == VAR_CONST) CoTaskMemFree(pVarDesc->u.lpvarValue); diff --git a/dlls/qcap/enummedia.c b/dlls/qcap/enummedia.c index a57d8a9..8f33611 100644 --- a/dlls/qcap/enummedia.c +++ b/dlls/qcap/enummedia.c @@ -47,11 +47,9 @@ HRESULT CopyMediaType(AM_MEDIA_TYPE * pD void FreeMediaType(AM_MEDIA_TYPE * pMediaType) { - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; + if (pMediaType->pUnk) { IUnknown_Release(pMediaType->pUnk); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a44ca36..23fb1fb 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -620,11 +620,10 @@ static HRESULT WINAPI FileSource_Load(IF IPin_Release(This->pOutputPin); This->pOutputPin = NULL; } - if (This->pszFileName) - { - CoTaskMemFree(This->pszFileName); - This->pszFileName = NULL; - } + + CoTaskMemFree(This->pszFileName); + This->pszFileName = NULL; + CloseHandle(hFile); } @@ -1079,12 +1078,8 @@ static HRESULT WINAPI FileAsyncReader_Wa *pdwUser = pDataRq->dwUserData; } - /* clean up */ - if (pDataRq) - { - /* no need to close event handle since we will close it when the pin is destroyed */ - CoTaskMemFree(pDataRq); - } + /* no need to close event handle since we will close it when the pin is destroyed */ + CoTaskMemFree(pDataRq); TRACE("-- %lx\n", hr); return hr; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 5a5eaf3..7a92a7e 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -152,8 +152,7 @@ static int find_data(struct Vector * v, static void delete_vector(struct Vector * v) { - if (v->pData) - CoTaskMemFree(v->pData); + CoTaskMemFree(v->pData); v->current = 0; v->capacity = 0; } @@ -288,11 +287,8 @@ static HRESULT WINAPI FilterMapper2_Crea } CloseHandle(hKey); - - if (wClsidCategory) - CoTaskMemFree(wClsidCategory); - if (wClsidAMCat) - CoTaskMemFree(wClsidAMCat); + CoTaskMemFree(wClsidCategory); + CoTaskMemFree(wClsidAMCat); return hr; } @@ -336,10 +332,8 @@ static HRESULT WINAPI FilterMapper2_Unre hr = HRESULT_FROM_WIN32(lRet); } - if (wClsidCategory) - CoTaskMemFree(wClsidCategory); - if (wFilter) - CoTaskMemFree(wFilter); + CoTaskMemFree(wClsidCategory); + CoTaskMemFree(wFilter); return hr; } @@ -368,8 +362,7 @@ static HRESULT FM2_WriteClsid(IPropertyB V_UNION(&var, bstrVal) = wszClsid; hr = IPropertyBag_Write(pPropBag, wszClsidName, &var); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); return hr; } @@ -748,11 +741,9 @@ static HRESULT WINAPI FilterMapper2_Regi strcpyW(pCurrent+1, szInstance); else { - if (szClsidTemp) - { - CoTaskMemFree(szClsidTemp); - szClsidTemp = NULL; - } + CoTaskMemFree(szClsidTemp); + szClsidTemp = NULL; + hr = StringFromCLSID(clsidFilter, &szClsidTemp); if (SUCCEEDED(hr)) strcpyW(pCurrent+1, szClsidTemp); @@ -787,16 +778,14 @@ static HRESULT WINAPI FilterMapper2_Regi if (pPropBag) IPropertyBag_Release(pPropBag); - if (szClsidTemp) - CoTaskMemFree(szClsidTemp); + CoTaskMemFree(szClsidTemp); if (SUCCEEDED(hr) && ppMoniker) *ppMoniker = pMoniker; else if (pMoniker) IMoniker_Release(pMoniker); - if (pregfp2) - CoTaskMemFree(pregfp2); + CoTaskMemFree(pregfp2); TRACE("-- returning %lx\n", hr); @@ -1360,8 +1349,7 @@ static HRESULT WINAPI FilterMapper_Regis hr = HRESULT_FROM_WIN32(lRet); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); if (hKey) CloseHandle(hKey); if (hPinsKey) @@ -1437,12 +1425,9 @@ static HRESULT WINAPI FilterMapper_Regis CloseHandle(hKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); - if (wszClsidMajorType) - CoTaskMemFree(wszClsidMajorType); - if (wszClsidSubType) - CoTaskMemFree(wszClsidSubType); + CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsidMajorType); + CoTaskMemFree(wszClsidSubType); return hr; } @@ -1488,8 +1473,7 @@ static HRESULT WINAPI FilterMapper_Unreg CloseHandle(hKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); return hr; } @@ -1546,8 +1530,7 @@ static HRESULT WINAPI FilterMapper_Unreg CoTaskMemFree(wszPinNameKey); } - if (wszClsid) - CoTaskMemFree(wszClsid); + CoTaskMemFree(wszClsid); if (hKey) CloseHandle(hKey);

1 0

James Hawkins : advpack: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 29a55bd512267af743a2ccbc8833750d03678c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a55bd512267af743a2ccbc8… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 6 19:06:59 2006 -0700 advpack: Win64 printf format warning fixes. --- dlls/advpack/Makefile.in | 1 - dlls/advpack/advpack.c | 22 +++++++++++----------- dlls/advpack/files.c | 22 +++++++++++----------- dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 8 ++++---- 5 files changed, 28 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29a55bd512267af743a2c…

1 0

Michael Stefaniuc : atl: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 32f42f2d5eed4233b3322683d49abf374e1b1d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f42f2d5eed4233b3322683d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:02:28 2006 +0200 atl: Win64 printf format warning fixes. --- dlls/atl/Makefile.in | 1 - dlls/atl/atl_main.c | 10 +++++----- dlls/atl/registrar.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 81c3464..cd4de31 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -6,7 +6,6 @@ MODULE = atl.dll IMPORTLIB = libatl.$(IMPLIBEXT) IMPORTS = ole32 shlwapi user32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ atl_main.c \ diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index fcda029..2fdf901 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -43,7 +43,7 @@ HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %ld, %p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(hinstDLL); @@ -143,7 +143,7 @@ HRESULT WINAPI AtlModuleRegisterClassObj HRESULT hRes = S_OK; int i=0; - TRACE("(%p %li %li)\n",pM, dwClsContext, dwFlags); + TRACE("(%p %i %i)\n",pM, dwClsContext, dwFlags); if (pM == NULL) return E_INVALIDARG; @@ -222,7 +222,7 @@ HRESULT WINAPI AtlInternalQueryInterface while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%p %li %p)\n",i,pEntries[i].piid, + TRACE("Trying entry %i (%p %i %p)\n",i,pEntries[i].piid, pEntries[i].dw, pEntries[i].pFunc); if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid)) @@ -244,7 +244,7 @@ HRESULT WINAPI AtlInternalQueryInterface } i++; } - TRACE("Done returning (0x%lx)\n",rc); + TRACE("Done returning (0x%x)\n",rc); return rc; } @@ -272,7 +272,7 @@ HRESULT WINAPI AtlAdvise(IUnknown *pUnkC */ HRESULT WINAPI AtlUnadvise(IUnknown *pUnkCP, const IID *iid, DWORD dw) { - FIXME("%p %p %ld\n", pUnkCP, iid, dw); + FIXME("%p %p %d\n", pUnkCP, iid, dw); return S_OK; } diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 9770e91..0a62aad 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -249,7 +249,7 @@ static HRESULT do_process_key(LPCOLESTR SHDeleteKeyW(parent_key, buf->str); lres = RegCreateKeyW(parent_key, buf->str, &hkey); if(lres != ERROR_SUCCESS) { - WARN("Could not create(open) key: %08lx\n", lres); + WARN("Could not create(open) key: %08x\n", lres); hres = HRESULT_FROM_WIN32(lres); break; } @@ -258,7 +258,7 @@ static HRESULT do_process_key(LPCOLESTR strbuf_write(buf->str, &name, -1); lres = RegOpenKeyW(parent_key, buf->str, &hkey); if(lres != ERROR_SUCCESS) - WARN("Could not open key %s: %08lx\n", debugstr_w(name.str), lres); + WARN("Could not open key %s: %08x\n", debugstr_w(name.str), lres); } if(key_type != DO_DELETE && *iter == '=') { @@ -280,7 +280,7 @@ static HRESULT do_process_key(LPCOLESTR lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_SZ, (PBYTE)buf->str, (lstrlenW(buf->str)+1)*sizeof(WCHAR)); if(lres != ERROR_SUCCESS) { - WARN("Could set value of key: %08lx\n", lres); + WARN("Could set value of key: %08x\n", lres); hres = HRESULT_FROM_WIN32(lres); break; } @@ -296,7 +296,7 @@ static HRESULT do_process_key(LPCOLESTR lres = RegSetValueExW(hkey, name.len ? name.str : NULL, 0, REG_DWORD, (PBYTE)&dw, sizeof(dw)); if(lres != ERROR_SUCCESS) { - WARN("Could set value of key: %08lx\n", lres); + WARN("Could set value of key: %08x\n", lres); hres = HRESULT_FROM_WIN32(lres); break; } @@ -390,7 +390,7 @@ static HRESULT do_process_root_key(LPCOL } hres = do_process_key(&iter, root_keys[i].key, &buf, do_register); if(FAILED(hres)) { - WARN("Processing key failed: %08lx\n", hres); + WARN("Processing key failed: %08x\n", hres); break; } hres = get_word(&iter, &buf); @@ -520,7 +520,7 @@ static ULONG WINAPI Registrar_AddRef(IRe { Registrar *This = (Registrar*)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ->%ld\n", This, ref); + TRACE("(%p) ->%d\n", This, ref); return ref; } @@ -529,7 +529,7 @@ static ULONG WINAPI Registrar_Release(IR Registrar *This = (Registrar*)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ->%ld\n", This, ref); + TRACE("(%p) ->%d\n", This, ref); if(!ref) { IRegistrar_ClearReplacements(iface); HeapFree(GetProcessHeap(), 0, This); @@ -839,6 +839,6 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %lu\n", dll_count); + TRACE("dll_count = %u\n", dll_count); return dll_count ? S_FALSE : S_OK; }

1 0

Michael Stefaniuc : wnaspi32: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 72e64f53b148a84f2d9e195ac409b60d1e9ba54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e64f53b148a84f2d9e195ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:02:14 2006 +0200 wnaspi32: Win64 printf format warning fixes. --- dlls/wnaspi32/Makefile.in | 1 - dlls/wnaspi32/aspi.c | 10 +++++----- dlls/wnaspi32/winaspi16.c | 10 +++++----- dlls/wnaspi32/winaspi32.c | 4 ++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 3c07663..8cef4d0 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wnaspi32.dll IMPORTLIB = libwnaspi32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ aspi.c \ diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index 4e621e1..e0a011c 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -142,7 +142,7 @@ int ASPI_GetNumControllers() } RegCloseKey(hkeyScsi); - TRACE("Returning %ld host adapters\n", num_ha ); + TRACE("Returning %d host adapters\n", num_ha ); return num_ha; } @@ -301,11 +301,11 @@ SCSI_LinuxDeviceIo( int fd, { set_last_error(); save_error = GetLastError(); - WARN("Not enough bytes written to scsi device. bytes=%ld .. %ld\n", cbInBuffer, dwBytes ); + WARN("Not enough bytes written to scsi device. bytes=%d .. %d\n", cbInBuffer, dwBytes ); /* FIXME: set_last_error() never sets error to ERROR_NOT_ENOUGH_MEMORY... */ if( save_error == ERROR_NOT_ENOUGH_MEMORY ) MESSAGE("Your Linux kernel was not able to handle the amount of data sent to the scsi device. Try recompiling with a larger SG_BIG_BUFF value (kernel 2.0.x sg.h)"); - WARN("error= %ld\n", save_error ); + WARN("error= %d\n", save_error ); *lpcbBytesReturned = 0; return FALSE; } @@ -316,8 +316,8 @@ SCSI_LinuxDeviceIo( int fd, { set_last_error(); save_error = GetLastError(); - WARN("Not enough bytes read from scsi device. bytes=%ld .. %ld\n", cbOutBuffer, *lpcbBytesReturned); - WARN("error= %ld\n", save_error ); + WARN("Not enough bytes read from scsi device. bytes=%d .. %d\n", cbOutBuffer, *lpcbBytesReturned); + WARN("error= %d\n", save_error ); return FALSE; } return TRUE; diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index f34bf04..c9adb51 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -166,12 +166,12 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *pr TRACE("\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled"); TRACE("Target: %d\n", prb->SRB_Target); TRACE("Lun: %d\n", prb->SRB_Lun); - TRACE("BufLen: %ld\n", prb->SRB_BufLen); + TRACE("BufLen: %d\n", prb->SRB_BufLen); TRACE("SenseLen: %d\n", prb->SRB_SenseLen); - TRACE("BufPtr: %lx (%p)\n", prb->SRB_BufPointer, lpBuf); - TRACE("LinkPointer %lx\n", prb->SRB_Rsvd1); + TRACE("BufPtr: %x (%p)\n", prb->SRB_BufPointer, lpBuf); + TRACE("LinkPointer %x\n", prb->SRB_Rsvd1); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); - TRACE("POST Proc: %lx\n", (DWORD) prb->SRB_PostProc); + TRACE("POST Proc: %x\n", (DWORD) prb->SRB_PostProc); cdb = &prb->CDBByte[0]; cmd = prb->CDBByte[0]; if (TRACE_ON(aspi)) @@ -328,7 +328,7 @@ ASPI_ExecScsiCmd(DWORD ptrPRB, UINT16 mo /* now do posting */ if (ASPI_POSTING(lpPRB) && lpPRB->SRB_PostProc) { - TRACE("Post Routine (%lx) called\n", (DWORD) lpPRB->SRB_PostProc); + TRACE("Post Routine (%x) called\n", (DWORD) lpPRB->SRB_PostProc); switch (mode) { case ASPI_DOS: diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 6920920..e06bb9b 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -179,7 +179,7 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb) TRACE("\tPosting %s\n", prb->SRB_Flags & 0x1 ? "enabled" : "disabled"); TRACE("Target: %d\n", prb->SRB_Target); TRACE("Lun: %d\n", prb->SRB_Lun); - TRACE("BufLen: %ld\n", prb->SRB_BufLen); + TRACE("BufLen: %d\n", prb->SRB_BufLen); TRACE("SenseLen: %d\n", prb->SRB_SenseLen); TRACE("BufPtr: %p\n", prb->SRB_BufPointer); TRACE("CDB Length: %d\n", prb->SRB_CDBLen); @@ -338,7 +338,7 @@ #define MAKE_HOST_TO_TARGET(lpPRB) \ ((lpPRB->SRB_Flags & 0x18) == 0x18) ) && lpPRB->SRB_BufLen ) { - FIXME("command 0x%02x, no data transfer specified, but buflen is %ld!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen); + FIXME("command 0x%02x, no data transfer specified, but buflen is %d!!!\n",lpPRB->CDBByte[0],lpPRB->SRB_BufLen); } break; }

1 0

Michael Stefaniuc : wtsapi32: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 01ab17f0c36b41086dad12680d47d5eed25cdb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab17f0c36b41086dad12680… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:02:04 2006 +0200 wtsapi32: Win64 printf format warning fixes. --- dlls/wtsapi32/Makefile.in | 1 - dlls/wtsapi32/wtsapi32.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index 196dc5c..495d8bf 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wtsapi32.dll IMPORTLIB = libwtsapi32.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ wtsapi32.c diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 995e43b..91b1aa4 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -29,7 +29,7 @@ HMODULE WTSAPI32_hModule = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -60,7 +60,7 @@ void WINAPI WTSCloseServer(HANDLE hServe */ BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) { - FIXME("Stub %p 0x%08lx %d\n", hServer, SessionId, bWait); + FIXME("Stub %p 0x%08x %d\n", hServer, SessionId, bWait); return TRUE; } @@ -70,7 +70,7 @@ BOOL WINAPI WTSDisconnectSession(HANDLE BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_PROCESS_INFOA* ppProcessInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08lx 0x%08lx %p %p\n", hServer, Reserved, Version, + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppProcessInfo, pCount); if (!ppProcessInfo || !pCount) return FALSE; @@ -87,7 +87,7 @@ BOOL WINAPI WTSEnumerateProcessesA(HANDL BOOL WINAPI WTSEnumerateProcessesW(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_PROCESS_INFOW* ppProcessInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08lx 0x%08lx %p %p\n", hServer, Reserved, Version, + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppProcessInfo, pCount); if (!ppProcessInfo || !pCount) return FALSE; @@ -104,7 +104,7 @@ BOOL WINAPI WTSEnumerateProcessesW(HANDL BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_SESSION_INFOA* ppSessionInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08lx 0x%08lx %p %p\n", hServer, Reserved, Version, + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppSessionInfo, pCount); if (!ppSessionInfo || !pCount) return FALSE; @@ -121,7 +121,7 @@ BOOL WINAPI WTSEnumerateSessionsA(HANDLE BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_SESSION_INFOW* ppSessionInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08lx 0x%08lx %p %p\n", hServer, Reserved, Version, + FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppSessionInfo, pCount); if (!ppSessionInfo || !pCount) return FALSE; @@ -172,7 +172,7 @@ BOOL WINAPI WTSQuerySessionInformationA( DWORD* BytesReturned) { /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ - FIXME("Stub %p 0x%08lx %d %p %p\n", hServer, SessionId, WTSInfoClass, + FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); return FALSE; @@ -189,7 +189,7 @@ BOOL WINAPI WTSQuerySessionInformationW( DWORD* BytesReturned) { /* FIXME: Forward request to winsta.dll::WinStationQueryInformationW */ - FIXME("Stub %p 0x%08lx %d %p %p\n", hServer, SessionId, WTSInfoClass, + FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); return FALSE; @@ -201,6 +201,6 @@ BOOL WINAPI WTSQuerySessionInformationW( BOOL WINAPI WTSWaitSystemEvent(HANDLE hServer, DWORD Mask, DWORD* Flags) { /* FIXME: Forward request to winsta.dll::WinStationWaitSystemEvent */ - FIXME("Stub %p 0x%08lx %p\n", hServer, Mask, Flags); + FIXME("Stub %p 0x%08x %p\n", hServer, Mask, Flags); return FALSE; }

1 0

Michael Stefaniuc : amstream: Win64 printf format warning fixes.
by Alexandre Julliard 07 Oct '06

07 Oct '06

Module: wine Branch: master Commit: 158253bffd1ccdc181eb13ac0f9786a7e05b0a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=158253bffd1ccdc181eb13ac0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 6 23:01:52 2006 +0200 amstream: Win64 printf format warning fixes. --- dlls/amstream/Makefile.in | 1 - dlls/amstream/amstream.c | 10 +++++----- dlls/amstream/mediastream.c | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 41e8fa1..33f8d23 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = amstream.dll IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ amstream.c \ diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 0001f1f..449a2d2 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -210,7 +210,7 @@ static HRESULT WINAPI IAMMultiMediaStrea IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; HRESULT hr = S_OK; - FIXME("(%p/%p)->(%lx,%lx,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); + FIXME("(%p/%p)->(%x,%x,%p) partial stub!\n", This, iface, (DWORD)StreamType, dwFlags, pFilterGraph); if (pFilterGraph) { @@ -256,7 +256,7 @@ static HRESULT WINAPI IAMMultiMediaStrea IMediaStream* pStream; IMediaStream** pNewStreams; - FIXME("(%p/%p)->(%p,%p,%lx,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); + FIXME("(%p/%p)->(%p,%p,%x,%p) partial stub!\n", This, iface, pStreamObject, PurposeId, dwFlags, ppNewStream); hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) @@ -291,7 +291,7 @@ static HRESULT WINAPI IAMMultiMediaStrea IPin *ipin; PIN_DIRECTION pin_direction; - TRACE("(%p/%p)->(%s,%lx)\n", This, iface, debugstr_w(pszFileName), dwFlags); + TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) @@ -350,7 +350,7 @@ static HRESULT WINAPI IAMMultiMediaStrea { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p,%p,%lx) stub!\n", This, iface, pCtx, pMoniker, dwFlags); + FIXME("(%p/%p)->(%p,%p,%x) stub!\n", This, iface, pCtx, pMoniker, dwFlags); return E_NOTIMPL; } @@ -359,7 +359,7 @@ static HRESULT WINAPI IAMMultiMediaStrea { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%lx)\n", This, iface, dwFlags); + FIXME("(%p/%p)->(%x)\n", This, iface, dwFlags); if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 430755f..c2446c9 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -134,7 +134,7 @@ static HRESULT WINAPI IMediaStreamImpl_S { IMediaStreamImpl *This = (IMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p,%lx) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); + FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); return S_FALSE; } @@ -143,7 +143,7 @@ static HRESULT WINAPI IMediaStreamImpl_A { IMediaStreamImpl *This = (IMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%lx,%p) stub!\n", This, iface, dwFlags, ppSample); + FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample); return S_FALSE; } @@ -152,7 +152,7 @@ static HRESULT WINAPI IMediaStreamImpl_C { IMediaStreamImpl *This = (IMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%p,%lx,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); return S_FALSE; } @@ -161,7 +161,7 @@ static HRESULT WINAPI IMediaStreamImpl_S { IMediaStreamImpl *This = (IMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%lx) stub!\n", This, iface, dwFlags); + FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags); return S_FALSE; }

1 0