Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[jimtabor] 31698: Removed Enhmeta code from win32k.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jan 10 10:42:32 2008 New Revision: 31698 URL: http://svn.reactos.org/svn/reactos?rev=31698&view=rev Log: Removed Enhmeta code from win32k. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Jan 10 10:42:32 2008 @@ -404,9 +404,6 @@ HPALETTE PalIndexed; UNICODE_STRING DriverName; - - HANDLE hFile; - LPENHMETAHEADER emh; } DC, *PDC; #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 10 10:42:32 2008 @@ -1001,11 +1001,6 @@ #if 0 /* FIXME */ PATH_DestroyGdiPath (&DCToDelete->w.path); #endif - - if (DCToDelete->emh) - { - EngFreeMem(DCToDelete->emh); - } DC_UnlockDc( DCToDelete ); DC_FreeDC ( hDC );

16 years, 8 months

[cwittich] 31697: add cpu.inf

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 10 10:37:55 2008 New Revision: 31697 URL: http://svn.reactos.org/svn/reactos?rev=31697&view=rev Log: add cpu.inf Added: trunk/reactos/media/inf/cpu.inf Added: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3169… ============================================================================== --- trunk/reactos/media/inf/cpu.inf (added) +++ trunk/reactos/media/inf/cpu.inf Thu Jan 10 10:37:55 2008 @@ -1,0 +1,46 @@ +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Processor +ClassGUID = {50127DC3-0F36-415e-A6CC-4CB3BE910B65} +Provider = %ReactOS% +DriverVer = 09/27/2007,1.00 + +[ControlFlags] +ExcludeFromSelect = * + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%Intel%=Intel +%Standard%=Standard + +[Standard] +%Processor.DeviceDesc% = NO_DRV,ACPI\Processor + +[Intel] +%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86 + + +;---------------------------- NO DRIVER REQ ----------------------------- + +[NO_DRV] +AddReg=NO_DRV.AddReg + +[NO_DRV.Services] +AddService = , 0x00000002 + +[NO_DRV.HW] + +[NO_DRV.AddReg] +HKR,,EnumPropPages32,,"devcpux.dll,PropSheetExtProc" + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +IntelMfg = "Intel" +Processor.DeviceDesc = "Processor" +IntelProcessor.DeviceDesc = "Intel Processor" +Standard = "Standard processor"

16 years, 8 months

[jimtabor] 31696: Add member items for meta clipping region and bounding rectangle support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jan 10 10:21:02 2008 New Revision: 31696 URL: http://svn.reactos.org/svn/reactos?rev=31696&view=rev Log: Add member items for meta clipping region and bounding rectangle support. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Jan 10 10:21:02 2008 @@ -339,15 +339,18 @@ typedef struct _WIN_DC_INFO { - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + int flags; + + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hrgnMeta; /* Meta region (may be 0) */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ + HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ + + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HBITMAP hBitmap; HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ /* #if 0 */ - HANDLE hDevice; HPALETTE hPalette; GdiPath path; @@ -381,12 +384,15 @@ FLONG flGraphics; FLONG flGraphics2; PDC_ATTR pDc_Attr; + WIN_DC_INFO w; DC_ATTR Dc_Attr; HDC hNext; HDC hPrev; - + RECTL erclClip; RECTL erclWindow; RECTL erclBounds; + HRGN hprgnAPI; + HRGN hprgnVis; CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; @@ -398,7 +404,6 @@ HPALETTE PalIndexed; UNICODE_STRING DriverName; - WIN_DC_INFO w; HANDLE hFile; LPENHMETAHEADER emh; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 10 10:21:02 2008 @@ -1213,9 +1213,6 @@ nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; newdc->w.hBitmap = dc->w.hBitmap; newdc->w.hFirstBitmap = dc->w.hFirstBitmap; -#if 0 - newdc->w.hDevice = dc->w.hDevice; -#endif newdc->PalIndexed = dc->PalIndexed; newdc->w.hPalette = dc->w.hPalette; newdc->w.totalExtent = dc->w.totalExtent; @@ -1287,10 +1284,6 @@ dc->w.hFirstBitmap = dcs->w.hFirstBitmap; -#if 0 - dc->w.hDevice = dcs->w.hDevice; -#endif - Dc_Attr->dwLayout = sDc_Attr->dwLayout; dc->w.totalExtent = dcs->w.totalExtent; Dc_Attr->jROP2 = sDc_Attr->jROP2;

16 years, 8 months

[weiden] 31695: Stop abusing WM_SETCURSOR and use tooltips instead

by weiden＠svn.reactos.org

Author: weiden Date: Thu Jan 10 09:34:46 2008 New Revision: 31695 URL: http://svn.reactos.org/svn/reactos?rev=31695&view=rev Log: Stop abusing WM_SETCURSOR and use tooltips instead Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Thu Jan 10 09:34:46 2008 @@ -10,6 +10,15 @@ #include "options.h" +typedef struct _OPTIONS_DLG +{ + HWND hwndDlg; + HWND hwndToolTip; + HICON hIcon; + HFONT hFont; + SETTINGS Settings; +} OPTIONS_DLG, *POPTIONS_DLG; + HINSTANCE hInstance; BOOL CreateDir(HWND hwnd, WCHAR* dir) @@ -29,7 +38,7 @@ } INT -WriteSettings(HWND hwnd) +WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; @@ -38,29 +47,29 @@ HANDLE hFile; FILE *pFile; - showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); + showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) - if (!CreateDir(hwnd, logdir)) + if (!CreateDir(infoPtr->hwndDlg, logdir)) return FALSE; if (objstate && (objdir[0] != 0)) - if (!CreateDir(hwnd, objdir)) + if (!CreateDir(infoPtr->hwndDlg, objdir)) return FALSE; if (outstate && (outdir[0] != 0)) - if (!CreateDir(hwnd, outdir)) + if (!CreateDir(infoPtr->hwndDlg, outdir)) return FALSE; wcscpy(checkmgw, mingwpath); @@ -70,7 +79,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); return FALSE; } CloseHandle(hFile); @@ -98,17 +107,18 @@ return TRUE; } LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); return FALSE; } -VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) +VOID LoadSettings(POPTIONS_DLG infoPtr) { FILE *pFile; WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; WCHAR WTempLine[25+MAX_PATH]; WCHAR SBTitle[256]; + PSETTINGS LoadedSettings = &infoPtr->Settings; wcscpy(optionsfile, _wgetenv(L"APPDATA")); if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) @@ -154,7 +164,7 @@ fclose(pFile); free(WTempLine); LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256); - SetDlgItemText(hwnd, ID_STATUSBAR, SBTitle); + SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } else { @@ -163,57 +173,61 @@ GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); - } - SendDlgItemMessageW(hwnd, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); - SendDlgItemMessageW(hwnd, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); - SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); - SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); + + LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); + SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); + } + SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); + SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); if (LoadedSettings->writelog) { - EnableWindow(GetDlgItem(hwnd, ID_BROWSE), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_LOGDIR), TRUE); - } - SendDlgItemMessage(hwnd, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); - SendDlgItemMessageW(hwnd, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); - SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); - SetDlgItemText(hwnd, ID_LOGDIR, LoadedSettings->logdir); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSE), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_LOGDIR), TRUE); + } + SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); + SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); + SetDlgItemText(infoPtr->hwndDlg, ID_MGWDIR, LoadedSettings->mingwpath); + SetDlgItemText(infoPtr->hwndDlg, ID_LOGDIR, LoadedSettings->logdir); if (LoadedSettings->objdir[0] != 0) { LoadedSettings->objstate = 1; - SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); - SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwnd, ID_BROWSEOBJ), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_OBJDIR), TRUE); + SetDlgItemText(infoPtr->hwndDlg, ID_OBJDIR, LoadedSettings->objdir); + SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOBJ), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OBJDIR), TRUE); } if (LoadedSettings->outdir[0] != 0) { LoadedSettings->outstate = 1; - SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); - SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwnd, ID_BROWSEOUT), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_OUTDIR), TRUE); - } -} - -VOID SetSaveState(HWND hwnd, PSETTINGS DefaultSettings) + SetDlgItemText(infoPtr->hwndDlg, ID_OUTDIR, LoadedSettings->outdir); + SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOUT), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OUTDIR), TRUE); + } +} + +VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; - - showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessageW(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); + PSETTINGS DefaultSettings = &infoPtr->Settings; + + showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (objstate) if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) @@ -232,45 +246,7 @@ (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && (StateObj) && (StateOut)); - EnableWindow(GetDlgItem(hwnd, ID_OK), State); -} - -BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam) -{ - if (hwndChild == (HWND)lParam) - { - HWND hwndParent; - LONG WindowID; - INT TextID = HLP_DEFAULTMSG; - WCHAR HelpTxt[256]; - hwndParent = GetParent(hwndChild); - WindowID = GetWindowLong(hwndChild, GWL_ID); - switch(WindowID) - { - case IDC_BACK: TextID = HLP_BACKCOLORC; break; - case IDC_FONT: TextID = HLP_FONTCOLORC; break; - case ID_SHOWBUILDTIME: TextID = HLP_SBUILDTIME; break; - case ID_USECCACHE: TextID = HLP_CCACHEUSED; break; - case ID_STRIP: TextID = HLP_STRIPEDEXE; break; - case ID_MGWDIR: - case ID_BROWSEMGW: TextID = HLP_FINDMGWDIR; break; - case ID_LOGDIR: - case ID_BROWSE: - case ID_SAVELOGS: TextID = HLP_FINDLOGDIR; break; - case ID_OBJDIR: - case ID_BROWSEOBJ: - case ID_OTHEROBJ: TextID = HLP_FINDOBJDIR; break; - case ID_OUTDIR: - case ID_BROWSEOUT: - case ID_OTHEROUT: TextID = HLP_FINDOUTDIR; break; - case ID_OK: TextID = HLP_SAVEBUTTON; break; - case ID_CANCEL: TextID = HLP_QUITBUTTON; break; - } - LoadString(hInstance, TextID, HelpTxt, 256); - SetDlgItemText(hwndParent, ID_STATUSBAR, HelpTxt); - return FALSE; - } - return TRUE; + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); } INT CALLBACK @@ -317,32 +293,103 @@ return FALSE; } +static VOID +AssociateToolWithControl(POPTIONS_DLG infoPtr, int ControlId, UINT StringId) +{ + HWND hwndControl; + TOOLINFO ti; + + hwndControl = GetDlgItem(infoPtr->hwndDlg, ControlId); + if (infoPtr->hwndToolTip && hwndControl) + { + ZeroMemory(&ti, sizeof(ti)); + ti.cbSize = sizeof(ti); + ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + ti.hwnd = infoPtr->hwndDlg; + ti.uId = (UINT_PTR)hwndControl; + ti.hinst = hInstance; + ti.lpszText = MAKEINTRESOURCE(StringId); + + SendMessage(infoPtr->hwndToolTip, TTM_ADDTOOL, 0, (LPARAM)&ti); + } +} + INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - static HICON hIcon; - static HFONT hFont; - static SETTINGS Settings; + POPTIONS_DLG infoPtr = NULL; + + if (Msg != WM_INITDIALOG) + { + infoPtr = (POPTIONS_DLG)GetWindowLongPtr(Dlg, DWLP_USER); + if (infoPtr == NULL) + return FALSE; + } switch (Msg) { case WM_INITDIALOG: { + static const struct { + int ControlId; + UINT StringId; + } ToolTipAssociations[] = { + {IDC_BACK, HLP_BACKCOLORC}, + {IDC_FONT, HLP_FONTCOLORC}, + {ID_SHOWBUILDTIME, HLP_SBUILDTIME}, + {ID_USECCACHE, HLP_CCACHEUSED}, + {ID_STRIP, HLP_STRIPEDEXE}, + {ID_MGWDIR, HLP_FINDMGWDIR}, + {ID_BROWSEMGW, HLP_FINDMGWDIR}, + {ID_LOGDIR, HLP_FINDLOGDIR}, + {ID_BROWSE, HLP_FINDLOGDIR}, + {ID_SAVELOGS, HLP_FINDLOGDIR}, + {ID_OBJDIR, HLP_FINDOBJDIR}, + {ID_BROWSEOBJ, HLP_FINDOBJDIR}, + {ID_OTHEROBJ, HLP_FINDOBJDIR}, + {ID_OUTDIR, HLP_FINDOUTDIR}, + {ID_BROWSEOUT, HLP_FINDOUTDIR}, + {ID_OTHEROUT, HLP_FINDOUTDIR}, + {ID_OK, HLP_SAVEBUTTON}, + {ID_CANCEL, HLP_QUITBUTTON}, + }; + int i; LOGFONT lf; WCHAR TempColor[256]; - hIcon = LoadImage( hInstance, - MAKEINTRESOURCE(ID_OPTICON), - IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - 0); - if(hIcon) - SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + infoPtr = (POPTIONS_DLG)lParam; + infoPtr->hwndDlg = Dlg; + + SetWindowLongPtr(Dlg, DWLP_USER, (LONG_PTR)infoPtr); + + infoPtr->hwndToolTip = CreateWindowEx(0, + TOOLTIPS_CLASS, + NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + infoPtr->hwndDlg, + NULL, + hInstance, + NULL); + + for (i = 0; i < sizeof(ToolTipAssociations) / sizeof(ToolTipAssociations[0]); i++) + AssociateToolWithControl(infoPtr, ToolTipAssociations[i].ControlId, ToolTipAssociations[i].StringId); + + infoPtr->hIcon = LoadImage( hInstance, + MAKEINTRESOURCE(ID_OPTICON), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if(infoPtr->hIcon) + SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)infoPtr->hIcon); GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; - hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, + infoPtr->hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf.lfOutPrecision, lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfFaceName); @@ -352,7 +399,7 @@ SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) TempColor); SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) TempColor); } - LoadSettings(Dlg, &Settings); + LoadSettings(infoPtr); return TRUE; } @@ -360,9 +407,7 @@ { if ((HIWORD(wParam) == CBN_SELCHANGE) && ((LOWORD(wParam) == IDC_FONT) || (LOWORD(wParam) == IDC_BACK))) { - RECT rcWnd; - GetClientRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd); - InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd, FALSE); + InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), NULL, FALSE); } else { @@ -370,7 +415,7 @@ { case ID_OK: { - if (!WriteSettings(Dlg)) + if (!WriteSettings(infoPtr)) break; } case ID_CANCEL: @@ -460,7 +505,7 @@ } } - SetSaveState(Dlg, &Settings); + SetSaveState(infoPtr); return FALSE; } @@ -468,14 +513,14 @@ { HFONT hFontOld; // note: do not change the order - it matches to previous order - COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, + static const COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, 0x00008080, 0x00c0c0c0, 0x00808080, 0x00ff0000, 0x0000ff00, 0x00ffff00, 0x000000ff, 0x00ff00ff, 0x0000ffff, 0x00ffffff }; if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { - hFontOld = SelectObject((HDC)wParam, hFont); + hFontOld = SelectObject((HDC)wParam, infoPtr->hFont); SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); @@ -483,16 +528,10 @@ break; } - case WM_SETCURSOR: - { - EnumChildWindows(Dlg, EnumChildProc, (LPARAM)wParam); - return FALSE; - } - case WM_DESTROY: { - if (hIcon) - DestroyIcon(hIcon); + if (infoPtr->hIcon) + DestroyIcon(infoPtr->hIcon); } case WM_CLOSE: @@ -507,8 +546,15 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) { + POPTIONS_DLG OptionsDlgInfo; hInstance = hInst; - DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo)); + if (OptionsDlgInfo != NULL) + { + ZeroMemory(OptionsDlgInfo, sizeof(*OptionsDlgInfo)); + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); + } return 0; }

16 years, 8 months

[jimtabor] 31694: See http://msdn2.microsoft.com/en-us/library/aa293810(VS.60).aspx for details.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jan 10 09:34:37 2008 New Revision: 31694 URL: http://svn.reactos.org/svn/reactos?rev=31694&view=rev Log: See http://msdn2.microsoft.com/en-us/library/aa293810(VS.60).aspx for details. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 10 09:34:37 2008 @@ -3,6 +3,9 @@ #define __WIN32K_DC_H #include "driver.h" + +// Get/SetBounds/Rect support. +#define DCB_WINDOWMGR 0x8000 // Queries the Windows bounding rectangle instead of the application's /* DC flags */ #define DC_SAVED 0x0002 /* It is a saved DC */

16 years, 8 months

[weiden] 31693: Add the ability to determine the cpu count based on the inherited process affinity mask (only for win32 hosts)

by weiden＠svn.reactos.org

Author: weiden Date: Thu Jan 10 08:18:53 2008 New Revision: 31693 URL: http://svn.reactos.org/svn/reactos?rev=31693&view=rev Log: Add the ability to determine the cpu count based on the inherited process affinity mask (only for win32 hosts) Modified: trunk/tools/RosBE/Tools/cpucount.c Modified: trunk/tools/RosBE/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/cpucount.c?rev=3… ============================================================================== --- trunk/tools/RosBE/Tools/cpucount.c (original) +++ trunk/tools/RosBE/Tools/cpucount.c Thu Jan 10 08:18:53 2008 @@ -24,17 +24,41 @@ { int cpuCount = 0; +#if defined(WIN32) + if(argc > 3) +#else if(argc > 2) +#endif { fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } #if defined(WIN32) - SYSTEM_INFO SystemInformation; + if (argc != 1 && !strncmp(argv[argc - 1], "-a", 2)) + { + DWORD_PTR ProcessAffinityMask, SystemAffinityMask; - GetSystemInfo(&SystemInformation); - cpuCount = SystemInformation.dwNumberOfProcessors; + if (GetProcessAffinityMask(GetCurrentProcess(), &ProcessAffinityMask, &SystemAffinityMask)) + { + while (ProcessAffinityMask != 0) + { + if (ProcessAffinityMask & 0x1) + cpuCount++; + + ProcessAffinityMask >>= 1; + } + } + + argc--; /* don't look at this argument again */ + } + else + { + SYSTEM_INFO SystemInformation; + + GetSystemInfo(&SystemInformation); + cpuCount = SystemInformation.dwNumberOfProcessors; + } #elif defined(__APPLE__) size_t countSize = sizeof(cpuCount); @@ -43,7 +67,7 @@ cpuCount = sysconf(_SC_NPROCESSORS_ONLN); #endif - if(argc != 1) + if (argc != 1) { if(!strncmp(argv[1], "-x1", 3)) { @@ -55,11 +79,18 @@ } else { - printf("Usage: %s [OPTIONS]\n", argv[0]); +#if defined(WIN32) + printf("Usage: %s [-x1|-x2] [-a]\n", argv[0]); +#else + printf("Usage: %s [-x1|-x2]\n", argv[0]); +#endif printf("Running cpucount without options returns the number of\n"); printf("processors in the system.\n"); printf("-x1 - Number of processors in the system, plus 1.\n"); printf("-x2 - Number of processors in the system, doubled.\n"); +#if defined(WIN32) + printf("-a - Use the affinity mask to determine number of processors\n"); +#endif return 0; } }

16 years, 8 months

[fireball] 31692: - Fix a typo, spotted by Johannes Anderwald.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 10 01:03:42 2008 New Revision: 31692 URL: http://svn.reactos.org/svn/reactos?rev=31692&view=rev Log: - Fix a typo, spotted by Johannes Anderwald. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Thu Jan 10 01:03:42 2008 @@ -419,7 +419,7 @@ } /* In both cases, we do have a timeout */ - WaitPipeInfo->TimeoutSpecified = FALSE; + WaitPipeInfo->TimeoutSpecified = TRUE; } /* Set the length and copy the name */ @@ -520,7 +520,7 @@ } /* In both cases, we do have a timeout */ - WaitPipe.TimeoutSpecified = FALSE; + WaitPipe.TimeoutSpecified = TRUE; } Status = NtFsControlFile(FileHandle,

16 years, 8 months

[fireball] 31691: - Make WaitNamedPipe (copied from the new implementation #ifdef USING_PROPER_NPFS_WAIT_SEMANTICS) and corresponding part in npfs.sys actually respect the timeout.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 9 23:38:52 2008 New Revision: 31691 URL: http://svn.reactos.org/svn/reactos?rev=31691&view=rev Log: - Make WaitNamedPipe (copied from the new implementation #ifdef USING_PROPER_NPFS_WAIT_SEMANTICS) and corresponding part in npfs.sys actually respect the timeout. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c Wed Jan 9 23:38:52 2008 @@ -498,7 +498,30 @@ return FALSE; } - WaitPipe.Timeout.QuadPart = nTimeOut * -10000LL; + /* Check what timeout we got */ + if (nTimeOut == NMPWAIT_USE_DEFAULT_WAIT) + { + /* Don't use a timeout */ + WaitPipe.TimeoutSpecified = FALSE; + } + else + { + /* Check if we should wait forever */ + if (nTimeOut == NMPWAIT_WAIT_FOREVER) + { + /* Set the max */ + WaitPipe.Timeout.LowPart = 0; + WaitPipe.Timeout.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + WaitPipe.Timeout.QuadPart = UInt32x32To64(-10000, nTimeOut); + } + + /* In both cases, we do have a timeout */ + WaitPipe.TimeoutSpecified = FALSE; + } Status = NtFsControlFile(FileHandle, NULL, Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c Wed Jan 9 23:38:52 2008 @@ -289,6 +289,7 @@ PNPFS_CCB ServerCcb; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipe; NTSTATUS Status; + LARGE_INTEGER TimeOut; DPRINT("NpfsWaitPipe\n"); @@ -320,12 +321,20 @@ current_entry = current_entry->Flink; } - /* no listening server fcb found -- wait for one */ + /* No listening server fcb found */ + + /* If no timeout specified, use the default one */ + if (WaitPipe->TimeoutSpecified) + TimeOut = WaitPipe->Timeout; + else + TimeOut = Fcb->TimeOut; + + /* Wait for one */ Status = KeWaitForSingleObject(&Ccb->ConnectEvent, UserRequest, KernelMode, FALSE, - &WaitPipe->Timeout); + &TimeOut); DPRINT("KeWaitForSingleObject() returned (Status %lx)\n", Status);

16 years, 8 months

[cfinck] 31690: If W32kGetDefaultKeyLayout() is called before a user logged on, fall back to the layout set in HKU\.DEFAULT instead of falling back to US English. This enables the layout set in 1st stage setup also in 2nd stage setup and half-fixes bug 2952. (win32csr will only use the HKU\.DEFAULT setting as it's loaded before a user logged on. Currently, we don't change the keyboard layout for win32csr, when a user logs on).

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 9 20:46:36 2008 New Revision: 31690 URL: http://svn.reactos.org/svn/reactos?rev=31690&view=rev Log: If W32kGetDefaultKeyLayout() is called before a user logged on, fall back to the layout set in HKU\.DEFAULT instead of falling back to US English. This enables the layout set in 1st stage setup also in 2nd stage setup and half-fixes bug 2952. (win32csr will only use the HKU\.DEFAULT setting as it's loaded before a user logged on. Currently, we don't change the keyboard layout for win32csr, when a user logs on). Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Jan 9 20:46:36 2008 @@ -272,6 +272,7 @@ PKBL W32kGetDefaultKeyLayout(VOID) { const WCHAR szKeyboardLayoutPath[] = L"\\Keyboard Layout\\Preload"; + const WCHAR szDefaultUserPath[] = L"\\REGISTRY\\USER\\.DEFAULT"; HANDLE KeyHandle; LCID LayoutLocaleId = 0; @@ -290,41 +291,42 @@ if( NT_SUCCESS(Status) ) { // FIXME: Is this 100% correct? - // We're called very early, so \\REGISTRY\\USER might not be available yet. Check this first. + // We're called very early, so HKEY_CURRENT_USER might not be available yet. Check this first. InitializeObjectAttributes(&KeyAttributes, &CurrentUserPath, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); if(Status == STATUS_OBJECT_NAME_NOT_FOUND) { - // Fall back to US English without any debug message - LayoutLocaleId = 0x409; + // It is not available, so read it from HKEY_USERS\.DEFAULT + RtlCopyMemory(wszBuffer, szDefaultUserPath, sizeof(szDefaultUserPath)); } else { - // The path is available, so build the full path to HKEY_CURRENT_USER\Keyboard Layout\Preload + // The path is available ZwClose(KeyHandle); - RtlCopyMemory(wszBuffer, CurrentUserPath.Buffer, CurrentUserPath.MaximumLength); - RtlInitUnicodeString(&FullKeyboardLayoutPath, wszBuffer); - FullKeyboardLayoutPath.MaximumLength = MAX_PATH; - - Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + } + + // Build the full path + RtlInitUnicodeString(&FullKeyboardLayoutPath, wszBuffer); + FullKeyboardLayoutPath.MaximumLength = MAX_PATH; + + Status = RtlAppendUnicodeToString(&FullKeyboardLayoutPath, szKeyboardLayoutPath); + + if( NT_SUCCESS(Status) ) + { + // Return the first keyboard layout listed there + RtlInitUnicodeString(&LayoutValueName, L"1"); + + Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); if( NT_SUCCESS(Status) ) - { - // Return the first keyboard layout listed there - RtlInitUnicodeString(&LayoutValueName, L"1"); - - Status = ReadRegistryValue(&FullKeyboardLayoutPath, &LayoutValueName, &LayoutLocaleIdString); - - if( NT_SUCCESS(Status) ) - RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); - else - DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); - } + RtlUnicodeStringToInteger(&LayoutLocaleIdString, 16, &LayoutLocaleId); else - DPRINT1("RtlAppendUnicodeToString failed! (%08lx)\n", Status); - } + DPRINT1("ReadRegistryValue failed! (%08lx).\n", Status); + } + else + DPRINT1("RtlAppendUnicodeToString failed! (%08lx)\n", Status); RtlFreeUnicodeString(&CurrentUserPath); }

16 years, 8 months

[gedmurphy] 31689: add a temp debug output whilst we're still walking on egg shells

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jan 9 19:44:39 2008 New Revision: 31689 URL: http://svn.reactos.org/svn/reactos?rev=31689&view=rev Log: add a temp debug output whilst we're still walking on egg shells Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Jan 9 19:44:39 2008 @@ -247,6 +247,8 @@ { return hIcon; } + else + FIXME("Didn't find the shared icon!!\n"); } hResource = LoadResource(hinst, hResInfo);

16 years, 8 months

← Newer
1
...
35
36
37
38
39
40
41
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008