Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[hpoussin] 22825: Import ntdll only once
by hpoussin＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: hpoussin Date: Tue Jul 4 17:49:33 2006 New Revision: 22825 URL: http://svn.reactos.org/svn/reactos?rev=22825&view=rev Log: Import ntdll only once Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22825&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Tue Jul 4 17:49:33 2006 @@ -222,7 +222,10 @@ FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( FOR %%j IN (%%i) DO ( IF "%WINE_VARTYPE%" == "1" ( - IF "%WINE_HAS_NTDLL%" == "" ECHO ^<library^>ntdll^</library^> + IF "!WINE_HAS_NTDLL!" == "" ( + ECHO ^<library^>ntdll^</library^> + SET WINE_HAS_NTDLL=1 + ) ECHO ^<file^>%%j^</file^> ) ELSE IF "%WINE_VARTYPE%" == "2" ( ECHO ^<library^>%%j^</library^>

1 0

[winesync] 22824: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 17:46:00 2006 New Revision: 22824 URL: http://svn.reactos.org/svn/reactos?rev=22824&view=rev Log: Autosyncing with Wine Added: trunk/reactos/dll/win32/comctl32/comctl32.log (with props) 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/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_De.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_En.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (props changed) trunk/reactos/dll/win32/comctl32/comctl_Es.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_It.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Si.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (contents, props changed) trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (contents, props changed) 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/draglist.c trunk/reactos/dll/win32/comctl32/dsa.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/imagelist.h 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/smoothscroll.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/theme_dialog.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.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… Added: trunk/reactos/dll/win32/comctl32/comctl32.log 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/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… 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/comctl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.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/draglist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/draglis… Modified: trunk/reactos/dll/win32/comctl32/dsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dsa.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/imagelist.h 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/smoothscroll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/smooths… 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/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… 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/theme_combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c… Modified: trunk/reactos/dll/win32/comctl32/theme_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_d… Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e… Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_l… 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

[winesync] 22823: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 17:41:25 2006 New Revision: 22823 URL: http://svn.reactos.org/svn/reactos?rev=22823&view=rev Log: Autosyncing with Wine Added: trunk/reactos/dll/win32/cards/cards.spec (with props) trunk/reactos/dll/win32/cards/version.rc (with props) Removed: trunk/reactos/dll/win32/cards/cards.def trunk/reactos/dll/win32/cards/res/ Modified: trunk/reactos/dll/win32/cards/cards.c trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/cards/cards.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… Removed: trunk/reactos/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.def?… Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… Added: trunk/reactos/dll/win32/cards/cards.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.spec… Added: trunk/reactos/dll/win32/cards/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/version.rc…

1 0

[janderwald] 22822: * halfplemented console system menu
by janderwald＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: janderwald Date: Tue Jul 4 17:36:57 2006 New Revision: 22822 URL: http://svn.reactos.org/svn/reactos?rev=22822&view=rev Log: * halfplemented console system menu Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/en.rc trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/resource.h trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Tue Jul 4 17:36:57 2006 @@ -20,7 +20,7 @@ /* GLOBALS *******************************************************************/ HANDLE Win32CsrApiHeap; -HINSTANCE Win32CsrDllHandle; +HINSTANCE Win32CsrDllHandle = NULL; static CSRSS_EXPORTED_FUNCS CsrExports; static CSRSS_API_DEFINITION Win32CsrApiDefinitions[] = Modified: trunk/reactos/subsystems/win32/csrss/win32csr/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/en.rc (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/en.rc Tue Jul 4 17:36:57 2006 @@ -26,3 +26,15 @@ LTEXT "If you choose to end the program immediately, you will loose any unsaved data. To end the program now, click End Now", IDC_STATIC,7,53,178,26 END + +STRINGTABLE +BEGIN + IDS_MARK "Mark" + IDS_COPY "Copy\tEnter" + IDS_PASTE "Paste" + IDS_SELECTALL "Select All" + IDS_SCROLL "Scroll" + IDS_FIND "Find..." + IDS_DEFAULTS "Defaults" + IDS_PROPERTIES "Properties" +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Tue Jul 4 17:36:57 2006 @@ -30,6 +30,7 @@ RECT Selection; POINT SelectionStart; BOOL MouseDown; + HMODULE ConsoleLibrary; } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; #ifndef WM_APP @@ -634,6 +635,10 @@ KillTimer(hWnd, 1); Console->PrivateData = NULL; DeleteCriticalSection(&GuiData->Lock); + GetSystemMenu(hWnd, TRUE); + if (GuiData->ConsoleLibrary) + FreeLibrary(GuiData->ConsoleLibrary); + HeapFree(Win32CsrApiHeap, 0, GuiData); } @@ -774,6 +779,160 @@ GuiConsoleUpdateSelection(hWnd, NULL, GuiData); } +} + +static VOID +GuiConsoleShowConsoleProperties(HWND hWnd, BOOL Defaults) +{ + PCSRSS_CONSOLE Console; + PGUI_CONSOLE_DATA GuiData; + APPLET_PROC CPLFunc; + TCHAR szBuffer[MAX_PATH]; + + GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); + + if (GuiData == NULL) + { + DPRINT1("GuiConsoleGetDataPointers failed\n"); + return; + } + if (GuiData->ConsoleLibrary == NULL) + { + GetWindowsDirectory(szBuffer,MAX_PATH); + _tcscat(szBuffer, _T("\\system32\\console.dll")); + GuiData->ConsoleLibrary = LoadLibrary(szBuffer); + + if (GuiData->ConsoleLibrary == NULL) + { + DPRINT1("failed to load console.dll"); + return; + } + } + + CPLFunc = (APPLET_PROC) GetProcAddress(GuiData->ConsoleLibrary, _T("CPlApplet")); + if (!CPLFunc) + { + DPRINT("Error: Console.dll misses CPlApplet export\n"); + return; + } + + if (!CPLFunc(hWnd, CPL_INIT, 0, 0)) + { + DPRINT("Error: failed to initialize console.dll\n"); + return; + } + + if (CPLFunc(hWnd, CPL_GETCOUNT, 0, 0) != 1) + { + DPRINT("Error: console.dll returned unexpected CPL count\n"); + return; + } + + CPLFunc(hWnd, CPL_DBLCLK, 0, Defaults); + + // TODO + // + // read back the changes from console.dll + // + // if the changes are system-wide then + // console.dll should have written it to + // registry + // + // if the changes only apply to this session + // then exchange this info with console.dll in + // some private way +} +static LRESULT FASTCALL +GuiConsoleHandleSysMenuCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + DPRINT1("GuiConsoleHandleSysMenuCommand entered %d\n", wParam); + + switch(wParam) + { + case IDS_MARK: + case IDS_COPY: + case IDS_PASTE: + case IDS_SELECTALL: + case IDS_SCROLL: + case IDS_FIND: + break; + + case IDS_DEFAULTS: + GuiConsoleShowConsoleProperties(hWnd, TRUE); + break; + case IDS_PROPERTIES: + GuiConsoleShowConsoleProperties(hWnd, FALSE); + break; + default: + break; + } + + return 0; +} +static BOOLEAN FASTCALL +InsertItem(HMENU hMenu, INT fType, INT fMask, INT fState, HMENU hSubMenu, INT ResourceId) +{ + MENUITEMINFO MenuItemInfo; + TCHAR szBuffer[MAX_PATH]; + + memset(&MenuItemInfo, 0x0, sizeof(MENUITEMINFO)); + MenuItemInfo.cbSize = sizeof (MENUITEMINFO); + MenuItemInfo.fMask = fMask; + MenuItemInfo.fType = fType; + MenuItemInfo.fState = fState; + MenuItemInfo.hSubMenu = hSubMenu; + MenuItemInfo.wID = ResourceId; + + if (fType != MFT_SEPARATOR) + { + MenuItemInfo.cch = LoadString(Win32CsrDllHandle, ResourceId, szBuffer, MAX_PATH); + if (!MenuItemInfo.cch) + { + DPRINT("LoadString failed ResourceId %d Error %x\n", ResourceId, GetLastError()); + return FALSE; + } + MenuItemInfo.dwTypeData = szBuffer; + } + + if (InsertMenuItem(hMenu, ResourceId, FALSE, &MenuItemInfo)) + return TRUE; + + DPRINT("InsertMenuItem failed Last error %x\n", GetLastError()); + return FALSE; +} + + + +static VOID FASTCALL +GuiConsoleCreateSysMenu(HWND hWnd) +{ + HMENU hMenu; + HMENU hSubMenu; + + + hMenu = GetSystemMenu(hWnd, FALSE); + if (hMenu == NULL) + { + DPRINT("GetSysMenu failed\n"); + return; + } + /* insert seperator */ + InsertItem(hMenu, MFT_SEPARATOR, MIIM_FTYPE, 0, NULL, -1); + + /* create submenu */ + hSubMenu = CreatePopupMenu(); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_MARK); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING | MIIM_STATE, MFS_GRAYED, NULL, IDS_COPY); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_PASTE); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SELECTALL); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_SCROLL); + InsertItem(hSubMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_FIND); + InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING | MIIM_SUBMENU, 0, hSubMenu, IDS_EDIT); + + /* create default/properties item */ + InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_DEFAULTS); + InsertItem(hMenu, MIIM_STRING, MIIM_ID | MIIM_FTYPE | MIIM_STRING, 0, NULL, IDS_PROPERTIES); + DrawMenuBar(hWnd); } static LRESULT CALLBACK @@ -817,6 +976,8 @@ case WM_MOUSEMOVE: GuiConsoleMouseMove(hWnd, wParam, lParam); break; + case WM_SYSCOMMAND: + return GuiConsoleHandleSysMenuCommand(hWnd, wParam, lParam); default: Result = DefWindowProcW(hWnd, msg, wParam, lParam); break; @@ -833,6 +994,8 @@ MSG Msg; PWCHAR Buffer, Title; PCSRSS_CONSOLE Console = (PCSRSS_CONSOLE) lParam; + + switch(msg) { @@ -854,7 +1017,7 @@ } NewWindow = CreateWindowW(L"ConsoleWindowClass", Title, - WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, + WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, // | WS_HSCROLL | WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, @@ -870,6 +1033,9 @@ Console->hWindow = NewWindow; if (NULL != NewWindow) { + GuiConsoleCreateSysMenu(NewWindow); + //ShowScrollBar(NewWindow, SB_VERT, FALSE); + //ShowScrollBar(NewWindow, SB_HORZ, FALSE); SetWindowLongW(hWnd, GWL_USERDATA, GetWindowLongW(hWnd, GWL_USERDATA) + 1); ShowWindow(NewWindow, SW_SHOW); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/resource.h (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/resource.h Tue Jul 4 17:36:57 2006 @@ -15,6 +15,21 @@ #define IDC_PROGRESS 101 #define IDC_END_NOW 102 + +#define NCPOPUP_MENU 103 + +#define IDS_EDIT 204 +#define IDS_MARK 205 +#define IDS_COPY 206 +#define IDS_PASTE 207 +#define IDS_SELECTALL 208 +#define IDS_SCROLL 209 +#define IDS_FIND 210 +#define IDS_DEFAULTS 211 +#define IDS_PROPERTIES 212 + + + #endif /* WIN32CSR_RESOURCE_H_INCLUDED */ /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Tue Jul 4 17:36:57 2006 @@ -19,4 +19,9 @@ #include "tuiconsole.h" #include <win32csr.h> +#include <tchar.h> +#include <cpl.h> + +#include "resource.h" + /* EOF */

1 0

[winesync] 22821: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 17:33:18 2006 New Revision: 22821 URL: http://svn.reactos.org/svn/reactos?rev=22821&view=rev Log: Autosyncing with Wine Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild Tue Jul 4 17:33:18 2006 @@ -2,21 +2,21 @@ <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> <library>wine</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>iphlpapi</library> <file>cabinet_main.c</file> + <library>ntdll</library> <file>fci.c</file> + <library>ntdll</library> <file>fdi.c</file> + <library>ntdll</library> <file>cabinet.rc</file> <file>cabinet.spec</file> </module>

1 0

[janderwald] 22820: * remove unreferenced parameters warning in font.c layout.c colors.c * remove global structure g_ConsoleInfo * implemented reading/writing of options dialog settings * added apply dialog * thnx to w3seek for help
by janderwald＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: janderwald Date: Tue Jul 4 17:22:05 2006 New Revision: 22820 URL: http://svn.reactos.org/svn/reactos?rev=22820&view=rev Log: * remove unreferenced parameters warning in font.c layout.c colors.c * remove global structure g_ConsoleInfo * implemented reading/writing of options dialog settings * added apply dialog * thnx to w3seek for help Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/font.c trunk/reactos/dll/win32/console/layout.c trunk/reactos/dll/win32/console/options.c trunk/reactos/dll/win32/console/resource.h Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Tue Jul 4 17:22:05 2006 @@ -18,6 +18,10 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Tue Jul 4 17:22:05 2006 @@ -36,6 +36,129 @@ psp->pfnDlgProc = DlgProc; } +BOOL +InitConsoleInfo(HWND hwnd) +{ + PConsoleInfo pConInfo; + STARTUPINFO StartupInfo; + TCHAR * ptr; + SIZE_T length; + + pConInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ConsoleInfo)); + if (!pConInfo) + return FALSE; + + /* initialize struct */ + pConInfo->InsertMode = TRUE; + pConInfo->HistoryBufferSize = 50; + pConInfo->NumberOfHistoryBuffers = 5; + + GetStartupInfo(&StartupInfo); + + if ( StartupInfo.lpTitle ) + { + if ( _tcslen(StartupInfo.lpTitle) ) + { + if ( !GetWindowsDirectory(pConInfo->szProcessName, MAX_PATH) ) + { + HeapFree(GetProcessHeap(), 0, pConInfo); + return FALSE; + } + length = _tcslen(pConInfo->szProcessName); + if ( !_tcsncmp(pConInfo->szProcessName, StartupInfo.lpTitle, length) ) + { + // Windows XP SP2 uses unexpanded environment vars to get path + // i.e. c:\windows\system32\cmd.exe + // becomes + // %SystemRoot%_system32_cmd.exe + + _tcscpy(pConInfo->szProcessName, _T("%SystemRoot%")); + _tcsncpy(&pConInfo->szProcessName[12], &StartupInfo.lpTitle[length], _tcslen(StartupInfo.lpTitle) - length + 1); + + ptr = &pConInfo->szProcessName[12]; + while( (ptr = _tcsstr(ptr, _T("\\"))) ) + ptr[0] = _T('_'); + } + } + else + { + _tcscpy(pConInfo->szProcessName, _T("Console")); + } + } + else + { + _tcscpy(pConInfo->szProcessName, _T("Console")); + } + + SetWindowText(hwnd, pConInfo->szProcessName); + SetWindowLongPtr(hwnd, DWLP_USER , (LONG)pConInfo); + + return TRUE; +} + +INT_PTR +CALLBACK +ApplyProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + HWND hDlgCtrl; + + UNREFERENCED_PARAMETER(lParam) + + switch(uMsg) + { + case WM_INITDIALOG: + { +#if 0 + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_CURRENT); +#else + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_ALL); +#endif + SendMessage(hDlgCtrl, BM_SETCHECK, BST_CHECKED, 0); + return TRUE; + } + case WM_COMMAND: + { + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_APPLY_CURRENT); + if ( SendMessage(hDlgCtrl, BM_GETCHECK, 0, 0) == BST_CHECKED ) + EndDialog(hwndDlg, IDC_RADIO_APPLY_CURRENT); + else + EndDialog(hwndDlg, IDC_RADIO_APPLY_ALL); + } + break; + } + default: + break; + } + return FALSE; + +} + +void +ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo) +{ + INT_PTR res; + + res = DialogBox(hApplet, MAKEINTRESOURCE(IDD_APPLYOPTIONS), hwndDlg, ApplyProc); + + if ( res == IDC_RADIO_APPLY_ALL ) + { + WriteConsoleOptions(pConInfo); + } + else if ( res == IDC_RADIO_APPLY_CURRENT ) + { + /* + * TODO: check if szProcessName != _T("Console") + * in that case notify win32csr that the changes are local + */ + } +} /* Property Sheet Callback */ int CALLBACK @@ -45,66 +168,78 @@ LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) - switch(uMsg) - { - case PSCB_BUTTONPRESSED: - switch(lParam) - { - case PSBTN_OK: /* OK */ - break; - case PSBTN_CANCEL: /* Cancel */ - break; - case PSBTN_APPLYNOW: /* Apply now */ - break; - case PSBTN_FINISH: /* Close */ - break; - default: - return FALSE; - } - break; - - case PSCB_INITIALIZED: - break; - } - return TRUE; + PConsoleInfo pConInfo = (PConsoleInfo) GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch(uMsg) + { + case PSCB_BUTTONPRESSED: + { + switch(lParam) + { + case PSBTN_OK: /* OK */ + { + if ( pConInfo ) + { + ApplyConsoleInfo(hwndDlg, pConInfo); + } + break; + } + case PSBTN_CANCEL: /* Cancel */ + { + break; + } + case PSBTN_FINISH: /* Close */ + { + break; + } + default: + return FALSE; + } + break; + } + case PSCB_INITIALIZED: + { + break; + } + default: + break; + } + return TRUE; } /* First Applet */ LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) { - PROPSHEETPAGE psp[5]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; - INT i=0; - - UNREFERENCED_PARAMETER(hwnd) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) - - memset(Caption, 0x0, sizeof(Caption)); - LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + PROPSHEETPAGE psp[4]; + PROPSHEETHEADER psh; + INT i=0; + + UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + + + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | PSH_PROPTITLE | PSH_USECALLBACK; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.pszCaption = 0; + psh.nPages = 4; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pfnCallback = PropSheetProc; - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.pszCaption = Caption; - psh.nPages = 4; - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = PropSheetProc; - - InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc); - - return (LONG)(PropertySheet(&psh) != -1); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEOPTIONS, (DLGPROC) OptionsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEFONT, (DLGPROC) FontProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGELAYOUT, (DLGPROC) LayoutProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGECOLORS, (DLGPROC) ColorsProc); + + return (PropertySheet(&psh) != -1); } /* Control Panel Callback */ @@ -116,7 +251,7 @@ LPARAM lParam2) { int i = (int)lParam1; - + switch(uMsg) { case CPL_INIT: @@ -130,7 +265,6 @@ case CPL_INQUIRE: { CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; CPlInfo->idIcon = Applets[i].idIcon; CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; @@ -146,7 +280,7 @@ } -BOOLEAN +INT WINAPI DllMain( HINSTANCE hinstDLL, @@ -154,12 +288,6 @@ LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved) - - /* initialize global struct */ - memset(&g_ConsoleInfo, 0x0, sizeof(ConsoleInfo)); - g_ConsoleInfo.InsertMode = TRUE; - g_ConsoleInfo.HistoryBufferSize = 50; - g_ConsoleInfo.NumberOfHistoryBuffers = 5; switch(dwReason) { Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Tue Jul 4 17:22:05 2006 @@ -20,7 +20,7 @@ typedef struct TAGConsoleInfo { - LPSTR szProcessName; + TCHAR szProcessName[MAX_PATH]; DWORD CursorSize; DWORD NumberOfHistoryBuffers; DWORD HistoryBufferSize; @@ -31,6 +31,7 @@ } ConsoleInfo, *PConsoleInfo; -extern ConsoleInfo g_ConsoleInfo; +BOOL WriteConsoleOptions(PConsoleInfo pConInfo); +BOOL InitConsoleInfo(HWND hwnd); #endif /* CONSOLE_H__ */ Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Tue Jul 4 17:22:05 2006 @@ -10,18 +10,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Cursor Size", -1, 15, 15, 120, 70 -CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", 0x50010009, 25, 25, 90, 10 -CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", 0x50010009, 25, 40, 90, 10 -CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", 0x50010009, 25, 55, 90, 10 -GROUPBOX "Display Options", -1, 140, 15, 100, 70 -CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", 0x50010009, 150, 35, 70, 10 -CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", 0x50010009, 150, 50, 70, 10 -GROUPBOX "Command History:", -1, 15, 90, 120, 70 +GROUPBOX "Cursor Size", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 +CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 +CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 +GROUPBOX "Display Options", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP +CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 +CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 +GROUPBOX "Command History:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "&Buffer Size", -1, 25, 100, 60, 15 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 @@ -31,13 +31,13 @@ CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 -GROUPBOX "Edit Options", -1, 140, 90, 100, 70 -CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15 -CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15 +GROUPBOX "Edit Options", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP +CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 220, 220 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Font" FONT 8, "MS Shell Dlg" BEGIN @@ -45,7 +45,7 @@ END IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 220, 220 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Layout" FONT 8, "MS Shell Dlg" BEGIN @@ -53,15 +53,27 @@ END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 220, 220 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" BEGIN LTEXT "This space is intentionally left blank", -1, 55, 103, 120, 10 END +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Apply Properties" +FONT 8, "MS Shell Dlg" +BEGIN +CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_DISABLED, 25, 25, 150, 10 +CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 +PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE +PUSHBUTTON "Cancel", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE +END + STRINGTABLE BEGIN IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." + IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" END Modified: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (original) +++ trunk/reactos/dll/win32/console/font.c Tue Jul 4 17:22:05 2006 @@ -19,6 +19,10 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Tue Jul 4 17:22:05 2006 @@ -18,6 +18,10 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Tue Jul 4 17:22:05 2006 @@ -9,9 +9,6 @@ #include "console.h" - -ConsoleInfo g_ConsoleInfo; - BOOLEAN InitializeOptionsDialog(); INT_PTR @@ -23,11 +20,128 @@ LPARAM lParam ) { + PConsoleInfo pConInfo; + LRESULT lResult; + HWND hDlgCtrl; + LPPSHNOTIFY lppsn; + + pConInfo = (PConsoleInfo) GetWindowLongPtr(GetParent(hwndDlg), DWLP_USER); + switch(uMsg) { case WM_INITDIALOG: + { return InitializeOptionsDialog(hwndDlg); - + } + case WM_NOTIFY: + { + if (!pConInfo) + { + break; + } + lppsn = (LPPSHNOTIFY) lParam; + if (lppsn->hdr.code == UDN_DELTAPOS) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); + pConInfo->HistoryBufferSize = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); + + hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); + pConInfo->NumberOfHistoryBuffers = LOWORD(SendMessage(hDlgCtrl, UDM_GETPOS, 0, 0)); + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + case WM_COMMAND: + { + if (!pConInfo) + { + break; + } + switch(LOWORD(wParam)) + { + case IDC_RADIO_SMALL_CURSOR: + { + pConInfo->CursorSize = 0x0; + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_MEDIUM_CURSOR: + { + pConInfo->CursorSize = 0x32; + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_LARGE_CURSOR: + { + pConInfo->CursorSize = 0x64; + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_DISPLAY_WINDOW: + { + pConInfo->FullScreen = FALSE; + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_RADIO_DISPLAY_FULL: + { + pConInfo->FullScreen = TRUE; + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_QUICK_EDIT: + { + lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + if (lResult == BST_CHECKED) + { + pConInfo->QuickEdit = FALSE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + } + else if (lResult == BST_UNCHECKED) + { + pConInfo->QuickEdit = TRUE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_INSERT_MODE: + { + lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + if (lResult == BST_CHECKED) + { + pConInfo->InsertMode = FALSE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + } + else if (lResult == BST_UNCHECKED) + { + pConInfo->InsertMode = TRUE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + case IDC_CHECK_DISCARD_DUPLICATES: + { + lResult = SendMessage((HWND)lParam, BM_GETCHECK, (WPARAM)0, (LPARAM)0); + if (lResult == BST_CHECKED) + { + pConInfo->HistoryNoDup = FALSE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); + } + else if (lResult == BST_UNCHECKED) + { + pConInfo->HistoryNoDup = TRUE; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + default: + break; + } + break; + } default: break; } @@ -35,7 +149,7 @@ return FALSE; } -BOOL InitializeOptionsFromReg(TCHAR * Path) +BOOL InitializeOptionsFromReg(TCHAR * Path, PConsoleInfo pConInfo) { HKEY hKey; HKEY hSubKey; @@ -66,37 +180,37 @@ if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (BYTE*)&Value, &dwValue) != ERROR_SUCCESS) break; - if ( !_tcscmp(szValueName, _T("CursorSize")) ) - { + if ( !_tcscmp(szValueName, _T("CursorSize")) ) + { if ( Value == 0x32) - g_ConsoleInfo.CursorSize = Value; + pConInfo->CursorSize = Value; else if ( Value == 0x64 ) - g_ConsoleInfo.CursorSize = Value; + pConInfo->CursorSize = Value; } else if ( !_tcscmp(szValueName, _T("NumberOfHistoryBuffers")) ) { - g_ConsoleInfo.NumberOfHistoryBuffers = Value; - } - else if ( !_tcscmp(szValueName, _T("HistoryBufferSize")) ) - { - g_ConsoleInfo.HistoryBufferSize = Value; - } - else if ( !_tcscmp(szValueName, _T("HistoryNoDup")) ) - { - g_ConsoleInfo.HistoryNoDup = Value; - } - else if ( !_tcscmp(szValueName, _T("FullScreen")) ) - { - g_ConsoleInfo.FullScreen = Value; - } - else if ( !_tcscmp(szValueName, _T("QuickEdit")) ) - { - g_ConsoleInfo.QuickEdit = Value; - } - else if ( !_tcscmp(szValueName, _T("InsertMode")) ) - { - g_ConsoleInfo.InsertMode = Value; - } + pConInfo->NumberOfHistoryBuffers = Value; + } + else if ( !_tcscmp(szValueName, _T("HistoryBufferSize")) ) + { + pConInfo->HistoryBufferSize = Value; + } + else if ( !_tcscmp(szValueName, _T("HistoryNoDup")) ) + { + pConInfo->HistoryNoDup = Value; + } + else if ( !_tcscmp(szValueName, _T("FullScreen")) ) + { + pConInfo->FullScreen = Value; + } + else if ( !_tcscmp(szValueName, _T("QuickEdit")) ) + { + pConInfo->QuickEdit = Value; + } + else if ( !_tcscmp(szValueName, _T("InsertMode")) ) + { + pConInfo->InsertMode = Value; + } } RegCloseKey(hKey); @@ -105,13 +219,13 @@ } void -UpdateDialogElements(HWND hwndDlg) +UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) { HWND hDlgCtrl; TCHAR szBuffer[MAX_PATH]; /* update cursor size */ - if ( g_ConsoleInfo.CursorSize == 0 ) + if ( pConInfo->CursorSize == 0 ) { /* small cursor */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); @@ -122,7 +236,7 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } - else if ( g_ConsoleInfo.CursorSize == 0x32 ) + else if ( pConInfo->CursorSize == 0x32 ) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_MEDIUM_CURSOR); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); @@ -132,7 +246,7 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } - else if ( g_ConsoleInfo.CursorSize == 0x64 ) + else if ( pConInfo->CursorSize == 0x64 ) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_LARGE_CURSOR); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); @@ -144,24 +258,30 @@ } /* update num buffers */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); - _stprintf(szBuffer, _T("%d"), g_ConsoleInfo.NumberOfHistoryBuffers); + _stprintf(szBuffer, _T("%d"), pConInfo->NumberOfHistoryBuffers); SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); /* update buffer size */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); + SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); - _stprintf(szBuffer, _T("%d"), g_ConsoleInfo.HistoryBufferSize); + _stprintf(szBuffer, _T("%d"), pConInfo->HistoryBufferSize); SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); + + /* update discard duplicates */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); - if ( g_ConsoleInfo.HistoryNoDup ) + if ( pConInfo->HistoryNoDup ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); /* update full/window screen */ - if ( g_ConsoleInfo.FullScreen ) + if ( pConInfo->FullScreen ) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); @@ -180,14 +300,14 @@ /* update quick edit */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); - if ( g_ConsoleInfo.QuickEdit ) + if ( pConInfo->QuickEdit ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); /* update insert mode */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); - if ( g_ConsoleInfo.InsertMode ) + if ( pConInfo->InsertMode ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); @@ -196,52 +316,68 @@ BOOLEAN InitializeOptionsDialog(HWND hwndDlg) { - STARTUPINFO StartupInfo; - TCHAR szBuffer[MAX_PATH]; - GetStartupInfo(&StartupInfo); - TCHAR * ptr; - DWORD length; - - if ( StartupInfo.lpTitle ) - { - if ( !GetWindowsDirectory(szBuffer, MAX_PATH) ) - return FALSE; - - length = _tcslen(szBuffer); - if ( !_tcsncmp(szBuffer, StartupInfo.lpTitle, length) ) - { - // Windows XP SP2 uses unexpanded environment vars to get path - // i.e. c:\windows\system32\cmd.exe - // becomes - // %SystemRoot%_system32_cmd.exe - - _tcscpy(szBuffer, _T("\%SystemRoot\%")); - _tcsncpy(&szBuffer[12], &StartupInfo.lpTitle[length], _tcslen(StartupInfo.lpTitle) - length + 1); - - ptr = &szBuffer[12]; - while( (ptr = _tcsstr(ptr, _T("\\"))) ) - ptr[0] = _T('_'); - } - - - if ( InitializeOptionsFromReg(szBuffer) ) - { - UpdateDialogElements(hwndDlg); - return TRUE; - } - UpdateDialogElements(hwndDlg); - - } - else - { - - if ( InitializeOptionsFromReg( _T("Console")) ) - { - UpdateDialogElements(hwndDlg); - return TRUE; - - } - } - + PConsoleInfo pConInfo = (PConsoleInfo) GetWindowLongPtr(GetParent(hwndDlg), DWLP_USER); + + if (!pConInfo) + return FALSE; + + InitializeOptionsFromReg(pConInfo->szProcessName, pConInfo); + UpdateDialogElements(hwndDlg, pConInfo); return TRUE; } + +BOOL WriteConsoleOptions(PConsoleInfo pConInfo) +{ + HKEY hKey; + HKEY hSubKey; + + if ( RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hKey) != ERROR_SUCCESS ) + return FALSE; + + + if ( RegOpenKeyEx(hKey, pConInfo->szProcessName, 0, KEY_READ | KEY_SET_VALUE, &hSubKey) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + if ( pConInfo->CursorSize == 0x0) + RegDeleteKey(hSubKey, _T("CursorSize")); + else + RegSetValueEx(hSubKey, _T("CursorSize"), 0, REG_DWORD, (const BYTE *)&pConInfo->CursorSize, sizeof(DWORD)); + + if ( pConInfo->NumberOfHistoryBuffers == 0x5 ) + RegDeleteKey(hSubKey, _T("NumberOfHistoryBuffers")); + else + RegSetValueEx(hSubKey, _T("NumberOfHistoryBuffers"), 0, REG_DWORD, (const BYTE *)&pConInfo->NumberOfHistoryBuffers, sizeof(DWORD)); + + if ( pConInfo->HistoryBufferSize == 50 ) + RegDeleteKey(hSubKey, _T("HistoryBufferSize")); + else + RegSetValueEx(hSubKey, _T("HistoryBufferSize"), 0, REG_DWORD, (const BYTE *)&pConInfo->HistoryBufferSize, sizeof(DWORD)); + + if ( pConInfo->FullScreen == FALSE ) + RegDeleteKey(hSubKey, _T("FullScreen")); + else + RegSetValueEx(hSubKey, _T("FullScreen"), 0, REG_DWORD, (const BYTE *)&pConInfo->FullScreen, sizeof(DWORD)); + + if ( pConInfo->QuickEdit == FALSE) + RegDeleteKey(hSubKey, _T("QuickEdit")); + else + RegSetValueEx(hSubKey, _T("QuickEdit"), 0, REG_DWORD, (const BYTE *)&pConInfo->QuickEdit, sizeof(DWORD)); + + if ( pConInfo->InsertMode == TRUE ) + RegDeleteKey(hSubKey, _T("InsertMode")); + else + RegSetValueEx(hSubKey, _T("InsertMode"), 0, REG_DWORD, (const BYTE *)&pConInfo->InsertMode, sizeof(DWORD)); + + if ( pConInfo->HistoryNoDup == FALSE ) + RegDeleteKey(hSubKey, _T("HistoryNoDup")); + else + RegSetValueEx(hSubKey, _T("HistoryNoDup"), 0, REG_DWORD, (const BYTE *)&pConInfo->HistoryNoDup, sizeof(DWORD)); + + RegCloseKey(hKey); + RegCloseKey(hSubKey); + + return TRUE; +} Modified: trunk/reactos/dll/win32/console/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/resource… ============================================================================== --- trunk/reactos/dll/win32/console/resource.h (original) +++ trunk/reactos/dll/win32/console/resource.h Tue Jul 4 17:22:05 2006 @@ -4,12 +4,15 @@ #define IDC_CPLICON 40 #define IDS_CPLNAME 41 #define IDS_CPLDESCRIPTION 42 +#define IDS_APPLY_SHORTCUT_ALL 43 #define IDD_PROPPAGEOPTIONS 100 #define IDD_PROPPAGEFONT 101 #define IDD_PROPPAGELAYOUT 102 #define IDD_PROPPAGECOLORS 103 +#define IDD_APPLYOPTIONS 104 +//options dialog #define IDC_CHECK_QUICK_EDIT 200 #define IDC_CHECK_INSERT_MODE 201 #define IDC_CHECK_DISCARD_DUPLICATES 202 @@ -23,4 +26,14 @@ #define IDC_RADIO_DISPLAY_WINDOW 210 #define IDC_RADIO_DISPLAY_FULL 211 +// apply dialog +#define IDC_RADIO_APPLY_ALL 300 +#define IDC_RADIO_APPLY_CURRENT 301 + +//font dialog +#define IDC_CHECK_BOLD_FONTS 400 + + + + #endif

1 0

[winesync] 22819: Autosyncing with Wine
by winesync＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: winesync Date: Tue Jul 4 16:05:13 2006 New Revision: 22819 URL: http://svn.reactos.org/svn/reactos?rev=22819&view=rev Log: Autosyncing with Wine Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/mapi32.rbuild trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/sendmail.c (contents, props changed) trunk/reactos/dll/win32/mapi32/util.c Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c Tue Jul 4 16:05:13 2006 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rb… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.rbuild (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild Tue Jul 4 16:05:13 2006 @@ -1,18 +1,23 @@ -<module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll"> +<module name="mapi32" type="win32dll" baseaddress="${BASEADDRESS_MAPI32}" installbase="system32" installname="mapi32.dll" allowwarnings="true"> <importlibrary definition="mapi32.spec.def" /> <include base="mapi32">.</include> <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> - <define name="__WINESRC__" /> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>shlwapi</library> + <library>shell32</library> + <library>ole32</library> + <library>user32</library> + <library>kernel32</library> <library>ntdll</library> - <library>kernel32</library> - <library>shlwapi</library> - <library>wine</library> <library>uuid</library> - <library>advapi32</library> + <file>imalloc.c</file> <file>mapi32_main.c</file> - <file>imalloc.c</file> <file>prop.c</file> <file>sendmail.c</file> <file>util.c</file> Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec Tue Jul 4 16:05:13 2006 @@ -20,8 +20,8 @@ 28 stdcall -private DllCanUnloadNow() 29 stub MAPIOpenFormMgr 30 stub MAPIOpenFormMgr@8 - 31 stub MAPIOpenLocalFormContainer - 32 stub MAPIOpenLocalFormContainer@4 + 31 stdcall MAPIOpenLocalFormContainer(ptr) + 32 stdcall MAPIOpenLocalFormContainer@4(ptr) MAPIOpenLocalFormContainer 33 stdcall ScInitMapiUtil@4(long) ScInitMapiUtil 34 stdcall DeinitMapiUtil@0() DeinitMapiUtil 35 stub ScGenerateMuid@4 @@ -186,6 +186,5 @@ 251 stub GetOutlookVersion@0 252 stub FixMAPI 253 stub FixMAPI@0 -# This entry point is sometimes used to detect if the mapi dll came from Outlook -#254 stub FGetComponentPath -#255 stub FGetComponentPath@20 +254 stdcall FGetComponentPath(str str ptr long long) +255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Tue Jul 4 16:05:13 2006 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> @@ -74,7 +74,7 @@ return SUCCESS_SUCCESS; } -ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password, +ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam, @@ -84,7 +84,7 @@ return SUCCESS_SUCCESS; } -ULONG WINAPI MAPILogoff(LHANDLE session, ULONG uiparam, FLAGS flags, +ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session, @@ -100,6 +100,12 @@ return SUCCESS_SUCCESS; } +HRESULT WINAPI MAPIOpenLocalFormContainer(LPVOID *ppfcnt) +{ + FIXME("(%p) Stub\n", ppfcnt); + return E_FAIL; +} + VOID WINAPI MAPIUninitialize(void) { FIXME("Stub\n"); Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c (original) +++ trunk/reactos/dll/win32/mapi32/prop.c Tue Jul 4 16:05:13 2006 @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> @@ -1404,7 +1404,7 @@ ULONG ulObjAccess; /* Object access level */ ULONG ulNumValues; /* Number of items in values list */ struct list values; /* List of property values */ - RTL_CRITICAL_SECTION cs; /* Lock for thread safety */ + CRITICAL_SECTION cs; /* Lock for thread safety */ } IPropDataImpl; /* Internal - Get a property value, assumes lock is held */ @@ -1461,13 +1461,13 @@ /* Internal - Lock an IPropData object */ static inline void IMAPIPROP_Lock(IPropDataImpl *This) { - RtlEnterCriticalSection(&This->cs); + EnterCriticalSection(&This->cs); } /* Internal - Unlock an IPropData object */ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) { - RtlLeaveCriticalSection(&This->cs); + LeaveCriticalSection(&This->cs); } /* This one seems to be missing from mapidefs.h */ @@ -1553,7 +1553,7 @@ This->lpFree(current->value); This->lpFree(current); } - RtlDeleteCriticalSection(&This->cs); + DeleteCriticalSection(&This->cs); This->lpFree(This); } return (ULONG)lRef; @@ -2542,7 +2542,7 @@ lpPropData->ulObjAccess = IPROP_READWRITE; lpPropData->ulNumValues = 0; list_init(&lpPropData->values); - RtlInitializeCriticalSection(&lpPropData->cs); + InitializeCriticalSection(&lpPropData->cs); *lppPropData = (LPPROPDATA)lpPropData; } return scode; Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c Tue Jul 4 16:05:13 2006 @@ -1,199 +1,199 @@ -/* - * MAPISendMail implementation - * - * Copyright 2005 Hans Leidekker - * - * 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 - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdio.h> -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winnls.h" -#include "objbase.h" -#include "mapi.h" -#include "winreg.h" -#include "shellapi.h" -#include "shlwapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mapi); - -/************************************************************************** - * MAPISendMail (MAPI32.211) - * - * Send a mail. - * - * PARAMS - * session [I] Handle to a MAPI session. - * uiparam [I] Parent window handle. - * message [I] Pointer to a MAPIMessage structure. - * flags [I] Flags. - * reserved [I] Reserved, pass 0. - * - * RETURNS - * Success: SUCCESS_SUCCESS - * Failure: MAPI_E_FAILURE - * - * NOTES - * This is a temporary hack. - */ -ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, - lpMapiMessage message, FLAGS flags, ULONG reserved ) -{ - ULONG ret = MAPI_E_FAILURE; - unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; - unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; - - char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body; - static const char format[] = - "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; - char *mailto = NULL, *escape = NULL; - HRESULT res; - DWORD size; - - TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08lx)\n", session, uiparam, - message, flags, reserved ); - - if (!message) return MAPI_E_FAILURE; - - for (i = 0; i < message->nRecipCount; i++) - { - if (!message->lpRecips) - { - WARN("No recipients found\n"); - return MAPI_E_FAILURE; - } - - address = message->lpRecips[i].lpszAddress; - if (address) - { - switch (message->lpRecips[i].ulRecipClass) - { - case MAPI_ORIG: - TRACE( "From: %s", debugstr_a(address) ); - break; - case MAPI_TO: - TRACE( "To: %s", debugstr_a(address) ); - to_size += lstrlenA( address ) + 1; - break; - case MAPI_CC: - TRACE( "Cc: %s", debugstr_a(address) ); - cc_size += lstrlenA( address ) + 1; - break; - case MAPI_BCC: - TRACE( "Bcc: %s", debugstr_a(address) ); - bcc_size += lstrlenA( address ) + 1; - break; - default: - TRACE( "Unknown recipient class: %ld\n", - message->lpRecips[i].ulRecipClass ); - } - } - else - FIXME("Name resolution and entry identifiers not supported\n"); - } - if (message->nFileCount) FIXME("Ignoring attachments\n"); - - subject = message->lpszSubject ? message->lpszSubject : ""; - body = message->lpszNoteText ? message->lpszNoteText : ""; - - TRACE( "Subject: %s\n", debugstr_a(subject) ); - TRACE( "Body: %s\n", debugstr_a(body) ); - - subj_size = lstrlenA( subject ); - body_size = lstrlenA( body ); - - ret = MAPI_E_INSUFFICIENT_MEMORY; - if (to_size) - { - to = HeapAlloc( GetProcessHeap(), 0, to_size ); - if (!to) goto exit; - } - if (cc_size) - { - cc = HeapAlloc( GetProcessHeap(), 0, cc_size ); - if (!cc) goto exit; - } - if (bcc_size) - { - bcc = HeapAlloc( GetProcessHeap(), 0, bcc_size ); - if (!bcc) goto exit; - } - - if (message->lpOriginator) - TRACE( "From: %s\n", debugstr_a(message->lpOriginator->lpszAddress) ); - - for (i = 0; i < message->nRecipCount; i++) - { - address = message->lpRecips[i].lpszAddress; - if (address) - { - switch (message->lpRecips[i].ulRecipClass) - { - case MAPI_TO: - if (to_count) lstrcatA( to, "," ); - lstrcatA( to, address ); - to_count++; - break; - case MAPI_CC: - if (cc_count) lstrcatA( cc, "," ); - lstrcatA( cc, address ); - cc_count++; - break; - case MAPI_BCC: - if (bcc_count) lstrcatA( bcc, "," ); - lstrcatA( bcc, address ); - bcc_count++; - break; - } - } - } - ret = MAPI_E_FAILURE; - size = sizeof(format) + to_size + cc_size + bcc_size + subj_size + body_size; - - mailto = HeapAlloc( GetProcessHeap(), 0, size ); - if (!mailto) goto exit; - - sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); - - size = 0; - res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); - if (res != E_POINTER) goto exit; - - escape = HeapAlloc( GetProcessHeap(), 0, size ); - if (!escape) goto exit; - - res = UrlEscapeA( mailto, escape, &size, URL_ESCAPE_SPACES_ONLY ); - if (res != S_OK) goto exit; - - if ((UINT_PTR)ShellExecuteA( NULL, "open", escape, NULL, NULL, 0 ) > 32) - ret = SUCCESS_SUCCESS; - -exit: - HeapFree( GetProcessHeap(), 0, to ); - HeapFree( GetProcessHeap(), 0, cc ); - HeapFree( GetProcessHeap(), 0, bcc ); - HeapFree( GetProcessHeap(), 0, mailto ); - HeapFree( GetProcessHeap(), 0, escape ); - - return ret; -} +/* + * MAPISendMail implementation + * + * Copyright 2005 Hans Leidekker + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "objbase.h" +#include "mapi.h" +#include "winreg.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi); + +/************************************************************************** + * MAPISendMail (MAPI32.211) + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessage structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + * NOTES + * This is a temporary hack. + */ +ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, + lpMapiMessage message, FLAGS flags, ULONG reserved ) +{ + ULONG ret = MAPI_E_FAILURE; + unsigned int i, to_count = 0, cc_count = 0, bcc_count = 0; + unsigned int to_size = 0, cc_size = 0, bcc_size = 0, subj_size, body_size; + + char *address = "", *to = NULL, *cc = NULL, *bcc = NULL, *subject, *body; + static const char format[] = + "mailto:\"%s\"?subject=\"%s\"&cc=\"%s\"&bcc=\"%s\"&body=\"%s\""; + char *mailto = NULL, *escape = NULL; + HRESULT res; + DWORD size; + + TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08lx)\n", session, uiparam, + message, flags, reserved ); + + if (!message) return MAPI_E_FAILURE; + + for (i = 0; i < message->nRecipCount; i++) + { + if (!message->lpRecips) + { + WARN("No recipients found\n"); + return MAPI_E_FAILURE; + } + + address = message->lpRecips[i].lpszAddress; + if (address) + { + switch (message->lpRecips[i].ulRecipClass) + { + case MAPI_ORIG: + TRACE( "From: %s", debugstr_a(address) ); + break; + case MAPI_TO: + TRACE( "To: %s", debugstr_a(address) ); + to_size += lstrlenA( address ) + 1; + break; + case MAPI_CC: + TRACE( "Cc: %s", debugstr_a(address) ); + cc_size += lstrlenA( address ) + 1; + break; + case MAPI_BCC: + TRACE( "Bcc: %s", debugstr_a(address) ); + bcc_size += lstrlenA( address ) + 1; + break; + default: + TRACE( "Unknown recipient class: %ld\n", + message->lpRecips[i].ulRecipClass ); + } + } + else + FIXME("Name resolution and entry identifiers not supported\n"); + } + if (message->nFileCount) FIXME("Ignoring attachments\n"); + + subject = message->lpszSubject ? message->lpszSubject : ""; + body = message->lpszNoteText ? message->lpszNoteText : ""; + + TRACE( "Subject: %s\n", debugstr_a(subject) ); + TRACE( "Body: %s\n", debugstr_a(body) ); + + subj_size = lstrlenA( subject ); + body_size = lstrlenA( body ); + + ret = MAPI_E_INSUFFICIENT_MEMORY; + if (to_size) + { + to = HeapAlloc( GetProcessHeap(), 0, to_size ); + if (!to) goto exit; + } + if (cc_size) + { + cc = HeapAlloc( GetProcessHeap(), 0, cc_size ); + if (!cc) goto exit; + } + if (bcc_size) + { + bcc = HeapAlloc( GetProcessHeap(), 0, bcc_size ); + if (!bcc) goto exit; + } + + if (message->lpOriginator) + TRACE( "From: %s\n", debugstr_a(message->lpOriginator->lpszAddress) ); + + for (i = 0; i < message->nRecipCount; i++) + { + address = message->lpRecips[i].lpszAddress; + if (address) + { + switch (message->lpRecips[i].ulRecipClass) + { + case MAPI_TO: + if (to_count) lstrcatA( to, "," ); + lstrcatA( to, address ); + to_count++; + break; + case MAPI_CC: + if (cc_count) lstrcatA( cc, "," ); + lstrcatA( cc, address ); + cc_count++; + break; + case MAPI_BCC: + if (bcc_count) lstrcatA( bcc, "," ); + lstrcatA( bcc, address ); + bcc_count++; + break; + } + } + } + ret = MAPI_E_FAILURE; + size = sizeof(format) + to_size + cc_size + bcc_size + subj_size + body_size; + + mailto = HeapAlloc( GetProcessHeap(), 0, size ); + if (!mailto) goto exit; + + sprintf( mailto, format, to ? to : "", subject, cc ? cc : "", bcc ? bcc : "", body ); + + size = 0; + res = UrlEscapeA( mailto, NULL, &size, URL_ESCAPE_SPACES_ONLY ); + if (res != E_POINTER) goto exit; + + escape = HeapAlloc( GetProcessHeap(), 0, size ); + if (!escape) goto exit; + + res = UrlEscapeA( mailto, escape, &size, URL_ESCAPE_SPACES_ONLY ); + if (res != S_OK) goto exit; + + if ((UINT_PTR)ShellExecuteA( NULL, "open", escape, NULL, NULL, 0 ) > 32) + ret = SUCCESS_SUCCESS; + +exit: + HeapFree( GetProcessHeap(), 0, to ); + HeapFree( GetProcessHeap(), 0, cc ); + HeapFree( GetProcessHeap(), 0, bcc ); + HeapFree( GetProcessHeap(), 0, mailto ); + HeapFree( GetProcessHeap(), 0, escape ); + + return ret; +} Propchange: trunk/reactos/dll/win32/mapi32/sendmail.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c (original) +++ trunk/reactos/dll/win32/mapi32/util.c Tue Jul 4 16:05:13 2006 @@ -15,10 +15,11 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -35,6 +36,7 @@ #include "wine/unicode.h" #include "mapival.h" #include "xcmc.h" +#include "msi.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); @@ -821,3 +823,70 @@ FIXME("stub"); return CMC_E_NOT_SUPPORTED; } + +/************************************************************************** + * FGetComponentPath (MAPI32.254) + * FGetComponentPath@20 (MAPI32.255) + * + * Return the installed component path, usually to the private mapi32.dll. + * + * PARAMS + * component [I] Component ID + * qualifier [I] Application LCID + * dll_path [O] returned component path + * dll_path_length [I] component path length + * install [I] install mode + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. + * + * NOTES + * Previously documented in Q229700 "How to locate the correct path + * to the Mapisvc.inf file in Microsoft Outlook". + */ +BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path, + DWORD dll_path_length, BOOL install) +{ + BOOL ret = FALSE; + HMODULE hmsi; + + TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); + + dll_path[0] = 0; + + hmsi = LoadLibraryA("msi.dll"); + if (hmsi) + { + FARPROC pMsiProvideQualifiedComponentA = GetProcAddress(hmsi, "MsiProvideQualifiedComponentA"); + + if (pMsiProvideQualifiedComponentA) + { + static const char * const fmt[] = { "%d\\NT", "%d\\95", "%d" }; + char lcid_ver[20]; + UINT i; + + for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + { + /* FIXME: what's the correct behaviour here? */ + if (!qualifier || qualifier == lcid_ver) + { + sprintf(lcid_ver, fmt[i], GetUserDefaultUILanguage()); + qualifier = lcid_ver; + } + + if (pMsiProvideQualifiedComponentA(component, qualifier, + install ? INSTALLMODE_DEFAULT : INSTALLMODE_EXISTING, + dll_path, &dll_path_length) == ERROR_SUCCESS) + { + ret = TRUE; + break; + } + + if (qualifier != lcid_ver) break; + } + } + FreeLibrary(hmsi); + } + return ret; +}

1 0

[jimtabor] 22818: - NtUser/CreateWindowExA/W: - During testing I found one application not working with the new mdi support changes. VIDE from the Vgui C++ project was creating a bugcheck trying to access kernel space. Just for precautions I moved the kernel code back into user32. After testing the application, it worked fine. So, I'm reordering the execution of CreateWindowEx. Keeping a small part in kernel space and the rest in user. This has caused code duplication in user32, but I want to se
by jimtabor＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: jimtabor Date: Tue Jul 4 09:56:25 2006 New Revision: 22818 URL: http://svn.reactos.org/svn/reactos?rev=22818&view=rev Log: - NtUser/CreateWindowExA/W: - During testing I found one application not working with the new mdi support changes. VIDE from the Vgui C++ project was creating a bugcheck trying to access kernel space. Just for precautions I moved the kernel code back into user32. After testing the application, it worked fine. So, I'm reordering the execution of CreateWindowEx. Keeping a small part in kernel space and the rest in user. This has caused code duplication in user32, but I want to set this straight first. I will sort out the code duplication later. Sorry for the mess. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Tue Jul 4 09:56:25 2006 @@ -246,16 +246,6 @@ } return TRUE; } - -#ifdef __REACTOS__ -INT -MDI_GetId(HWND hWndClient) -{ - MDICLIENTINFO * ci = get_client_info( hWndClient ); - if(ci) return ci->idFirstChild + ci->nActiveChildren; - return 0; -} -#endif /********************************************************************** Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Tue Jul 4 09:56:25 2006 @@ -10,7 +10,7 @@ */ /* INCLUDES ******************************************************************/ - +#define DEBUG #include <user32.h> #include <wine/debug.h> @@ -18,7 +18,9 @@ BOOL ControlsInitialized = FALSE; LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); -INT MDI_GetId(HWND hWndClient); +void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ); + +#define CW_USEDEFAULT16 0x00008000 /* FUNCTIONS *****************************************************************/ @@ -160,6 +162,7 @@ UNICODE_STRING ClassName; WNDCLASSEXA wce; HWND Handle; + MDICREATESTRUCTA mdi; #if 0 DbgPrint("[window] CreateWindowExA style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); @@ -187,7 +190,72 @@ if (dwExStyle & WS_EX_MDICHILD) { - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU) MDI_GetId(hWndParent); + POINT mPos[2]; + UINT id = 0; + /* lpParams of WM_[NC]CREATE is different for MDI children. + * MDICREATESTRUCT members have the originally passed values. + * + * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW + * have the same layout. + */ + mdi.szClass = (LPCSTR)&lpClassName; + mdi.szTitle = (LPCSTR)&lpWindowName; + mdi.hOwner = hInstance; + mdi.x = x; + mdi.y = y; + mdi.cx = nWidth; + mdi.cy = nHeight; + mdi.style = dwStyle; + mdi.lParam = (LPARAM)lpParam; + + lpParam = (LPVOID)&mdi; + + if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + { + if (dwStyle & WS_POPUP) + { + DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); + return(0); + } + dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); + } + else + { + dwStyle &= ~WS_POPUP; + dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); + } + + HWND top_child = GetWindow(hWndParent, GW_CHILD); + + if (top_child) + { + /* Restore current maximized child */ + if((dwStyle & WS_VISIBLE) && IsZoomed(top_child)) + { + DPRINT("Restoring current maximized child %p\n", top_child); + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow(top_child, SW_RESTORE); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + } + + MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); + + if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + + if (dwStyle & (WS_CHILD | WS_POPUP)) + { + if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) + { + x = mPos[0].x; + y = mPos[0].y; + } + if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) + nWidth = mPos[1].x; + if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) + nHeight = mPos[1].y; + } } if (!RtlCreateUnicodeStringFromAsciiz(&WindowName, (PCSZ)lpWindowName)) @@ -228,6 +296,14 @@ DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); #endif + if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD)) + { + SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); + SetWindowPos(Handle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | + SWP_NOMOVE | SWP_NOSIZE); + } + + RtlFreeUnicodeString(&WindowName); if (!IS_ATOM(lpClassName)) @@ -260,6 +336,8 @@ UNICODE_STRING ClassName; WNDCLASSEXW wce; HANDLE Handle; + MDICREATESTRUCTW mdi; + #if 0 DbgPrint("[window] CreateWindowExA style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); #endif @@ -270,10 +348,76 @@ ControlsInitialized = ControlsInit(lpClassName); } + if (dwExStyle & WS_EX_MDICHILD) - { - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU) MDI_GetId(hWndParent); - } + { + POINT mPos[2]; + UINT id = 0; + /* lpParams of WM_[NC]CREATE is different for MDI children. + * MDICREATESTRUCT members have the originally passed values. + * + * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW + * have the same layout. + */ + mdi.szClass = (LPWSTR)&lpClassName; + mdi.szTitle = (LPWSTR)&lpWindowName; + mdi.hOwner = hInstance; + mdi.x = x; + mdi.y = y; + mdi.cx = nWidth; + mdi.cy = nHeight; + mdi.style = dwStyle; + mdi.lParam = (LPARAM)lpParam; + + lpParam = (LPVOID)&mdi; + + if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + { + if (dwStyle & WS_POPUP) + { + DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); + return(0); + } + dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); + } + else + { + dwStyle &= ~WS_POPUP; + dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX ); + } + + HWND top_child = GetWindow(hWndParent, GW_CHILD); + + if (top_child) + { + /* Restore current maximized child */ + if((dwStyle & WS_VISIBLE) && IsZoomed(top_child)) + { + DPRINT("Restoring current maximized child %p\n", top_child); + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow(top_child, SW_RESTORE); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + } + + MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); + + if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + if (dwStyle &(WS_CHILD | WS_POPUP)) + { + + if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) + { + x = mPos[0].x; + y = mPos[0].y; + } + if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) + nWidth = mPos[1].x; + if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) + nHeight = mPos[1].y; + } + } if (IS_ATOM(lpClassName)) { @@ -310,6 +454,13 @@ lpParam, SW_SHOW, TRUE); + + if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD)) + { + SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); + SetWindowPos((HWND)Handle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | + SWP_NOMOVE | SWP_NOSIZE); + } #if 0 DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Tue Jul 4 09:56:25 2006 @@ -1411,7 +1411,6 @@ POINT Pos; SIZE Size; PW32THREADINFO ti = NULL; - #if 0 POINT MaxSize, MaxPos, MinTrack, MaxTrack; @@ -1420,7 +1419,6 @@ POINT MaxPos; #endif CREATESTRUCTW Cs; - MDICREATESTRUCTW mdi; CBT_CREATEWNDW CbtCreate; LRESULT Result; BOOL MenuChanged; @@ -1627,59 +1625,6 @@ else { RtlInitUnicodeString(&Window->WindowName, NULL); - } - - if (dwExStyle & WS_EX_MDICHILD) - { - PWINDOW_OBJECT top_child; - - /* lpParams of WM_[NC]CREATE is different for MDI children. - * MDICREATESTRUCT members have the originally passed values. - * - * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW - * have the same layout. - */ - mdi.szClass = (LPWSTR)ClassName; - mdi.szTitle = (LPWSTR)WindowName; - mdi.hOwner = hInstance; - mdi.x = x; - mdi.y = y; - mdi.cx = nWidth; - mdi.cy = nHeight; - mdi.style = dwStyle; - mdi.lParam = (LPARAM)lpParam; - - lpParam = (LPVOID)&mdi; - if (ParentWindow->Style & MDIS_ALLCHILDSTYLES) - { - if (dwStyle & WS_POPUP) - { - DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN((HWND)0); - } - dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); - } - else - { - dwStyle &= ~WS_POPUP; - dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); - } - - top_child = ParentWindow->FirstChild; - - if (top_child) - { - /* Restore current maximized child */ - if((dwStyle & WS_VISIBLE) && (top_child->Style & WS_MAXIMIZE)) - { - DPRINT("Restoring current maximized child %p\n", top_child); - co_IntSendMessage( top_child->hSelf, WM_SETREDRAW, FALSE, 0 ); - co_WinPosShowWindow(top_child, SW_RESTORE); - co_IntSendMessage( top_child->hSelf, WM_SETREDRAW, TRUE, 0 ); - } - } } /* @@ -1694,17 +1639,17 @@ dwExStyle &= ~WS_EX_WINDOWEDGE; /* Correct the window style. */ - if (!(dwStyle & WS_CHILD)) - { + if (!(dwStyle & WS_CHILD)) + { dwStyle |= WS_CLIPSIBLINGS; DPRINT("3: Style is now %lx\n", dwStyle); if (!(dwStyle & WS_POPUP)) { - dwStyle |= WS_CAPTION; - Window->Flags |= WINDOWOBJECT_NEED_SIZE; - DPRINT("4: Style is now %lx\n", dwStyle); - } - } + dwStyle |= WS_CAPTION; + Window->Flags |= WINDOWOBJECT_NEED_SIZE; + DPRINT("4: Style is now %lx\n", dwStyle); + } + } /* create system menu */ if((dwStyle & WS_SYSMENU) && @@ -1791,11 +1736,12 @@ Pos.x = rc.left; Pos.y = rc.top; } + /* According to wine, the ShowMode is set to y if x == CW_USEDEFAULT(16) and y is something else. and Quote! */ - + /* Never believe Microsoft's documentation... CreateWindowEx doc says * that if an overlapped window is created with WS_VISIBLE style bit * set and the x parameter is set to CW_USEDEFAULT, the system ignores @@ -1840,51 +1786,20 @@ Pos.x = max(rc.left, 0); if(Pos.y > rc.top) Pos.y = max(rc.top, 0); - } + } } else { - if (dwExStyle & WS_EX_MDICHILD) - { - POINT mPos[2]; - RECT rect; - INT nstagger, total = 0, spacing = UserGetSystemMetrics(SM_CYCAPTION) + - UserGetSystemMetrics(SM_CYFRAME) -1; - PWINDOW_OBJECT Child; - - for (Child = ParentWindow->FirstChild; Child; Child = Child->NextSibling) - ++total; - - IntGetClientRect(ParentWindow, &rect); - - nstagger = (rect.bottom - rect.top)/(3 * spacing); - mPos[1].x = (rect.right - rect.left - nstagger * spacing); - mPos[1].y = (rect.bottom - rect.top - nstagger * spacing); - mPos[0].x = mPos[0].y = spacing * (total%(nstagger+1)); - - if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) - { - Pos.x = mPos[0].x; - Pos.y = mPos[0].y; - } - if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) - Size.cx = mPos[1].x; - if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) - Size.cy = mPos[1].y; - } - else - { - /* if CW_USEDEFAULT(16) is set for non-overlapped windows, both values are set to zero) */ - if(x == CW_USEDEFAULT || x == CW_USEDEFAULT16) - { - Pos.x = 0; - Pos.y = 0; - } - if(nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16) - { - Size.cx = 0; - Size.cy = 0; - } + /* if CW_USEDEFAULT(16) is set for non-overlapped windows, both values are set to zero) */ + if(x == CW_USEDEFAULT || x == CW_USEDEFAULT16) + { + Pos.x = 0; + Pos.y = 0; + } + if(nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16) + { + Size.cx = 0; + Size.cy = 0; } } @@ -2090,13 +2005,6 @@ WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, Window->IDMenu), (LPARAM)Window->hSelf); - } - - if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD)) - { - co_IntSendMessage(ParentWindow->hSelf, WM_MDIREFRESHMENU, 0, 0); - co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | - SWP_NOMOVE | SWP_NOSIZE); } if ((!hWndParent) && (!HasOwner))

1 0

[jimtabor] 22817: Restore tinus patches.
by jimtabor＠svn.reactos.org 04 Jul '06

04 Jul '06

Author: jimtabor Date: Tue Jul 4 06:32:33 2006 New Revision: 22817 URL: http://svn.reactos.org/svn/reactos?rev=22817&view=rev Log: Restore tinus patches. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c Tue Jul 4 06:32:33 2006 @@ -883,7 +883,7 @@ if (!hIcon) hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON); if (!hIcon) - hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadIconW(NULL, IDI_APPLICATION); if (hIcon) { HDC hMemDC; @@ -953,7 +953,7 @@ */ memset(&menuInfo, 0, sizeof(menuInfo)); menuInfo.cbSize = sizeof(menuInfo); - menuInfo.fMask = MIIM_DATA | MIIM_TYPE; + menuInfo.fMask = MIIM_DATA | MIIM_TYPE | MIIM_BITMAP; GetMenuItemInfoW(menu, 0, @@ -1099,10 +1099,9 @@ if( wndPtr->flags & WIN_ISWIN32 ) #endif { -#define ccs ((LPCLIENTCREATESTRUCT) cs->lpCreateParams) + LPCLIENTCREATESTRUCT ccs = (LPCLIENTCREATESTRUCT)cs->lpCreateParams; ci->hWindowMenu = ccs->hWindowMenu; ci->idFirstChild = ccs->idFirstChild; -#undef ccs } #ifndef __REACTOS__ else @@ -1785,23 +1784,30 @@ /* set common info values */ info.cbSize = sizeof(info); - info.fMask = SIF_POS | SIF_RANGE; + info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE; /* set the specific */ + /* Note how we set nPos to 0 because we scroll the clients instead of + * the window, and we set nPage to 1 bigger than the clientRect because + * otherwise the scrollbar never disables. This causes a somewhat ugly + * effect though while scrolling. + */ switch( scroll ) { case SB_BOTH: case SB_HORZ: info.nMin = childRect.left; - info.nMax = childRect.right - clientRect.right; - info.nPos = clientRect.left - childRect.left; + info.nMax = childRect.right; + info.nPos = 0; + info.nPage = 1 + clientRect.right - clientRect.left; SetScrollInfo(hwnd, SB_HORZ, &info, TRUE); if (scroll == SB_HORZ) break; /* fall through */ case SB_VERT: info.nMin = childRect.top; - info.nMax = childRect.bottom - clientRect.bottom; - info.nPos = clientRect.top - childRect.top; + info.nMax = childRect.bottom; + info.nPos = 0; + info.nPage = 1 + clientRect.bottom - clientRect.top; SetScrollInfo(hwnd, SB_VERT, &info, TRUE); break; }

1 0

[jimtabor] 22816: Wine port for DefWindowProcAW WM_NCCREATE help SetText.
by jimtabor＠svn.reactos.org 03 Jul '06

03 Jul '06

Author: jimtabor Date: Tue Jul 4 02:36:09 2006 New Revision: 22816 URL: http://svn.reactos.org/svn/reactos?rev=22816&view=rev Log: Wine port for DefWindowProcAW WM_NCCREATE help SetText. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Tue Jul 4 02:36:09 2006 @@ -1539,7 +1539,23 @@ { case WM_NCCREATE: { - return TRUE; + ANSI_STRING AnsiString; + UNICODE_STRING UnicodeString; + LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + + if(cs->lpszName) + { + RtlInitAnsiString(&AnsiString, (LPSTR)cs->lpszName); + RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); + NtUserDefSetText(hWnd, &UnicodeString); + RtlFreeUnicodeString(&UnicodeString); + } + else + NtUserDefSetText(hWnd, NULL); + + return (1); } case WM_GETTEXTLENGTH: @@ -1618,7 +1634,16 @@ { case WM_NCCREATE: { - return TRUE; + UNICODE_STRING UnicodeString; + LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + + if(cs->lpszName) + RtlInitUnicodeString(&UnicodeString, (LPWSTR)cs->lpszName); + + NtUserDefSetText( hWnd, (cs->lpszName ? &UnicodeString : NULL)); + return (1); } case WM_GETTEXTLENGTH:

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006