October 2012 - Wine-Commits

Nikolay Sivov : dwrite: Forward CreateRenderingParams() to CreateMonitorRenderingParams() with primary monitor.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 0990d37d983ded70a5d0fb5caa505997f3ddbcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0990d37d983ded70a5d0fb5ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:35:00 2012 +0400 dwrite: Forward CreateRenderingParams() to CreateMonitorRenderingParams() with primary monitor. --- dlls/dwrite/Makefile.in | 2 +- dlls/dwrite/main.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 1b68b2b..5a6564b 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite -IMPORTS = gdi32 +IMPORTS = user32 gdi32 C_SRCS = \ font.c \ diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 866fa88..c126ec1 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "initguid.h" #include "dwrite.h" @@ -249,8 +250,14 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) { - FIXME("(%p): stub\n", params); - return E_NOTIMPL; + HMONITOR monitor; + POINT pt; + + TRACE("(%p)\n", params); + + pt.x = pt.y = 0; + monitor = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY); + return IDWriteFactory_CreateMonitorRenderingParams(iface, monitor, params); } static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory *iface, HMONITOR monitor,

1 0

Nikolay Sivov : dwrite: Stub for CreateMonitorRenderingParams().
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 7707ca7d090e8f8f77dd5d552cb5640c99ec26f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7707ca7d090e8f8f77dd5d552… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:29:35 2012 +0400 dwrite: Stub for CreateMonitorRenderingParams(). --- dlls/dwrite/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index b4dfd3a..866fa88 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -256,8 +256,14 @@ static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory *iface, HMONITOR monitor, IDWriteRenderingParams **params) { - FIXME("(%p %p): stub\n", monitor, params); - return E_NOTIMPL; + static int fixme_once = 0; + + TRACE("(%p %p)\n", monitor, params); + + if (!fixme_once++) + FIXME("(%p): monitor setting ignored\n", monitor); + return IDWriteFactory_CreateCustomRenderingParams(iface, 0.0, 0.0, 0.0, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE_DEFAULT, params); } static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory *iface, FLOAT gamma, FLOAT enhancedContrast,

1 0

Nikolay Sivov : mlang: Rename IMultiLanguage3 method implementation functions to match interface name .
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 5f3e754935fa9e3d0a0863bec47f82d05a7946a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3e754935fa9e3d0a0863bec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:53:43 2012 +0400 mlang: Rename IMultiLanguage3 method implementation functions to match interface name. --- dlls/mlang/mlang.c | 120 ++++++++++++++++++++++++++-------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f3e754935fa9e3d0a086…

1 0

Nikolay Sivov : mlang: Move GetCharCodePages() to IMLangFontLink2 and forward to it.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: a67b97ce56682bc4eb131394c5eb9205d96c0d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67b97ce56682bc4eb131394c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:33:39 2012 +0400 mlang: Move GetCharCodePages() to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 59 ++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bcd3b11..1450e72 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1828,30 +1828,11 @@ static ULONG WINAPI fnIMLangFontLink_Release( static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( IMLangFontLink* iface, - WCHAR chSrc, - DWORD* pdwCodePages) + WCHAR ch_src, + DWORD* codepages) { - int i; - CHAR buf; - BOOL used_dc; - DWORD codePages; - - *pdwCodePages = 0; - - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) - { - WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, - &chSrc, 1, &buf, 1, NULL, &used_dc); - - /* If default char is not used, current codepage include the given symbol */ - if (!used_dc) - { - IMLangFontLink_CodePageToCodePages(iface, - mlang_data[i].family_codepage, &codePages); - *pdwCodePages |= codePages; - } - } - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetCharCodePages(&This->IMLangFontLink2_iface, ch_src, codepages); } static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( @@ -3180,11 +3161,35 @@ static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } -static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, - WCHAR chSrc, DWORD *pdwCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface, + WCHAR ch_src, DWORD *ret_codepages) { - FIXME("(%p)->%s %p\n",This, debugstr_wn(&chSrc,1),pdwCodePages); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + int i; + + TRACE("(%p)->(%s %p)\n", This, debugstr_wn(&ch_src, 1), ret_codepages); + + *ret_codepages = 0; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + BOOL used_dc; + CHAR buf; + + WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, + &ch_src, 1, &buf, 1, NULL, &used_dc); + + /* If default char is not used, current codepage include the given symbol */ + if (!used_dc) + { + DWORD codepages; + + IMLangFontLink2_CodePageToCodePages(iface, + mlang_data[i].family_codepage, &codepages); + *ret_codepages |= codepages; + } + } + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This,

1 0

Francois Gouget : shell32/tests: Improve the shell_execute{_ex}() tracing.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 483b8f7608e2b4688e866d4377f39559ee946446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483b8f7608e2b4688e866d437… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 1 03:30:47 2012 +0200 shell32/tests: Improve the shell_execute{_ex}() tracing. --- dlls/shell32/tests/shlexec.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f34e569..6cfb2b0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -75,18 +75,17 @@ static void init_event(const char* child_file) hEvent=CreateEvent(NULL, FALSE, FALSE, event_name); } -static void strcat_param(char* str, const char* param) +static void strcat_param(char* str, const char* name, const char* param) { - if (param!=NULL) + if (param) { - strcat(str, "\""); + if (str[strlen(str)-1] == '"') + strcat(str, ", "); + strcat(str, name); + strcat(str, "=\""); strcat(str, param); strcat(str, "\""); } - else - { - strcat(str, "null"); - } } static char shell_call[2048]=""; @@ -99,13 +98,10 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + strcat_param(shell_call, "verb", operation); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -162,13 +158,16 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, INT_PTR rc; strcpy(shell_call, "ShellExecuteEx("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + if (mask) + { + char smask[11]; + sprintf(smask, "0x%x", mask); + strcat_param(shell_call, "mask", smask); + } + strcat_param(shell_call, "verb", operation); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 906127fe29a6411238639761841bdf29f1033a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906127fe29a64112386397618… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 1 03:30:06 2012 +0200 Assorted spelling fixes. --- dlls/shell32/tests/shlexec.c | 2 +- dlls/wininet/urlcache.c | 4 ++-- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6fdde5c..f34e569 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -996,7 +996,7 @@ static void test_lpFile_parsed(void) rc > 32 ? "success" : "failure", rc, fileA ); - /* quoted lpFile not works only on real win95 and nt4 */ + /* quoted lpFile does not work on real win95 and nt4 */ testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 13633ac..249ac46 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2351,7 +2351,7 @@ static void handle_full_cache(void) } } -/* Enumerates entires in cache, allows cache unlocking between calls. */ +/* Enumerates entries in cache, allows cache unlocking between calls. */ static BOOL urlcache_next_entry(URLCACHE_HEADER *header, DWORD *hash_table_off, DWORD *hash_table_entry, struct _HASH_ENTRY **hash_entry, CACHEFILE_ENTRY **entry) { @@ -2456,7 +2456,7 @@ static int dword_cmp(const void *p1, const void *p2) * * PARAMETERS * cache_path [I] Which volume to free up from, or NULL if you don't care. - * size [I] How much percent of cache space should be free. + * size [I] How many percents of the cache should be free. * filter [I] Which entries can't be deleted (CacheEntryType) * * RETURNS diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 82ec153..64dd21d 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1820,7 +1820,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); - /* Skip preceeding whitespace */ + /* Skip preceding whitespace */ while (*curPos == ' ' || *curPos == '\t') curPos++; /* Show prompt before batch line IF echo is on and in batch program */

1 0

Nikolay Sivov : mlang: Move GetStrCodePages() to IMLangFontLink2 and forward to it.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: ea2b24d861bdc8bdafcf97e7c093a54ff96d4962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2b24d861bdc8bdafcf97e7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:44:05 2012 +0400 mlang: Move GetStrCodePages() to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 81 +++++++++++++++++++++++++++------------------------- 1 files changed, 42 insertions(+), 39 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1450e72..b6bf3ee 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1837,41 +1837,15 @@ static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( IMLangFontLink* iface, - const WCHAR* pszSrc, - LONG cchSrc, - DWORD dwPriorityCodePages, - DWORD* pdwCodePages, - LONG* pcchCodePages) + const WCHAR* src, + LONG src_len, + DWORD priority_cp, + DWORD* codepages, + LONG* ret_len) { - LONG i; - DWORD cps = 0; - - TRACE("(%p)->%s %d %x %p %p\n", iface, debugstr_wn(pszSrc, cchSrc), cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); - - if (pdwCodePages) *pdwCodePages = 0; - if (pcchCodePages) *pcchCodePages = 0; - - if (!pszSrc || !cchSrc || cchSrc < 0) - return E_INVALIDARG; - - for (i = 0; i < cchSrc; i++) - { - DWORD cp; - HRESULT ret; - - ret = IMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); - if (ret != S_OK) return E_FAIL; - - if (!cps) cps = cp; - else cps &= cp; - - /* FIXME: not tested */ - if (dwPriorityCodePages & cps) break; - } - - if (pdwCodePages) *pdwCodePages = cps; - if (pcchCodePages) *pcchCodePages = min( i + 1, cchSrc ); - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetStrCodePages(&This->IMLangFontLink2_iface, src, src_len, priority_cp, + codepages, ret_len); } static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( @@ -3192,12 +3166,41 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface return S_OK; } -static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, - const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages, - DWORD *pdwCodePages, LONG *pcchCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, + const WCHAR *src, LONG src_len, DWORD priority_cp, + DWORD *codepages, LONG *ret_len) { - return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, - pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); + MLang_impl *This = impl_from_IMLangFontLink2(iface); + LONG i; + DWORD cps = 0; + + TRACE("(%p)->(%s:%d %x %p %p)\n", This, debugstr_wn(src, src_len), src_len, priority_cp, + codepages, ret_len); + + if (codepages) *codepages = 0; + if (ret_len) *ret_len = 0; + + if (!src || !src_len || src_len < 0) + return E_INVALIDARG; + + for (i = 0; i < src_len; i++) + { + DWORD cp; + HRESULT ret; + + ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp); + if (ret != S_OK) return E_FAIL; + + if (!cps) cps = cp; + else cps &= cp; + + /* FIXME: not tested */ + if (priority_cp & cps) break; + } + + if (codepages) *codepages = cps; + if (ret_len) *ret_len = min( i + 1, src_len ); + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* iface,

1 0

Nikolay Sivov : dwrite: Store render params properties and implement accessing methods.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: f4f54e1fb78384dd4feb6712eff41c0e5490758b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f54e1fb78384dd4feb6712e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:11:44 2012 +0400 dwrite: Store render params properties and implement accessing methods. --- dlls/dwrite/main.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index e94abc5..b4dfd3a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -49,6 +49,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) struct renderingparams { IDWriteRenderingParams IDWriteRenderingParams_iface; LONG ref; + + FLOAT gamma; + FLOAT enh_contrast; + FLOAT cleartype_level; + DWRITE_PIXEL_GEOMETRY geometry; + DWRITE_RENDERING_MODE mode; }; static inline struct renderingparams *impl_from_IDWriteRenderingParams(IDWriteRenderingParams *iface) @@ -98,36 +104,36 @@ static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams *iface) static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 128.0; + TRACE("(%p)\n", This); + return This->gamma; } static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->enh_contrast; } static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->cleartype_level; } static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return DWRITE_PIXEL_GEOMETRY_FLAT; + TRACE("(%p)\n", This); + return This->geometry; } static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return DWRITE_RENDERING_MODE_DEFAULT; + TRACE("(%p)\n", This); + return This->mode; } static const struct IDWriteRenderingParamsVtbl renderingparamsvtbl = { @@ -141,7 +147,8 @@ static const struct IDWriteRenderingParamsVtbl renderingparamsvtbl = { renderingparams_GetRenderingMode }; -static HRESULT create_renderingparams(IDWriteRenderingParams **params) +static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT cleartype_level, + DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) { struct renderingparams *This; @@ -153,6 +160,12 @@ static HRESULT create_renderingparams(IDWriteRenderingParams **params) This->IDWriteRenderingParams_iface.lpVtbl = &renderingparamsvtbl; This->ref = 1; + This->gamma = gamma; + This->enh_contrast = enhancedContrast; + This->cleartype_level = cleartype_level; + This->geometry = geometry; + This->mode = mode; + *params = &This->IDWriteRenderingParams_iface; return S_OK; @@ -250,8 +263,8 @@ static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory *iface, FLOAT gamma, FLOAT enhancedContrast, FLOAT cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) { - FIXME("(%f %f %f %d %d %p): stub\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); - return create_renderingparams(params); + TRACE("(%f %f %f %d %d %p)\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); + return create_renderingparams(gamma, enhancedContrast, cleartype_level, geometry, mode, params); } static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader)

1 0

Huw Davies : gdi32: Correctly map the 256-level bitmap to the 5, 17 and 65-level bitmaps.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 0941fefbc0d81fb9af48a1f2b4d3164792a981dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0941fefbc0d81fb9af48a1f2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 1 10:47:17 2012 +0100 gdi32: Correctly map the 256-level bitmap to the 5, 17 and 65-level bitmaps. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f609758..20186fa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6023,7 +6023,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, for (row = 0, start = buf; row < height; row++) { for (col = 0, ptr = start; col < width; col++, ptr++) - *ptr = (((int)*ptr) * max_level + 128) / 256; + *ptr = (((int)*ptr) * (max_level + 1)) / 256; start += pitch; } }

1 0

Alexandre Julliard : user32: Always flush window surfaces in PeekMessage, even with PM_NOYIELD.
by Alexandre Julliard Oct. 1, 2012

Oct. 1, 2012

Module: wine Branch: master Commit: 5db9abaf81d243b887eabcc8348b0d1cf5d581d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db9abaf81d243b887eabcc83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 12:12:53 2012 +0200 user32: Always flush window surfaces in PeekMessage, even with PM_NOYIELD. --- dlls/user32/message.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2e81e3a..fa52207 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3685,7 +3685,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { - if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + if (flags & PM_NOYIELD) flush_window_surfaces( FALSE ); + else wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); return FALSE; }

1 0