From c590a7f3227268f09264ace4932e193d0d7b93a6 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Tue, 21 Jan 2014 19:22:37 +0000 Subject: Windows: Fix 64-bit compitation of crash_generation_app. BUG=560 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1104002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1276 4c0a9323-5329-0410-9bdc-e9ce6186880e --- .../windows/tests/crash_generation_app/crash_generation_app.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/client/windows') diff --git a/src/client/windows/tests/crash_generation_app/crash_generation_app.cc b/src/client/windows/tests/crash_generation_app/crash_generation_app.cc index 12449ce9..7a6c1a97 100644 --- a/src/client/windows/tests/crash_generation_app/crash_generation_app.cc +++ b/src/client/windows/tests/crash_generation_app/crash_generation_app.cc @@ -357,13 +357,7 @@ LRESULT CALLBACK WndProc(HWND wnd, PAINTSTRUCT ps; HDC hdc; -#pragma warning(push) -#pragma warning(disable:4312) - // Disable warning C4312: 'type cast' : conversion from 'LONG' to - // 'HINSTANCE' of greater size. - // The value returned by GetwindowLong in the case below returns unsigned. - HINSTANCE instance = (HINSTANCE)GetWindowLong(wnd, GWL_HINSTANCE); -#pragma warning(pop) + HINSTANCE instance = (HINSTANCE)GetWindowLongPtr(wnd, GWLP_HINSTANCE); switch (message) { case WM_COMMAND: -- cgit v1.2.1