Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33035: Plugged in the old NtGdiSetDIBits for now. Need to investigate the problems with SaveDC and CreateCompatibleDC.
by jimtabor＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: jimtabor Date: Sat Apr 19 14:00:34 2008 New Revision: 33035 URL: http://svn.reactos.org/svn/reactos?rev=33035&view=rev Log: Plugged in the old NtGdiSetDIBits for now. Need to investigate the problems with SaveDC and CreateCompatibleDC. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sat Apr 19 14:00:34 2008 @@ -295,7 +295,7 @@ 0); } - +#if 0 /* * @implemented */ @@ -386,6 +386,20 @@ RestoreDC(SavehDC, -1); return LinesCopied; +} +#endif + +INT +STDCALL +SetDIBits(HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) +{ + return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); } /* Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Sat Apr 19 14:00:34 2008 @@ -131,6 +131,18 @@ LPPOINT Point ); +/* Use SetDIBitsToDevice in gdi32. */ +INT +STDCALL +NtGdiSetDIBits ( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + CONST VOID * Bits, + CONST BITMAPINFO * bmi, + UINT ColorUse + ); #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sat Apr 19 14:00:34 2008 @@ -275,6 +275,41 @@ return result; } + +// Converts a DIB to a device-dependent bitmap +INT STDCALL +NtGdiSetDIBits( + HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *bmi, + UINT ColorUse) +{ + PDC Dc; + INT Ret; + + Dc = DC_LockDc(hDC); + if (NULL == Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + if (Dc->DC_Type == DC_TYPE_INFO) + { + DC_UnlockDc(Dc); + return 0; + } + + Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); + + DC_UnlockDc(Dc); + + return Ret; +} + + W32KAPI INT Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Apr 19 14:00:34 2008 @@ -674,6 +674,7 @@ # # #ReactOS specific syscalls +NtGdiSetDIBits 7 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4

1 0

[greatlrd] 33034: NtGdiDdCreateDirectDrawObject Bugfix : do not set pfnDdCreateDirectDrawObject before the dxg.sys been load. Add : allown loading of vista name of dx kernel known as dxkrnl.sys DxDdStartupDxGraphics add debug out for it, that can be use to see how the list being load.
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 07:46:54 2008 New Revision: 33034 URL: http://svn.reactos.org/svn/reactos?rev=33034&view=rev Log: NtGdiDdCreateDirectDrawObject Bugfix : do not set pfnDdCreateDirectDrawObject before the dxg.sys been load. Add : allown loading of vista name of dx kernel known as dxkrnl.sys DxDdStartupDxGraphics add debug out for it, that can be use to see how the list being load. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sat Apr 19 07:46:54 2008 @@ -51,12 +51,23 @@ /* Loading the kernel interface of directx for win32k */ + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - - if (ghDxGraphics == NULL) + + if ( ghDxGraphics == NULL) { DPRINT1("Warning: dxg.sys not found\n"); + + /* try loading vista dx kernel */ + DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); + + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); + } + + if ( ghDxGraphics == NULL) + { Status = STATUS_DLL_NOT_FOUND; + DPRINT1("Warning: no ReactX or DirectX kernel driver found\n"); } else { @@ -105,7 +116,21 @@ gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } + + /* dump sort list for debuging */ +#if 1 + DPRINT1("ghDxGraphics address 0x%08lx\n",ghDxGraphics); + DPRINT1("gpfnStartupDxGraphics address 0x%08lx\n",gpfnStartupDxGraphics); + DPRINT1("gpfnCleanupDxGraphics address 0x%08lx\n",gpfnCleanupDxGraphics); + + for (t=0;t<=DXG_INDEX_DxDdIoctl;t++) + { + DPRINT1("gpDxFuncs[0x%08lx].iFunc = 0x%08lx\n",t,gpDxFuncs[t].iFunc); + DPRINT1("gpDxFuncs[0x%08lx].pfn = 0x%08lx\n",t,gpDxFuncs[t].pfn); + } +#endif DPRINT1("DirectX interface is activated\n"); + } /* return the status */ } @@ -126,7 +151,7 @@ STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { - PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; + PGD_DDCREATEDIRECTDRAWOBJECT pfnDdCreateDirectDrawObject; NTSTATUS Status; PEPROCESS Proc = NULL; @@ -144,6 +169,9 @@ DPRINT1("Warning : Failed to create the directx interface\n"); return 0; } + + /* get the pfnDdCreateDirectDrawObject after we load the drv */ + pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; if (pfnDdCreateDirectDrawObject == NULL) {

1 0

[gedmurphy] 33033: - set autostart on boot option - add hex value to win message tab
by gedmurphy＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: gedmurphy Date: Sat Apr 19 06:03:09 2008 New Revision: 33033 URL: http://svn.reactos.org/svn/reactos?rev=33033&view=rev Log: - set autostart on boot option - add hex value to win message tab Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs trunk/tools/Message Translator/GUI/MainForm.cs trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs Modified: trunk/tools/Message Translator/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.Designer.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -47,14 +47,15 @@ this.errorMessageLabel = new System.Windows.Forms.Label(); this.errorNumberLabel = new System.Windows.Forms.Label(); this.wndmsgTab = new System.Windows.Forms.TabPage(); + this.label2 = new System.Windows.Forms.Label(); + this.wndmsgHexTxtBox = new System.Windows.Forms.TextBox(); + this.wndmsgDecimalTxtBox = new System.Windows.Forms.TextBox(); this.wndmsgCodeTxtBox = new System.Windows.Forms.TextBox(); - this.wndmsgNumberTxtBox = new System.Windows.Forms.TextBox(); this.wndmsgCodeLabel = new System.Windows.Forms.Label(); this.wndmsgNumberLabel = new System.Windows.Forms.Label(); this.bugurlTab = new System.Windows.Forms.TabPage(); this.bugLinkLabel = new System.Windows.Forms.LinkLabel(); this.optionsTab = new System.Windows.Forms.TabPage(); - this.optionsOKButton = new System.Windows.Forms.Button(); this.optionsRunStartChkBox = new System.Windows.Forms.CheckBox(); this.optionsMinimizeChkBox = new System.Windows.Forms.CheckBox(); this.mainErrLabel = new System.Windows.Forms.Label(); @@ -232,8 +233,10 @@ // // wndmsgTab // + this.wndmsgTab.Controls.Add(this.label2); + this.wndmsgTab.Controls.Add(this.wndmsgHexTxtBox); + this.wndmsgTab.Controls.Add(this.wndmsgDecimalTxtBox); this.wndmsgTab.Controls.Add(this.wndmsgCodeTxtBox); - this.wndmsgTab.Controls.Add(this.wndmsgNumberTxtBox); this.wndmsgTab.Controls.Add(this.wndmsgCodeLabel); this.wndmsgTab.Controls.Add(this.wndmsgNumberLabel); this.wndmsgTab.Location = new System.Drawing.Point(4, 22); @@ -243,6 +246,31 @@ this.wndmsgTab.Text = "Window Msg"; this.wndmsgTab.UseVisualStyleBackColor = true; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(162, 15); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(12, 13); + this.label2.TabIndex = 13; + this.label2.Text = "/"; + // + // wndmsgHexTxtBox + // + this.wndmsgHexTxtBox.Location = new System.Drawing.Point(176, 12); + this.wndmsgHexTxtBox.Name = "wndmsgHexTxtBox"; + this.wndmsgHexTxtBox.ReadOnly = true; + this.wndmsgHexTxtBox.Size = new System.Drawing.Size(104, 20); + this.wndmsgHexTxtBox.TabIndex = 12; + // + // wndmsgDecimalTxtBox + // + this.wndmsgDecimalTxtBox.Location = new System.Drawing.Point(63, 12); + this.wndmsgDecimalTxtBox.Name = "wndmsgDecimalTxtBox"; + this.wndmsgDecimalTxtBox.ReadOnly = true; + this.wndmsgDecimalTxtBox.Size = new System.Drawing.Size(98, 20); + this.wndmsgDecimalTxtBox.TabIndex = 11; + // // wndmsgCodeTxtBox // this.wndmsgCodeTxtBox.Location = new System.Drawing.Point(63, 38); @@ -250,14 +278,6 @@ this.wndmsgCodeTxtBox.ReadOnly = true; this.wndmsgCodeTxtBox.Size = new System.Drawing.Size(217, 20); this.wndmsgCodeTxtBox.TabIndex = 6; - // - // wndmsgNumberTxtBox - // - this.wndmsgNumberTxtBox.Location = new System.Drawing.Point(63, 12); - this.wndmsgNumberTxtBox.Name = "wndmsgNumberTxtBox"; - this.wndmsgNumberTxtBox.ReadOnly = true; - this.wndmsgNumberTxtBox.Size = new System.Drawing.Size(217, 20); - this.wndmsgNumberTxtBox.TabIndex = 5; // // wndmsgCodeLabel // @@ -301,7 +321,6 @@ // // optionsTab // - this.optionsTab.Controls.Add(this.optionsOKButton); this.optionsTab.Controls.Add(this.optionsRunStartChkBox); this.optionsTab.Controls.Add(this.optionsMinimizeChkBox); this.optionsTab.Location = new System.Drawing.Point(4, 22); @@ -310,16 +329,6 @@ this.optionsTab.TabIndex = 4; this.optionsTab.Text = "Options"; this.optionsTab.UseVisualStyleBackColor = true; - // - // optionsOKButton - // - this.optionsOKButton.Location = new System.Drawing.Point(220, 160); - this.optionsOKButton.Name = "optionsOKButton"; - this.optionsOKButton.Size = new System.Drawing.Size(69, 22); - this.optionsOKButton.TabIndex = 0; - this.optionsOKButton.Text = "OK"; - this.optionsOKButton.UseVisualStyleBackColor = true; - this.optionsOKButton.Click += new System.EventHandler(this.optionsOKButton_Click); // // optionsRunStartChkBox // @@ -434,7 +443,6 @@ private System.Windows.Forms.Button mainLookupButton; private System.Windows.Forms.TextBox mainErrTxtBox; - private System.Windows.Forms.Button optionsOKButton; private System.Windows.Forms.Label mainErrLabel; private System.Windows.Forms.CheckBox optionsMinimizeChkBox; private System.Windows.Forms.TextBox errorMessageTxtBox; @@ -443,7 +451,6 @@ private System.Windows.Forms.Label errorNumberLabel; private System.Windows.Forms.Label errorTypeLabel; private System.Windows.Forms.TextBox wndmsgCodeTxtBox; - private System.Windows.Forms.TextBox wndmsgNumberTxtBox; private System.Windows.Forms.Label wndmsgCodeLabel; private System.Windows.Forms.Label wndmsgNumberLabel; private System.Windows.Forms.LinkLabel bugLinkLabel; @@ -467,6 +474,9 @@ private System.Windows.Forms.Button errorForwardButton; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox errorHexTxtBox; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox wndmsgHexTxtBox; + private System.Windows.Forms.TextBox wndmsgDecimalTxtBox; } } Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -10,10 +10,7 @@ { public partial class MainForm : Form { - MessageTranslator msgTrans; - private Panel[] panels; private static string regPath = @"Software\ReactOS\MsgTrans"; - private string[] msgTypes = { "error", "wm", "bug" }; #region properties @@ -124,6 +121,32 @@ } } #endregion + + private void SetAutoStart(bool bStart) + { + string path = @"Software\Microsoft\Windows\CurrentVersion\Run"; + string keyName = "MsgTrans"; + + try + { + if (bStart) + { + RegistryKey rk = Registry.CurrentUser.CreateSubKey(path); + string dir = Assembly.GetEntryAssembly().Location; + rk.SetValue(keyName, dir); + } + else + { + RegistryKey rk = Registry.CurrentUser.CreateSubKey(path); + rk.DeleteValue(keyName); + } + } + catch (Exception ex) + { + MessageOutput mo = new MessageOutput(); + mo.MsgOut(null, ex.Message); + } + } private string GetMessageType() { @@ -169,7 +192,8 @@ } else if (msgType == msgTypes[1]) // wm { - wndmsgNumberTxtBox.Text = msgTran.Number.ToString(); + wndmsgDecimalTxtBox.Text = msgTran.Number.ToString(); + wndmsgHexTxtBox.Text = "0x" + msgTran.Hex; wndmsgCodeTxtBox.Text = msgTran.Code; } else if (msgType == msgTypes[2]) // bug @@ -189,11 +213,6 @@ InitializeComponent(); } - public void MsgOut(string message) - { - MessageBox.Show(message); - } - private void MainForm_Load(object sender, EventArgs e) { // setup error page @@ -207,8 +226,6 @@ // setup options page optionsMinimizeChkBox.Checked = HideOnMin; optionsRunStartChkBox.Checked = RunOnStart; - optionsOKButton.Enabled = false; - optionsOKButton.Text = "Done"; notifyIcon.Visible = false; toolTip.SetToolTip(mainErrTxtBox, Properties.Resources.tooltipErrMsg); @@ -224,17 +241,6 @@ System.Diagnostics.Process.Start(e.Link.LinkData.ToString()); } - private void optionsOKButton_Click(object sender, EventArgs e) - { - Button btn = (Button)sender; - - HideOnMin = optionsMinimizeChkBox.Checked; - RunOnStart = optionsRunStartChkBox.Checked; - - btn.Text = "Done"; - btn.Enabled = false; - } - private void MainForm_Resize(object sender, EventArgs e) { if (FormWindowState.Minimized == WindowState) @@ -275,8 +281,17 @@ private void OptionsHaveChanged(object sender, EventArgs e) { - optionsOKButton.Text = "OK"; - optionsOKButton.Enabled = true; + CheckBox cb = (CheckBox)sender; + + if (cb.Name == optionsMinimizeChkBox.Name) + { + HideOnMin = optionsMinimizeChkBox.Checked; + } + else if (cb.Name == optionsRunStartChkBox.Name) + { + SetAutoStart(cb.Checked); + RunOnStart = optionsRunStartChkBox.Checked; + } } private void mainTabControl_SelectedIndexChanged(object sender, EventArgs e) Modified: trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -6,7 +6,6 @@ { public class ErrorCommand : Command { - MessageTranslator msgTrans; private NtStatusCommand ntStatus; private WinerrorCommand winerror; private HResultCommand hresult; @@ -17,7 +16,6 @@ string hresultXml) : base(msgTrans) { - this.msgTrans = msgTrans; this.ntStatus = new NtStatusCommand(msgTrans, ntstatusXml); this.winerror = new WinerrorCommand(msgTrans, winerrorXml); this.hresult = new HResultCommand(msgTrans, hresultXml); Modified: trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/HresultCommand.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -56,7 +56,7 @@ public override string Help() { - return "!hresult <value>"; + return "hresult <value>"; } public string GetHresultDescription(long hresult) Modified: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -44,7 +44,7 @@ </Target> --> <ItemGroup> - <Compile Include="AppSenseBugUrl.cs" /> + <Compile Include="BugUrlCommandl.cs" /> <Compile Include="BugCommand.cs" /> <Compile Include="XmlCommand.cs" /> <Compile Include="ErrorCommand.cs" /> Modified: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -10,12 +10,8 @@ public class MessageTranslator { private IMsgOutput msgOutput; - private string ntstatusXml; - private string winerrorXml; - private string hresultXml; - private string wmXml; + private List<Command> commands = new List<Command>(); private string bugUrl; - private List<Command> commands = new List<Command>(); private string type; private long number; private string hex; @@ -53,6 +49,14 @@ get { return bugUrl; } set { bugUrl = value; } } + public IMsgOutput MsgOutput + { + get { return msgOutput; } + } + public IList<Command> Commands + { + get { return commands; } + } #endregion public MessageTranslator(IMsgOutput msgOutput, @@ -63,11 +67,6 @@ string bugUrl) { this.msgOutput = msgOutput; - this.ntstatusXml = ntstatusXml; - this.winerrorXml = winerrorXml; - this.hresultXml = hresultXml; - this.wmXml = wmXml; - this.bugUrl = bugUrl; commands.Add(new ErrorCommand(this, ntstatusXml, @@ -75,16 +74,6 @@ hresultXml)); commands.Add(new WMCommand(this, wmXml)); commands.Add(new BugUrl(this, bugUrl)); - } - - public IMsgOutput MsgOutput - { - get { return msgOutput; } - } - - public IList<Command> Commands - { - get { return commands; } } public bool ParseCommandMessage(MessageContext context, Modified: trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/NtStatusCommand.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -56,7 +56,7 @@ public override string Help() { - return "!ntstatus <value>"; + return "ntstatus <value>"; } public string GetNtstatusDescription(long ntstatus) Modified: trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/WmCommand.cs [iso-8859-1] Sat Apr 19 06:03:09 2008 @@ -48,6 +48,7 @@ if (code != null) { MsgTrans.Number = num; + MsgTrans.Hex = num.ToString("X"); MsgTrans.Code = code; return true; } @@ -62,7 +63,7 @@ public override string Help() { - return "!wm <value> or !wm <name>"; + return "wm <value> or wm <name>"; } private string GetWmDescription(long wm)

1 0

[greatlrd] 33032: add small help text and file dump from win32kdxtest
by greatlrd＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: greatlrd Date: Sat Apr 19 02:21:03 2008 New Revision: 33032 URL: http://svn.reactos.org/svn/reactos?rev=33032&view=rev Log: add small help text and file dump from win32kdxtest Modified: trunk/rostests/dxtest/win32kdxtest/main.c Modified: trunk/rostests/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/main.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/main.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/main.c [iso-8859-1] Sat Apr 19 02:21:03 2008 @@ -13,6 +13,7 @@ #include "test.h" BOOL dumping_on =FALSE; +FILE *fs_file; /* we using d3d8thk.dll it is doing the real syscall in windows 2000 * in ReactOS and Windows XP and higher d3d8thk.dll it linking to @@ -32,6 +33,30 @@ { dumping_on = TRUE; } + + if ( (stricmp(argv[1],"-help")==0) || + (stricmp(argv[1],"-?")==0) || + (stricmp(argv[1],"/help")==0) || + (stricmp(argv[1],"/?")==0) ) + { + printf("the %s support follow param \n",argv[0]); + printf("-dump : It dump all data it resvie to screen \n"); + printf("-dumpfile filename : It dump all data it resvie to file \n"); + printf("\nrember u can only use one of them at time \n"); + exit(1); + } + } + + if (argc == 3) + { + if (stricmp(argv[1],"-dumpfile")==0) + { + /* create or over write a file in binary mode, and redirect printf to the file */ + if ( (fs_file = freopen(argv[2], "wb", stdout)) != NULL) + { + dumping_on = TRUE; + } + } } hDirectDrawLocal = test_NtGdiDdCreateDirectDrawObject(); @@ -45,6 +70,11 @@ test_NtGdiDdCanCreateSurface(hDirectDrawLocal); test_NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal); + + if (fs_file != NULL) + { + fclose(fs_file); + } return 0; }

1 0

[jimtabor] 33031: Tidy ups some missed changes.
by jimtabor＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: jimtabor Date: Fri Apr 18 21:42:37 2008 New Revision: 33031 URL: http://svn.reactos.org/svn/reactos?rev=33031&view=rev Log: Tidy ups some missed changes. Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Fri Apr 18 21:42:37 2008 @@ -155,6 +155,9 @@ { // DHPDEV from NtGdiGetDhpdev must be from print driver. PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); + + if (!pDrvInfo2) return NULL; + if (pDrvInfo2->cVersion != 0xFEDCBA98 ) // Init mask for ver 2+ { PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; @@ -170,6 +173,9 @@ EngGetPrinterDataFileName(HDEV hdev) { PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); + + if (!pDrvInfo2) return NULL; + if (pDrvInfo2->cVersion != 0xFEDCBA98 ) { PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Fri Apr 18 21:42:37 2008 @@ -91,19 +91,6 @@ LPPOINT Point ); -/* Use SetDIBitsToDevice in gdi32. */ -INT -STDCALL -NtGdiSetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID * Bits, - CONST BITMAPINFO * bmi, - UINT ColorUse - ); - /* Needs to be done in user-mode. */ BOOL STDCALL

1 0

[jimtabor] 33030: Update OffsetClipRgn, IntersectClipRect, GetRgnBox, moved SetDIBitsToDevice from stubs and misc changes. Properly implement EngGetDriverName and EngGetPrinterDataFileName.
by jimtabor＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: jimtabor Date: Fri Apr 18 21:20:36 2008 New Revision: 33030 URL: http://svn.reactos.org/svn/reactos?rev=33030&view=rev Log: Update OffsetClipRgn, IntersectClipRect, GetRgnBox, moved SetDIBitsToDevice from stubs and misc changes. Properly implement EngGetDriverName and EngGetPrinterDataFileName. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/gdi32/objects/eng.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def [iso-8859-1] Fri Apr 18 21:20:36 2008 @@ -436,7 +436,7 @@ GetTextAlign@4 GetTextCharacterExtra@4 GetTextCharset@4 -GetTextCharsetInfo@12 +GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12 GetTextColor@4 GetTextExtentExPointA@28 GetTextExtentExPointI@28 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Fri Apr 18 21:20:36 2008 @@ -44,44 +44,6 @@ /* FIXME share memory */ return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); -} - -/* - * @implemented - * - */ -INT -STDCALL -SetDIBitsToDevice( - HDC hDC, - int XDest, - int YDest, - DWORD Width, - DWORD Height, - int XSrc, - int YSrc, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *lpbmi, - UINT ColorUse) -{ - return NtGdiSetDIBitsToDeviceInternal(hDC, - XDest, - YDest, - Width, - Height, - XSrc, - YSrc, - StartScan, - ScanLines, - (LPBYTE)Bits, - (LPBITMAPINFO)lpbmi, - ColorUse, - lpbmi->bmiHeader.biSizeImage, - lpbmi->bmiHeader.biSize, - FALSE, - NULL); } /* @@ -1980,17 +1942,6 @@ /* * @unimplemented */ -LPWSTR STDCALL -EngGetDriverName(HDEV hdev) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ ULONG STDCALL XLATEOBJ_iXlate(XLATEOBJ *XlateObj, ULONG Color) @@ -2179,7 +2130,6 @@ GetClipBox(HDC hdc, LPRECT lprc) { - /* FIXME some part need be done in user mode */ return NtGdiGetAppClipBox(hdc, lprc); } @@ -2231,8 +2181,25 @@ GetRgnBox(HRGN hrgn, LPRECT prcOut) { - /* FIXME some stuff need be done in user mode */ - return NtGdiGetRgnBox(hrgn, prcOut); +#if 0 + PRGN_ATTR Rgn_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hRgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) + return NtGdiGetRgnBox(hrgn, prcOut); + if (Rgn_Attr->Flags == NULLREGION) + { + prcOut->left = 0; + prcOut->top = 0; + prcOut->right = 0; + prcOut->bottom = 0; + } + else + { + if (Rgn_Attr->Flags != SIMPLEREGION) return NtGdiGetRgnBox(hrgn, prcOut); + *prcOut = Rgn_Attr->Rect; + } + return Rgn_Attr->Flags; +#endif + return NtGdiGetRgnBox(hrgn, prcOut); } @@ -2250,19 +2217,9 @@ return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); } - -INT -STDCALL -GetTextCharsetInfo(HDC hdc, - LPFONTSIGNATURE lpSig, - DWORD dwFlags) -{ - /* FIXME some part are done in user mode */ - return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags); -} - - - +/* + * @implemented + */ INT STDCALL IntersectClipRect(HDC hdc, @@ -2271,18 +2228,59 @@ int nRightRect, int nBottomRect) { - /* FIXME some part are done in user mode */ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_IntersectClipRect( hdc, nLeftRect, nTopRect, nRightRect, nBottomRect); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( pLDC ) + { + if (pLDC->iType != LDC_EMFLDC || EMFDRV_IntersectClipRect( hdc, nLeftRect, nTopRect, nRightRect, nBottomRect)) + return NtGdiIntersectClipRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect); + } + else + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + } +#endif return NtGdiIntersectClipRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect); } +/* + * @implemented + */ INT STDCALL OffsetClipRgn(HDC hdc, int nXOffset, int nYOffset) { - /* FIXME some part are done in user mode */ - return NtGdiOffsetClipRgn( hdc, nXOffset, nYOffset); +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_OffsetClipRgn( hdc, nXOffset, nYOffset ); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } + if (pLDC->iType == LDC_EMFLDC && !EMFDRV_OffsetClipRgn( hdc, nXOffset, nYOffset )) + return 0; + return NtGdiOffsetClipRgn( hdc, nXOffset, nYOffset); + } + } +#endif + return NtGdiOffsetClipRgn( hdc, nXOffset, nYOffset); } Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Apr 18 21:20:36 2008 @@ -381,10 +381,49 @@ } if ( newDC ) - DeleteDC((HDC)SavehDC); + DeleteDC(SavehDC); else - RestoreDC((HDC)SavehDC, -1); + RestoreDC(SavehDC, -1); return LinesCopied; } +/* + * @implemented + * + */ +INT +STDCALL +SetDIBitsToDevice( + HDC hDC, + int XDest, + int YDest, + DWORD Width, + DWORD Height, + int XSrc, + int YSrc, + UINT StartScan, + UINT ScanLines, + CONST VOID *Bits, + CONST BITMAPINFO *lpbmi, + UINT ColorUse) +{ + return NtGdiSetDIBitsToDeviceInternal(hDC, + XDest, + YDest, + Width, + Height, + XSrc, + YSrc, + StartScan, + ScanLines, + (LPBYTE)Bits, + (LPBITMAPINFO)lpbmi, + ColorUse, + lpbmi->bmiHeader.biSizeImage, + lpbmi->bmiHeader.biSize, + FALSE, + NULL); +} + + Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Fri Apr 18 21:20:36 2008 @@ -151,9 +151,31 @@ * @implemented */ LPWSTR STDCALL +EngGetDriverName(HDEV hdev) +{ + // DHPDEV from NtGdiGetDhpdev must be from print driver. + PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); + if (pDrvInfo2->cVersion != 0xFEDCBA98 ) // Init mask for ver 2+ + { + PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; + return pDrvInfo1->pName; + } + return pDrvInfo2->pDriverPath; +} + +/* + * @implemented + */ +LPWSTR STDCALL EngGetPrinterDataFileName(HDEV hdev) { - return EngGetDriverName(hdev); + PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev); + if (pDrvInfo2->cVersion != 0xFEDCBA98 ) + { + PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2; + return pDrvInfo1->pName; + } + return pDrvInfo2->pDataFile; } /*

1 0

[jimtabor] 33029: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Win32k half: Remove NtGdiSetDIBits, all related files updated.include
by jimtabor＠svn.reactos.org 19 Apr '08

19 Apr '08

Author: jimtabor Date: Fri Apr 18 19:24:34 2008 New Revision: 33029 URL: http://svn.reactos.org/svn/reactos?rev=33029&view=rev Log: Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Win32k half: Remove NtGdiSetDIBits, all related files updated.include Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Fri Apr 18 19:24:34 2008 @@ -23,7 +23,7 @@ /* For device-independent bitmaps: */ DIBSECTION *dib; HPALETTE hDIBPalette; - HDC hDC; + HDC hDC; // Doc in "Undocumented Windows", page 546, seems to be supported with XP. } BITMAPOBJ, *PBITMAPOBJ; #define BITMAPOBJ_IS_APIBITMAP 0x1 Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Apr 18 19:24:34 2008 @@ -1,5 +1,4 @@ /* - * $Id$ * * ReactOS W32 Subsystem * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team @@ -275,39 +274,6 @@ BITMAPOBJ_UnlockBitmap(bitmap); return result; -} - -// Converts a DIB to a device-dependent bitmap -INT STDCALL -NtGdiSetDIBits( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *bmi, - UINT ColorUse) -{ - PDC Dc; - INT Ret; - - Dc = DC_LockDc(hDC); - if (NULL == Dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - if (Dc->DC_Type == DC_TYPE_INFO) - { - DC_UnlockDc(Dc); - return 0; - } - - Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); - - DC_UnlockDc(Dc); - - return Ret; } W32KAPI @@ -335,13 +301,16 @@ INT ret = 0; NTSTATUS Status = STATUS_SUCCESS; PDC pDC; - HBITMAP hSourceBitmap; - SURFOBJ *pDestSurf, *pSourceSurf; + HBITMAP hSourceBitmap = NULL; + SURFOBJ *pDestSurf, *pSourceSurf = NULL; RECTL rcDest; POINTL ptSource; INT DIBWidth; SIZEL SourceSize; XLATEOBJ *XlateObj = NULL; + PPALGDI pDCPalette; + HPALETTE DDBPalette, DIBPalette = NULL; + ULONG DDBPaletteType, DIBPaletteType; if (!Bits) return 0; @@ -364,10 +333,6 @@ DC_UnlockDc(pDC); return 0; } - - SourceSize.cx = bmi->bmiHeader.biWidth; - SourceSize.cy = ScanLines; - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); rcDest.left = XDest; rcDest.top = YDest; @@ -379,6 +344,10 @@ /* Enter SEH, as the bits are user mode */ _SEH_TRY { + SourceSize.cx = bmi->bmiHeader.biWidth; + SourceSize.cy = ScanLines; + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, @@ -395,13 +364,39 @@ pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); if (!pSourceSurf) { - EngDeleteSurface((HSURF)hSourceBitmap); Status = STATUS_UNSUCCESSFUL; _SEH_LEAVE; } - /* FIXME: handle XlateObj */ - XlateObj = NULL; + + /* Obtain destination palette from the DC */ + pDCPalette = PALETTE_LockPalette(((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault); + if (!pDCPalette) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + Status = STATUS_UNSUCCESSFUL; + _SEH_LEAVE; + } + DDBPaletteType = pDCPalette->Mode; + DDBPalette = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; + PALETTE_UnlockPalette(pDCPalette); + + DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); + if (!DIBPalette) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + _SEH_LEAVE; + } + + /* Determine XlateObj */ + XlateObj = IntEngCreateXlate(DDBPaletteType, DIBPaletteType, DDBPalette, DIBPalette); + if (!XlateObj) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + _SEH_LEAVE; + } /* Copy the bits */ Status = IntEngBitBlt(pDestSurf, @@ -416,8 +411,6 @@ NULL, ROP3_TO_ROP4(SRCCOPY)); - EngUnlockSurface(pSourceSurf); - EngDeleteSurface((HSURF)hSourceBitmap); } _SEH_HANDLE { @@ -431,6 +424,10 @@ ret = ScanLines; } + if (pSourceSurf) EngUnlockSurface(pSourceSurf); + if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); + if (XlateObj) EngDeleteXlate(XlateObj); + if (DIBPalette) PALETTE_FreePaletteByHandle(DIBPalette); EngUnlockSurface(pDestSurf); DC_UnlockDc(pDC); @@ -745,6 +742,7 @@ HBITMAP hBitmap, hOldBitmap; HDC hdcMem; HPALETTE hPal = NULL; + PDC pDC; if (!Bits || !BitsInfo) { @@ -776,8 +774,13 @@ ROP, 0); } - NtGdiSetDIBits(hdcMem, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, - BitsInfo, (UINT)Usage); + pDC = DC_LockDc(hdcMem); + + IntSetDIBits(pDC, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, + BitsInfo, Usage); + + DC_UnlockDc(pDC); + /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Fri Apr 18 19:24:34 2008 @@ -674,7 +674,6 @@ # # #ReactOS specific syscalls -NtGdiSetDIBits 7 NtGdiSetViewportExtEx 4 NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4

1 0

[jimtabor] 33028: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Gdi32 half only: Implement SetDIBits, I made corrections to the patch to handle palette and proper hdc handling.
by jimtabor＠svn.reactos.org 18 Apr '08

18 Apr '08

Author: jimtabor Date: Fri Apr 18 18:51:29 2008 New Revision: 33028 URL: http://svn.reactos.org/svn/reactos?rev=33028&view=rev Log: PatchPatch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Gdi32 half only: Implement SetDIBits, I made corrections to the patch to handle palette and proper hdc handling. Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c [iso-8859-1] Fri Apr 18 18:51:29 2008 @@ -9,23 +9,6 @@ * Api that are hacked but we can not do correct implemtions yetm but using own syscall * */ - -/* - * @unimplemented - */ -int -STDCALL -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - /* FIXME share memory */ - return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); -} /* * @implemented Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Apr 18 18:51:29 2008 @@ -295,3 +295,96 @@ 0); } + +/* + * @implemented + */ +INT +STDCALL +SetDIBits(HDC hDC, + HBITMAP hBitmap, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) +{ + HDC hDCc, SavehDC, nhDC; + DWORD dwWidth, dwHeight; + HGDIOBJ hOldBitmap; + HPALETTE hPal = NULL; + INT LinesCopied = 0; + BOOL newDC = FALSE; + + if ( !lpvBits || (GDI_HANDLE_GET_TYPE(hBitmap) != GDI_OBJECT_TYPE_BITMAP) ) + return 0; + + if ( lpbmi ) + { + if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) + { + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || lpbmi->bmiHeader.biCompression == BI_PNG ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + } + } + + hDCc = NtGdiGetDCforBitmap(hBitmap); + SavehDC = hDCc; + if ( !hDCc ) + { + nhDC = CreateCompatibleDC(hDC); + if ( !nhDC ) return 0; + newDC = TRUE; + SavehDC = nhDC; + } + else if ( !SaveDC(hDCc) ) + return 0; + + hOldBitmap = SelectObject(SavehDC, hBitmap); + + if ( hOldBitmap ) + { + if ( hDC ) + hPal = SelectPalette(SavehDC, (HPALETTE)GetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE), FALSE); + + if ( lpbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + { + PBITMAPCOREINFO pbci = (PBITMAPCOREINFO) lpbmi; + dwWidth = pbci->bmciHeader.bcWidth; + dwHeight = pbci->bmciHeader.bcHeight; + } + else + { + dwWidth = lpbmi->bmiHeader.biWidth; + dwHeight = abs(lpbmi->bmiHeader.biHeight); + } + + LinesCopied = SetDIBitsToDevice(SavehDC, + 0, + 0, + dwWidth, + dwHeight, + 0, + 0, + uStartScan, + cScanLines, + (void *)lpvBits, + (LPBITMAPINFO)lpbmi, + fuColorUse); + + if ( hDC ) SelectPalette(SavehDC, hPal, FALSE); + + SelectObject(SavehDC, hOldBitmap); + } + + if ( newDC ) + DeleteDC((HDC)SavehDC); + else + RestoreDC((HDC)SavehDC, -1); + + return LinesCopied; +} +

1 0

[fireball] 33027: - Include tditest in rosapps build.
by fireball＠svn.reactos.org 18 Apr '08

18 Apr '08

Author: fireball Date: Fri Apr 18 15:46:48 2008 New Revision: 33027 URL: http://svn.reactos.org/svn/reactos?rev=33027&view=rev Log: - Include tditest in rosapps build. Added: trunk/rosapps/net/tditest/tditest.rbuild (with props) Modified: trunk/rosapps/net/directory.rbuild trunk/rosapps/net/tditest/include/tditest.h trunk/rosapps/net/tditest/tditest/tditest.c Modified: trunk/rosapps/net/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/net/directory.rbuild?rev=3… ============================================================================== --- trunk/rosapps/net/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/net/directory.rbuild [iso-8859-1] Fri Apr 18 15:46:48 2008 @@ -11,5 +11,9 @@ <directory name="niclist"> <xi:include href="niclist/niclist.rbuild" /> </directory> + + <directory name="tditest"> + <xi:include href="tditest/tditest.rbuild" /> + </directory> </group> Modified: trunk/rosapps/net/tditest/include/tditest.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/net/tditest/include/tdites… ============================================================================== --- trunk/rosapps/net/tditest/include/tditest.h [iso-8859-1] (original) +++ trunk/rosapps/net/tditest/include/tditest.h [iso-8859-1] Fri Apr 18 15:46:48 2008 @@ -7,15 +7,9 @@ #ifndef __TDITEST_H #define __TDITEST_H -#ifdef _MSC_VER #include <ntddk.h> #include <tdikrnl.h> #include <tdiinfo.h> -#else -#include <ntddk.h> -#include <net/tdikrnl.h> -#include <net/tdiinfo.h> -#endif #include "debug.h" Added: trunk/rosapps/net/tditest/tditest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/net/tditest/tditest.rbuild… ============================================================================== --- trunk/rosapps/net/tditest/tditest.rbuild (added) +++ trunk/rosapps/net/tditest/tditest.rbuild [iso-8859-1] Fri Apr 18 15:46:48 2008 @@ -1,0 +1,8 @@ +<module name="tditest" type="kernelmodedriver" installbase="system32/drivers" installname="tditest.sys"> + <include base="tditest">include</include> + <library>ntoskrnl</library> + + <directory name="tditest"> + <file>tditest.c</file> + </directory> +</module> Propchange: trunk/rosapps/net/tditest/tditest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/net/tditest/tditest/tdites… ============================================================================== --- trunk/rosapps/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/net/tditest/tditest/tditest.c [iso-8859-1] Fri Apr 18 15:46:48 2008 @@ -915,7 +915,7 @@ /* Call TdiOpenThread() */ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - ExInitializeWorkItem(&WorkItem, TdiOpenThread, &Event); + ExInitializeWorkItem(&WorkItem, (PWORKER_THREAD_ROUTINE)TdiOpenThread, &Event); ExQueueWorkItem(&WorkItem, DelayedWorkQueue); KeWaitForSingleObject(&Event, Executive, KernelMode, TRUE, NULL);

1 0

[jimtabor] 33026: Implement NtGdiGetDCforBitmap. Q. Where to set hdc? ATM we return null.
by jimtabor＠svn.reactos.org 18 Apr '08

18 Apr '08

Author: jimtabor Date: Fri Apr 18 15:43:25 2008 New Revision: 33026 URL: http://svn.reactos.org/svn/reactos?rev=33026&view=rev Log: Implement NtGdiGetDCforBitmap. Q. Where to set hdc? ATM we return null. Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Fri Apr 18 15:43:25 2008 @@ -23,6 +23,7 @@ /* For device-independent bitmaps: */ DIBSECTION *dib; HPALETTE hDIBPalette; + HDC hDC; } BITMAPOBJ, *PBITMAPOBJ; #define BITMAPOBJ_IS_APIBITMAP 0x1 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Fri Apr 18 15:43:25 2008 @@ -87,7 +87,7 @@ DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. INT DC_Type; INT DC_Flags; - PVOID pPDev; // PGDIDEVICE + PVOID pPDev; // PGDIDEVICE aka PDEVOBJ PVOID hSem; // PERESOURCE FLONG flGraphics; FLONG flGraphics2; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Apr 18 15:43:25 2008 @@ -78,6 +78,7 @@ } bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + bmp->hDC = NULL; // Fixme if (NULL != pBits) { @@ -739,4 +740,21 @@ return Count; } } + +/* + * @implemented + */ +HDC +APIENTRY +NtGdiGetDCforBitmap( + IN HBITMAP hsurf) +{ + HDC hDC = NULL; + PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hsurf ); + hDC = bmp->hDC; + BITMAPOBJ_UnlockBitmap( bmp ); + return hDC; +} + + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Fri Apr 18 15:43:25 2008 @@ -2053,19 +2053,6 @@ /* * @unimplemented */ -HDC -APIENTRY -NtGdiGetDCforBitmap( - IN HBITMAP hsurf) -{ - UNIMPLEMENTED; - return NULL; -} - - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiGetDeviceCapsAll (

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs