Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 38823: add new file
by gedmurphy＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: gedmurphy Date: Sat Jan 17 10:48:52 2009 New Revision: 38823 URL: http://svn.reactos.org/svn/reactos?rev=38823&view=rev Log: add new file Added: trunk/reactos/dll/win32/comctl32/theme_button.c (with props) Added: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c (added) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Sat Jan 17 10:48:52 2009 @@ -1,0 +1,317 @@ +/* + * Theming - Button control + * + * Copyright (c) 2008 by Reece H. Dunn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <string.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "tmschema.h" +#include "comctl32.h" + +#define BUTTON_TYPE 0x0f /* bit mask for the available button types */ + +/* These are indices into a states array to determine the theme state for a given theme part. */ +typedef enum +{ + STATE_NORMAL, + STATE_DISABLED, + STATE_HOT, + STATE_PRESSED, + STATE_DEFAULTED +} ButtonState; + +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags); + +static UINT get_drawtext_flags(DWORD style, DWORD ex_style) +{ + UINT flags = 0; + + if (style & BS_PUSHLIKE) + style &= ~BUTTON_TYPE; + + if (!(style & BS_MULTILINE)) + flags |= DT_SINGLELINE; + else + flags |= DT_WORDBREAK; + + switch (style & BS_CENTER) + { + case BS_LEFT: flags |= DT_LEFT; break; + case BS_RIGHT: flags |= DT_RIGHT; break; + case BS_CENTER: flags |= DT_CENTER; break; + default: + flags |= ((style & BUTTON_TYPE) <= BS_DEFPUSHBUTTON) + ? DT_CENTER : DT_LEFT; + } + + if (ex_style & WS_EX_RIGHT) + flags = DT_RIGHT | (flags & ~(DT_LEFT | DT_CENTER)); + + if ((style & BUTTON_TYPE) != BS_GROUPBOX) + { + switch (style & BS_VCENTER) + { + case BS_TOP: flags |= DT_TOP; break; + case BS_BOTTOM: flags |= DT_BOTTOM; break; + case BS_VCENTER: /* fall through */ + default: flags |= DT_VCENTER; break; + } + } + else + /* GroupBox's text is always single line and is top aligned. */ + flags |= DT_SINGLELINE | DT_TOP; + + return flags; +} + +static inline WCHAR *get_button_text(HWND hwnd) +{ + INT len = 512; + WCHAR *text; + text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (text) InternalGetWindowText(hwnd, text, len + 1); + return text; +} + +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +{ + static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + + RECT bgRect, textRect; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + int state = states[ drawState ]; + WCHAR *text = get_button_text(hwnd); + + GetClientRect(hwnd, &bgRect); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); + if (text) + { + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } + + if (hPrevFont) SelectObject(hDC, hPrevFont); +} + +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +{ + static const int cb_states[3][5] = + { + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } + }; + + static const int rb_states[2][5] = + { + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } + }; + + static const int cb_size = 13; + + RECT bgRect, textRect; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) + ? BP_RADIOBUTTON + : BP_CHECKBOX; + int state = (part == BP_CHECKBOX) + ? cb_states[ checkState ][ drawState ] + : rb_states[ checkState ][ drawState ]; + WCHAR *text = get_button_text(hwnd); + + GetClientRect(hwnd, &bgRect); + GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); + + if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ + bgRect.top = bgRect.top + (textRect.bottom - textRect.top - cb_size) / 2; + + /* adjust for the check/radio marker */ + bgRect.bottom = bgRect.top + cb_size; + bgRect.right = bgRect.left + cb_size; + textRect.left = bgRect.right + 6; + + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); + if (text) + { + DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } + + if (hPrevFont) SelectObject(hDC, hPrevFont); +} + +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +{ + static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + + RECT bgRect, textRect, contentRect; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + int state = states[ drawState ]; + WCHAR *text = get_button_text(hwnd); + + GetClientRect(hwnd, &bgRect); + textRect = bgRect; + + if (text) + { + SIZE textExtent; + GetTextExtentPoint32W(hDC, text, lstrlenW(text), &textExtent); + bgRect.top += (textExtent.cy / 2); + textRect.left += 10; + textRect.bottom = textRect.top + textExtent.cy; + textRect.right = textRect.left + textExtent.cx + 4; + + ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + } + + GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); + ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); + + SelectClipRgn(hDC, NULL); + + if (text) + { + textRect.left += 2; + textRect.right -= 2; + DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } + + if (hPrevFont) SelectObject(hDC, hPrevFont); +} + +static const pfThemedPaint btnThemedPaintFunc[BUTTON_TYPE + 1] = +{ + PB_draw, /* BS_PUSHBUTTON */ + PB_draw, /* BS_DEFPUSHBUTTON */ + CB_draw, /* BS_CHECKBOX */ + CB_draw, /* BS_AUTOCHECKBOX */ + CB_draw, /* BS_RADIOBUTTON */ + CB_draw, /* BS_3STATE */ + CB_draw, /* BS_AUTO3STATE */ + GB_draw, /* BS_GROUPBOX */ + NULL, /* BS_USERBUTTON */ + CB_draw, /* BS_AUTORADIOBUTTON */ + NULL, /* Not defined */ + NULL, /* BS_OWNERDRAW */ + NULL, /* Not defined */ + NULL, /* Not defined */ + NULL, /* Not defined */ + NULL, /* Not defined */ +}; + +static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) +{ + PAINTSTRUCT ps; + HDC hDC; + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); + UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); + ButtonState drawState = IsWindowEnabled(hwnd) ? STATE_NORMAL : STATE_DISABLED; + pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; + + if (paint) + { + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + paint(theme, hwnd, hDC, drawState, dtFlags); + if (!hParamDC) EndPaint(hwnd, &ps); + return TRUE; + } + + return FALSE; /* Delegate drawing to the non-themed code. */ +} + +/********************************************************************** + * The button control subclass window proc. + */ +LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, + ULONG_PTR dwRefData) +{ + const WCHAR* themeClass = WC_BUTTONW; + HTHEME theme; + LRESULT result; + + switch (msg) + { + case WM_CREATE: + result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + OpenThemeData(hwnd, themeClass); + return result; + + case WM_DESTROY: + theme = GetWindowTheme(hwnd); + CloseThemeData (theme); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme(hwnd); + CloseThemeData (theme); + OpenThemeData(hwnd, themeClass); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + case WM_PAINT: + theme = GetWindowTheme(hwnd); + if (theme && BUTTON_Paint(theme, hwnd, (HDC)wParam)) + return 0; + else + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_ENABLE: + theme = GetWindowTheme(hwnd); + if (theme) RedrawWindow(hwnd, NULL, NULL, + RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + default: + /* Call old proc */ + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + } + return 0; +} Propchange: trunk/reactos/dll/win32/comctl32/theme_button.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 38822: update comctl32 to Wine 1.1.13. not including ros specific stuff for now while I work out what we still need
by gedmurphy＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: gedmurphy Date: Sat Jan 17 10:43:06 2009 New Revision: 38822 URL: http://svn.reactos.org/svn/reactos?rev=38822&view=rev Log: update comctl32 to Wine 1.1.13. not including ros specific stuff for now while I work out what we still need Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/flatsb.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/nativefont.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… Modified: trunk/reactos/dll/win32/comctl32/flatsb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/flatsb.… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… Modified: trunk/reactos/dll/win32/comctl32/nativefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/nativef… Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.…

1 0

[gedmurphy] 38821: Add some previously undocumented messages
by gedmurphy＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: gedmurphy Date: Sat Jan 17 10:23:02 2009 New Revision: 38821 URL: http://svn.reactos.org/svn/reactos?rev=38821&view=rev Log: Add some previously undocumented messages Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Jan 17 10:23:02 2009 @@ -1213,10 +1213,10 @@ /* undocumented messages in Toolbar */ #define TB_UNKWN45D (WM_USER+93) -#define TB_UNKWN45E (WM_USER+94) -#define TB_UNKWN460 (WM_USER+96) -#define TB_UNKWN462 (WM_USER+98) -#define TB_UNKWN463 (WM_USER+99) +#define TB_SETHOTITEM2 (WM_USER+94) +#define TB_SETLISTGAP (WM_USER+96) +#define TB_GETIMAGELISTCOUNT (WM_USER+98) +#define TB_GETIDEALSIZE (WM_USER+99) #define TB_UNKWN464 (WM_USER+100) #define TB_GETMETRICS (WM_USER+101)

1 0

[dchapyshev] 38820: - Implement GUIDFromStringW. Based on http://www.winehq.org/pipermail/wine-cvs/2009-January/051920.html
by dchapyshev＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dchapyshev Date: Sat Jan 17 09:47:50 2009 New Revision: 38820 URL: http://svn.reactos.org/svn/reactos?rev=38820&view=rev Log: - Implement GUIDFromStringW. Based on http://www.winehq.org/pipermail/wine-cvs/2009-January/051920.html Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sat Jan 17 09:47:50 2009 @@ -255,6 +255,7 @@ 660 stdcall -noname FileIconInit(long) 680 stdcall IsUserAnAdmin() 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) + 704 stdcall -noname GUIDFromStringW(wstr ptr) 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW 730 stdcall RestartDialogEx(long wstr long long) Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Sat Jan 17 09:47:50 2009 @@ -33,6 +33,7 @@ #include "winreg.h" #include "wine/debug.h" #include "winnls.h" +#include "winternl.h" #include "shellapi.h" #include "objbase.h" @@ -1573,6 +1574,17 @@ BOOL WINAPI shell32_243(DWORD a, DWORD b) { return FALSE; +} + +/************************************************************************* + * GUIDFromStringW [SHELL32.704] + */ +BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) +{ + UNICODE_STRING guid_str; + + RtlInitUnicodeString(&guid_str, str); + return !RtlGUIDFromString(&guid_str, guid); } /*************************************************************************

1 0

[dchapyshev] 38819: - Implement AllocateUserPhysicalPages, FreeUserPhysicalPages, MapUserPhysicalPages, MapUserPhysicalPagesScatter, ResetWriteWatch - Fix return value for CreateSocketHandle - Fix arguments for DelayLoadFailureHook (see http://msdn.microsoft.com/en-us/library/bb432244(VS.85).aspx)
by dchapyshev＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dchapyshev Date: Sat Jan 17 09:27:35 2009 New Revision: 38819 URL: http://svn.reactos.org/svn/reactos?rev=38819&view=rev Log: - Implement AllocateUserPhysicalPages, FreeUserPhysicalPages, MapUserPhysicalPages, MapUserPhysicalPagesScatter, ResetWriteWatch - Fix return value for CreateSocketHandle - Fix arguments for DelayLoadFailureHook (see http://msdn.microsoft.com/en-us/library/bb432244(VS.85).aspx) Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Sat Jan 17 09:27:35 2009 @@ -289,11 +289,140 @@ if (!NT_SUCCESS(Status)) { - SetLastError(RtlNtStatusToDosError(Status)); + SetLastErrorByStatus(Status); return -1; } return 0; } +/* + * @implemented + */ +UINT +WINAPI +ResetWriteWatch( + LPVOID lpBaseAddress, + SIZE_T dwRegionSize + ) +{ + NTSTATUS Status; + + Status = NtResetWriteWatch(NtCurrentProcess(), + lpBaseAddress, + dwRegionSize); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return -1; + } + + return 0; +} + +/* + * @implemented + */ +BOOL +WINAPI +AllocateUserPhysicalPages( + HANDLE hProcess, + PULONG_PTR NumberOfPages, + PULONG_PTR UserPfnArray + ) +{ + NTSTATUS Status; + + Status = NtAllocateUserPhysicalPages(hProcess, + NumberOfPages, + UserPfnArray); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +FreeUserPhysicalPages( + HANDLE hProcess, + PULONG_PTR NumberOfPages, + PULONG_PTR PageArray + ) +{ + NTSTATUS Status; + + Status = NtFreeUserPhysicalPages(hProcess, + NumberOfPages, + PageArray); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +MapUserPhysicalPages( + PVOID VirtualAddress, + ULONG_PTR NumberOfPages, + PULONG_PTR PageArray OPTIONAL + ) +{ + NTSTATUS Status; + + Status = NtMapUserPhysicalPages(VirtualAddress, + NumberOfPages, + PageArray); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +MapUserPhysicalPagesScatter( + PVOID *VirtualAddresses, + ULONG_PTR NumberOfPages, + PULONG_PTR PageArray OPTIONAL + ) +{ + NTSTATUS Status; + + Status = NtMapUserPhysicalPagesScatter(VirtualAddresses, + NumberOfPages, + PageArray); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; +} + /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sat Jan 17 09:27:35 2009 @@ -293,21 +293,6 @@ } /* - * @unimplemented - */ -BOOL -WINAPI -AllocateUserPhysicalPages( - HANDLE hProcess, - PULONG_PTR NumberOfPages, - PULONG_PTR UserPfnArray - ) -{ - STUB; - return 0; -} - -/* * @implemented */ BOOL @@ -359,22 +344,6 @@ STUB; return 0; } - -/* - * @unimplemented - */ -BOOL -WINAPI -FreeUserPhysicalPages( - HANDLE hProcess, - PULONG_PTR NumberOfPages, - PULONG_PTR PageArray - ) -{ - STUB; - return 0; -} - /* * @unimplemented @@ -444,36 +413,6 @@ HEAP_INFORMATION_CLASS HeapInformationClass, PVOID HeapInformation OPTIONAL, SIZE_T HeapInformationLength OPTIONAL - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -MapUserPhysicalPages( - PVOID VirtualAddress, - ULONG_PTR NumberOfPages, - PULONG_PTR PageArray OPTIONAL - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -MapUserPhysicalPagesScatter( - PVOID *VirtualAddresses, - ULONG_PTR NumberOfPages, - PULONG_PTR PageArray OPTIONAL ) { STUB; @@ -529,20 +468,6 @@ WINAPI RemoveVectoredExceptionHandler( PVOID VectoredHandlerHandle - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -UINT -WINAPI -ResetWriteWatch( - LPVOID lpBaseAddress, - SIZE_T dwRegionSize ) { STUB; @@ -935,7 +860,7 @@ HANDLE WINAPI CreateSocketHandle(VOID) { STUB; - return 0; + return INVALID_HANDLE_VALUE; } /* @@ -970,14 +895,10 @@ /* * @unimplemented */ -#if 0 -FARPROC WINAPI DelayLoadFailureHook(unsigned int dliNotify, PDelayLoadInfo pdli) -#else -FARPROC WINAPI DelayLoadFailureHook(unsigned int dliNotify, PVOID pdli) -#endif -{ - STUB; - return 0; +FARPROC WINAPI DelayLoadFailureHook(LPCSTR pszDllName, LPCSTR pszProcName) +{ + STUB; + return NULL; } /*

1 0

[mjmartin] 38818: - rw.c: Better implementation of read/write for pipes. The ReadPtr is there so use it. Duuhh. Only move memory to make room for more data when the buffer is full vice moving memory on every read. Call KeSetEvent at the correct time, when reading is done. - fsctrl.c: Correct data returned from NpfsPeekPipe when read mode is byte stream.
by mjmartin＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: mjmartin Date: Sat Jan 17 09:21:15 2009 New Revision: 38818 URL: http://svn.reactos.org/svn/reactos?rev=38818&view=rev Log: - rw.c: Better implementation of read/write for pipes. The ReadPtr is there so use it. Duuhh. Only move memory to make room for more data when the buffer is full vice moving memory on every read. Call KeSetEvent at the correct time, when reading is done. - fsctrl.c: Correct data returned from NpfsPeekPipe when read mode is byte stream. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Jan 17 09:21:15 2009 @@ -398,7 +398,7 @@ DPRINT("ReadDataAvailable: %lu\n", Ccb->ReadDataAvailable); ExAcquireFastMutex(&Ccb->DataListLock); - BufferPtr = Ccb->Data; + BufferPtr = Ccb->ReadPtr; DPRINT("BufferPtr = %x\n", BufferPtr); if (Ccb->Fcb->PipeType == FILE_PIPE_BYTE_STREAM_TYPE) { @@ -420,9 +420,8 @@ if (ReadDataAvailable > 0) { - memcpy(&Reply->MessageLength,Ccb->Data,sizeof(ULONG)); - - /* NOTE: Modifying the structure in header file to keep track of NumberOfMessage would be better */ + memcpy(&Reply->MessageLength, BufferPtr, sizeof(ULONG)); + while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) { memcpy(&MessageLength, BufferPtr, sizeof(MessageLength)); @@ -430,20 +429,34 @@ ASSERT(MessageLength > 0); DPRINT("MessageLength = %lu\n",MessageLength); + ReadDataAvailable -= MessageLength; MessageCount++; - ReadDataAvailable -= MessageLength; - - /* If its the first message, copy the Message if the size of buffer is large enough */ - if (MessageCount==1) + + if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { - if ((Reply->Data[0]) - && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + && (OutputBufferLength >= (MessageLength + ReturnLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) { - ReturnLength = MessageLength; - memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + memcpy((PVOID)((ULONG_PTR)&Reply->Data[0] + ReturnLength), + (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), + MessageLength); + ReturnLength += MessageLength; } } + else + { + /* If its the first message, copy the Message if the size of buffer is large enough */ + if (MessageCount==1) + { + if ((Reply->Data[0]) + && (OutputBufferLength >= (MessageLength + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])))) + { + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + ReturnLength = MessageLength; + } + } + } + BufferPtr =(PVOID)((ULONG)BufferPtr + MessageLength + sizeof(MessageLength)); DPRINT("BufferPtr = %x\n", BufferPtr); DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sat Jan 17 09:21:15 2009 @@ -320,6 +320,15 @@ Ccb = FileObject->FsContext2; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; + if ((Ccb->OtherSide) && (Ccb->OtherSide->PipeState == FILE_PIPE_DISCONNECTED_STATE) && (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE)) + { + DPRINT("Both Client and Server are disconnected!\n"); + Status = STATUS_PIPE_DISCONNECTED; + Irp->IoStatus.Information = 0; + goto done; + + } + if ((Ccb->OtherSide == NULL) && (Ccb->ReadDataAvailable == 0)) { /* Its ok if the other side has been Disconnect, but if we have data still in the buffer @@ -523,123 +532,104 @@ } else if (Ccb->Fcb->PipeType == FILE_PIPE_MESSAGE_TYPE) { - ULONG ThisCopyLength = 0; - ULONG TotalLengthNeeded = min(Length, Ccb->ReadDataAvailable); - DPRINT("Message mode: Ccb>Data %x\n", Ccb->Data); - do - { - Buffer = (PVOID)((ULONG_PTR)Buffer + ThisCopyLength); - - /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ - if (Ccb->ReadDataAvailable) - { - ULONG NextMessageLength = 0; - - /*First get the size of the message */ - memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); - - if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + /* Check if buffer is full and the read pointer is not at the start of the buffer */ + if ((Ccb->WriteQuotaAvailable == 0) && (Ccb->ReadPtr > Ccb->Data)) + { + memcpy(Ccb->Data, Ccb->ReadPtr, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr); + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr)); + Ccb->ReadPtr = Ccb->Data; + Ccb->WriteQuotaAvailable += (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr; + } + + /* For Message mode, the Message length is stored in the buffer preceeding the Message. */ + if (Ccb->ReadDataAvailable) + { + ULONG NextMessageLength = 0; + + /*First get the size of the message */ + memcpy(&NextMessageLength, Ccb->ReadPtr, sizeof(NextMessageLength)); + + if ((NextMessageLength == 0) || (NextMessageLength > Ccb->ReadDataAvailable)) + { + DPRINT1("Possible memory corruption.\n"); + HexDump(Ccb->Data, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data); + ASSERT(FALSE); + } + + /* Use the smaller value */ + CopyLength = min(NextMessageLength, Length); + + /* retrieve the message from the buffer */ + memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->ReadPtr + sizeof(NextMessageLength)), CopyLength); + + if (Ccb->ReadDataAvailable > CopyLength) + { + if (CopyLength < NextMessageLength) + /* Client only requested part of the message */ { - DPRINT("Possible memory corruption.\n"); - HexDump(Ccb->Data, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data); - ASSERT(FALSE); - } - - /* Use the smaller value */ - ThisCopyLength = min(NextMessageLength, Length); - - /* retrieve the message from the buffer */ - memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->Data + sizeof(NextMessageLength)), ThisCopyLength); - - if (Ccb->ReadDataAvailable > ThisCopyLength) - { - if (ThisCopyLength < NextMessageLength) - { - /* Client only requested part of the message */ - - /* Calculate the remaining message new size */ - ULONG NewMessageSize = NextMessageLength-ThisCopyLength; - - /* Write a new Message size to buffer for the part of the message still there */ - memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); - - /* Move the memory starting from end of partial Message just retrieved */ - memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), - (PVOID)((ULONG_PTR)Ccb->Data + ThisCopyLength + sizeof(NewMessageSize)), - (ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)) - - ThisCopyLength); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength); - - /* Add ThisCopyLength only to WriteQuotaAvailable as the - Message Size was replaced in the buffer */ - Ccb->WriteQuotaAvailable += ThisCopyLength; - } - else - { - /* Client wanted the entire message */ - - /* Move the memory starting from the next Message just retrieved */ - memmove(Ccb->Data, - (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), - (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->Data - NextMessageLength - - sizeof(NextMessageLength)); - - /* Update the write pointer */ - Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ThisCopyLength - - sizeof(NextMessageLength)); - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(NextMessageLength)); - } + /* Calculate the remaining message new size */ + ULONG NewMessageSize = NextMessageLength-CopyLength; + /* Update ReadPtr to point to new Message size location */ + Ccb->ReadPtr = (PVOID)((ULONG_PTR)Ccb->ReadPtr + CopyLength); + + /* Write a new Message size to buffer for the part of the message still there */ + memcpy(Ccb->ReadPtr, &NewMessageSize, sizeof(NewMessageSize)); } else + /* Client wanted the entire message */ { - /* This was the last Message, so just zero this messages for safety sake */ - memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); - - /* reset the write pointer to beginning of buffer */ - Ccb->WritePtr = Ccb->Data; - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (ThisCopyLength + sizeof(ULONG)); - - KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) - { - KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); - } + /* Update ReadPtr to point to next message size */ + Ccb->ReadPtr = (PVOID)((ULONG_PTR)Ccb->ReadPtr + CopyLength + sizeof(CopyLength)); } + } + else + { + /* This was the last Message, so just zero this messages for safety sake */ + memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); + + /* reset read and write pointer to beginning of buffer */ + Ccb->WritePtr = Ccb->Data; + Ccb->ReadPtr = Ccb->Data; + + /* Add both the message length and the header to the WriteQuotaAvailable + as they both were removed */ + Ccb->WriteQuotaAvailable += (CopyLength + sizeof(CopyLength)); + } #ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",ThisCopyLength,Buffer); - HexDump((PUCHAR)Buffer, ThisCopyLength); + DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); + HexDump((PUCHAR)Buffer, CopyLength); #endif - Information += ThisCopyLength; - - Ccb->ReadDataAvailable -= ThisCopyLength; - - if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); - } - - }while ((ThisCopyLength < TotalLengthNeeded) - && (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) - && (Ccb->ReadDataAvailable)); - + Information += CopyLength; + + Ccb->ReadDataAvailable -= CopyLength; + + if ((ULONG)Ccb->WriteQuotaAvailable > (ULONG)Ccb->MaxDataLength) ASSERT(FALSE); + } if (Information > 0) { - break; + if ((Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) && (Ccb->ReadDataAvailable) && (Length > CopyLength)) + { + Buffer = (PVOID)((ULONG_PTR)Buffer + CopyLength); + Length -= CopyLength; + } + else + { + KeResetEvent(&Ccb->ReadEvent); + if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + { + KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); + } + break; + } } } else { - DPRINT1("Unhandled Pipe Mode with Read Mode!\n"); + DPRINT1("Unhandled Pipe Mode!\n"); ASSERT(FALSE); } }

1 0

[dchapyshev] 38817: - Launch hardware wizard on hardware page
by dchapyshev＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dchapyshev Date: Sat Jan 17 09:13:10 2009 New Revision: 38817 URL: http://svn.reactos.org/svn/reactos?rev=38817&view=rev Log: - Launch hardware wizard on hardware page Modified: trunk/reactos/dll/cpl/sysdm/hardware.c Modified: trunk/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardware.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardware.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardware.c [iso-8859-1] Sat Jan 17 09:13:10 2009 @@ -41,6 +41,28 @@ #endif /* __REACTOS__ */ } +static VOID +LaunchHardwareWizard(HWND hWndParent) +{ + SHELLEXECUTEINFO shInputDll; + + memset(&shInputDll, 0x0, sizeof(SHELLEXECUTEINFO)); + + shInputDll.cbSize = sizeof(shInputDll); + shInputDll.hwnd = hWndParent; + shInputDll.lpVerb = _T("open"); + shInputDll.lpFile = _T("rundll32.exe"); + shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL hdwwiz.cpl"); + + if (ShellExecuteEx(&shInputDll) == 0) + { + MessageBox(NULL, + _T("Can't start hdwwiz.cpl"), + NULL, + MB_OK | MB_ICONERROR); + } +} + /* Property page dialog callback */ INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, @@ -65,6 +87,10 @@ } return TRUE; + case IDC_HARDWARE_WIZARD: + LaunchHardwareWizard(hwndDlg); + return TRUE; + case IDC_HARDWARE_PROFILE: DialogBox(hApplet, MAKEINTRESOURCE(IDD_HARDWAREPROFILES),

1 0

[dgorbachev] 38816: Fix a bug.
by dgorbachev＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dgorbachev Date: Sat Jan 17 09:05:21 2009 New Revision: 38816 URL: http://svn.reactos.org/svn/reactos?rev=38816&view=rev Log: Fix a bug. Modified: trunk/reactos/dll/directx/dxdiagn/container.c Modified: trunk/reactos/dll/directx/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/contai… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] Sat Jan 17 09:05:21 2009 @@ -150,7 +150,7 @@ hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (!SUCCEEDED(hr) || NULL == pContainer) goto on_error; - *cur++; /* go after '.' (just replaced by \0) */ + cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); }

1 0

[cwittich] 38815: use spaces instead of tabs (for real now)
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 08:47:32 2009 New Revision: 38815 URL: http://svn.reactos.org/svn/reactos?rev=38815&view=rev Log: use spaces instead of tabs (for real now) Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Jan 17 08:47:32 2009 @@ -61,7 +61,7 @@ FinalSlash = strrchr(szFileName, '\\'); if(FinalSlash) - szFileName = FinalSlash + 1; + szFileName = FinalSlash + 1; /* Open the Driver */ FilePointer = FsOpenFile(szFileName); @@ -69,31 +69,31 @@ /* Try under the system root in the main dir and drivers */ if (FilePointer == NULL) { - strcpy(value, SystemRoot); - if(value[strlen(value)-1] != '\\') - strcat(value, "\\"); - strcat(value, szFileName); - FilePointer = FsOpenFile(value); + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); } if (FilePointer == NULL) { - strcpy(value, SystemRoot); - if(value[strlen(value)-1] != '\\') - strcat(value, "\\"); - strcat(value, "SYSTEM32\\"); - strcat(value, szFileName); - FilePointer = FsOpenFile(value); + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, "SYSTEM32\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); } if (FilePointer == NULL) { - strcpy(value, SystemRoot); - if(value[strlen(value)-1] != '\\') - strcat(value, "\\"); - strcat(value, "SYSTEM32\\DRIVERS\\"); - strcat(value, szFileName); - FilePointer = FsOpenFile(value); + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, "SYSTEM32\\DRIVERS\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); } /* Make sure we did */ @@ -438,7 +438,7 @@ /* open driver Key */ rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey); if (rc == ERROR_SUCCESS) - { + { /* Read the Start Value */ ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); @@ -570,41 +570,41 @@ VOID LoadAndBootReactOS(PCSTR OperatingSystemName) { - PFILE FilePointer; - CHAR name[255]; - CHAR value[255]; - CHAR SystemPath[255]; + PFILE FilePointer; + CHAR name[255]; + CHAR value[255]; + CHAR SystemPath[255]; CHAR LivePath[255]; - CHAR szKernelName[255]; - CHAR szFileName[255]; - CHAR MsgBuffer[256]; - ULONG_PTR SectionId; + CHAR szKernelName[255]; + CHAR szFileName[255]; + CHAR MsgBuffer[256]; + ULONG_PTR SectionId; PIMAGE_NT_HEADERS NtHeader; PVOID LoadBase; - ULONG_PTR Base; - ULONG Size; + ULONG_PTR Base; + ULONG Size; // // Backdrop // UiDrawBackdrop(); - // - // Open the operating system section - // specified in the .ini file - // - if (!IniOpenSection(OperatingSystemName, &SectionId)) - { - sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); - UiMessageBox(MsgBuffer); - return; - } + // + // Open the operating system section + // specified in the .ini file + // + if (!IniOpenSection(OperatingSystemName, &SectionId)) + { + sprintf(MsgBuffer,"Operating System section '%s' not found in freeldr.ini", OperatingSystemName); + UiMessageBox(MsgBuffer); + return; + } // // Read the command line // - if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) - { + if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) + { // // Check if a ramdisk file was given // @@ -627,18 +627,18 @@ // RamDiskLoadVirtualFile(szFileName); } - } - - /* - * Setup multiboot information structure - */ + } + + /* + * Setup multiboot information structure + */ UiDrawProgressBarCenter(1, 100, szLoadingMsg); - UiDrawStatusText("Detecting Hardware..."); - LoaderBlock.CommandLine = reactos_kernel_cmdline; - LoaderBlock.PageDirectoryStart = (ULONG_PTR)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG_PTR)&PageDirectoryEnd; - LoaderBlock.ModsCount = 0; - LoaderBlock.ModsAddr = reactos_modules; + UiDrawStatusText("Detecting Hardware..."); + LoaderBlock.CommandLine = reactos_kernel_cmdline; + LoaderBlock.PageDirectoryStart = (ULONG_PTR)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG_PTR)&PageDirectoryEnd; + LoaderBlock.ModsCount = 0; + LoaderBlock.ModsAddr = reactos_modules; LoaderBlock.DrivesAddr = reactos_arc_disk_info; LoaderBlock.RdAddr = (ULONG_PTR)gRamDiskBase; LoaderBlock.RdLength = gRamDiskSize; @@ -688,220 +688,220 @@ } } - /* - * Initialize the registry - */ - RegInitializeRegistry(); - - /* - * Make sure the system path is set in the .ini file - */ - if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) - { - UiMessageBox("System path not specified for selected operating system."); - return; - } - - /* - * Special case for Live CD. - */ - if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) - { + /* + * Initialize the registry + */ + RegInitializeRegistry(); + + /* + * Make sure the system path is set in the .ini file + */ + if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) + { + UiMessageBox("System path not specified for selected operating system."); + return; + } + + /* + * Special case for Live CD. + */ + if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) + { /* Use everything following the "LiveCD" string as the path */ strcpy(LivePath, SystemPath + strlen("LiveCD")); /* Normalize */ MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); strcat(SystemPath, LivePath); strcat(strcpy(reactos_kernel_cmdline, SystemPath), - " /MININT"); - } - else - { - if (! MachDiskNormalizeSystemPath(SystemPath, - sizeof(SystemPath))) - { - UiMessageBox("Invalid system path"); - return; - } - /* copy system path into kernel command line */ - strcpy(reactos_kernel_cmdline, SystemPath); - } - - /* - * Read the optional kernel parameters (if any) - */ - if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) - { - strcat(reactos_kernel_cmdline, " "); - strcat(reactos_kernel_cmdline, value); - } - - /* - * Detect hardware - */ - LoaderBlock.ArchExtra = (ULONG_PTR)MachHwDetect(); + " /MININT"); + } + else + { + if (! MachDiskNormalizeSystemPath(SystemPath, + sizeof(SystemPath))) + { + UiMessageBox("Invalid system path"); + return; + } + /* copy system path into kernel command line */ + strcpy(reactos_kernel_cmdline, SystemPath); + } + + /* + * Read the optional kernel parameters (if any) + */ + if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) + { + strcat(reactos_kernel_cmdline, " "); + strcat(reactos_kernel_cmdline, value); + } + + /* + * Detect hardware + */ + LoaderBlock.ArchExtra = (ULONG_PTR)MachHwDetect(); UiDrawProgressBarCenter(5, 100, szLoadingMsg); LoaderBlock.DrivesCount = reactos_disk_count; - UiDrawStatusText("Loading..."); - - // - // If we have a ramdisk, this will switch to the ramdisk disk routines - // which read from memory instead of using the firmware. This has to be done - // after hardware detection, since hardware detection will require using the - // real routines in order to perform disk-detection (just because we're on a - // ram-boot doesn't mean the user doesn't have actual disks installed too!) - // - RamDiskSwitchFromBios(); - - /* - * Try to open system drive - */ - if (!FsOpenSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) - { - UiMessageBox("Failed to open system drive."); - return; - } - - /* append a backslash */ - if ((strlen(szBootPath)==0) || - szBootPath[strlen(szBootPath)] != '\\') - strcat(szBootPath, "\\"); - - DbgPrint((DPRINT_REACTOS,"SystemRoot: '%s'\n", szBootPath)); - strcpy(SystemRoot, szBootPath); - - /* - * Find the kernel image name - * and try to load the kernel off the disk - */ - if(IniReadSettingByName(SectionId, "Kernel", value, sizeof(value))) - { - /* - * Set the name and - */ - if (value[0] == '\\') - { - strcpy(szKernelName, value); - } - else - { - strcpy(szKernelName, szBootPath); - strcat(szKernelName, "SYSTEM32\\"); - strcat(szKernelName, value); - } - } - else - { - strcpy(value, "NTOSKRNL.EXE"); - strcpy(szKernelName, szBootPath); - strcat(szKernelName, "SYSTEM32\\"); - strcat(szKernelName, value); - } - - /* - * Find the HAL image name - * and try to load the kernel off the disk - */ - if(IniReadSettingByName(SectionId, "Hal", value, sizeof(value))) - { - /* - * Set the name and - */ - if (value[0] == '\\') - { - strcpy(szHalName, value); - } - else - { - strcpy(szHalName, szBootPath); - strcat(szHalName, "SYSTEM32\\"); - strcat(szHalName, value); - } - } - else - { - strcpy(value, "HAL.DLL"); - strcpy(szHalName, szBootPath); - strcat(szHalName, "SYSTEM32\\"); - strcat(szHalName, value); - } - - /* Load the kernel */ - LoadBase = FrLdrLoadImage(szKernelName, 5, 1); - if (!LoadBase) return; - - /* Get the NT header, kernel base and kernel entry */ - NtHeader = RtlImageNtHeader(LoadBase); - KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); - KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint)); - LoaderBlock.KernelBase = KernelBase; - - /* - * Load the System hive from disk - */ - strcpy(szFileName, szBootPath); - strcat(szFileName, "SYSTEM32\\CONFIG\\SYSTEM"); - - DbgPrint((DPRINT_REACTOS, "SystemHive: '%s'", szFileName)); - - FilePointer = FsOpenFile(szFileName); - if (FilePointer == NULL) - { - UiMessageBox("Could not find the System hive!"); - return; - } - - /* - * Update the status bar with the current file - */ - strcpy(name, "Reading "); - strcat(name, value); - while (strlen(name) < 80) - strcat(name, " "); - UiDrawStatusText(name); - - /* - * Load the System hive - */ - Base = FrLdrLoadModule(FilePointer, szFileName, &Size); - if (Base == 0 || Size == 0) - { - UiMessageBox("Could not load the System hive!\n"); - return; - } - DbgPrint((DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size)); - - /* - * Import the loaded system hive - */ - RegImportBinaryHive((PCHAR)Base, Size); - - /* - * Initialize the 'CurrentControlSet' link - */ - RegInitCurrentControlSet(FALSE); - - UiDrawProgressBarCenter(15, 100, szLoadingMsg); - - UiDrawProgressBarCenter(20, 100, szLoadingMsg); - - /* - * Load NLS files - */ - if (!FrLdrLoadNlsFiles(szBootPath, MsgBuffer)) - { - UiMessageBox(MsgBuffer); - return; - } - UiDrawProgressBarCenter(30, 100, szLoadingMsg); - - /* - * Load boot drivers - */ - FrLdrLoadBootDrivers(szBootPath, 40); - //UiUnInitialize("Booting ReactOS..."); + UiDrawStatusText("Loading..."); + + // + // If we have a ramdisk, this will switch to the ramdisk disk routines + // which read from memory instead of using the firmware. This has to be done + // after hardware detection, since hardware detection will require using the + // real routines in order to perform disk-detection (just because we're on a + // ram-boot doesn't mean the user doesn't have actual disks installed too!) + // + RamDiskSwitchFromBios(); + + /* + * Try to open system drive + */ + if (!FsOpenSystemVolume(SystemPath, szBootPath, &LoaderBlock.BootDevice)) + { + UiMessageBox("Failed to open system drive."); + return; + } + + /* append a backslash */ + if ((strlen(szBootPath)==0) || + szBootPath[strlen(szBootPath)] != '\\') + strcat(szBootPath, "\\"); + + DbgPrint((DPRINT_REACTOS,"SystemRoot: '%s'\n", szBootPath)); + strcpy(SystemRoot, szBootPath); + + /* + * Find the kernel image name + * and try to load the kernel off the disk + */ + if(IniReadSettingByName(SectionId, "Kernel", value, sizeof(value))) + { + /* + * Set the name and + */ + if (value[0] == '\\') + { + strcpy(szKernelName, value); + } + else + { + strcpy(szKernelName, szBootPath); + strcat(szKernelName, "SYSTEM32\\"); + strcat(szKernelName, value); + } + } + else + { + strcpy(value, "NTOSKRNL.EXE"); + strcpy(szKernelName, szBootPath); + strcat(szKernelName, "SYSTEM32\\"); + strcat(szKernelName, value); + } + + /* + * Find the HAL image name + * and try to load the kernel off the disk + */ + if(IniReadSettingByName(SectionId, "Hal", value, sizeof(value))) + { + /* + * Set the name and + */ + if (value[0] == '\\') + { + strcpy(szHalName, value); + } + else + { + strcpy(szHalName, szBootPath); + strcat(szHalName, "SYSTEM32\\"); + strcat(szHalName, value); + } + } + else + { + strcpy(value, "HAL.DLL"); + strcpy(szHalName, szBootPath); + strcat(szHalName, "SYSTEM32\\"); + strcat(szHalName, value); + } + + /* Load the kernel */ + LoadBase = FrLdrLoadImage(szKernelName, 5, 1); + if (!LoadBase) return; + + /* Get the NT header, kernel base and kernel entry */ + NtHeader = RtlImageNtHeader(LoadBase); + KernelBase = SWAPD(NtHeader->OptionalHeader.ImageBase); + KernelEntryPoint = (ROS_KERNEL_ENTRY_POINT)(KernelBase + SWAPD(NtHeader->OptionalHeader.AddressOfEntryPoint)); + LoaderBlock.KernelBase = KernelBase; + + /* + * Load the System hive from disk + */ + strcpy(szFileName, szBootPath); + strcat(szFileName, "SYSTEM32\\CONFIG\\SYSTEM"); + + DbgPrint((DPRINT_REACTOS, "SystemHive: '%s'", szFileName)); + + FilePointer = FsOpenFile(szFileName); + if (FilePointer == NULL) + { + UiMessageBox("Could not find the System hive!"); + return; + } + + /* + * Update the status bar with the current file + */ + strcpy(name, "Reading "); + strcat(name, value); + while (strlen(name) < 80) + strcat(name, " "); + UiDrawStatusText(name); + + /* + * Load the System hive + */ + Base = FrLdrLoadModule(FilePointer, szFileName, &Size); + if (Base == 0 || Size == 0) + { + UiMessageBox("Could not load the System hive!\n"); + return; + } + DbgPrint((DPRINT_REACTOS, "SystemHive loaded at 0x%x size %u", (unsigned)Base, (unsigned)Size)); + + /* + * Import the loaded system hive + */ + RegImportBinaryHive((PCHAR)Base, Size); + + /* + * Initialize the 'CurrentControlSet' link + */ + RegInitCurrentControlSet(FALSE); + + UiDrawProgressBarCenter(15, 100, szLoadingMsg); + + UiDrawProgressBarCenter(20, 100, szLoadingMsg); + + /* + * Load NLS files + */ + if (!FrLdrLoadNlsFiles(szBootPath, MsgBuffer)) + { + UiMessageBox(MsgBuffer); + return; + } + UiDrawProgressBarCenter(30, 100, szLoadingMsg); + + /* + * Load boot drivers + */ + FrLdrLoadBootDrivers(szBootPath, 40); + //UiUnInitialize("Booting ReactOS..."); // // Perform architecture-specific pre-boot configuration @@ -911,38 +911,38 @@ // // Setup paging and jump to kernel // - FrLdrStartup(0x2badb002); + FrLdrStartup(0x2badb002); } #undef DbgPrint ULONG DbgPrint(const char *Format, ...) { - va_list ap; - CHAR Buffer[512]; - ULONG Length; - - va_start(ap, Format); - - /* Construct a string */ - Length = _vsnprintf(Buffer, 512, Format, ap); - - /* Check if we went past the buffer */ - if (Length == -1U) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - /* Show it as a message box */ - UiMessageBox(Buffer); - - /* Cleanup and exit */ - va_end(ap); - return 0; + va_list ap; + CHAR Buffer[512]; + ULONG Length; + + va_start(ap, Format); + + /* Construct a string */ + Length = _vsnprintf(Buffer, 512, Format, ap); + + /* Check if we went past the buffer */ + if (Length == -1U) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + /* Show it as a message box */ + UiMessageBox(Buffer); + + /* Cleanup and exit */ + va_end(ap); + return 0; } /* EOF */

1 0

[silverblade] 38814: Use spaces instead of tabs.
by silverblade＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: silverblade Date: Sat Jan 17 08:44:24 2009 New Revision: 38814 URL: http://svn.reactos.org/svn/reactos?rev=38814&view=rev Log: Use spaces instead of tabs. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Jan 17 08:44:24 2009 @@ -707,12 +707,12 @@ */ if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) { - /* Use everything following the "LiveCD" string as the path */ + /* Use everything following the "LiveCD" string as the path */ strcpy(LivePath, SystemPath + strlen("LiveCD")); - /* Normalize */ - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, LivePath); - strcat(strcpy(reactos_kernel_cmdline, SystemPath), + /* Normalize */ + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); + strcat(SystemPath, LivePath); + strcat(strcpy(reactos_kernel_cmdline, SystemPath), " /MININT"); } else

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