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

Austin English : windowscodecsext: Add a stub dll.
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: ac15301b7f7b415f3a2b57a4b6f09b506f194cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac15301b7f7b415f3a2b57a4b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 2 05:15:03 2013 +0100 windowscodecsext: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/windowscodecsext/Makefile.in | 6 +++ dlls/windowscodecsext/main.c | 47 +++++++++++++++++++++++++++ dlls/windowscodecsext/windowscodecsext.spec | 3 ++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e3253ee..c5fabba 100755 --- a/configure +++ b/configure @@ -16184,6 +16184,7 @@ wine_fn_config_dll winaspi.dll16 enable_win16 wine_fn_config_dll windebug.dll16 enable_win16 wine_fn_config_dll windowscodecs enable_windowscodecs implib wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test +wine_fn_config_dll windowscodecsext enable_windowscodecsext wine_fn_config_dll winealsa.drv enable_winealsa_drv wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv wine_fn_config_lib winecrt0 diff --git a/configure.ac b/configure.ac index c93cd08..012228c 100644 --- a/configure.ac +++ b/configure.ac @@ -3068,6 +3068,7 @@ WINE_CONFIG_DLL(winaspi.dll16,enable_win16) WINE_CONFIG_DLL(windebug.dll16,enable_win16) WINE_CONFIG_DLL(windowscodecs,,[implib]) WINE_CONFIG_TEST(dlls/windowscodecs/tests) +WINE_CONFIG_DLL(windowscodecsext) WINE_CONFIG_DLL(winealsa.drv) WINE_CONFIG_DLL(winecoreaudio.drv) WINE_CONFIG_LIB(winecrt0) diff --git a/dlls/windowscodecsext/Makefile.in b/dlls/windowscodecsext/Makefile.in new file mode 100644 index 0000000..de6d06c --- /dev/null +++ b/dlls/windowscodecsext/Makefile.in @@ -0,0 +1,6 @@ +MODULE = windowscodecsext.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/windowscodecsext/main.c b/dlls/windowscodecsext/main.c new file mode 100644 index 0000000..608096e --- /dev/null +++ b/dlls/windowscodecsext/main.c @@ -0,0 +1,47 @@ +/* + * Windows Codecs Extensions + * + * Copyright 2013 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/windowscodecsext/windowscodecsext.spec b/dlls/windowscodecsext/windowscodecsext.spec new file mode 100644 index 0000000..d6b0e2b --- /dev/null +++ b/dlls/windowscodecsext/windowscodecsext.spec @@ -0,0 +1,3 @@ +@ stub DllGetClassObject +@ stub IWICColorTransform_Initialize_Proxy +@ stub WICCreateColorTransform_Proxy

1 0

Alexander Morozov : ole32: Avoid a deadlock when a being loaded DLL calls CoRegisterClassObject from its DLL_PROCESS_ATTACH handler .
by Alexandre Julliard Feb. 8, 2013

Feb. 8, 2013

Module: wine Branch: master Commit: 5857895684020e513f6f3858938fc5ab7a227676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5857895684020e513f6f38589… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Aug 2 15:52:48 2011 +0400 ole32: Avoid a deadlock when a being loaded DLL calls CoRegisterClassObject from its DLL_PROCESS_ATTACH handler. --- dlls/ole32/rpc.c | 45 ++++++++++++++++++--------------------------- 1 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5c981bb..5070117 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1877,7 +1877,7 @@ struct local_server_params { CLSID clsid; IStream *stream; - HANDLE ready_event; + HANDLE pipe; HANDLE stop_event; HANDLE thread; BOOL multi_use; @@ -1898,7 +1898,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) ULONG res; BOOL multi_use = lsp->multi_use; OVERLAPPED ovl; - HANDLE pipe_event, hPipe, new_pipe; + HANDLE pipe_event, hPipe = lsp->pipe, new_pipe; DWORD bytes; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1907,18 +1907,6 @@ static DWORD WINAPI local_server_thread(LPVOID param) get_localserver_pipe_name(pipefn, &lsp->clsid); ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) - { - FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; - } - - SetEvent(lsp->ready_event); - while (1) { if (!ConnectNamedPipe(hPipe, &ovl)) { @@ -2008,8 +1996,9 @@ static DWORD WINAPI local_server_thread(LPVOID param) /* starts listening for a local server */ HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) { - DWORD tid; + DWORD tid, err; struct local_server_params *lsp; + WCHAR pipefn[100]; lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); if (!lsp) @@ -2018,34 +2007,36 @@ HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, vo lsp->clsid = *clsid; lsp->stream = stream; IStream_AddRef(stream); - lsp->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (!lsp->ready_event) - { - HeapFree(GetProcessHeap(), 0, lsp); - return HRESULT_FROM_WIN32(GetLastError()); - } lsp->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!lsp->stop_event) { - CloseHandle(lsp->ready_event); HeapFree(GetProcessHeap(), 0, lsp); return HRESULT_FROM_WIN32(GetLastError()); } lsp->multi_use = multi_use; + get_localserver_pipe_name(pipefn, &lsp->clsid); + lsp->pipe = CreateNamedPipeW(pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL); + if (lsp->pipe == INVALID_HANDLE_VALUE) + { + err = GetLastError(); + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(lsp->stop_event); + HeapFree(GetProcessHeap(), 0, lsp); + return HRESULT_FROM_WIN32(err); + } + lsp->thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); if (!lsp->thread) { - CloseHandle(lsp->ready_event); + CloseHandle(lsp->pipe); CloseHandle(lsp->stop_event); HeapFree(GetProcessHeap(), 0, lsp); return HRESULT_FROM_WIN32(GetLastError()); } - WaitForSingleObject(lsp->ready_event, INFINITE); - CloseHandle(lsp->ready_event); - lsp->ready_event = NULL; - *registration = lsp; return S_OK; }

1 0

Michael Stefaniuc : d3dcompiler_43: 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: 536bdfde27f2967ac944c83885384a4d3ec52c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=536bdfde27f2967ac944c8388… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 8 10:34:39 2013 +0100 d3dcompiler_43: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3dcompiler_43/blob.c | 3 --- dlls/d3dcompiler_43/compiler.c | 12 +++--------- dlls/d3dcompiler_43/reflection.c | 6 ------ 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 6900e87..865d139 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -148,10 +148,7 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D blob object memory\n"); return E_OUTOFMEMORY; - } hr = d3dcompiler_blob_init(object, data_size); if (FAILED(hr)) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index caa6080..86e8b44 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -84,10 +84,8 @@ static void wpp_write_message(const char *fmt, va_list args) { wpp_messages = HeapAlloc(GetProcessHeap(), 0, MESSAGEBUFFER_INITIAL_SIZE); if(wpp_messages == NULL) - { - ERR("Error allocating memory for parser messages\n"); return; - } + wpp_messages_capacity = MESSAGEBUFFER_INITIAL_SIZE; } @@ -189,10 +187,8 @@ static void *wpp_open_mem(const char *filename, int type) if(current_include == NULL) return NULL; desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*desc)); if(!desc) - { - ERR("Error allocating memory\n"); return NULL; - } + hr = ID3DInclude_Open(current_include, type ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_include, (LPCVOID *)&desc->buffer, @@ -275,10 +271,8 @@ static void wpp_write_mem(const char *buffer, unsigned int len) { wpp_output = HeapAlloc(GetProcessHeap(), 0, BUFFER_INITIAL_CAPACITY); if(!wpp_output) - { - ERR("Error allocating memory\n"); return; - } + wpp_output_capacity = BUFFER_INITIAL_CAPACITY; } if(len > wpp_output_capacity - wpp_output_size) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5dd7c38..f516e4a 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1282,10 +1282,7 @@ static struct d3dcompiler_shader_reflection_type *get_reflection_type(struct d3d type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); if (!type) - { - ERR("Failed to allocate type memory.\n"); return NULL; - } type->ID3D11ShaderReflectionType_iface.lpVtbl = &d3dcompiler_shader_reflection_type_vtbl; type->id = offset; @@ -1833,10 +1830,7 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D compiler shader reflection object memory\n"); return E_OUTOFMEMORY; - } hr = d3dcompiler_shader_reflection_init(object, data, data_size); if (FAILED(hr))

1 0

Jörg Höhle : ntdll: Use the monotonic time counter also for timer queues.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 4f6db78ca0f4f01d8a8734ddc332cc3ea1a8587e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f6db78ca0f4f01d8a8734ddc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 5 18:01:04 2013 +0100 ntdll: Use the monotonic time counter also for timer queues. --- dlls/ntdll/threadpool.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 81abac3..f246cfb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -605,9 +605,9 @@ static DWORD WINAPI timer_callback_wrapper(LPVOID p) static inline ULONGLONG queue_current_time(void) { - LARGE_INTEGER now; - NtQuerySystemTime(&now); - return now.QuadPart / 10000; + LARGE_INTEGER now, freq; + NtQueryPerformanceCounter(&now, &freq); + return now.QuadPart * 1000 / freq.QuadPart; } static void queue_add_timer(struct queue_timer *t, ULONGLONG time,

1 0

Ken Thomases : secur32: On Mac, add support for cipher suites defined in 10 .8 SDK.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 7494f5bc5e4945e4b7828a04f202f06660ab98f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7494f5bc5e4945e4b7828a04f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Feb 7 09:11:24 2013 -0600 secur32: On Mac, add support for cipher suites defined in 10.8 SDK. --- dlls/secur32/schannel_macosx.c | 143 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 140 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7494f5bc5e4945e4b7828…

1 0

Akihiro Sagawa : gdi32: Ensure a fixed-pitch full-width character has double advance of a half-width character .
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9aa8300f99965d2b66eb7016ff3e44a3d517ba8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa8300f99965d2b66eb7016f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 7 22:13:04 2013 +0900 gdi32: Ensure a fixed-pitch full-width character has double advance of a half-width character. --- dlls/gdi32/freetype.c | 37 ++++++++++++++++++-- dlls/gdi32/tests/font.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 40cf080..b977b0d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5821,6 +5821,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; + FT_Fixed avgAdvance = 0; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -5957,10 +5958,26 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } + if(FT_IS_SCALABLE(incoming_font->ft_face)) { + TEXTMETRICW tm; + if (get_text_metrics(incoming_font, &tm) && + !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { + avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, + incoming_font->ft_face->size->metrics.x_scale); + if (avgAdvance && (ft_face->glyph->metrics.horiAdvance+63) >> 6 == (avgAdvance*2+63) >> 6) + TRACE("Fixed-pitch full-width character detected\n"); + else + avgAdvance = 0; /* cancel this feature */ + } + } + if(!needsTransform) { left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + if (!avgAdvance) + adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + else + adv = (INT)((avgAdvance + 32) >> 6) * 2; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - @@ -6001,13 +6018,27 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = ft_face->glyph->metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = (vec.x+63) >> 6; lpgm->gmCellIncY = -((vec.y+63) >> 6); + if (!avgAdvance || vec.y) + lpgm->gmCellIncX = (vec.x+63) >> 6; + else { + vec.x = avgAdvance; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMat); + lpgm->gmCellIncX = ((vec.x+32) >> 6) * 2; + } vec.x = ft_face->glyph->metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = (vec.x+63) >> 6; + if (!avgAdvance || vec.y) + adv = (vec.x+63) >> 6; + else { + vec.x = avgAdvance; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + adv = ((vec.x+32) >> 6) * 2; + } } lpgm->gmBlackBoxX = (right - left) >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f234b62..943f584 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3552,6 +3552,38 @@ todo_wine DeleteDC(hdc); } +static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + const NEWTEXTMETRICEX *lpntmex = (const NEWTEXTMETRICEX *)lpntme; + CHARSETINFO csi; + LOGFONT lf = *lpelfe; + HFONT hfont; + + /* skip bitmap, proportional or vertical font */ + if ((FontType & TRUETYPE_FONTTYPE) == 0 || + (lf.lfPitchAndFamily & 0xf) != FIXED_PITCH || + lf.lfFaceName[0] == '@') + return 1; + + /* skip linked font */ + if (!TranslateCharsetInfo((DWORD*)(INT_PTR)lpelfe->lfCharSet, &csi, TCI_SRCCHARSET) || + (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) + return 1; + + /* test with an odd height */ + lf.lfHeight = -19; + lf.lfWidth = 0; + hfont = CreateFontIndirect(&lf); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + return 1; +} + static void test_GetGlyphOutline(void) { HDC hdc; @@ -3640,6 +3672,8 @@ static void test_GetGlyphOutline(void) for (i = 0; i < sizeof c / sizeof c[0]; ++i) { + static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; + lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; lf.lfPitchAndFamily = 0; @@ -3670,6 +3704,60 @@ static void test_GetGlyphOutline(void) ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + if (EnumFontFamiliesEx(hdc, &lf, create_fixed_pitch_font_proc, (LPARAM)&hfont, 0)) + { + skip("Fixed-pitch TrueType font for charset %u is not available\n", c[i].cs); + continue; + } + DeleteObject(SelectObject(hdc, hfont)); + if (c[i].a <= 0xff) + { + DeleteObject(SelectObject(hdc, old_hfont)); + continue; + } + + ret = GetObject(hfont, sizeof lf, &lf); + ok(ret > 0, "GetObject error %u\n", GetLastError()); + + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n", + -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = TRUE; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = FALSE; + lf.lfEscapement = lf.lfOrientation = 2700; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); + hfont = SelectObject(hdc, old_hfont); DeleteObject(hfont); }

1 0

André Hentschel : ntdll: Set TPIDRURW to TEB on thread init for ARM.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: b288f7be1860c6373555b3d412fe849a656fe165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b288f7be1860c6373555b3d41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 6 22:00:59 2013 +0100 ntdll: Set TPIDRURW to TEB on thread init for ARM. --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5ad4016..6abd76b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -832,6 +832,21 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +/********************************************************************** + * set_tpidrurw + * + * Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. + */ +#ifdef __ARM_ARCH_7A__ +extern void set_tpidrurw( TEB *teb ); +__ASM_GLOBAL_FUNC( set_tpidrurw, + "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ + "blx lr" ) +#else +void set_tpidrurw( TEB *teb ) +{ +} +#endif /********************************************************************** * signal_init_thread @@ -845,6 +860,7 @@ void signal_init_thread( TEB *teb ) pthread_key_create( &teb_key, NULL ); init_done = 1; } + set_tpidrurw( teb ); pthread_setspecific( teb_key, teb ); }

1 0

Huw Davies : riched20: Move SplitRun to wrap.c and make it static.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 68d72f479288fc77436e4d7b4d64aa5f7d7d8218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d72f479288fc77436e4d7b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 7 14:30:47 2013 +0000 riched20: Move SplitRun to wrap.c and make it static. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 48 ------------------------------------ dlls/riched20/wrap.c | 63 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6562b8e..9722f36 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -146,7 +146,6 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nChar) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 54db370..aaa6300 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -243,54 +243,6 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) } /****************************************************************************** - * ME_SplitRun - * - * Splits a run into two in a given place. It also updates the screen position - * and size (extent) of the newly generated runs. - */ -ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) -{ - ME_TextEditor *editor = wc->context->editor; - ME_Run *run, *run2; - ME_Paragraph *para = &wc->pPara->member.para; - ME_Cursor cursor = {wc->pPara, item, nVChar}; - - assert(item->member.run.nCharOfs != -1); - if(TRACE_ON(richedit)) - { - TRACE("Before check before split\n"); - ME_CheckCharOffsets(editor); - TRACE("After check before split\n"); - } - - run = &item->member.run; - - TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), - run->pt.x, run->pt.y); - - ME_SplitRunSimple(editor, &cursor); - - run2 = &cursor.pRun->member.run; - - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); - - run2->pt.x = run->pt.x+run->nWidth; - run2->pt.y = run->pt.y; - - if(TRACE_ON(richedit)) - { - TRACE("Before check after split\n"); - ME_CheckCharOffsets(editor); - TRACE("After check after split\n"); - TRACE("After split: %s(%d, %d), %s(%d, %d)\n", - debugstr_run( run ), run->pt.x, run->pt.y, - debugstr_run( run2 ), run2->pt.x, run2->pt.y); - } - - return cursor.pRun; -} - -/****************************************************************************** * ME_SplitRunSimple * * Does the most basic job of splitting a run into two - it does not diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index b63697b..97598e7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -32,6 +32,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); * - no tabs */ +/****************************************************************************** + * split_run_extents + * + * Splits a run into two in a given place. It also updates the screen position + * and size (extent) of the newly generated runs. + */ +static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) +{ + ME_TextEditor *editor = wc->context->editor; + ME_Run *run, *run2; + ME_Paragraph *para = &wc->pPara->member.para; + ME_Cursor cursor = {wc->pPara, item, nVChar}; + + assert(item->member.run.nCharOfs != -1); + if(TRACE_ON(richedit)) + { + TRACE("Before check before split\n"); + ME_CheckCharOffsets(editor); + TRACE("After check before split\n"); + } + + run = &item->member.run; + + TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), + run->pt.x, run->pt.y); + + ME_SplitRunSimple(editor, &cursor); + + run2 = &cursor.pRun->member.run; + + ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + + run2->pt.x = run->pt.x+run->nWidth; + run2->pt.y = run->pt.y; + + if(TRACE_ON(richedit)) + { + TRACE("Before check after split\n"); + ME_CheckCharOffsets(editor); + TRACE("After check after split\n"); + TRACE("After split: %s(%d, %d), %s(%d, %d)\n", + debugstr_run( run ), run->pt.x, run->pt.y, + debugstr_run( run2 ), run2->pt.x, run2->pt.y); + } + + return cursor.pRun; +} + + static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { ME_DisplayItem *item = ME_MakeDI(diStartRow); @@ -247,7 +296,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i return NULL; j = reverse_find_non_whitespace( get_text( &p->member.run, 0 ), i); if (j>0) { - pp = ME_SplitRun(wc, piter, j); + pp = split_run_extents(wc, piter, j); wc->pt.x += piter->member.run.nWidth; return pp; } @@ -267,7 +316,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i { i = reverse_find_non_whitespace( get_text( &piter->member.run, 0 ), piter->member.run.len ); - pp = ME_SplitRun(wc, piter, i); + pp = split_run_extents(wc, piter, i); wc->pt = pp->member.run.pt; return pp; } @@ -322,7 +371,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem if (i == len) i = reverse_find_non_whitespace( get_text( run, 0 ), len ); if (i) { - ME_DisplayItem *piter2 = ME_SplitRun(wc, piter, i); + ME_DisplayItem *piter2 = split_run_extents(wc, piter, i); wc->pt = piter2->member.run.pt; return piter2; } @@ -339,7 +388,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return ME_SplitRun(wc, piter, idesp); + return split_run_extents(wc, piter, idesp); else if (wc->pRowStart && piter != wc->pRowStart) { @@ -353,7 +402,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem /* split point inside first character - no choice but split after that char */ if (len != 1) { /* the run is more than 1 char, so we may split */ - return ME_SplitRun(wc, piter, 1); + return split_run_extents(wc, piter, 1); } /* the run is one char, can't split it */ return piter; @@ -393,7 +442,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) black = find_non_whitespace( get_text( run, 0 ), run->len, 0 ); if (black) { wc->bOverflown = FALSE; - pp = ME_SplitRun(wc, p, black); + pp = split_run_extents(wc, p, black); ME_CalcRunExtent(wc->context, &wc->pPara->member.para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &pp->member.run); @@ -444,7 +493,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) { /* we aren't sure if it's *really* necessary, it's a good start however */ int black = reverse_find_non_whitespace( get_text( run, 0 ), len ); - ME_SplitRun(wc, p, black); + split_run_extents(wc, p, black); /* handle both parts again */ return p; }

1 0

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

Feb. 7, 2013

Module: wine Branch: master Commit: 1eff4669ff70ee74ed9b6d5237c9533ae1e5a54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eff4669ff70ee74ed9b6d523… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:50:28 2013 +0100 d3d10core: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d10core/device.c | 45 --------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index c45ebd8..f7b906d 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1068,10 +1068,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 buffer object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_buffer_init(object, This, desc, data); if (FAILED(hr)) @@ -1108,10 +1105,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 texture2d object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_texture2d_init(object, This, desc); if (FAILED(hr)) @@ -1140,10 +1134,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 texture3d object memory.\n"); return E_OUTOFMEMORY; - } hr = d3d10_texture3d_init(object, device, desc); if (FAILED(hr)) @@ -1169,10 +1160,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 shader resource view object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_shader_resource_view_init(object, resource, desc))) { @@ -1197,10 +1185,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 rendertarget view object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_rendertarget_view_init(object, resource, desc); if (FAILED(hr)) @@ -1226,10 +1211,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 depthstencil view object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) { @@ -1260,10 +1242,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 input layout object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_input_layout_init(object, This, element_descs, element_count, shader_byte_code, shader_byte_code_length); @@ -1292,10 +1271,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 vertex shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_vertex_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1323,10 +1299,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 geometry shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1366,10 +1339,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 pixel shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_pixel_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1411,10 +1381,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 blend state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_blend_state_init(object, device, desc))) { @@ -1455,10 +1422,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 depthstencil state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) { @@ -1500,10 +1464,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 rasterizer state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) { @@ -1544,10 +1505,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 sampler state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_sampler_state_init(object, device, desc))) { @@ -1572,10 +1530,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 query object memory.\n"); return E_OUTOFMEMORY; - } hr = d3d10_query_init(object); if (FAILED(hr))

1 0

Ken Thomases : winemac: Add WineApplication methods to convert from Cocoa to Win32 coordinate space .
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 6289a612ae6bbe0fcd07d7a3c8ff802db10fc5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6289a612ae6bbe0fcd07d7a3c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:22 2013 -0600 winemac: Add WineApplication methods to convert from Cocoa to Win32 coordinate space. Cocoa coordinate space has its origin in the lower left of the primary screen and y increases up. --- dlls/winemac.drv/cocoa_app.h | 3 +++ dlls/winemac.drv/cocoa_app.m | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 2ccaec9..1166087 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -43,6 +43,9 @@ CGEventSourceKeyboardType keyboardType; NSEvent* lastFlagsChanged; + + CGFloat primaryScreenHeight; + BOOL primaryScreenHeightValid; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3853ec9..ae2353b 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -225,6 +225,32 @@ int macdrv_err_on; } } + - (CGFloat) primaryScreenHeight + { + if (!primaryScreenHeightValid) + { + NSArray* screens = [NSScreen screens]; + if ([screens count]) + { + primaryScreenHeight = NSHeight([[screens objectAtIndex:0] frame]); + primaryScreenHeightValid = TRUE; + } + else + return 1280; /* arbitrary value */ + } + + return primaryScreenHeight; + } + + - (NSPoint) flippedMouseLocation:(NSPoint)point + { + /* This relies on the fact that Cocoa's mouse location points are + actually off by one (precisely because they were flipped from + Quartz screen coordinates using this same technique). */ + point.y = [self primaryScreenHeight] - point.y; + return point; + } + /* * ---------- NSApplication method overrides ---------- @@ -241,6 +267,11 @@ int macdrv_err_on; /* * ---------- NSApplicationDelegate methods ---------- */ + - (void)applicationDidChangeScreenParameters:(NSNotification *)notification + { + primaryScreenHeightValid = FALSE; + } + - (void)applicationDidResignActive:(NSNotification *)notification { macdrv_event event;

1 0

Ken Thomases : winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 5f06bf80db714c1c355018cf7e3bd0e5eaa73ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06bf80db714c1c355018cf7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:18 2013 -0600 winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu. --- dlls/winemac.drv/window.c | 30 ++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d63912..7a7eda7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1041,6 +1041,36 @@ done: /*********************************************************************** + * SysCommand (MACDRV.@) + * + * Perform WM_SYSCOMMAND handling. + */ +LRESULT CDECL macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + struct macdrv_win_data *data; + LRESULT ret = -1; + + TRACE("%p, %x, %lx\n", hwnd, (unsigned)wparam, lparam); + + if (!(data = get_win_data(hwnd))) goto done; + if (!data->cocoa_window || !data->on_screen) goto done; + + /* prevent a simple ALT press+release from activating the system menu, + as that can get confusing */ + if ((wparam & 0xfff0) == SC_KEYMENU && !(WCHAR)lparam && !GetMenu(hwnd) && + (GetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) + { + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + ret = 0; + } + +done: + release_win_data(data); + return ret; +} + + +/*********************************************************************** * UpdateLayeredWindow (MACDRV.@) */ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 30df9d6..57b1e5a 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -24,6 +24,7 @@ @ cdecl SetWindowStyle(ptr long ptr) macdrv_SetWindowStyle @ cdecl SetWindowText(long wstr) macdrv_SetWindowText @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow +@ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow @ cdecl VkKeyScanEx(long long) macdrv_VkKeyScanEx

1 0

Michael Stefaniuc : d3drm: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9affa153fdc96dbeb36f502049a01e8cb1da9803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9affa153fdc96dbeb36f50204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:10:01 2013 +0100 d3drm: Let C look like C. --- dlls/d3drm/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f72dcaa..6ff4345 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -62,7 +62,7 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_QueryInterface(IDirect3DRMTexture2 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; } @@ -431,7 +431,7 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_QueryInterface(IDirect3DRMTexture3 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; }

1 0

Michael Stefaniuc : gphoto2.ds: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: f59d0ac743184a9f584cba405951361a575b9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d0ac743184a9f584cba405… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:11:23 2013 +0100 gphoto2.ds: Let C look like C. --- dlls/gphoto2.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index df79875..0b21f2e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -175,7 +175,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } break; case WM_COMMAND: - switch LOWORD(wParam) + switch (LOWORD(wParam)) { case IDC_SKIP: on_disable_dialog_clicked(hwnd);

1 0

Daniel Jelinski : comctl32/listview: Do not touch icon spacing if set explicitly.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: f9c3a612af058429ce92aff3bdd9b942efe0f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a612af058429ce92aff3b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:49:55 2013 +0100 comctl32/listview: Do not touch icon spacing if set explicitly. --- dlls/comctl32/listview.c | 10 ++++++++-- dlls/comctl32/tests/listview.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 96863f9..bc8997a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -55,7 +55,6 @@ * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented * -- LISTVIEW_SetColumnWidth ignores header images & bitmap - * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -290,6 +289,7 @@ typedef struct tagLISTVIEW_INFO HIMAGELIST himlSmall; HIMAGELIST himlState; SIZE iconSize; + BOOL autoSpacing; SIZE iconSpacing; SIZE iconStateSize; POINT currIconPos; /* this is the position next icon will be placed */ @@ -8594,11 +8594,15 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { + infoPtr->autoSpacing = TRUE; if (infoPtr->himlNormal) ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; } + else + infoPtr->autoSpacing = FALSE; + /* if 0 then keep width */ if (cx != 0) infoPtr->iconSpacing.cx = cx; @@ -8660,7 +8664,8 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9374,6 +9379,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; + infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c46fe42..98ca495 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4643,6 +4643,23 @@ static void test_getitemspacing(void) SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* spacing = 0 - keep previous value */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1)); + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret));

1 0

Michael Stefaniuc : iphlpapi: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 1cc6710aee05c646684323ee266455947a10ddfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc6710aee05c646684323ee2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:02 2013 +0100 iphlpapi: Let C look like C. --- 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 f8191ba..966d24e 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 (SUCCEEDED(ret)) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;

1 0

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

Feb. 7, 2013

Module: wine Branch: master Commit: d86ecd4bb4471590231b31e307d573518c8e398a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86ecd4bb4471590231b31e30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:55:34 2013 +0100 d3d9: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d9/d3d9_main.c | 6 ------ dlls/d3d9/device.c | 25 ------------------------- dlls/d3d9/directx.c | 6 ------ dlls/d3d9/swapchain.c | 3 --- dlls/d3d9/vertexdeclaration.c | 3 --- 5 files changed, 0 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 065a37e..ad2e330 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -40,10 +40,7 @@ IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d9 object memory.\n"); return NULL; - } if (!d3d9_init(object, FALSE)) { @@ -64,10 +61,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E TRACE("sdk_version %#x, d3d9ex %p.\n", sdk_version, d3d9ex); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d9 object memory.\n"); return E_OUTOFMEMORY; - } if (!d3d9_init(object, TRUE)) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 91543b5..7b53790 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -734,10 +734,7 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) @@ -781,10 +778,7 @@ static HRESULT WINAPI d3d9_device_CreateVolumeTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate volume texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) @@ -816,10 +810,7 @@ static HRESULT WINAPI d3d9_device_CreateCubeTexture(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate cube texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) @@ -851,10 +842,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexBuffer(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) @@ -886,10 +874,7 @@ static HRESULT WINAPI d3d9_device_CreateIndexBuffer(IDirect3DDevice9Ex *iface, U object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) @@ -1559,10 +1544,7 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate stateblock memory.\n"); return E_OUTOFMEMORY; - } hr = stateblock_init(object, device, type, NULL); if (FAILED(hr)) @@ -1613,7 +1595,6 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Failed to allocate stateblock memory.\n"); wined3d_mutex_lock(); wined3d_stateblock_decref(wined3d_stateblock); wined3d_mutex_unlock(); @@ -2413,10 +2394,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate vertex shader memory.\n"); return E_OUTOFMEMORY; - } hr = vertexshader_init(object, device, byte_code); if (FAILED(hr)) @@ -2896,10 +2874,7 @@ static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUER object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate query memory.\n"); return E_OUTOFMEMORY; - } hr = query_init(object, device, type); if (FAILED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index a97ff57..a335375 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -456,10 +456,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, NULL); if (FAILED(hr)) @@ -567,10 +564,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDeviceEx(IDirect3D9Ex *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d9, d3d9->wined3d, adapter, device_type, focus_window, flags, parameters, mode); if (FAILED(hr)) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 3b32346..8177336 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -278,10 +278,7 @@ HRESULT d3d9_swapchain_create(struct d3d9_device *device, struct wined3d_swapcha HRESULT hr; if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate swapchain memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = swapchain_init(object, device, desc))) { diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 4fe1189..502b7d3 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -419,10 +419,7 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate vertex declaration memory.\n"); return E_OUTOFMEMORY; - } hr = vertexdeclaration_init(object, device, elements); if (FAILED(hr))

1 0

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

Feb. 7, 2013

Module: wine Branch: master Commit: 14c3895573f0a7038e52dd810aa1641d2001dc9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c3895573f0a7038e52dd810… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:52:40 2013 +0100 d3d8: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d8/d3d8_main.c | 3 --- dlls/d3d8/device.c | 22 ---------------------- dlls/d3d8/directx.c | 3 --- dlls/d3d8/shader.c | 3 --- dlls/d3d8/swapchain.c | 3 --- 5 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 3405447..d03bcba 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -42,10 +42,7 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) TRACE("sdk_version %#x.\n", sdk_version); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate d3d8 object memory.\n"); return NULL; - } if (!d3d8_init(object)) { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d9c337a..a94d3bd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -723,10 +723,7 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = texture_init(object, device, width, height, levels, usage, format, pool); if (FAILED(hr)) @@ -755,10 +752,7 @@ static HRESULT WINAPI d3d8_device_CreateVolumeTexture(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate volume texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = volumetexture_init(object, device, width, height, depth, levels, usage, format, pool); if (FAILED(hr)) @@ -786,10 +780,7 @@ static HRESULT WINAPI d3d8_device_CreateCubeTexture(IDirect3DDevice8 *iface, UIN object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate cube texture memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = cubetexture_init(object, device, edge_length, levels, usage, format, pool); if (FAILED(hr)) @@ -817,10 +808,7 @@ static HRESULT WINAPI d3d8_device_CreateVertexBuffer(IDirect3DDevice8 *iface, UI object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = vertexbuffer_init(object, device, size, usage, fvf, pool); if (FAILED(hr)) @@ -848,10 +836,7 @@ static HRESULT WINAPI d3d8_device_CreateIndexBuffer(IDirect3DDevice8 *iface, UIN object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory.\n"); return D3DERR_OUTOFVIDEOMEMORY; - } hr = indexbuffer_init(object, device, size, usage, format, pool); if (FAILED(hr)) @@ -2150,7 +2135,6 @@ static HRESULT WINAPI d3d8_device_CreateVertexShader(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Failed to allocate vertex shader memory.\n"); *shader = 0; return E_OUTOFMEMORY; } @@ -2216,10 +2200,7 @@ static struct d3d8_vertex_declaration *d3d8_device_get_fvf_declaration(struct d3 TRACE("not found. Creating and inserting at position %d.\n", low); if (!(d3d8_declaration = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d8_declaration)))) - { - ERR("Memory allocation failed.\n"); return NULL; - } if (FAILED(hr = d3d8_vertex_declaration_init_fvf(d3d8_declaration, device, fvf))) { @@ -2532,10 +2513,7 @@ static HRESULT WINAPI d3d8_device_CreatePixelShader(IDirect3DDevice8 *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate pixel shader memmory.\n"); return E_OUTOFMEMORY; - } wined3d_mutex_lock(); handle = d3d8_allocate_handle(&device->handle_table, object, D3D8_HANDLE_PS); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 4070b3e..61d187d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -364,10 +364,7 @@ static HRESULT WINAPI d3d8_CreateDevice(IDirect3D8 *iface, UINT adapter, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; - } hr = device_init(object, d3d8, d3d8->wined3d, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index db36120..f7096bb 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -61,10 +61,7 @@ static HRESULT d3d8_vertexshader_create_vertexdeclaration(struct d3d8_device *de object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Memory allocation failed.\n"); return E_OUTOFMEMORY; - } hr = d3d8_vertex_declaration_init(object, device, declaration, shader_handle); if (FAILED(hr)) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 6686c0f..e9f4976 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -183,10 +183,7 @@ HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapcha HRESULT hr; if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - { - ERR("Failed to allocate swapchain memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = swapchain_init(object, device, desc))) {

1 0

Ken Thomases : winemac: Process clicks in an inactive window in addition to activating it.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 033fe9a7c2bf1722c3cd2596dfcd78510ada12a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033fe9a7c2bf1722c3cd2596d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:30 2013 -0600 winemac: Process clicks in an inactive window in addition to activating it. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index c7739a4..bd6f086 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -216,6 +216,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [[self window] rightMouseDown:theEvent]; } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent + { + return YES; + } + @end

1 0

Ken Thomases : winemac: Implement MOUSE_MOVED(_ABSOLUTE) events.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 572324bae3eb0a1338444f7128ffe2e899740154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572324bae3eb0a1338444f712… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:26 2013 -0600 winemac: Implement MOUSE_MOVED(_ABSOLUTE) events. --- dlls/winemac.drv/cocoa_event.m | 30 +++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 3 ++ dlls/winemac.drv/cocoa_window.m | 64 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 12 +++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/mouse.c | 22 +++++++++++++ 7 files changed, 138 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=572324bae3eb0a1338444…

1 0

Michael Stefaniuc : krnl386.exe16: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 68c447d87efe40c37ac668860dac2b334961cf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c447d87efe40c37ac668860… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:08:42 2013 +0100 krnl386.exe16: Let C look like C. --- dlls/krnl386.exe16/int10.c | 10 +++++----- dlls/krnl386.exe16/int16.c | 2 +- dlls/krnl386.exe16/int67.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index 0edfbd7..dfba761 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -1123,7 +1123,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x0b: - switch BH_reg(context) { + switch (BH_reg(context)) { case 0x00: /* SET BACKGROUND/BORDER COLOR */ /* In text modes, this sets only the border... */ /* According to the interrupt list and one of my books. */ @@ -1192,7 +1192,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x10: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* SET SINGLE PALETTE REGISTER - A.C. */ TRACE("Set Single Palette Register - Reg 0x0%x Value 0x0%x\n", BL_reg(context),BH_reg(context)); @@ -1291,7 +1291,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) case 0x11: /* TEXT MODE CHARGEN */ /* Note that second subfunction is *almost* identical. */ /* See INTERRUPT.A for details. */ - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* LOAD USER SPECIFIED PATTERNS */ case 0x10: FIXME("Load User Specified Patterns - Not Supported\n"); @@ -1339,7 +1339,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x12: /* ALTERNATE FUNCTION SELECT */ - switch BL_reg(context) { + switch (BL_reg(context)) { case 0x10: /* GET EGA INFO */ TRACE("EGA info requested\n"); SET_BH( context, 0x00 ); /* Color screen */ @@ -1385,7 +1385,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT *context ) break; case 0x1a: - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* GET DISPLAY COMBINATION CODE */ TRACE("Get Display Combination Code\n"); SET_AL( context, 0x1a ); /* Function supported */ diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 47e9d8e..f567ee7 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -52,7 +52,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context ) BIOSDATA *data = NULL; BYTE ascii, scan; - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x00: /* Get Keystroke */ /* Returns: AH = Scan code diff --git a/dlls/krnl386.exe16/int67.c b/dlls/krnl386.exe16/int67.c index 3137bc9..019d379 100644 --- a/dlls/krnl386.exe16/int67.c +++ b/dlls/krnl386.exe16/int67.c @@ -149,7 +149,7 @@ static void EMS_access_name( CONTEXT *context ) return; } - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* get name */ ptr = PTR_REAL_TO_LIN(context->SegEs, DI_reg(context)); memcpy(ptr, EMS_record->handle[hindex].name, 8); @@ -326,7 +326,7 @@ static void EMS_restore_context( CONTEXT *context ) */ void WINAPI DOSVM_Int67Handler( CONTEXT *context ) { - switch AH_reg(context) { + switch (AH_reg(context)) { case 0x40: /* EMS - GET MANAGER STATUS */ SET_AH( context, 0 ); /* status: ok */ @@ -465,7 +465,7 @@ void EMS_Ioctl_Handler( CONTEXT *context ) { assert(AH_reg(context) == 0x44); - switch AL_reg(context) { + switch (AL_reg(context)) { case 0x00: /* IOCTL - GET DEVICE INFORMATION */ RESET_CFLAG(context); /* operation was successful */ SET_DX( context, 0x4080 ); /* bit 14 (support ioctl read) and

1 0

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

Feb. 7, 2013

Module: wine Branch: master Commit: 20f1016bc86db024596ae166e08c8afda4a67c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f1016bc86db024596ae166e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:56:27 2013 +0100 d3dx9_36: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3dx9_36/core.c | 3 --- dlls/d3dx9_36/effect.c | 25 ------------------------- dlls/d3dx9_36/line.c | 3 --- dlls/d3dx9_36/shader.c | 3 --- 4 files changed, 0 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index d322091..961f023 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -145,10 +145,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD size, ID3DXBuffer **buffer) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate buffer memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_buffer_init(object, size); if (FAILED(hr)) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1681ea2..4ef900e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4608,10 +4608,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons sampler = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sampler)); if (!sampler) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_parse_sampler(sampler, data, ptr, objects); if (hr != D3D_OK) @@ -4913,7 +4910,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -4949,7 +4945,6 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch member = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*member)); if (!member) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5037,10 +5032,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); if (!parameter) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } state->type = ST_CONSTANT; @@ -5132,7 +5124,6 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5207,7 +5198,6 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx_pass *pass, const char *data, annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5316,7 +5306,6 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); if (!annotation) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5349,7 +5338,6 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co pass = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pass)); if (!pass) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5570,7 +5558,6 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); if (!parameter) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5603,7 +5590,6 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * technique = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*technique)); if (!technique) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5751,7 +5737,6 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3 object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5804,10 +5789,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_effect_init(object, device, srcdata, srcdatalen, pool); if (FAILED(hr)) @@ -5847,7 +5829,6 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { - ERR("Out of memory\n"); hr = E_OUTOFMEMORY; goto err_out; } @@ -5888,10 +5869,7 @@ HRESULT WINAPI D3DXCreateEffectCompiler(const char *srcdata, UINT srcdatalen, co object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } hr = d3dx9_effect_compiler_init(object, srcdata, srcdatalen); if (FAILED(hr)) @@ -5980,10 +5958,7 @@ HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; object->ref = 1; diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index e6cd3b0..1ec643a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -339,10 +339,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXLineImpl)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXLine_iface.lpVtbl = &ID3DXLine_Vtbl; object->ref = 1; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a0d36e2..75bc9b5 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1669,10 +1669,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(const DWORD *byte_code, DWORD flags, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Out of memory\n"); return E_OUTOFMEMORY; - } object->ID3DXConstantTable_iface.lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1;

1 0

Michael Stefaniuc : usp10: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9f6f8bfc0088f5b466d51067489cc29355924bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6f8bfc0088f5b466d510674… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:15:38 2013 +0100 usp10: Let C look like C. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 41a7f32..a08b047 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1878,7 +1878,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - if FAILED(hr) + if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) hr = E_INVALIDARG;

1 0

Michael Stefaniuc : riched20: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 6c1b292f0b781c08041867f2508df5df164f61c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1b292f0b781c08041867f25… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:14:05 2013 +0100 riched20: Let C look like C. --- dlls/riched20/txtsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index e9cc5e1..0e78c53 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -77,7 +77,7 @@ static HRESULT WINAPI ITextServicesImpl_QueryInterface(IUnknown *iface, REFIID r if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_ITextServices) + else if (IsEqualIID(riid, &IID_ITextServices)) *ppv = &This->ITextServices_iface; else { *ppv = NULL;

1 0

Michael Stefaniuc : qedit: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 2f67eb99ef0395e5905e6b4d928b372316765f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f67eb99ef0395e5905e6b4d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:12 2013 +0100 qedit: Let C look like C. --- dlls/qedit/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index fea3aa4..7e90c31 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -79,7 +79,7 @@ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IUnknown_inner; - else if IsEqualIID(riid, &IID_IMediaDet) + else if (IsEqualIID(riid, &IID_IMediaDet)) *ppv = &This->IMediaDet_iface; else WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv);

1 0

Hans Leidekker : windowscodecs: Convert the source bitmap to the requested pixel format in IWICColorTransform ::Initialize.
by Alexandre Julliard Feb. 6, 2013

Feb. 6, 2013

Module: wine Branch: master Commit: d855ed4153d4485035b40f7a7a0d0f47a663e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d855ed4153d4485035b40f7a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 6 13:52:48 2013 +0100 windowscodecs: Convert the source bitmap to the requested pixel format in IWICColorTransform::Initialize. --- dlls/windowscodecs/colortransform.c | 49 ++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/windowscodecs/colortransform.c b/dlls/windowscodecs/colortransform.c index dae4f38..7791731 100644 --- a/dlls/windowscodecs/colortransform.c +++ b/dlls/windowscodecs/colortransform.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct ColorTransform { IWICColorTransform IWICColorTransform_iface; LONG ref; + IWICBitmapSource *dst; } ColorTransform; static inline ColorTransform *impl_from_IWICColorTransform(IWICColorTransform *iface) @@ -86,6 +87,7 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) if (ref == 0) { + if (This->dst) IWICBitmapSource_Release(This->dst); HeapFree(GetProcessHeap(), 0, This); } @@ -95,45 +97,67 @@ static ULONG WINAPI ColorTransform_Release(IWICColorTransform *iface) static HRESULT WINAPI ColorTransform_GetSize(IWICColorTransform *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return IWICBitmapSource_GetSize(This->dst, puiWidth, puiHeight); } static HRESULT WINAPI ColorTransform_GetPixelFormat(IWICColorTransform *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + return IWICBitmapSource_GetPixelFormat(This->dst, pPixelFormat); } static HRESULT WINAPI ColorTransform_GetResolution(IWICColorTransform *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p)\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return IWICBitmapSource_GetResolution(This->dst, pDpiX, pDpiY); } static HRESULT WINAPI ColorTransform_CopyPalette(IWICColorTransform *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p)\n", iface, pIPalette); + + return IWICBitmapSource_CopyPalette(This->dst, pIPalette); } static HRESULT WINAPI ColorTransform_CopyPixels(IWICColorTransform *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - return E_NOTIMPL; + ColorTransform *This = impl_from_IWICColorTransform(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return IWICBitmapSource_CopyPixels(This->dst, prc, cbStride, cbBufferSize, pbBuffer); } static HRESULT WINAPI ColorTransform_Initialize(IWICColorTransform *iface, IWICBitmapSource *pIBitmapSource, IWICColorContext *pIContextSource, IWICColorContext *pIContextDest, REFWICPixelFormatGUID pixelFmtDest) { - FIXME("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, + ColorTransform *This = impl_from_IWICColorTransform(iface); + IWICBitmapSource *dst; + HRESULT hr; + + TRACE("(%p,%p,%p,%p,%s)\n", iface, pIBitmapSource, pIContextSource, pIContextDest, debugstr_guid(pixelFmtDest)); - return E_NOTIMPL; + + FIXME("ignoring color contexts\n"); + + hr = WICConvertBitmapSource(pixelFmtDest, pIBitmapSource, &dst); + if (FAILED(hr)) return hr; + + if (This->dst) IWICBitmapSource_Release(This->dst); + This->dst = dst; + return S_OK; } static const IWICColorTransformVtbl ColorTransform_Vtbl = { @@ -159,6 +183,7 @@ HRESULT ColorTransform_Create(IWICColorTransform **colortransform) This->IWICColorTransform_iface.lpVtbl = &ColorTransform_Vtbl; This->ref = 1; + This->dst = NULL; *colortransform = &This->IWICColorTransform_iface;

1 0