From df3afb30b45e88d5e8705137a9aeef09babd9a69 Mon Sep 17 00:00:00 2001 From: CreepyCrafter24 <33260128+CreepyCrafter24@users.noreply.github.com> Date: Wed, 11 Sep 2019 11:22:16 +0200 Subject: [PATCH] Fix --- Misc/ArrayFormatter.cs | 4 +- W32.Test/Form1.Designer.cs | 83 +++++++++++++++++++++++--------- W32.Test/Form1.cs | 17 ++++++- W32/Wnd32.cs | 96 ++++++++++++++++++++++++++++++++++---- 4 files changed, 165 insertions(+), 35 deletions(-) diff --git a/Misc/ArrayFormatter.cs b/Misc/ArrayFormatter.cs index e91db19..2864df0 100644 --- a/Misc/ArrayFormatter.cs +++ b/Misc/ArrayFormatter.cs @@ -15,7 +15,9 @@ namespace CC_Functions.Misc string a = ""; for (int i = 0; i < Input.Length; i++) a += Input[i].ToString() + Seperator; - return a.Remove(a.Length - 1 - Seperator.Length); + if (Seperator.Length > 0) + a = a.Remove(a.Length - Seperator.Length); + return a; } catch { throw; } } diff --git a/W32.Test/Form1.Designer.cs b/W32.Test/Form1.Designer.cs index 0e8fa98..0ad6437 100644 --- a/W32.Test/Form1.Designer.cs +++ b/W32.Test/Form1.Designer.cs @@ -66,6 +66,9 @@ this.wnd_select_self = new System.Windows.Forms.Button(); this.wnd = new System.Windows.Forms.GroupBox(); this.wnd_select_class_box = new System.Windows.Forms.TextBox(); + this.wnd_action_icon = new System.Windows.Forms.Panel(); + this.wnd_action_visible = new System.Windows.Forms.CheckBox(); + this.wnd_action_style = new System.Windows.Forms.ComboBox(); this.keyboard.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.wnd_action_pos_h_bar)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.wnd_action_pos_w_bar)).BeginInit(); @@ -98,7 +101,7 @@ this.keyboard_log.Multiline = true; this.keyboard_log.Name = "keyboard_log"; this.keyboard_log.ReadOnly = true; - this.keyboard_log.Size = new System.Drawing.Size(286, 123); + this.keyboard_log.Size = new System.Drawing.Size(286, 150); this.keyboard_log.TabIndex = 2; this.keyboard_log.TextChanged += new System.EventHandler(this.Keyboard_log_TextChanged); // @@ -108,7 +111,7 @@ this.keyboard.Controls.Add(this.keyboard_enabled); this.keyboard.Location = new System.Drawing.Point(264, 160); this.keyboard.Name = "keyboard"; - this.keyboard.Size = new System.Drawing.Size(298, 171); + this.keyboard.Size = new System.Drawing.Size(298, 198); this.keyboard.TabIndex = 8; this.keyboard.TabStop = false; this.keyboard.Text = "CC-Functions.W32.KeyboardHook"; @@ -148,7 +151,7 @@ // wnd_action_pos_h_label // this.wnd_action_pos_h_label.AutoSize = true; - this.wnd_action_pos_h_label.Location = new System.Drawing.Point(116, 185); + this.wnd_action_pos_h_label.Location = new System.Drawing.Point(116, 210); this.wnd_action_pos_h_label.Name = "wnd_action_pos_h_label"; this.wnd_action_pos_h_label.Size = new System.Drawing.Size(18, 13); this.wnd_action_pos_h_label.TabIndex = 19; @@ -157,7 +160,7 @@ // wnd_action_pos_w_label // this.wnd_action_pos_w_label.AutoSize = true; - this.wnd_action_pos_w_label.Location = new System.Drawing.Point(116, 161); + this.wnd_action_pos_w_label.Location = new System.Drawing.Point(116, 186); this.wnd_action_pos_w_label.Name = "wnd_action_pos_w_label"; this.wnd_action_pos_w_label.Size = new System.Drawing.Size(21, 13); this.wnd_action_pos_w_label.TabIndex = 18; @@ -165,14 +168,14 @@ // // wnd_action_pos_h_bar // - this.wnd_action_pos_h_bar.Location = new System.Drawing.Point(136, 185); + this.wnd_action_pos_h_bar.Location = new System.Drawing.Point(136, 210); this.wnd_action_pos_h_bar.Name = "wnd_action_pos_h_bar"; this.wnd_action_pos_h_bar.Size = new System.Drawing.Size(104, 45); this.wnd_action_pos_h_bar.TabIndex = 21; // // wnd_action_pos_w_bar // - this.wnd_action_pos_w_bar.Location = new System.Drawing.Point(136, 161); + this.wnd_action_pos_w_bar.Location = new System.Drawing.Point(136, 186); this.wnd_action_pos_w_bar.Name = "wnd_action_pos_w_bar"; this.wnd_action_pos_w_bar.Size = new System.Drawing.Size(104, 45); this.wnd_action_pos_w_bar.TabIndex = 20; @@ -180,7 +183,7 @@ // wnd_action_pos_y_label // this.wnd_action_pos_y_label.AutoSize = true; - this.wnd_action_pos_y_label.Location = new System.Drawing.Point(6, 185); + this.wnd_action_pos_y_label.Location = new System.Drawing.Point(6, 210); this.wnd_action_pos_y_label.Name = "wnd_action_pos_y_label"; this.wnd_action_pos_y_label.Size = new System.Drawing.Size(17, 13); this.wnd_action_pos_y_label.TabIndex = 15; @@ -189,7 +192,7 @@ // wnd_action_pos_x_label // this.wnd_action_pos_x_label.AutoSize = true; - this.wnd_action_pos_x_label.Location = new System.Drawing.Point(6, 161); + this.wnd_action_pos_x_label.Location = new System.Drawing.Point(6, 186); this.wnd_action_pos_x_label.Name = "wnd_action_pos_x_label"; this.wnd_action_pos_x_label.Size = new System.Drawing.Size(17, 13); this.wnd_action_pos_x_label.TabIndex = 13; @@ -197,21 +200,21 @@ // // wnd_action_pos_y_bar // - this.wnd_action_pos_y_bar.Location = new System.Drawing.Point(17, 185); + this.wnd_action_pos_y_bar.Location = new System.Drawing.Point(17, 210); this.wnd_action_pos_y_bar.Name = "wnd_action_pos_y_bar"; this.wnd_action_pos_y_bar.Size = new System.Drawing.Size(104, 45); this.wnd_action_pos_y_bar.TabIndex = 17; // // wnd_action_pos_x_bar // - this.wnd_action_pos_x_bar.Location = new System.Drawing.Point(17, 161); + this.wnd_action_pos_x_bar.Location = new System.Drawing.Point(17, 186); this.wnd_action_pos_x_bar.Name = "wnd_action_pos_x_bar"; this.wnd_action_pos_x_bar.Size = new System.Drawing.Size(104, 45); this.wnd_action_pos_x_bar.TabIndex = 16; // // wnd_action_pos // - this.wnd_action_pos.Location = new System.Drawing.Point(87, 135); + this.wnd_action_pos.Location = new System.Drawing.Point(87, 160); this.wnd_action_pos.Name = "wnd_action_pos"; this.wnd_action_pos.Size = new System.Drawing.Size(75, 23); this.wnd_action_pos.TabIndex = 14; @@ -322,7 +325,7 @@ // // wnd_action_destroy // - this.wnd_action_destroy.Location = new System.Drawing.Point(6, 135); + this.wnd_action_destroy.Location = new System.Drawing.Point(6, 160); this.wnd_action_destroy.Name = "wnd_action_destroy"; this.wnd_action_destroy.Size = new System.Drawing.Size(75, 23); this.wnd_action_destroy.TabIndex = 2; @@ -332,9 +335,9 @@ // // wnd_action_overlay // - this.wnd_action_overlay.Location = new System.Drawing.Point(158, 106); + this.wnd_action_overlay.Location = new System.Drawing.Point(147, 106); this.wnd_action_overlay.Name = "wnd_action_overlay"; - this.wnd_action_overlay.Size = new System.Drawing.Size(79, 23); + this.wnd_action_overlay.Size = new System.Drawing.Size(64, 23); this.wnd_action_overlay.TabIndex = 11; this.wnd_action_overlay.Text = "Overlay"; this.wnd_action_overlay.UseVisualStyleBackColor = true; @@ -342,9 +345,9 @@ // // wnd_action_front // - this.wnd_action_front.Location = new System.Drawing.Point(77, 106); + this.wnd_action_front.Location = new System.Drawing.Point(168, 160); this.wnd_action_front.Name = "wnd_action_front"; - this.wnd_action_front.Size = new System.Drawing.Size(75, 23); + this.wnd_action_front.Size = new System.Drawing.Size(72, 23); this.wnd_action_front.TabIndex = 10; this.wnd_action_front.Text = "To Front"; this.wnd_action_front.UseVisualStyleBackColor = true; @@ -363,7 +366,7 @@ // // wnd_action_title_get // - this.wnd_action_title_get.Location = new System.Drawing.Point(200, 77); + this.wnd_action_title_get.Location = new System.Drawing.Point(203, 77); this.wnd_action_title_get.Name = "wnd_action_title_get"; this.wnd_action_title_get.Size = new System.Drawing.Size(37, 23); this.wnd_action_title_get.TabIndex = 8; @@ -373,7 +376,7 @@ // // wnd_action_title_set // - this.wnd_action_title_set.Location = new System.Drawing.Point(200, 48); + this.wnd_action_title_set.Location = new System.Drawing.Point(203, 48); this.wnd_action_title_set.Name = "wnd_action_title_set"; this.wnd_action_title_set.Size = new System.Drawing.Size(37, 23); this.wnd_action_title_set.TabIndex = 7; @@ -385,7 +388,7 @@ // this.wnd_select_title_box.Location = new System.Drawing.Point(93, 50); this.wnd_select_title_box.Name = "wnd_select_title_box"; - this.wnd_select_title_box.Size = new System.Drawing.Size(101, 20); + this.wnd_select_title_box.Size = new System.Drawing.Size(104, 20); this.wnd_select_title_box.TabIndex = 6; // // wnd_selet_class_button @@ -429,6 +432,9 @@ // // wnd // + this.wnd.Controls.Add(this.wnd_action_style); + this.wnd.Controls.Add(this.wnd_action_visible); + this.wnd.Controls.Add(this.wnd_action_icon); this.wnd.Controls.Add(this.wnd_action_pos_h_label); this.wnd.Controls.Add(this.wnd_action_pos_w_label); this.wnd.Controls.Add(this.wnd_action_pos_h_bar); @@ -453,7 +459,7 @@ this.wnd.Controls.Add(this.wnd_select_self); this.wnd.Location = new System.Drawing.Point(12, 117); this.wnd.Name = "wnd"; - this.wnd.Size = new System.Drawing.Size(246, 214); + this.wnd.Size = new System.Drawing.Size(246, 241); this.wnd.TabIndex = 6; this.wnd.TabStop = false; this.wnd.Text = "CC-Functions.W32.Wnd32"; @@ -462,14 +468,44 @@ // this.wnd_select_class_box.Location = new System.Drawing.Point(93, 79); this.wnd_select_class_box.Name = "wnd_select_class_box"; - this.wnd_select_class_box.Size = new System.Drawing.Size(101, 20); + this.wnd_select_class_box.Size = new System.Drawing.Size(104, 20); this.wnd_select_class_box.TabIndex = 5; // + // wnd_action_icon + // + this.wnd_action_icon.BackColor = System.Drawing.SystemColors.ControlLight; + this.wnd_action_icon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.wnd_action_icon.Location = new System.Drawing.Point(217, 106); + this.wnd_action_icon.Name = "wnd_action_icon"; + this.wnd_action_icon.Size = new System.Drawing.Size(23, 23); + this.wnd_action_icon.TabIndex = 22; + // + // wnd_action_visible + // + this.wnd_action_visible.AutoSize = true; + this.wnd_action_visible.Location = new System.Drawing.Point(77, 110); + this.wnd_action_visible.Name = "wnd_action_visible"; + this.wnd_action_visible.Size = new System.Drawing.Size(56, 17); + this.wnd_action_visible.TabIndex = 23; + this.wnd_action_visible.Text = "Visible"; + this.wnd_action_visible.UseVisualStyleBackColor = true; + this.wnd_action_visible.CheckedChanged += new System.EventHandler(this.Wnd_action_visible_CheckedChanged); + // + // wnd_action_style + // + this.wnd_action_style.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.wnd_action_style.FormattingEnabled = true; + this.wnd_action_style.Location = new System.Drawing.Point(6, 133); + this.wnd_action_style.Name = "wnd_action_style"; + this.wnd_action_style.Size = new System.Drawing.Size(121, 21); + this.wnd_action_style.TabIndex = 24; + this.wnd_action_style.SelectedIndexChanged += new System.EventHandler(this.Wnd_action_style_SelectedIndexChanged); + // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(574, 342); + this.ClientSize = new System.Drawing.Size(574, 370); this.Controls.Add(this.exit); this.Controls.Add(this.keyboard); this.Controls.Add(this.mouse); @@ -535,5 +571,8 @@ private System.Windows.Forms.Button wnd_select_self; private System.Windows.Forms.GroupBox wnd; private System.Windows.Forms.TextBox wnd_select_class_box; + private System.Windows.Forms.Panel wnd_action_icon; + private System.Windows.Forms.CheckBox wnd_action_visible; + private System.Windows.Forms.ComboBox wnd_action_style; } } \ No newline at end of file diff --git a/W32.Test/Form1.cs b/W32.Test/Form1.cs index edf3d73..a790534 100644 --- a/W32.Test/Form1.cs +++ b/W32.Test/Form1.cs @@ -37,6 +37,8 @@ namespace CC_Functions.W32.Test wnd_action_pos_y_bar.Maximum = Screen.PrimaryScreen.Bounds.Height; wnd_action_pos_w_bar.Maximum = Screen.PrimaryScreen.Bounds.Width; wnd_action_pos_h_bar.Maximum = Screen.PrimaryScreen.Bounds.Height; + wnd_action_style.DataSource = Enum.GetValues(typeof(FormWindowState)); + wnd_action_style.SelectedItem = tmpWnd.state; } public void set_up_box(ComboBox box, Type enumT) @@ -66,16 +68,21 @@ namespace CC_Functions.W32.Test private void Wnd_action_title_get_Click(object sender, EventArgs e) { + if (!tmpWnd.stillExists) + tmpWnd = Wnd32.fromForm(this); wnd_select_title_box.Text = tmpWnd.title; - wnd_action_enabled.Enabled = tmpWnd.enabled; + wnd_action_enabled.Checked = tmpWnd.enabled; wnd_select_selected.Text = "Selected: " + tmpWnd.hWnd.ToString(); + try { wnd_action_icon.BackgroundImage = tmpWnd.icon.ToBitmap(); } catch { wnd_action_icon.BackgroundImage = null; } try { wnd_action_pos_x_bar.Value = tmpWnd.position.X; } catch { } try { wnd_action_pos_y_bar.Value = tmpWnd.position.Y; } catch { } try { wnd_action_pos_w_bar.Value = tmpWnd.position.Width; } catch { } try { wnd_action_pos_h_bar.Value = tmpWnd.position.Height; } catch { } } - private void Wnd_action_enabled_CheckedChanged(object sender, EventArgs e) => tmpWnd.enabled = wnd_action_enabled.Enabled; + private void Wnd_action_enabled_CheckedChanged(object sender, EventArgs e) => tmpWnd.enabled = wnd_action_enabled.Checked; + + private void Wnd_action_visible_CheckedChanged(object sender, EventArgs e) => tmpWnd.shown = wnd_action_visible.Checked; private void Wnd_action_front_Click(object sender, EventArgs e) => tmpWnd.isForeground = true; @@ -206,5 +213,11 @@ namespace CC_Functions.W32.Test { moving = false; } + + private void Wnd_action_style_SelectedIndexChanged(object sender, EventArgs e) + { + Enum.TryParse(wnd_action_style.SelectedValue.ToString(), out FormWindowState status); + tmpWnd.state = status; + } } } diff --git a/W32/Wnd32.cs b/W32/Wnd32.cs index e4b92c2..5bca3d4 100644 --- a/W32/Wnd32.cs +++ b/W32/Wnd32.cs @@ -22,38 +22,105 @@ namespace CC_Functions.W32 public static Wnd32 foreground() => fromHandle(GetForegroundWindow()); #endregion #region InstanceActions - public string title { get { + public string title + { + get { int length = GetWindowTextLength(hWnd); StringBuilder sb = new StringBuilder(length + 1); GetWindowText(hWnd, sb, sb.Capacity); return sb.ToString(); - } set { + } + set { SetWindowText(hWnd, value); - } } - public Rectangle position { get { + } + } + public Rectangle position + { + get { RECT Rect = new RECT(); GetWindowRect(hWnd, ref Rect); return new Rectangle(new Point(Rect.left, Rect.top), new Size(Rect.right - Rect.left, Rect.bottom - Rect.top)); - } set { + } + set { RECT Rect = new RECT(); GetWindowRect(hWnd, ref Rect); MoveWindow(hWnd, value.X, value.Y, value.Width, value.Height, true); - } } - public bool isForeground { get { + } + } + public bool isForeground + { + get { return GetForegroundWindow() == hWnd; - } set { + } + set { if (value) SetForegroundWindow(hWnd); else throw new InvalidOperationException("You can't set a Window not to be in the foreground. Move another one over it!"); } } - public bool enabled { get { + public bool enabled + { + get { return IsWindowEnabled(hWnd); - } set { + } + set { EnableWindow(hWnd, value); } } + public Icon icon + { + get { + var hicon = SendMessage(hWnd, 0x7F, 1, 0); + if (hicon == IntPtr.Zero) + hicon = SendMessage(hWnd, 0x7F, 0, 0); + if (hicon == IntPtr.Zero) + hicon = SendMessage(hWnd, 0x7F, 2, 0); + return Icon.FromHandle(hicon); + } + } + public bool shown + { + set { + if (value) + ShowWindow(hWnd, 9); + else + ShowWindow(hWnd, 0); + } + } + public FormWindowState state + { + get { + int style = (int)GetWindowLong(hWnd, -16); + if ((style & 0x01000000) == 0x01000000) + { + return FormWindowState.Maximized; + } + else if ((style & 0x20000000) == 0x20000000) + { + return FormWindowState.Minimized; + } + else + { + return FormWindowState.Normal; + } + } + set { + switch (value) + { + case FormWindowState.Minimized: + ShowWindow(hWnd, 11); + break; + case FormWindowState.Normal: + ShowWindow(hWnd, 1); + break; + case FormWindowState.Maximized: + ShowWindow(hWnd, 3); + break; + } + } + } + public void MakeOverlay() => _ = SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS); public bool Destroy() { @@ -131,6 +198,15 @@ namespace CC_Functions.W32 [DllImport("user32.dll")] [return: MarshalAs(UnmanagedType.Bool)] static extern bool IsWindow(IntPtr hWnd); + + [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)] + static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, int lParam); + + [DllImport("user32.dll")] + static extern bool ShowWindow(IntPtr hWnd, int nCmdShow); + + [DllImport("user32.dll", SetLastError = true)] + static extern int GetWindowLong(IntPtr hWnd, int nIndex); #endregion } }