ISSUE-21: Cleaning up some of the commented out code.

Author: JasonZink

win32/N3888_RefImpl/Win32RenderWindow.cpp

@@ -61,6 +61,7 @@ Win32RenderWindow::Win32RenderWindow(unsigned int width, unsigned int height, co
 		UpdateWindow(handle);
 	}
 
+	// Create the initial surface for drawing to.
 	g_psurface = unique_ptr<surface>(new surface(move(make_surface(format::argb32, lwidth, lheight))));
 }
 

win32/N3888_RefImpl/Win32RenderWindow.h

@@ -17,17 +17,13 @@ class Win32RenderWindow
 
 	HWND GetHandle();
 
-
 	LRESULT WindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
 	void ShowSaveAsPNGDialog();
 
 	std::unique_ptr<std::experimental::drawing::surface> g_psurface;
 
 private:
 	HWND handle;
-	
-	RECT g_previousClientRect;
-	//ref_counted_bool g_doNotPaint;
 };
 
 #endif // _WIN32RENDERWINDOW_

win32/N3888_RefImpl/entrypoint-win32.cpp

@@ -25,35 +25,11 @@ using namespace std::experimental::drawing;
 
 #define MAX_LOADSTRING 100
 
-class ref_counted_bool {
-	::std::atomic<int> m_refCount;
-public:
-	ref_counted_bool() : m_refCount(0) {}
-	ref_counted_bool& operator=(bool value) {
-		if (value) {
-			m_refCount++;
-		}
-		else {
-			auto count = m_refCount.load(memory_order_acquire);
-			if (--count < 0) {
-				count = 0;
-			}
-			m_refCount.store(count, memory_order_release);
-		}
-		return *this;
-	}
-	operator bool() {
-		return m_refCount.load() != 0;
-	}
-};
 
 // Global Variables:
 HINSTANCE hInst;								// current instance
 TCHAR szTitle[MAX_LOADSTRING];					// The title bar text
 TCHAR szWindowClass[MAX_LOADSTRING];			// the main window class name
-//unique_ptr<surface> g_psurface;
-//RECT g_previousClientRect;
-//ref_counted_bool g_doNotPaint;
 
 // Everything in the Draw function should be portable C++ code.
 void Draw(surface& surface) {
@@ -199,59 +175,6 @@ void Draw(surface& surface) {
 	context.show_text("Hello C++!");
 }
 
-//void OnPaint(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
-//	UNREFERENCED_PARAMETER(message);
-//	UNREFERENCED_PARAMETER(wParam);
-//	UNREFERENCED_PARAMETER(lParam);
-//
-//	PAINTSTRUCT ps;
-//	HDC hdc;
-//	RECT updateRect{ };
-//	auto getUpdateRectResult = GetUpdateRect(hWnd, &updateRect, FALSE);
-//
-//	// There's a bug somewhere (possibly cairo?) where if you run this code without the check to make sure that
-//	// updateRect.left and .top are both 0, it crashes and does so in the cairo DLL such that it's immune to
-//	// being caught. Specifically in a Win32/Debug config it throws well inside cairo on the ctxt.paint() call
-//	// on an illegal memory access (actually in pixman-sse2.c in a call to "void save_128_aligned(__m128i*, __m128i);").
-//	if (getUpdateRectResult != FALSE && updateRect.left == 0 && updateRect.top == 0) {
-//		hdc = BeginPaint(hWnd, &ps);
-//
-//		RECT clientRect;
-//		if (!GetClientRect(hWnd, &clientRect)) {
-//			throw_get_last_error<logic_error>("Failed GetClientRect call.");
-//		}
-//		auto width = clientRect.right - clientRect.left;
-//		auto height = clientRect.bottom - clientRect.top;
-//		auto previousWidth = g_previousClientRect.right - g_previousClientRect.left;
-//		auto previousHeight = g_previousClientRect.bottom - g_previousClientRect.top;
-//
-//		// To enable screenshot saving, we are using a global unique_ptr surface. I did not rewrite the boilerplate
-//		// Win32 code so that it'd be a class, hence the globals.
-//		if ((g_psurface == nullptr) || (width != previousWidth) || (height != previousHeight)) {
-//			g_psurface = unique_ptr<surface>(new surface(move(make_surface(format::argb32, width, height))));
-//			g_previousClientRect = clientRect;
-//		}
-//
-//		// Draw to the off-screen buffer.
-//		Draw(*g_psurface);
-//
-//		// Flush to ensure that it is drawn to the window.
-//		g_psurface->flush();
-//
-//		auto surface = make_surface(cairo_win32_surface_create(hdc));
-//		auto ctxt = context(surface);
-//		ctxt.set_source_surface(*g_psurface, 0.0, 0.0);
-//		ctxt.paint();
-//		surface.flush();
-//		EndPaint(hWnd, &ps);
-//	}
-//	else {
-//		if (getUpdateRectResult != FALSE) {
-//			hdc = BeginPaint(hWnd, &ps);
-//			EndPaint(hWnd, &ps);
-//		}
-//	}
-//}
 
 int WINAPI wWinMain(
 	_In_ HINSTANCE hInstance,
@@ -261,7 +184,7 @@ int WINAPI wWinMain(
 	) {
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
-	//g_previousClientRect = { }; // Zero out previous client rect.
+
 	throw_if_failed_hresult<runtime_error>(
 		CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED), "Failed call to CoInitializeEx."
 		);
@@ -274,12 +197,6 @@ int WINAPI wWinMain(
 	LoadString(hInstance, IDC_N3888_REFIMPL, szWindowClass, MAX_LOADSTRING);
 	MyRegisterClass(hInstance);
 
-	//HWND hWnd;
-	// Perform application initialization:
-	//if (!InitInstance(hInstance, nCmdShow, hWnd)) {
-	//	CoUninitialize();
-	//	return FALSE;
-	//}
 
 	hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_N3888_REFIMPL));
 
@@ -361,143 +278,4 @@ ATOM MyRegisterClass(HINSTANCE hInstance) {
 	wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
 
 	return RegisterClassEx(&wcex);
-}
-
-//
-//   FUNCTION: InitInstance(HINSTANCE, int)
-//
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
-//
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow, HWND& hWnd) {
-	//HWND hWnd;
-	INITCOMMONCONTROLSEX initCommonControlsEx{ };
-	initCommonControlsEx.dwSize = sizeof(initCommonControlsEx);
-	initCommonControlsEx.dwICC = ICC_LINK_CLASS;
-	if (InitCommonControlsEx(&initCommonControlsEx) == FALSE) {
-		throw runtime_error("Failed call to InitCommonControlsEx.");
-	}
-
-	hInst = hInstance; // Store instance handle in our global variable
-
-	hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW,
-		CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL);
-
-	if (!hWnd) {
-		return FALSE;
-	}
-
-	ShowWindow(hWnd, nCmdShow);
-	UpdateWindow(hWnd);
-
-	return TRUE;
-}
-
-
-//
-//  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
-//
-//  PURPOSE:  Processes messages for the main window.
-//
-//  WM_COMMAND	- process the application menu
-//  WM_PAINT	- Paint the main window
-//  WM_DESTROY	- post a quit message and return
-//
-//
-//LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
-//	int wmId, wmEvent;
-//
-//#if defined(DEBUG_WNDPROC)
-//	wstringstream str;
-//	str << L"Message: 0x" << hex << uppercase << message << nouppercase
-//		<< L". WPARAM: 0x" << hex << uppercase << static_cast<UINT>(wParam) << nouppercase
-//		<< L". LPARAM: 0x" << hex << uppercase << static_cast<UINT>(lParam) << endl;
-//	OutputDebugStringW(str.str().c_str());
-//#endif
-//
-//	switch (message) {
-//	case WM_COMMAND:
-//		wmId = LOWORD(wParam);
-//		wmEvent = HIWORD(wParam);
-//		// Parse the menu selections:
-//		switch (wmId) {
-//		case IDM_ABOUT:
-//		{
-//			auto aboutResult = DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
-//			if (aboutResult <= 0) {
-//				throw_get_last_error<logic_error>("Failed call to DialogBox.");
-//			}
-//		}
-//			break;
-//		case ID_EDIT_SCREENCAPTURE:
-//			ShowSaveAsPNGDialog();
-//			break;
-//		case IDM_EXIT:
-//			DestroyWindow(hWnd);
-//			break;
-//		default:
-//			return DefWindowProc(hWnd, message, wParam, lParam);
-//		}
-//		break;
-//	case WM_ENTERSIZEMOVE:
-//		g_doNotPaint = true; // Don't paint while resizing to avoid flicker.
-//		return DefWindowProc(hWnd, message, wParam, lParam);
-//	case WM_EXITSIZEMOVE:
-//		g_doNotPaint = false;
-//		return DefWindowProc(hWnd, message, wParam, lParam);
-//	case WM_PAINT:
-//		if (!g_doNotPaint) {
-//			OnPaint(hWnd, message, wParam, lParam);
-//		}
-//		break;
-//	case WM_DESTROY:
-//		PostQuitMessage(0);
-//		break;
-//	default:
-//		return DefWindowProc(hWnd, message, wParam, lParam);
-//	}
-//	return 0;
-//}
-
-// Message handler for about box.
-//INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
-//	UNREFERENCED_PARAMETER(lParam);
-//	switch (message) {
-//	case WM_INITDIALOG:
-//		return (INT_PTR)TRUE;
-//
-//	case WM_COMMAND:
-//		if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) {
-//			EndDialog(hDlg, LOWORD(wParam));
-//			return (INT_PTR)TRUE;
-//		}
-//		break;
-//	case WM_NOTIFY:
-//	{
-//		PNMLINK pnmLink = reinterpret_cast<PNMLINK>(lParam);
-//		if ((pnmLink->hdr.idFrom == IDC_SYSLINK1) || (pnmLink->hdr.idFrom == IDC_SYSLINK2)) {
-//			switch (pnmLink->hdr.code)
-//			{
-//			case NM_CLICK:
-//				// Intentional fall-through.
-//			case NM_RETURN:
-//			{
-//				auto shExecResult = reinterpret_cast<int>(ShellExecute(nullptr, L"open", pnmLink->item.szUrl, nullptr, nullptr, SW_SHOW));
-//				if (shExecResult <= 32) {
-//					wstringstream err;
-//					err << L"Error calling ShellExecute while trying to open the link. Return code: " << to_wstring(shExecResult) << "." << endl;
-//					MessageBox(hDlg, err.str().c_str(), L"Error opening link", MB_OK | MB_ICONEXCLAMATION);
-//				}
-//			}
-//				return (INT_PTR)TRUE;
-//			}
-//		}
-//	}
-//		break;
-//	}
-//	return (INT_PTR)FALSE;
-//}
+}