wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Jacek Caban : jscript: Use prop_put in jsdisp_propput_dontenum.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7491d480a9aeb908c9311a91a05d543641d20b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7491d480a9aeb908c9311a91a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:03:35 2012 +0100 jscript: Use prop_put in jsdisp_propput_dontenum. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2be474e..b4d333b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1271,7 +1271,7 @@ HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) if(FAILED(hres)) return hres; - return jsval_copy(val, &prop->u.val); + return prop_put(obj, prop, val, NULL); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val)

1 0

Nikolay Sivov : scrrun: Added a stub for IFolder interface.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: fee495d5fda56fa5b0c24ac1f1368ae369209f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee495d5fda56fa5b0c24ac1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 16:59:00 2012 -0500 scrrun: Added a stub for IFolder interface. --- dlls/scrrun/filesystem.c | 325 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun_private.h | 11 ++ dlls/scrrun/tests/filesystem.c | 32 ++++- 4 files changed, 362 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fee495d5fda56fa5b0c24…

1 0

Nikolay Sivov : scrrun: Invoke() takes interface pointer, not a pointer to pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f43b49fbedc697e33ca81a09d7dd18b4d6348ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b49fbedc697e33ca81a09d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 10:36:16 2012 -0500 scrrun: Invoke() takes interface pointer, not a pointer to pointer. --- dlls/scrrun/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ade3310..d79c061 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -127,7 +127,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, hr = get_typeinfo(IFileSystem3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Alexandre Julliard : winex11: Store the anti-aliasing flags in the device instead of the font cache.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 548e1264540e4ecc30b8ad55bd6146fd7d3df51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=548e1264540e4ecc30b8ad55b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 16:48:47 2012 +0100 winex11: Store the anti-aliasing flags in the device instead of the font cache. --- dlls/winex11.drv/xrender.c | 64 +++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b9d27fa..bafc622 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -146,7 +146,6 @@ typedef struct typedef struct { LFANDSIZE lfsz; - AA_Type aa_default; gsCacheEntryFormat * format[AA_MAXVALUE]; INT count; INT next; @@ -158,6 +157,7 @@ struct xrender_physdev X11DRV_PDEVICE *x11dev; HRGN region; enum wxr_format format; + UINT aa_flags; int cache_index; BOOL update_clip; Picture pict; @@ -789,10 +789,8 @@ static AA_Type aa_type_from_flags( UINT aa_flags ) { switch (aa_flags & 0x7f) { - case 0: case GGO_BITMAP: return AA_None; - case GGO_GRAY4_BITMAP: case WINE_GGO_GRAY16_BITMAP: return AA_Grey; case WINE_GGO_HRGB_BITMAP: @@ -860,6 +858,21 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; + switch (*aa_flags) + { + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + physdev->aa_flags = WINE_GGO_GRAY16_BITMAP; + break; + case 0: + physdev->aa_flags = GGO_BITMAP; + break; + default: + physdev->aa_flags = *aa_flags; + break; + } + TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); @@ -883,7 +896,6 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (physdev->cache_index != -1) dec_ref_cache( physdev->cache_index ); physdev->cache_index = GetCacheEntry( &lfsz ); - glyphsetCache[physdev->cache_index].aa_default = aa_type_from_flags( *aa_flags ); LeaveCriticalSection(&xrender_cs); return ret; } @@ -1014,7 +1026,7 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) * * Helper to ExtTextOut. Must be called inside xrender_cs */ -static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type format) +static void UploadGlyph(struct xrender_physdev *physDev, int glyph) { unsigned int buflen; char *buf; @@ -1023,40 +1035,17 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form XGlyphInfo gi; gsCacheEntry *entry = glyphsetCache + physDev->cache_index; gsCacheEntryFormat *formatEntry; - UINT ggo_format = GGO_GLYPH_INDEX; + UINT ggo_format = GGO_GLYPH_INDEX | physDev->aa_flags; + AA_Type format = aa_type_from_flags( physDev->aa_flags ); enum wxr_format wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; - switch(format) { - case AA_Grey: - ggo_format |= WINE_GGO_GRAY16_BITMAP; - break; - case AA_RGB: - ggo_format |= WINE_GGO_HRGB_BITMAP; - break; - case AA_BGR: - ggo_format |= WINE_GGO_HBGR_BITMAP; - break; - case AA_VRGB: - ggo_format |= WINE_GGO_VRGB_BITMAP; - break; - case AA_VBGR: - ggo_format |= WINE_GGO_VBGR_BITMAP; - break; - - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - ggo_format |= GGO_BITMAP; - break; - } - buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); if(buflen == GDI_ERROR) { if(format != AA_None) { format = AA_None; - entry->aa_default = AA_None; + physDev->aa_flags = GGO_BITMAP; ggo_format = GGO_GLYPH_INDEX | GGO_BITMAP; buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } @@ -1318,7 +1307,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, struct xrender_physdev *physdev = get_xrender_dev( dev ); gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; - AA_Type aa_type = AA_None; unsigned int idx; Picture pict, tile_pict = 0; XGlyphElt16 *elts; @@ -1354,17 +1342,15 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->cache_index; - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; for(idx = 0; idx < count; idx++) { if( !formatEntry ) { - UploadGlyph(physdev, wstr[idx], aa_type); - /* re-evaluate antialias since aa_default may have changed */ - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + UploadGlyph(physdev, wstr[idx]); + /* re-evaluate format entry since aa_flags may have changed */ + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { - UploadGlyph(physdev, wstr[idx], aa_type); + UploadGlyph(physdev, wstr[idx]); } } if (!formatEntry)

1 0

Alexandre Julliard : winex11: Use the default anti-aliasing parameters from gdi32.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 11875bf40a62ece03a7bec739f1e8c2007f9c28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11875bf40a62ece03a7bec739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:22:46 2012 +0100 winex11: Use the default anti-aliasing parameters from gdi32. --- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 8 - dlls/winex11.drv/xrender.c | 320 +++++++++------------------------------- 3 files changed, 67 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11875bf40a62ece03a7be…

1 0

Alexandre Julliard : gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5c02c352d9df394fa97a45965c8d32ddcb1abcd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02c352d9df394fa97a45965… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:32:15 2012 +0100 gdi32: Determine the default anti-aliasing parameters in the null driver SelectFont entry point. --- dlls/gdi32/driver.c | 5 -- dlls/gdi32/font.c | 93 ++++++++++++++++++++++------------------------ dlls/gdi32/freetype.c | 48 +++++++++++++++-------- dlls/gdi32/gdi_private.h | 4 +- 4 files changed, 76 insertions(+), 74 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 2ab0778..f5cadbe 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -552,11 +552,6 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush return brush; } -static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) -{ - return 0; -} - static HPALETTE nulldrv_SelectPalette( PHYSDEV dev, HPALETTE palette, BOOL bkgnd ) { return palette; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 09ea1b7..b289fa9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -260,8 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; - static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) { static const WCHAR desktop[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -279,28 +277,6 @@ static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) return err; } -static enum smoothing get_default_smoothing( void ) -{ - static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; - DWORD type, err; - - /* FIXME: Ignoring FontSmoothing for now since this is - set to off by default in wine.inf */ - - err = get_desktop_value( smoothing_type, &type ); - if (err) return aa_smoothing; - - switch (type) - { - case 1: /* FE_FONTSMOOTHINGSTANDARD */ - return aa_smoothing; - case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ - return subpixel_smoothing; - } - - return aa_smoothing; -} - static UINT get_subpixel_orientation( void ) { static const WCHAR smoothing_orientation[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g', @@ -321,39 +297,28 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) +static UINT get_default_smoothing( void ) { - enum smoothing smoothing; + static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; + DWORD type, err; - switch (lf->lfQuality) - { - case NONANTIALIASED_QUALITY: - return GGO_BITMAP; - case ANTIALIASED_QUALITY: - smoothing = aa_smoothing; - break; - case CLEARTYPE_QUALITY: - case CLEARTYPE_NATURAL_QUALITY: - smoothing = subpixel_smoothing; - break; - case DEFAULT_QUALITY: - case DRAFT_QUALITY: - case PROOF_QUALITY: - default: - smoothing = get_default_smoothing(); - } + /* FIXME: Ignoring FontSmoothing for now since this is + set to off by default in wine.inf */ - switch (smoothing) + err = get_desktop_value( smoothing_type, &type ); + if (err) return 0; + + switch (type) { - case subpixel_smoothing: - return get_subpixel_orientation(); - case aa_smoothing: + case 1: /* FE_FONTSMOOTHINGSTANDARD */ return GGO_GRAY4_BITMAP; - default: - return GGO_BITMAP; + case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ + return get_subpixel_orientation(); } + return 0; } + /*********************************************************************** * GdiGetCodePage (GDI32.@) */ @@ -697,6 +662,36 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) /*********************************************************************** + * nulldrv_SelectFont + */ +HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + LOGFONTW lf; + + if (*aa_flags) return 0; + + GetObjectW( font, sizeof(lf), &lf ); + switch (lf.lfQuality) + { + case NONANTIALIASED_QUALITY: + *aa_flags = GGO_BITMAP; + break; + case ANTIALIASED_QUALITY: + *aa_flags = GGO_GRAY4_BITMAP; + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + *aa_flags = get_subpixel_orientation(); + break; + default: + *aa_flags = get_default_smoothing(); + break; + } + return 0; +} + + +/*********************************************************************** * FONT_EnumInstance * * Note: plf is really an ENUMLOGFONTEXW, and ptm is a NEWTEXTMETRICEXW. diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 98c7b40..fcdcca9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4953,27 +4953,41 @@ found_face: done: if (ret) { - if (!*aa_flags) *aa_flags = ret->aa_flags; - if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); - /* fixup the antialiasing flags for that font */ - switch (*aa_flags) + switch (lf.lfQuality) { - case WINE_GGO_HRGB_BITMAP: - case WINE_GGO_HBGR_BITMAP: - case WINE_GGO_VRGB_BITMAP: - case WINE_GGO_VBGR_BITMAP: - if (is_subpixel_rendering_enabled()) break; - *aa_flags = GGO_GRAY4_BITMAP; - /* fall through */ - case GGO_GRAY4_BITMAP: - if (is_hinting_enabled()) + case NONANTIALIASED_QUALITY: + case ANTIALIASED_QUALITY: + next->funcs->pSelectFont( dev, hfont, aa_flags ); + break; + case CLEARTYPE_QUALITY: + case CLEARTYPE_NATURAL_QUALITY: + default: + if (!*aa_flags) *aa_flags = ret->aa_flags; + next->funcs->pSelectFont( dev, hfont, aa_flags ); + + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) { - WORD gasp_flags; - if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - *aa_flags = GGO_BITMAP; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } } - break; } dc->gdiFont = ret; physdev->font = ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 084245e..e3fe577 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -278,9 +278,6 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE /* enhmetafile.c */ extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; -/* font.c */ -extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; - /* freetype.c */ /* Undocumented structure filled in by GdiRealizationInfo */ @@ -394,6 +391,7 @@ extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *ggo_flags ) DECLSPEC_HIDDEN; extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, INT x_src, INT y_src, UINT start, UINT lines, const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN;

1 0

Sam Edwards : opengl32: Implement wglUseFontOutlines curve smoothing.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 2a208bd2ad6442db9b02f3002defce3d9db455b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a208bd2ad6442db9b02f3002… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Thu Nov 1 16:39:47 2012 -0600 opengl32: Implement wglUseFontOutlines curve smoothing. --- dlls/opengl32/wgl.c | 222 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 173 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a208bd2ad6442db9b02f…

1 0

Tatyana Fokina : ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 9d4fcaf2bbdb0ff148d623b78231441d73162086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4fcaf2bbdb0ff148d623b78… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Fri Nov 2 15:56:50 2012 +0400 ole32: Removed unused parametrs keyname and valuename in COM_RegReadPath. --- dlls/ole32/compobj.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2019b41..9c92c32 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -967,16 +967,14 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, * * Reads a registry value and expands it when necessary */ -static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen) +static DWORD COM_RegReadPath(HKEY hkeyroot, WCHAR * dst, DWORD dstlen) { DWORD ret; - HKEY key; DWORD keytype; WCHAR src[MAX_PATH]; DWORD dwLength = dstlen * sizeof(WCHAR); - if((ret = RegOpenKeyExW(hkeyroot, keyname, 0, KEY_READ, &key)) == ERROR_SUCCESS) { - if( (ret = RegQueryValueExW(key, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { + if( (ret = RegQueryValueExW(hkeyroot, NULL, NULL, &keytype, (LPBYTE)src, &dwLength)) == ERROR_SUCCESS ) { if (keytype == REG_EXPAND_SZ) { if (dstlen <= ExpandEnvironmentStringsW(src, dst, dstlen)) ret = ERROR_MORE_DATA; } else { @@ -992,9 +990,7 @@ static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *v } lstrcpynW(dst, src, dstlen); } - } - RegCloseKey (key); - } + } return ret; } @@ -1019,7 +1015,7 @@ static HRESULT apartment_hostobject(struct apartment *apt, TRACE("clsid %s, iid %s\n", debugstr_guid(&params->clsid), debugstr_guid(&params->iid)); - if (COM_RegReadPath(params->hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(params->hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(&params->clsid)); @@ -2383,7 +2379,7 @@ static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, else apartment_threaded = !apt->multi_threaded; - if (COM_RegReadPath(hkeydll, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) + if (COM_RegReadPath(hkeydll, dllpath, ARRAYSIZE(dllpath)) != ERROR_SUCCESS) { /* failure: CLSID is not found in registry */ WARN("class %s not registered inproc\n", debugstr_guid(rclsid)); @@ -4299,7 +4295,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { WCHAR dllpath[MAX_PATH+1]; - if (COM_RegReadPath(hkey, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + if (COM_RegReadPath(hkey, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) { static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; if (!strcmpiW(dllpath, wszOle32))

1 0

André Hentschel : d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7d1fa526e6b5e6588c819af7a4aa6f73ebaa4f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1fa526e6b5e6588c819af7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 18:06:03 2012 +0100 d3dx9_36: D3DXCreateFontIndirectW seems no longer to be a stub. --- dlls/d3dx9_36/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 65adff1..d2bc4bc 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -301,7 +301,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ IDirect3D9 *d3d; HRESULT hr; - FIXME("(%p, %p, %p): stub\n", device, desc, font); + TRACE("(%p, %p, %p)\n", device, desc, font); if( !device || !desc || !font ) return D3DERR_INVALIDCALL;

1 0

Detlef Riekenberg : winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 8a3211af4cdee3832514693a667c562c4aedfc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3211af4cdee3832514693a6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 4 23:01:08 2012 +0100 winhttp: Accept WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH as session option. --- dlls/winhttp/session.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3617b20..3889922 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -182,6 +182,9 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe case WINHTTP_OPTION_RECEIVE_TIMEOUT: session->recv_timeout = *(DWORD *)buffer; return TRUE; + case WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: + FIXME("WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: 0x%x\n", *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012