Module: wine Branch: master Commit: 443f62d2f7914a634814a52d6de726bd0c98af8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=443f62d2f7914a634814a52d6d...
Author: Michael Stefaniuc mstefani@redhat.de Date: Wed Oct 16 23:01:49 2013 +0200
opengl32/tests: Compile with -D__WINESRC__.
---
dlls/opengl32/tests/Makefile.in | 1 - dlls/opengl32/tests/opengl.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/opengl32/tests/Makefile.in b/dlls/opengl32/tests/Makefile.in index 7bcb283..98e474c 100644 --- a/dlls/opengl32/tests/Makefile.in +++ b/dlls/opengl32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = opengl32.dll IMPORTS = opengl32 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ opengl.c diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3aa2c40..83c5256 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -303,8 +303,8 @@ static void test_setpixelformat(HDC winhdc) else ok(!res, "Unexpectedly set an alternate pixel format\n"); }
- hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -323,8 +323,8 @@ static void test_setpixelformat(HDC winhdc) DestroyWindow( hwnd ); }
- hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) { @@ -755,7 +755,7 @@ static void test_deletecontext(HWND hwnd, HDC hdc) */ thread_params.hglrc = hglrc; thread_params.hwnd = hwnd; - thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); + thread_params.test_finished = CreateEventW(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) @@ -1620,8 +1620,8 @@ START_TEST(opengl) 0, 0, 0 /* layer masks */ };
- hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, - 10, 10, 200, 200, NULL, NULL, NULL, NULL); + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); ok(hwnd != NULL, "err: %d\n", GetLastError()); if (hwnd) {