backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Replaced remaining asserts in ipxconfig with error messages

Browse Source
This commit is contained in:
Daniel Collins 2011-07-09 03:31:54 +00:00
parent 8228b5af49
commit 877edb3d85
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes.txt
View File

@ -12,6 +12,8 @@ Version 0.2.1:
Feature: Optionally log names of all WinSock calls. Feature: Optionally log names of all WinSock calls.
Bugfix: Store correct DLL name in stub DLLs. Bugfix: Store correct DLL name in stub DLLs.
Cleanup: Replace assert calls with proper error checks in ipxconfig.
Version 0.2: Version 0.2:
Implemented ioctlsocket() function with support for FIONREAD. Implemented ioctlsocket() function with support for FIONREAD.

46
src/ipxconfig.cpp
View File

@ -21,7 +21,6 @@
#include <commctrl.h> #include <commctrl.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#include <iostream> #include <iostream>
#include <assert.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include <stdint.h> #include <stdint.h>
@ -70,6 +69,7 @@ static HWND create_child(HWND parent, int x, int y, int w, int h, LPCTSTR class_
static void add_list_column(HWND hwnd, int id, char *text, int width); static void add_list_column(HWND hwnd, int id, char *text, int width);
static int get_text_width(HWND hwnd, const char *txt); static int get_text_width(HWND hwnd, const char *txt);
static int get_text_height(HWND hwnd); static int get_text_height(HWND hwnd);
static RECT get_window_rect(HWND hwnd);
static std::string w32_errmsg(DWORD errnum); static std::string w32_errmsg(DWORD errnum);
static void die(std::string msg); static void die(std::string msg);
@ -207,15 +207,13 @@ static LRESULT CALLBACK main_wproc(HWND window, UINT msg, WPARAM wp, LPARAM lp)
case WM_SIZE: case WM_SIZE:
int width = LOWORD(lp), height = HIWORD(lp); int width = LOWORD(lp), height = HIWORD(lp);
RECT rect; RECT rect = get_window_rect(windows.nic_conf);
assert(GetWindowRect(windows.nic_conf, &rect));
int conf_h = rect.bottom - rect.top; int conf_h = rect.bottom - rect.top;
assert(GetWindowRect(windows.global_conf, &rect)); rect = get_window_rect(windows.global_conf);
int gc_h = rect.bottom - rect.top; int gc_h = rect.bottom - rect.top;
assert(GetWindowRect(windows.button_box, &rect)); rect = get_window_rect(windows.button_box);
int btn_w = rect.right - rect.left; int btn_w = rect.right - rect.left;
MoveWindow(windows.nic_list, 0, 0, width, height-conf_h-gc_h, TRUE); MoveWindow(windows.nic_list, 0, 0, width, height-conf_h-gc_h, TRUE);
@ -280,14 +278,16 @@ static LRESULT CALLBACK addr_dialog_wproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM
MoveWindow(ok, edit_w+10, 5, btn_w, height, TRUE); MoveWindow(ok, edit_w+10, 5, btn_w, height, TRUE);
MoveWindow(cancel, edit_w+btn_w+15, 5, btn_w, height, TRUE); MoveWindow(cancel, edit_w+btn_w+15, 5, btn_w, height, TRUE);
RECT crect, brect; RECT crect, brect = get_window_rect(hwnd);
assert(GetClientRect(hwnd, &crect));
assert(GetWindowRect(hwnd, &brect)); if(!GetClientRect(hwnd, &crect)) {
die("GetClientRect failed: " + w32_errmsg(GetLastError()));
}
int win_w = ((brect.right - brect.left) - crect.right) + edit_w + 2*btn_w + 20; int win_w = ((brect.right - brect.left) - crect.right) + edit_w + 2*btn_w + 20;
int win_h = ((brect.bottom - brect.top) - crect.bottom) + height + 10; int win_h = ((brect.bottom - brect.top) - crect.bottom) + height + 10;
assert(GetWindowRect(windows.main, &brect)); brect = get_window_rect(windows.main);
int win_x = brect.left + (brect.right - brect.left) / 2 - win_w / 2; int win_x = brect.left + (brect.right - brect.left) / 2 - win_w / 2;
int win_y = brect.top + (brect.bottom - brect.top) / 2 - win_h / 2; int win_y = brect.top + (brect.bottom - brect.top) / 2 - win_h / 2;
@ -744,10 +744,14 @@ static void add_list_column(HWND hwnd, int id, char *text, int width) {
static int get_text_width(HWND hwnd, const char *txt) { static int get_text_width(HWND hwnd, const char *txt) {
HDC dc = GetDC(hwnd); HDC dc = GetDC(hwnd);
assert(dc); if(!dc) {
die("GetDC failed");
}
SIZE size; SIZE size;
assert(GetTextExtentPoint32(dc, txt, strlen(txt), &size)); if(!GetTextExtentPoint32(dc, txt, strlen(txt), &size)) {
die("GetTextExtentPoint32 failed");
}
ReleaseDC(hwnd, dc); ReleaseDC(hwnd, dc);
@ -756,16 +760,30 @@ static int get_text_width(HWND hwnd, const char *txt) {
static int get_text_height(HWND hwnd) { static int get_text_height(HWND hwnd) {
HDC dc = GetDC(hwnd); HDC dc = GetDC(hwnd);
assert(dc); if(!dc) {
die("GetDC failed");
}
TEXTMETRIC tm; TEXTMETRIC tm;
assert(GetTextMetrics(dc, &tm)); if(!GetTextMetrics(dc, &tm)) {
die("GetTextMetrics failed");
}
ReleaseDC(hwnd, dc); ReleaseDC(hwnd, dc);
return tm.tmHeight; return tm.tmHeight;
} }
static RECT get_window_rect(HWND hwnd) {
RECT rect;
if(!GetWindowRect(hwnd, &rect)) {
die("GetWindowRect failed: " + w32_errmsg(GetLastError()));
}
return rect;
}
/* Convert a win32 error number to a message */ /* Convert a win32 error number to a message */
static std::string w32_errmsg(DWORD errnum) { static std::string w32_errmsg(DWORD errnum) {
char buf[256] = {'\0'}; char buf[256] = {'\0'};