February 2013 - Wine-Commits

Ken Thomases : winemac: Implement MOUSE_SCROLL events.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 3748c3930837dcdd93c01f19cf6992e359dc6720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3748c3930837dcdd93c01f19c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:12 2013 -0600 winemac: Implement MOUSE_SCROLL events. --- dlls/winemac.drv/cocoa_window.m | 78 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 7 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 8 ++++ dlls/winemac.drv/mouse.c | 21 ++++++++++ 5 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index bd6f086..218ba3f 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -778,6 +778,84 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) rightMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - (void) otherMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } + - (void) scrollWheel:(NSEvent *)theEvent + { + CGPoint pt; + macdrv_event event; + CGEventRef cgevent; + CGFloat x, y; + BOOL continuous = FALSE; + + cgevent = [theEvent CGEvent]; + pt = CGEventGetLocation(cgevent); + + event.type = MOUSE_SCROLL; + event.window = (macdrv_window)[self retain]; + event.mouse_scroll.x = pt.x; + event.mouse_scroll.y = pt.y; + event.mouse_scroll.time_ms = [NSApp ticksForEventTime:[theEvent timestamp]]; + + if (CGEventGetIntegerValueField(cgevent, kCGScrollWheelEventIsContinuous)) + { + continuous = TRUE; + + /* Continuous scroll wheel events come from high-precision scrolling + hardware like Apple's Magic Mouse, Mighty Mouse, and trackpads. + For these, we can get more precise data from the CGEvent API. */ + /* Axis 1 is vertical, axis 2 is horizontal. */ + x = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis2); + y = CGEventGetDoubleValueField(cgevent, kCGScrollWheelEventPointDeltaAxis1); + } + else + { + double pixelsPerLine = 10; + CGEventSourceRef source; + + /* The non-continuous values are in units of "lines", not pixels. */ + if ((source = CGEventCreateSourceFromEvent(cgevent))) + { + pixelsPerLine = CGEventSourceGetPixelsPerLine(source); + CFRelease(source); + } + + x = pixelsPerLine * [theEvent deltaX]; + y = pixelsPerLine * [theEvent deltaY]; + } + + /* Mac: negative is right or down, positive is left or up. + Win32: negative is left or down, positive is right or up. + So, negate the X scroll value to translate. */ + x = -x; + + /* The x,y values so far are in pixels. Win32 expects to receive some + fraction of WHEEL_DELTA == 120. By my estimation, that's roughly + 6 times the pixel value. */ + event.mouse_scroll.x_scroll = 6 * x; + event.mouse_scroll.y_scroll = 6 * y; + + if (!continuous) + { + /* For non-continuous "clicky" wheels, if there was any motion, make + sure there was at least WHEEL_DELTA motion. This is so, at slow + speeds where the system's acceleration curve is actually reducing the + scroll distance, the user is sure to get some action out of each click. + For example, this is important for rotating though weapons in a + first-person shooter. */ + if (0 < event.mouse_scroll.x_scroll && event.mouse_scroll.x_scroll < 120) + event.mouse_scroll.x_scroll = 120; + else if (-120 < event.mouse_scroll.x_scroll && event.mouse_scroll.x_scroll < 0) + event.mouse_scroll.x_scroll = -120; + + if (0 < event.mouse_scroll.y_scroll && event.mouse_scroll.y_scroll < 120) + event.mouse_scroll.y_scroll = 120; + else if (-120 < event.mouse_scroll.y_scroll && event.mouse_scroll.y_scroll < 0) + event.mouse_scroll.y_scroll = -120; + } + + if (event.mouse_scroll.x_scroll || event.mouse_scroll.y_scroll) + [queue postEvent:&event]; + } + /* * ---------- NSWindowDelegate methods ---------- diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 1f90c04..f03fef4 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -39,6 +39,7 @@ static const char *dbgstr_event(int type) "MOUSE_BUTTON", "MOUSE_MOVED", "MOUSE_MOVED_ABSOLUTE", + "MOUSE_SCROLL", "WINDOW_CLOSE_REQUESTED", "WINDOW_DID_MINIMIZE", "WINDOW_DID_UNMINIMIZE", @@ -69,7 +70,10 @@ static macdrv_event_mask get_event_mask(DWORD mask) } if (mask & QS_MOUSEBUTTON) + { event_mask |= event_mask_for_type(MOUSE_BUTTON); + event_mask |= event_mask_for_type(MOUSE_SCROLL); + } if (mask & QS_MOUSEMOVE) { @@ -126,6 +130,9 @@ void macdrv_handle_event(macdrv_event *event) case MOUSE_MOVED_ABSOLUTE: macdrv_mouse_moved(hwnd, event); break; + case MOUSE_SCROLL: + macdrv_mouse_scroll(hwnd, event); + break; case WINDOW_CLOSE_REQUESTED: macdrv_window_close_requested(hwnd); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 5cfcb8b..8c4ce54 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -136,6 +136,7 @@ extern void macdrv_window_did_unminimize(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_mouse_button(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) DECLSPEC_HIDDEN; extern void macdrv_keyboard_changed(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 388ffb7..23f0edf 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -132,6 +132,7 @@ enum { MOUSE_BUTTON, MOUSE_MOVED, MOUSE_MOVED_ABSOLUTE, + MOUSE_SCROLL, WINDOW_CLOSE_REQUESTED, WINDOW_DID_MINIMIZE, WINDOW_DID_UNMINIMIZE, @@ -170,6 +171,13 @@ typedef struct macdrv_event { unsigned long time_ms; } mouse_moved; struct { + int x_scroll; + int y_scroll; + int x; + int y; + unsigned long time_ms; + } mouse_scroll; + struct { CGRect frame; } window_frame_changed; struct { diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 4742e37..d251808 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -142,3 +142,24 @@ void macdrv_mouse_moved(HWND hwnd, const macdrv_event *event) send_mouse_input(hwnd, flags, event->mouse_moved.x, event->mouse_moved.y, 0, event->mouse_moved.time_ms); } + + +/*********************************************************************** + * macdrv_mouse_scroll + * + * Handler for MOUSE_SCROLL events. + */ +void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) +{ + TRACE("win %p/%p scroll (%d,%d) at (%d,%d) time %lu (%lu ticks ago)\n", hwnd, + event->window, event->mouse_scroll.x_scroll, event->mouse_scroll.y_scroll, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.time_ms, (GetTickCount() - event->mouse_scroll.time_ms)); + + send_mouse_input(hwnd, MOUSEEVENTF_WHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.y_scroll, event->mouse_scroll.time_ms); + send_mouse_input(hwnd, MOUSEEVENTF_HWHEEL | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, + event->mouse_scroll.x, event->mouse_scroll.y, + event->mouse_scroll.x_scroll, event->mouse_scroll.time_ms); +}

1 0

Ken Thomases : comctl32: Improve mouse wheel scrolling in treeview control.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: c5858c16a665b13a9798a80be9de698dbf52b109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5858c16a665b13a9798a80be… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:08 2013 -0600 comctl32: Improve mouse wheel scrolling in treeview control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/comctl32/treeview.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b0cbc7a..46ef751 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -102,6 +102,7 @@ typedef struct tagTREEVIEW_INFO BOOL insertBeforeorAfter; /* flag used by TVM_SETINSERTMARK */ HIMAGELIST dragList; /* Bitmap of dragged item */ LONG scrollX; + INT wheelRemainder; COLORREF clrBk; COLORREF clrText; COLORREF clrLine; @@ -4925,7 +4926,7 @@ scroll: static LRESULT TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - short gcWheelDelta; + short wheelDelta; UINT pulScrollLines = 3; if (wParam & (MK_SHIFT | MK_CONTROL)) @@ -4936,13 +4937,25 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) SystemParametersInfoW(SPI_GETWHEELSCROLLLINES, 0, &pulScrollLines, 0); - gcWheelDelta = -(short)HIWORD(wParam); - pulScrollLines *= (gcWheelDelta / WHEEL_DELTA); + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->wheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->wheelRemainder > 0)) + infoPtr->wheelRemainder += wheelDelta; + else + infoPtr->wheelRemainder = wheelDelta; - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (infoPtr->wheelRemainder && pulScrollLines) { - int newDy = infoPtr->firstVisible->visibleOrder + pulScrollLines; - int maxDy = infoPtr->maxVisibleOrder; + int newDy; + int maxDy; + int lineScroll; + + lineScroll = pulScrollLines * (float)infoPtr->wheelRemainder / WHEEL_DELTA; + infoPtr->wheelRemainder -= WHEEL_DELTA * lineScroll / (int)pulScrollLines; + + newDy = infoPtr->firstVisible->visibleOrder - lineScroll; + maxDy = infoPtr->maxVisibleOrder; if (newDy > maxDy) newDy = maxDy; @@ -5047,6 +5060,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) /* dragList */ infoPtr->scrollX = 0; + infoPtr->wheelRemainder = 0; infoPtr->clrBk = CLR_NONE; /* use system color */ infoPtr->clrText = CLR_NONE; /* use system color */

1 0

Ken Thomases : user32: Improve mouse wheel scrolling in edit control.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 1642d312fd8ae98df7f24a59307a72a639a269c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1642d312fd8ae98df7f24a593… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:50 2013 -0600 user32: Improve mouse wheel scrolling in edit control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/user32/edit.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ada313f..74e0ea4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -140,6 +140,7 @@ typedef struct Even if parent will change, EN_* messages should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ + INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ /* * only for multi line controls */ @@ -3551,6 +3552,8 @@ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) if(!(es->style & ES_NOHIDESEL)) EDIT_InvalidateText(es, es->selection_start, es->selection_end); EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + /* throw away left over scroll when we lose focus */ + es->wheelDeltaRemainder = 0; return 0; } @@ -5108,7 +5111,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_MOUSEWHEEL: { - int gcWheelDelta = 0; + int wheelDelta; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); @@ -5116,12 +5119,20 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B result = DefWindowProcW(hwnd, msg, wParam, lParam); break; } - gcWheelDelta -= GET_WHEEL_DELTA_WPARAM(wParam); - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + wheelDelta = GET_WHEEL_DELTA_WPARAM(wParam); + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && es->wheelDeltaRemainder < 0) || + (wheelDelta > 0 && es->wheelDeltaRemainder > 0)) + es->wheelDeltaRemainder += wheelDelta; + else + es->wheelDeltaRemainder = wheelDelta; + if (es->wheelDeltaRemainder && pulScrollLines) { - int cLineScroll= (int) min((UINT) es->line_count, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - result = EDIT_EM_LineScroll(es, 0, cLineScroll); + int cLineScroll; + pulScrollLines = (int) min((UINT) es->line_count, pulScrollLines); + cLineScroll = pulScrollLines * (float)es->wheelDeltaRemainder / WHEEL_DELTA; + es->wheelDeltaRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + result = EDIT_EM_LineScroll(es, 0, -cLineScroll); } } break;

1 0

Detlef Riekenberg : kernel32/tests: Skip tests on non-English systems.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 8f1a3604ac15dc9d06cf4733f2353fe780a2c08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1a3604ac15dc9d06cf4733f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 11 00:03:30 2013 +0100 kernel32/tests: Skip tests on non-English systems. --- dlls/kernel32/tests/locale.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ebd7278..e9c83b8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -280,11 +280,23 @@ static void test_GetLocaleInfoW(void) ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SCOUNTRY, bufferW, COUNTOF(bufferW)); ok(ret, "got %d\n", ret); - ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(statesW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); ret = GetLocaleInfoW(lcid_en_neut, LOCALE_SLANGUAGE, bufferW, COUNTOF(bufferW)); ok(ret, "got %d\n", ret); - ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(slangW, bufferW), "got wrong name %s\n", wine_dbgstr_w(bufferW)); while (*ptr->name) { @@ -3434,7 +3446,13 @@ static void test_GetLocaleInfoEx(void) ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); - ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW)); + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) + { + skip("Non-English locale\n"); + } + else + ok(!lstrcmpW(bufferW, statesW), "got %s\n", wine_dbgstr_w(bufferW)); bufferW[0] = 0; SetLastError(0xdeadbeef);

1 0

Nikolay Sivov : xmllite: Store start data pointer for comments.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: b97dd9b0e2030261b11e01f6e0382c3a7a6db157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97dd9b0e2030261b11e01f6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 08:38:42 2013 +0400 xmllite: Store start data pointer for comments. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b3f7194..7bec2b1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1035,7 +1035,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) { start = reader->save; ptr = reader_get_cur(reader); - reader->save = NULL; } else { @@ -1044,6 +1043,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_shrink(reader); ptr = start = reader_get_cur(reader); reader->nodetype = XmlNodeType_Comment; + reader->save = start; reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); @@ -1067,7 +1067,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); - reader->nodetype = XmlNodeType_Comment; + reader->save = NULL; return S_OK; } else

1 0

Ken Thomases : comctl32: Eliminate redundant local variable (gcWheelDelta = = -wheelDelta).
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 930e84dfd22e100410cdf3d082262c3812970a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930e84dfd22e100410cdf3d08… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:59 2013 -0600 comctl32: Eliminate redundant local variable (gcWheelDelta == -wheelDelta). --- dlls/comctl32/listview.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc8997a..5f25e85 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9785,13 +9785,11 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - INT gcWheelDelta = 0; INT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= wheelDelta; switch(infoPtr->uView) { @@ -9801,21 +9799,21 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) * listview should be scrolled by a multiple of 37 dependently on its dimension or its visible item number * should be fixed in the future. */ - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (gcWheelDelta < 0) ? + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, (wheelDelta > 0) ? -LISTVIEW_SCROLL_ICON_LINE_SIZE : LISTVIEW_SCROLL_ICON_LINE_SIZE); break; case LV_VIEW_DETAILS: - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (abs(wheelDelta) >= WHEEL_DELTA && pulScrollLines) { int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); + cLineScroll *= (-wheelDelta / WHEEL_DELTA); LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); } break; case LV_VIEW_LIST: - LISTVIEW_HScroll(infoPtr, (gcWheelDelta < 0) ? SB_LINELEFT : SB_LINERIGHT, 0); + LISTVIEW_HScroll(infoPtr, (wheelDelta > 0) ? SB_LINELEFT : SB_LINERIGHT, 0); break; } return 0;

1 0

Detlef Riekenberg : advapi32/tests: Skip tests on non-English systems.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 245dbaac5ddeb5458f70b2ed6c13d100ebfadc93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245dbaac5ddeb5458f70b2ed6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 10 23:19:47 2013 +0100 advapi32/tests: Skip tests on non-English systems. --- dlls/advapi32/tests/lsa.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index d03d9d6..bffb7c0 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -255,7 +255,8 @@ static void test_LsaLookupNames2(void) return; } - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) || + (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH)) { skip("Non-English locale (skipping LsaLookupNames2 tests)\n"); return;

1 0

Nikolay Sivov : xmllite: Basic test for chunk value read vs full value read .
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 0a7d802ef35ab0397af0263b60bd00ac9294c9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7d802ef35ab0397af0263b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 11 09:22:23 2013 +0400 xmllite: Basic test for chunk value read vs full value read. --- dlls/xmllite/tests/reader.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index e61600c..65c3448 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1263,6 +1263,60 @@ static void test_read_pending(void) IXmlReader_Release(reader); } +static void test_readvaluechunk(void) +{ + static const char testA[] = ""; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + const WCHAR *value; + WCHAR b; + HRESULT hr; + UINT c; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(testA, sizeof(testA)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); +todo_wine { + ok(hr == S_OK, "got %08x\n", hr); + ok(c == 1, "got %u\n", c); + ok(b == ' ', "got %x\n", b); +} + /* portion read as chunk is skipped from resulting node value */ + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + /* once value is returned/allocated it's not possible to read by chunk */ + c = 0; + b = 0; + hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); +todo_wine + ok(hr == S_FALSE, "got %08x\n", hr); + ok(c == 0, "got %u\n", c); + ok(b == 0, "got %x\n", b); + + value = NULL; + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + ok(value[0] == 'c', "got %s\n", wine_dbgstr_w(value)); + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1285,6 +1339,7 @@ START_TEST(reader) test_read_element(); test_read_full(); test_read_pending(); + test_readvaluechunk(); test_read_xmldeclaration(); CoUninitialize();

1 0

Ken Thomases : comctl32: Improve mouse wheel scrolling in listview control.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 858acfbb0ddbe0ba08d965932b556c1cd7c4b8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858acfbb0ddbe0ba08d965932… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:09:03 2013 -0600 comctl32: Improve mouse wheel scrolling in listview control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/comctl32/listview.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5f25e85..2d75f85 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -330,6 +330,7 @@ typedef struct tagLISTVIEW_INFO INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ DWORD dwHoverTime; HCURSOR hHotCursor; + INT cWheelRemainder; /* keyboard operation */ DWORD lastKeyPressTimestamp; @@ -9385,6 +9386,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->nEditLabelItem = -1; infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = HOVER_DEFAULT; /* default system hover time */ + infoPtr->cWheelRemainder = 0; infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; @@ -9785,12 +9787,10 @@ static LRESULT LISTVIEW_HScroll(LISTVIEW_INFO *infoPtr, INT nScrollCode, static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { - INT pulScrollLines = 3; + UINT pulScrollLines = 3; TRACE("(wheelDelta=%d)\n", wheelDelta); - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - switch(infoPtr->uView) { case LV_VIEW_ICON: @@ -9804,11 +9804,21 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) break; case LV_VIEW_DETAILS: - if (abs(wheelDelta) >= WHEEL_DELTA && pulScrollLines) + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + + /* if scrolling changes direction, ignore left overs */ + if ((wheelDelta < 0 && infoPtr->cWheelRemainder < 0) || + (wheelDelta > 0 && infoPtr->cWheelRemainder > 0)) + infoPtr->cWheelRemainder += wheelDelta; + else + infoPtr->cWheelRemainder = wheelDelta; + if (infoPtr->cWheelRemainder && pulScrollLines) { - int cLineScroll = min(LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); - cLineScroll *= (-wheelDelta / WHEEL_DELTA); - LISTVIEW_VScroll(infoPtr, SB_INTERNAL, cLineScroll); + int cLineScroll; + pulScrollLines = min((UINT)LISTVIEW_GetCountPerColumn(infoPtr), pulScrollLines); + cLineScroll = pulScrollLines * (float)infoPtr->cWheelRemainder / WHEEL_DELTA; + infoPtr->cWheelRemainder -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTVIEW_VScroll(infoPtr, SB_INTERNAL, -cLineScroll); } break; @@ -9940,7 +9950,10 @@ static LRESULT LISTVIEW_KillFocus(LISTVIEW_INFO *infoPtr) { TRACE("()\n"); - /* if we did not have the focus, there's nothing to do */ + /* drop any left over scroll amount */ + infoPtr->cWheelRemainder = 0; + + /* if we did not have the focus, there's nothing more to do */ if (!infoPtr->bFocus) return 0; /* send NM_KILLFOCUS notification */

1 0

Nikolay Sivov : oledb32: Add a table of init properties, support Persist Security Info switch in init string.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 461c09e5d6c66c73746d7e1e68e5fe49a7462cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461c09e5d6c66c73746d7e1e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 10 20:01:23 2013 +0400 oledb32: Add a table of init properties, support Persist Security Info switch in init string. --- dlls/oledb32/datainit.c | 87 ++++++++++++++++++++++++++++++++++------- dlls/oledb32/tests/database.c | 5 +- 2 files changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index aa61d3b..d979846 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -289,30 +289,89 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) CoTaskMemFree(propset); } +struct dbproperty { + const WCHAR *name; + DBPROPID id; + DBPROPOPTIONS options; + VARTYPE type; +}; + +static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; +static const WCHAR persistsiW[] = {'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o',0}; + +static const struct dbproperty dbproperties[] = { + { datasourceW, DBPROP_INIT_DATASOURCE, DBPROPOPTIONS_REQUIRED, VT_BSTR }, + { persistsiW, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPOPTIONS_OPTIONAL, VT_BOOL } +}; + static HRESULT set_dbpropset(BSTR name, BSTR value, DBPROPSET **propset) { - static const WCHAR datasourceW[] = {'D','a','t','a',' ','S','o','u','r','c','e',0}; + VARIANT src, dest; + int min, max, n; + HRESULT hr; + + min = 0; + max = sizeof(dbproperties)/sizeof(struct dbproperty) - 1; - if (!strcmpW(datasourceW, name)) + while (min <= max) { - *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); - (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); - (*propset)->cProperties = 1; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; - (*propset)->rgProperties[0].dwPropertyID = DBPROP_INIT_DATASOURCE; - (*propset)->rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; - (*propset)->rgProperties[0].dwStatus = 0; - memset(&(*propset)->rgProperties[0].colid, 0, sizeof(DBID)); - V_VT(&(*propset)->rgProperties[0].vValue) = VT_BSTR; - V_BSTR(&(*propset)->rgProperties[0].vValue) = SysAllocString(value); - return S_OK; + int r; + + n = (min+max)/2; + + r = strcmpW(dbproperties[n].name, name); + if (!r) + break; + + if (r < 0) + min = n+1; + else + max = n-1; } - else + + if (min > max) { *propset = NULL; FIXME("unsupported property %s\n", debugstr_w(name)); return E_FAIL; } + + VariantInit(&dest); + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = value; + + hr = VariantChangeType(&dest, &src, 0, dbproperties[n].type); + if (FAILED(hr)) + { + ERR("failed to init property %s value as type %d\n", debugstr_w(name), dbproperties[n].type); + return hr; + } + + *propset = CoTaskMemAlloc(sizeof(DBPROPSET)); + if (!*propset) + { + VariantClear(&dest); + return E_OUTOFMEMORY; + } + + (*propset)->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); + if (!(*propset)->rgProperties) + { + VariantClear(&dest); + CoTaskMemFree(*propset); + return E_OUTOFMEMORY; + } + + (*propset)->cProperties = 1; + (*propset)->guidPropertySet = DBPROPSET_DBINIT; + (*propset)->rgProperties[0].dwPropertyID = dbproperties[n].id; + (*propset)->rgProperties[0].dwOptions = dbproperties[n].options; + (*propset)->rgProperties[0].dwStatus = 0; + memset(&(*propset)->rgProperties[0].colid, 0, sizeof(DBID)); + (*propset)->rgProperties[0].vValue = dest; + + return S_OK; } /*** IDataInitialize methods ***/ diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 4d3694c..d744c86 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -59,12 +59,13 @@ static void test_database(void) { static WCHAR initstring_jet[] = {'P','r','o','v','i','d','e','r','=','M','i','c','r','o','s','o','f','t','.', 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', - 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; - hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, (void**)&datainit); if (FAILED(hr)) { win_skip("Unable to load oledb library\n");

1 0

Ken Thomases : user32: Improve mouse wheel scrolling in listbox control.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: f42cfc04eb05fa266cfae0c64452686a68c24151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42cfc04eb05fa266cfae0c64… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 10 19:08:54 2013 -0600 user32: Improve mouse wheel scrolling in listbox control. Allow fractions of WHEEL_DELTA to scroll fractions of SPI_GETWHEELSCROLLLINES, although still only whole lines. Keep the remainder and apply it to next event if in same direction. --- dlls/user32/listbox.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b3709ef..0f4a8be 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -90,6 +90,7 @@ typedef struct INT nb_tabs; /* Number of tabs in array */ INT *tabs; /* Array of tabs */ INT avg_char_width; /* Average width of characters */ + INT wheel_remain; /* Left over scroll amount */ BOOL caret_on; /* Is caret on? */ BOOL captured; /* Is mouse captured? */ BOOL in_focus; @@ -1988,18 +1989,24 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - short gcWheelDelta = 0; UINT pulScrollLines = 3; SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); - gcWheelDelta -= delta; + /* if scrolling changes direction, ignore left overs */ + if ((delta < 0 && descr->wheel_remain < 0) || + (delta > 0 && descr->wheel_remain > 0)) + descr->wheel_remain += delta; + else + descr->wheel_remain = delta; - if (abs(gcWheelDelta) >= WHEEL_DELTA && pulScrollLines) + if (descr->wheel_remain && pulScrollLines) { - int cLineScroll = (int) min((UINT) descr->page_size, pulScrollLines); - cLineScroll *= (gcWheelDelta / WHEEL_DELTA); - LISTBOX_SetTopItem( descr, descr->top_item + cLineScroll, TRUE ); + int cLineScroll; + pulScrollLines = min((UINT) descr->page_size, pulScrollLines); + cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; + descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; } @@ -2482,6 +2489,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->horz_pos = 0; descr->nb_tabs = 0; descr->tabs = NULL; + descr->wheel_remain = 0; descr->caret_on = !lphc; if (descr->style & LBS_NOSEL) descr->caret_on = FALSE; descr->in_focus = FALSE; @@ -2989,6 +2997,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return 0; case WM_KILLFOCUS: descr->in_focus = FALSE; + descr->wheel_remain = 0; if ((descr->focus_item != -1) && descr->caret_on) LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); SEND_NOTIFICATION( descr, LBN_KILLFOCUS );

1 0

Andrew Talbot : jscript: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 6b5a18f61923dd9f867f2747bac5f0eb394da5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5a18f61923dd9f867f2747b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 9 22:32:02 2013 +0000 jscript: Avoid signed-unsigned integer comparisons. --- dlls/jscript/date.c | 2 +- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 7 ++++--- dlls/jscript/regexp.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index f192824..d9243b1 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2236,7 +2236,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { } else { /* Month or garbage */ - int j; + unsigned int j; for(size=i; parse[size]>='A' && parse[size]<='Z'; size++); size -= i; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index f7b0443..9f5cfe6 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -342,7 +342,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) SyntaxErrorConstr_value, TypeErrorConstr_value, URIErrorConstr_value}; jsdisp_t *err; - INT i; + unsigned int i; jsstr_t *str; HRESULT hres; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index b058460..056f04a 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -755,7 +755,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg bytecode_t *code; jsdisp_t *function; jsstr_t **params = NULL; - int i=0, j=0; + unsigned int i = 0; + int j = 0; HRESULT hres = S_OK; static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('}; @@ -809,8 +810,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } } - while(--i >= 0) - jsstr_release(params[i]); + while(i) + jsstr_release(params[--i]); heap_free(params); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index c1311d1..263bee9 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3596,7 +3596,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input, const match { jsdisp_t *array; jsstr_t *str; - int i; + DWORD i; HRESULT hres = S_OK; static const WCHAR indexW[] = {'i','n','d','e','x',0};

1 0

Daniel Jelinski : user32: Fix CopyImage implementation when changing cursor to icon.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 59e0d7af68138ab295921447569ae42d3b71faec URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e0d7af68138ab2959214475… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Feb 8 20:19:47 2013 +0100 user32: Fix CopyImage implementation when changing cursor to icon. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 25059e0..5b21101 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2873,7 +2873,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) res = CURSORICON_Load( icon->module, icon->resname, desiredx, desiredy, depth, - type == IMAGE_CURSOR, flags ); + !icon->is_icon, flags ); else res = CopyIcon( hnd ); /* FIXME: change size if necessary */ release_icon_ptr( hnd, icon );

1 0

Stefan Dösinger : wined3d: Use the ARBfp ffp pipeline only if ARBfp is supported.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 425eab4cf91bb26aa983a2c1b59e63e4386c60a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=425eab4cf91bb26aa983a2c1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 8 23:19:46 2013 +0100 wined3d: Use the ARBfp ffp pipeline only if ARBfp is supported. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7734cba..f42299e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2252,7 +2252,7 @@ static const struct fragment_pipeline *select_fragment_implementation(const stru { if (shader_backend_ops == &glsl_shader_backend) return &glsl_fragment_pipe; - if (shader_backend_ops == &arb_program_shader_backend) + if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline; if (gl_info->supported[ATI_FRAGMENT_SHADER]) return &atifs_fragment_pipeline;

1 0

Stefan Dösinger : wined3d: Reserve one vs constant on r200.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 3221e7fdd0133ce2096278acf2ce47836e99cac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3221e7fdd0133ce2096278acf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 8 23:19:47 2013 +0100 wined3d: Reserve one vs constant on r200. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/directx.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2fd5108..e8da805 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -821,6 +821,7 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); max_constantsF -= count_bits(reg_maps->integer_constants); + max_constantsF -= gl_info->reserved_arb_constants; for (i = 0; i < shader->limits.constant_float; ++i) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f42299e..acdcc57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -751,6 +751,14 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re return gl_vendor == GL_VENDOR_FGLRX; } +static BOOL match_r200(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + if (card_vendor != HW_VENDOR_AMD) return FALSE; + if (device == CARD_AMD_RADEON_8500) return TRUE; + return FALSE; +} + static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. @@ -861,6 +869,19 @@ static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; } +static void quirk_r200_constants(struct wined3d_gl_info *gl_info) +{ + /* The Mesa r200 driver (and there is no other driver for this GPU Wine would run on) + * loads some fog parameters (start, end, exponent, but not the color) into the + * program. + * + * Apparently the fog hardware is only able to handle linear fog with a range of 0.0;1.0, + * and it is the responsibility of the vertex pipeline to handle non-linear fog and + * linear fog with start and end other than 0.0 and 1.0. */ + TRACE("Reserving 1 ARB constant for compiler private use.\n"); + gl_info->reserved_arb_constants = max(gl_info->reserved_arb_constants, 1); +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -941,6 +962,11 @@ static const struct driver_quirk quirk_table[] = quirk_limited_tex_filtering, "Texture filtering, blending and VTF support is limited" }, + { + match_r200, + quirk_r200_constants, + "r200 vertex shader constants" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ce0c65..45f6b29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1532,7 +1532,7 @@ struct wined3d_gl_info { DWORD glsl_version; struct wined3d_gl_limits limits; - DWORD reserved_glsl_constants; + DWORD reserved_glsl_constants, reserved_arb_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1];

1 0

Juan Lang : iphlpapi: Fix HRESULT/win32 error code confusion.
by Alexandre Julliard Feb. 11, 2013

Feb. 11, 2013

Module: wine Branch: master Commit: 0ca4ad0d2fe616a9a54a30bbee88c787afc5ee1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca4ad0d2fe616a9a54a30bbe… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 8 12:33:28 2013 -0800 iphlpapi: Fix HRESULT/win32 error code confusion. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 966d24e..1f52fcc 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } ret = GetIcmpStatistics(&ipv4stats); - if (SUCCEEDED(ret)) + if (!ret) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;

1 0

Jactry Zeng : Updated Simplified Chinese translation
by Jeremy Newman Feb. 11, 2013

Feb. 11, 2013

Module: website Branch: master Commit: fc651178d86439ff169b5cd91034b2edff73043a URL: http://source.winehq.org/git/website.git/?a=commit;h=fc651178d86439ff169b5c… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 9 16:53:37 2013 +0800 Updated Simplified Chinese translation --- templates/zh-cn/about.template | 2 +- templates/zh-cn/cvs.template | 21 ++++++ templates/zh-cn/download/debian.template | 22 +++++++ templates/zh-cn/download/ubuntu.template | 2 +- templates/zh-cn/interview.template | 8 +++ templates/zh-cn/irc.template | 98 ++++++++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 2 deletions(-) diff --git a/templates/zh-cn/about.template b/templates/zh-cn/about.template index c2659d5..e2c56be 100644 --- a/templates/zh-cn/about.template +++ b/templates/zh-cn/about.template @@ -6,7 +6,7 @@ Wine （“Wine Is Not an Emulator” 的首字母缩写）是一个能够在多种 POSIX-compliant 操作系统（诸如 Linux，Mac OSX 及 BSD 等）上运行 Windows 应用的兼容层。 Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而是將 Windows API 调用翻译成为动态的 POSIX 调用，免除了性能和其他一些行为的内存占用，让你能够干净地集合 Windows 应用到你的桌面。 - 1993 年，Bob Amstadt 发起了 Wine 项目，旨在寻求一种在 Linux 上运行 Windows 3.1 + Wine 项目由 Bob Amstadt 于 1993 年发起，旨在寻求一种在 Linux 上运行 Windows 3.1 程序的办法。不久之后，Alexandre Julliard 开始接手领导 Wine 的开发，从此由他管理这个项目。多年以来，随着 Windows API 和应用为了适应新硬件及软件而不断演变，Wine 也一直不断发展来支持新的特性，移植到更多其他系统，并且更加稳定，提供着更好的用户体验。 diff --git a/templates/zh-cn/cvs.template b/templates/zh-cn/cvs.template new file mode 100644 index 0000000..ba10a25 --- /dev/null +++ b/templates/zh-cn/cvs.template @@ -0,0 +1,21 @@ + + + +<h1 class="title">The Wine CVS Tree</h1> + +注意：我们已经把开发从 CVS 切换到 <a href="http://git.or.cz">Git</a> 了。 + 不可以再通过 CVS 来获取 Wine 了。 + <a href="{$root}/site/git">Wine Git tree</a> 的使用说明可以从 + <a href="http://wiki.winehq.org">Wine Wiki</a> 上的 + <a href="http://wiki.winehq.org/GitWine">GitWine</a> 页面找到。 + +<hr /> + +<h1 id="sourcetree">通过 Web 方式浏览源码树</h1> + +The source code of the entire Wine tree is (<a href="http://lxr.linux.no/">LXR</a>-based) + cross-referenced and available for browsing, including a search engine. + This cross-references source is based on the snapshot-releases and is made available at: +<ul> + <li><a href="http://source.winehq.org/">source.winehq.org</a></li> +</ul> diff --git a/templates/zh-cn/download/debian.template b/templates/zh-cn/download/debian.template new file mode 100644 index 0000000..3ae57b0 --- /dev/null +++ b/templates/zh-cn/download/debian.template @@ -0,0 +1,22 @@ + + + +<h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> +Wine for Debian Sid +<a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> + +Debian-based 发行版使用为人所熟知的 APT 这一特定的工具来管理软件包。APT 能够自动解决软件安装包的依赖、更新包、检索 APT 仓库。Debian-based 发行版有他们自己包含 Wine 的软件源，然而，我们仍保持我们自己的源到最新 beta 版，以便可以从这里下载。 + +警告：这些是 beta 版安装包 +这意味着他们可能偶尔遭受 <a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。如果最新的 Wine 稳定版（当前是 Wine {$config_stable_release}）能够为你工作，你或者不太想用这些 beta 版安装包。 + +这个网站有 i386 和 amd64 架构的安装包。 + +你得下载 .deb 文件并手动安装他们。更多细节请查看页面。 + + +主页： <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a> +打包者： <a href="mailto:curan(a)debian.org">Kai Wasserbäch</a> + + + diff --git a/templates/zh-cn/download/ubuntu.template b/templates/zh-cn/download/ubuntu.template index 4380a60..fd150d4 100644 --- a/templates/zh-cn/download/ubuntu.template +++ b/templates/zh-cn/download/ubuntu.template @@ -22,7 +22,7 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 <h2>警告：Beta 版安装包</h2> -版本 1.5 的安装包是 beta 版的安装包。这意味着他们会偶尔被做<a href="http://wiki.winehq.org/Regression">回滚处理（regressions）</a>，这种处理发生在当更新导致 Wine 的（原有）功能被破坏的情况下。 +版本 1.5 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。所以，如果稳定版的 Wine 1.4 已经能够为你工作，你或许不太想用 beta 版的安装包。 <h2>安装 Wine：</h2> diff --git a/templates/zh-cn/interview.template b/templates/zh-cn/interview.template new file mode 100644 index 0000000..5d1c425 --- /dev/null +++ b/templates/zh-cn/interview.template @@ -0,0 +1,8 @@ + + + +<h1 class="title">访谈</h1> + + + + diff --git a/templates/zh-cn/irc.template b/templates/zh-cn/irc.template new file mode 100644 index 0000000..a7a2aee --- /dev/null +++ b/templates/zh-cn/irc.template @@ -0,0 +1,98 @@ + + + +<h1 class="title">在线聊天社区</h1> + +<a href="http://www.freenode.net">Freenode.net</a> 上有各种 Wine 的频道。 +你可以使用像 +<a href="http://www.xchat.org/">X-Chat</a> 这样的 IRC 程序来进入聊天室，按照如下配置： + +<blockquote> + Server: irc.freenode.net + Port: 6667 +</blockquote> + +你可以根据你想讨论的话题来选择频道： + +<blockquote> + #winehq: 用户支持和运行 Wine 的帮助 + #crossover: 用户支持和运行 Crossover 的支持 + #winehackers: 开发和其他对 Wine 的贡献 + #winehq-social: 和其他社区成员闲聊灌水 +</blockquote> + +使用 Firefox 或者其他支持 IRC 地址的浏览器，可以通过点击加入聊天： +<ul> + <li><a href="irc://irc.freenode.net/winehq">#winehq</a></li> + <li><a href="irc://irc.freenode.net/crossover">#crossover</a></li> + <li><a href="irc://irc.freenode.net/winehackers">#winehackers</a></li> + <li><a href="irc://irc.freenode.net/winehq-social">#winehq-social</a></li> +</ul> + +为了使讨论更加专注和尽可能有效，在 IRC 提问之前可以先尝试搜索你的问题。 +<a href="http://wiki.winehq.org/FAQ">Wine FAQ</a>、 +<a href="http://appdb.winehq.org">AppDB</a>、 +<a href="http://www.winehq.org/site/download">下载页面</a> 都是值得首先检查的资源。 + +<h2>IRC 规定和惩罚</h2> + +除了不能带有攻击性和不顾他人地吵闹外，这里还有一些简单的规定希望每个人在 IRC 频道里都能遵守。 +大多数情况下，初次违法规定会被视为意外并予以警告。但当你用完了警告次数后，你将会被从频道中踢出。 + +如果你继续违反规定并用完“踢出”次数，你将会被禁止进入频道两个小时。 +在这之后如果还造成其他任何问题，将会被永久禁止，并且只能通过申诉来解除禁止。 +如果你想为禁令申辩，请到 #winehq-social （或者 +<a href="mailto:wine-devel(a)winehq.org">wine-devel 邮件列表</a>，当你被禁止进入 +#winehq-social 时），并且首先解释你为什么会被禁止和为什么你认为禁令应该解除。 + +<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> + <tr align="center" bgcolor="black"> + <th>规定</th> + <th>说明</th> + <th>警告</th> + <th>踢出</th> + </tr> + <tr bgcolor="#ffffff"> + <td>不要发送垃圾邮件。</td> + <td></td> + <td>1</td> + <td>2</td> + </tr> + <tr bgcolor="#ffffff"> + <td>当粘贴内容超过一或两行时者使用 pastebin。</td> + <td><a href="http://winehq.pastebin.com">winehq.pastebin.com</a> 和 + <a href="http://pastebin.ca">pastebin.ca</a> 都是可以使用的。</td> + <td>0</td> + <td>5</td> + </tr> + <tr bgcolor="#ffffff"> + <td>在合适的频道中讨论合适的话题。</td> + <td>如果不确定，可以在 #winehq 询问应该加入什么频道。</td> + <td>2</td> + <td>3</td> + </tr> + <tr bgcolor="#ffffff"> + <td>只有 Wine 和 Crossover 才会在他们对应的频道获得支持。</td> + <td>Sidenet、WineDoors、Cedega、IEs4Linux 等等是不会被支持的。</td> + <td>2</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>在 #winehq 提问前，确保你正在使用的是最新版本的 Wine。</td> + <td>如果不确定，在命令行中使用 <tt>wine --version</tt> 来确定你的版本。</td> + <td>3</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>请等候直到轮到你获取帮助。</td> + <td></td> + <td>3</td> + <td>1</td> + </tr> + <tr bgcolor="#ffffff"> + <td>不要讨论有关盗版软件的。</td> + <td></td> + <td>1</td> + <td>1</td> + </tr> +</table>

1 0

Henri Verbeet : wined3d: Add WINED3DFMT_INST to the format table.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: c37594d3a902dab5cd3186f6b9276e4ccbcb0e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37594d3a902dab5cd3186f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 8 13:21:14 2013 +0100 wined3d: Add WINED3DFMT_INST to the format table. We need the format to exist in apply_format_fixups() in particular. --- dlls/wined3d/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2b95dfd..4b29ec8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -124,6 +124,7 @@ static const struct wined3d_format_channels formats[] = /* Vendor-specific formats */ {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0},

1 0

Aric Stewart : usp10: Fix memory leak when a font has 0 languages, scripts or features.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 237ed21737de24fb7f0a508eb87b3c7937164258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237ed21737de24fb7f0a508eb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 8 09:46:08 2013 -0600 usp10: Fix memory leak when a font has 0 languages, scripts or features. Based on original fix proposded by Wojciech Pyczak. --- dlls/usp10/opentype.c | 22 ++++++++++++++++++---- dlls/usp10/usp10_internal.h | 3 +++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 85eacf9..a48a607 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1898,6 +1898,9 @@ static void GPOS_expand_script_cache(ScriptCache *psc) script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); count = GET_BE_WORD(script->ScriptCount); + if (!count) + return; + if (!psc->script_count) { psc->script_count = count; @@ -1941,10 +1944,11 @@ static void GPOS_expand_script_cache(ScriptCache *psc) static void _initialize_script_cache(ScriptCache *psc) { - if (!psc->script_count) + if (!psc->scripts_initialized) { GSUB_initialize_script_cache(psc); GPOS_expand_script_cache(psc); + psc->scripts_initialized = TRUE; } } @@ -2029,6 +2033,10 @@ static void GPOS_expand_language_cache(LoadedScript *script) count = GET_BE_WORD(table->LangSysCount); TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + + if (!count) + return; + if (!script->language_count) { int i; @@ -2072,10 +2080,11 @@ static void GPOS_expand_language_cache(LoadedScript *script) static void _initialize_language_cache(LoadedScript *script) { - if (!script->language_count) + if (!script->languages_initialized) { GSUB_initialize_language_cache(script); GPOS_expand_language_cache(script); + script->languages_initialized = TRUE; } } @@ -2194,6 +2203,10 @@ static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); TRACE("%i features\n",count); + + if (!count) + return; + if (!language->feature_count) { language->feature_count = count; @@ -2219,7 +2232,7 @@ static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) } } } - else if (count) + else { language->features = HeapReAlloc(GetProcessHeap(),0,language->features, sizeof(LoadedFeature)*(language->feature_count + count)); @@ -2245,10 +2258,11 @@ static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language) { - if (!language->feature_count) + if (!language->features_initialized) { GSUB_initialize_feature_cache(psc->GSUB_Table, language); GPOS_expand_feature_cache(psc->GPOS_Table, language); + language->features_initialized = TRUE; } } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 3ada1c4..77bb20d 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -144,6 +144,7 @@ typedef struct { OPENTYPE_TAG tag; LPCVOID gsub_table; LPCVOID gpos_table; + BOOL features_initialized; INT feature_count; LoadedFeature *features; } LoadedLanguage; @@ -153,6 +154,7 @@ typedef struct { LPCVOID gsub_table; LPCVOID gpos_table; LoadedLanguage default_language; + BOOL languages_initialized; INT language_count; LoadedLanguage *languages; } LoadedScript; @@ -174,6 +176,7 @@ typedef struct { LPVOID CMAP_Table; LPVOID CMAP_format12_Table; LPVOID GPOS_Table; + BOOL scripts_initialized; INT script_count; LoadedScript *scripts;

1 0

Aric Stewart : usp10: Free default_language items when freeing script cache .
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: c8b5a16f0c2177746d6d4358f319f5e1e0f93234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b5a16f0c2177746d6d4358f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 8 09:45:55 2013 -0600 usp10: Free default_language items when freeing script cache. --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a08b047..0b14e9e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1060,6 +1060,9 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); } + for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts);

1 0

Huw Davies : riched20: Move the split point calculation to wrap.c.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 9e8a9f4f657e30de42d422bda3b23810e56976bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8a9f4f657e30de42d422bda… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 8 11:45:03 2013 +0000 riched20: Move the split point calculation to wrap.c. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 50 ------------------------------------------------ dlls/riched20/wrap.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9722f36..4401498 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -140,7 +140,6 @@ ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) DECLSPEC_HIDDEN; void ME_CheckCharOffsets(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_PropagateCharOffset(ME_DisplayItem *p, int shift) DECLSPEC_HIDDEN; -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) DECLSPEC_HIDDEN; /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_HIDDEN; int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index aaa6300..6f9d5b5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -404,56 +404,6 @@ void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) } /****************************************************************************** - * ME_CharFromPoint - * - * Returns a character position inside the run given a run-relative - * pixel horizontal position. This version rounds left (ie. if the second - * character is at pixel position 8, then for cx=0..7 it returns 0). - */ -int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) -{ - int fit = 0; - HGDIOBJ hOldFont; - SIZE sz; - if (!run->len || cx <= 0) - return 0; - - if (run->nFlags & MERF_TAB || - (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) - { - if (cx < run->nWidth/2) - return 0; - return 1; - } - if (run->nFlags & MERF_GRAPHICS) - { - SIZE sz; - ME_GetOLEObjectSize(c, run, &sz); - if (cx < sz.cx) - return 0; - return 1; - } - hOldFont = ME_SelectStyleFont(c, run->style); - - if (c->editor->cPasswordMask) - { - ME_String *strMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - GetTextExtentExPointW(c->hDC, strMasked->szData, run->len, - cx, &fit, NULL, &sz); - ME_DestroyString(strMasked); - } - else - { - GetTextExtentExPointW(c->hDC, get_text( run, 0 ), run->len, - cx, &fit, NULL, &sz); - } - - ME_UnselectStyleFont(c, run->style, hOldFont); - - return fit; -} - -/****************************************************************************** * ME_CharFromPointCursor * * Returns a character position inside the run given a run-relative diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 97598e7..0531c97 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -80,6 +80,51 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite return cursor.pRun; } +/****************************************************************************** + * find_split_point + * + * Returns a character position to split inside the run given a run-relative + * pixel horizontal position. This version rounds left (ie. if the second + * character is at pixel position 8, then for cx=0..7 it returns 0). + */ +static int find_split_point( ME_Context *c, int cx, ME_Run *run ) +{ + int fit = 0; + HGDIOBJ hOldFont; + SIZE sz; + + if (!run->len || cx <= 0) return 0; + + if (run->nFlags & MERF_TAB || + (run->nFlags & (MERF_ENDCELL|MERF_ENDPARA)) == MERF_ENDCELL) + { + if (cx < run->nWidth / 2) return 0; + return 1; + } + if (run->nFlags & MERF_GRAPHICS) + { + SIZE sz; + ME_GetOLEObjectSize( c, run, &sz ); + if (cx < sz.cx) return 0; + return 1; + } + hOldFont = ME_SelectStyleFont( c, run->style ); + + if (c->editor->cPasswordMask) + { + ME_String *strMasked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + GetTextExtentExPointW( c->hDC, strMasked->szData, run->len, cx, &fit, NULL, &sz ); + ME_DestroyString( strMasked ); + } + else + { + GetTextExtentExPointW( c->hDC, get_text( run, 0 ), run->len, cx, &fit, NULL, &sz ); + } + + ME_UnselectStyleFont( c, run->style, hOldFont ); + + return fit; +} static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { @@ -337,7 +382,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem int i, idesp, len; ME_Run *run = &p->member.run; - idesp = i = ME_CharFromPoint(wc->context, loc, run); + idesp = i = find_split_point( wc->context, loc, run ); len = run->len; assert(len>0); assert(i<len);

1 0

Jacek Caban : atl100: Added AtlComModuleRegisterClassObjects implementation ( based on AtlModuleRegisterClassObjects).
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 68a4c30e8b702e425ea099061dd3e8510e2a7f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a4c30e8b702e425ea099061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 8 10:59:19 2013 +0100 atl100: Added AtlComModuleRegisterClassObjects implementation (based on AtlModuleRegisterClassObjects). --- dlls/atl100/atl.c | 32 ++++++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index ce35b38..ebb47a1 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -456,6 +456,38 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE *pm, REFCLSID rclsid, } /*********************************************************************** + * AtlComModuleRegisterClassObjects [atl100.17] + */ +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE *module, DWORD context, DWORD flags) +{ + _ATL_OBJMAP_ENTRY **iter; + IUnknown *unk; + HRESULT hres; + + TRACE("(%p %x %x)\n", module, context, flags); + + if(!module) + return E_INVALIDARG; + + for(iter = module->m_ppAutoObjMapFirst; iter < module->m_ppAutoObjMapLast; iter++) { + if(!(*iter)->pfnGetClassObject) + continue; + + hres = (*iter)->pfnGetClassObject((*iter)->pfnCreateInstance, &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = CoRegisterClassObject((*iter)->pclsid, unk, context, flags, &(*iter)->dwRegister); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } + + return S_OK; + +} + +/*********************************************************************** * AtlComModuleUnregisterServer [atl100.22] */ HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib, const CLSID *clsid) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index c959a29..fa5d251 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -4,7 +4,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) -17 stub AtlComModuleRegisterClassObjects +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) 20 stub AtlComModuleRevokeClassObjects 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) 23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index dfc9c43..dbd38aa 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -4,7 +4,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlComModuleGetClassObject(ptr ptr ptr ptr) atl100.AtlComModuleGetClassObject -17 stub AtlComModuleRegisterClassObjects +17 stdcall AtlComModuleRegisterClassObjects(ptr long long) atl100.AtlComModuleRegisterClassObjects 18 stdcall AtlComModuleRegisterServer(ptr long ptr) 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stub AtlComModuleRevokeClassObjects diff --git a/include/atlbase.h b/include/atlbase.h index 7d18d81..1036b10 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -255,6 +255,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); HRESULT WINAPI AtlRegisterTypeLib(HINSTANCE,LPCOLESTR); HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void**); +HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*);

1 0

Michael Stefaniuc : dmime: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5351700223f2879f1bef541141e1a3808a070a53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5351700223f2879f1bef54114… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:51:54 2013 +0100 dmime: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/dmime/segment.c | 5 ++--- dlls/dmime/segtriggertrack.c | 7 +++---- dlls/dmime/tempotrack.c | 12 +++++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index e0d082d..36766db 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -246,10 +246,9 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_InsertTrack } pNewSegTrack = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_SEGMENT_TRACK)); - if (NULL == pNewSegTrack) { - ERR(": no more memory\n"); + if (NULL == pNewSegTrack) return E_OUTOFMEMORY; - } + pNewSegTrack->dwGroupBits = dwGroupBits; pNewSegTrack->pTrack = pTrack; IDirectMusicTrack_Init(pTrack, (IDirectMusicSegment *)iface); diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 221feeb..583561c 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -274,10 +274,9 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS TRACE_(dmfile)(": segment item chunk\n"); /** alloc new item entry */ pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_SEGMENT_ITEM)); - if (!pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (!pNewItem) + return E_OUTOFMEMORY; + IStream_Read (pStm, &pNewItem->header, sizeof(DMUS_IO_SEGMENT_ITEM_HEADER), NULL); TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimeLogical); TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimePhysical); diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 21a4685..b8dee90 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -113,10 +113,9 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_InitPlay (LPDIREC FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); - if (NULL == pState) { - ERR(": no more memory\n"); + if (NULL == pState) return E_OUTOFMEMORY; - } + /** TODO real fill useful data */ pState->dummy = 0; *ppStateData = pState; @@ -348,10 +347,9 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA TRACE_(dmfile)(" - lTime = %u\n", item.lTime); TRACE_(dmfile)(" - dblTempo = %g\n", item.dblTempo); pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_ITEM)); - if (NULL == pNewItem) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (NULL == pNewItem) + return E_OUTOFMEMORY; + pNewItem->item = item; list_add_tail (&This->Items, &pNewItem->entry); pNewItem = NULL;

1 0

Michael Stefaniuc : d3drm: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5ef8a8b2f29d34118e7c1389d2c3b7ec2f50e57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef8a8b2f29d34118e7c1389d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:27:49 2013 +0100 d3drm: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3drm/d3drm.c | 3 --- dlls/d3drm/device.c | 3 --- dlls/d3drm/frame.c | 12 ------------ dlls/d3drm/light.c | 3 --- dlls/d3drm/material.c | 3 --- dlls/d3drm/meshbuilder.c | 6 ------ dlls/d3drm/texture.c | 3 --- dlls/d3drm/viewport.c | 3 --- 8 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 48b362d..a18eb11 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1686,10 +1686,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRM_iface.lpVtbl = &Direct3DRM_Vtbl; object->IDirect3DRM2_iface.lpVtbl = &Direct3DRM2_Vtbl; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 6d72d92..e6e0d71 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1161,10 +1161,7 @@ HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMDeviceImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMDevice2_iface.lpVtbl = &Direct3DRMDevice2_Vtbl; object->IDirect3DRMDevice3_iface.lpVtbl = &Direct3DRMDevice3_Vtbl; diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 525a3fa..b0bbaa6 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -203,10 +203,7 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMFrameArray_iface.lpVtbl = &Direct3DRMFrameArray_Vtbl; object->ref = 1; @@ -319,10 +316,7 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMVisualArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMVisualArray_iface.lpVtbl = &Direct3DRMVisualArray_Vtbl; object->ref = 1; @@ -439,10 +433,7 @@ static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; object->ref = 1; @@ -2665,10 +2656,7 @@ HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent, IUnknown** ret_ifa object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMFrame2_iface.lpVtbl = &Direct3DRMFrame2_Vtbl; object->IDirect3DRMFrame3_iface.lpVtbl = &Direct3DRMFrame3_Vtbl; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 558d836..32500bf 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -426,10 +426,7 @@ HRESULT Direct3DRMLight_create(IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMLight_iface.lpVtbl = &Direct3DRMLight_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/material.c b/dlls/d3drm/material.c index 0c1fa8c..2adb20f 100644 --- a/dlls/d3drm/material.c +++ b/dlls/d3drm/material.c @@ -312,10 +312,7 @@ HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMaterialImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMaterial2_iface.lpVtbl = &Direct3DRMMaterial2_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 59266de..51f981a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2522,10 +2522,7 @@ HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshBuilderImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &Direct3DRMMeshBuilder2_Vtbl; object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &Direct3DRMMeshBuilder3_Vtbl; @@ -3086,10 +3083,7 @@ HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMMeshImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMMesh_iface.lpVtbl = &Direct3DRMMesh_Vtbl; object->ref = 1; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 6ff4345..cbaaf63 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -849,10 +849,7 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMTextureImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMTexture2_iface.lpVtbl = &Direct3DRMTexture2_Vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &Direct3DRMTexture3_Vtbl; diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index e134bf2..729db03 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -971,10 +971,7 @@ HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMViewportImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirect3DRMViewport_iface.lpVtbl = &Direct3DRMViewport_Vtbl; object->IDirect3DRMViewport2_iface.lpVtbl = &Direct3DRMViewport2_Vtbl;

1 0

Michael Stefaniuc : amstream: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 76b910514ef060dd981646768ff0be9d26748d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b910514ef060dd981646768… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:29:36 2013 +0100 amstream: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/amstream/amstream.c | 3 --- dlls/amstream/audiodata.c | 3 --- dlls/amstream/mediastream.c | 12 ------------ dlls/amstream/mediastreamfilter.c | 3 --- 4 files changed, 0 insertions(+), 21 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 94066a1..800e48d 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -63,10 +63,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAMMultiMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMultiMediaStream_iface.lpVtbl = &AM_Vtbl; object->ref = 1; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 2bd57da..3a62a9f 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -143,10 +143,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; object->ref = 1; diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index dd037fc..f619cbd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -436,10 +436,7 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DirectDrawMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IAMMediaStream_Vtbl; object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Vtbl; @@ -839,10 +836,7 @@ HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioMediaStreamImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAMMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAMMediaStream_Vtbl; object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStreamImpl_IAudioMediaStream_Vtbl; @@ -992,10 +986,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawStreamSampleImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; @@ -1133,10 +1124,7 @@ static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *a object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioStreamSampleImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->IAudioStreamSample_iface.lpVtbl = &AudioStreamSample_Vtbl; object->ref = 1; diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index bfec0f0..49ee6fe 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -516,10 +516,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } BaseFilter_Init(&object->filter, (IBaseFilterVtbl*)&MediaStreamFilter_Vtbl, &CLSID_MediaStreamFilter, (DWORD_PTR)(__FILE__ ": MediaStreamFilterImpl.csFilter"), &BaseFuncTable);

1 0