Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ea] 18217: Add stub for RtlSetProcessIsCritical.
by ea＠svn.reactos.com 02 Oct '05

02 Oct '05

Add stub for RtlSetProcessIsCritical. Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/rtl/process.c _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-10-02 14:10:05 UTC (rev 18216) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-10-02 15:50:30 UTC (rev 18217) @@ -621,6 +621,7 @@ RtlSetLastWin32Error@4 RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 RtlSetOwnerSecurityDescriptor@12 +RtlSetProcessIsCritical@12 RtlSetSaclSecurityDescriptor@16 RtlSetSecurityDescriptorRMControl@8 RtlSetSecurityObject@20 _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-10-02 14:10:05 UTC (rev 18216) +++ trunk/reactos/lib/rtl/process.c 2005-10-02 15:50:30 UTC (rev 18217) @@ -340,4 +340,18 @@ return (PVOID)((ULONG_PTR)Pointer ^ Cookie); } +/* + * @unimplemented + */ +NTSYSAPI +VOID +NTAPI +RtlSetProcessIsCritical( + IN BOOLEAN NewValue, + OUT PBOOLEAN OldValue OPTIONAL, + IN BOOLEAN IsWinlogon) +{ + //TODO +} + /* EOF */

1 0

[ekohl] 18216: Named pipes must be opened for asynchronous access.
by ekohl＠svn.reactos.com 02 Oct '05

02 Oct '05

Named pipes must be opened for asynchronous access. This fixes bug #826. Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c _____ Modified: trunk/reactos/lib/rpcrt4/rpc_binding.c --- trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-10-02 13:54:32 UTC (rev 18215) +++ trunk/reactos/lib/rpcrt4/rpc_binding.c 2005-10-02 14:10:05 UTC (rev 18216) @@ -142,7 +142,7 @@ pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, + Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname); @@ -167,7 +167,7 @@ pname = HeapAlloc(GetProcessHeap(), 0, strlen(prefix) + strlen(Connection->Endpoint) + 1); strcat(strcpy(pname, prefix), Connection->Endpoint); TRACE("listening on %s\n", pname); - Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, + Connection->conn = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); HeapFree(GetProcessHeap(), 0, pname);

1 0

[weiden] 18215: sizeof(HelloString) does already contain the terminating NULL. Thanks to Hartmut.
by weiden＠svn.reactos.com 02 Oct '05

02 Oct '05

sizeof(HelloString) does already contain the terminating NULL. Thanks to Hartmut. Modified: trunk/reactos/lib/hid/hid.c _____ Modified: trunk/reactos/lib/hid/hid.c --- trunk/reactos/lib/hid/hid.c 2005-10-02 13:47:48 UTC (rev 18214) +++ trunk/reactos/lib/hid/hid.c 2005-10-02 13:54:32 UTC (rev 18215) @@ -369,14 +369,13 @@ IN ULONG BufferLength) { const CHAR HelloString[] = "Hello\n"; - ULONG StrSize = sizeof(HelloString) + sizeof(HelloString[0]); if(BufferLength > 0) { - memcpy(Buffer, HelloString, min(StrSize, BufferLength)); + memcpy(Buffer, HelloString, min(sizeof(HelloString), BufferLength)); } - return StrSize; + return sizeof(HelloString); }

1 0

[weiden] 18214: fixed difference in signedness warnings
by weiden＠svn.reactos.com 02 Oct '05

02 Oct '05

fixed difference in signedness warnings Modified: trunk/reactos/lib/ddraw/main/ddraw.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/ddraw.c --- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-02 12:46:49 UTC (rev 18213) +++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-02 13:47:48 UTC (rev 18214) @@ -151,7 +151,7 @@ ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedIncrement(&This->DirectDrawGlobal.dwRefCnt); + ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); return ref; } @@ -159,7 +159,7 @@ ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref = InterlockedDecrement(&This->DirectDrawGlobal.dwRefCnt); + ULONG ref = InterlockedDecrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); if (ref == 0) { _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-02 12:46:49 UTC (rev 18213) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-02 13:47:48 UTC (rev 18214) @@ -37,7 +37,7 @@ typedef struct { IDirectDrawSurface7Vtbl* lpVtbl; - DWORD ref; + LONG ref; IDirectDrawImpl* owner; @@ -49,7 +49,7 @@ typedef struct { IDirectDrawClipperVtbl* lpVtbl; - DWORD ref; + LONG ref; IDirectDrawImpl* owner; @@ -61,7 +61,7 @@ typedef struct { IDirectDrawPaletteVtbl* lpVtbl; - DWORD ref; + LONG ref; IDirectDrawImpl* owner;

1 0

[weiden] 18213: minor changes (mostly formatting)
by weiden＠svn.reactos.com 02 Oct '05

02 Oct '05

minor changes (mostly formatting) Modified: trunk/reactos/lib/hid/hid.c Modified: trunk/reactos/lib/shellext/slayer/slayer.c _____ Modified: trunk/reactos/lib/hid/hid.c --- trunk/reactos/lib/hid/hid.c 2005-10-02 12:27:54 UTC (rev 18212) +++ trunk/reactos/lib/hid/hid.c 2005-10-02 12:46:49 UTC (rev 18213) @@ -368,8 +368,8 @@ HidD_Hello(OUT PCHAR Buffer, IN ULONG BufferLength) { - const PCHAR HelloString = "Hello\n"; - ULONG StrSize = (lstrlenA(HelloString) + 1) * sizeof(CHAR); + const CHAR HelloString[] = "Hello\n"; + ULONG StrSize = sizeof(HelloString) + sizeof(HelloString[0]); if(BufferLength > 0) { _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.c --- trunk/reactos/lib/shellext/slayer/slayer.c 2005-10-02 12:27:54 UTC (rev 18212) +++ trunk/reactos/lib/shellext/slayer/slayer.c 2005-10-02 12:46:49 UTC (rev 18213) @@ -28,7 +28,7 @@ #include <precomp.h> HINSTANCE hInstance = NULL; -LONG dllrefs = 0; +static LONG dllrefs = 0; /* FIXME - they should be exported somewhere instead of defined here... */ DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); @@ -1051,9 +1051,9 @@ TCHAR szModule[MAX_PATH + 1]; int lnszDescription; - if(!GetModuleFileName(hInstance, - szModule, - sizeof(szModule) / sizeof(szModule[0]))) + if (!GetModuleFileName(hInstance, + szModule, + sizeof(szModule) / sizeof(szModule[0]))) { return E_ACCESSDENIED; }

1 0

[weiden] 18212: make the tree compilable again...
by weiden＠svn.reactos.com 02 Oct '05

02 Oct '05

make the tree compilable again... Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/ntoskrnl/ke/sem.c _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-10-02 12:25:42 UTC (rev 18211) +++ trunk/reactos/include/ndk/pstypes.h 2005-10-02 12:27:54 UTC (rev 18212) @@ -13,8 +13,8 @@ #include "ldrtypes.h" #include "mmtypes.h" #include "obtypes.h" -//#include "extypes.h" #ifndef NTOS_MODE_USER +#include "extypes.h" #include "setypes.h" #endif _____ Modified: trunk/reactos/ntoskrnl/ke/sem.c --- trunk/reactos/ntoskrnl/ke/sem.c 2005-10-02 12:25:42 UTC (rev 18211) +++ trunk/reactos/ntoskrnl/ke/sem.c 2005-10-02 12:27:54 UTC (rev 18212) @@ -76,7 +76,7 @@ LONG Adjustment, BOOLEAN Wait) { - LONG InitialState, ULONG State; + LONG InitialState, State; KIRQL OldIrql; PKTHREAD CurrentThread; @@ -91,7 +91,7 @@ /* Save the Old State and get new one */ InitialState = Semaphore->Header.SignalState; - State = InitialState + Adjustement; + State = InitialState + Adjustment; /* Check if the Limit was exceeded */ if ((Semaphore->Limit < State) || (InitialState > State)) @@ -105,7 +105,7 @@ Semaphore->Header.SignalState = State; /* Check if we should wake it */ - if (!(InitialState) && !(IsListEmpty(&Semaphore->Header.WaitListHead)) + if (!(InitialState) && !(IsListEmpty(&Semaphore->Header.WaitListHead))) { /* Wake the Semaphore */ KiWaitTest(&Semaphore->Header, Increment);

1 0

[mf] 18211: fix directory traversing in explorer SDI windows
by mf＠svn.reactos.com 02 Oct '05

02 Oct '05

fix directory traversing in explorer SDI windows Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-02 12:24:10 UTC (rev 18210) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-10-02 12:25:42 UTC (rev 18211) @@ -112,6 +112,8 @@ -> see FileChildWindow::FileChildWindow() */ + LOG(FmtString(TEXT("ShellBrowser::jump_to(): pidl=%s"), (LPCTSTR)FileSysShellPath(pidl))); + if (_cur_dir) { static DynamicFct<LPITEMIDLIST(WINAPI*)(LPCITEMIDLIST, LPCITEMIDLIST)> ILFindChild(TEXT("SHELL32"), 24); @@ -127,8 +129,10 @@ entry = _cur_dir->find_entry(child_pidl); - if (entry) + if (entry) { + _cur_dir = static_cast<ShellDirectory*>(entry); _callback->entry_selected(entry); + } } }

1 0

[mf] 18210: fix enabling of split border
by mf＠svn.reactos.com 02 Oct '05

02 Oct '05

fix enabling of split border Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 11:40:41 UTC (rev 18209) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 12:24:10 UTC (rev 18210) @@ -93,6 +93,7 @@ LPCITEMIDLIST parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[0]); ShellFolder folder(parent_pidl); + LOG(FmtString(TEXT("MainFrameBase::OpenShellFolders(): parent_pidl=%s"), (LPCTSTR)FileSysShellPath(parent_pidl))); for(int i=pida->cidl; i>0; --i) { LPCITEMIDLIST pidl = (LPCITEMIDLIST) ((LPBYTE)pida+pida->aoffset[i]); @@ -109,6 +110,7 @@ bool separateFolders = XMLBool(explorer_options, "separate-folders", true); ShellPath pidl_abs = ShellPath(pidl).create_absolute_pidl(parent_pidl); + LOG(FmtString(TEXT("MainFrameBase::OpenShellFolders(): pidl_abs=%s"), (LPCTSTR)FileSysShellPath(pidl_abs))); if (hFrameWnd && (mdi || !separateFolders)) { int flags = OWM_PIDL; @@ -922,7 +924,7 @@ path = fsp; if (path) { - LOG(FmtString(TEXT("PM_OPEN_WINDOW: path=%s"), path)); + LOG(FmtString(TEXT("MDIMainFrame PM_OPEN_WINDOW: path=%s"), path)); lstrcpy(buffer, path); path = buffer; } @@ -1354,47 +1356,52 @@ case WM_PAINT: { PaintCanvas canvas(_hwnd); - ClientRect rt(_hwnd); - rt.left = _split_pos-SPLIT_WIDTH/2; - rt.right = _split_pos+SPLIT_WIDTH/2+1; - if (_right_hwnd) { - WindowRect right_rect(_right_hwnd); - ScreenToClient(_hwnd, &right_rect); - rt.top = right_rect.top; - rt.bottom = right_rect.bottom; + if (_left_hwnd) { + ClientRect rt(_hwnd); + rt.left = _split_pos-SPLIT_WIDTH/2; + rt.right = _split_pos+SPLIT_WIDTH/2+1; + + if (_right_hwnd) { + WindowRect right_rect(_right_hwnd); + ScreenToClient(_hwnd, &right_rect); + rt.top = right_rect.top; + rt.bottom = right_rect.bottom; + } + + HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(COLOR_SPLITBAR)); + Rectangle(canvas, rt.left, rt.top-1, rt.right, rt.bottom+1); + SelectObject(canvas, lastBrush); } - - HBRUSH lastBrush = SelectBrush(canvas, GetStockBrush(COLOR_SPLITBAR)); - Rectangle(canvas, rt.left, rt.top-1, rt.right, rt.bottom+1); - SelectObject(canvas, lastBrush); break;} case WM_SETCURSOR: - if (LOWORD(lparam) == HTCLIENT) { - POINT pt; - GetCursorPos(&pt); - ScreenToClient(_hwnd, &pt); + if (_left_hwnd) + if (LOWORD(lparam) == HTCLIENT) { + POINT pt; + GetCursorPos(&pt); + ScreenToClient(_hwnd, &pt); - if (pt.x>=_split_pos-SPLIT_WIDTH/2 && pt.x<_split_pos+SPLIT_WIDTH/2+1) { - SetCursor(LoadCursor(0, IDC_SIZEWE)); - return TRUE; + if (pt.x>=_split_pos-SPLIT_WIDTH/2 && pt.x<_split_pos+SPLIT_WIDTH/2+1) { + SetCursor(LoadCursor(0, IDC_SIZEWE)); + return TRUE; + } } - } goto def; - case WM_LBUTTONDOWN: { - int x = GET_X_LPARAM(lparam); + case WM_LBUTTONDOWN: + if (_left_hwnd) { + int x = GET_X_LPARAM(lparam); - ClientRect rt(_hwnd); + ClientRect rt(_hwnd); - if (x>=_split_pos-SPLIT_WIDTH/2 && x<_split_pos+SPLIT_WIDTH/2+1) { - _last_split = _split_pos; - SetCapture(_hwnd); + if (x>=_split_pos-SPLIT_WIDTH/2 && x<_split_pos+SPLIT_WIDTH/2+1) { + _last_split = _split_pos; + SetCapture(_hwnd); + } } + break; - break;} - case WM_LBUTTONUP: if (GetCapture() == _hwnd) ReleaseCapture(); @@ -1445,7 +1452,7 @@ path = fsp; if (path) { - LOG(FmtString(TEXT("PM_OPEN_WINDOW: path=%s"), path)); + LOG(FmtString(TEXT("SDIMainFrame PM_OPEN_WINDOW: path=%s"), path)); lstrcpy(buffer, path); path = buffer; } @@ -1548,7 +1555,7 @@ hdwp = DeferWindowPos(hdwp, _left_hwnd, 0, _clnt_rect.left, _clnt_rect.top, _split_pos-SPLIT_WIDTH/2-_clnt_rect.left, _clnt_rect.bottom-_clnt_rect.top, SWP_NOZORDER|SWP_NOACTIVATE); } else { - //_split_pos = 0; + //_split_pos = -1; cx = 0; } @@ -1661,7 +1668,7 @@ } else */{ _shellpath_info._open_mode = mode; _shellpath_info._shell_path = path; - _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ + _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ path update_shell_browser(); } @@ -1678,7 +1685,7 @@ } else { _shellpath_info._open_mode = mode; _shellpath_info._shell_path = path; - _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ + _shellpath_info._root_shell_path = path; //@@ MF 02.10.2005 was: SpecialFolderPath(CSIDL_DRIVES, _hwnd); update_shell_browser(); }

1 0

[mf] 18209: new option to open explorer subfolders in separate windows
by mf＠svn.reactos.com 02 Oct '05

02 Oct '05

new option to open explorer subfolders in separate windows Modified: trunk/reactos/subsys/system/explorer/dialogs/settings.cpp Modified: trunk/reactos/subsys/system/explorer/explorer-cfg-template.xml Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/settings.cpp --- trunk/reactos/subsys/system/explorer/dialogs/settings.cpp 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/dialogs/settings.cpp 2005-10-02 11:40:41 UTC (rev 18209) @@ -238,10 +238,13 @@ XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); bool mdi = XMLBool(explorer_options, "mdi", true); + bool separateFolders = XMLBool(explorer_options, "separate-folders", true); int id = mdi? IDC_MDI: IDC_SDI; CheckDlgButton(hwnd, id, BST_CHECKED); SetFocus(GetDlgItem(hwnd, id)); + + CheckDlgButton(hwnd, IDC_SEPARATE_SUBFOLDERS, separateFolders?BST_CHECKED:BST_UNCHECKED); } int MdiSdiDlg::Command(int id, int code) @@ -250,8 +253,12 @@ switch(id) { case IDOK: { bool mdi = IsDlgButtonChecked(_hwnd, IDC_MDI)==BST_CHECKED; + bool separateFolders = IsDlgButtonChecked(_hwnd, IDC_SEPARATE_SUBFOLDERS)==BST_CHECKED; + XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); + XMLBoolRef(explorer_options, "mdi") = mdi; + XMLBoolRef(explorer_options, "separate-folders") = separateFolders; } // fall through case IDCANCEL: _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cfg-template.xml --- trunk/reactos/subsys/system/explorer/explorer-cfg-template.xml 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-cfg-template.xml 2005-10-02 11:40:41 UTC (rev 18209) @@ -2,14 +2,13 @@ <explorer-cfg> <general> <look-and-feel name="classic"/> - <explorer mdi="true"/> + <explorer mdi="true" separate-folders="true"/> <language name="EN"/> </general> <desktop> <icon-alignment algorithm="simple" start="left-top" direction="horizontal"/> </desktop> - <desktopbar> <options show-clock="true"/> <positions> _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-02 11:40:41 UTC (rev 18209) @@ -362,7 +362,7 @@ PUSHBUTTON "&ZruÜit",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Volba MDI / SDI m¾du" @@ -371,15 +371,18 @@ LTEXT "ProsÝm zvolte si Vßmi up°ednost?ovan² zp¨sob zobrazenÝ oken pr¨zkumnÝka:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Mnoho dokumentov² interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 + CONTROL "&SDI (Jedno dokumentov² interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,115,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 - CONTROL "&SDI (Jedno dokumentov² interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,115,10 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 LTEXT "Toto nastavenÝ bude pou×ito jako implicitnÝ pro vÜechny okna pr¨zkumnÝka.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&Nastavit",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&ZruÜit",IDCANCEL,106,105,50,14 + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&Nastavit",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&ZruÜit",IDCANCEL,106,136,50,14 END _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-02 11:40:41 UTC (rev 18209) @@ -360,24 +360,27 @@ PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Choose MDI / SDI mode" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN LTEXT "Please select your prefered explorer user interface:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 - CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL "&SDI (single document interface)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,115,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 LTEXT "This setting will be used as default for all explorer windows in the future.", - IDC_STATIC,7,91,174,22 - DEFPUSHBUTTON "&OK",IDOK,29,117,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,106,117,50,14 + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 END _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-02 11:40:41 UTC (rev 18209) @@ -360,22 +360,27 @@ PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Elegir modo MDI / SDI" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", IDC_STATIC,7,7,170,18 CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,123,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,123,10 CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,116,10 + BS_AUTORADIOBUTTON,7,62,116,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 LTEXT "Esta configuraci¾n se usarß por defecto y apartir de ahora para todas las ventanas del explorador.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&Aceptar",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Cancelar",IDCANCEL,106,105,50,14 + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&Aceptar",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,106,136,50,14 END _____ Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc --- trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-ru.rc 2005-10-02 11:40:41 UTC (rev 18209) @@ -330,7 +330,7 @@ PUSHBUTTON "&Ð´ÓÔÛÓ",254,158,42,47,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "?¹ßÕÞ?Õ ÕµÞý MDI / SDI" @@ -339,15 +339,18 @@ LTEXT "?¹ßÕÞ?Õ ÝÓÞß¯ÙÕÕ ´Õõ´¯¸?Þ?ÕÙ³Ý¹Ú õÙ ÔÓ±\nÔÞõ ´¯Ô¯õÝÞÛÓ:", IDC_STATIC,7,7,171,17 CONTROL "&MDI (ýÝ¯Ò¯õ¯Û¾ýÕÝ?Ý¹Ú Ý?Õ¶ÕÚ ±)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,136,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,136,10 + CONTROL "&SDI (¯õÝ¯õ¯Û¾ýÕÝ?Ý¹Ú ÞÝ?Õ¶ÕÚ ±)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,134,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 - CONTROL "&SDI (¯õÝ¯õ¯Û¾ýÕÝ?Ý¹Ú ÞÝ?Õ¶ÕÚ ±)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,134,10 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 LTEXT "¦?Þ ÝÓ±?¯ÚÛÞ ß¾õ¾? Þ±´¯Ù³þ¯ÔÓÝÝ¹, ÛÓÛ þÝÓ¸ÕÝÞÕ ´¯ ¾ý¯Ù¸ÓÝÞ? õÙ Ô±Õ§ ¯Û¯Ý ´¯Ô¯õÝÞÛÓ Ô ß¾õ¾¨Õý.", - IDC_STATIC,7,76,174,26 - DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,106,105,50,14 + IDC_STATIC,7,107,174,26 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 END IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 _____ Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc --- trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-10-02 11:40:41 UTC (rev 18209) @@ -397,23 +397,26 @@ PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Võlj MDI / SDI Lõge" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN LTEXT "Võlj det grõnssnitt du f÷redrar:",IDC_STATIC,7,7,160,8 CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 + CONTROL "&SDI (single document interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,115,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 - CONTROL "&SDI (single document interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,115,10 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Open Subfolders in s&eparate windows", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 LTEXT "Den hõr instõllningen kommer att gõlla som standard i alla nya explorer-f÷nster.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Avbryt",IDCANCEL,106,105,50,14 + IDC_STATIC,7,107,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,106,136,50,14 END _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/resource.h 2005-10-02 11:40:41 UTC (rev 18209) @@ -164,6 +164,7 @@ #define IDC_WIN_VERSION 1030 #define IDC_MDI 1030 #define IDC_SDI 1031 +#define IDC_SEPARATE_SUBFOLDERS 1034 #define ID_REFRESH 1704 #define ID_ABOUT_WINEFILE 1705 #define IDS_VERSION_STR 5000 @@ -221,7 +222,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 169 #define _APS_NEXT_COMMAND_VALUE 40024 -#define _APS_NEXT_CONTROL_VALUE 1034 +#define _APS_NEXT_CONTROL_VALUE 1035 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-10-02 11:40:41 UTC (rev 18209) @@ -103,17 +103,24 @@ if (SUCCEEDED(hr)) if (attribs & SFGAO_FOLDER) { try { + XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); + + bool mdi = XMLBool(explorer_options, "mdi", true); + bool separateFolders = XMLBool(explorer_options, "separate-folders", true); + ShellPath pidl_abs = ShellPath(pidl).create_absolute_pidl(parent_pidl); - if (hFrameWnd) { - if (SendMessage(hFrameWnd, PM_OPEN_WINDOW, OWM_PIDL, (LPARAM)(LPCITEMIDLIST)pidl_abs)) + if (hFrameWnd && (mdi || !separateFolders)) { + int flags = OWM_PIDL; + + if (separateFolders) + flags |= OWM_SEPARATE; + + if (SendMessage(hFrameWnd, PM_OPEN_WINDOW, flags, (LPARAM)(LPCITEMIDLIST)pidl_abs)) ++cnt; } else { HWND hwnd; #ifndef _NO_MDI - XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); - bool mdi = XMLBool(explorer_options, "mdi", true); - if (mdi) hwnd = MDIMainFrame::Create(pidl_abs, 0); else @@ -900,7 +907,9 @@ LRESULT MDIMainFrame::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { switch(nmsg) { - case PM_OPEN_WINDOW: {CONTEXT("MDIMainFrame PM_OPEN_WINDOW"); + case PM_OPEN_WINDOW: { + CONTEXT("MDIMainFrame PM_OPEN_WINDOW"); + TCHAR buffer[MAX_PATH]; LPCTSTR path; ShellPath shell_path = DesktopFolderPath(); @@ -940,11 +949,11 @@ // Shell Namespace as default view ShellChildWndInfo create_info(_hmdiclient, path, shell_path); - create_info._pos.showCmd = SW_SHOWMAXIMIZED; - create_info._pos.rcNormalPosition.left = 0; - create_info._pos.rcNormalPosition.top = 0; - create_info._pos.rcNormalPosition.right = 600; - create_info._pos.rcNormalPosition.bottom = 280; + create_info._pos.showCmd = wparam&OWM_SEPARATE? SW_SHOWNORMAL: SW_SHOWMAXIMIZED; + create_info._pos.rcNormalPosition.left = CW_USEDEFAULT; + create_info._pos.rcNormalPosition.top = CW_USEDEFAULT; + create_info._pos.rcNormalPosition.right = CW_USEDEFAULT; + create_info._pos.rcNormalPosition.bottom = CW_USEDEFAULT; create_info._open_mode = (OPEN_WINDOW_MODE)wparam; @@ -1421,7 +1430,9 @@ } break; - case PM_OPEN_WINDOW: {CONTEXT("SDIMainFrame PM_OPEN_WINDOW"); + case PM_OPEN_WINDOW: { + CONTEXT("SDIMainFrame PM_OPEN_WINDOW"); + TCHAR buffer[MAX_PATH]; LPCTSTR path; ShellPath shell_path = DesktopFolderPath(); @@ -1449,9 +1460,10 @@ *buffer = '\0'; path = buffer; + shell_path = path; } - jump_to(shell_path, (OPEN_WINDOW_MODE)wparam); + jump_to(shell_path, (OPEN_WINDOW_MODE)wparam); //@todo content of 'path' not used any more return TRUE;} // success default: def: _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-02 10:33:25 UTC (rev 18208) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2005-10-02 11:40:41 UTC (rev 18209) @@ -27,7 +27,7 @@ #define PM_OPEN_WINDOW (WM_APP+0x07) -enum OPEN_WINDOW_MODE {OWM_EXPLORE=1, OWM_DETAILS=2, OWM_PIDL=4}; +enum OPEN_WINDOW_MODE {OWM_EXPLORE=1, OWM_DETAILS=2, OWM_PIDL=4, OWM_SEPARATE=8}; /// Explorer frame window base class

1 0

[hpoussin] 18208: Add stubs for InstallNewDevice, InstallSelectedDriver, UpdateDriverForPlugAndPlayDevicesA/W
by hpoussin＠svn.reactos.com 02 Oct '05

02 Oct '05

Add stubs for InstallNewDevice, InstallSelectedDriver, UpdateDriverForPlugAndPlayDevicesA/W Modified: trunk/reactos/lib/newdev/newdev.c Modified: trunk/reactos/lib/newdev/newdev.def Added: trunk/reactos/lib/newdev/newdev.h Modified: trunk/reactos/lib/newdev/newdev.xml Added: trunk/reactos/lib/newdev/stubs.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.c 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,37 +1,15 @@ /* - * ReactOS New devices installation - * Copyright (C) 2004 ReactOS Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS New devices installation * FILE: lib/newdev/newdev.c * PURPOSE: New devices installation - * PROGRAMMER: HervÚ Poussineau (hpoussin(a)reactos.org) + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ -#include <windows.h> -#include <setupapi.h> +#include "newdev.h" -ULONG DbgPrint(PCH Format,...); -#define UNIMPLEMENTED \ - DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) -#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - -BOOL +BOOL WINAPI DevInstallW( IN HWND Hwnd, IN HINSTANCE Handle, @@ -44,8 +22,7 @@ DWORD index; BOOL ret; - DbgPrint("OK\n"); - DbgPrint("Installing device %S\n", InstanceId); + DPRINT1("Installing device %S\n", InstanceId); hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); if (hDevInfo == INVALID_HANDLE_VALUE) _____ Modified: trunk/reactos/lib/newdev/newdev.def --- trunk/reactos/lib/newdev/newdev.def 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.def 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,16 +1,15 @@ LIBRARY newdev.dll EXPORTS -DevInstallW +DevInstallW@16 ;InstallDevInst ;InstallDevInstEx -;InstallNewDevice +InstallNewDevice@12 ;InstallSelectedDevice -;InstallSelectedDriver +InstallSelectedDriverW@20 ;InstallWindowsUpdateDriver ;RollbackDriver -;UpdateDriverForPlugAndPlayDevicesA -;UpdateDriverForPlugAndPlayDevicesA@20=UpdateDriverForPlugAndPlayDevice sA -;UpdateDriverForPlugAndPlayDevicesW +UpdateDriverForPlugAndPlayDevicesA@20 +UpdateDriverForPlugAndPlayDevicesW@20 ;EOF \ No newline at end of file _____ Added: trunk/reactos/lib/newdev/newdev.h --- trunk/reactos/lib/newdev/newdev.h 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.h 2005-10-02 10:33:25 UTC (rev 18208) @@ -0,0 +1,7 @@ +#include <windows.h> +#include <setupapi.h> + +ULONG DbgPrint(PCH Format,...); +#define UNIMPLEMENTED \ + DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint Property changes on: trunk/reactos/lib/newdev/newdev.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/newdev/newdev.xml --- trunk/reactos/lib/newdev/newdev.xml 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/newdev.xml 2005-10-02 10:33:25 UTC (rev 18208) @@ -1,6 +1,7 @@ <module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> <importlibrary definition="newdev.def" /> <file>newdev.c</file> + <file>stubs.c</file> <library>ntdll</library> <library>setupapi</library> </module> _____ Added: trunk/reactos/lib/newdev/stubs.c --- trunk/reactos/lib/newdev/stubs.c 2005-10-02 10:07:25 UTC (rev 18207) +++ trunk/reactos/lib/newdev/stubs.c 2005-10-02 10:33:25 UTC (rev 18208) @@ -0,0 +1,61 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS New devices installation + * FILE: lib/newdev/stubs.c + * PURPOSE: Stubs + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#include "newdev.h" + +BOOL WINAPI +InstallNewDevice( + IN HWND hwndParent, + IN LPGUID ClassGuid OPTIONAL, + OUT PDWORD Reboot) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +InstallSelectedDriverW( + IN HWND hwndParent, + IN HDEVINFO DeviceInfoSet, + IN LPCWSTR Reserved, + IN BOOL Backup, + OUT PDWORD pReboot) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesA( + IN HWND hwndParent, + IN LPCSTR HardwareId, + IN LPCSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + +BOOL WINAPI +UpdateDriverForPlugAndPlayDevicesW( + IN HWND hwndParent, + IN LPCWSTR HardwareId, + IN LPCWSTR FullInfPath, + IN DWORD InstallFlags, + OUT PBOOL bRebootRequired OPTIONAL) +{ + UNIMPLEMENTED; + SetLastError(ERROR_GEN_FAILURE); + return FALSE; +} + Property changes on: trunk/reactos/lib/newdev/stubs.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

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