wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Dmitry Timoshkov : gdiplus: Check whether region path points really fit into shorts.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 56a65007214b244710418f62ed8a1d5d1e257d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a65007214b244710418f62e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:30 2013 +0900 gdiplus: Check whether region path points really fit into shorts. --- dlls/gdiplus/region.c | 6 ++++-- dlls/gdiplus/tests/region.c | 14 -------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0295e62..5d95fcd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -96,8 +96,10 @@ static BOOL is_integer_path(const GpPath *path) for (i = 0; i < path->pathdata.Count; i++) { - if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || - path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) + short x, y; + x = gdip_round(path->pathdata.Points[i].X); + y = gdip_round(path->pathdata.Points[i].Y); + if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) return FALSE; } return TRUE; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 77fb4fe..2b4f148 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -617,44 +617,30 @@ static void test_getregiondata(void) needed = 0; status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(72, needed); memset(buf, 0xee, sizeof(buf)); needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(72, needed); -todo_wine expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); -todo_wine expect_dword(buf + 5, 48); expect_magic(buf + 6); expect_dword(buf + 7, 4); /* flags 0 means that a path is an array of FLOATs */ -todo_wine expect_dword(buf + 8, 0); -todo_wine expect_float(buf + 9, -196900.0); -todo_wine expect_float(buf + 10, -197400.0); -todo_wine expect_float(buf + 11, 2600.0); -todo_wine expect_float(buf + 12, -197400.0); -todo_wine expect_float(buf + 13, 2600.0); -todo_wine expect_float(buf + 14, 2300.0); -todo_wine expect_float(buf + 15, -196900.0); -todo_wine expect_float(buf + 16, 2300.0); -todo_wine expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ status = GdipDeletePath(path);

1 0

Dmitry Timoshkov : gdiplus: Add a check for passed buffer size to GdipGetRegionData.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 761391f156e67404d3c4db801f28da51d06d3654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761391f156e67404d3c4db801… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:26 2013 +0900 gdiplus: Add a check for passed buffer size to GdipGetRegionData. --- dlls/gdiplus/region.c | 12 +++++++++++- dlls/gdiplus/tests/region.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index aef2ac7..0295e62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -828,12 +828,22 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, DWORD num_children; } *region_header; INT filled = 0; + UINT required; + GpStatus status; TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); - if (!(region && buffer && size)) + if (!region || !buffer || !size) return InvalidParameter; + status = GdipGetRegionDataSize(region, &required); + if (status != Ok) return status; + if (size < required) + { + if (needed) *needed = size; + return InsufficientBuffer; + } + region_header = (struct _region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index dcf5092..77fb4fe 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -133,11 +133,8 @@ static void test_getregiondata(void) memset(buf, 0xee, sizeof(buf)); needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, 4, &needed); -todo_wine ok(status == InsufficientBuffer, "status %08x\n", status); -todo_wine expect(4, needed); -todo_wine expect_dword(buf, 0xeeeeeeee); memset(buf, 0xee, sizeof(buf));

1 0

Dmitry Timoshkov : gdiplus/tests: Test GdipGetRegionData behaviour with an integer path that can' t be stored as an array of shorts.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 8dc170e2ca686ea22f8e5ccb5bc9793ed8dfa3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc170e2ca686ea22f8e5ccb5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:22 2013 +0900 gdiplus/tests: Test GdipGetRegionData behaviour with an integer path that can't be stored as an array of shorts. --- dlls/gdiplus/tests/region.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 8e0dc9f..dcf5092 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -567,6 +567,103 @@ todo_wine expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test how shorts are stored in the region path data */ + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + GdipAddPathRectangleI(path, -1969, -1974, 1995, 1997); + + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + expect(56, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + expect(56, needed); + expect_dword(buf, 48); + trace("buf[1] = %08x\n", buf[1]); + expect_magic(buf + 2); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + expect_dword(buf + 5, 32); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0x4000 means that a path is an array of shorts instead of FLOATs */ + expect_dword(buf + 8, 0x4000); + point = (RegionDataPoint*)(buf + 9); + expect(-1969, point[0].X); + expect(-1974, point[0].Y); + expect(26, point[1].X); /* buf + 10 */ + expect(-1974, point[1].Y); + expect(26, point[2].X); /* buf + 11 */ + expect(23, point[2].Y); + expect(-1969, point[3].X); /* buf + 12 */ + expect(23, point[3].Y); + expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); + + /* Test with integers that can't be stored as shorts */ + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + GdipAddPathRectangleI(path, -196900, -197400, 199500, 199700); + + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); +todo_wine + expect(72, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); +todo_wine + expect(72, needed); +todo_wine + expect_dword(buf, 64); + trace("buf[1] = %08x\n", buf[1]); + expect_magic(buf + 2); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); +todo_wine + expect_dword(buf + 5, 48); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0 means that a path is an array of FLOATs */ +todo_wine + expect_dword(buf + 8, 0); +todo_wine + expect_float(buf + 9, -196900.0); +todo_wine + expect_float(buf + 10, -197400.0); +todo_wine + expect_float(buf + 11, 2600.0); +todo_wine + expect_float(buf + 12, -197400.0); +todo_wine + expect_float(buf + 13, 2600.0); +todo_wine + expect_float(buf + 14, 2300.0); +todo_wine + expect_float(buf + 15, -196900.0); +todo_wine + expect_float(buf + 16, 2300.0); +todo_wine + expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } static void test_isinfinite(void)

1 0

Dmitry Timoshkov : gdiplus/tests: Add some invalid parameter tests for GdipGetRegionData.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 619e96831439f42b1fbce54d5bc897254c6c8ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619e96831439f42b1fbce54d5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:17 2013 +0900 gdiplus/tests: Add some invalid parameter tests for GdipGetRegionData. --- dlls/gdiplus/tests/region.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 23c7a07..8e0dc9f 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -118,14 +118,30 @@ static void test_getregiondata(void) GpPath *path; GpMatrix *matrix; - memset(buf, 0xee, sizeof(buf)); - status = GdipCreateRegion(&region); ok(status == Ok, "status %08x\n", status); + needed = 0; status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); + + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, 0, &needed); + ok(status == InvalidParameter, "status %08x\n", status); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, 4, &needed); +todo_wine + ok(status == InsufficientBuffer, "status %08x\n", status); +todo_wine + expect(4, needed); +todo_wine + expect_dword(buf, 0xeeeeeeee); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed);

1 0

André Hentschel : mscoree/tests: Don't expect a 2. x runtime.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: dc60ed45961f76a9f766f2d2259bc0abb912b4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc60ed45961f76a9f766f2d22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 00:08:01 2013 +0100 mscoree/tests: Don't expect a 2.x runtime. --- dlls/mscoree/tests/metahost.c | 76 +++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 7794e74..d00bb4f 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -64,6 +64,44 @@ static void cleanup(void) FreeLibrary(hmscoree); } +static WCHAR *strrchrW( WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = str; } while (*str++); + return ret; +} + +static void test_getruntime(WCHAR *version) +{ + static const WCHAR dotzero[] = {'.','0',0}; + WCHAR *dot; + HRESULT hr; + ICLRRuntimeInfo *info; + DWORD count; + WCHAR buf[MAX_PATH]; + + hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + + hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + if (hr != S_OK) return; + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); + ok(lstrcmpW(buf, version) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(info); + + /* Versions must match exactly. */ + dot = strrchrW(version, '.'); + lstrcpyW(dot, dotzero); + hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); +} + static void test_enumruntimes(void) { IEnumUnknown *runtime_enum; @@ -100,8 +138,9 @@ static void test_enumruntimes(void) trace("runtime found: %s\n", wine_dbgstr_w(buf)); ICLRRuntimeInfo_Release(runtime_info); - IUnknown_Release(unk); + + test_getruntime(buf); } ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr); @@ -109,39 +148,6 @@ static void test_enumruntimes(void) IEnumUnknown_Release(runtime_enum); } -static void test_getruntime(void) -{ - static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0}; - static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0}; - HRESULT hr; - ICLRRuntimeInfo *info; - DWORD count; - WCHAR buf[MAX_PATH]; - - hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); - - hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - if (hr == CLR_E_SHIM_RUNTIME) - /* FIXME: Get Mono properly packaged so we can fail here. */ - todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - else - ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - if (hr != S_OK) return; - - count = MAX_PATH; - hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); - ok(hr == S_OK, "GetVersionString returned %x\n", hr); - ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); - ok(lstrcmpW(buf, twodotzero) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); - - ICLRRuntimeInfo_Release(info); - - /* Versions must match exactly. */ - hr = ICLRMetaHost_GetRuntime(metahost, twodotzerodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); -} - static void WINAPI notification_callback(ICLRRuntimeInfo *pRuntimeInfo, CallbackThreadSetFnPtr pfnCallbackThreadSet, CallbackThreadUnsetFnPtr pfnCallbackThreadUnset) { @@ -165,8 +171,6 @@ START_TEST(metahost) return; test_enumruntimes(); - - test_getruntime(); test_notification(); cleanup();

1 0

André Hentschel : user32/tests: Allow win8 error code.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: de92a45822df24780df981a0e810565640cc5989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de92a45822df24780df981a0e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 00:06:50 2013 +0100 user32/tests: Allow win8 error code. --- dlls/user32/tests/sysparams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 33c7a1c..31d1a8e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2868,8 +2868,9 @@ static void test_EnumDisplaySettings(void) if (!EnumDisplaySettingsA(NULL, num, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || + le == ERROR_MOD_NOT_FOUND /* Win8 */ || le == 0xdeadbeef, /* XP, 2003 */ - "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d for %d\n", le, num); + "Expected ERROR_NO_MORE_FILES, ERROR_MOD_NOT_FOUND or 0xdeadbeef, got %d for %d\n", le, num); break; } num++;

1 0

Qian Hong : urlmon: Accept uppercase extension name in AsyncInstallDistributionUnit.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: f96fde38316a9b9cf51c7b06e86bd2403a8cce55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96fde38316a9b9cf51c7b06e… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Nov 13 06:31:17 2013 +0800 urlmon: Accept uppercase extension name in AsyncInstallDistributionUnit. --- dlls/urlmon/axinstall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index ca1aef6..7ee7d94 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -447,7 +447,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!ext) ext = ptr; - if(!strcmpW(ext, cab_extW)) { + if(!strcmpiW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { FIXME("Unsupported extension %s\n", debugstr_w(ext));

1 0

Frédéric Delanoy : dsound/tests: Use BOOL type where appropriate.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: c28d61928690367c3cc1156215ef6379f4a2af87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28d61928690367c3cc115621… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:12 2013 +0100 dsound/tests: Use BOOL type where appropriate. --- dlls/dsound/tests/capture.c | 10 +++--- dlls/dsound/tests/ds3d.c | 16 ++++---- dlls/dsound/tests/ds3d8.c | 83 +++++++++++++++++++++---------------------- dlls/dsound/tests/dsound.c | 4 +- dlls/dsound/tests/dsound8.c | 15 ++++---- dlls/dsound/tests/propset.c | 2 +- 6 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c28d61928690367c3cc11…

1 0

Frédéric Delanoy : gdiplus/tests: Use BOOL type where appropriate.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 17875091113c0069b050ae2bde74c36eb7033b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17875091113c0069b050ae2bd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:13 2013 +0100 gdiplus/tests: Use BOOL type where appropriate. --- dlls/gdiplus/tests/metafile.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index aa39351..9dcc803 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -26,9 +26,9 @@ typedef struct emfplus_record { - ULONG todo; + BOOL todo; ULONG record_type; - ULONG playback_todo; + BOOL playback_todo; } emfplus_record; typedef struct emfplus_check_state @@ -88,7 +88,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR if (state->expected[state->count].record_type) { - actual.todo = 0; + actual.todo = FALSE; actual.record_type = record->Type; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -111,7 +111,7 @@ static int CALLBACK enum_emf_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETAR if (state->expected[state->count].record_type) { - actual.todo = 0; + actual.todo = FALSE; actual.record_type = lpEMFR->iType; check_record(state->count, state->desc, &state->expected[state->count], &actual); @@ -148,7 +148,7 @@ static BOOL CALLBACK enum_metafile_proc(EmfPlusRecordType record_type, unsigned emfplus_check_state *state = (emfplus_check_state*)userdata; emfplus_record actual; - actual.todo = 0; + actual.todo = FALSE; actual.record_type = record_type; if (dataSize == 0)

1 0

Frédéric Delanoy : netapi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: b7dc0021583ede4af0a0aa95fc929a64221e0895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dc0021583ede4af0a0aa95f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 12 22:11:10 2013 +0100 netapi32/tests: Use BOOL type where appropriate. --- dlls/netapi32/tests/access.c | 6 +++--- dlls/netapi32/tests/wksta.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index a8c43c3..b71e1c8 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -66,7 +66,7 @@ static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; -static int init_access_tests(void) +static BOOL init_access_tests(void) { DWORD dwSize; BOOL rc; @@ -77,14 +77,14 @@ static int init_access_tests(void) if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not available.\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(WCHAR); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static NET_API_STATUS create_test_user(void) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 5d1d8ac..ee3004e 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -44,7 +44,7 @@ static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP static WCHAR user_name[UNLEN + 1]; static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; -static int init_wksta_tests(void) +static BOOL init_wksta_tests(void) { DWORD dwSize; BOOL rc; @@ -54,14 +54,14 @@ static int init_wksta_tests(void) rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetUserNameW is not implemented\n"); - return 0; + return FALSE; } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; dwSize = sizeof(computer_name)/sizeof(computer_name[0]); ok(GetComputerNameW(computer_name, &dwSize), "Computer Name Retrieved\n"); - return 1; + return TRUE; } static void run_get_comp_name_tests(void)

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013