October 2013 - Wine-Commits

Alexandre Julliard : winex11: Clear the thread data explicitly on detach.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: fdde51580d9ea736b2171efd84c9c3eefca81505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdde51580d9ea736b2171efd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 19:45:22 2013 +0200 winex11: Clear the thread data explicitly on detach. --- dlls/winex11.drv/x11drv_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7b730ca..a6572ba 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -609,6 +609,8 @@ static void thread_detach(void) if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); HeapFree( GetProcessHeap(), 0, data ); + /* clear data in case we get re-entered from user32 before the thread is truly dead */ + TlsSetValue( thread_data_tls_index, NULL ); } }

1 0

Dmitry Timoshkov : gdi32/tests: Fix metafile tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 0c63f40bdcd0260aba69df71942ae54eabfb4ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c63f40bdcd0260aba69df719… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:44 2013 +0900 gdi32/tests: Fix metafile tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/metafile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 53ec7ac..54b5973 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2718,7 +2718,7 @@ static HENHMETAFILE create_converted_emf(const METAFILEPICT *mfp) UINT size; LPBYTE pBits; - hdcMf = CreateMetaFile(NULL); + hdcMf = CreateMetaFileA(NULL); ok(hdcMf != NULL, "CreateMetaFile failed with error %d\n", GetLastError()); ret = LineTo(hdcMf, (INT)LINE_X, (INT)LINE_Y); ok(ret, "LineTo failed with error %d\n", GetLastError()); @@ -2898,7 +2898,7 @@ static void test_SetWinMetaFileBits(void) HDC dc; LONG diffx, diffy; - wmfDC = CreateMetaFile(NULL); + wmfDC = CreateMetaFileA(NULL); ok(wmfDC != NULL, "CreateMetaFile failed\n"); if (!wmfDC) return; @@ -3245,7 +3245,7 @@ static void test_gdiis(void) HMODULE hgdi32; /* resolve all the functions */ - hgdi32 = GetModuleHandle("gdi32"); + hgdi32 = GetModuleHandleA("gdi32.dll"); pGdiIsMetaPrintDC = (void*) GetProcAddress(hgdi32, "GdiIsMetaPrintDC"); pGdiIsMetaFileDC = (void*) GetProcAddress(hgdi32, "GdiIsMetaFileDC"); pGdiIsPlayMetafileDC = (void*) GetProcAddress(hgdi32, "GdiIsPlayMetafileDC"); @@ -3262,7 +3262,7 @@ static void test_gdiis(void) ok(!pGdiIsPlayMetafileDC(NULL), "isplaymetafile with NULL parameter\n"); /* try with a metafile */ - hmfDC = CreateMetaFile(NULL); + hmfDC = CreateMetaFileA(NULL); ok(!pGdiIsMetaPrintDC(hmfDC), "ismetaprint on metafile\n"); ok(pGdiIsMetaFileDC(hmfDC), "ismetafile on metafile\n"); ok(!pGdiIsPlayMetafileDC(hmfDC), "isplaymetafile on metafile\n");

1 0

Dmitry Timoshkov : gdi32/tests: Fix DIB tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 85b42085a46ab4584a68a76d26d5541b8a75ea9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b42085a46ab4584a68a76d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:29 2013 +0900 gdi32/tests: Fix DIB tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/dib.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 18c1067..15e7b50 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2720,17 +2720,17 @@ static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) { DWORD dib_size = get_dib_size(bmi), ret; - LOGFONT lf; + LOGFONTA lf; HFONT font; GLYPHMETRICS gm; BYTE g_buf[10000]; int i, stride, x, y; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; char *eto_hash = NULL, *diy_hash = NULL; - static const char *str = "Hello Wine"; + static const char str[] = "Hello Wine"; POINT origin, g_org; static const BYTE vals[4] = { 0x00, 0x00, 0x00, 0x00 }; - TEXTMETRIC tm; + TEXTMETRICA tm; COLORREF text_color; for(i = 0; i < dib_size; i++) @@ -2741,10 +2741,10 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) lf.lfHeight = 24; lf.lfQuality = aa ? ANTIALIASED_QUALITY : NONANTIALIASED_QUALITY; - font = CreateFontIndirect( &lf ); + font = CreateFontIndirectA( &lf ); font = SelectObject( hdc, font ); - GetTextMetrics( hdc, &tm ); + GetTextMetricsA( hdc, &tm ); if (!(tm.tmPitchAndFamily & TMPF_VECTOR)) { skip( "skipping as a bitmap font has been selected for Tahoma.\n" ); @@ -2758,7 +2758,7 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) origin.x = 10; origin.y = 100; - ExtTextOut( hdc, origin.x, origin.y, 0, NULL, str, strlen(str), NULL ); + ExtTextOutA( hdc, origin.x, origin.y, 0, NULL, str, strlen(str), NULL ); eto_hash = hash_dib( bmi, bits ); for(i = 0; i < dib_size; i++) @@ -2771,11 +2771,11 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) { DWORD ggo_flags = aa ? GGO_GRAY4_BITMAP : GGO_BITMAP; - ret = GetGlyphOutline( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); + ret = GetGlyphOutlineA( hdc, str[i], ggo_flags, &gm, 0, NULL, &identity ); if (ret == GDI_ERROR) continue; - if (ret) GetGlyphOutline( hdc, str[i], ggo_flags, &gm, sizeof(g_buf), g_buf, &identity ); + if (ret) GetGlyphOutlineA( hdc, str[i], ggo_flags, &gm, sizeof(g_buf), g_buf, &identity ); g_org.x = origin.x + gm.gmptGlyphOrigin.x; g_org.y = origin.y - gm.gmptGlyphOrigin.y;

1 0

Dmitry Timoshkov : gdi32/tests: Fix GDI object tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: c58072833ec4487be8397557797f584dc0222f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58072833ec4487be83975577… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:40 2013 +0900 gdi32/tests: Fix GDI object tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/gdiobj.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 3b9f734..65374ea 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -121,7 +121,7 @@ static DWORD WINAPI thread_proc(void *param) DWORD status; struct hgdiobj_event *hgdiobj_event = param; - hgdiobj_event->hdc = CreateDC("display", NULL, NULL, NULL); + hgdiobj_event->hdc = CreateDCA("display", NULL, NULL, NULL); ok(hgdiobj_event->hdc != NULL, "CreateDC error %u\n", GetLastError()); hgdiobj_event->hgdiobj1 = CreatePen(PS_DASHDOTDOT, 17, RGB(1, 2, 3)); @@ -134,7 +134,7 @@ static DWORD WINAPI thread_proc(void *param) status = WaitForSingleObject(hgdiobj_event->stop_event, INFINITE); ok(status == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", GetLastError()); - ok(!GetObject(hgdiobj_event->hgdiobj1, sizeof(lp), &lp), "GetObject should fail\n"); + ok(!GetObjectA(hgdiobj_event->hgdiobj1, sizeof(lp), &lp), "GetObject should fail\n"); ok(!GetDeviceCaps(hgdiobj_event->hdc, TECHNOLOGY), "GetDeviceCaps(TECHNOLOGY) should fail\n"); @@ -151,9 +151,9 @@ static void test_thread_objects(void) DWORD status; BOOL bRet; - hgdiobj_event.stop_event = CreateEvent(NULL, 0, 0, NULL); + hgdiobj_event.stop_event = CreateEventA(NULL, 0, 0, NULL); ok(hgdiobj_event.stop_event != NULL, "CreateEvent error %u\n", GetLastError()); - hgdiobj_event.ready_event = CreateEvent(NULL, 0, 0, NULL); + hgdiobj_event.ready_event = CreateEventA(NULL, 0, 0, NULL); ok(hgdiobj_event.ready_event != NULL, "CreateEvent error %u\n", GetLastError()); hthread = CreateThread(NULL, 0, thread_proc, &hgdiobj_event, 0, &tid); @@ -162,7 +162,7 @@ static void test_thread_objects(void) status = WaitForSingleObject(hgdiobj_event.ready_event, INFINITE); ok(status == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", GetLastError()); - ret = GetObject(hgdiobj_event.hgdiobj1, sizeof(lp), &lp); + ret = GetObjectA(hgdiobj_event.hgdiobj1, sizeof(lp), &lp); ok(ret == sizeof(lp), "GetObject error %u\n", GetLastError()); ok(lp.lopnStyle == PS_DASHDOTDOT, "wrong pen style %d\n", lp.lopnStyle); ok(lp.lopnWidth.x == 17, "wrong pen width.y %d\n", lp.lopnWidth.x); @@ -249,7 +249,7 @@ static void test_GetCurrentObject(void) hobj = GetCurrentObject(hdc, OBJ_BITMAP); ok(hobj == hbmp, "OBJ_BITMAP is wrong: %p\n", hobj); - assert(GetObject(hbrush, sizeof(lb), &lb) == sizeof(lb)); + assert(GetObjectA(hbrush, sizeof(lb), &lb) == sizeof(lb)); hpen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_SQUARE | PS_JOIN_BEVEL, 10, &lb, 0, NULL); assert(hpen != 0);

1 0

Dmitry Timoshkov : gdi32/tests: Fix DC tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 120ee4e0582ba8fc6ac12c33d4227e1eaef892b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120ee4e0582ba8fc6ac12c33d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:23 2013 +0900 gdi32/tests: Fix DC tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/dc.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5f19370..10e194a 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -531,19 +531,19 @@ static void test_CreateCompatibleDC(void) HDC hdc, hNewDC, hdcMetafile, screen_dc; HBITMAP bitmap; INT caps; - DEVMODE dm; + DEVMODEA dm; bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); - bRet = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm); + bRet = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); ok(bRet, "EnumDisplaySettingsEx failed\n"); dm.u1.s1.dmScale = 200; dm.dmFields |= DM_SCALE; - hdc = CreateDC( "DISPLAY", NULL, NULL, &dm ); + hdc = CreateDCA( "DISPLAY", NULL, NULL, &dm ); - screen_dc = CreateDC( "DISPLAY", NULL, NULL, NULL ); + screen_dc = CreateDCA( "DISPLAY", NULL, NULL, NULL ); test_device_caps( hdc, screen_dc, "display dc", 1 ); - ResetDC( hdc, &dm ); + ResetDCA( hdc, &dm ); test_device_caps( hdc, screen_dc, "display dc", 1 ); DeleteDC( hdc ); @@ -573,7 +573,7 @@ static void test_CreateCompatibleDC(void) caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 ); - ResetDC( hdcMetafile, &dm ); + ResetDCA( hdcMetafile, &dm ); test_device_caps( hdcMetafile, hdc, "enhmetafile dc", 1 ); DeleteDC( hNewDC ); DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); @@ -586,7 +586,7 @@ static void test_CreateCompatibleDC(void) caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 ); - ResetDC( hdcMetafile, &dm ); + ResetDCA( hdcMetafile, &dm ); test_device_caps( hdcMetafile, screen_dc, "metafile dc", 1 ); DeleteMetaFile( CloseMetaFile( hdcMetafile )); @@ -673,7 +673,7 @@ static void test_DeleteDC(void) { HWND hwnd; HDC hdc, hdc_test; - WNDCLASSEX cls; + WNDCLASSEXA cls; int ret; /* window DC */ @@ -727,7 +727,7 @@ static void test_DeleteDC(void) memset(&cls, 0, sizeof(cls)); cls.cbSize = sizeof(cls); cls.style = CS_CLASSDC; - cls.hInstance = GetModuleHandle(0); + cls.hInstance = GetModuleHandleA(NULL); cls.lpszClassName = "Wine class DC"; cls.lpfnWndProc = DefWindowProcA; ret = RegisterClassExA(&cls); @@ -766,7 +766,7 @@ static void test_DeleteDC(void) ret = GetObjectType(hdc_test); ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); - ret = UnregisterClassA("Wine class DC", GetModuleHandle(NULL)); + ret = UnregisterClassA("Wine class DC", GetModuleHandleA(NULL)); ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); @@ -777,7 +777,7 @@ todo_wine memset(&cls, 0, sizeof(cls)); cls.cbSize = sizeof(cls); cls.style = CS_OWNDC; - cls.hInstance = GetModuleHandle(0); + cls.hInstance = GetModuleHandleA(NULL); cls.lpszClassName = "Wine own DC"; cls.lpfnWndProc = DefWindowProcA; ret = RegisterClassExA(&cls); @@ -811,7 +811,7 @@ todo_wine DestroyWindow(hwnd); - ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL)); + ret = UnregisterClassA("Wine own DC", GetModuleHandleA(NULL)); ok(ret, "UnregisterClassA failed\n"); } @@ -1262,7 +1262,7 @@ static HDC create_printer_dc(int scale, BOOL reset) dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, is_postscript_printer(hdc) ? "" : "NOT " ); - if (reset) ResetDC( hdc, pbuf->pDevMode ); + if (reset) ResetDCA( hdc, pbuf->pDevMode ); done: HeapFree( GetProcessHeap(), 0, dbuf ); HeapFree( GetProcessHeap(), 0, pbuf ); @@ -1346,7 +1346,7 @@ static void test_printer_dc(void) START_TEST(dc) { - pSetLayout = (void *)GetProcAddress( GetModuleHandle("gdi32.dll"), "SetLayout"); + pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); test_dc_values(); test_savedc(); test_savedc_2();

1 0

Dmitry Timoshkov : tools/winapi: Remove OLDFONTENUMPROC from the list of tested types.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 352c8d0215a06f00898e18f29e003c8f9665e88f URL: http://source.winehq.org/git/wine.git/?a=commit;h=352c8d0215a06f00898e18f29… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:30:30 2013 +0900 tools/winapi: Remove OLDFONTENUMPROC from the list of tested types. --- dlls/gdi32/tests/generated.c | 15 --------------- tools/winapi/tests.dat | 1 - 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 497d900..019524d 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -4434,13 +4434,6 @@ static void test_pack_NPEXTLOGPEN(void) TEST_TARGET_ALIGN(NPEXTLOGPEN, 8) } -static void test_pack_OLDFONTENUMPROC(void) -{ - /* OLDFONTENUMPROC */ - TEST_TYPE_SIZE (OLDFONTENUMPROC, 8) - TEST_TYPE_ALIGN (OLDFONTENUMPROC, 8) -} - static void test_pack_OLDFONTENUMPROCA(void) { /* OLDFONTENUMPROCA */ @@ -10964,13 +10957,6 @@ static void test_pack_NPEXTLOGPEN(void) TEST_TARGET_ALIGN(NPEXTLOGPEN, 4) } -static void test_pack_OLDFONTENUMPROC(void) -{ - /* OLDFONTENUMPROC */ - TEST_TYPE_SIZE (OLDFONTENUMPROC, 4) - TEST_TYPE_ALIGN (OLDFONTENUMPROC, 4) -} - static void test_pack_OLDFONTENUMPROCA(void) { /* OLDFONTENUMPROCA */ @@ -13386,7 +13372,6 @@ static void test_pack(void) test_pack_NEWTEXTMETRICEXW(); test_pack_NEWTEXTMETRICW(); test_pack_NPEXTLOGPEN(); - test_pack_OLDFONTENUMPROC(); test_pack_OLDFONTENUMPROCA(); test_pack_OLDFONTENUMPROCW(); test_pack_OUTLINETEXTMETRICA(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index b4b596c..68d95f7 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -273,7 +273,6 @@ NEWTEXTMETRICEXW NEWTEXTMETRICW NPEXTLOGPEN !NPLOGPALETTE # FIXME: 20040821: Mishandled by winapi_test -OLDFONTENUMPROC OLDFONTENUMPROCA OLDFONTENUMPROCW OUTLINETEXTMETRICA

1 0

Michael Stefaniuc : mmdevapi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: fc0c0be1a3ed1552c4f797c9de717479ec39273e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0c0be1a3ed1552c4f797c9d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:15:13 2013 +0200 mmdevapi/tests: Compile with -D__WINESRC__. --- dlls/mmdevapi/tests/Makefile.in | 1 - dlls/mmdevapi/tests/dependency.c | 8 ++++---- dlls/mmdevapi/tests/render.c | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 137cb74..532e535 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ capture.c \ diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 2408216..6744b63 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -68,24 +68,24 @@ START_TEST(dependency) goto cleanup; } - ok(!GetModuleHandle("dsound.dll"), "dsound.dll was already loaded!\n"); + ok(!GetModuleHandleA("dsound.dll"), "dsound.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IDirectSound8, CLSCTX_INPROC_SERVER, NULL, (void**)&ds8); ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); if (hr == S_OK) { - ok(GetModuleHandle("dsound.dll") != NULL, "dsound.dll not loaded!\n"); + ok(GetModuleHandleA("dsound.dll") != NULL, "dsound.dll not loaded!\n"); ok(ds8 != NULL, "ds8 pointer is null\n"); } if (ds8) IDirectSound8_Release(ds8); - ok(!GetModuleHandle("quartz.dll"), "quartz.dll was already loaded!\n"); + ok(!GetModuleHandleA("quartz.dll"), "quartz.dll was already loaded!\n"); hr = IMMDevice_Activate(dev, &IID_IBaseFilter, CLSCTX_INPROC_SERVER, NULL, (void**)&bf); ok(hr == S_OK, "Activating bf failed: 0x%08x\n", hr); if (hr == S_OK) { - ok(GetModuleHandle("quartz.dll") != NULL, "quartz.dll not loaded!\n"); + ok(GetModuleHandleA("quartz.dll") != NULL, "quartz.dll not loaded!\n"); ok(bf != NULL, "bf pointer is null\n"); if (bf) { diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 0ee7c8c..5d50379 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -36,6 +36,7 @@ #include "unknwn.h" #include "uuids.h" #include "mmdeviceapi.h" +#include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h"

1 0

Michael Stefaniuc : winmm/tests: Use the explicit mciSendStringA() form.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 51ce8f254eedc9227fcbe6feaabb9b29e2c78004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ce8f254eedc9227fcbe6fea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:12:43 2013 +0200 winmm/tests: Use the explicit mciSendStringA() form. --- dlls/winmm/tests/mci.c | 342 ++++++++++++++++++++++---------------------- dlls/winmm/tests/mcicda.c | 86 ++++++------ dlls/winmm/tests/midi.c | 4 +- 3 files changed, 216 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51ce8f254eedc9227fcbe…

1 0

Michael Stefaniuc : cmd/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: 7641cef0bdd9bc600934c00e7a183a68badff169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7641cef0bdd9bc600934c00e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 15 22:01:13 2013 +0200 cmd/tests: Compile with -D__WINESRC__. --- programs/cmd/tests/Makefile.in | 1 - programs/cmd/tests/batch.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 9d73c99..8fd1670 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = cmd.exe -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ batch.c diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 6cf740b..c011d70 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -139,9 +139,9 @@ static DWORD map_file(const char *file_name, const char **ret) size = GetFileSize(file, NULL); - map = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); - ok(map != NULL, "CreateFileMapping(%s) failed: %u\n", file_name, GetLastError()); + ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); if(!map) return 0; @@ -408,7 +408,7 @@ static DWORD load_resource(const char *name, const char *type, const char **ret) return size; } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) { const char *cmd_data, *out_data; DWORD cmd_size, out_size;

1 0

Nikolay Sivov : dispex/tests: Compile with -D__WINESRC__.
by Alexandre Julliard Oct. 16, 2013

Oct. 16, 2013

Module: wine Branch: master Commit: de69361b8ab531c3443ccc0051b6290d5a7a52d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de69361b8ab531c3443ccc005… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 15 20:42:36 2013 +0400 dispex/tests: Compile with -D__WINESRC__. --- dlls/dispex/tests/Makefile.in | 1 - dlls/dispex/tests/marshal.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dispex/tests/Makefile.in b/dlls/dispex/tests/Makefile.in index c200a8f..5c6b859 100644 --- a/dlls/dispex/tests/Makefile.in +++ b/dlls/dispex/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dispex.dll IMPORTS = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ marshal.c diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 7fa9121..1b2ef61 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -65,7 +65,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); /* force the message queue to be created before signaling parent thread */ - PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + PeekMessageA(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); if(hr == S_OK) SetEvent(data->marshal_event); @@ -76,7 +76,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) return hr; } - while (GetMessage(&msg, NULL, 0, 0)) + while (GetMessageA(&msg, NULL, 0, 0)) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { @@ -85,7 +85,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) SetEvent((HANDLE)msg.lParam); } else - DispatchMessage(&msg); + DispatchMessageA(&msg); } HeapFree(GetProcessHeap(), 0, data); @@ -105,8 +105,8 @@ static DWORD start_host_object2(IStream *stream, REFIID riid, IUnknown *object, data->iid = *riid; data->object = object; data->marshal_flags = marshal_flags; - data->marshal_event = events[0] = CreateEvent(NULL, FALSE, FALSE, NULL); - data->error_event = events[1] = CreateEvent(NULL, FALSE, FALSE, NULL); + data->marshal_event = events[0] = CreateEventW(NULL, FALSE, FALSE, NULL); + data->error_event = events[1] = CreateEventW(NULL, FALSE, FALSE, NULL); data->filter = filter; *thread = CreateThread(NULL, 0, host_object_proc, data, 0, &tid); @@ -131,7 +131,7 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M static void end_host_object(DWORD tid, HANDLE thread) { - BOOL ret = PostThreadMessage(tid, WM_QUIT, 0, 0); + BOOL ret = PostThreadMessageA(tid, WM_QUIT, 0, 0); ok(ret, "PostThreadMessage failed with error %d\n", GetLastError()); /* be careful of races - don't return until hosting thread has terminated */ WaitForSingleObject(thread, INFINITE);

1 0