Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20356: Add Wine-0_9_4 tag and remove Wine-0_9_3 tag
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Add Wine-0_9_4 tag and remove Wine-0_9_3 tag Deleted: vendor/wine/dlls/avifil32/Wine-0_9_3/ Added: vendor/wine/dlls/avifil32/Wine-0_9_4/ Deleted: vendor/wine/dlls/cabinet/Wine-0_9_3/ Added: vendor/wine/dlls/cabinet/Wine-0_9_4/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_3/ Added: vendor/wine/dlls/comctl32/Wine-0_9_4/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_4/tooltips.c Added: vendor/wine/dlls/comctl32/Wine-0_9_4/tooltips.c Deleted: vendor/wine/dlls/comctl32/Wine-0_9_4/treeview.c Added: vendor/wine/dlls/comctl32/Wine-0_9_4/treeview.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/ Added: vendor/wine/dlls/commdlg/Wine-0_9_4/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_4/finddlg32.c Added: vendor/wine/dlls/commdlg/Wine-0_9_4/finddlg32.c Deleted: vendor/wine/dlls/commdlg/Wine-0_9_4/fontdlg.c Added: vendor/wine/dlls/commdlg/Wine-0_9_4/fontdlg.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/ Added: vendor/wine/dlls/crypt32/Wine-0_9_4/ Deleted: vendor/wine/dlls/crypt32/Wine-0_9_4/cert.c Added: vendor/wine/dlls/crypt32/Wine-0_9_4/cert.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_4/encode.c Added: vendor/wine/dlls/crypt32/Wine-0_9_4/encode.c Deleted: vendor/wine/dlls/dinput/Wine-0_9_3/ Added: vendor/wine/dlls/dinput/Wine-0_9_4/ Deleted: vendor/wine/dlls/dinput8/Wine-0_9_3/ Added: vendor/wine/dlls/dinput8/Wine-0_9_4/ Deleted: vendor/wine/dlls/dplay/Wine-0_9_3/ Added: vendor/wine/dlls/dplay/Wine-0_9_4/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_3/ Added: vendor/wine/dlls/dplayx/Wine-0_9_4/ Deleted: vendor/wine/dlls/dsound/Wine-0_9_3/ Added: vendor/wine/dlls/dsound/Wine-0_9_4/ Deleted: vendor/wine/dlls/dxdiagn/Wine-0_9_3/ Added: vendor/wine/dlls/dxdiagn/Wine-0_9_4/ Deleted: vendor/wine/dlls/icmp/Wine-0_9_3/ Added: vendor/wine/dlls/icmp/Wine-0_9_4/ Deleted: vendor/wine/dlls/imm32/Wine-0_9_3/ Added: vendor/wine/dlls/imm32/Wine-0_9_4/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_3/ Added: vendor/wine/dlls/midimap/Wine-0_9_4/ Deleted: vendor/wine/dlls/mpr/Wine-0_9_3/ Added: vendor/wine/dlls/mpr/Wine-0_9_4/ Deleted: vendor/wine/dlls/mpr/Wine-0_9_4/mpr_main.c Added: vendor/wine/dlls/mpr/Wine-0_9_4/mpr_main.c Deleted: vendor/wine/dlls/msi/Wine-0_9_3/ Added: vendor/wine/dlls/msi/Wine-0_9_4/ Deleted: vendor/wine/dlls/msi/Wine-0_9_4/dialog.c Added: vendor/wine/dlls/msi/Wine-0_9_4/dialog.c Deleted: vendor/wine/dlls/msi/Wine-0_9_4/format.c Added: vendor/wine/dlls/msi/Wine-0_9_4/format.c Deleted: vendor/wine/dlls/msimg32/Wine-0_9_3/ Added: vendor/wine/dlls/msimg32/Wine-0_9_4/ Deleted: vendor/wine/dlls/netapi32/Wine-0_9_3/ Added: vendor/wine/dlls/netapi32/Wine-0_9_4/ Deleted: vendor/wine/dlls/objsel/Wine-0_9_3/ Added: vendor/wine/dlls/objsel/Wine-0_9_4/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_3/ Added: vendor/wine/dlls/ole32/Wine-0_9_4/ Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/errorinfo.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/errorinfo.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/ole16.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/ole16.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/ole2.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/ole2.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/rpc.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/rpc.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/stg_stream.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/stg_stream.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/storage32.c Added: vendor/wine/dlls/ole32/Wine-0_9_4/storage32.c Deleted: vendor/wine/dlls/ole32/Wine-0_9_4/storage32.h Added: vendor/wine/dlls/ole32/Wine-0_9_4/storage32.h Deleted: vendor/wine/dlls/oleacc/Wine-0_9_3/ Added: vendor/wine/dlls/oleacc/Wine-0_9_4/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_3/ Added: vendor/wine/dlls/oleaut32/Wine-0_9_4/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_4/oleaut.c Added: vendor/wine/dlls/oleaut32/Wine-0_9_4/oleaut.c Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_4/safearray.c Added: vendor/wine/dlls/oleaut32/Wine-0_9_4/safearray.c Deleted: vendor/wine/dlls/oleaut32/Wine-0_9_4/typelib.c Added: vendor/wine/dlls/oleaut32/Wine-0_9_4/typelib.c Deleted: vendor/wine/dlls/oledlg/Wine-0_9_3/ Added: vendor/wine/dlls/oledlg/Wine-0_9_4/ Deleted: vendor/wine/dlls/olepro32/Wine-0_9_3/ Added: vendor/wine/dlls/olepro32/Wine-0_9_4/ Deleted: vendor/wine/dlls/riched20/Wine-0_9_3/ Added: vendor/wine/dlls/riched20/Wine-0_9_4/ Deleted: vendor/wine/dlls/riched20/Wine-0_9_4/editor.c Added: vendor/wine/dlls/riched20/Wine-0_9_4/editor.c Deleted: vendor/wine/dlls/richedit/Wine-0_9_3/ Added: vendor/wine/dlls/richedit/Wine-0_9_4/ Deleted: vendor/wine/dlls/rpcrt4/Wine-0_9_3/ Added: vendor/wine/dlls/rpcrt4/Wine-0_9_4/ Deleted: vendor/wine/dlls/shdocvw/Wine-0_9_3/ Added: vendor/wine/dlls/shdocvw/Wine-0_9_4/ Deleted: vendor/wine/dlls/shell32/Wine-0_9_3/ Added: vendor/wine/dlls/shell32/Wine-0_9_4/ Deleted: vendor/wine/dlls/shell32/Wine-0_9_4/shellpath.c Added: vendor/wine/dlls/shell32/Wine-0_9_4/shellpath.c [truncated at 100 lines; 44 more skipped] _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_4 (from rev 20338, vendor/wine/dlls/avifil32/current) _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_4 (from rev 20338, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_4 (from rev 20338, vendor/wine/dlls/comctl32/current) _____ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_4/tooltips.c --- vendor/wine/dlls/comctl32/current/tooltips.c 2005-12-26 20:14:24 UTC (rev 20338) +++ vendor/wine/dlls/comctl32/Wine-0_9_4/tooltips.c 2005-12-26 23:34:26 UTC (rev 20356) @@ -1,2840 +0,0 @@ -/* - * Tool tip control - * - * Copyright 1998, 1999 Eric Kohl - * Copyright 2004 Robert Shearman - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Sep. 08, 2004, by Robert Shearman. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features or bugs please note them below. - * - * TODO: - * - Custom draw support. - * - Animation. - * - Links. - * - Messages: - * o TTM_ADJUSTRECT - * o TTM_GETTITLEA - * o TTM_GETTTILEW - * o TTM_POPUP - * - Styles: - * o TTS_NOANIMATE - * o TTS_NOFADE - * o TTS_CLOSE - * - * Testing: - * - Run tests using Waite Group Windows95 API Bible Volume 2. - * The second cdrom (chapter 3) contains executables activate.exe, - * curtool.exe, deltool.exe, enumtools.exe, getinfo.exe, getiptxt.exe, - * hittest.exe, needtext.exe, newrect.exe, updtext.exe and winfrpt.exe. - * - * Timer logic. - * - * One important point to remember is that tools don't necessarily get - * a WM_MOUSEMOVE once the cursor leaves the tool, an example is when - * a tool sets TTF_IDISHWND (i.e. an entire window is a tool) because - * here WM_MOUSEMOVEs only get sent when the cursor is inside the - * client area. Therefore the only reliable way to know that the - * cursor has left a tool is to keep a timer running and check the - * position every time it expires. This is the role of timer - * ID_TIMERLEAVE. - * - * - * On entering a tool (detected in a relayed WM_MOUSEMOVE) we start - * ID_TIMERSHOW, if this times out and we're still in the tool we show - * the tip. On showing a tip we start both ID_TIMERPOP and - * ID_TIMERLEAVE. On hiding a tooltip we kill ID_TIMERPOP. - * ID_TIMERPOP is restarted on every relayed WM_MOUSEMOVE. If - * ID_TIMERPOP expires the tool is hidden and ID_TIMERPOP is killed. - * ID_TIMERLEAVE remains running - this is important as we need to - * determine when the cursor leaves the tool. - * - * When ID_TIMERLEAVE expires or on a relayed WM_MOUSEMOVE if we're - * still in the tool do nothing (apart from restart ID_TIMERPOP if - * this is a WM_MOUSEMOVE) (ID_TIMERLEAVE remains running). If we've - * left the tool and entered another one then hide the tip and start - * ID_TIMERSHOW with time ReshowTime and kill ID_TIMERLEAVE. If we're - * outside all tools hide the tip and kill ID_TIMERLEAVE. On Relayed - * mouse button messages hide the tip but leave ID_TIMERLEAVE running, - * this again will let us keep track of when the cursor leaves the - * tool. - * - * - * infoPtr->nTool is the tool the mouse was on on the last relayed MM - * or timer expiry or -1 if the mouse was not on a tool. - * - * infoPtr->nCurrentTool is the tool for which the tip is currently - * displaying text for or -1 if the tip is not shown. Actually this - * will only ever be infoPtr-nTool or -1, so it could be changed to a - * BOOL. - * - */ - - - -#include <stdarg.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/unicode.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" -#include "comctl32.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(tooltips); - -static HICON hTooltipIcons[TTI_ERROR+1]; - -typedef struct -{ - UINT uFlags; - HWND hwnd; - BOOL bNotifyUnicode; - UINT_PTR uId; - RECT rect; - HINSTANCE hinst; - LPWSTR lpszText; - LPARAM lParam; -} TTTOOL_INFO; - - -typedef struct -{ - WCHAR szTipText[INFOTIPSIZE]; - BOOL bActive; - BOOL bTrackActive; - UINT uNumTools; - COLORREF clrBk; - COLORREF clrText; - HFONT hFont; - HFONT hTitleFont; - INT xTrackPos; - INT yTrackPos; - INT nMaxTipWidth; - INT nTool; /* tool that mouse was on on last relayed mouse move */ - INT nCurrentTool; - INT nTrackTool; - INT nReshowTime; - INT nAutoPopTime; - INT nInitialTime; - RECT rcMargin; - BOOL bToolBelow; - LPWSTR pszTitle; - HICON hTitleIcon; - - TTTOOL_INFO *tools; -} TOOLTIPS_INFO; - -#define ID_TIMERSHOW 1 /* show delay timer */ -#define ID_TIMERPOP 2 /* auto pop timer */ -#define ID_TIMERLEAVE 3 /* tool leave timer */ - - -#define TOOLTIPS_GetInfoPtr(hWindow) ((TOOLTIPS_INFO *)GetWindowLongPtrW (hWindow, 0)) - -/* offsets from window edge to start of text */ -#define NORMAL_TEXT_MARGIN 2 -#define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) -/* value used for CreateRoundRectRgn that specifies how much - * each corner is curved */ -#define BALLOON_ROUNDEDNESS 20 -#define BALLOON_STEMHEIGHT 13 -#define BALLOON_STEMWIDTH 10 -#define BALLOON_STEMINDENT 20 - -#define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ -#define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ -#define ICON_HEIGHT 16 -#define ICON_WIDTH 16 - -static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uId, DWORD_PTR dwRef); - - -inline static UINT_PTR -TOOLTIPS_GetTitleIconIndex(HICON hIcon) -{ - UINT i; - for (i = 0; i <= TTI_ERROR; i++) - if (hTooltipIcons[i] == hIcon) - return i; - return (UINT_PTR)hIcon; -} - -static void -TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) -{ - NONCLIENTMETRICSW nclm; - - infoPtr->clrBk = GetSysColor (COLOR_INFOBK); - infoPtr->clrText = GetSysColor (COLOR_INFOTEXT); - - DeleteObject (infoPtr->hFont); - nclm.cbSize = sizeof(nclm); - SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); - infoPtr->hFont = CreateFontIndirectW (&nclm.lfStatusFont); - - DeleteObject (infoPtr->hTitleFont); - nclm.lfStatusFont.lfWeight = FW_BOLD; - infoPtr->hTitleFont = CreateFontIndirectW (&nclm.lfStatusFont); -} - -static void -TOOLTIPS_Refresh (HWND hwnd, HDC hdc) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd); - RECT rc; - INT oldBkMode; - HFONT hOldFont; - HBRUSH hBrush; - UINT uFlags = DT_EXTERNALLEADING; - HRGN hRgn = NULL; - DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); - - if (infoPtr->nMaxTipWidth > -1) - uFlags |= DT_WORDBREAK; - if (GetWindowLongW (hwnd, GWL_STYLE) & TTS_NOPREFIX) - uFlags |= DT_NOPREFIX; - GetClientRect (hwnd, &rc); - - hBrush = CreateSolidBrush(infoPtr->clrBk); - - oldBkMode = SetBkMode (hdc, TRANSPARENT); - SetTextColor (hdc, infoPtr->clrText); - - if (dwStyle & TTS_BALLOON) - { - /* create a region to store result into */ - hRgn = CreateRectRgn(0, 0, 0, 0); - - GetWindowRgn(hwnd, hRgn); - - /* fill the background */ - FillRgn(hdc, hRgn, hBrush); - DeleteObject(hBrush); - hBrush = NULL; - } - else - { - /* fill the background */ - FillRect(hdc, &rc, hBrush); - DeleteObject(hBrush); - hBrush = NULL; - } - - if ((dwStyle & TTS_BALLOON) || infoPtr->pszTitle) - { - /* calculate text rectangle */ - rc.left += (BALLOON_TEXT_MARGIN + infoPtr->rcMargin.left); - rc.top += (BALLOON_TEXT_MARGIN + infoPtr->rcMargin.top); - rc.right -= (BALLOON_TEXT_MARGIN + infoPtr->rcMargin.right); - rc.bottom -= (BALLOON_TEXT_MARGIN + infoPtr->rcMargin.bottom); - if(infoPtr->bToolBelow) rc.top += BALLOON_STEMHEIGHT; - - if (infoPtr->pszTitle) - { - RECT rcTitle = {rc.left, rc.top, rc.right, rc.bottom}; - int height; - BOOL icon_present; - - /* draw icon */ - icon_present = infoPtr->hTitleIcon && - DrawIconEx(hdc, rc.left, rc.top, infoPtr->hTitleIcon, - ICON_WIDTH, ICON_HEIGHT, 0, NULL, DI_NORMAL); - if (icon_present) - rcTitle.left += ICON_WIDTH + BALLOON_ICON_TITLE_SPACING; - - rcTitle.bottom = rc.top + ICON_HEIGHT; - - /* draw title text */ - hOldFont = SelectObject (hdc, infoPtr->hTitleFont); - height = DrawTextW(hdc, infoPtr->pszTitle, -1, &rcTitle, DT_BOTTOM | DT_SINGLELINE | DT_NOPREFIX); - SelectObject (hdc, hOldFont); - rc.top += height + BALLOON_TITLE_TEXT_SPACING; - } - } - else - { - /* calculate text rectangle */ - rc.left += (NORMAL_TEXT_MARGIN + infoPtr->rcMargin.left); - rc.top += (NORMAL_TEXT_MARGIN + infoPtr->rcMargin.top); - rc.right -= (NORMAL_TEXT_MARGIN + infoPtr->rcMargin.right); - rc.bottom -= (NORMAL_TEXT_MARGIN + infoPtr->rcMargin.bottom); - } - - /* draw text */ - hOldFont = SelectObject (hdc, infoPtr->hFont); - DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags); - /* be polite and reset the things we changed in the dc */ - SelectObject (hdc, hOldFont); - SetBkMode (hdc, oldBkMode); - - if (dwStyle & TTS_BALLOON) - { - /* frame region because default window proc doesn't do it */ - INT width = GetSystemMetrics(SM_CXDLGFRAME) - GetSystemMetrics(SM_CXEDGE); - INT height = GetSystemMetrics(SM_CYDLGFRAME) - GetSystemMetrics(SM_CYEDGE); - - hBrush = GetSysColorBrush(COLOR_WINDOWFRAME); - FrameRgn(hdc, hRgn, hBrush, width, height); - } - - if (hRgn) - DeleteObject(hRgn); -} - -static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *toolPtr) -{ - NMTTDISPINFOA ttnmdi; - - /* fill NMHDR struct */ - ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOA)); - ttnmdi.hdr.hwndFrom = hwnd; - ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOA; - ttnmdi.lpszText = (LPSTR)&ttnmdi.szText; - ttnmdi.uFlags = toolPtr->uFlags; - ttnmdi.lParam = toolPtr->lParam; - - TRACE("hdr.idFrom = %x\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); - - if (IS_INTRESOURCE(ttnmdi.lpszText)) { - LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), - infoPtr->szTipText, INFOTIPSIZE); - if (ttnmdi.uFlags & TTF_DI_SETITEM) { - toolPtr->hinst = ttnmdi.hinst; - toolPtr->lpszText = (LPWSTR)ttnmdi.lpszText; - } - } - else if (ttnmdi.lpszText == 0) { - /* no text available */ - infoPtr->szTipText[0] = '\0'; - } - else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKA) { - INT max_len = (ttnmdi.lpszText == &ttnmdi.szText[0]) ? - sizeof(ttnmdi.szText)/sizeof(ttnmdi.szText[0]) : -1; - MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, max_len, - infoPtr->szTipText, INFOTIPSIZE); - if (ttnmdi.uFlags & TTF_DI_SETITEM) { - INT len = MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, - max_len, NULL, 0); - toolPtr->hinst = 0; - toolPtr->lpszText = Alloc (len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ttnmdi.lpszText, -1, - toolPtr->lpszText, len); - } - } - else { - ERR("recursive text callback!\n"); - infoPtr->szTipText[0] = '\0'; - } -} - -static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO *toolPtr) -{ - NMTTDISPINFOW ttnmdi; - - /* fill NMHDR struct */ - ZeroMemory (&ttnmdi, sizeof(NMTTDISPINFOW)); - ttnmdi.hdr.hwndFrom = hwnd; - ttnmdi.hdr.idFrom = toolPtr->uId; - ttnmdi.hdr.code = TTN_GETDISPINFOW; - ttnmdi.lpszText = (LPWSTR)&ttnmdi.szText; - ttnmdi.uFlags = toolPtr->uFlags; - ttnmdi.lParam = toolPtr->lParam; - - TRACE("hdr.idFrom = %x\n", ttnmdi.hdr.idFrom); - SendMessageW(toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); - - if (IS_INTRESOURCE(ttnmdi.lpszText)) { - LoadStringW(ttnmdi.hinst, LOWORD(ttnmdi.lpszText), - infoPtr->szTipText, INFOTIPSIZE); - if (ttnmdi.uFlags & TTF_DI_SETITEM) { - toolPtr->hinst = ttnmdi.hinst; - toolPtr->lpszText = ttnmdi.lpszText; - } - } - else if (ttnmdi.lpszText == 0) { - /* no text available */ - infoPtr->szTipText[0] = '\0'; - } - else if (ttnmdi.lpszText != LPSTR_TEXTCALLBACKW) { - INT max_len = (ttnmdi.lpszText == &ttnmdi.szText[0]) ? - sizeof(ttnmdi.szText)/sizeof(ttnmdi.szText[0]) : INFOTIPSIZE-1; - lstrcpynW(infoPtr->szTipText, ttnmdi.lpszText, max_len); - if (ttnmdi.uFlags & TTF_DI_SETITEM) { - INT len = max(strlenW(ttnmdi.lpszText), max_len); - toolPtr->hinst = 0; - toolPtr->lpszText = Alloc ((len+1) * sizeof(WCHAR)); - memcpy(toolPtr->lpszText, ttnmdi.lpszText, (len+1) * sizeof(WCHAR)); - } - } - else { - ERR("recursive text callback!\n"); - infoPtr->szTipText[0] = '\0'; - } -} - -static void -TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool) -{ - TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool]; - - if (IS_INTRESOURCE(toolPtr->lpszText) && toolPtr->hinst) { - /* load a resource */ - TRACE("load res string %p %x\n", - toolPtr->hinst, LOWORD(toolPtr->lpszText)); - LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), - infoPtr->szTipText, INFOTIPSIZE); - } - else if (toolPtr->lpszText) { - if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) { - if (toolPtr->bNotifyUnicode) - TOOLTIPS_GetDispInfoW(hwnd, infoPtr, toolPtr); - else - TOOLTIPS_GetDispInfoA(hwnd, infoPtr, toolPtr); - } - else { - /* the item is a usual (unicode) text */ - lstrcpynW (infoPtr->szTipText, toolPtr->lpszText, INFOTIPSIZE); - } - } - else { - /* no text available */ - infoPtr->szTipText[0] = L'\0'; - } - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); -} - - -static void -TOOLTIPS_CalcTipSize (HWND hwnd, TOOLTIPS_INFO *infoPtr, LPSIZE lpSize) -{ - HDC hdc; - HFONT hOldFont; - DWORD style = GetWindowLongW(hwnd, GWL_STYLE); - UINT uFlags = DT_EXTERNALLEADING | DT_CALCRECT; - RECT rc = {0, 0, 0, 0}; - SIZE title = {0, 0}; - - if (infoPtr->nMaxTipWidth > -1) { - rc.right = infoPtr->nMaxTipWidth; - uFlags |= DT_WORDBREAK; - } - if (style & TTS_NOPREFIX) - uFlags |= DT_NOPREFIX; - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - - hdc = GetDC (hwnd); - if (infoPtr->pszTitle) - { - RECT rcTitle = {0, 0, 0, 0}; - TRACE("title %s\n", debugstr_w(infoPtr->pszTitle)); - if (infoPtr->hTitleIcon) - { - title.cx = ICON_WIDTH; - title.cy = ICON_HEIGHT; - } - if (title.cx != 0) title.cx += BALLOON_ICON_TITLE_SPACING; - hOldFont = SelectObject (hdc, infoPtr->hTitleFont); - DrawTextW(hdc, infoPtr->pszTitle, -1, &rcTitle, DT_SINGLELINE | DT_NOPREFIX | DT_CALCRECT); - SelectObject (hdc, hOldFont); - title.cy = max(title.cy, rcTitle.bottom - rcTitle.top) + BALLOON_TITLE_TEXT_SPACING; - title.cx += (rcTitle.right - rcTitle.left); - } - hOldFont = SelectObject (hdc, infoPtr->hFont); - DrawTextW (hdc, infoPtr->szTipText, -1, &rc, uFlags); - SelectObject (hdc, hOldFont); - ReleaseDC (hwnd, hdc); - - if ((style & TTS_BALLOON) || infoPtr->pszTitle) - { - lpSize->cx = max(rc.right - rc.left, title.cx) + 2*BALLOON_TEXT_MARGIN + - infoPtr->rcMargin.left + infoPtr->rcMargin.right; - lpSize->cy = title.cy + rc.bottom - rc.top + 2*BALLOON_TEXT_MARGIN + - infoPtr->rcMargin.bottom + infoPtr->rcMargin.top + - BALLOON_STEMHEIGHT; - } - else - { - lpSize->cx = rc.right - rc.left + 2*NORMAL_TEXT_MARGIN + - infoPtr->rcMargin.left + infoPtr->rcMargin.right; - lpSize->cy = rc.bottom - rc.top + 2*NORMAL_TEXT_MARGIN + - infoPtr->rcMargin.bottom + infoPtr->rcMargin.top; - } -} - - -static void -TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) -{ - TTTOOL_INFO *toolPtr; - RECT rect, wndrect; - SIZE size; - NMHDR hdr; - int ptfx = 0; - DWORD style = GetWindowLongW(hwnd, GWL_STYLE); - - if (infoPtr->nTool == -1) { - TRACE("invalid tool (-1)!\n"); - return; - } - - infoPtr->nCurrentTool = infoPtr->nTool; - - TRACE("Show tooltip pre %d! (%p)\n", infoPtr->nTool, hwnd); - - TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool); - - if (infoPtr->szTipText[0] == L'\0') { - infoPtr->nCurrentTool = -1; - return; - } - - TRACE("Show tooltip %d!\n", infoPtr->nCurrentTool); - toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; - - hdr.hwndFrom = hwnd; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - - TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size); - TRACE("size %ld x %ld\n", size.cx, size.cy); - - if (toolPtr->uFlags & TTF_CENTERTIP) { - RECT rc; - - if (toolPtr->uFlags & TTF_IDISHWND) - GetWindowRect ((HWND)toolPtr->uId, &rc); - else { - rc = toolPtr->rect; - MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); - } - rect.left = (rc.left + rc.right - size.cx) / 2; - if (style & TTS_BALLOON) - { - ptfx = rc.left + ((rc.right - rc.left) / 2); - if(rect.top - size.cy >= 0) - { - rect.top -= size.cy; - infoPtr->bToolBelow = FALSE; - } - else - { - infoPtr->bToolBelow = TRUE; - rect.top += 20; - } - rect.left = max(0, rect.left - BALLOON_STEMINDENT); - } - else - { - rect.top = rc.bottom + 2; - infoPtr->bToolBelow = TRUE; - } - } - else { - GetCursorPos ((LPPOINT)&rect); - if (style & TTS_BALLOON) - { - ptfx = rect.left; - if(rect.top - size.cy >= 0) - { - rect.top -= size.cy; - infoPtr->bToolBelow = FALSE; - } - else - { - infoPtr->bToolBelow = TRUE; - rect.top += 20; - } - rect.left = max(0, rect.left - BALLOON_STEMINDENT); - } - else - { - rect.top += 20; - infoPtr->bToolBelow = TRUE; - } - } - - TRACE("pos %ld - %ld\n", rect.left, rect.top); - - rect.right = rect.left + size.cx; - rect.bottom = rect.top + size.cy; - - /* check position */ - wndrect.right = GetSystemMetrics( SM_CXSCREEN ); - if( rect.right > wndrect.right ) { - rect.left -= rect.right - wndrect.right + 2; - rect.right = wndrect.right - 2; - } - wndrect.bottom = GetSystemMetrics( SM_CYSCREEN ); - if( rect.bottom > wndrect.bottom ) { - RECT rc; - - if (toolPtr->uFlags & TTF_IDISHWND) - GetWindowRect ((HWND)toolPtr->uId, &rc); - else { - rc = toolPtr->rect; - MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); - } - rect.bottom = rc.top - 2; - rect.top = rect.bottom - size.cy; - } - - AdjustWindowRectEx (&rect, GetWindowLongW (hwnd, GWL_STYLE), - FALSE, GetWindowLongW (hwnd, GWL_EXSTYLE)); - - if (style & TTS_BALLOON) - { - HRGN hRgn; - HRGN hrStem; - POINT pts[3]; - - ptfx -= rect.left; - - if(infoPtr->bToolBelow) - { - pts[0].x = ptfx; - pts[0].y = 0; - pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); - pts[1].y = BALLOON_STEMHEIGHT; - pts[2].x = pts[1].x + BALLOON_STEMWIDTH; - pts[2].y = pts[1].y; - if(pts[2].x > (rect.right - rect.left) - BALLOON_STEMINDENT) - { - pts[2].x = (rect.right - rect.left) - BALLOON_STEMINDENT; - pts[1].x = pts[2].x - BALLOON_STEMWIDTH; - } - } - else - { - pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); - pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; - pts[1].x = pts[0].x + BALLOON_STEMWIDTH; - pts[1].y = pts[0].y; - pts[2].x = ptfx; - pts[2].y = (rect.bottom - rect.top); - if(pts[1].x > (rect.right - rect.left) - BALLOON_STEMINDENT) - { - pts[1].x = (rect.right - rect.left) - BALLOON_STEMINDENT; - pts[0].x = pts[1].x - BALLOON_STEMWIDTH; - } - } - - hrStem = CreatePolygonRgn(pts, sizeof(pts) / sizeof(pts[0]), ALTERNATE); - - hRgn = CreateRoundRectRgn(0, - (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), - rect.right - rect.left, - (infoPtr->bToolBelow ? rect.bottom - rect.top : rect.bottom - rect.top - BALLOON_STEMHEIGHT), - BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); - - CombineRgn(hRgn, hRgn, hrStem, RGN_OR); - DeleteObject(hrStem); - - SetWindowRgn(hwnd, hRgn, FALSE); - /* we don't free the region handle as the system deletes it when - * it is no longer needed */ - } - - SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); - - /* repaint the tooltip */ - InvalidateRect(hwnd, NULL, TRUE); - UpdateWindow(hwnd); - - SetTimer (hwnd, ID_TIMERPOP, infoPtr->nAutoPopTime, 0); - TRACE("timer 2 started!\n"); - SetTimer (hwnd, ID_TIMERLEAVE, infoPtr->nReshowTime, 0); - TRACE("timer 3 started!\n"); -} - - -static void -TOOLTIPS_Hide (HWND hwnd, TOOLTIPS_INFO *infoPtr) -{ - TTTOOL_INFO *toolPtr; - NMHDR hdr; - - TRACE("Hide tooltip %d! (%p)\n", infoPtr->nCurrentTool, hwnd); - - if (infoPtr->nCurrentTool == -1) - return; - - toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; - KillTimer (hwnd, ID_TIMERPOP); - - hdr.hwndFrom = hwnd; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); - - infoPtr->nCurrentTool = -1; - - SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE); -} - - -static void -TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) -{ - TTTOOL_INFO *toolPtr; - RECT rect; - SIZE size; - NMHDR hdr; - - if (infoPtr->nTrackTool == -1) { - TRACE("invalid tracking tool (-1)!\n"); - return; - } - - TRACE("show tracking tooltip pre %d!\n", infoPtr->nTrackTool); - - TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nTrackTool); - - if (infoPtr->szTipText[0] == L'\0') { - infoPtr->nTrackTool = -1; - return; - } - - TRACE("show tracking tooltip %d!\n", infoPtr->nTrackTool); - toolPtr = &infoPtr->tools[infoPtr->nTrackTool]; - - hdr.hwndFrom = hwnd; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - - TOOLTIPS_CalcTipSize (hwnd, infoPtr, &size); - TRACE("size %ld x %ld\n", size.cx, size.cy); - - if (toolPtr->uFlags & TTF_ABSOLUTE) { - rect.left = infoPtr->xTrackPos; - rect.top = infoPtr->yTrackPos; - - if (toolPtr->uFlags & TTF_CENTERTIP) { - rect.left -= (size.cx / 2); - rect.top -= (size.cy / 2); - } - } - else { - RECT rcTool; - - if (toolPtr->uFlags & TTF_IDISHWND) - GetWindowRect ((HWND)toolPtr->uId, &rcTool); - else { - rcTool = toolPtr->rect; - MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rcTool, 2); - } - - GetCursorPos ((LPPOINT)&rect); - rect.top += 20; - - if (toolPtr->uFlags & TTF_CENTERTIP) { - rect.left -= (size.cx / 2); - rect.top -= (size.cy / 2); - } - - /* smart placement */ - if ((rect.left + size.cx > rcTool.left) && (rect.left < rcTool.right) && - (rect.top + size.cy > rcTool.top) && (rect.top < rcTool.bottom)) - rect.left = rcTool.right; - } - - TRACE("pos %ld - %ld\n", rect.left, rect.top); - - rect.right = rect.left + size.cx; - rect.bottom = rect.top + size.cy; - - AdjustWindowRectEx (&rect, GetWindowLongW (hwnd, GWL_STYLE), - FALSE, GetWindowLongW (hwnd, GWL_EXSTYLE)); - - if (GetWindowLongW(hwnd, GWL_STYLE) & TTS_BALLOON) - { - HRGN hRgn; - - /* FIXME: need to add pointy bit using CreatePolyRgn & CombinRgn */ - hRgn = CreateRoundRectRgn(0, 0, rect.right - rect.left, rect.bottom - rect.top, BALLOON_ROUNDEDNESS, BALLOON_ROUNDEDNESS); - - SetWindowRgn(hwnd, hRgn, FALSE); - /* we don't free the region handle as the system deletes it when - * it is no longer needed */ - } - - SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE ); - - InvalidateRect(hwnd, NULL, TRUE); - UpdateWindow(hwnd); -} - - -static void -TOOLTIPS_TrackHide (HWND hwnd, TOOLTIPS_INFO *infoPtr) -{ - TTTOOL_INFO *toolPtr; - NMHDR hdr; - - TRACE("hide tracking tooltip %d\n", infoPtr->nTrackTool); - - if (infoPtr->nTrackTool == -1) - return; - - toolPtr = &infoPtr->tools[infoPtr->nTrackTool]; - - hdr.hwndFrom = hwnd; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_POP; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, - (WPARAM)toolPtr->uId, (LPARAM)&hdr); - - SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE); -} - - -static INT -TOOLTIPS_GetToolFromInfoA (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOA lpToolInfo) -{ - TTTOOL_INFO *toolPtr; - INT nTool; - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if (!(toolPtr->uFlags & TTF_IDISHWND) && - (lpToolInfo->hwnd == toolPtr->hwnd) && - (lpToolInfo->uId == toolPtr->uId)) - return nTool; - } - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if ((toolPtr->uFlags & TTF_IDISHWND) && - (lpToolInfo->uId == toolPtr->uId)) - return nTool; - } - - return -1; -} - - -static INT -TOOLTIPS_GetToolFromInfoW (TOOLTIPS_INFO *infoPtr, LPTTTOOLINFOW lpToolInfo) -{ - TTTOOL_INFO *toolPtr; - INT nTool; - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if (!(toolPtr->uFlags & TTF_IDISHWND) && - (lpToolInfo->hwnd == toolPtr->hwnd) && - (lpToolInfo->uId == toolPtr->uId)) - return nTool; - } - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if ((toolPtr->uFlags & TTF_IDISHWND) && - (lpToolInfo->uId == toolPtr->uId)) - return nTool; - } - - return -1; -} - - -static INT -TOOLTIPS_GetToolFromPoint (TOOLTIPS_INFO *infoPtr, HWND hwnd, LPPOINT lpPt) -{ - TTTOOL_INFO *toolPtr; - INT nTool; - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if (!(toolPtr->uFlags & TTF_IDISHWND)) { - if (hwnd != toolPtr->hwnd) - continue; - if (!PtInRect (&toolPtr->rect, *lpPt)) - continue; - return nTool; - } - } - - for (nTool = 0; nTool < infoPtr->uNumTools; nTool++) { - toolPtr = &infoPtr->tools[nTool]; - - if (toolPtr->uFlags & TTF_IDISHWND) { - if ((HWND)toolPtr->uId == hwnd) - return nTool; - } - } - - return -1; -} - - -static BOOL -TOOLTIPS_IsWindowActive (HWND hwnd) -{ - HWND hwndActive = GetActiveWindow (); - if (!hwndActive) - return FALSE; - if (hwndActive == hwnd) - return TRUE; - return IsChild (hwndActive, hwnd); -} - - -static INT -TOOLTIPS_CheckTool (HWND hwnd, BOOL bShowTest) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); - POINT pt; - HWND hwndTool; - INT nTool; - - GetCursorPos (&pt); - hwndTool = (HWND)SendMessageW (hwnd, TTM_WINDOWFROMPOINT, 0, (LPARAM)&pt); - if (hwndTool == 0) - return -1; - - ScreenToClient (hwndTool, &pt); - nTool = TOOLTIPS_GetToolFromPoint (infoPtr, hwndTool, &pt); - if (nTool == -1) - return -1; - - if (!(GetWindowLongW (hwnd, GWL_STYLE) & TTS_ALWAYSTIP) && bShowTest) { - if (!TOOLTIPS_IsWindowActive (GetWindow (hwnd, GW_OWNER))) - return -1; - } - - TRACE("tool %d\n", nTool); - - return nTool; -} - - -static LRESULT -TOOLTIPS_Activate (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); - - infoPtr->bActive = (BOOL)wParam; - - if (infoPtr->bActive) - TRACE("activate!\n"); - - if (!(infoPtr->bActive) && (infoPtr->nCurrentTool != -1)) - TOOLTIPS_Hide (hwnd, infoPtr); - - return 0; -} - - -static LRESULT -TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); - LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; - TTTOOL_INFO *toolPtr; - INT nResult; - - if (lpToolInfo == NULL) - return FALSE; - if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE) - return FALSE; - - TRACE("add tool (%p) %p %d%s!\n", - hwnd, lpToolInfo->hwnd, lpToolInfo->uId, [truncated at 1000 lines; 58783 more skipped]

1 0

[gvg] 20357: Update status
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-12-26 23:34:26 UTC (rev 20356) +++ trunk/reactos/media/doc/README.WINE 2005-12-26 23:35:02 UTC (rev 20357) @@ -26,56 +26,56 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_3 -reactos/tools/wpp # Synced to Wine-0_9_3 +reactos/tools/unicode # Synced to Wine-0_9_4 +reactos/tools/wpp # Synced to Wine-0_9_4 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_3 -reactos/tools/wmc # Synced to Wine-0_9_3 -reactos/tools/wrc # Synced to Wine-0_9_3 +reactos/tools/winebuild # Synced to Wine-0_9_4 +reactos/tools/wmc # Synced to Wine-0_9_4 +reactos/tools/wrc # Synced to Wine-0_9_4 reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/avifil32 # Synced to Wine-0_9_3 -reactos/lib/cabinet # Synced to Wine-0_9_3 -reactos/lib/comctl32 # Synced to Wine-0_9_3 -reactos/lib/comdlg32 # Synced to Wine-0_9_3 -reactos/lib/crypt32 # Synced to Wine-0_9_3 +reactos/lib/avifil32 # Synced to Wine-0_9_4 +reactos/lib/cabinet # Synced to Wine-0_9_4 +reactos/lib/comctl32 # Synced to Wine-0_9_4 +reactos/lib/comdlg32 # Synced to Wine-0_9_4 +reactos/lib/crypt32 # Synced to Wine-0_9_4 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9_3 -reactos/lib/dinput8 # Synced to Wine-0_9_3 -reactos/lib/dplay # Synced to Wine-0_9_3 -reactos/lib/dplayx # Synced to Wine-0_9_3 -reactos/lib/dxdiagn # Synced to Wine-0_9_3 -reactos/lib/icmp # Synced to Wine-0_9_3 -reactos/lib/imm32 # Synced to Wine-0_9_3 +reactos/lib/dinput # Synced to Wine-0_9_4 +reactos/lib/dinput8 # Synced to Wine-0_9_4 +reactos/lib/dplay # Synced to Wine-0_9_4 +reactos/lib/dplayx # Synced to Wine-0_9_4 +reactos/lib/dxdiagn # Synced to Wine-0_9_4 +reactos/lib/icmp # Synced to Wine-0_9_4 +reactos/lib/imm32 # Synced to Wine-0_9_4 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9_3 +reactos/lib/mpr # Synced to Wine-0_9_4 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9_3 -reactos/lib/msi # Synced to Wine-0_9_3 +reactos/lib/msimg32 # Synced to Wine-0_9_4 +reactos/lib/msi # Synced to Wine-0_9_4 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Synced to Wine-0_9_3 -reactos/lib/objsel # Synced to Wine-0_9_3 +reactos/lib/netapi32 # Synced to Wine-0_9_4 +reactos/lib/objsel # Synced to Wine-0_9_4 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-0_9_3 -reactos/lib/oleacc # Synced to Wine-0_9_3 -reactos/lib/oleaut32 # Synced to Wine-0_9_3 -reactos/lib/oledlg # Synced to Wine-0_9_3 -reactos/lib/olepro32 # Synced to Wine-0_9_3 -reactos/lib/riched20 # Synced to Wine-0_9_3 -reactos/lib/richedit # Synced to Wine-0_9_3 -reactos/lib/rpcrt4 # Synced to Wine-0_9_3 +reactos/lib/ole32 # Synced to Wine-0_9_4 +reactos/lib/oleacc # Synced to Wine-0_9_4 +reactos/lib/oleaut32 # Synced to Wine-0_9_4 +reactos/lib/oledlg # Synced to Wine-0_9_4 +reactos/lib/olepro32 # Synced to Wine-0_9_4 +reactos/lib/riched20 # Synced to Wine-0_9_4 +reactos/lib/richedit # Synced to Wine-0_9_4 +reactos/lib/rpcrt4 # Synced to Wine-0_9_4 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9_3 -reactos/lib/shdocvw # Synced to Wine-0_9_3 -reactos/lib/shfolder # Synced to Wine-0_9_3 -reactos/lib/shlwapi # Synced to Wine-0_9_3 +reactos/lib/shell32 # Synced to Wine-0_9_4 +reactos/lib/shdocvw # Synced to Wine-0_9_4 +reactos/lib/shfolder # Synced to Wine-0_9_4 +reactos/lib/shlwapi # Synced to Wine-0_9_4 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9_3 -reactos/lib/uxtheme # Synced to Wine-0_9_3 +reactos/lib/urlmon # Synced to Wine-0_9_4 +reactos/lib/uxtheme # Synced to Wine-0_9_4 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628

1 0

[gvg] 20355: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Thomas Weidenmueller <wine-patches(a)reactsoft.com> - urlmon: Correctly fix IStream::Read. Don't dereference a possible NULL pointer. - urlmon: Fix call to ReadFile. The BytesRead parameter passed to ReadFile may never be NULL. Jacek Caban <jacek(a)codeweavers.com> - urlmon: Added handling of BINDF_FROMURLMON in file protocol. - urlmon: Added some tests and fixes of file protocol. - urlmon: Fix BindToStorage test. Modified: trunk/reactos/lib/urlmon/binding.c Modified: trunk/reactos/lib/urlmon/file.c Modified: trunk/reactos/lib/urlmon/umstream.c Modified: trunk/reactos/w32api/include/urlmon.h _____ Modified: trunk/reactos/lib/urlmon/binding.c --- trunk/reactos/lib/urlmon/binding.c 2005-12-26 23:24:41 UTC (rev 20354) +++ trunk/reactos/lib/urlmon/binding.c 2005-12-26 23:31:24 UTC (rev 20355) @@ -401,7 +401,7 @@ hres = IBindCtx_GetObjectParam(pbc, wszBSCBHolder, (IUnknown**)callback); if(FAILED(hres)) - return INET_E_DATA_NOT_AVAILABLE; + return MK_E_SYNTAX; return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/file.c --- trunk/reactos/lib/urlmon/file.c 2005-12-26 23:24:41 UTC (rev 20354) +++ trunk/reactos/lib/urlmon/file.c 2005-12-26 23:31:24 UTC (rev 20355) @@ -110,7 +110,9 @@ LARGE_INTEGER size; DWORD len; LPWSTR url, mime = NULL; + LPCWSTR file_name; WCHAR null_char = 0; + BOOL first_call = FALSE; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -134,33 +136,42 @@ return hres; } - hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); - if(SUCCEEDED(hres)) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, mime); + if(!(grfBINDF & BINDF_FROMURLMON)) + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + first_call = TRUE; + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - This->file = CreateFileW(url+sizeof(wszFile)/sizeof(WCHAR), GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + file_name = url+sizeof(wszFile)/sizeof(WCHAR); + if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') + file_name += 3; + This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(This->file == INVALID_HANDLE_VALUE) { This->file = NULL; IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, GetLastError(), NULL); HeapFree(GetProcessHeap(), 0, url); - CoTaskMemFree(mime); return INET_E_RESOURCE_NOT_FOUND; } - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, - url+sizeof(wszFile)/sizeof(WCHAR)); - if(mime) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); - IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_CACHEFILENAMEAVAILABLE, file_name); + + hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, + (grfBINDF & BINDF_FROMURLMON) ? + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, + mime); + CoTaskMemFree(mime); + } } - CoTaskMemFree(mime); HeapFree(GetProcessHeap(), 0, url); if(GetFileSizeEx(This->file, &size)) @@ -168,6 +179,9 @@ BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, size.u.LowPart, size.u.LowPart); + if(first_call) + IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/umstream.c --- trunk/reactos/lib/urlmon/umstream.c 2005-12-26 23:24:41 UTC (rev 20354) +++ trunk/reactos/lib/urlmon/umstream.c 2005-12-26 23:31:24 UTC (rev 20355) @@ -225,6 +225,7 @@ ULONG cb, ULONG* pcbRead) { + ULONG dwBytesRead; IUMCacheStream *This = (IUMCacheStream *)iface; TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); @@ -232,7 +233,10 @@ if ( !pv ) return STG_E_INVALIDPOINTER; - if ( ! ReadFile( This->handle, pv, cb, pcbRead, NULL ) ) + if ( !pcbRead) + pcbRead = &dwBytesRead; + + if ( ! ReadFile( This->handle, pv, cb, (LPDWORD)pcbRead, NULL ) ) return S_FALSE; if (!*pcbRead) _____ Modified: trunk/reactos/w32api/include/urlmon.h --- trunk/reactos/w32api/include/urlmon.h 2005-12-26 23:24:41 UTC (rev 20354) +++ trunk/reactos/w32api/include/urlmon.h 2005-12-26 23:31:24 UTC (rev 20355) @@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 0.9.1 from urlmon.idl - Do not edit ***/ +/*** Autogenerated by WIDL 0.9.4 from urlmon.idl - Do not edit ***/ #include <rpc.h> #include <rpcndr.h> @@ -13,12 +13,12 @@ #include <msxml.h> #ifndef __IInternetProtocolSink_FWD_DEFINED__ #define __IInternetProtocolSink_FWD_DEFINED__ -typedef struct IInternetProtocolSink IInternetProtocolSink; +typedef interface IInternetProtocolSink IInternetProtocolSink; #endif #ifndef __IBinding_FWD_DEFINED__ #define __IBinding_FWD_DEFINED__ -typedef struct IBinding IBinding; +typedef interface IBinding IBinding; #endif typedef IBinding *LPBINDING; @@ -30,7 +30,7 @@ DEFINE_GUID(IID_IBinding, 0x79eac9c0, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IBinding : public IUnknown +interface IBinding : public IUnknown { virtual HRESULT STDMETHODCALLTYPE Abort( ) = 0; @@ -55,11 +55,7 @@ }; #else -typedef struct IBindingVtbl IBindingVtbl; -struct IBinding { - const IBindingVtbl* lpVtbl; -}; -struct IBindingVtbl { +typedef struct IBindingVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -100,6 +96,9 @@ DWORD* pdwReserved); END_INTERFACE +} IBindingVtbl; +interface IBinding { + const IBindingVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -121,38 +120,38 @@ HRESULT CALLBACK IBinding_Abort_Proxy( IBinding* This); void __RPC_STUB IBinding_Abort_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_Suspend_Proxy( IBinding* This); void __RPC_STUB IBinding_Suspend_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_Resume_Proxy( IBinding* This); void __RPC_STUB IBinding_Resume_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_SetPriority_Proxy( IBinding* This, LONG nPriority); void __RPC_STUB IBinding_SetPriority_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_GetPriority_Proxy( IBinding* This, LONG* pnPriority); void __RPC_STUB IBinding_GetPriority_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_RemoteGetBindResult_Proxy( @@ -162,8 +161,8 @@ LPOLESTR* pszResult, DWORD dwReserved); void __RPC_STUB IBinding_RemoteGetBindResult_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBinding_GetBindResult_Proxy( @@ -183,7 +182,7 @@ #ifndef __IBindStatusCallback_FWD_DEFINED__ #define __IBindStatusCallback_FWD_DEFINED__ -typedef struct IBindStatusCallback IBindStatusCallback; +typedef interface IBindStatusCallback IBindStatusCallback; #endif typedef IBindStatusCallback *LPBINDSTATUSCALLBACK; @@ -291,7 +290,7 @@ BINDSTATUS_ENDUPLOADINGDATA, BINDSTATUS_PROTOCOLCLASSID, BINDSTATUS_ENCODING, - BINDSTATUS_VERFIEDMIMETYPEAVAILABLE, + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, BINDSTATUS_CLASSINSTALLLOCATION, BINDSTATUS_DECODING, BINDSTATUS_LOADINGMIMEHANDLER, @@ -317,7 +316,11 @@ BINDSTATUS_SESSION_COOKIE_RECEIVED, BINDSTATUS_PERSISTENT_COOKIE_RECEIVED, BINDSTATUS_SESSION_COOKIES_ALLOWED, - BINDSTATUS_CACHECONTROL + BINDSTATUS_CACHECONTROL, + BINDSTATUS_CONTENTDISPOSITIONFILENAME, + BINDSTATUS_MIMETEXTPLAINMISMATCH, + BINDSTATUS_PUBLISHERAVAILABLE, + BINDSTATUS_DISPLAYNAMEAVAILABLE } BINDSTATUS; /*********************************************************************** ****** * IBindStatusCallback interface @@ -327,7 +330,7 @@ DEFINE_GUID(IID_IBindStatusCallback, 0x79eac9c1, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IBindStatusCallback : public IUnknown +interface IBindStatusCallback : public IUnknown { virtual HRESULT STDMETHODCALLTYPE OnStartBinding( DWORD dwReserved, @@ -365,11 +368,7 @@ }; #else -typedef struct IBindStatusCallbackVtbl IBindStatusCallbackVtbl; -struct IBindStatusCallback { - const IBindStatusCallbackVtbl* lpVtbl; -}; -struct IBindStatusCallbackVtbl { +typedef struct IBindStatusCallbackVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -428,6 +427,9 @@ IUnknown* punk); END_INTERFACE +} IBindStatusCallbackVtbl; +interface IBindStatusCallback { + const IBindStatusCallbackVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -453,24 +455,24 @@ DWORD dwReserved, IBinding* pib); void __RPC_STUB IBindStatusCallback_OnStartBinding_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_GetPriority_Proxy( IBindStatusCallback* This, LONG* pnPriority); void __RPC_STUB IBindStatusCallback_GetPriority_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_OnLowResource_Proxy( IBindStatusCallback* This, DWORD reserved); void __RPC_STUB IBindStatusCallback_OnLowResource_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_OnProgress_Proxy( @@ -480,8 +482,8 @@ ULONG ulStatusCode, LPCWSTR szStatusText); void __RPC_STUB IBindStatusCallback_OnProgress_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_OnStopBinding_Proxy( @@ -489,8 +491,8 @@ HRESULT hresult, LPCWSTR szError); void __RPC_STUB IBindStatusCallback_OnStopBinding_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_RemoteGetBindInfo_Proxy( @@ -499,8 +501,8 @@ RemBINDINFO* pbindinfo, RemSTGMEDIUM* pstgmed); void __RPC_STUB IBindStatusCallback_RemoteGetBindInfo_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_GetBindInfo_Proxy( @@ -519,8 +521,8 @@ RemFORMATETC* pformatetc, RemSTGMEDIUM* pstgmed); void __RPC_STUB IBindStatusCallback_RemoteOnDataAvailable_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy( @@ -540,8 +542,8 @@ REFIID riid, IUnknown* punk); void __RPC_STUB IBindStatusCallback_OnObjectAvailable_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -549,7 +551,7 @@ #ifndef __IAuthenticate_FWD_DEFINED__ #define __IAuthenticate_FWD_DEFINED__ -typedef struct IAuthenticate IAuthenticate; +typedef interface IAuthenticate IAuthenticate; #endif typedef IAuthenticate *LPAUTHENTICATION; @@ -561,7 +563,7 @@ DEFINE_GUID(IID_IAuthenticate, 0x79eac9d0, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IAuthenticate : public IUnknown +interface IAuthenticate : public IUnknown { virtual HRESULT STDMETHODCALLTYPE Authenticate( HWND* phwnd, @@ -570,11 +572,7 @@ }; #else -typedef struct IAuthenticateVtbl IAuthenticateVtbl; -struct IAuthenticate { - const IAuthenticateVtbl* lpVtbl; -}; -struct IAuthenticateVtbl { +typedef struct IAuthenticateVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -597,6 +595,9 @@ LPWSTR* pszPassword); END_INTERFACE +} IAuthenticateVtbl; +interface IAuthenticate { + const IAuthenticateVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -616,8 +617,8 @@ LPWSTR* pszUsername, LPWSTR* pszPassword); void __RPC_STUB IAuthenticate_Authenticate_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -625,7 +626,7 @@ #ifndef __IHttpNegotiate_FWD_DEFINED__ #define __IHttpNegotiate_FWD_DEFINED__ -typedef struct IHttpNegotiate IHttpNegotiate; +typedef interface IHttpNegotiate IHttpNegotiate; #endif typedef IHttpNegotiate *LPHTTPNEGOTIATE; @@ -637,7 +638,7 @@ DEFINE_GUID(IID_IHttpNegotiate, 0x79eac9d2, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IHttpNegotiate : public IUnknown +interface IHttpNegotiate : public IUnknown { virtual HRESULT STDMETHODCALLTYPE BeginningTransaction( LPCWSTR szURL, @@ -653,11 +654,7 @@ }; #else -typedef struct IHttpNegotiateVtbl IHttpNegotiateVtbl; -struct IHttpNegotiate { - const IHttpNegotiateVtbl* lpVtbl; -}; -struct IHttpNegotiateVtbl { +typedef struct IHttpNegotiateVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -688,6 +685,9 @@ LPWSTR* pszAdditionalRequestHeaders); END_INTERFACE +} IHttpNegotiateVtbl; +interface IHttpNegotiate { + const IHttpNegotiateVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -709,8 +709,8 @@ DWORD dwReserved, LPWSTR* pszAdditionalHeaders); void __RPC_STUB IHttpNegotiate_BeginningTransaction_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IHttpNegotiate_OnResponse_Proxy( @@ -720,8 +720,8 @@ LPCWSTR szRequestHeaders, LPWSTR* pszAdditionalRequestHeaders); void __RPC_STUB IHttpNegotiate_OnResponse_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -729,7 +729,7 @@ #ifndef __IHttpNegotiate2_FWD_DEFINED__ #define __IHttpNegotiate2_FWD_DEFINED__ -typedef struct IHttpNegotiate2 IHttpNegotiate2; +typedef interface IHttpNegotiate2 IHttpNegotiate2; #endif typedef IHttpNegotiate2 *LPHTTPNEGOTIATE2; @@ -741,7 +741,7 @@ DEFINE_GUID(IID_IHttpNegotiate2, 0x4f9f9fcb, 0xe0f4, 0x48eb, 0xb7,0xab, 0xfa,0x2e,0xa9,0x36,0x5c,0xb4); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IHttpNegotiate2 : public IHttpNegotiate +interface IHttpNegotiate2 : public IHttpNegotiate { virtual HRESULT STDMETHODCALLTYPE GetRootSecurityId( BYTE* pbSecurityId, @@ -750,11 +750,7 @@ }; #else -typedef struct IHttpNegotiate2Vtbl IHttpNegotiate2Vtbl; -struct IHttpNegotiate2 { - const IHttpNegotiate2Vtbl* lpVtbl; -}; -struct IHttpNegotiate2Vtbl { +typedef struct IHttpNegotiate2Vtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -792,6 +788,9 @@ DWORD_PTR dwReserved); END_INTERFACE +} IHttpNegotiate2Vtbl; +interface IHttpNegotiate2 { + const IHttpNegotiate2Vtbl* lpVtbl; }; #ifdef COBJMACROS @@ -814,8 +813,8 @@ DWORD* pcbSecurityId, DWORD_PTR dwReserved); void __RPC_STUB IHttpNegotiate2_GetRootSecurityId_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -825,7 +824,7 @@ #define SID_SBindHost IID_IBindHost #ifndef __IBindHost_FWD_DEFINED__ #define __IBindHost_FWD_DEFINED__ -typedef struct IBindHost IBindHost; +typedef interface IBindHost IBindHost; #endif typedef IBindHost *LPBINDHOST; @@ -837,7 +836,7 @@ DEFINE_GUID(IID_IBindHost, 0xfc4801a1, 0x2ba9, 0x11cf, 0xa2,0x29, 0x00,0xaa,0x00,0x3d,0x73,0x52); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IBindHost : public IUnknown +interface IBindHost : public IUnknown { virtual HRESULT STDMETHODCALLTYPE CreateMoniker( LPOLESTR szName, @@ -861,11 +860,7 @@ }; #else -typedef struct IBindHostVtbl IBindHostVtbl; -struct IBindHost { - const IBindHostVtbl* lpVtbl; -}; -struct IBindHostVtbl { +typedef struct IBindHostVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -905,6 +900,9 @@ void** ppvObj); END_INTERFACE +} IBindHostVtbl; +interface IBindHost { + const IBindHostVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -927,8 +925,8 @@ IMoniker** ppmk, DWORD dwReserved); void __RPC_STUB IBindHost_CreateMoniker_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindHost_RemoteMonikerBindToStorage_Proxy( @@ -939,8 +937,8 @@ REFIID riid, IUnknown** ppvObj); void __RPC_STUB IBindHost_RemoteMonikerBindToStorage_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy( @@ -965,8 +963,8 @@ REFIID riid, IUnknown** ppvObj); void __RPC_STUB IBindHost_RemoteMonikerBindToObject_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy( @@ -988,7 +986,7 @@ #ifndef __IWinInetInfo_FWD_DEFINED__ #define __IWinInetInfo_FWD_DEFINED__ -typedef struct IWinInetInfo IWinInetInfo; +typedef interface IWinInetInfo IWinInetInfo; #endif typedef IWinInetInfo *LPWININETINFO; @@ -1000,7 +998,7 @@ DEFINE_GUID(IID_IWinInetInfo, 0x79eac9d6, 0xbafa, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IWinInetInfo : public IUnknown +interface IWinInetInfo : public IUnknown { virtual HRESULT STDMETHODCALLTYPE QueryOption( DWORD dwOption, @@ -1009,11 +1007,7 @@ }; #else -typedef struct IWinInetInfoVtbl IWinInetInfoVtbl; -struct IWinInetInfo { - const IWinInetInfoVtbl* lpVtbl; -}; -struct IWinInetInfoVtbl { +typedef struct IWinInetInfoVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1036,6 +1030,9 @@ DWORD* pcbBuf); END_INTERFACE +} IWinInetInfoVtbl; +interface IWinInetInfo { + const IWinInetInfoVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1055,8 +1052,8 @@ BYTE* pBuffer, DWORD* pcbBuf); void __RPC_STUB IWinInetInfo_RemoteQueryOption_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IWinInetInfo_QueryOption_Proxy( @@ -1074,7 +1071,7 @@ #ifndef __IWinInetHttpInfo_FWD_DEFINED__ #define __IWinInetHttpInfo_FWD_DEFINED__ -typedef struct IWinInetHttpInfo IWinInetHttpInfo; +typedef interface IWinInetHttpInfo IWinInetHttpInfo; #endif typedef IWinInetHttpInfo *LPWININETHTTPINFO; @@ -1086,7 +1083,7 @@ DEFINE_GUID(IID_IWinInetHttpInfo, 0x79eac9d8, 0xbafa, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IWinInetHttpInfo : public IWinInetInfo +interface IWinInetHttpInfo : public IWinInetInfo { virtual HRESULT STDMETHODCALLTYPE QueryInfo( DWORD dwOption, @@ -1097,11 +1094,7 @@ }; #else -typedef struct IWinInetHttpInfoVtbl IWinInetHttpInfoVtbl; -struct IWinInetHttpInfo { - const IWinInetHttpInfoVtbl* lpVtbl; -}; -struct IWinInetHttpInfoVtbl { +typedef struct IWinInetHttpInfoVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1133,6 +1126,9 @@ DWORD* pdwReserved); END_INTERFACE +} IWinInetHttpInfoVtbl; +interface IWinInetHttpInfo { + const IWinInetHttpInfoVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1156,8 +1152,8 @@ DWORD* pdwFlags, DWORD* pdwReserved); void __RPC_STUB IWinInetHttpInfo_RemoteQueryInfo_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy( @@ -1179,7 +1175,7 @@ #ifndef __IPersistMoniker_FWD_DEFINED__ #define __IPersistMoniker_FWD_DEFINED__ -typedef struct IPersistMoniker IPersistMoniker; +typedef interface IPersistMoniker IPersistMoniker; #endif typedef IPersistMoniker *LPPERSISTMONIKER; @@ -1191,7 +1187,7 @@ DEFINE_GUID(IID_IPersistMoniker, 0x79eac9c9, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IPersistMoniker : public IUnknown +interface IPersistMoniker : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetClassID( CLSID* pClassID) = 0; @@ -1219,11 +1215,7 @@ }; #else -typedef struct IPersistMonikerVtbl IPersistMonikerVtbl; -struct IPersistMoniker { - const IPersistMonikerVtbl* lpVtbl; -}; -struct IPersistMonikerVtbl { +typedef struct IPersistMonikerVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1269,6 +1261,9 @@ IMoniker** ppimkName); END_INTERFACE +} IPersistMonikerVtbl; +interface IPersistMoniker { + const IPersistMonikerVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1291,15 +1286,15 @@ IPersistMoniker* This, CLSID* pClassID); void __RPC_STUB IPersistMoniker_GetClassID_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMoniker_IsDirty_Proxy( IPersistMoniker* This); void __RPC_STUB IPersistMoniker_IsDirty_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMoniker_Load_Proxy( @@ -1309,8 +1304,8 @@ LPBC pibc, DWORD grfMode); void __RPC_STUB IPersistMoniker_Load_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMoniker_Save_Proxy( @@ -1319,8 +1314,8 @@ LPBC pbc, BOOL fRemember); void __RPC_STUB IPersistMoniker_Save_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMoniker_SaveCompleted_Proxy( @@ -1328,16 +1323,16 @@ IMoniker* pimkName, LPBC pibc); void __RPC_STUB IPersistMoniker_SaveCompleted_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IPersistMoniker_GetCurMoniker_Proxy( IPersistMoniker* This, IMoniker** ppimkName); void __RPC_STUB IPersistMoniker_GetCurMoniker_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -1345,7 +1340,7 @@ #ifndef __IMonikerProp_FWD_DEFINED__ #define __IMonikerProp_FWD_DEFINED__ -typedef struct IMonikerProp IMonikerProp; +typedef interface IMonikerProp IMonikerProp; #endif typedef IMonikerProp *LPMONIKERPROP; @@ -1361,7 +1356,7 @@ DEFINE_GUID(IID_IMonikerProp, 0xa5ca5f7f, 0x1847, 0x4d87, 0x9c,0x5b, 0x91,0x85,0x09,0xf7,0x51,0x1d); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IMonikerProp : public IUnknown +interface IMonikerProp : public IUnknown { virtual HRESULT STDMETHODCALLTYPE PutProperty( MONIKERPROPERTY mkp, @@ -1369,11 +1364,7 @@ }; #else -typedef struct IMonikerPropVtbl IMonikerPropVtbl; -struct IMonikerProp { - const IMonikerPropVtbl* lpVtbl; -}; -struct IMonikerPropVtbl { +typedef struct IMonikerPropVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1395,6 +1386,9 @@ LPCWSTR val); END_INTERFACE +} IMonikerPropVtbl; +interface IMonikerProp { + const IMonikerPropVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1413,8 +1407,8 @@ MONIKERPROPERTY mkp, LPCWSTR val); void __RPC_STUB IMonikerProp_PutProperty_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -1422,7 +1416,7 @@ #ifndef __IInternetBindInfo_FWD_DEFINED__ #define __IInternetBindInfo_FWD_DEFINED__ -typedef struct IInternetBindInfo IInternetBindInfo; +typedef interface IInternetBindInfo IInternetBindInfo; #endif typedef IInternetBindInfo *LPIINTERNETBINDINFO; @@ -1453,7 +1447,7 @@ DEFINE_GUID(IID_IInternetBindInfo, 0x79eac9e1, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IInternetBindInfo : public IUnknown +interface IInternetBindInfo : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetBindInfo( DWORD* grfBINDF, @@ -1467,11 +1461,7 @@ }; #else -typedef struct IInternetBindInfoVtbl IInternetBindInfoVtbl; -struct IInternetBindInfo { - const IInternetBindInfoVtbl* lpVtbl; -}; -struct IInternetBindInfoVtbl { +typedef struct IInternetBindInfoVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1500,6 +1490,9 @@ ULONG* pcElFetched); END_INTERFACE +} IInternetBindInfoVtbl; +interface IInternetBindInfo { + const IInternetBindInfoVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1519,8 +1512,8 @@ DWORD* grfBINDF, BINDINFO* pbindinfo); void __RPC_STUB IInternetBindInfo_GetBindInfo_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IInternetBindInfo_GetBindString_Proxy( @@ -1530,8 +1523,8 @@ ULONG cEl, ULONG* pcElFetched); void __RPC_STUB IInternetBindInfo_GetBindString_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); @@ -1539,7 +1532,7 @@ #ifndef __IInternetPriority_FWD_DEFINED__ #define __IInternetPriority_FWD_DEFINED__ -typedef struct IInternetPriority IInternetPriority; +typedef interface IInternetPriority IInternetPriority; #endif typedef IInternetPriority *LPIINTERNETPRIORITY; @@ -1551,7 +1544,7 @@ DEFINE_GUID(IID_IInternetPriority, 0x79eac9eb, 0xbaf9, 0x11ce, 0x8c,0x82, 0x00,0xaa,0x00,0x4b,0xa9,0x0b); #if defined(__cplusplus) && !defined(CINTERFACE) -struct IInternetPriority : public IUnknown +interface IInternetPriority : public IUnknown { virtual HRESULT STDMETHODCALLTYPE SetPriority( LONG nPriority) = 0; @@ -1561,11 +1554,7 @@ }; #else -typedef struct IInternetPriorityVtbl IInternetPriorityVtbl; -struct IInternetPriority { - const IInternetPriorityVtbl* lpVtbl; -}; -struct IInternetPriorityVtbl { +typedef struct IInternetPriorityVtbl { BEGIN_INTERFACE /*** IUnknown methods ***/ @@ -1590,6 +1579,9 @@ LONG* pnPriority); END_INTERFACE +} IInternetPriorityVtbl; +interface IInternetPriority { + const IInternetPriorityVtbl* lpVtbl; }; #ifdef COBJMACROS @@ -1608,16 +1600,16 @@ IInternetPriority* This, LONG nPriority); void __RPC_STUB IInternetPriority_SetPriority_Stub( - struct IRpcStubBuffer* This, - struct IRpcChannelBuffer* pRpcChannelBuffer, + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, DWORD* pdwStubPhase); HRESULT CALLBACK IInternetPriority_GetPriority_Proxy( IInternetPriority* This, LONG* pnPriority); [truncated at 1000 lines; 906 more skipped]

1 0

[gvg] 20354: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Add some missing includes which contain used prototypes. Modified: trunk/reactos/lib/shlwapi/regstream.c _____ Modified: trunk/reactos/lib/shlwapi/regstream.c --- trunk/reactos/lib/shlwapi/regstream.c 2005-12-26 23:23:03 UTC (rev 20353) +++ trunk/reactos/lib/shlwapi/regstream.c 2005-12-26 23:24:41 UTC (rev 20354) @@ -29,6 +29,7 @@ #include "winbase.h" #include "objbase.h" #include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h"

1 0

[gvg] 20353: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Michael Jung <mjung(a)iss.tu-darmstadt.de> - shell32: Fix drag-scrolling in the shellview object. Stefan Leichter <Stefan.Leichter(a)camLine.com> - shell32: Fix return value of PathProcessCommand. Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shlview.c _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-12-26 23:20:19 UTC (rev 20352) +++ trunk/reactos/lib/shell32/shellpath.c 2005-12-26 23:23:03 UTC (rev 20353) @@ -700,7 +700,7 @@ /*********************************************************************** ** * PathProcessCommandA [SHELL32.653] */ -HRESULT WINAPI PathProcessCommandA ( +LONG WINAPI PathProcessCommandA ( LPCSTR lpszPath, LPSTR lpszBuff, DWORD dwBuffSize, @@ -708,14 +708,15 @@ { FIXME("%s %p 0x%04lx 0x%04lx stub\n", lpszPath, lpszBuff, dwBuffSize, dwFlags); - strcpy(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpy(lpszBuff, lpszPath); + return strlen(lpszPath); } /*********************************************************************** ** * PathProcessCommandW */ -HRESULT WINAPI PathProcessCommandW ( +LONG WINAPI PathProcessCommandW ( LPCWSTR lpszPath, LPWSTR lpszBuff, DWORD dwBuffSize, @@ -723,14 +724,15 @@ { FIXME("(%s, %p, 0x%04lx, 0x%04lx) stub\n", debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags); - strcpyW(lpszBuff, lpszPath); - return 0; + if(!lpszPath) return -1; + if(lpszBuff) strcpyW(lpszBuff, lpszPath); + return strlenW(lpszPath); } /*********************************************************************** ** * PathProcessCommand (SHELL32.653) */ -HRESULT WINAPI PathProcessCommandAW ( +LONG WINAPI PathProcessCommandAW ( LPCVOID lpszPath, LPVOID lpszBuff, DWORD dwBuffSize, _____ Modified: trunk/reactos/lib/shell32/shlview.c --- trunk/reactos/lib/shell32/shlview.c 2005-12-26 23:20:19 UTC (rev 20352) +++ trunk/reactos/lib/shell32/shlview.c 2005-12-26 23:23:03 UTC (rev 20353) @@ -103,7 +103,8 @@ IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ IDataObject* pCurDataObject; /* The dragged data-object */ LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ - UINT iActiveTimersMask; /* Bookkeeping of activated timers for drag scrolling */ + UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT ptLastMousePos; /* Mouse position at last DragOver call */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -197,7 +198,9 @@ sv->pCurDropTarget = NULL; sv->pCurDataObject = NULL; sv->iDragOverItem = 0; - sv->iActiveTimersMask = 0; + sv->cScrollDelay = 0; + sv->ptLastMousePos.x = 0; + sv->ptLastMousePos.y = 0; TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; @@ -2179,48 +2182,6 @@ } /*********************************************************************** ******* - * scroll_timer_proc [Internal] - * - * Timer callback function for drag&drop scrolling - */ - -#define IDT_UP 0x1u -#define IDT_DOWN 0x2u -#define IDT_LEFT 0x4u -#define IDT_RIGHT 0x8u - -VOID CALLBACK scroll_timer_proc(HWND hwnd, UINT uMsg, UINT_PTR idTimer, DWORD dwTimer) { - switch (idTimer) { - case IDT_UP: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); - break; - case IDT_DOWN: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); - break; - case IDT_LEFT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEUP, 0); - break; - case IDT_RIGHT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEDOWN, 0); - break; - } -} - -/********************************************************************** ******** - * start_stop_timer [Internal] - */ -static inline void start_stop_timer(IShellViewImpl *This, UINT_PTR idTimer, BOOL fStart) { - if (fStart && !(This->iActiveTimersMask & idTimer)) { - SetTimer(This->hWndList, idTimer, 200, scroll_timer_proc); - This->iActiveTimersMask |= idTimer; - } - if (!fStart && This->iActiveTimersMask & idTimer) { - KillTimer(This->hWndList, idTimer); - This->iActiveTimersMask &= ~idTimer; - } -} - -/********************************************************************** ******** * drag_notify_subitem [Internal] * * Figure out the shellfolder object, which is currently under the mouse cursor @@ -2246,13 +2207,28 @@ ScreenToClient(This->hWndList, &htinfo.pt); lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); - /* Start or stop the drag scrolling timers */ + /* Send WM_*SCROLL messages every 250 ms during drag-scrolling */ GetClientRect(This->hWndList, &clientRect); - start_stop_timer(This, IDT_LEFT, htinfo.pt.x < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_RIGHT, htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH); - start_stop_timer(This, IDT_UP, htinfo.pt.y < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_DOWN, htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH); - + if (htinfo.pt.x == This->ptLastMousePos.x && htinfo.pt.y == This->ptLastMousePos.y && + (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH || + htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH )) + { + This->cScrollDelay = (This->cScrollDelay + 1) % 5; /* DragOver is called every 50 ms */ + if (This->cScrollDelay == 0) { /* Mouse did hover another 250 ms over the scroll-area */ + if (htinfo.pt.x < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEUP, 0); + if (htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEDOWN, 0); + if (htinfo.pt.y < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEUP, 0); + if (htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEDOWN, 0); + } + } else { + This->cScrollDelay = 0; /* Reset, if the cursor is not over the listview's scroll-area */ + } + This->ptLastMousePos = htinfo.pt; + /* If we are still over the previous sub-item, notify it via DragOver and return. */ if (This->pCurDropTarget && lResult == This->iDragOverItem) return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); @@ -2321,11 +2297,6 @@ This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; } @@ -2342,11 +2313,6 @@ This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; }

1 0

[gvg] 20352: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> - riched20: Reset selection when text is reset. Modified: trunk/reactos/lib/riched20/editor.c _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-12-26 23:18:49 UTC (rev 20351) +++ trunk/reactos/lib/riched20/editor.c 2005-12-26 23:20:19 UTC (rev 20352) @@ -1471,6 +1471,7 @@ TRACE("WM_SETTEXT - NULL\n"); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); + ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); return 0; }

1 0

[gvg] 20351: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Robert Shearman <rob(a)codeweavers.com> - OLE: Fix SafeArrayCopy for NULL pvData. It is allowed to copy a SAFEARRAY with a NULL pvData, as long as cbElements is non-zero. Add a test for this and fix the safe array code. - OLE: Add const to several typelib functions. Add const attributes to parameters for several functions and fix up some formatting. - OleTranslateColor trace fix. OleTranslateColor isn't a stub so don't print ":stub" in the trace message. Modified: trunk/reactos/lib/oleaut32/oleaut.c Modified: trunk/reactos/lib/oleaut32/safearray.c Modified: trunk/reactos/lib/oleaut32/typelib.c _____ Modified: trunk/reactos/lib/oleaut32/oleaut.c --- trunk/reactos/lib/oleaut32/oleaut.c 2005-12-26 23:16:41 UTC (rev 20350) +++ trunk/reactos/lib/oleaut32/oleaut.c 2005-12-26 23:18:49 UTC (rev 20351) @@ -629,7 +629,7 @@ COLORREF colorref; BYTE b = HIBYTE(HIWORD(clr)); - TRACE("(%08lx, %p, %p):stub\n", clr, hpal, pColorRef); + TRACE("(%08lx, %p, %p)\n", clr, hpal, pColorRef); /* * In case pColorRef is NULL, provide our own to simplify the code. _____ Modified: trunk/reactos/lib/oleaut32/safearray.c --- trunk/reactos/lib/oleaut32/safearray.c 2005-12-26 23:16:41 UTC (rev 20350) +++ trunk/reactos/lib/oleaut32/safearray.c 2005-12-26 23:18:49 UTC (rev 20351) @@ -355,7 +355,9 @@ /* Copy data items from one array to another */ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { - if (!psa->pvData || !dest->pvData || psa->fFeatures & FADF_DATADELETED) + if (!psa->pvData) + return S_OK; + else if (!dest->pvData || psa->fFeatures & FADF_DATADELETED) return E_INVALIDARG; else { @@ -1378,6 +1380,12 @@ if (!psa) return S_OK; /* Handles copying of NULL arrays */ + if (!psa->cbElements) + { + ERR("not copying an array of 0 elements\n"); + return E_INVALIDARG; + } + if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) { VARTYPE vt; _____ Modified: trunk/reactos/lib/oleaut32/typelib.c --- trunk/reactos/lib/oleaut32/typelib.c 2005-12-26 23:16:41 UTC (rev 20350) +++ trunk/reactos/lib/oleaut32/typelib.c 2005-12-26 23:18:49 UTC (rev 20351) @@ -85,7 +85,7 @@ /* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } }; -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt); +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); /*********************************************************************** ***** @@ -5054,7 +5054,7 @@ return E_FAIL; } -static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; ITypeInfo *tinfo2 = NULL; @@ -5088,11 +5088,11 @@ break; case TKIND_INTERFACE: - if (IsEqualIID(&IID_IDispatch, &tattr->guid)) - *vt |= VT_DISPATCH; - else - *vt |= VT_UNKNOWN; - break; + if (IsEqualIID(&IID_IDispatch, &tattr->guid)) + *vt |= VT_DISPATCH; + else + *vt |= VT_UNKNOWN; + break; case TKIND_DISPATCH: *vt |= VT_DISPATCH; @@ -5118,7 +5118,7 @@ return hr; } -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; @@ -5134,7 +5134,7 @@ ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_USERDEFINED))) { VARTYPE vt_userdefined = 0; - TYPEDESC *tdesc_userdefined = tdesc; + const TYPEDESC *tdesc_userdefined = tdesc; if (tdesc->vt == VT_PTR) { vt_userdefined = VT_BYREF;

1 0

[gvg] 20350: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Michael Jung <mjung(a)iss.tu-darmstadt.de> - ole32: Periodically call IDropTarger::DragOver during Drag&Drop. Robert Shearman <rob(a)codeweavers.com> - CreateErrorInfo trace fix. CreateErrorInfo isn't a stub so don't print this in the trace message. Alexandre Julliard <julliard(a)winehq.org> - Take advantage of the __EXCEPT_PAGE_FAULT macro. - We no longer need to handle EXCEPTION_PRIV_INSTRUCTION on page faults. - ole32: Revert exception handler change. The handler does the opposite of normal page fault handlers. Ulrich Czekalla <ulrich(a)codeweavers.com> - ole32: Return error instead of asserting if storage file is corrupt. Eric Pouech <eric.pouech(a)wanadoo.fr> - Functions with no paramters must be (void). - Const correctness fixes. Modified: trunk/reactos/lib/ole32/errorinfo.c Modified: trunk/reactos/lib/ole32/ole16.c Modified: trunk/reactos/lib/ole32/ole2.c Modified: trunk/reactos/lib/ole32/rpc.c Modified: trunk/reactos/lib/ole32/stg_stream.c Modified: trunk/reactos/lib/ole32/storage32.c Modified: trunk/reactos/lib/ole32/storage32.h Modified: trunk/reactos/w32api/include/winerror.h _____ Modified: trunk/reactos/lib/ole32/errorinfo.c --- trunk/reactos/lib/ole32/errorinfo.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/errorinfo.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -476,7 +476,7 @@ { IErrorInfo * pei; HRESULT res; - TRACE("(%p): stub:\n", pperrinfo); + TRACE("(%p)\n", pperrinfo); if(! pperrinfo ) return E_INVALIDARG; if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY; _____ Modified: trunk/reactos/lib/ole32/ole16.c --- trunk/reactos/lib/ole32/ole16.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/ole16.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -144,7 +144,7 @@ /*********************************************************************** ******* * IMalloc16_GetSize [COMPOBJ.506] */ -DWORD IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv) +DWORD IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->GetSize(%08lx)\n",This,pv); @@ -154,7 +154,7 @@ /*********************************************************************** ******* * IMalloc16_DidAlloc [COMPOBJ.507] */ -INT16 IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) { +INT16 IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { IMalloc16 *This = (IMalloc16 *)iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; @@ -173,7 +173,7 @@ * IMalloc16_Constructor [VTABLE] */ LPMALLOC16 -IMalloc16_Constructor() +IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16; static SEGPTR msegvt16; _____ Modified: trunk/reactos/lib/ole32/ole2.c --- trunk/reactos/lib/ole32/ole2.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/ole2.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -79,6 +79,8 @@ HWND curTargetHWND; /* window the mouse is hovering over */ HWND curDragTargetHWND; /* might be a ancestor of curTargetHWND */ IDropTarget* curDragTarget; + POINTL curMousePos; /* current position of the mouse in screen coordinates */ + DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ } TrackerWindowInfo; typedef struct tagOleMenuDescriptor /* OleMenuDescriptor */ @@ -158,13 +160,9 @@ WPARAM wParam, LPARAM lParam); static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static DWORD OLEDD_GetButtonState(void); @@ -533,6 +531,10 @@ */ while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) ) { + trackerInfo.curMousePos.x = msg.pt.x; + trackerInfo.curMousePos.y = msg.pt.y; + trackerInfo.dwKeyState = OLEDD_GetButtonState(); + if ( (msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST) ) { @@ -551,9 +553,7 @@ /* * Notify the drop source. */ - OLEDD_TrackStateChange(&trackerInfo, - msg.pt, - OLEDD_GetButtonState()); + OLEDD_TrackStateChange(&trackerInfo); } else { @@ -2033,6 +2033,9 @@ * to receive the user input and act upon it. This procedure is in charge * of this behavior. */ + +#define DRAG_TIMER_ID 1 + static LRESULT WINAPI OLEDD_DragTrackerWindowProc( HWND hwnd, UINT uMsg, @@ -2046,27 +2049,14 @@ LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); + SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); - break; } + case WM_TIMER: case WM_MOUSEMOVE: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Track the movement of the mouse. - */ - OLEDD_TrackMouseMove(trackerInfo, mousePos, wParam); - + OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); break; } case WM_LBUTTONUP: @@ -2076,24 +2066,14 @@ case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Notify everyone that the button state changed - * TODO: Check if the "escape" key was pressed. - */ - OLEDD_TrackStateChange(trackerInfo, mousePos, wParam); - + OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); break; } + case WM_DESTROY: + { + KillTimer(hwnd, DRAG_TIMER_ID); + break; + } } /* @@ -2114,23 +2094,19 @@ * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; HRESULT hr = S_OK; + POINT pt; /* * Get the handle of the window under the mouse */ - hwndNewTarget = WindowFromPoint(mousePos); + pt.x = trackerInfo->curMousePos.x; + pt.y = trackerInfo->curMousePos.y; + hwndNewTarget = WindowFromPoint(pt); /* * Every time, we re-initialize the effects passed to the @@ -2145,19 +2121,9 @@ if ( (trackerInfo->curDragTarget != 0) && (trackerInfo->curTargetHWND == hwndNewTarget) ) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragOver(trackerInfo->curDragTarget, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } else @@ -2197,20 +2163,10 @@ */ if (trackerInfo->curDragTarget!=0) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragEnter(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } } @@ -2276,15 +2232,8 @@ * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { /* * Ask the drop source what to do with the operation. @@ -2292,7 +2241,7 @@ trackerInfo->returnValue = IDropSource_QueryContinueDrag( trackerInfo->dropSource, trackerInfo->escPressed, - keyState); + trackerInfo->dwKeyState); /* * All the return valued will stop the operation except the S_OK @@ -2325,20 +2274,10 @@ */ case DRAGDROP_S_DROP: { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be - * in the target window's coordinate space. However, the tests - * I made tell me the coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); break; } _____ Modified: trunk/reactos/lib/ole32/rpc.c --- trunk/reactos/lib/ole32/rpc.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/rpc.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -112,8 +112,7 @@ static WINE_EXCEPTION_FILTER(ole_filter) { - if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION || - GetExceptionCode() == EXCEPTION_PRIV_INSTRUCTION) + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_EXECUTE_HANDLER; } _____ Modified: trunk/reactos/lib/ole32/stg_stream.c --- trunk/reactos/lib/ole32/stg_stream.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/stg_stream.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -273,7 +273,7 @@ */ if (This->smallBlockChain!=0) { - SmallBlockChainStream_ReadAt(This->smallBlockChain, + res = SmallBlockChainStream_ReadAt(This->smallBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -282,7 +282,7 @@ } else if (This->bigBlockChain!=0) { - BlockChainStream_ReadAt(This->bigBlockChain, + res = BlockChainStream_ReadAt(This->bigBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -300,30 +300,19 @@ goto end; } - /* - * We should always be able to read the proper amount of data from the - * chain. - */ - assert(bytesToReadFromBuffer == *pcbRead); - - /* - * Advance the pointer for the number of positions read. - */ - This->currentPosition.u.LowPart += *pcbRead; - - if(*pcbRead != cb) + if (SUCCEEDED(res)) { - WARN("read %ld instead of the required %ld bytes !\n", *pcbRead, cb); - /* - * this used to return S_FALSE, however MSDN docu says that an app should - * be prepared to handle error in case of stream end reached, as *some* - * implementations *might* return an error (IOW: most do *not*). - * As some program fails on returning S_FALSE, I better use S_OK here. - */ - res = S_OK; + /* + * We should always be able to read the proper amount of data from the + * chain. + */ + assert(bytesToReadFromBuffer == *pcbRead); + + /* + * Advance the pointer for the number of positions read. + */ + This->currentPosition.u.LowPart += *pcbRead; } - else - res = S_OK; end: TRACE("<-- %08lx\n", res); _____ Modified: trunk/reactos/lib/ole32/storage32.c --- trunk/reactos/lib/ole32/storage32.c 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/storage32.c 2005-12-26 23:16:41 UTC (rev 20350) @@ -3414,7 +3414,8 @@ ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; ULONG propertyIndex; - BOOL successRead, successWrite; + BOOL successWrite; + HRESULT successRead; StgProperty chainProperty; BYTE *buffer; BlockChainStream *bbTempChain = NULL; @@ -3463,7 +3464,7 @@ offset.u.LowPart += This->smallBlockSize; - } while (successRead && successWrite); + } while (SUCCEEDED(successRead) && successWrite); HeapFree(GetProcessHeap(),0,buffer); assert(cbTotalRead == cbTotalWritten); @@ -4397,6 +4398,9 @@ blockNoInSequence--; } + if ((blockNoInSequence > 0) && (blockIndex == BLOCK_END_OF_CHAIN)) + return FALSE; /* We failed to find the starting block */ + This->lastBlockNoInSequenceIndex = blockIndex; /* @@ -5098,13 +5102,14 @@ * bytesRead may be NULL. * Failure will be returned if the specified number of bytes has not been read. */ -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, void* buffer, ULONG* bytesRead) { + HRESULT rc = S_OK; ULARGE_INTEGER offsetInBigBlockFile; ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->smallBlockSize; @@ -5127,9 +5132,9 @@ while ( (blockNoInSequence > 0) && (blockIndex != BLOCK_END_OF_CHAIN)) { - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; blockNoInSequence--; } @@ -5158,27 +5163,32 @@ /* * Read those bytes in the buffer from the small block file. + * The small block has already been identified so it shouldn't fail + * unless the file is corrupt. */ - BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, + if (!BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, offsetInBigBlockFile, bytesToReadInBuffer, bufferWalker, - &bytesReadFromBigBlockFile); + &bytesReadFromBigBlockFile)) + return STG_E_DOCFILECORRUPT; assert(bytesReadFromBigBlockFile == bytesToReadInBuffer); /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; + bufferWalker += bytesToReadInBuffer; size -= bytesToReadInBuffer; *bytesRead += bytesToReadInBuffer; offsetInBlock = 0; /* There is no offset on the next block */ } - return (size == 0); + return rc; } /*********************************************************************** ******* _____ Modified: trunk/reactos/lib/ole32/storage32.h --- trunk/reactos/lib/ole32/storage32.h 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/lib/ole32/storage32.h 2005-12-26 23:16:41 UTC (rev 20350) @@ -667,7 +667,7 @@ ULONG SmallBlockChainStream_GetNextFreeBlock( SmallBlockChainStream* This); -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, _____ Modified: trunk/reactos/w32api/include/winerror.h --- trunk/reactos/w32api/include/winerror.h 2005-12-26 23:10:21 UTC (rev 20349) +++ trunk/reactos/w32api/include/winerror.h 2005-12-26 23:16:41 UTC (rev 20350) @@ -2183,6 +2183,7 @@ #define STG_E_SHAREREQUIRED _HRESULT_TYPEDEF_(0x80030106L) #define STG_E_NOTFILEBASEDSTORAGE _HRESULT_TYPEDEF_(0x80030107L) #define STG_E_EXTANTMARSHALLINGS _HRESULT_TYPEDEF_(0x80030108L) +#define STG_E_DOCFILECORRUPT _HRESULT_TYPEDEF_(0x80030109L) #define STG_E_STATUS_COPY_PROTECTION_FAILURE _HRESULT_TYPEDEF_(0x80030305L) #define STG_E_CSS_AUTHENTICATION_FAILURE _HRESULT_TYPEDEF_(0x80030306L)

1 0

[gvg] 20349: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Magnus Olsen <magnus(a)itkonsult-olsen.com> - msi: Fixed deformat_environment to not cut off string. Bill Medland <billmedland(a)mercuryspeed.com> - msi: Use a default dialog font if nothing is specified. - msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer. Modified: trunk/reactos/lib/msi/dialog.c Modified: trunk/reactos/lib/msi/format.c _____ Modified: trunk/reactos/lib/msi/dialog.c --- trunk/reactos/lib/msi/dialog.c 2005-12-26 23:08:49 UTC (rev 20348) +++ trunk/reactos/lib/msi/dialog.c 2005-12-26 23:10:21 UTC (rev 20349) @@ -1618,6 +1618,8 @@ { static const WCHAR df[] = { 'D','e','f','a','u','l','t','U','I','F','o','n','t',0 }; + static const WCHAR dfv[] = { + 'M','S',' ','S','h','e','l','l',' ','D','l','g',0 }; msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams; MSIRECORD *rec = NULL; LPWSTR title = NULL; @@ -1644,6 +1646,11 @@ dialog->attributes = MSI_RecordGetInteger( rec, 6 ); dialog->default_font = msi_dup_property( dialog->package, df ); + if (!dialog->default_font) + { + dialog->default_font = strdupW(dfv); + if (!dialog->default_font) return -1; + } title = msi_get_deformatted_field( dialog->package, rec, 7 ); SetWindowTextW( hwnd, title ); _____ Modified: trunk/reactos/lib/msi/format.c --- trunk/reactos/lib/msi/format.c 2005-12-26 23:08:49 UTC (rev 20348) +++ trunk/reactos/lib/msi/format.c 2005-12-26 23:10:21 UTC (rev 20349) @@ -639,10 +639,15 @@ len = deformat_string_internal(package,rec,&deformated,strlenW(rec), record, NULL); + /* If len is zero then WideCharToMultiByte will return 0 indicating + * failure, but that will do just as well since we are ignoring + * possible errors. + */ lenA = WideCharToMultiByte(CP_ACP,0,deformated,len,NULL,0,NULL,NULL); if (buffer) { + /* Ditto above */ WideCharToMultiByte(CP_ACP,0,deformated,len,buffer,*size,NULL, NULL); if (*size>lenA) { @@ -652,7 +657,8 @@ else { rc = ERROR_MORE_DATA; - buffer[(*size)-1] = 0; + if (*size) + buffer[(*size)-1] = 0; } } else

1 0

[gvg] 20348: Sync to Wine-0_9_4:
by gvg＠svn.reactos.com 26 Dec '05

26 Dec '05

Sync to Wine-0_9_4: Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Add some missing includes which contain used prototypes. Modified: trunk/reactos/lib/mpr/mpr_main.c _____ Modified: trunk/reactos/lib/mpr/mpr_main.c --- trunk/reactos/lib/mpr/mpr_main.c 2005-12-26 23:05:15 UTC (rev 20347) +++ trunk/reactos/lib/mpr/mpr_main.c 2005-12-26 23:08:49 UTC (rev 20348) @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "objbase.h" #include "winnetwk.h" #include "wine/debug.h" #include "wnetpriv.h"

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