May 2010 - Wine-commits - list.winehq.org

Aric Stewart : usp10: Use font chartype only as a fallback if we do not know the characters script already .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: a27e03bf5d796cabb8ec99eec418867254e17d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27e03bf5d796cabb8ec99eec… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:10:56 2010 -0500 usp10: Use font chartype only as a fallback if we do not know the characters script already. --- dlls/usp10/shape.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 71022ef..55c8a80 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -347,13 +347,29 @@ static UINT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* f return glyph; } -static const char* get_opentype_script(HDC hdc) +static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa) { + UINT charset; + + switch (psa->eScript) + { + case Script_Arabic: + return "arab"; + case Script_Syriac: + return "syrc"; + case Script_Hebrew: + return "hebr"; + case Script_Latin: + case Script_Numeric: + case Script_CR: + case Script_LF: + return "latn"; + } + /* - * I am not sure if this is the correct way to generate our script tag + * fall back to the font charset */ - UINT charset = GetTextCharsetInfo(hdc, NULL, 0x0); - + charset = GetTextCharsetInfo(hdc, NULL, 0x0); switch (charset) { case ANSI_CHARSET: return "latn"; @@ -375,7 +391,7 @@ static const char* get_opentype_script(HDC hdc) } } -static WORD get_GSUB_feature_glyph(HDC hdc, void* GSUB_Table, UINT glyph, const char* feat) +static WORD get_GSUB_feature_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB_Table, UINT glyph, const char* feat) { const GSUB_Header *header; const GSUB_Script *script; @@ -387,7 +403,7 @@ static WORD get_GSUB_feature_glyph(HDC hdc, void* GSUB_Table, UINT glyph, const header = GSUB_Table; - script = GSUB_get_script_table(header, get_opentype_script(hdc)); + script = GSUB_get_script_table(header, get_opentype_script(hdc,psa)); if (!script) { TRACE("Script not found\n"); @@ -509,7 +525,7 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC WORD newGlyph = pwOutGlyphs[i]; if (psc->GSUB_Table) - newGlyph = get_GSUB_feature_glyph(hdc, psc->GSUB_Table, pwOutGlyphs[i], contextual_features[context_shape[i]]); + newGlyph = get_GSUB_feature_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs[i], contextual_features[context_shape[i]]); if (newGlyph == pwOutGlyphs[i] && pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */

1 0

Aric Stewart : gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: ec62c33d79dd99e4ced80a1f248b1d6d98366b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec62c33d79dd99e4ced80a1f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:11:34 2010 -0500 gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string. --- dlls/gdi32/bidi.c | 5 ++++- dlls/gdi32/font.c | 9 +++++++-- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 20fde13..82691ed 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -352,7 +352,8 @@ BOOL BIDI_Reorder( LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -637,6 +638,8 @@ BOOL BIDI_Reorder( done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 963dadc..17fb381 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1702,16 +1702,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ GetCharacterPlacementW( } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 10ff13e..d1cb66b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -356,7 +356,7 @@ typedef struct tagBITMAPOBJ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Handle Ligature Substitution Subtable from GSUB.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6c73258725b7099f028a98443e676f8ed243f427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c73258725b7099f028a98443… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:12:03 2010 -0500 usp10: Handle Ligature Substitution Subtable from GSUB. This also involves a restructuring of the handling of glyph lookups from GSUB since Ligature Substitution can result in many glyphs being replaced with 1 glyph, and future looksup may result in one glyph being replaces with many glyphs. --- dlls/usp10/shape.c | 247 ++++++++++++++++++++++++++++++++---------- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 190 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c73258725b7099f028a9…

1 0

Aric Stewart : usp10: Apply the GSUB 'rlig' feature for Required ligature substitution.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 18b310a70373fe3c92195a03de82677a90a3f68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b310a70373fe3c92195a03d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:12:28 2010 -0500 usp10: Apply the GSUB 'rlig' feature for Required ligature substitution. --- dlls/usp10/shape.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 85fbb64..d7e9811 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -70,6 +70,8 @@ enum joined_forms { (ULONG)_x1 ) #define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define GSUB_E_NOFEATURE -2 +#define GSUB_E_NOGLYPH -1 typedef struct { DWORD version; @@ -348,7 +350,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN } } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -413,7 +415,7 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, } } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -433,13 +435,13 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; - int out_index = -1; + int out_index = GSUB_E_NOGLYPH; const GSUB_LookupList *lookup; lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); @@ -448,10 +450,10 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe for (i = 0; i < GET_BE_WORD(feature->LookupCount); i++) { out_index = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[i]), glyphs, glyph_index, write_dir, glyph_count); - if (out_index != -1) + if (out_index != GSUB_E_NOGLYPH) break; } - if (out_index == -1) + if (out_index == GSUB_E_NOGLYPH) TRACE("lookups found no glyphs\n"); return out_index; } @@ -508,7 +510,7 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB const GSUB_Feature *feature; if (!GSUB_Table) - return -1; + return GSUB_E_NOFEATURE; header = GSUB_Table; @@ -516,19 +518,19 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB if (!script) { TRACE("Script not found\n"); - return -1; + return GSUB_E_NOFEATURE; } language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ if (!language) { TRACE("Language not found\n"); - return -1; + return GSUB_E_NOFEATURE; } feature = GSUB_get_feature(header, language, feat); if (!feature) { TRACE("%s feature not found\n",feat); - return -1; + return GSUB_E_NOFEATURE; } TRACE("applying feature %s\n",feat); return GSUB_apply_feature(header, feature, glyphs, index, write_dir, glyph_count); @@ -647,9 +649,9 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC { INT nextIndex; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); - if (nextIndex != -1) + if (nextIndex > GSUB_E_NOGLYPH) i = nextIndex; - shaped = (nextIndex != -1); + shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) @@ -666,6 +668,23 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC } } + /* Required ligature substitution */ + if (psc->GSUB_Table) + { + i = 0; + while(i < *pcGlyphs) + { + INT nextIndex; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, "rlig"); + if (nextIndex > GSUB_E_NOGLYPH) + i = nextIndex; + else if (nextIndex == GSUB_E_NOFEATURE) + break; + else + i++; + } + } + HeapFree(GetProcessHeap(),0,context_shape); HeapFree(GetProcessHeap(),0,context_type); }

1 0

Andrey Turkin : oleaut32: Fix ctl2_alloc_importfile offset calculations.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 9724c6d774f1834f3ccf61047577757277ca639c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9724c6d774f1834f3ccf61047… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:48:19 2010 +0400 oleaut32: Fix ctl2_alloc_importfile offset calculations. --- dlls/oleaut32/typelib2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b5ebea3..70454dc 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -779,8 +779,8 @@ static int ctl2_alloc_importfile( encoded_string[0] |= 1; for (offset = 0; offset < This->typelib_segdir[MSFT_SEG_IMPORTFILES].length; - offset += ((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff) - | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 0xc) { + offset += ((((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff00) + | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 5) & 0xfffc) + 0xc) { if (!memcmp(encoded_string, This->typelib_segment_data[MSFT_SEG_IMPORTFILES] + offset + 0xc, length)) return offset; }

1 0

Andrey Turkin : oleaut32: Store correct offset for imported files in ICreateTypeInfo::AddRefTypeInfo .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 61dfc28b75bafc943fa7c35508b244dcbdd16bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dfc28b75bafc943fa7c3550… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:49:48 2010 +0400 oleaut32: Store correct offset for imported files in ICreateTypeInfo::AddRefTypeInfo. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 70454dc..b5d85ff 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1681,7 +1681,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( } guid.guid = tlibattr->guid; - guid.hreftype = This->typelib->typelib_guids*12+2; + guid.hreftype = This->typelib->typelib_segdir[MSFT_SEG_IMPORTFILES].length+2; guid.next_hash = -1; guid_offset = ctl2_alloc_guid(This->typelib, &guid);

1 0

Andrey Turkin : oleaut32: Don't rewrite name's hreftype.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 234afb88e8f62c6891a32b5848295cb8b84535ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=234afb88e8f62c6891a32b584… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:49:29 2010 +0400 oleaut32: Don't rewrite name's hreftype. --- dlls/oleaut32/typelib2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b5d85ff..aa14d22 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2239,7 +2239,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( iter->name = offset; namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; - *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; + if (*((INT*)namedata) == -1) + *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; len = iter->u.data[0]/4 - iter->u.data[5]*3;

1 0

Sven Baars : msi: Fix English translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: cc9e357ecfffaeec5e7858e4c670ecfca506d8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9e357ecfffaeec5e7858e4c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:11:32 2010 +0200 msi: Fix English translation. --- dlls/msi/msi_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_En.rc b/dlls/msi/msi_En.rc index 4205758..c506e00 100644 --- a/dlls/msi/msi_En.rc +++ b/dlls/msi/msi_En.rc @@ -30,7 +30,7 @@ STRINGTABLE DISCARDABLE 9 "insert disk %s" 10 "Windows Installer %s\n\n" \ "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ + "msiexec command {required parameter} [optional parameter]\n\n" \ "Install a product:\n" \ "\t/i {package|productcode} [property]\n" \ "\t/package {package|productcode} [property]\n" \

1 0

Alexandre Julliard : winhlp32: Get rid of the shadow window, it' s ugly and causes z-order issues.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 84412cb0f5f376a3a14e7b2e54ae8b34d0dbe95c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84412cb0f5f376a3a14e7b2e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 22 11:24:03 2010 +0200 winhlp32: Get rid of the shadow window, it's ugly and causes z-order issues. --- programs/winhlp32/string.c | 1 - programs/winhlp32/winhelp.c | 32 +------------------------------- programs/winhlp32/winhelp.h | 1 - 3 files changed, 1 insertions(+), 33 deletions(-) diff --git a/programs/winhlp32/string.c b/programs/winhlp32/string.c index b931948..4c84697 100644 --- a/programs/winhlp32/string.c +++ b/programs/winhlp32/string.c @@ -22,7 +22,6 @@ const char MAIN_WIN_CLASS_NAME[] = "MS_WINHELP"; const char BUTTON_BOX_WIN_CLASS_NAME[] = "WHButtonBox"; -const char SHADOW_WIN_CLASS_NAME[] = "WHShadow"; const char HISTORY_WIN_CLASS_NAME[] = "WHHistory"; const char STRING_BUTTON[] = "BUTTON"; diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index b6da3fa..2396917 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -570,7 +570,6 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win) WINHELP_DeleteButtons(win); if (win->page) WINHELP_DeletePageLinks(win->page); - if (win->hShadowWnd) DestroyWindow(win->hShadowWnd); if (win->hHistoryWnd) DestroyWindow(win->hHistoryWnd); DeleteObject(win->hBrush); @@ -843,7 +842,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe if (bPopup) { DWORD mask = SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0); - RECT rect; win->font_scale = Globals.active_win->font_scale; WINHELP_SetupText(hTextWnd, win, wpage->relative); @@ -853,17 +851,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask | ENM_REQUESTRESIZE); SendMessage(hTextWnd, EM_REQUESTRESIZE, 0, 0); SendMessage(hTextWnd, EM_SETEVENTMASK, 0, mask); - - GetWindowRect(win->hMainWnd, &rect); - win->hShadowWnd = CreateWindowEx(WS_EX_TOOLWINDOW, SHADOW_WIN_CLASS_NAME, - "", WS_POPUP | WS_VISIBLE, - rect.left + SHADOW_DX, rect.top + SHADOW_DY, - rect.right - rect.left, - rect.bottom - rect.top, - Globals.active_win->hMainWnd, 0, - Globals.hInstance, NULL); - SetWindowPos(win->hMainWnd, win->hShadowWnd, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE); } else { @@ -1198,16 +1185,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara return DefWindowProc(hWnd, msg, wParam, lParam); } -/*********************************************************************** - * - * WINHELP_ShadowWndProc - */ -static LRESULT CALLBACK WINHELP_ShadowWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - if (WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL)) return 0; - return WINHELP_CheckPopup(hWnd, msg, wParam, lParam, NULL) ? 0L : DefWindowProc(hWnd, msg, wParam, lParam); -} - /************************************************************************** * cb_KWBTree * @@ -1629,7 +1606,7 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search) */ static BOOL WINHELP_RegisterWinClasses(void) { - WNDCLASSEX class_main, class_button_box, class_shadow, class_history; + WNDCLASSEX class_main, class_button_box, class_history; class_main.cbSize = sizeof(class_main); class_main.style = CS_HREDRAW | CS_VREDRAW; @@ -1652,19 +1629,12 @@ static BOOL WINHELP_RegisterWinClasses(void) class_button_box.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); class_button_box.lpszClassName = BUTTON_BOX_WIN_CLASS_NAME; - class_shadow = class_main; - class_shadow.lpfnWndProc = WINHELP_ShadowWndProc; - class_shadow.cbWndExtra = 0; - class_shadow.hbrBackground = (HBRUSH)(COLOR_3DDKSHADOW+1); - class_shadow.lpszClassName = SHADOW_WIN_CLASS_NAME; - class_history = class_main; class_history.lpfnWndProc = WINHELP_HistoryWndProc; class_history.lpszClassName = HISTORY_WIN_CLASS_NAME; return (RegisterClassEx(&class_main) && RegisterClassEx(&class_button_box) && - RegisterClassEx(&class_shadow) && RegisterClassEx(&class_history)); } diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index e163d90..519dec2 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -76,7 +76,6 @@ typedef struct tagWinHelp HLPFILE_PAGE* page; HWND hMainWnd; - HWND hShadowWnd; HWND hHistoryWnd; WNDPROC origRicheditWndProc;

1 0

Alexandre Julliard : user32: Don' t repaint the caret in SetCaretPos if the position doesn't change.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 5702a941ad71ae65ae1c802addde82210c7adbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5702a941ad71ae65ae1c802ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 09:26:05 2010 +0200 user32: Don't repaint the caret in SetCaretPos if the position doesn't change. --- dlls/user32/caret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index 308336d..53bb5b4 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -269,7 +269,7 @@ BOOL WINAPI SetCaretPos( INT x, INT y ) } } SERVER_END_REQ; - if (ret && !hidden) + if (ret && !hidden && (x != r.left || y != r.top)) { if (old_state) CARET_DisplayCaret( hwnd, &r ); r.right += x - r.left;

1 0