November 2012 - Wine-commits

Piotr Caban : msvcp71: Fixed basic_streambuf<wchar> vtable.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 4455250a98b32f6f87eca76d24f26184ffa30f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4455250a98b32f6f87eca76d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:20 2012 +0100 msvcp71: Fixed basic_streambuf<wchar> vtable. --- dlls/msvcp71/ios.c | 115 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 70 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4455250a98b32f6f87eca…

1 0

Piotr Caban : msvcrt: Allocate buffer in fwrite function.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ec26342c88fb48954cad9044fecce336e1be31d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec26342c88fb48954cad9044f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 17:18:34 2012 +0100 msvcrt: Allocate buffer in fwrite function. --- dlls/msvcrt/file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 185b1e2..1b87dd2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2919,8 +2919,13 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } } if(wrcnt) { + int res; + + if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + msvcrt_alloc_buffer(file); + /* Flush buffer */ - int res=msvcrt_flush_buffer(file); + res=msvcrt_flush_buffer(file); if(!res) { int pwritten = MSVCRT__write(file->_file, ptr, wrcnt); if (pwritten <= 0)

1 0

Christian Costa : dmusic: Dump port params only once.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: db390b774bf46db6e8d4745759c7337e49beb9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=db390b774bf46db6e8d474575… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 1 17:30:49 2012 +0100 dmusic: Dump port params only once. --- dlls/dmusic/dmusic.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 111ff77..d914ce4 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -129,9 +129,6 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSI TRACE("(%p)->(%s, %p, %p, %p)\n", This, debugstr_dmguid(rclsid_port), port_params, port, unkouter); - if (TRACE_ON(dmusic)) - dump_DMUS_PORTPARAMS(port_params); - if (!rclsid_port) return E_POINTER; if (!port_params)

1 0

Christian Costa : dmusic: Display new ref in AddRef and Release.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 31a582989fc56dab4310a53b8e19ee2421a13424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a582989fc56dab4310a53b8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Nov 1 17:34:44 2012 +0100 dmusic: Display new ref in AddRef and Release. --- dlls/dmusic/clock.c | 25 ++++++++++++------------- dlls/dmusic/collection.c | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 4d9a1b4..2a8cd09 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -45,30 +45,29 @@ static HRESULT WINAPI IReferenceClockImpl_QueryInterface(IReferenceClock *iface, static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) { - IReferenceClockImpl *This = impl_from_IReferenceClock(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); + DMUSIC_LockModule(); - return refCount; + return ref; } static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) { - IReferenceClockImpl *This = impl_from_IReferenceClock(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) + HeapFree(GetProcessHeap(), 0, This); - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); - return refCount; + return ref; } /* IReferenceClockImpl IReferenceClock part: */ diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c06d988..c1545b2 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -80,7 +80,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); DMUSIC_LockModule(); @@ -92,7 +92,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref = %u)\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Piotr Caban : msvcp90: Fixed incorrect sentry object usage.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 0280c5fb5f8a7a69725d7b5294906c31f9de7387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0280c5fb5f8a7a69725d7b529… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 20:05:51 2012 +0100 msvcp90: Fixed incorrect sentry object usage. --- dlls/msvcp100/ios.c | 3 --- dlls/msvcp60/ios.c | 3 --- dlls/msvcp71/ios.c | 3 --- dlls/msvcp90/ios.c | 3 --- 4 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 026ee99..608e9f5 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -6039,7 +6039,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -7160,7 +7159,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -7189,7 +7187,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3a5fa52..bd3eb7d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7432,7 +7432,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -8678,7 +8677,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -8707,7 +8705,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 043ac64..fff2abc 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7773,7 +7773,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9041,7 +9040,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9070,7 +9068,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7759b72..d03f3a9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7797,7 +7797,6 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_char_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_char_setstate(base, IOSTATE_failbit); @@ -9052,7 +9051,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); @@ -9081,7 +9079,6 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - basic_istream_wchar_sentry_destroy(this); if(ret.off==-1 && ret.pos==0 && ret.state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit);

1 0

Piotr Caban : msvcp90: Use critical sections in mutex object.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 5e1cbccebf9a796782402038453833fa33b9917f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1cbccebf9a7967824020384… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 2 20:06:08 2012 +0100 msvcp90: Use critical sections in mutex object. --- dlls/msvcp100/misc.c | 18 ++++++++++++++---- dlls/msvcp100/msvcp.h | 2 +- dlls/msvcp60/misc.c | 16 ++++++++++++---- dlls/msvcp71/misc.c | 18 ++++++++++++++---- dlls/msvcp71/msvcp.h | 2 +- dlls/msvcp90/misc.c | 18 ++++++++++++++---- dlls/msvcp90/msvcp90.h | 2 +- 7 files changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/msvcp100/misc.c b/dlls/msvcp100/misc.c index 40f9fed..5854c5e 100644 --- a/dlls/msvcp100/misc.c +++ b/dlls/msvcp100/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock(a)_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock(a)_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } /* ?_Mutex_Lock(a)_Mutex@std@@CAXPAV12@@Z */ diff --git a/dlls/msvcp100/msvcp.h b/dlls/msvcp100/msvcp.h index 08c3471..de8d9e3 100644 --- a/dlls/msvcp100/msvcp.h +++ b/dlls/msvcp100/msvcp.h @@ -205,7 +205,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*); diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index f0796a4..9c840b7 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -31,7 +31,13 @@ /* ??0_Mutex(a)std@@QEAA(a)XZ */ mutex* mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -39,21 +45,23 @@ mutex* mutex_ctor(mutex *this) /* ??1_Mutex(a)std@@QEAA(a)XZ */ void mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock(a)_Mutex@std@@QAEXXZ */ /* ?_Lock(a)_Mutex@std@@QEAAXXZ */ void mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock(a)_Mutex@std@@QAEXXZ */ /* ?_Unlock(a)_Mutex@std@@QEAAXXZ */ void mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } static CRITICAL_SECTION lockit_cs; diff --git a/dlls/msvcp71/misc.c b/dlls/msvcp71/misc.c index 8615a51..21ca929 100644 --- a/dlls/msvcp71/misc.c +++ b/dlls/msvcp71/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock(a)_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock(a)_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; diff --git a/dlls/msvcp71/msvcp.h b/dlls/msvcp71/msvcp.h index aea85cc..6f9e266 100644 --- a/dlls/msvcp71/msvcp.h +++ b/dlls/msvcp71/msvcp.h @@ -201,7 +201,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c8c4122..8b3df21 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -33,7 +33,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcp); DEFINE_THISCALL_WRAPPER(mutex_ctor, 4) mutex* __thiscall mutex_ctor(mutex *this) { - this->mutex = CreateMutexW(NULL, FALSE, NULL); + CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); + if(!cs) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + InitializeCriticalSection(cs); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); + this->mutex = cs; return this; } @@ -42,7 +50,9 @@ mutex* __thiscall mutex_ctor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_dtor, 4) void __thiscall mutex_dtor(mutex *this) { - CloseHandle(this->mutex); + ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(this->mutex); + MSVCRT_operator_delete(this->mutex); } /* ?_Lock(a)_Mutex@std@@QAEXXZ */ @@ -50,7 +60,7 @@ void __thiscall mutex_dtor(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_lock, 4) void __thiscall mutex_lock(mutex *this) { - WaitForSingleObject(this->mutex, INFINITE); + EnterCriticalSection(this->mutex); } /* ?_Unlock(a)_Mutex@std@@QAEXXZ */ @@ -58,7 +68,7 @@ void __thiscall mutex_lock(mutex *this) DEFINE_THISCALL_WRAPPER(mutex_unlock, 4) void __thiscall mutex_unlock(mutex *this) { - ReleaseMutex(this->mutex); + LeaveCriticalSection(this->mutex); } /* ?_Mutex_Lock(a)_Mutex@std@@CAXPAV12@@Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 1108591..2496ebcd 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -201,7 +201,7 @@ void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */ typedef struct { - void *mutex; + void *mutex; } mutex; mutex* __thiscall mutex_ctor(mutex*);

1 0

Andrew Eikum : oleaut32: helpcontext is not an offset.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 561e46c435b824489922476fb448531e74ca482e URL: http://source.winehq.org/git/wine.git/?a=commit;h=561e46c435b824489922476fb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 2 12:53:36 2012 -0500 oleaut32: helpcontext is not an offset. --- dlls/oleaut32/typelib.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3d94164..cb179f9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4092,9 +4092,6 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pOtherTypeInfoBlks[i].name_offs + pNameTable); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; - (*ppTypeInfoImpl)->DocString = TLB_MultiByteToBSTR( - pOtherTypeInfoBlks[i].helpcontext + - pNameTable); (*ppTypeInfoImpl)->TypeAttr.guid = pOtherTypeInfoBlks[i].uuid; (*ppTypeInfoImpl)->TypeAttr.typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->TypeAttr.wMajorVerNum = pTIHeader->major_version;

1 0

Alexandre Julliard : gdi32: Add a parameter to return anti-aliasing flags in the SelectFont driver entry point .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 6164d533a9bbfc40ed0fbc0c6c2b95c493da1c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6164d533a9bbfc40ed0fbc0c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 30 19:37:31 2012 +0100 gdi32: Add a parameter to return anti-aliasing flags in the SelectFont driver entry point. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 4 ++-- dlls/gdi32/font.c | 3 ++- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/wineps.drv/font.c | 6 +++--- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/xrender.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ca21d4d..2ab0778 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -552,7 +552,7 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush return brush; } -static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font ) +static HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { return 0; } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 03bb829..3dd2923 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -105,7 +105,7 @@ extern BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, extern HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HBRUSH EMFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle ) DECLSPEC_HIDDEN; +extern HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN EMFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DECLSPEC_HIDDEN; extern INT EMFDRV_SetArcDirection( PHYSDEV dev, INT arcDirection ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 905560d..8dd88f6 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -277,7 +277,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont ) /*********************************************************************** * EMFDRV_SelectFont */ -HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont ) +HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*)dev; EMRSELECTOBJECT emr; @@ -315,7 +315,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont ) return 0; done: dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); - dev->funcs->pSelectFont( dev, hFont ); + dev->funcs->pSelectFont( dev, hFont, aa_flags ); return hFont; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6684660..6179230 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -716,6 +716,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) HGDIOBJ ret = 0; DC *dc = get_dc_ptr( hdc ); PHYSDEV physdev; + UINT aa_flags = 0; if (!dc) return 0; @@ -726,7 +727,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) } physdev = GET_DC_PHYSDEV( dc, pSelectFont ); - if (physdev->funcs->pSelectFont( physdev, handle )) + if (physdev->funcs->pSelectFont( physdev, handle, &aa_flags )) { ret = dc->hFont; dc->hFont = handle; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ca11968..b747f6f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4429,7 +4429,7 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) /************************************************************* * freetype_SelectFont */ -static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) +static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { struct freetype_physdev *physdev = get_freetype_dev( dev ); GdiFont *ret; diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index d04cc8f..e1a03bb 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -105,7 +105,7 @@ extern BOOL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, extern HBITMAP MFDRV_SelectBitmap( PHYSDEV dev, HBITMAP handle ) DECLSPEC_HIDDEN; extern HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL MFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) DECLSPEC_HIDDEN; -extern HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT handle ) DECLSPEC_HIDDEN; +extern HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT handle, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN handle, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HPALETTE MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceBackground) DECLSPEC_HIDDEN; extern UINT MFDRV_RealizePalette(PHYSDEV dev, HPALETTE hPalette, BOOL primary) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index ca70117..07e66b7 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -285,7 +285,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo /*********************************************************************** * MFDRV_SelectFont */ -HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont ) +HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LOGFONTW font; INT16 index; diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index abc9b92..f04d069 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); /*********************************************************************** * SelectFont (WINEPS.@) */ -HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) +HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); @@ -114,14 +114,14 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) physDev->font.escapement = lf.lfEscapement; physDev->font.set = FALSE; - if (!subst && ((ret = next->funcs->pSelectFont( next, hfont )))) + if (!subst && ((ret = next->funcs->pSelectFont( next, hfont, aa_flags )))) { PSDRV_SelectDownloadFont(dev); return ret; } PSDRV_SelectBuiltinFont(dev, hfont, &lf, FaceName); - next->funcs->pSelectFont( next, 0 ); /* tell next driver that we selected a device font */ + next->funcs->pSelectFont( next, 0, aa_flags ); /* tell next driver that we selected a device font */ return hfont; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 52f84e7..1e76bef 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -444,7 +444,7 @@ extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott extern BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) DECLSPEC_HIDDEN; extern HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont ) DECLSPEC_HIDDEN; +extern HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF PSDRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 389f684..d1993f7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1036,12 +1036,12 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz) /********************************************************************** * xrenderdrv_SelectFont */ -static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont ) +static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) { LFANDSIZE lfsz; struct xrender_physdev *physdev = get_xrender_dev( dev ); PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectFont ); - HFONT ret = next->funcs->pSelectFont( next, hfont ); + HFONT ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 1f6376c..f6be211d 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -153,7 +153,7 @@ struct gdi_dc_funcs HBITMAP (*pSelectBitmap)(PHYSDEV,HBITMAP); HBRUSH (*pSelectBrush)(PHYSDEV,HBRUSH,const struct brush_pattern*); BOOL (*pSelectClipPath)(PHYSDEV,INT); - HFONT (*pSelectFont)(PHYSDEV,HFONT); + HFONT (*pSelectFont)(PHYSDEV,HFONT,UINT*); HPALETTE (*pSelectPalette)(PHYSDEV,HPALETTE,BOOL); HPEN (*pSelectPen)(PHYSDEV,HPEN,const struct brush_pattern*); INT (*pSetArcDirection)(PHYSDEV,INT); @@ -197,7 +197,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 44 +#define WINE_GDI_DRIVER_VERSION 45 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */

1 0

Alexandre Julliard : gdi32: Store the anti-aliasing flags in the DC when selecting a font.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ccc034c27e7595662c9c02b86de1b660ac680536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc034c27e7595662c9c02b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 15:55:29 2012 +0100 gdi32: Store the anti-aliasing flags in the DC when selecting a font. --- dlls/gdi32/dibdrv/graphics.c | 8 ++++---- dlls/gdi32/font.c | 20 ++++++++------------ dlls/gdi32/freetype.c | 2 ++ dlls/gdi32/gdi_private.h | 3 ++- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 450ecad..6f936e0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -665,7 +665,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); struct clipped_rects clipped_rects; - UINT aa_flags; + DC *dc; RECT bounds; DWORD text_color; struct intensity_range ranges[17]; @@ -700,10 +700,10 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); - aa_flags = get_font_aa_flags( dev->hdc ); - - render_string( dev->hdc, &pdev->dib, x, y, flags, aa_flags, str, count, dx, + dc = get_dc_ptr( dev->hdc ); + render_string( dev->hdc, &pdev->dib, x, y, flags, dc->aa_flags, str, count, dx, text_color, ranges, &clipped_rects, &bounds ); + release_dc_ptr( dc ); done: add_clipped_bounds( pdev, &bounds, pdev->clip ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6179230..d5396ff 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -390,9 +390,8 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -UINT get_font_aa_flags( HDC hdc ) +UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - LOGFONTW lf; WORD gasp_flags; static int hinter = -1; static int subpixel_enabled = -1; @@ -406,9 +405,6 @@ UINT get_font_aa_flags( HDC hdc ) } else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - GetObjectW( GetCurrentObject( hdc, OBJ_FONT ), sizeof(lf), &lf ); - if (lf.lfQuality == NONANTIALIASED_QUALITY) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; @@ -417,8 +413,10 @@ UINT get_font_aa_flags( HDC hdc ) subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; } - switch (lf.lfQuality) + switch (lf->lfQuality) { + case NONANTIALIASED_QUALITY: + return GGO_BITMAP; case ANTIALIASED_QUALITY: smoothing = aa_smoothing; break; @@ -731,6 +729,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { ret = dc->hFont; dc->hFont = handle; + dc->aa_flags = aa_flags ? aa_flags : GGO_BITMAP; update_font_code_page( dc ); GDI_dec_ref_count( ret ); } @@ -1948,7 +1947,7 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect LPCWSTR str, UINT count, const INT *dx ) { DC *dc = get_nulldrv_dc( dev ); - UINT aa_flags, i; + UINT i; DWORD err; HGDIOBJ orig; HPEN pen; @@ -1970,18 +1969,15 @@ BOOL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect if (!count) return TRUE; - aa_flags = get_font_aa_flags( dev->hdc ); - - if (aa_flags != GGO_BITMAP) + if (dc->aa_flags != GGO_BITMAP) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer; struct gdi_image_bits bits; struct bitblt_coords src, dst; PHYSDEV dst_dev; - /* FIXME Subpixel modes */ - aa_flags = GGO_GRAY4_BITMAP; + UINT aa_flags = GGO_GRAY4_BITMAP; dst_dev = GET_DC_PHYSDEV( dc, pPutImage ); src.visrect = get_total_extents( dev->hdc, x, y, flags, aa_flags, str, count, dx ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b747f6f..ad179f1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4459,6 +4459,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) GetObjectW( hfont, sizeof(lf), &lf ); lf.lfWidth = abs(lf.lfWidth); + if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + can_use_bitmap = GetDeviceCaps(dev->hdc, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 792a9e4..084245e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -88,6 +88,7 @@ typedef struct tagDC RECT vis_rect; /* visible rectangle in screen coords */ RECT device_rect; /* rectangle for the whole device */ int pixel_format; /* pixel format (for memory DCs) */ + UINT aa_flags; /* anti-aliasing flags to pass to GetGlyphOutline for current font */ FLOAT miterLimit; int flags; @@ -278,7 +279,7 @@ extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DE extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; /* font.c */ -extern UINT get_font_aa_flags( HDC hdc ) DECLSPEC_HIDDEN; +extern UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alexandre Julliard : gdi32: Disable anti-aliasing when necessary in the various drivers.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 9cdb0e1ca6d9cdbe5d40d5a544629d6f21baff2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdb0e1ca6d9cdbe5d40d5a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 16:07:51 2012 +0100 gdi32: Disable anti-aliasing when necessary in the various drivers. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 13 +++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 1 + dlls/gdi32/font.c | 8 -------- dlls/gdi32/mfdrv/objects.c | 1 + dlls/wineps.drv/font.c | 2 ++ dlls/winex11.drv/init.c | 12 +++++++++++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 0b6013d..4d84452 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -484,7 +484,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SelectBitmap, /* pSelectBitmap */ dibdrv_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + dibdrv_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 564fe95..1cd87e3 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -141,6 +141,7 @@ extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT extern BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ellipse_width, INT ellipse_height ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 6f936e0..0b54188 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -712,6 +712,19 @@ done: } /*********************************************************************** + * dibdrv_SelectFont + */ +HFONT dibdrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (pdev->dib.bit_count <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, font, aa_flags ); +} + +/*********************************************************************** * dibdrv_Arc */ BOOL dibdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 8dd88f6..4c85fe7 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -314,6 +314,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont, UINT *aa_flags ) if(!EMFDRV_WriteRecord( dev, &emr.emr )) return 0; done: + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); dev->funcs->pSelectFont( dev, hFont, aa_flags ); return hFont; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d5396ff..a2d4d3e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -397,14 +397,6 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) static int subpixel_enabled = -1; enum smoothing smoothing; - if (GetObjectType( hdc ) == OBJ_MEMDC) - { - BITMAP bm; - GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bm), &bm ); - if (bm.bmBitsPixel <= 8) return GGO_BITMAP; - } - else if (GetDeviceCaps( hdc, BITSPIXEL ) <= 8) return GGO_BITMAP; - if (hinter == -1 || subpixel_enabled == -1) { RASTERIZER_STATUS status; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 07e66b7..697644d 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -290,6 +290,7 @@ HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) LOGFONTW font; INT16 index; + *aa_flags = GGO_BITMAP; /* no point in anti-aliasing on metafiles */ index = MFDRV_FindObject(dev, hfont); if( index < 0 ) { diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index f04d069..4888af3 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -47,6 +47,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (!GetObjectW( hfont, sizeof(lf), &lf )) return 0; + *aa_flags = GGO_BITMAP; /* no anti-aliasing on printer devices */ + TRACE("FaceName = %s Height = %d Italic = %d Weight = %d\n", debugstr_w(lf.lfFaceName), lf.lfHeight, lf.lfItalic, lf.lfWeight); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d729fd0..7cf318f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -295,6 +295,16 @@ static INT X11DRV_GetDeviceCaps( PHYSDEV dev, INT cap ) } +/*********************************************************************** + * SelectFont + */ +static HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) +{ + if (default_visual.depth <= 8) *aa_flags = GGO_BITMAP; /* no anti-aliasing on <= 8bpp */ + dev = GET_NEXT_PHYSDEV( dev, pSelectFont ); + return dev->funcs->pSelectFont( dev, hfont, aa_flags ); +} + /********************************************************************** * ExtEscape (X11DRV.@) */ @@ -532,7 +542,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSelectBitmap */ X11DRV_SelectBrush, /* pSelectBrush */ NULL, /* pSelectClipPath */ - NULL, /* pSelectFont */ + X11DRV_SelectFont, /* pSelectFont */ NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */

1 0