May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Try a little harder to clip the cursor to avoid some race conditions.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: e52e57d13342d1d688126a6d8493219f740c5a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52e57d13342d1d688126a6d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 16:44:09 2011 +0200 winex11: Try a little harder to clip the cursor to avoid some race conditions. --- dlls/winex11.drv/mouse.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 70cdd86..d369f6c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -396,14 +396,14 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) return TRUE; } - TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); + TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); wine_tsx11_lock(); if (msg_hwnd) XUnmapWindow( data->display, clip_window ); XMoveResizeWindow( data->display, clip_window, clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, clip->right - clip->left, clip->bottom - clip->top ); - if (msg_hwnd) XMapWindow( data->display, clip_window ); + XMapWindow( data->display, clip_window ); if (!XGrabPointer( data->display, clip_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime )) @@ -516,7 +516,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; - if (!reset && thread_data->clip_hwnd) return FALSE; /* already clipping */ + if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ SetRect( &rect, 0, 0, screen_width, screen_height ); if (!grab_fullscreen) {

1 0

Alexandre Julliard : winex11: Allow MotionNotify events through occasionally while XInput is active.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 8e9b4e0a5c6bee5f72ca2314db26233638f0e1d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9b4e0a5c6bee5f72ca2314d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 16:19:45 2011 +0200 winex11: Allow MotionNotify events through occasionally while XInput is active. --- dlls/winex11.drv/event.c | 10 +++++++--- dlls/winex11.drv/mouse.c | 12 +++++++----- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6ef1e07..f2e2841 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -323,10 +323,14 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) switch (next->type) { case MotionNotify: - if (next->xany.window == x11drv_thread_data()->clip_window) { - TRACE( "ignoring MotionNotify for clip window\n" ); - return MERGE_IGNORE; + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (next->xany.window == thread_data->clip_window && + next->xmotion.time - thread_data->last_motion_notify < 1000) + { + TRACE( "ignoring MotionNotify for clip window\n" ); + return MERGE_IGNORE; + } } break; case GenericEvent: diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6c56b15..70cdd86 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -547,11 +547,6 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (thread_data->clip_window != window) return; input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; - if (!(input->u.mi.dwFlags & ~(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE))) - { - /* motion events are ignored when xinput2 is active */ - if (thread_data->xi2_state == xi_enabled) return; - } __wine_send_input( hwnd, input ); return; } @@ -1366,6 +1361,13 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; + if (!hwnd) + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + if (event->time - thread_data->last_motion_notify < 1000) return; + thread_data->last_motion_notify = event->time; + } + send_mouse_input( hwnd, event->window, event->state, &input ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ca7a379..a14fa39 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,6 +548,7 @@ struct x11drv_thread_data HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ + Time last_motion_notify; /* time of last mouse motion */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ Window clip_window; /* window used for cursor clipping */

1 0

Nikolay Sivov : comctl32/tests: Test return values in uniform way.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 96c99dc99b272dbbdfa958a9b7a75817e1d1323a URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c99dc99b272dbbdfa958a9b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 12:20:42 2011 +0400 comctl32/tests: Test return values in uniform way. --- dlls/comctl32/tests/listview.c | 175 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96c99dc99b272dbbdfa95…

1 0

Austin English : advapi32: Return success in RegisterTraceGuids.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 8781b58ed92db1cf4d5fd3eff4b92ea294f1d758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8781b58ed92db1cf4d5fd3eff… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 10 14:59:10 2011 -0500 advapi32: Return success in RegisterTraceGuids. --- dlls/advapi32/eventlog.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index ecc887e..2301502 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -750,10 +750,10 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,)\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /****************************************************************************** @@ -769,10 +769,10 @@ ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) { - FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,)\n", RequestAddress, RequestContext, + FIXME("(%p, %p, %s, %u, %p, %s, %s, %p,): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), debugstr_a(MofResourceName), RegistrationHandle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Nikolay Sivov : comctl32/listview: Fix parameter validation for LVM_SETITEMTEXT.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: c6dd14199c6f48161ee8393232cb4daddb4df78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dd14199c6f48161ee839323… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 01:52:09 2011 +0400 comctl32/listview: Fix parameter validation for LVM_SETITEMTEXT. --- dlls/comctl32/listview.c | 4 ++-- dlls/comctl32/tests/listview.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8f7745f..86c3f76 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8785,8 +8785,8 @@ static BOOL LISTVIEW_SetItemTextT(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE { LVITEMW lvItem; - if (nItem < 0 && nItem >= infoPtr->nItemCount) return FALSE; - + if (!lpLVItem || nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE; + lvItem.iItem = nItem; lvItem.iSubItem = lpLVItem->iSubItem; lvItem.mask = LVIF_TEXT; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20f231e..7f9f7a7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4710,6 +4710,40 @@ static void test_dispinfo(void) DestroyWindow(hwnd); } +static void test_LVM_SETITEMTEXT(void) +{ + static char testA[] = "TEST"; + LVITEMA item; + HWND hwnd; + DWORD ret; + + hwnd = create_listview_control(LVS_ICON); + ok(hwnd != NULL, "failed to create listview window\n"); + + insert_item(hwnd, 0); + + /* null item pointer */ + ret = SendMessage(hwnd, LVM_SETITEMTEXTA, 0, 0); + expect(FALSE, ret); + + ret = SendMessage(hwnd, LVM_SETITEMTEXTW, 0, 0); + expect(FALSE, ret); + + /* index out of bounds */ + item.pszText = testA; + item.cchTextMax = 0; /* ignored */ + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 1, (LPARAM)&item); + expect(FALSE, ret); + + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, -1, (LPARAM)&item); + expect(FALSE, ret); + + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + expect(TRUE, ret); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4774,6 +4808,7 @@ START_TEST(listview) test_destroynotify(); test_createdragimage(); test_dispinfo(); + test_LVM_SETITEMTEXT(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Aric Stewart : usp10: Implementation of ScriptShapeOpenType.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 3ad7822d8560a39e024646b20f176f798652d118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad7822d8560a39e024646b20… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 12 13:57:26 2011 -0500 usp10: Implementation of ScriptShapeOpenType. --- dlls/usp10/shape.c | 12 ++++- dlls/usp10/usp10.c | 111 ++++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 3 + include/usp10.h | 12 +++++ 5 files changed, 119 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index dff1f4f..b718190 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -762,10 +762,13 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe return out_index; } -static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa) +static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc) { UINT charset; + if (psc->userScript != 0) + return (char*)&psc->userScript; + if (ShapingData[psa->eScript].otTag[0] != 0) return ShapingData[psa->eScript].otTag; @@ -810,10 +813,13 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc const GSUB_Script *script; const GSUB_LangSys *language; - script = GSUB_get_script_table(psc->GSUB_Table, get_opentype_script(hdc,psa)); + script = GSUB_get_script_table(psc->GSUB_Table, get_opentype_script(hdc,psa,psc)); if (script) { - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ + if (psc->userLang != 0) + language = GSUB_get_lang_table(script,(char*)&psc->userLang); + else + language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ if (language) feature = GSUB_get_feature(psc->GSUB_Table, language, feat); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index d818015..e7bda77 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1477,61 +1477,84 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) } /*********************************************************************** - * ScriptShape (USP10.@) + * ScriptShapeOpenType (USP10.@) * * Produce glyphs and visual attributes for a run. * * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. + * psa [I/O] Script analysis. + * tagScript [I] The OpenType tag for the Script + * tagLangSys [I] The OpenType tag for the Language + * rcRangeChars[I] Array of Character counts in each range + * rpRangeProperties [I] Array of TEXTRANGE_PROPERTIES structures + * cRanges [I] Count of ranges * pwcChars [I] Array of characters specifying the run. * cChars [I] Number of characters in pwcChars. * cMaxGlyphs [I] Length of pwOutGlyphs. - * psa [I/O] Script analysis. - * pwOutGlyphs [O] Array of glyphs. * pwLogClust [O] Array of logical cluster info. - * psva [O] Array of visual attributes. + * pCharProps [O] Array of character property values + * pwOutGlyphs [O] Array of glyphs. + * pOutGlyphProps [O] Array of attributes for the retrieved glyphs * pcGlyphs [O] Number of glyphs returned. * * RETURNS * Success: S_OK * Failure: Non-zero HRESULT value. */ -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, - int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, - SCRIPT_VISATTR *psva, int *pcGlyphs) +HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, + SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, + OPENTYPE_TAG tagLangSys, int *rcRangeChars, + TEXTRANGE_PROPERTIES **rpRangeProperties, + int cRanges, const WCHAR *pwcChars, int cChars, + int cMaxGlyphs, WORD *pwLogClust, + SCRIPT_CHARPROP *pCharProps, WORD *pwOutGlyphs, + SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; unsigned int i; BOOL rtl; - TRACE("(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)\n", hdc, psc, debugstr_wn(pwcChars, cChars), - cChars, cMaxGlyphs, psa, pwOutGlyphs, pwLogClust, psva, pcGlyphs); + TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", + hdc, psc, psa, + debugstr_an((char*)&tagScript,4), debugstr_an((char*)&tagLangSys,4), + rcRangeChars, rpRangeProperties, cRanges, debugstr_wn(pwcChars, cChars), + cChars, cMaxGlyphs, pwLogClust, pCharProps, pwOutGlyphs, pOutGlyphProps, pcGlyphs); if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); - if (!psva || !pcGlyphs) return E_INVALIDARG; + if (!pOutGlyphProps || !pcGlyphs || !pCharProps) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + + if (cRanges) + FIXME("Ranges not supported yet\n"); + rtl = (!psa->fLogicalOrder && psa->fRTL); *pcGlyphs = cChars; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr; if (!pwLogClust) return E_FAIL; + ((ScriptCache *)*psc)->userScript = tagScript; + ((ScriptCache *)*psc)->userLang = tagLangSys; + /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ for (i = 0; i < cChars; i++) { int idx = i; if (rtl) idx = cChars - 1 - i; /* FIXME: set to better values */ - psva[i].uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; - psva[i].fClusterStart = 1; - psva[i].fDiacritic = 0; - psva[i].fZeroWidth = 0; - psva[i].fReserved = 0; - psva[i].fShapeReserved = 0; + pOutGlyphProps[i].sva.uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; + pOutGlyphProps[i].sva.fClusterStart = 1; + pOutGlyphProps[i].sva.fDiacritic = 0; + pOutGlyphProps[i].sva.fZeroWidth = 0; + pOutGlyphProps[i].sva.fReserved = 0; + pOutGlyphProps[i].sva.fShapeReserved = 0; + + /* FIXME: have the shaping engine set this */ + pCharProps[i].fCanGlyphAlone = 1; pwLogClust[i] = idx; } @@ -1584,6 +1607,60 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, return S_OK; } + +/*********************************************************************** + * ScriptShape (USP10.@) + * + * Produce glyphs and visual attributes for a run. + * + * PARAMS + * hdc [I] Device context. + * psc [I/O] Opaque pointer to a script cache. + * pwcChars [I] Array of characters specifying the run. + * cChars [I] Number of characters in pwcChars. + * cMaxGlyphs [I] Length of pwOutGlyphs. + * psa [I/O] Script analysis. + * pwOutGlyphs [O] Array of glyphs. + * pwLogClust [O] Array of logical cluster info. + * psva [O] Array of visual attributes. + * pcGlyphs [O] Number of glyphs returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, + int cChars, int cMaxGlyphs, + SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, + SCRIPT_VISATTR *psva, int *pcGlyphs) +{ + HRESULT hr; + int i; + SCRIPT_CHARPROP *charProps; + SCRIPT_GLYPHPROP *glyphProps; + + if (!psva || !pcGlyphs) return E_INVALIDARG; + if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + + charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); + if (!charProps) return E_OUTOFMEMORY; + glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); + if (!glyphProps) return E_OUTOFMEMORY; + + hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs, glyphProps, pcGlyphs); + + if (SUCCEEDED(hr)) + { + for (i = 0; i < *pcGlyphs; i++) + psva[i] = glyphProps[i].sva; + } + + heap_free(charProps); + heap_free(glyphProps); + + return hr; +} + /*********************************************************************** * ScriptPlace (USP10.@) * diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 21e7c31..bc2eb73 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -24,7 +24,7 @@ @ stub ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) -@ stub ScriptShapeOpenType +@ stdcall ScriptShapeOpenType(ptr ptr ptr long long ptr ptr long wstr long long ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index fae1066..a61e56e 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -69,6 +69,9 @@ typedef struct { LPVOID GSUB_Table; INT feature_count; LoadedFeature *features; + + OPENTYPE_TAG userScript; + OPENTYPE_TAG userLang; } ScriptCache; #define odd(x) ((x) & 1) diff --git a/include/usp10.h b/include/usp10.h index d947e6e..1940176 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -210,6 +210,18 @@ typedef struct tagOPENTYPE_FEATURE_RECORD LONG lParameter; } OPENTYPE_FEATURE_RECORD; +typedef struct tagSCRIPT_GLYPHPROP +{ + SCRIPT_VISATTR sva; + WORD reserved; +} SCRIPT_GLYPHPROP; + +typedef struct tagSCRIPT_CHARPROP +{ + WORD fCanGlyphAlone :1; + WORD reserved :15; +} SCRIPT_CHARPROP; + typedef struct tagTEXTRANGE_PROPERTIES { OPENTYPE_FEATURE_RECORD *potfRecords;

1 0

Frédéric Delanoy : kernel32/tests: Fix typo.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: f5304c4f73508adddb05e881fadb9a27d250795d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5304c4f73508adddb05e881f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 12 22:10:52 2011 +0200 kernel32/tests: Fix typo. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 19f630b..1268c1d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1348,7 +1348,7 @@ static void test_CompareStringA(void) /* \xB9 character lies between a and b */ ret = CompareStringA(lcid, 0, "a", 1, "\xB9", 1); - todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be grater than \'a\'\n"); + todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); }

1 0

Anders Jonsson : winecfg: Update Swedish translation.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 2096d9014113b7cb1eeb38f819731a037aa3a255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2096d9014113b7cb1eeb38f81… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu May 12 21:46:56 2011 +0200 winecfg: Update Swedish translation. --- programs/winecfg/Sv.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 10fc98a..cffc415 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -62,7 +62,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " F�nsterinst�llningar ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "F�nga &musen automatiskt i fullsk�rmsf�nster",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Till�t f�nsterhanteraren att &dekorera f�nstren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Till�t &f�nsterhanteraren att styra f�nstren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulera ett virtuellt skriv&bord",IDC_ENABLE_DESKTOP,"Button",

1 0

Alexandre Julliard : makefiles: Tools must be built before includes now.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 9f93b5fa3103594867dab78a43ea9cc3f0e6c133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f93b5fa3103594867dab78a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 10:45:02 2011 +0200 makefiles: Tools must be built before includes now. --- Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.in b/Makefile.in index b8cd6af..af4a4a7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ __builddeps__: __tooldeps__ include loader server: libs/port libs/wine tools fonts: tools -include: tools/widl +include: tools tools/widl libs/wine: libs/port tools/wmc tools/wrc: tools tools tools/wmc tools/wrc: libs/wine

1 0

Nikolay Sivov : comctl32/tab: Send NM_RCLICK on WM_RBUTTONUP.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 4daa5459f48a8b1f2f9a9818cdd775280ede4f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4daa5459f48a8b1f2f9a9818c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 00:46:39 2011 +0400 comctl32/tab: Send NM_RCLICK on WM_RBUTTONUP. --- dlls/comctl32/tab.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index bd34358..0424f7f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -707,7 +707,7 @@ TAB_LButtonUp (const TAB_INFO *infoPtr) } static inline LRESULT -TAB_RButtonDown (const TAB_INFO *infoPtr) +TAB_RButtonUp (const TAB_INFO *infoPtr) { TAB_SendSimpleNotify(infoPtr, NM_RCLICK); return 0; @@ -3427,8 +3427,8 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NOTIFY: return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, lParam); - case WM_RBUTTONDOWN: - return TAB_RButtonDown (infoPtr); + case WM_RBUTTONUP: + return TAB_RButtonUp (infoPtr); case WM_MOUSEMOVE: return TAB_MouseMove (infoPtr, wParam, lParam);

1 0