January 2008 - Wine-commits

Rob Shearman : rpcrt4: Print fixme' s if the serialize or no-serialize flags are set on a context handle being marshalled or unmarshalled .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: a0410bef34c3012f31328c07f92e3676c29680b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0410bef34c3012f31328c07f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:26:10 2008 +0000 rpcrt4: Print fixme's if the serialize or no-serialize flags are set on a context handle being marshalled or unmarshalled. --- dlls/rpcrt4/ndr_contexthandle.c | 19 +++++++++++++++---- dlls/rpcrt4/ndr_marshall.c | 27 ++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 21d8747..7334bf6 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -218,7 +218,8 @@ void WINAPI NDRSContextMarshall(NDR_SCONTEXT SContext, NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p)\n", SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, + userRunDownIn, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -230,7 +231,8 @@ void WINAPI NDRSContextMarshallEx(RPC_BINDING_HANDLE hBinding, NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p %p)\n", hBinding, SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -252,6 +254,9 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); + if (SContext->userContext) { status = RpcServerAssoc_UpdateContextHandle(binding->Assoc, SContext, CtxGuard, userRunDownIn); @@ -287,7 +292,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall(void *pBuff, ULONG DataRepresentation) { TRACE("(%p %08x)\n", pBuff, DataRepresentation); - return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, + DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -298,7 +305,8 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(RPC_BINDING_HANDLE hBinding, ULONG DataRepresentation) { TRACE("(%p %p %08x)\n", hBinding, pBuff, DataRepresentation); - return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -319,6 +327,9 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); + if (!pBuff) status = RpcServerAssoc_AllocateContextHandle(binding->Assoc, CtxGuard, &SContext); diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dcbb4fd..f8f8973 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -6241,7 +6241,8 @@ void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; } @@ -6263,7 +6264,7 @@ NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; return ContextHandle; @@ -6280,9 +6281,14 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6290,7 +6296,8 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, } return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, if_id, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, + flags); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6299,6 +6306,7 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); @@ -6311,6 +6319,10 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6318,7 +6330,7 @@ void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, if_id, 0); + pStubMsg->Buffer, RundownRoutine, if_id, flags); pStubMsg->Buffer += cbNDRContext; } @@ -6327,6 +6339,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, { NDR_SCONTEXT ContextHandle; RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6339,6 +6352,10 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, RpcRaiseException(RPC_X_BAD_STUB_DATA); } + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) { RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; @@ -6348,7 +6365,7 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - if_id, 0); + if_id, flags); pStubMsg->Buffer += cbNDRContext; return ContextHandle;

1 0

Rob Shearman : include: Add the strict_context_handle flag to the Irot interface.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d7cbaf572a7c0cdda52169ddc110bb9a94a43d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7cbaf572a7c0cdda52169ddc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:26:18 2008 +0000 include: Add the strict_context_handle flag to the Irot interface. --- include/wine/irot.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/wine/irot.idl b/include/wine/irot.idl index f14af13..54d8653 100644 --- a/include/wine/irot.idl +++ b/include/wine/irot.idl @@ -28,7 +28,8 @@ typedef struct tagMonikerComparisonData { [ uuid(7a98c254-6808-11cf-b73b-00aa00b677a8), - version(0.2) + version(0.2), + strict_context_handle ] interface Irot {

1 0

Kirill K. Smirnov : winhelp: Fix index to handle offset value = 0 correclty .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 7c97735b09478830b355f7b657086ddf8f06a7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c97735b09478830b355f7b65… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sun Jan 6 18:35:06 2008 +0300 winhelp: Fix index to handle offset value = 0 correclty. --- programs/winhelp/winhelp.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index ab516e8..840fb8a 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1972,6 +1972,10 @@ static void cb_KWBTree(void *p, void **next, void *cookie) * * Index dialog callback function. * + * nResult passed to EndDialog: + * 1: CANCEL button + * >1: valid offset value +2. + * EndDialog itself can return 0 (error). */ INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2011,6 +2015,7 @@ INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA MessageBox(hWnd, "macro keywords not supported yet", "Error", MB_OK | MB_ICONSTOP); return TRUE; } + offset += 2; } /* Fall through */ case IDCANCEL: @@ -2051,6 +2056,10 @@ BOOL WINHELP_CreateIndexWindow(void) Globals.active_win->hMainWnd, WINHELP_SearchDlgProc, (LPARAM)hlpfile); if (ret > 1) + { + ret -= 2; + WINE_TRACE("got %d as an offset\n", ret); WINHELP_CreateHelpWindowByOffset(hlpfile, ret, Globals.active_win->info, SW_NORMAL); + } return TRUE; }

1 0

Alexandre Julliard : wineboot: Don't print errors for non-fatal problems.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: ebac63e17c4768f4f284752ac3fecf2b9030cbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebac63e17c4768f4f284752ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 12:25:56 2008 +0100 wineboot: Don't print errors for non-fatal problems. --- programs/wineboot/wineboot.c | 59 ++++++++++-------------------------------- 1 files changed, 14 insertions(+), 45 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1552330..da0eb79 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -160,18 +160,8 @@ static BOOL pendingRename(void) if( (res=RegOpenKeyExW( HKEY_LOCAL_MACHINE, SessionW, 0, KEY_ALL_ACCESS, &hSession )) !=ERROR_SUCCESS ) { - if( res==ERROR_FILE_NOT_FOUND ) - { - WINE_TRACE("The key was not found - skipping\n"); - res=TRUE; - } - else - { - WINE_ERR("Couldn't open key, error %d\n", res ); - res=FALSE; - } - - goto end; + WINE_TRACE("The key was not found - skipping\n"); + return TRUE; } res=RegQueryValueExW( hSession, ValueName, NULL, NULL /* The value type does not really interest us, as it is not @@ -326,9 +316,7 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) if( !CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info) ) { - WINE_ERR("Failed to run command %s (%d)\n", wine_dbgstr_w(cmdline), - GetLastError() ); - + WINE_WARN("Failed to run command %s (%d)\n", wine_dbgstr_w(cmdline), GetLastError() ); return INVALID_RUNCMD_RETURN; } @@ -361,8 +349,8 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; - HKEY hkWin=NULL, hkRun=NULL; - DWORD res=ERROR_SUCCESS; + HKEY hkWin, hkRun; + DWORD res; DWORD i, nMaxCmdLine=0, nMaxValue=0; WCHAR *szCmdLine=NULL; WCHAR *szValue=NULL; @@ -372,36 +360,19 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, else WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) ); - if( (res=RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin ))!=ERROR_SUCCESS ) - { - WINE_ERR("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%d)\n", - res); - - goto end; - } + if (RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin ) != ERROR_SUCCESS) + return TRUE; - if( (res=RegOpenKeyExW( hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun ))!= - ERROR_SUCCESS) + if (RegOpenKeyExW( hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun ) != ERROR_SUCCESS) { - if( res==ERROR_FILE_NOT_FOUND ) - { - WINE_TRACE("Key doesn't exist - nothing to be done\n"); - - res=ERROR_SUCCESS; - } - else - WINE_ERR("RegOpenKey failed on run key (%d)\n", res); - - goto end; + RegCloseKey( hkWin ); + return TRUE; } - + RegCloseKey( hkWin ); + if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) - { - WINE_ERR("Couldn't query key info (%d)\n", res ); - goto end; - } if( i==0 ) { @@ -470,12 +441,10 @@ end: if( hkRun!=NULL ) RegCloseKey( hkRun ); - if( hkWin!=NULL ) - RegCloseKey( hkWin ); WINE_TRACE("done\n"); - return res==ERROR_SUCCESS?TRUE:FALSE; + return res==ERROR_SUCCESS; } /* @@ -672,7 +641,7 @@ static BOOL ProcessStartupItems(void) WINE_TRACE("Unable to parse display name.\n"); else if ((iRet = (int)ShellExecuteW(NULL, NULL, wszCommand, NULL, NULL, SW_SHOWNORMAL)) <= 32) - WINE_ERR("Error %d executing command %s.\n", iRet, wine_dbgstr_w(wszCommand)); + WINE_WARN("Error %d executing command %s.\n", iRet, wine_dbgstr_w(wszCommand)); } IMalloc_Free(ppM, pidlItem);

1 0

Rob Shearman : ole32: get_moniker_for_progid_display_name should fallback to using IClassFactory to get IParseDisplayName if getting it directly fails .
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 9645f9d19d2ff9a57546569f1a573a5b73801437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9645f9d19d2ff9a57546569f1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 16:20:26 2008 +0000 ole32: get_moniker_for_progid_display_name should fallback to using IClassFactory to get IParseDisplayName if getting it directly fails. --- dlls/ole32/moniker.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index e77c8c4..cc83d95 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1086,6 +1086,21 @@ static HRESULT get_moniker_for_progid_display_name(LPBC pbc, IParseDisplayName *pdn; hr = IMoniker_BindToObject(class_moniker, pbc, NULL, &IID_IParseDisplayName, (void **)&pdn); + /* fallback to using IClassFactory to get IParseDisplayName - + * adsldp.dll depends on this */ + if (FAILED(hr)) + { + IClassFactory *pcf; + hr = IMoniker_BindToObject(class_moniker, pbc, NULL, + &IID_IClassFactory, (void **)&pcf); + if (SUCCEEDED(hr)) + { + hr = IClassFactory_CreateInstance(pcf, NULL, + &IID_IParseDisplayName, + (void **)&pdn); + IClassFactory_Release(pcf); + } + } IMoniker_Release(class_moniker); if (SUCCEEDED(hr)) {

1 0

Rob Shearman : ole32: Fix a typo in the class moniker tests.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 2456f2d43b4bbfc7eb8dfae060bc5f534c98ceaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2456f2d43b4bbfc7eb8dfae06… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 16:20:35 2008 +0000 ole32: Fix a typo in the class moniker tests. --- dlls/ole32/tests/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a5a1e8f..9068f27 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1311,7 +1311,7 @@ static void test_class_moniker(void) ok(hr == MK_E_UNAVAILABLE, "IMoniker_GetTimeOfLastChange should return MK_E_UNAVAILABLE, not 0x%08x\n", hr); hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - ok_ole_success(hr, IMoniker_BindToStorage); + ok_ole_success(hr, IMoniker_BindToObject); IUnknown_Release(unknown); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);

1 0

Andrew Talbot : gdi32: Remove unneeded casts.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: d0d4c74e85d54210313aa7cdb921500e3d2b119e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d4c74e85d54210313aa7cdb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:09 2008 +0000 gdi32: Remove unneeded casts. --- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dib.c | 8 ++++---- dlls/gdi32/enhmetafile.c | 4 ++-- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/metafile.c | 2 +- dlls/gdi32/metafile16.c | 4 +--- dlls/gdi32/printdrv.c | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index ac5ae77..c713f74 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -471,7 +471,7 @@ BOOL16 WINAPI SetSolidBrush16(HBRUSH16 hBrush, COLORREF newColor ) BRUSHOBJ * brushPtr; BOOL16 res = FALSE; - TRACE("(hBrush %04x, newColor %08x)\n", hBrush, (DWORD)newColor); + TRACE("(hBrush %04x, newColor %08x)\n", hBrush, newColor); if (!(brushPtr = (BRUSHOBJ *) GDI_GetObjPtr( HBRUSH_32(hBrush), BRUSH_MAGIC ))) return FALSE; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index ac2c9b0..c08be17 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -832,7 +832,7 @@ INT WINAPI GetDIBits( *dstbits++ = (BYTE)(((val >> 2) & 0xf8) | ((val >> 7) & 0x07)); *dstbits++ = (BYTE)(((val >> 7) & 0xf8) | ((val >> 12) & 0x07)); } - dstbits = (LPBYTE)(dbits+=dstwidthb); + dstbits = dbits+=dstwidthb; srcbits = (LPWORD)(sbits+=srcwidthb); } } @@ -848,7 +848,7 @@ INT WINAPI GetDIBits( case 32: /* 32 bpp srcDIB -> 24 bpp dstDIB */ { - LPBYTE srcbits = (LPBYTE)sbits; + LPBYTE srcbits = sbits; width = min(srcwidth, dstwidth); for( y = 0; y < lines; y++) { @@ -857,8 +857,8 @@ INT WINAPI GetDIBits( *dstbits++ = *srcbits++; *dstbits++ = *srcbits++; } - dstbits=(LPBYTE)(dbits+=dstwidthb); - srcbits = (LPBYTE)(sbits+=srcwidthb); + dstbits = dbits+=dstwidthb; + srcbits = sbits+=srcwidthb; } } break; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 2b4d03f..081f7c1 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2545,7 +2545,7 @@ static INT CALLBACK cbEnhPaletteCopy( HDC a, /* Update the passed data as a return code */ info->lpPe = NULL; /* Palettes were copied! */ - info->cEntries = (UINT)dwNumPalToCopy; + info->cEntries = dwNumPalToCopy; return FALSE; /* That's all we need */ } @@ -2576,7 +2576,7 @@ UINT WINAPI GetEnhMetaFilePaletteEntries( HENHMETAFILE hEmf, if ( enhHeader->nPalEntries == 0 ) return 0; /* Is the user requesting the number of palettes? */ - if ( lpPe == NULL ) return (UINT)enhHeader->nPalEntries; + if ( lpPe == NULL ) return enhHeader->nPalEntries; /* Copy cEntries worth of PALETTEENTRY structs into the buffer */ infoForCallBack.cEntries = cEntries; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f8b4e92..4d51341 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3291,7 +3291,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, if(size) { potm = HeapAlloc(GetProcessHeap(), 0, size); WineEngGetOutlineTextMetrics(font, size, potm); - ptm = (TEXTMETRICW*)&potm->otmTextMetrics; + ptm = &potm->otmTextMetrics; } else { WineEngGetTextMetrics(font, &tm); ptm = &tm; diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 13fce77..43ef06d 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1271,7 +1271,7 @@ static BOOL MF_Play_MetaExtTextOut(HDC hdc, METARECORD *mr) { dxx = (LPINT16)(sot+(((s1+1)>>1)*2)); dx = HeapAlloc( GetProcessHeap(), 0, s1*sizeof(INT)); - if (dx) for (i = 0; i < s1; i++) dx[i] = (SHORT)dxx[i]; + if (dx) for (i = 0; i < s1; i++) dx[i] = dxx[i]; } else { TRACE("%s len: %d\n", sot, mr->rdSize); diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi32/metafile16.c index 11f8424..9da9325 100644 --- a/dlls/gdi32/metafile16.c +++ b/dlls/gdi32/metafile16.c @@ -308,8 +308,6 @@ HMETAFILE16 WINAPI SetMetaFileBits16( HGLOBAL16 hMem ) HMETAFILE16 WINAPI SetMetaFileBitsBetter16( HMETAFILE16 hMeta ) { if( IsValidMetaFile16( hMeta ) ) - return (HMETAFILE16)GlobalReAlloc16( hMeta, 0, - GMEM_SHARE | GMEM_NODISCARD | GMEM_MODIFY); + return GlobalReAlloc16( hMeta, 0, GMEM_SHARE | GMEM_NODISCARD | GMEM_MODIFY); return (HMETAFILE16)0; } - diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 16b3fe3..36359ae 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -327,7 +327,7 @@ HPQ16 WINAPI CreatePQ16(INT16 size) */ INT16 WINAPI DeletePQ16(HPQ16 hPQ) { - return GlobalFree16((HGLOBAL16)hPQ); + return GlobalFree16(hPQ); } /**********************************************************************

1 0

Andrew Talbot : dxdiagn: Remove unneeded casts.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: c6511b0031e70f35e438d8675eada385779d24dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6511b0031e70f35e438d8675… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:06 2008 +0000 dxdiagn: Remove unneeded casts. --- dlls/dxdiagn/container.c | 6 +++--- dlls/dxdiagn/provider.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 184840b..b517dce 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -116,8 +116,8 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONT p = This->subContainers; while (NULL != p) { - if (0 == lstrcmpW(p->contName, pwszContainer)) { - *ppInstance = (PDXDIAGCONTAINER)p->pCont; + if (0 == lstrcmpW(p->contName, pwszContainer)) { + *ppInstance = p->pCont; return S_OK; } p = p->next; @@ -159,7 +159,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, ppInstance); if (SUCCEEDED(hr)) { - IDxDiagContainerImpl_AddRef((PDXDIAGCONTAINER)*ppInstance); + IDxDiagContainerImpl_AddRef(*ppInstance); } on_error: diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ca81817..fb18a35 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -112,7 +112,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface if (FAILED(hr)) { return hr; } - hr = DXDiag_InitRootDXDiagContainer((PDXDIAGCONTAINER)This->pRootContainer); + hr = DXDiag_InitRootDXDiagContainer(This->pRootContainer); } return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContainer, &IID_IDxDiagContainer, (void**) ppInstance); }

1 0

Peter Oberndorfer : user32: Remove unused lpGrayMask array.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 76bbd027341d7a77c651ec80a7358d8d34531bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=76bbd027341d7a77c651ec80a… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sun Jan 6 15:54:21 2008 +0100 user32: Remove unused lpGrayMask array. --- dlls/user32/nonclient.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 45ac8cf..58671c5 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -32,17 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(nonclient); -static const BYTE lpGrayMask[] = { 0xAA, 0xA0, - 0x55, 0x50, - 0xAA, 0xA0, - 0x55, 0x50, - 0xAA, 0xA0, - 0x55, 0x50, - 0xAA, 0xA0, - 0x55, 0x50, - 0xAA, 0xA0, - 0x55, 0x50}; - #define SC_ABOUTWINE (SC_SCREENSAVE+1) #define SC_PUTMARK (SC_SCREENSAVE+2)

1 0

Andrew Talbot : iccvid: Remove unneeded casts.
by Alexandre Julliard 07 Jan '08

07 Jan '08

Module: wine Branch: master Commit: 33f10e7fb916f3d1f2b4d9af0a54bb2219b8d081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f10e7fb916f3d1f2b4d9af0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:15 2008 +0000 iccvid: Remove unneeded casts. --- dlls/iccvid/iccvid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 3d1be34..19faf1d 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -626,7 +626,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, while((chunk_size > 0) && (y < y_bottom)) { /* ---- flag bits: 0 = SKIP, 10 = V1, 11 = V4 ---- */ - flag = (unsigned long)get_long(); + flag = get_long(); chunk_size -= 4; mask = 0x80000000; @@ -637,7 +637,7 @@ static void decode_cinepak(cinepak_info *cvinfo, unsigned char *buf, int size, if(mask == 1) { if(chunk_size < 0) break; - flag = (unsigned long)get_long(); + flag = get_long(); chunk_size -= 4; mask = 0x80000000; }

1 0