Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[ekohl] 26453: - The initially selected cursor scheme was always treated as a system scheme. Fixed! - Clean-up the "browse cursor" and "delete cursor scheme" code. - Remove string buffers from the PointerProc function.
by ekohl＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: ekohl Date: Sat Apr 21 18:56:23 2007 New Revision: 26453 URL: http://svn.reactos.org/svn/reactos?rev=26453&view=rev Log: - The initially selected cursor scheme was always treated as a system scheme. Fixed! - Clean-up the "browse cursor" and "delete cursor scheme" code. - Remove string buffers from the PointerProc function. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sat Apr 21 18:56:23 2007 @@ -567,15 +567,27 @@ SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, (LPARAM)g_CursorData[nSel].hCursor); + + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), (g_CursorData[nSel].szCursorPath[0] != 0)); } static BOOL -DeleteUserCursorScheme(TCHAR * szScheme) -{ +DeleteUserCursorScheme(HWND hwndDlg) +{ + TCHAR szSchemeName[MAX_PATH]; + HWND hDlgCtrl; HKEY hCuKey; HKEY hCuCursorKey; - LONG Result; + LONG lResult; + INT nSel; + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMBO_CURSOR_SCHEME); + nSel = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); + if (nSel == CB_ERR) + return FALSE; + + SendMessage(hDlgCtrl, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName); if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) return FALSE; @@ -586,12 +598,18 @@ return FALSE; } - Result = RegDeleteValue(hCuCursorKey, szScheme); + lResult = RegDeleteValue(hCuCursorKey, szSchemeName); RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); - return (Result == ERROR_SUCCESS); + if (lResult == ERROR_SUCCESS) + { + SendMessage(hDlgCtrl, CB_DELETESTRING, nSel, 0); + SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + } + + return (lResult == ERROR_SUCCESS); } @@ -625,11 +643,22 @@ static BOOL -BrowseCursor(TCHAR * szFileName, HWND hwndDlg) -{ - //FIXME load text resources from string +BrowseCursor(HWND hwndDlg) +{ + TCHAR szFileName[MAX_PATH]; OPENFILENAME ofn; + INT nSel; + + /* FIXME load text resources from string */ static TCHAR szFilter[] = _T("Cursors\0*.ani;*.cur\0Animated Cursors\0*.ani\0Static Cursors\0*.cur\0All Files\0*.*\0\0"); + + memset(szFileName, 0x0, sizeof(szFileName)); + nSel = SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); + if (nSel == LB_ERR) + { + MessageBox(hwndDlg, _T("LB_ERR"), _T(""),MB_ICONERROR); + return FALSE; + } ZeroMemory(&ofn, sizeof(OPENFILENAME)); @@ -640,18 +669,21 @@ ofn.lpstrFile = szFileName; ofn.nMaxFile = MAX_PATH; ofn.lpstrInitialDir = _T("%WINDIR%\\Cursors"); - ofn.lpstrTitle = _T("Browse"); + ofn.lpstrTitle = _T("Browse"); /* FIXME load text resources from string */ ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST; - if (GetOpenFileName(&ofn)) - return TRUE; - else + if (!GetOpenFileName(&ofn)) return FALSE; + + /* Store the new cursor file path */ + _tcsncpy(g_CursorData[nSel].szCursorPath, szFileName, MAX_PATH); + + return TRUE; } static VOID -LoadCurrentCursorScheme(LPTSTR lpName, BOOL bSystem) +LoadCursorScheme(LPTSTR lpName, BOOL bSystem) { UINT index, i; @@ -664,17 +696,6 @@ } g_CursorData[i].szCursorPath[0] = 0; } - -#if 0 - if (lpName == NULL) - { - for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) - { - g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); - } - } - else -#endif if (lpName != NULL) { @@ -703,7 +724,9 @@ for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) { if (g_CursorData[i].szCursorPath[0] == 0) - g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId, + IMAGE_CURSOR, 0, 0, + LR_DEFAULTSIZE | LR_SHARED); else g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].szCursorPath, IMAGE_CURSOR, 0, 0, @@ -723,7 +746,9 @@ DestroyCursor(g_CursorData[i].hCursor); if (g_CursorData[i].szCursorPath[0] == 0) - g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].uDefaultCursorId, + IMAGE_CURSOR, 0, 0, + LR_DEFAULTSIZE | LR_SHARED); else g_CursorData[i].hCursor = (HCURSOR)LoadImage(NULL, g_CursorData[i].szCursorPath, IMAGE_CURSOR, 0, 0, @@ -787,31 +812,58 @@ } +static VOID +LoadNewCursorScheme(HWND hwndDlg, BOOL bInit) +{ + TCHAR buffer[MAX_PATH]; + TCHAR szSystemScheme[MAX_PATH]; + HWND hDlgCtrl; + BOOL bEnable; + LPTSTR lpName; + INT nSel; + + nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0); + if (nSel == CB_ERR) + return; + + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)buffer); + + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + if (_tcsstr(buffer, szSystemScheme) || nSel == 0) //avoid the default scheme can be deleted + bEnable = FALSE; + else + bEnable = TRUE; + + /* delete button */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); + EnableWindow(hDlgCtrl, bEnable); + + lpName = (LPTSTR)SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETITEMDATA, nSel, 0); + LoadCursorScheme(lpName, !bEnable); + RefreshCursorList(hwndDlg, bInit); +} + + static INT_PTR CALLBACK PointerProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { + PPOINTER_DATA pPointerData; LPPSHNOTIFY lppsn; - TCHAR buffer[MAX_PATH]; - TCHAR szSystemScheme[MAX_PATH]; - HWND hDlgCtrl; - LRESULT lResult; - - PPOINTER_DATA pPointerData; + INT nSel; pPointerData = (PPOINTER_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: pPointerData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POINTER_DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pPointerData); EnumerateCursorSchemes(hwndDlg); - LoadCurrentCursorScheme(NULL, FALSE); - RefreshCursorList(hwndDlg, TRUE); + LoadNewCursorScheme(hwndDlg, TRUE); /* Get drop shadow setting */ if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0)) @@ -821,8 +873,7 @@ if (pPointerData->bDropShadow) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DROP_SHADOW); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + SendDlgItemMessage(hwndDlg, IDC_CHECK_DROP_SHADOW, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } if ((INT)wParam == IDC_LISTBOX_CURSOR) @@ -850,7 +901,6 @@ #if (WINVER >= 0x0500) SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE); #endif -// SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } else if (lppsn->hdr.code == PSN_RESET) @@ -866,39 +916,17 @@ { case IDC_COMBO_CURSOR_SCHEME: if (HIWORD(wParam) == CBN_SELENDOK) - { - BOOL bEnable; - LPTSTR lpName; - - wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if(wParam == CB_ERR) - break; - - SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted - bEnable = FALSE; - else - bEnable = TRUE; - - /* delete button */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); - EnableWindow(hDlgCtrl, bEnable); - - lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); - LoadCurrentCursorScheme(lpName, !bEnable); - RefreshCursorList(hwndDlg, FALSE); - } + LoadNewCursorScheme(hwndDlg, FALSE); break; case IDC_LISTBOX_CURSOR: if (HIWORD(wParam) == LBN_SELCHANGE) { - UINT uSel, uIndex; - uSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); - uIndex = (UINT)SendMessage((HWND)lParam, LB_GETITEMDATA, (WPARAM)uSel, 0); + nSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, - (LPARAM)g_CursorData[uIndex].hCursor); + (LPARAM)g_CursorData[nSel].hCursor); + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), + (g_CursorData[nSel].szCursorPath[0] != 0)); } break; @@ -910,47 +938,35 @@ break; case IDC_BUTTON_USE_DEFAULT_CURSOR: - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); - lResult = SendMessage(hDlgCtrl, LB_GETCURSEL, 0, 0); - if (lResult != LB_ERR) + nSel = SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); + if (nSel != LB_ERR) { /* Clean the path of the currently selected cursor */ - memset(g_CursorData[lResult].szCursorPath, 0x0, MAX_PATH * sizeof(TCHAR)); + memset(g_CursorData[nSel].szCursorPath, 0x0, MAX_PATH * sizeof(TCHAR)); /* Update cursor list and preview */ ReloadCurrentCursorScheme(); RefreshCursorList(hwndDlg, FALSE); + + /* Disable the "Set Default" button */ + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), FALSE); } break; case IDC_BUTTON_BROWSE_CURSOR: - memset(buffer, 0x0, sizeof(buffer)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); - lResult = SendMessage(hDlgCtrl, LB_GETCURSEL, 0, 0); - if (lResult == LB_ERR) - MessageBox(hwndDlg, _T("LB_ERR"), _T(""),MB_ICONERROR); - if (BrowseCursor(buffer, hwndDlg)) - { - /* Store the new cursor file path */ - _tcsncpy(g_CursorData[lResult].szCursorPath, buffer, MAX_PATH); - + if (BrowseCursor(hwndDlg)) + { /* Update cursor list and preview */ ReloadCurrentCursorScheme(); RefreshCursorList(hwndDlg, FALSE); + + /* Enable the "Set Default" button */ + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE); } break; case IDC_BUTTON_DELETE_SCHEME: - hDlgCtrl = GetDlgItem(hwndDlg, IDC_COMBO_CURSOR_SCHEME); - wParam = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); - if(wParam == CB_ERR) - break; - SendMessage(hDlgCtrl, CB_GETLBTEXT, wParam, (LPARAM)buffer); - if (DeleteUserCursorScheme(buffer)) - { - SendMessage(hDlgCtrl, CB_DELETESTRING, wParam, 0); - SendMessage(hDlgCtrl, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); - } + DeleteUserCursorScheme(hwndDlg); break; case IDC_CHECK_DROP_SHADOW:

1 0

[cwittich] 26452: removed unneeded dependencies
by cwittich＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: cwittich Date: Sat Apr 21 18:24:15 2007 New Revision: 26452 URL: http://svn.reactos.org/svn/reactos?rev=26452&view=rev Log: removed unneeded dependencies Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/sdk/uuid/uuid.rbuild Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Sat Apr 21 18:24:15 2007 @@ -4,7 +4,6 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/crt</include> - <include base="ReactOS">include/psdk</include> <include base="mingw_common">include</include> <dependency>psdk</dependency> <file>cpu_features.c</file> @@ -25,7 +24,6 @@ </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="ReactOS">include/crt</include> - <include base="ReactOS">include/psdk</include> <include base="mingw_common">include</include> <dependency>psdk</dependency> <file>binmode.c</file> @@ -34,7 +32,6 @@ </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true"> <include base="ReactOS">include/crt</include> - <include base="ReactOS">include/psdk</include> <include base="mingw_common">include</include> <dependency>psdk</dependency> <file>wbinmode.c</file> @@ -43,7 +40,6 @@ </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true"> <include base="ReactOS">include/crt</include> - <include base="ReactOS">include/psdk</include> <include base="mingw_common">include</include> <file>dllcrt1.c</file> </module> Modified: trunk/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.rbuild?r… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.rbuild (original) +++ trunk/reactos/lib/sdk/uuid/uuid.rbuild Sat Apr 21 18:24:15 2007 @@ -2,7 +2,5 @@ <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> - <dependency>psdk</dependency> - <library>psdk</library> <file>uuid.c</file> </module>

1 0

[hpoussin] 26451: Try to fix build by including a POSTAUTO target, executed after the creation of makefile.auto Remove a hack in Makefile WARNING: You need to delete makefile.auto after updating to this revision!
by hpoussin＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: hpoussin Date: Sat Apr 21 17:19:59 2007 New Revision: 26451 URL: http://svn.reactos.org/svn/reactos?rev=26451&view=rev Log: Try to fix build by including a POSTAUTO target, executed after the creation of makefile.auto Remove a hack in Makefile WARNING: You need to delete makefile.auto after updating to this revision! Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26451&r1=2645… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sat Apr 21 17:19:59 2007 @@ -397,8 +397,6 @@ # will not be autogenretaed for right # platforms. -ARCH :=i386 - include lib/lib.mak include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak @@ -413,12 +411,17 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) +POSTAUTO : \ + psdk \ + $(IDL_FILES) \ + $(NCI_SERVICE_FILES) + $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw + @$(MAKE) POSTAUTO world: all bootcd livecd

1 0

[cwittich] 26450: add ks back to build
by cwittich＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: cwittich Date: Sat Apr 21 16:47:04 2007 New Revision: 26450 URL: http://svn.reactos.org/svn/reactos?rev=26450&view=rev Log: add ks back to build Modified: trunk/reactos/drivers/drivers.rbuild Modified: trunk/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev… ============================================================================== --- trunk/reactos/drivers/drivers.rbuild (original) +++ trunk/reactos/drivers/drivers.rbuild Sat Apr 21 16:47:04 2007 @@ -10,6 +10,9 @@ </directory> <directory name="input"> <xi:include href="input/directory.rbuild" /> +</directory> +<directory name="ksfilter"> + <xi:include href="ksfilter/directory.rbuild" /> </directory> <directory name="multimedia"> <xi:include href="multimedia/directory.rbuild" />

1 0

[cwittich] 26449: set svn:eol-style native
by cwittich＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: cwittich Date: Sat Apr 21 15:23:41 2007 New Revision: 26449 URL: http://svn.reactos.org/svn/reactos?rev=26449&view=rev Log: set svn:eol-style native Modified: trunk/reactos/include/psdk/dispex.idl (props changed) trunk/reactos/include/psdk/docobj.idl (props changed) trunk/reactos/include/psdk/downloadmgr.idl (props changed) trunk/reactos/include/psdk/dyngraph.idl (props changed) trunk/reactos/include/psdk/exdisp.idl (props changed) trunk/reactos/include/psdk/hlink.idl (props changed) trunk/reactos/include/psdk/htiframe.idl (props changed) trunk/reactos/include/psdk/iads.idl (props changed) trunk/reactos/include/psdk/indexsrv.idl (props changed) trunk/reactos/include/psdk/mediaobj.idl (props changed) trunk/reactos/include/psdk/mimeinfo.idl (props changed) trunk/reactos/include/psdk/mlang.idl (props changed) trunk/reactos/include/psdk/mmstream.idl (props changed) trunk/reactos/include/psdk/mshtmhst.idl (props changed) trunk/reactos/include/psdk/mshtml.idl (props changed) trunk/reactos/include/psdk/msxml.idl (props changed) trunk/reactos/include/psdk/msxml2.idl (props changed) trunk/reactos/include/psdk/oaidl.idl (props changed) trunk/reactos/include/psdk/objidl.idl (props changed) trunk/reactos/include/psdk/objsafe.idl (props changed) trunk/reactos/include/psdk/ocidl.idl (props changed) trunk/reactos/include/psdk/ocmm.idl (props changed) trunk/reactos/include/psdk/oledb.idl (props changed) trunk/reactos/include/psdk/oleidl.idl (props changed) trunk/reactos/include/psdk/optary.idl (props changed) trunk/reactos/include/psdk/propidl.idl (props changed) trunk/reactos/include/psdk/pstore.idl (props changed) trunk/reactos/include/psdk/richole.idl (props changed) trunk/reactos/include/psdk/sensevts.idl (props changed) trunk/reactos/include/psdk/servprov.idl (props changed) trunk/reactos/include/psdk/shldisp.idl (props changed) trunk/reactos/include/psdk/shobjidl.idl (props changed) trunk/reactos/include/psdk/shtypes.idl (props changed) trunk/reactos/include/psdk/stdole2.idl (props changed) trunk/reactos/include/psdk/strmif.idl (props changed) trunk/reactos/include/psdk/tom.idl (props changed) trunk/reactos/include/psdk/unknwn.idl (props changed) trunk/reactos/include/psdk/urlhist.idl (props changed) trunk/reactos/include/psdk/urlmon.idl (props changed) trunk/reactos/include/psdk/wtypes.idl (props changed) trunk/reactos/include/psdk/xmldom.idl (props changed) trunk/reactos/include/psdk/xmldso.idl (props changed) Propchange: trunk/reactos/include/psdk/dispex.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/docobj.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/downloadmgr.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/dyngraph.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/exdisp.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/hlink.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/htiframe.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/iads.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/indexsrv.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mediaobj.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mimeinfo.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mlang.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mmstream.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mshtmhst.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/mshtml.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/msxml.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/msxml2.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/oaidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/objidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/objsafe.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/ocidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/ocmm.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/oledb.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/oleidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/optary.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/propidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/pstore.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/richole.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/sensevts.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/servprov.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/shldisp.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/shobjidl.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/shtypes.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/stdole2.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/strmif.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/tom.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/unknwn.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/urlhist.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/urlmon.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/wtypes.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/xmldom.idl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/psdk/xmldso.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 26448: set svn:ignore property for generated psdk headers
by spetreolle＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: spetreolle Date: Sat Apr 21 14:46:24 2007 New Revision: 26448 URL: http://svn.reactos.org/svn/reactos?rev=26448&view=rev Log: set svn:ignore property for generated psdk headers Modified: trunk/reactos/include/psdk/ (props changed) Propchange: trunk/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Apr 21 14:46:24 2007 @@ -1,0 +1,24 @@ +optary.h +docobj.h +wtypes.h +shldisp.h +tom.h +servprov.h +shtypes.h +objidl.h +urlhist.h +shobjidl.h +ocmm.h +oleidl.h +sensevts.h +strmif.h +pstore.h +oaidl.h +propidl.h +objsafe.h +exdisp.h +richole.h +oledb.h +mshtmhst.h +unknwn.h +urlmon.h

1 0

[jimtabor] 26447: Initialize stock_object cache.
by jimtabor＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: jimtabor Date: Sat Apr 21 05:56:47 2007 New Revision: 26447 URL: http://svn.reactos.org/svn/reactos?rev=26447&view=rev Log: Initialize stock_object cache. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Sat Apr 21 05:56:47 2007 @@ -8,6 +8,8 @@ */ #include "precomp.h" + +extern HGDIOBJ stock_objects[]; /* * GDI32.DLL doesn't have an entry point. The initialization is done by a call @@ -67,7 +69,10 @@ NtCurrentTeb()->GdiTebBatch.Offset = 0; NtCurrentTeb()->GdiBatchCount = 0; #endif - +#if 0 + // Very simple, the list will fill itself as it is needed. + RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. +#endif return TRUE; }

1 0

[arty] 26446: Adapt fat for BE booting. Add proper port io in mach.c
by arty＠svn.reactos.org 21 Apr '07

21 Apr '07

Author: arty Date: Sat Apr 21 05:36:56 2007 New Revision: 26446 URL: http://svn.reactos.org/svn/reactos?rev=26446&view=rev Log: Adapt fat for BE booting. Add proper port io in mach.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sat Apr 21 05:36:56 2007 @@ -616,10 +616,11 @@ } UCHAR NTAPI READ_PORT_UCHAR(PUCHAR Address) { - return 0xff; + return GetPhysByte(((ULONG)Address)+0x80000000); } void WRITE_PORT_UCHAR(PUCHAR Address, UCHAR Value) { + SetPhysByte(((ULONG)Address)+0x80000000, Value); } void DiskStopFloppyMotor() { Modified: branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c Sat Apr 21 05:36:56 2007 @@ -19,7 +19,7 @@ #include <freeldr.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> ULONG BytesPerSector; /* Number of bytes per sector */ @@ -37,6 +37,84 @@ ULONG FatType = 0; /* FAT12, FAT16, FAT32, FATX16 or FATX32 */ ULONG FatDriveNumber = 0; +VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj) +{ + SW(Obj, BytesPerSector); + SW(Obj, ReservedSectors); + SW(Obj, RootDirEntries); + SW(Obj, TotalSectors); + SW(Obj, SectorsPerFat); + SW(Obj, SectorsPerTrack); + SW(Obj, NumberOfHeads); + SD(Obj, HiddenSectors); + SD(Obj, TotalSectorsBig); + SD(Obj, VolumeSerialNumber); + SW(Obj, BootSectorMagic); +} + +VOID FatSwapFat32BootSector(PFAT32_BOOTSECTOR Obj) +{ + SW(Obj, BytesPerSector); + SW(Obj, ReservedSectors); + SW(Obj, RootDirEntries); + SW(Obj, TotalSectors); + SW(Obj, SectorsPerFat); + SW(Obj, NumberOfHeads); + SD(Obj, HiddenSectors); + SD(Obj, TotalSectorsBig); + SD(Obj, SectorsPerFatBig); + SW(Obj, ExtendedFlags); + SW(Obj, FileSystemVersion); + SD(Obj, RootDirStartCluster); + SW(Obj, FsInfo); + SW(Obj, BackupBootSector); + SD(Obj, VolumeSerialNumber); + SW(Obj, BootSectorMagic); +} + +VOID FatSwapFatXBootSector(PFATX_BOOTSECTOR Obj) +{ + SD(Obj, VolumeSerialNumber); + SD(Obj, SectorsPerCluster); + SW(Obj, NumberOfFats); +} + +VOID FatSwapDirEntry(PDIRENTRY Obj) +{ + SW(Obj, CreateTime); + SW(Obj, CreateDate); + SW(Obj, LastAccessDate); + SW(Obj, ClusterHigh); + SW(Obj, Time); + SW(Obj, Date); + SW(Obj, ClusterLow); + SD(Obj, Size); +} + +VOID FatSwapLFNDirEntry(PLFN_DIRENTRY Obj) +{ + int i; + SW(Obj, StartCluster); + for(i = 0; i < 5; i++) + Obj->Name0_4[i] = SWAPW(Obj->Name0_4[i]); + for(i = 0; i < 6; i++) + Obj->Name5_10[i] = SWAPW(Obj->Name5_10[i]); + for(i = 0; i < 2; i++) + Obj->Name11_12[i] = SWAPW(Obj->Name11_12[i]); +} + +VOID FatSwapFatXDirEntry(PFATX_DIRENTRY Obj) +{ + SD(Obj, StartCluster); + SD(Obj, Size); + SW(Obj, Time); + SW(Obj, Date); + SW(Obj, CreateTime); + SW(Obj, CreateDate); + SW(Obj, LastAccessTime); + SW(Obj, LastAccessDate); +} + BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSectorCount) { char ErrMsg[80]; @@ -75,6 +153,7 @@ } RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512); + // Get the FAT type FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount); @@ -84,6 +163,7 @@ if (ISFATX(FatType)) { + FatSwapFatXBootSector(FatXVolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "FileSystemType: %c%c%c%c.\n", FatXVolumeBootSector->FileSystemType[0], FatXVolumeBootSector->FileSystemType[1], FatXVolumeBootSector->FileSystemType[2], FatXVolumeBootSector->FileSystemType[3])); @@ -97,6 +177,7 @@ } else if (FatType == FAT32) { + FatSwapFat32BootSector(Fat32VolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", Fat32VolumeBootSector->JumpBoot[0], Fat32VolumeBootSector->JumpBoot[1], Fat32VolumeBootSector->JumpBoot[2])); @@ -130,6 +211,7 @@ } else { + FatSwapFatBootSector(FatVolumeBootSector); DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT_BOOTSECTOR) = 0x%x.\n", sizeof(FAT_BOOTSECTOR))); DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", FatVolumeBootSector->JumpBoot[0], FatVolumeBootSector->JumpBoot[1], FatVolumeBootSector->JumpBoot[2])); @@ -165,7 +247,7 @@ // // Check the boot sector magic // - if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55) + if (! ISFATX(FatType) && SWAPW(FatVolumeBootSector->BootSectorMagic) != 0x55aa) { sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)", DriveNumber, FatVolumeBootSector->BootSectorMagic); @@ -205,7 +287,7 @@ if (ISFATX(FatType)) { BytesPerSector = 512; - SectorsPerCluster = FatXVolumeBootSector->SectorsPerCluster; + SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); FatSectorStart = (4096 / BytesPerSector); ActiveFatSectorStart = FatSectorStart; NumberOfFats = 1; @@ -260,6 +342,7 @@ // // Initialize the disk cache for this drive // + printf("About to do cache init\n"); if (!CacheInitializeDrive(DriveNumber)) { return FALSE; @@ -307,10 +390,10 @@ } else { - RootDirSectors = ((FatBootSector->RootDirEntries * 32) + (FatBootSector->BytesPerSector - 1)) / FatBootSector->BytesPerSector; - SectorsPerFat = FatBootSector->SectorsPerFat ? FatBootSector->SectorsPerFat : Fat32BootSector->SectorsPerFatBig; - TotalSectors = FatBootSector->TotalSectors ? FatBootSector->TotalSectors : FatBootSector->TotalSectorsBig; - DataSectorCount = TotalSectors - (FatBootSector->ReservedSectors + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors); + RootDirSectors = ((SWAPW(FatBootSector->RootDirEntries) * 32) + (SWAPW(FatBootSector->BytesPerSector) - 1)) / SWAPW(FatBootSector->BytesPerSector); + SectorsPerFat = SWAPW(FatBootSector->SectorsPerFat) ? SWAPW(FatBootSector->SectorsPerFat) : SWAPD(Fat32BootSector->SectorsPerFatBig); + TotalSectors = SWAPW(FatBootSector->TotalSectors) ? SWAPW(FatBootSector->TotalSectors) : SWAPD(FatBootSector->TotalSectorsBig); + DataSectorCount = TotalSectors - (SWAPW(FatBootSector->ReservedSectors) + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors); //mjl if (FatBootSector->SectorsPerCluster == 0) @@ -402,11 +485,13 @@ { ULONG EntryCount; ULONG CurrentEntry; - PDIRENTRY DirEntry; - PLFN_DIRENTRY LfnDirEntry; CHAR LfnNameBuffer[265]; CHAR ShortNameBuffer[20]; ULONG StartCluster; + DIRENTRY OurDirEntry; + LFN_DIRENTRY OurLfnDirEntry; + PDIRENTRY DirEntry = &OurDirEntry; + PLFN_DIRENTRY LfnDirEntry = &OurLfnDirEntry; EntryCount = DirectorySize / sizeof(DIRENTRY); @@ -415,10 +500,12 @@ memset(ShortNameBuffer, 0, 13 * sizeof(CHAR)); memset(LfnNameBuffer, 0, 261 * sizeof(CHAR)); - DirEntry = (PDIRENTRY) DirectoryBuffer; - for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirEntry++) - { - LfnDirEntry = (PLFN_DIRENTRY)DirEntry; + for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirectoryBuffer = ((PDIRENTRY)DirectoryBuffer)+1) + { + OurLfnDirEntry = *((PLFN_DIRENTRY) DirectoryBuffer); + FatSwapLFNDirEntry(LfnDirEntry); + OurDirEntry = *((PDIRENTRY) DirectoryBuffer); + FatSwapDirEntry(DirEntry); //DbgPrint((DPRINT_FILESYSTEM, "Dumping directory entry %d:\n", CurrentEntry)); //DbgDumpBuffer(DPRINT_FILESYSTEM, DirEntry, sizeof(DIRENTRY)); @@ -613,17 +700,20 @@ { ULONG EntryCount; ULONG CurrentEntry; - PFATX_DIRENTRY DirEntry; ULONG FileNameLen; + FATX_DIRENTRY OurDirEntry; + PFATX_DIRENTRY DirEntry = &OurDirEntry; EntryCount = DirectorySize / sizeof(FATX_DIRENTRY); DbgPrint((DPRINT_FILESYSTEM, "FatXSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x EntryCount = %d FileName = %s\n", DirectoryBuffer, EntryCount, FileName)); FileNameLen = strlen(FileName); - DirEntry = (PFATX_DIRENTRY) DirectoryBuffer; - for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++, DirEntry++) - { + + for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++, DirectoryBuffer = ((PFATX_DIRENTRY)DirectoryBuffer)+1) + { + OurDirEntry = *(PFATX_DIRENTRY) DirectoryBuffer; + FatSwapFatXDirEntry(&OurDirEntry); if (0xff == DirEntry->FileNameSize) { break; @@ -721,6 +811,7 @@ // Buffer the directory contents // DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) ); + if (DirectoryBuffer == NULL) { return FALSE; @@ -854,6 +945,7 @@ } fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset)); + fat = SWAPW(fat); if (Cluster & 0x0001) fat = fat >> 4; /* Cluster number is ODD */ else @@ -874,6 +966,7 @@ } fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset)); + fat = SWAPW(fat); break; @@ -891,6 +984,7 @@ // Get the fat entry fat = (*((ULONG *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset))) & 0x0FFFFFFF; + fat = SWAPD(fat); break;

1 0

[jimtabor] 26445: Fix my code so it can compile.
by jimtabor＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: jimtabor Date: Sat Apr 21 03:53:04 2007 New Revision: 26445 URL: http://svn.reactos.org/svn/reactos?rev=26445&view=rev Log: Fix my code so it can compile. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Sat Apr 21 03:53:04 2007 @@ -43,6 +43,7 @@ (ULONG) inPolygons, GdiPolyPolyRgn ); */ + return (HRGN) NULL; }

1 0

[jimtabor] 26444: Implement CreatePolygonRgn and partial implementation of CreatePolyPolygonRgn. Need to implement NtGdiPolyPolyDraw. It is stubbed in my tree.
by jimtabor＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: jimtabor Date: Sat Apr 21 03:50:44 2007 New Revision: 26444 URL: http://svn.reactos.org/svn/reactos?rev=26444&view=rev Log: Implement CreatePolygonRgn and partial implementation of CreatePolyPolygonRgn. Need to implement NtGdiPolyPolyDraw. It is stubbed in my tree. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Sat Apr 21 03:50:44 2007 @@ -21,3 +21,28 @@ else return 0; } + +HRGN +WINAPI +CreatePolygonRgn( const POINT* Point, int Count, int Mode) +{ + return CreatePolyPolygonRgn(Point, (const INT*)&Count, 1, Mode); +} + + +HRGN +WINAPI +CreatePolyPolygonRgn( const POINT* Point, + const INT* Count, + int inPolygons, + int Mode) +{ +/* return (HRGN) NtGdiPolyPolyDraw( (HDC) Mode, + (PPOINT) Point, + (PULONG) Count, + (ULONG) inPolygons, + GdiPolyPolyRgn ); +*/ +} + +

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
38
Older →

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 April 2007