January 2008 - Wine-Commits

Rob Shearman : include: Add defines for context handle flags to rpcfc.h.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 53e8734049d9e241af572dca733017ac18f21de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e8734049d9e241af572dca7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:20:47 2008 +0000 include: Add defines for context handle flags to rpcfc.h. --- include/wine/rpcfc.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 4242c94..34878e2 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -194,4 +194,10 @@ #define USER_MARSHAL_POINTER 0xc0 #define USER_MARSHAL_IID 0x20 +/* context handle flags */ +#define NDR_CONTEXT_HANDLE_CANNOT_BE_NULL 0x01 +#define NDR_CONTEXT_HANDLE_SERIALIZE 0x02 +#define NDR_CONTEXT_HANDLE_NO_SERIALIZE 0x04 +#define NDR_STRICT_CONTEXT_HANDLE 0x08 + #endif /* __WINE_RPCFC_H */

1 0

Rob Shearman : widl: Add support for strict context handles.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 15af19c6ecf63cca7c1326d53cc637f2ecbf7067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15af19c6ecf63cca7c1326d53… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 6 21:25:50 2008 +0000 widl: Add support for strict context handles. --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ tools/widl/typegen.c | 7 ++++++- tools/widl/widltypes.h | 1 + 4 files changed, 10 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d2fd3c1..98f17af 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -299,6 +299,7 @@ static const struct keyword attr_keywords[] = {"single", tSINGLE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, + {"strict_context_handle", tSTRICTCONTEXTHANDLE}, {"string", tSTRING}, {"switch_is", tSWITCHIS}, {"switch_type", tSWITCHTYPE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6c8337e..499ae15 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -225,6 +225,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tSMALL %token tSOURCE %token tSTDCALL +%token tSTRICTCONTEXTHANDLE %token tSTRING tSTRUCT %token tSWITCH tSWITCHIS tSWITCHTYPE %token tTRANSMITAS @@ -497,6 +498,7 @@ attribute: { $$ = NULL; } | tRETVAL { $$ = make_attr(ATTR_RETVAL); } | tSIZEIS '(' m_exprs ')' { $$ = make_attrp(ATTR_SIZEIS, $3); } | tSOURCE { $$ = make_attr(ATTR_SOURCE); } + | tSTRICTCONTEXTHANDLE { $$ = make_attr(ATTR_STRICTCONTEXTHANDLE); } | tSTRING { $$ = make_attr(ATTR_STRING); } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, $3); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b9d3306..3953b96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -43,6 +43,7 @@ static const func_t *current_func; static const type_t *current_structure; +static const ifref_t *current_iface; static struct list expr_eval_routines = LIST_INIT(expr_eval_routines); struct expr_eval_routine @@ -2057,7 +2058,10 @@ static size_t write_contexthandle_tfs(FILE *file, const type_t *type, unsigned int *typeformat_offset) { size_t start_offset = *typeformat_offset; - unsigned char flags = 0x08 /* strict */; + unsigned char flags = 0; + + if (is_attr(current_iface->attrs, ATTR_STRICTCONTEXTHANDLE)) + flags |= 0x08 /* strict */; if (is_ptr(type)) { @@ -2280,6 +2284,7 @@ static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, type_pred_t pr if (iface->iface->funcs) { const func_t *func; + current_iface = iface; LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { if (is_local(func->def->attrs)) continue; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6930f71..acdc3f1 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -121,6 +121,7 @@ enum attr_type ATTR_RETVAL, ATTR_SIZEIS, ATTR_SOURCE, + ATTR_STRICTCONTEXTHANDLE, ATTR_STRING, ATTR_SWITCHIS, ATTR_SWITCHTYPE,

1 0

Kirill K. Smirnov : winhelp: Fix index to handle offset value = 0 correclty .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

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

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 Jan. 7, 2008

Jan. 7, 2008

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

Alexandre Julliard : wineboot: Don't print errors for non-fatal problems.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

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: Fix a typo in the class moniker tests.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

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 Jan. 7, 2008

Jan. 7, 2008

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 Jan. 7, 2008

Jan. 7, 2008

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 Jan. 7, 2008

Jan. 7, 2008

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 : gphoto2.ds: Remove unneeded casts.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 35d3f81e69f0461a91701000815d166980b3a2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d3f81e69f0461a917010008… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 5 16:44:12 2008 +0000 gphoto2.ds: Remove unneeded casts. --- dlls/gphoto2.ds/capability.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index e9700cb..754e58d 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -193,17 +193,17 @@ TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 value) { - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); TRACE("-> %ld\n", value); if (pCapability->hContainer) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT32; pVal->Item = value; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); - pCapability->ConType = TWON_ONEVALUE; + GlobalUnlock (pCapability->hContainer); + pCapability->ConType = TWON_ONEVALUE; return TRUE; } else @@ -212,17 +212,17 @@ static TW_BOOL GPHOTO2_OneValueSet32 (pTW_CAPABILITY pCapability, TW_UINT32 valu static TW_BOOL GPHOTO2_OneValueSet16 (pTW_CAPABILITY pCapability, TW_UINT16 value) { - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ONEVALUE)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); TRACE("-> %d\n", value); if (pCapability->hContainer) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT16; pVal->Item = value; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); - pCapability->ConType = TWON_ONEVALUE; + GlobalUnlock (pCapability->hContainer); + pCapability->ConType = TWON_ONEVALUE; return TRUE; } else @@ -233,25 +233,25 @@ static TW_BOOL GPHOTO2_EnumSet16 (pTW_CAPABILITY pCapability, int nrofvalues, const TW_UINT16 *values, int current, int def) { pTW_ENUMERATION pVal; - pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ENUMERATION) + nrofvalues * sizeof(TW_UINT16)); + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ENUMERATION) + nrofvalues * sizeof(TW_UINT16)); if (!pCapability->hContainer) return FALSE; - pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pVal = GlobalLock (pCapability->hContainer); pVal->ItemType = TWTY_UINT16; pVal->NumItems = nrofvalues; memcpy(pVal->ItemList, values, sizeof(TW_UINT16)*nrofvalues); pVal->CurrentIndex = current; pVal->DefaultIndex = def; pCapability->ConType = TWON_ENUMERATION; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, TW_UINT16 **values) { - pTW_ENUMERATION pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ENUMERATION pVal = GlobalLock (pCapability->hContainer); if (!pVal) return FALSE; @@ -259,18 +259,18 @@ static TW_BOOL GPHOTO2_EnumGet16 (pTW_CAPABILITY pCapability, int *nrofvalues, T *values = HeapAlloc( GetProcessHeap(), 0, sizeof(TW_UINT16)*pVal->NumItems); memcpy (*values, pVal->ItemList, sizeof(TW_UINT16)*(*nrofvalues)); FIXME("Current Index %ld, Default Index %ld\n", pVal->CurrentIndex, pVal->DefaultIndex); - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } static TW_BOOL GPHOTO2_OneValueGet32 (pTW_CAPABILITY pCapability, TW_UINT32 *pValue) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); if (pVal) { *pValue = pVal->Item; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else @@ -279,12 +279,12 @@ static TW_BOOL GPHOTO2_OneValueGet32 (pTW_CAPABILITY pCapability, TW_UINT32 *pVa static TW_BOOL GPHOTO2_OneValueGet16 (pTW_CAPABILITY pCapability, TW_UINT16 *pValue) { - pTW_ONEVALUE pVal = GlobalLock ((HGLOBAL) pCapability->hContainer); + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); if (pVal) { *pValue = pVal->Item; - GlobalUnlock ((HGLOBAL) pCapability->hContainer); + GlobalUnlock (pCapability->hContainer); return TRUE; } else

1 0