Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 70101: [CHARMAP_NEW] - Allow the dialog to be resized, which in turn will grow / shrink the grid view and the fonts inside it. This means users can make the grid larger if they don't ha...
by gedmurphy＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: gedmurphy Date: Tue Nov 24 21:17:43 2015 New Revision: 70101 URL: http://svn.reactos.org/svn/reactos?rev=70101&view=rev Log: [CHARMAP_NEW] - Allow the dialog to be resized, which in turn will grow / shrink the grid view and the fonts inside it. This means users can make the grid larger if they don't have their glasses on or want to see all the fonts in more detail. We no longer need a large font window popping out from the grid when you click on a cell (which I was never a fan of). - Don't allow scrolling previous to row 0 or after the last row Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/charmap_new/GridView.h trunk/reactos/base/applications/charmap_new/MainWindow.cpp trunk/reactos/base/applications/charmap_new/lang/en-US.rc Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -22,7 +22,8 @@ CGridView::CGridView() : m_xNumCells(20), m_yNumCells(10), - ScrollPosition(0) + m_ScrollPosition(0), + m_NumRows(0) { m_szMapWndClass = L"CharGridWClass"; } @@ -78,7 +79,7 @@ if (hdc == NULL) return false; // Setup the logfont structure - NewFont.Font.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; + NewFont.Font.lfHeight = 0; // This is set in WM_SIZE NewFont.Font.lfCharSet = DEFAULT_CHARSET; StringCchCopyW(NewFont.Font.lfFaceName, LF_FACESIZE, FontName); @@ -127,12 +128,12 @@ NewFont.NumValidGlyphs = j; // Calculate the number of rows required to hold all glyphs - int Rows = NewFont.NumValidGlyphs / m_xNumCells; + m_NumRows = NewFont.NumValidGlyphs / m_xNumCells; if (NewFont.NumValidGlyphs % m_xNumCells) - Rows += 1; + m_NumRows += 1; // Set the scrollbar in relation to the rows - SetScrollRange(m_hwnd, SB_VERT, 0, Rows, FALSE); + SetScrollRange(m_hwnd, SB_VERT, 0, m_NumRows - m_yNumCells, FALSE); // We're done, update the current font m_CurrentFont = NewFont; @@ -224,7 +225,7 @@ // Get the client area we can draw on. The position we set above includes // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us - // the size without the scroll, and it more efficient than getting the + // the size without the scroll, and it's more efficient than getting the // scroll metrics and calculating the size from that RECT ClientRect; GetClientRect(m_hwnd, &ClientRect); @@ -234,6 +235,26 @@ // Let all the cells know about their new coords UpdateCellCoordinates(); + // We scale the font size up or down depending on the cell size + if (m_CurrentFont.hFont) + { + // Delete the existing font + DeleteObject(m_CurrentFont.hFont); + + HDC hdc; + hdc = GetDC(m_hwnd); + if (hdc) + { + // Update the font size with respect to the cell size + m_CurrentFont.Font.lfHeight = (m_CellSize.cy - 5); + m_CurrentFont.hFont = CreateFontIndirectW(&m_CurrentFont.Font); + ReleaseDC(m_hwnd, hdc); + } + } + + // Redraw the whole grid + InvalidateRect(m_hwnd, &ClientRect, TRUE); + return 0; } @@ -242,42 +263,47 @@ _In_ INT Pos) { - INT PrevScrollPosition = ScrollPosition; + INT PrevScrollPosition = m_ScrollPosition; switch (Value) { case SB_LINEUP: - ScrollPosition -= 1; + m_ScrollPosition -= 1; break; case SB_LINEDOWN: - ScrollPosition += 1; + m_ScrollPosition += 1; break; case SB_PAGEUP: - ScrollPosition -= m_yNumCells; + m_ScrollPosition -= m_yNumCells; break; case SB_PAGEDOWN: - ScrollPosition += m_yNumCells; + m_ScrollPosition += m_yNumCells; break; case SB_THUMBTRACK: - ScrollPosition = Pos; + m_ScrollPosition = Pos; break; default: break; } + // Make sure we don't scroll past row 0 or max rows + m_ScrollPosition = max(0, m_ScrollPosition); + m_ScrollPosition = min(m_ScrollPosition, m_NumRows); + + // Check if there's a difference from the previous position INT ScrollDiff; - ScrollDiff = PrevScrollPosition - ScrollPosition; + ScrollDiff = PrevScrollPosition - m_ScrollPosition; if (ScrollDiff) { // Set the new scrollbar position in the scroll box SetScrollPos(m_hwnd, SB_VERT, - ScrollPosition, + m_ScrollPosition, TRUE); // Check if the scrollbar has moved more than the @@ -288,7 +314,7 @@ GetClientRect(m_hwnd, &rect); // Scroll the visible cells which remain within the grid - // and invalid any new ones which appear from the top / bottom + // and invalidate any new ones which appear from the top / bottom ScrollWindowEx(m_hwnd, 0, ScrollDiff * m_CellSize.cy, @@ -441,22 +467,23 @@ { // Calculate which glyph to start at based on scroll position int i; - i = m_xNumCells * ScrollPosition; + i = m_xNumCells * m_ScrollPosition; // Make sure we have the correct font on the DC HFONT hOldFont; hOldFont = (HFONT)SelectFont(PaintStruct->hdc, m_CurrentFont.hFont); - // Traverse all the cells and tell them to paint themselves + // Traverse all the cells for (int y = 0; y < m_yNumCells; y++) for (int x = 0; x < m_xNumCells; x++) { + // Update the glyph for this cell WCHAR ch = (WCHAR)m_CurrentFont.ValidGlyphs[i]; m_Cells[y][x]->SetChar(ch); + // Tell it to paint itself m_Cells[y][x]->OnPaint(*PaintStruct); - i++; } @@ -487,6 +514,7 @@ { // Remove focus from any existing cell m_ActiveCell->SetFocus(false); + InvalidateRect(m_hwnd, m_ActiveCell->GetCellCoordinates(), TRUE); } // Set the new active cell and give it focus Modified: trunk/reactos/base/applications/charmap_new/GridView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -29,8 +29,8 @@ CCell*** m_Cells; // *m_Cells[][]; CCell *m_ActiveCell; - HFONT hFont; - INT ScrollPosition; + INT m_ScrollPosition; + int m_NumRows; CurrentFont m_CurrentFont; @@ -45,6 +45,8 @@ bool SetFont( _In_ CAtlString& FontName ); + + HWND GetHwnd() { return m_hwnd; } private: static LRESULT Modified: trunk/reactos/base/applications/charmap_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -214,7 +214,9 @@ } BOOL -CCharMapWindow::OnSize(void) +CCharMapWindow::OnSize( + _In_ WPARAM wParam + ) { RECT rcClient, rcStatus; INT lvHeight, iStatusHeight; @@ -229,14 +231,11 @@ // Get the full client rect GetClientRect(m_hMainWnd, &rcClient); - // Calculate the remaining height for the treeview + // Calculate the remaining height for the gridview lvHeight = rcClient.bottom - iStatusHeight; - // Resize the device view - //m_GridView->OnSize(0, - // iToolHeight, - // rcClient.right, - // lvHeight); + // Resize the grid view + SendMessageW(m_GridView->GetHwnd(), WM_SIZE, wParam, 0); return TRUE; } @@ -352,7 +351,7 @@ case WM_SIZE: { - return This->OnSize(); + return This->OnSize(wParam); } case WM_NOTIFY: @@ -526,7 +525,7 @@ Length = GetWindowTextLengthW(hCombo); if (!Length) return false; - CAtlStringW FontName;// = L"hahaha"; + CAtlStringW FontName; FontName.Preallocate(Length); SendMessageW(hCombo, Modified: trunk/reactos/base/applications/charmap_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] Tue Nov 24 21:17:43 2015 @@ -2,11 +2,11 @@ IDD_CHARMAP DIALOGEX 6, 6, 290, 224 FONT 8, "MS Shell Dlg", 0, 0 -STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX +STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX CAPTION "ReactOS Character Map" BEGIN LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 - COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | + COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS LTEXT "Characters to copy:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |

1 0

[akhaldi] 70100: [RTL] Partially sync some timer queue related functions with Wine Staging 1.7.55. Brought to you by Samuel Serapión and Thomas Faber. CORE-10574 CORE-10536
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 20:35:58 2015 New Revision: 70100 URL: http://svn.reactos.org/svn/reactos?rev=70100&view=rev Log: [RTL] Partially sync some timer queue related functions with Wine Staging 1.7.55. Brought to you by Samuel Serapión and Thomas Faber. CORE-10574 CORE-10536 Modified: trunk/reactos/lib/rtl/timerqueue.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=7… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Tue Nov 24 20:35:58 2015 @@ -47,20 +47,22 @@ DWORD period; ULONG flags; ULONGLONG expire; - BOOL destroy; /* timer should be deleted; once set, never unset */ - HANDLE event; /* removal event */ + BOOL destroy; /* timer should be deleted; once set, never unset */ + HANDLE event; /* removal event */ }; struct timer_queue { + DWORD magic; RTL_CRITICAL_SECTION cs; - struct list timers; /* sorted by expiration time */ - BOOL quit; /* queue should be deleted; once set, never unset */ + struct list timers; /* sorted by expiration time */ + BOOL quit; /* queue should be deleted; once set, never unset */ HANDLE event; HANDLE thread; }; #define EXPIRE_NEVER (~(ULONGLONG) 0) +#define TIMER_QUEUE_MAGIC 0x516d6954 /* TimQ */ static void queue_remove_timer(struct queue_timer *t) { @@ -77,7 +79,7 @@ NtSetEvent(t->event, NULL); RtlFreeHeap(RtlGetProcessHeap(), 0, t); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) NtSetEvent(q->event, NULL); } @@ -95,19 +97,18 @@ RtlLeaveCriticalSection(&q->cs); } -static DWORD WINAPI timer_callback_wrapper(LPVOID p) +static VOID WINAPI timer_callback_wrapper(LPVOID p) { struct queue_timer *t = p; t->callback(t->param, TRUE); timer_cleanup_callback(t); - return 0; } 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, @@ -151,13 +152,21 @@ RtlEnterCriticalSection(&q->cs); if (list_head(&q->timers)) { + ULONGLONG now, next; t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); - if (!t->destroy && t->expire <= queue_current_time()) + if (!t->destroy && t->expire <= ((now = queue_current_time()))) { ++t->runcount; - queue_move_timer( - t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, - FALSE); + if (t->period) + { + next = t->expire + t->period; + /* avoid trigger cascade if overloaded / hibernated */ + if (next < now) + next = now + t->period; + } + else + next = EXPIRE_NEVER; + queue_move_timer(t, next, FALSE); } else t = NULL; @@ -174,7 +183,7 @@ = (t->flags & (WT_EXECUTEINIOTHREAD | WT_EXECUTEINPERSISTENTTHREAD | WT_EXECUTELONGFUNCTION | WT_TRANSFER_IMPERSONATION)); - NTSTATUS status = RtlQueueWorkItem((WORKERCALLBACKFUNC)timer_callback_wrapper, t, flags); + NTSTATUS status = RtlQueueWorkItem(timer_callback_wrapper, t, flags); if (status != STATUS_SUCCESS) timer_cleanup_callback(t); } @@ -203,7 +212,7 @@ return timeout; } -static void WINAPI timer_queue_thread_proc(LPVOID p) +static DWORD WINAPI timer_queue_thread_proc(LPVOID p) { struct timer_queue *q = p; ULONG timeout_ms; @@ -225,7 +234,7 @@ timer got put at the head of the list so we need to adjust our timeout. */ RtlEnterCriticalSection(&q->cs); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) done = TRUE; RtlLeaveCriticalSection(&q->cs); } @@ -240,8 +249,10 @@ NtClose(q->event); RtlDeleteCriticalSection(&q->cs); + q->magic = 0; RtlFreeHeap(RtlGetProcessHeap(), 0, q); RtlpExitThreadFunc(STATUS_SUCCESS); + return 0; } static void queue_destroy_timer(struct queue_timer *t) @@ -281,13 +292,14 @@ RtlInitializeCriticalSection(&q->cs); list_init(&q->timers); q->quit = FALSE; - status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + q->magic = TIMER_QUEUE_MAGIC; + status = NtCreateEvent(&q->event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); if (status != STATUS_SUCCESS) { RtlFreeHeap(RtlGetProcessHeap(), 0, q); return status; } - status = RtlpStartThreadFunc((PVOID)timer_queue_thread_proc, q, &q->thread); + status = RtlpStartThreadFunc(timer_queue_thread_proc, q, &q->thread); if (status != STATUS_SUCCESS) { NtClose(q->event); @@ -323,7 +335,7 @@ HANDLE thread; NTSTATUS status; - if (!q) + if (!q || q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; thread = q->thread; @@ -360,10 +372,10 @@ return status; } -static struct timer_queue *default_timer_queue; - static struct timer_queue *get_timer_queue(HANDLE TimerQueue) { + static struct timer_queue *default_timer_queue; + if (TimerQueue) return TimerQueue; else @@ -378,7 +390,7 @@ (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ - RtlDeleteTimerQueueEx(p, NULL); + RtlDeleteTimerQueueEx(q, NULL); } } return default_timer_queue; @@ -401,7 +413,7 @@ * after the first callback. If zero, the timer will only * fire once. It still needs to be deleted with * RtlDeleteTimer. - * Flags [I] Flags controling the execution of the callback. In + * Flags [I] Flags controlling the execution of the callback. In * addition to the WT_* thread pool flags (see * RtlQueueWorkItem), WT_EXECUTEINTIMERTHREAD and * WT_EXECUTEONLYONCE are supported. @@ -418,8 +430,9 @@ NTSTATUS status; struct queue_timer *t; struct timer_queue *q = get_timer_queue(TimerQueue); - if (!q) - return STATUS_NO_MEMORY; + + if (!q) return STATUS_NO_MEMORY; + if (q->magic != TIMER_QUEUE_MAGIC) return STATUS_INVALID_HANDLE; t = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof *t); if (!t) @@ -516,7 +529,11 @@ return STATUS_INVALID_PARAMETER_1; q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) - status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); + { + status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); + if (status == STATUS_SUCCESS) + status = STATUS_PENDING; + } else if (CompletionEvent) event = CompletionEvent; @@ -530,7 +547,10 @@ if (CompletionEvent == INVALID_HANDLE_VALUE && event) { if (status == STATUS_PENDING) + { NtWaitForSingleObject(event, FALSE, NULL); + status = STATUS_SUCCESS; + } NtClose(event); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 24 20:35:58 2015 @@ -253,6 +253,7 @@ reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.47 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 +reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.37

1 0

[akhaldi] 70099: [KERNEL32_WINETEST] Avoid calling WaitForMultipleObjectsEx with pseudo handle. Brought to you by Sebastian Lackner.
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 19:38:03 2015 New Revision: 70099 URL: http://svn.reactos.org/svn/reactos?rev=70099&view=rev Log: [KERNEL32_WINETEST] Avoid calling WaitForMultipleObjectsEx with pseudo handle. Brought to you by Sebastian Lackner. Modified: trunk/rostests/winetests/kernel32/sync.c Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… ============================================================================== --- trunk/rostests/winetests/kernel32/sync.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/sync.c [iso-8859-1] Tue Nov 24 19:38:03 2015 @@ -2526,8 +2526,7 @@ { if (!strcmp(argv[2], "apc_deadlock")) { - HANDLE handle = GetCurrentThread(); - for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + for (;;) SleepEx(INFINITE, TRUE); } return; }

1 0

[gedmurphy] 70098: [CHARMAP_NEW] - Implement drawing fonts onto the gridview - Implement scrolling through the grid via the scrollbar - When a new font is selected, setup that font for drawing. Thi...
by gedmurphy＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: gedmurphy Date: Tue Nov 24 17:55:27 2015 New Revision: 70098 URL: http://svn.reactos.org/svn/reactos?rev=70098&view=rev Log: [CHARMAP_NEW] - Implement drawing fonts onto the gridview - Implement scrolling through the grid via the scrollbar - When a new font is selected, setup that font for drawing. This includes setting up the DC for painting, getting the valid glyphs for that font (this fixes the bug in the existing viewer which has lots of squares for glyphs), setting up scrollbar info, etc. - Make the cell object more responsible for its own painting CORE-10518 Modified: trunk/reactos/base/applications/charmap_new/Cell.cpp trunk/reactos/base/applications/charmap_new/Cell.h trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/charmap_new/GridView.h trunk/reactos/base/applications/charmap_new/MainWindow.cpp trunk/reactos/base/applications/charmap_new/MainWindow.h trunk/reactos/base/applications/charmap_new/lang/en-US.rc Modified: trunk/reactos/base/applications/charmap_new/Cell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/Cell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/Cell.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -29,7 +29,7 @@ ) : m_hParent(hParent), m_CellCoordinates(CellCoordinates), - ch(L'*'), + m_Char(L'*'), m_bHasFocus(false), m_bIsLarge(false) { @@ -50,21 +50,23 @@ if (NeedsPaint == FALSE) return false; + + // Draw the cell border BOOL b = Rectangle(PaintStruct.hdc, - m_CellCoordinates.left, - m_CellCoordinates.top, - m_CellCoordinates.right, - m_CellCoordinates.bottom); + m_CellCoordinates.left, + m_CellCoordinates.top, + m_CellCoordinates.right, + m_CellCoordinates.bottom); + + // Calculate an internal drawing canvas for the cell + RECT Internal; + CopyRect(&Internal, &m_CellCoordinates); + InflateRect(&Internal, -1, -1); // Check if this cell has focus if (m_bHasFocus) { - // Take a copy of the border dims and make it slightly smaller - RECT Internal; - CopyRect(&Internal, &m_CellCoordinates); - InflateRect(&Internal, -1, -1); - // Draw the smaller cell to make it look selected Rectangle(PaintStruct.hdc, Internal.left, @@ -73,7 +75,14 @@ Internal.bottom); } - return true; + int Success; + Success = DrawTextW(PaintStruct.hdc, + &m_Char, + 1, + &Internal, + DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + return (Success != 0); } void Modified: trunk/reactos/base/applications/charmap_new/Cell.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/Cell.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/Cell.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -7,7 +7,7 @@ bool m_bHasFocus; bool m_bIsLarge; - WCHAR ch; + WCHAR m_Char; public: CCell( @@ -23,6 +23,8 @@ LPRECT GetCellCoordinates() { return &m_CellCoordinates; } void SetFocus(_In_ bool HasFocus) { m_bHasFocus = HasFocus; } + WCHAR GetChar() { return m_Char; } + void SetChar(_In_ WCHAR ch) { m_Char = ch; } bool OnPaint( _In_ PAINTSTRUCT &PaintStruct Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -21,7 +21,8 @@ CGridView::CGridView() : m_xNumCells(20), - m_yNumCells(10) + m_yNumCells(10), + ScrollPosition(0) { m_szMapWndClass = L"CharGridWClass"; } @@ -62,7 +63,94 @@ } bool -CGridView::UpdateGridLayout( +CGridView::SetFont( + _In_ CAtlString& FontName + ) +{ + + // Create a temperary container for the new font + CurrentFont NewFont = { 0 }; + NewFont.FontName = FontName; + + // Get the DC for the full grid window + HDC hdc; + hdc = GetDC(m_hwnd); + if (hdc == NULL) return false; + + // Setup the logfont structure + NewFont.Font.lfHeight = GetDeviceCaps(hdc, LOGPIXELSY) / 5; + NewFont.Font.lfCharSet = DEFAULT_CHARSET; + StringCchCopyW(NewFont.Font.lfFaceName, LF_FACESIZE, FontName); + + // Get a handle to the new font + NewFont.hFont = CreateFontIndirectW(&NewFont.Font); + if (NewFont.hFont == NULL) + { + ReleaseDC(m_hwnd, hdc); + return false; + } + + // Setup an array of all possible non-BMP indices + WCHAR ch[MAX_GLYPHS]; + for (int i = 0; i < MAX_GLYPHS; i++) + ch[i] = (WCHAR)i; + + HFONT hOldFont; + hOldFont = (HFONT)SelectObject(hdc, NewFont.hFont); + + // Translate all the indices into glyphs + WORD out[MAX_GLYPHS]; + DWORD Status; + Status = GetGlyphIndicesW(hdc, + ch, + MAX_GLYPHS, + out, + GGI_MARK_NONEXISTING_GLYPHS); + ReleaseDC(m_hwnd, hdc); + if (Status == GDI_ERROR) + { + SelectObject(hdc, hOldFont); + return false; + } + + // Loop all the glyphs looking for valid ones + // and store those in our font data + int j = 0; + for (int i = 0; i < MAX_GLYPHS; i++) + { + if (out[i] != 0xffff) + { + NewFont.ValidGlyphs[j] = ch[i]; + j++; + } + } + NewFont.NumValidGlyphs = j; + + // Calculate the number of rows required to hold all glyphs + int Rows = NewFont.NumValidGlyphs / m_xNumCells; + if (NewFont.NumValidGlyphs % m_xNumCells) + Rows += 1; + + // Set the scrollbar in relation to the rows + SetScrollRange(m_hwnd, SB_VERT, 0, Rows, FALSE); + + // We're done, update the current font + m_CurrentFont = NewFont; + + // We changed the font, we'll need to repaint the whole window + InvalidateRect(m_hwnd, + NULL, + TRUE); + + return true; +} + + + +/* PRIVATE METHODS **********************************************/ + +bool +CGridView::UpdateCellCoordinates( ) { // Go through all the cells and calculate @@ -71,10 +159,10 @@ for (int x = 0; x < m_xNumCells; x++) { RECT CellCoordinates; - CellCoordinates.left = x * m_CellSize.cx + 1; - CellCoordinates.top = y * m_CellSize.cy + 1; - CellCoordinates.right = (x + 1) * m_CellSize.cx + 2; - CellCoordinates.bottom = (y + 1) * m_CellSize.cy + 2; + CellCoordinates.left = x * m_CellSize.cx; + CellCoordinates.top = y * m_CellSize.cy; + CellCoordinates.right = (x + 1) * m_CellSize.cx + 1; + CellCoordinates.bottom = (y + 1) * m_CellSize.cy + 1; m_Cells[y][x]->SetCellCoordinates(CellCoordinates); } @@ -125,6 +213,7 @@ m_ClientCoordinates.right = ParentRect.right - m_ClientCoordinates.left - 10; m_ClientCoordinates.bottom = ParentRect.bottom - m_ClientCoordinates.top - 70; + // Resize the grid window SetWindowPos(m_hwnd, NULL, m_ClientCoordinates.left, @@ -133,18 +222,90 @@ m_ClientCoordinates.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); - // Get the client area we can draw on. The position we set above - // includes a scrollbar. GetClientRect gives us the size without - // the scroll, and it more efficient than getting the scroll - // metrics and calculating the size + // Get the client area we can draw on. The position we set above includes + // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us + // the size without the scroll, and it more efficient than getting the + // scroll metrics and calculating the size from that RECT ClientRect; GetClientRect(m_hwnd, &ClientRect); m_CellSize.cx = ClientRect.right / m_xNumCells; m_CellSize.cy = ClientRect.bottom / m_yNumCells; - UpdateGridLayout(); + // Let all the cells know about their new coords + UpdateCellCoordinates(); return 0; +} + +VOID +CGridView::OnVScroll(_In_ INT Value, + _In_ INT Pos) +{ + + INT PrevScrollPosition = ScrollPosition; + + switch (Value) + { + case SB_LINEUP: + ScrollPosition -= 1; + break; + + case SB_LINEDOWN: + ScrollPosition += 1; + break; + + case SB_PAGEUP: + ScrollPosition -= m_yNumCells; + break; + + case SB_PAGEDOWN: + ScrollPosition += m_yNumCells; + break; + + case SB_THUMBTRACK: + ScrollPosition = Pos; + break; + + default: + break; + } + + INT ScrollDiff; + ScrollDiff = PrevScrollPosition - ScrollPosition; + if (ScrollDiff) + { + // Set the new scrollbar position in the scroll box + SetScrollPos(m_hwnd, + SB_VERT, + ScrollPosition, + TRUE); + + // Check if the scrollbar has moved more than the + // number of visible rows (draged or paged) + if (abs(ScrollDiff) < m_yNumCells) + { + RECT rect; + GetClientRect(m_hwnd, &rect); + + // Scroll the visible cells which remain within the grid + // and invalid any new ones which appear from the top / bottom + ScrollWindowEx(m_hwnd, + 0, + ScrollDiff * m_CellSize.cy, + &rect, + &rect, + NULL, + NULL, + SW_INVALIDATE); + } + else + { + // All the cells need to be redrawn + InvalidateRect(m_hwnd, + NULL, + TRUE); + } + } } LRESULT @@ -176,8 +337,10 @@ } } + // Make sure we have a valid DC if (bSuccess) { + // Paint the grid and chars DrawGrid(&PaintStruct); if (LocalHdc) @@ -237,6 +400,16 @@ break; } + case WM_VSCROLL: + { + INT Value, Pos; + Value = LOWORD(wParam); + Pos = HIWORD(wParam); + + This->OnVScroll(Value, Pos); + break; + } + case WM_PAINT: { This->OnPaint((HDC)wParam); @@ -266,12 +439,29 @@ _In_ LPPAINTSTRUCT PaintStruct ) { + // Calculate which glyph to start at based on scroll position + int i; + i = m_xNumCells * ScrollPosition; + + // Make sure we have the correct font on the DC + HFONT hOldFont; + hOldFont = (HFONT)SelectFont(PaintStruct->hdc, + m_CurrentFont.hFont); + // Traverse all the cells and tell them to paint themselves for (int y = 0; y < m_yNumCells; y++) for (int x = 0; x < m_xNumCells; x++) { + WCHAR ch = (WCHAR)m_CurrentFont.ValidGlyphs[i]; + m_Cells[y][x]->SetChar(ch); + m_Cells[y][x]->OnPaint(*PaintStruct); - } + + i++; + } + + SelectObject(PaintStruct->hdc, hOldFont); + } void Modified: trunk/reactos/base/applications/charmap_new/GridView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/GridView.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -1,17 +1,16 @@ #pragma once #include "Cell.h" -//typedef struct _CELL -//{ -// RECT CellExt; -// RECT CellInt; -// BOOL bActive; -// BOOL bLarge; -// WCHAR ch; -// -//} CELL, *PCELL; +#define MAX_GLYPHS 0xFFFF -#define MAX_GLYPHS 0xFFFF +struct CurrentFont +{ + CAtlStringW FontName; + LOGFONTW Font; + HFONT hFont; + USHORT ValidGlyphs[MAX_GLYPHS]; + USHORT NumValidGlyphs; +}; class CGridView @@ -26,17 +25,14 @@ int m_yNumCells; RECT m_ClientCoordinates; - //SIZE ClientSize; SIZE m_CellSize; - CCell*** m_Cells; // m_Cells[][]; + CCell*** m_Cells; // *m_Cells[][]; CCell *m_ActiveCell; HFONT hFont; - LOGFONTW CurrentFont; - INT iYStart; + INT ScrollPosition; - USHORT ValidGlyphs[MAX_GLYPHS]; - USHORT NumValidGlyphs; + CurrentFont m_CurrentFont; public: CGridView(); @@ -44,6 +40,10 @@ bool Create( _In_ HWND hParent + ); + + bool SetFont( + _In_ CAtlString& FontName ); private: @@ -65,11 +65,16 @@ _In_ INT Height ); + VOID OnVScroll( + _In_ INT Value, + _In_ INT Pos + ); + LRESULT OnPaint( _In_opt_ HDC hdc ); - bool UpdateGridLayout( + bool UpdateCellCoordinates( ); void DrawGrid( Modified: trunk/reactos/base/applications/charmap_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.cpp [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -199,6 +199,8 @@ if (!CreateFontComboBox()) return FALSE; + ChangeMapFont(); + // Configure Richedit control for sending notification changes. DWORD evMask; evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0); @@ -281,6 +283,13 @@ switch (Msg) { case IDC_CHECK_ADVANCED: + break; + + case IDC_FONTCOMBO: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + ChangeMapFont(); + } break; default: @@ -504,4 +513,26 @@ 0); return (ret == 1); -} +} + +bool +CCharMapWindow::ChangeMapFont( + ) +{ + HWND hCombo; + hCombo = GetDlgItem(m_hMainWnd, IDC_FONTCOMBO); + + INT Length; + Length = GetWindowTextLengthW(hCombo); + if (!Length) return false; + + CAtlStringW FontName;// = L"hahaha"; + FontName.Preallocate(Length); + + SendMessageW(hCombo, + WM_GETTEXT, + FontName.GetAllocLength(), + (LPARAM)FontName.GetBuffer()); + + return m_GridView->SetFont(FontName); +} Modified: trunk/reactos/base/applications/charmap_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/MainWindow.h [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -78,4 +78,7 @@ bool CreateFontComboBox( ); + + bool ChangeMapFont( + ); }; Modified: trunk/reactos/base/applications/charmap_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… ============================================================================== --- trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap_new/lang/en-US.rc [iso-8859-1] Tue Nov 24 17:55:27 2015 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_CHARMAP DIALOGEX 6, 6, 292, 224 +IDD_CHARMAP DIALOGEX 6, 6, 290, 224 FONT 8, "MS Shell Dlg", 0, 0 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "ReactOS Character Map" @@ -13,17 +13,6 @@ WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - //CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | - // WS_TABSTOP, 8, 208, 95, 10 - //LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 - //COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - //LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8 - //COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - //PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14 - //EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - //LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8 - //LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8 - //EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END STRINGTABLE

1 0

[tfaber] 70097: [RTL] - Implement RtlSetIoCompletionCallback. Patch by Samuel Serapión. CORE-10570 #resolve
by tfaber＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: tfaber Date: Tue Nov 24 15:51:32 2015 New Revision: 70097 URL: http://svn.reactos.org/svn/reactos?rev=70097&view=rev Log: [RTL] - Implement RtlSetIoCompletionCallback. Patch by Samuel Serapión. CORE-10570 #resolve Modified: trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=700… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Tue Nov 24 15:51:32 2015 @@ -912,8 +912,30 @@ IN PIO_APC_ROUTINE Callback, IN ULONG Flags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + FILE_COMPLETION_INFORMATION FileCompletionInfo; + NTSTATUS Status; + + DPRINT("RtlSetIoCompletionCallback(0x%p, 0x%p, 0x%x)\n", FileHandle, Callback, Flags); + + /* Initialize the thread pool if not already initialized */ + if (!IsThreadPoolInitialized()) + { + Status = RtlpInitializeThreadPool(); + if (!NT_SUCCESS(Status)) + return Status; + } + + FileCompletionInfo.Port = ThreadPoolCompletionPort; + FileCompletionInfo.Key = (PVOID)Callback; + + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &FileCompletionInfo, + sizeof(FileCompletionInfo), + FileCompletionInformation); + + return Status; } /*

1 0

[akhaldi] 70096: [NTDLL_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 15:14:42 2015 New Revision: 70096 URL: http://svn.reactos.org/svn/reactos?rev=70096&view=rev Log: [NTDLL_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdll/directory.c trunk/rostests/winetests/ntdll/env.c trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/file.c trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/om.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… Modified: trunk/rostests/winetests/ntdll/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/directory… Modified: trunk/rostests/winetests/ntdll/env.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/env.c?rev… Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… Modified: trunk/rostests/winetests/ntdll/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/file.c?re… Modified: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev…

1 0

[tfaber] 70095: [MSI] - Use the correct attributes when overwriting a read-only file in cabinet_copy_file. Will be sent upstream after the 1.8 release. CORE-10534 #resolve
by tfaber＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: tfaber Date: Tue Nov 24 14:57:00 2015 New Revision: 70095 URL: http://svn.reactos.org/svn/reactos?rev=70095&view=rev Log: [MSI] - Use the correct attributes when overwriting a read-only file in cabinet_copy_file. Will be sent upstream after the 1.8 release. CORE-10534 #resolve Modified: trunk/reactos/dll/win32/msi/media.c Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Tue Nov 24 14:57:00 2015 @@ -465,7 +465,7 @@ { TRACE("removing read-only attribute on %s\n", debugstr_w(path)); SetFileAttributesW( path, attrs2 & ~FILE_ATTRIBUTE_READONLY ); - handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs2, NULL); + handle = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, attrs, NULL); if (handle != INVALID_HANDLE_VALUE) goto done; err = GetLastError();

1 0

[akhaldi] 70094: [INCLUDES/WINE] Update debug.h. CORE-10536
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 14:43:59 2015 New Revision: 70094 URL: http://svn.reactos.org/svn/reactos?rev=70094&view=rev Log: [INCLUDES/WINE] Update debug.h. CORE-10536 Modified: trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] Tue Nov 24 14:43:59 2015 @@ -252,7 +252,7 @@ "|VT_ARRAY", "|VT_VECTOR|VT_ARRAY", "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", + "|VT_VECTOR|VT_BYREF", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", "|VT_RESERVED", @@ -260,7 +260,7 @@ "|VT_ARRAY|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_RESERVED", "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_BYREF|VT_RESERVED", "|VT_ARRAY|VT_BYREF|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", }; @@ -285,6 +285,8 @@ if (V_VT(v) & VT_BYREF) { if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + if (V_VT(v) == (VT_BSTR|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, V_BSTRREF(v) ? wine_dbgstr_w(*V_BSTRREF(v)) : "(none)" ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); } @@ -337,7 +339,7 @@ case VT_VOID: return wine_dbg_sprintf( "%p {VT_VOID}", v ); case VT_RECORD: - return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_RECORD(v), V_RECORDINFO(v) ); default: return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); }

1 0

[akhaldi] 70093: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 12:34:05 2015 New Revision: 70093 URL: http://svn.reactos.org/svn/reactos?rev=70093&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/quartz/mpegsplit.c (with props) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/quartz/fil_data.idl trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/testlist.c Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -8,6 +8,7 @@ filtermapper.c memallocator.c misc.c + mpegsplit.c referenceclock.c videorenderer.c testlist.c) Modified: trunk/rostests/winetests/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/fil_data… ============================================================================== --- trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "objidl.idl"; import "strmif.idl"; Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -180,6 +180,9 @@ ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); + ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); + /* add the two filters to the graph */ hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); @@ -203,6 +206,15 @@ ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, NULL, pIn); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, NULL); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, pIn); + ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); if (pIn) IPin_Release(pIn); if (pEnum) IEnumPins_Release(pEnum); Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -509,7 +509,7 @@ saBound.lLbound = 0; saBound.cElements = sizeof(data_block); psa = SafeArrayCreate(VT_UI1, 1, &saBound); - ok(psa != NULL, "Unable to crate safe array\n"); + ok(psa != NULL, "Unable to create safe array\n"); if (!psa) goto out; hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); ok(hr == S_OK, "Unable to access array data\n"); Added: trunk/rostests/winetests/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/mpegspli… ============================================================================== --- trunk/rostests/winetests/quartz/mpegsplit.c (added) +++ trunk/rostests/winetests/quartz/mpegsplit.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -0,0 +1,58 @@ +/* + * Unit tests for the MPEG-1 stream splitter functions + * + * Copyright 2015 Anton Baskanov + * + * 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 + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" + +static IUnknown *create_mpeg_splitter(void) +{ + IUnknown *mpeg_splitter = NULL; + HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&mpeg_splitter); + ok(S_OK == result, "got 0x%08x\n", result); + return mpeg_splitter; +} + +static void test_query_interface(void) +{ + IUnknown *mpeg_splitter = create_mpeg_splitter(); + + IAMStreamSelect *stream_select = NULL; + HRESULT result = IUnknown_QueryInterface( + mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + IAMStreamSelect_Release(stream_select); + } + + IUnknown_Release(mpeg_splitter); +} + +START_TEST(mpegsplit) +{ + CoInitialize(NULL); + + test_query_interface(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/quartz/mpegsplit.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -1,4 +1,4 @@ -/* Automatically generated file; DO NOT EDIT!! */ +/* Automatically generated by make depend; DO NOT EDIT!! */ #define STANDALONE #include <wine/test.h> @@ -9,6 +9,7 @@ extern void func_filtermapper(void); extern void func_memallocator(void); extern void func_misc(void); +extern void func_mpegsplit(void); extern void func_referenceclock(void); extern void func_videorenderer(void); @@ -20,7 +21,8 @@ { "filtermapper", func_filtermapper }, { "memallocator", func_memallocator }, { "misc", func_misc }, + { "mpegsplit", func_mpegsplit }, + { "referenceclock", func_referenceclock }, { "videorenderer", func_videorenderer }, - { "referenceclock", func_referenceclock }, { 0, 0 } };

1 0

[akhaldi] 70092: [QUARTZ] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 24 Nov '15

24 Nov '15

Author: akhaldi Date: Tue Nov 24 12:33:33 2015 New Revision: 70092 URL: http://svn.reactos.org/svn/reactos?rev=70092&view=rev Log: [QUARTZ] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/fil_data.idl trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/dll/directx/wine/quartz/systemclock.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/dll/directx/wine/quartz/waveparser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ @@ -52,7 +55,7 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${quartz_rc_deps}") set_module_type(quartz win32dll) target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) -add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 advapi32_vista shlwapi msvcrt kernel32 ntdll) add_dependencies(quartz dxsdk quartz_idlheader stdole2) add_pch(quartz quartz_private.h SOURCE) add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -186,7 +186,7 @@ ++stream->index_next; } - rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1 << 31)); + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1u << 31)); TRACE("offset(%u) size(%u)\n", (DWORD)BYTES_FROM_MEDIATIME(rtSampleStart), (DWORD)BYTES_FROM_MEDIATIME(rtSampleStop - rtSampleStart)); } @@ -579,7 +579,7 @@ BOOL keyframe = !(pIndex->aIndex[x].dwSize >> 31); DWORDLONG offset = pIndex->qwBaseOffset + pIndex->aIndex[x].dwOffset; TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); - TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1<<31))); + TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1u << 31))); TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } @@ -977,7 +977,7 @@ for (z = 0; z < stream->stdindex[y]->nEntriesInUse; ++z) { - UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); frames += len / stream->streamheader.dwSampleSize + !!(len % stream->streamheader.dwSampleSize); } } @@ -1092,24 +1092,18 @@ return E_FAIL; } - pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - - while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE)) + /* Skip any chunks until we find the LIST chunk */ + do { pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - - if (list.fcc != FOURCC_LIST) - { - ERR("Expected LIST, but got %.04s\n", (LPSTR)&list.fcc); - return E_FAIL; - } - if (list.fccListType != listtypeAVIMOVIE) - { - ERR("Expected AVI movie list, but got %.04s\n", (LPSTR)&list.fccListType); + while (hr == S_OK && (list.fcc != FOURCC_LIST || + (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + + if (hr != S_OK) + { + ERR("Failed to find LIST chunk from AVI file\n"); return E_FAIL; } @@ -1117,20 +1111,17 @@ /* FIXME: AVIX files are extended beyond the FOURCC chunk "AVI ", and thus won't be played here, * once I get one of the files I'll try to fix it */ - if (hr == S_OK) - { - This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pos += list.cb + sizeof(RIFFCHUNK); - - pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); - if (pos > total) - { - ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); - return E_FAIL; - } - - hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); - } + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); + + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; + } + + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); props->cbAlign = 1; props->cbPrefix = 0; @@ -1325,7 +1316,7 @@ { if (stream->streamheader.dwSampleSize) { - ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); ULONG size = stream->streamheader.dwSampleSize; pin->dwSamplesProcessed += len / size; @@ -1443,7 +1434,7 @@ if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } Modified: trunk/reactos/dll/directx/wine/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/fil_data.idl [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/fil_data.idl [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "objidl.idl"; import "strmif.idl"; Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -795,20 +795,18 @@ *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = &This->pin.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IAsyncReader)) *ppv = &This->IAsyncReader_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IMediaSeeking)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -589,7 +589,7 @@ if (info_out.dir != PINDIR_OUTPUT) { IBaseFilter_Release(info_out.pFilter); - return E_UNEXPECTED; + return VFW_E_CANNOT_CONNECT; } hr = IPin_QueryPinInfo(in, &info_in); @@ -599,7 +599,7 @@ goto out; if (info_in.dir != PINDIR_INPUT) { - hr = E_UNEXPECTED; + hr = VFW_E_CANNOT_CONNECT; goto out; } @@ -891,6 +891,9 @@ TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); + if(!ppinOut || !ppinIn) + return E_POINTER; + if (TRACE_ON(quartz)) { hr = IPin_QueryPinInfo(ppinIn, &PinInfo); Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -1514,7 +1514,7 @@ if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); - lRet = SHDeleteKeyW(hKey, wszPins); + lRet = RegDeleteTreeW(hKey, wszPins); if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); @@ -1573,7 +1573,7 @@ strcatW(wszPinNameKey, wszSlash); strcatW(wszPinNameKey, Name); - lRet = SHDeleteKeyW(hKey, wszPinNameKey); + lRet = RegDeleteTreeW(hKey, wszPinNameKey); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinNameKey); } Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -23,6 +23,9 @@ #include "quartz_private.h" +#include <strmif.h> + + #define SEQUENCE_HEADER_CODE 0xB3 #define PACK_START_CODE 0xBA @@ -38,6 +41,7 @@ typedef struct MPEGSplitterImpl { ParserImpl Parser; + IAMStreamSelect IAMStreamSelect_iface; LONGLONG EndOfFile; LONGLONG position; DWORD begin_offset; @@ -47,9 +51,19 @@ BOOL seek; } MPEGSplitterImpl; +static inline MPEGSplitterImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.filter.IBaseFilter_iface); +} + static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); +} + +static inline MPEGSplitterImpl *impl_from_IAMStreamSelect( IAMStreamSelect *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, IAMStreamSelect_iface); } static int MPEGSplitter_head_check(const BYTE *header) @@ -97,9 +111,7 @@ int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; LONGLONG duration; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && - ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && - ((header[2]>>2)&0x3) != 0x3)) + if (MPEGSplitter_head_check(header) != MPEG_AUDIO_HEADER) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; @@ -189,9 +201,9 @@ if (SUCCEEDED(hr)) { IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - IMediaSample_SetPreroll(sample, 0); - IMediaSample_SetDiscontinuity(sample, 0); - IMediaSample_SetSyncPoint(sample, 1); + IMediaSample_SetPreroll(sample, FALSE); + IMediaSample_SetDiscontinuity(sample, FALSE); + IMediaSample_SetSyncPoint(sample, TRUE); hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) { @@ -461,7 +473,7 @@ HRESULT hr; LONGLONG pos = 0; /* in bytes */ BYTE header[10]; - int streamtype = 0; + int streamtype; LONGLONG total, avail; AM_MEDIA_TYPE amt; PIN_INFO piOutput; @@ -499,12 +511,37 @@ hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); if (SUCCEEDED(hr)) pos += 4; - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); } while (0); - while(SUCCEEDED(hr) && !(streamtype=MPEGSplitter_head_check(header))) - { - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + while(SUCCEEDED(hr)) + { + TRACE("Testing header %x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + + streamtype = MPEGSplitter_head_check(header); + if (streamtype == MPEG_AUDIO_HEADER) + { + LONGLONG length; + if (parse_header(header, &length, NULL) == S_OK) + { + BYTE next_header[4]; + /* Ensure we have a valid header by seeking for the next frame, some bad + * encoded ID3v2 may have an incorrect length and we end up finding bytes + * like FF FE 00 28 which are nothing more than a Unicode BOM followed by + * ')' character from inside a ID3v2 tag. Unfortunately that sequence + * matches like a valid mpeg audio header. + */ + hr = IAsyncReader_SyncRead(pPin->pReader, pos + length - 4, 4, next_header); + if (FAILED(hr)) + break; + if (parse_header(next_header, &length, NULL) == S_OK) + break; + TRACE("%x:%x:%x:%x is a fake audio header, looking for next...\n", + header[0], header[1], header[2], header[3]); + } + } + else if (streamtype) /* Video or System stream */ + break; + /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3); @@ -695,7 +732,7 @@ IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); - This->seek = 0; + This->seek = FALSE; hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) @@ -712,9 +749,36 @@ return hr; } +static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if ( IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IPersist) + || IsEqualIID(riid, &IID_IMediaFilter) + || IsEqualIID(riid, &IID_IBaseFilter) ) + *ppv = iface; + else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) + *ppv = &This->IAMStreamSelect_iface; + + if (*ppv) + { + IBaseFilter_AddRef(iface); + return S_OK; + } + + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + + return E_NOINTERFACE; +} + static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - Parser_QueryInterface, + MPEGSplitter_QueryInterface, Parser_AddRef, Parser_Release, Parser_GetClassID, @@ -731,6 +795,64 @@ Parser_QueryVendorInfo }; +static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_QueryInterface(&This->Parser.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMStreamSelect_AddRef(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_AddRef(&This->Parser.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMStreamSelect_Release(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_Release(&This->Parser.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AMStreamSelect_Count(IAMStreamSelect *iface, DWORD *streams) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, streams); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **media_type, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%p,%p,%p,%p,%p,%p,%p) stub!\n", This, iface, index, media_type, flags, lcid, group, name, object, unknown); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Enable(IAMStreamSelect *iface, LONG index, DWORD flags) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%x) stub!\n", This, iface, index, flags); + + return E_NOTIMPL; +} + +static const IAMStreamSelectVtbl AMStreamSelectVtbl = +{ + AMStreamSelect_QueryInterface, + AMStreamSelect_AddRef, + AMStreamSelect_Release, + AMStreamSelect_Count, + AMStreamSelect_Info, + AMStreamSelect_Enable +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -754,10 +876,11 @@ CoTaskMemFree(This); return hr; } - This->seek = 1; + This->IAMStreamSelect_iface.lpVtbl = &AMStreamSelectVtbl; + This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -133,11 +133,11 @@ || IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -507,21 +507,21 @@ { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI Parser_Seeking_AddRef(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI Parser_Seeking_Release(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static const IMediaSeekingVtbl Parser_Seeking_Vtbl = Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -203,7 +203,7 @@ pPinImpl->dRate = 1.0; pPinImpl->state = Req_Die; pPinImpl->fnCustomRequest = pCustomRequest; - pPinImpl->stop_playback = 1; + pPinImpl->stop_playback = TRUE; InitializeCriticalSection(&pPinImpl->thread_lock); pPinImpl->thread_lock.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": PullPin.thread_lock"); @@ -406,6 +406,7 @@ { DWORD_PTR dwUser; + pSample = NULL; IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); if (!pSample) @@ -628,7 +629,7 @@ /* Wake up! */ assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Run; - This->stop_playback = 0; + This->stop_playback = FALSE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); } @@ -654,7 +655,7 @@ assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Pause; - This->stop_playback = 1; + This->stop_playback = TRUE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); @@ -690,7 +691,7 @@ assert(This->state == Req_Pause || This->state == Req_Sleepy); - This->stop_playback = 1; + This->stop_playback = TRUE; This->state = Req_Die; assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); ResetEvent(This->hEventStateChanged); Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -240,7 +240,7 @@ WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = SHDeleteKeyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -346,18 +346,18 @@ WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = SHDeleteKeyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -500,7 +500,7 @@ if (res != ERROR_SUCCESS) break; StringFromGUID2(list->subtype, buf, 39); - res = SHDeleteKeyW(majortype_key, buf); + res = RegDeleteTreeW(majortype_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; /* Removed majortype key if there is no more subtype key */ @@ -535,7 +535,7 @@ res = ERROR_SUCCESS; else if (res == ERROR_SUCCESS) for (; res == ERROR_SUCCESS && list->majortype; ++list) { - res = SHDeleteKeyA(extensions_root_key, list->extension); + res = RegDeleteTreeA(extensions_root_key, list->extension); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } Modified: trunk/reactos/dll/directx/wine/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/sy… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -209,7 +209,7 @@ if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IReferenceClock)) { SystemClockImpl_AddRef(iface); - *ppobj = This; + *ppobj = &This->IReferenceClock_iface; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -24,7 +24,6 @@ #include <d3d9.h> #include <vmr9.h> -#include <strmif.h> struct quartz_vmr { @@ -3068,6 +3067,7 @@ D3DDISPLAYMODE mode; hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ } while (FAILED(hr)); if (FAILED(hr)) ERR("HR: %08x\n", hr); @@ -3094,6 +3094,6 @@ This->SurfaceAllocatorNotify = NULL; This->reset = FALSE; - *ppv = This; - return S_OK; -} + *ppv = &This->IVMRImagePresenter9_iface; + return S_OK; +} Modified: trunk/reactos/dll/directx/wine/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/wa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -106,9 +106,9 @@ pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; - IMediaSample_SetPreroll(newsample, 0); - IMediaSample_SetDiscontinuity(newsample, 0); - IMediaSample_SetSyncPoint(newsample, 1); + IMediaSample_SetPreroll(newsample, FALSE); + IMediaSample_SetDiscontinuity(newsample, FALSE); + IMediaSample_SetSyncPoint(newsample, TRUE); hr = IAsyncReader_Request(pin->pReader, newsample, 0); } @@ -424,7 +424,7 @@ if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.55 reactos/dll/win32/activeds # Synced to WineStaging-1.7.47

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs