November 2013 - Wine-Commits

Hans Leidekker : include: Add some missing defines.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: d75dbbc00553e9024ff7a17bf1e22561631ffb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75dbbc00553e9024ff7a17bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:33:51 2013 +0100 include: Add some missing defines. --- include/lmaccess.h | 11 +++++++++++ include/lmshare.h | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/include/lmaccess.h b/include/lmaccess.h index 03bd504..5042f04 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -27,6 +27,17 @@ extern "C" { #include <lmcons.h> +#define ACCESS_NONE 0x0000 +#define ACCESS_READ 0x0001 +#define ACCESS_WRITE 0x0002 +#define ACCESS_CREATE 0x0004 +#define ACCESS_EXEC 0x0008 +#define ACCESS_DELETE 0x0010 +#define ACCESS_ATRIB 0x0020 +#define ACCESS_PERM 0x0040 +#define ACCESS_GROUP 0x8000 +#define ACCESS_ALL (ACCESS_READ|ACCESS_WRITE|ACCESS_CREATE|ACCESS_EXEC|ACCESS_DELETE|ACCESS_ATRIB|ACCESS_PERM) + #define UF_SCRIPT 0x000001 #define UF_ACCOUNTDISABLE 0x000002 #define UF_HOMEDIR_REQUIRED 0x000008 diff --git a/include/lmshare.h b/include/lmshare.h index def3f13..442cf5e 100644 --- a/include/lmshare.h +++ b/include/lmshare.h @@ -34,6 +34,30 @@ typedef struct _SHARE_INFO_1 { LMSTR shi1_remark; } SHARE_INFO_1, *PSHARE_INFO_1, *LPSHARE_INFO_1; +typedef struct _SHARE_INFO_2 { + LMSTR shi2_netname; + DWORD shi2_type; + LMSTR shi2_remark; + DWORD shi2_permissions; + DWORD shi2_max_uses; + DWORD shi2_current_uses; + LMSTR shi2_path; + LMSTR shi2_passwd; +} SHARE_INFO_2, *PSHARE_INFO_2, *LPSHARE_INFO_2; + +typedef struct _SHARE_INFO_502 { + LMSTR shi502_netname; + DWORD shi502_type; + LMSTR shi502_remark; + DWORD shi502_permissions; + DWORD shi502_max_uses; + DWORD shi502_current_uses; + LMSTR shi502_path; + LMSTR shi502_passwd; + DWORD shi502_reserved; + PSECURITY_DESCRIPTOR shi502_security_descriptor; +} SHARE_INFO_502, *PSHARE_INFO_502, *LPSHARE_INFO_502; + NET_API_STATUS WINAPI NetShareAdd(LMSTR,DWORD,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetShareCheck(LMSTR,LMSTR,LPDWORD); NET_API_STATUS WINAPI NetShareDel(LMSTR,LMSTR,DWORD);

1 0

Hans Leidekker : advapi32: Forward LogonUserA to LogonUserW.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 7519cddddbe602c57caa078b88396e5654d68c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7519cddddbe602c57caa078b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:32:55 2013 +0100 advapi32: Forward LogonUserA to LogonUserW. --- dlls/advapi32/advapi.c | 19 +++++++++++++++++-- dlls/advapi32/advapi32_misc.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 860c728..884b5d1 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -35,6 +35,8 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "advapi32_misc.h" + WINE_DEFAULT_DEBUG_CHANNEL(advapi); /****************************************************************************** @@ -268,10 +270,23 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { - FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_a(lpszUsername), + WCHAR *usernameW = NULL, *domainW = NULL, *passwordW = NULL; + BOOL ret = FALSE; + + TRACE("%s %s %p 0x%08x 0x%08x %p\n", debugstr_a(lpszUsername), debugstr_a(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); - return TRUE; + if (lpszUsername && !(usernameW = strdupAW( lpszUsername ))) return FALSE; + if (lpszDomain && !(domainW = strdupAW( lpszUsername ))) goto done; + if (lpszPassword && !(passwordW = strdupAW( lpszPassword ))) goto done; + + ret = LogonUserW( usernameW, domainW, passwordW, dwLogonType, dwLogonProvider, phToken ); + +done: + heap_free( usernameW ); + heap_free( domainW ); + heap_free( passwordW ); + return ret; } BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPassword, diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index ace73f1..9dd48b8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -22,6 +22,7 @@ #include "ntsecapi.h" #include "winsvc.h" +#include "winnls.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -52,4 +53,15 @@ static inline BOOL heap_free( void *mem ) return HeapFree( GetProcessHeap(), 0, mem ); } +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + #endif /* __WINE_ADVAPI32MISC_H */

1 0

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

Nov. 13, 2013

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/tests: Add some invalid parameter tests for GdipGetRegionData.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

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 Nov. 13, 2013

Nov. 13, 2013

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

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

Nov. 13, 2013

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

Hans Leidekker : advapi32: Return a fake handle from LogonUserW.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 02970b578eb3bd46810508f622437e107abc541d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02970b578eb3bd46810508f62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 13 15:31:54 2013 +0100 advapi32: Return a fake handle from LogonUserW. --- dlls/advapi32/advapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 7025a21..860c728 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -280,6 +280,7 @@ BOOL WINAPI LogonUserW( LPCWSTR lpszUsername, LPCWSTR lpszDomain, LPCWSTR lpszPa FIXME("%s %s %p 0x%08x 0x%08x %p - stub\n", debugstr_w(lpszUsername), debugstr_w(lpszDomain), lpszPassword, dwLogonType, dwLogonProvider, phToken); + *phToken = (HANDLE *)0xdeadbeef; return TRUE; }

1 0

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

Nov. 13, 2013

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 Nov. 13, 2013

Nov. 13, 2013

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

Nikolay Sivov : oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file.
by Alexandre Julliard Nov. 13, 2013

Nov. 13, 2013

Module: wine Branch: master Commit: 7be2251cd673588814dc8b5cb7272424dfb82688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be2251cd673588814dc8b5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 13 18:40:32 2013 +0400 oleaut32: Always set LIBFLAG_FHASDISKIMAGE when loading from file. --- dlls/oleaut32/tests/typelib.c | 33 +++++++++++++++++++++++++++++---- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9397fe3..80e3b99 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2662,8 +2662,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(libattr->syskind == sys, "syskind = %d\n", libattr->syskind); ok(libattr->wMajorVerNum == 0, "wMajorVer = %d\n", libattr->wMajorVerNum); ok(libattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", libattr->wMinorVerNum); - todo_wine - ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); + ok(libattr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "wLibFlags = %d\n", libattr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, libattr); hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); @@ -3965,7 +3964,9 @@ static void test_create_typelib_lcid(LCID lcid) HRESULT hr; ICreateTypeLib2 *tl; HANDLE file; - DWORD msft_header[7]; + DWORD msft_header[8]; + ITypeLib *typelib; + TLIBATTR *attr; DWORD read; GetTempFileNameA( ".", "tlb", 0, filename ); @@ -3974,6 +3975,14 @@ static void test_create_typelib_lcid(LCID lcid) hr = CreateTypeLib2(SYS_WIN32, name, &tl); ok(hr == S_OK, "got %08x\n", hr); + hr = ICreateTypeLib2_QueryInterface(tl, &IID_ITypeLib, (void**)&typelib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == 0, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + hr = ICreateTypeLib2_SetLcid(tl, lcid); ok(hr == S_OK, "got %08x\n", hr); @@ -3983,6 +3992,12 @@ static void test_create_typelib_lcid(LCID lcid) hr = ICreateTypeLib2_SaveAllChanges(tl); ok(hr == S_OK, "got %08x\n", hr); + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == 0, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + + ITypeLib_Release(typelib); ICreateTypeLib2_Release(tl); file = CreateFileA( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); @@ -3998,6 +4013,17 @@ static void test_create_typelib_lcid(LCID lcid) ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); ok(msft_header[6] == 0x00040003, "got %08x\n", msft_header[6]); + ok(msft_header[7] == 0, "got %08x\n", msft_header[7]); + + /* check flags after loading */ + hr = LoadTypeLib(name, &typelib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetLibAttr(typelib, &attr); + ok(hr == S_OK, "got %08x\n", hr); + ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "flags 0x%x\n", attr->wLibFlags); + ITypeLib_ReleaseTLibAttr(typelib, attr); + ITypeLib_Release(typelib); DeleteFileA(filename); } @@ -4770,7 +4796,6 @@ static void test_LoadRegTypeLib(void) ok(attr->lcid == 0, "got %x\n", attr->lcid); ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); -todo_wine ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, attr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07da928..0dd3f64 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3585,7 +3585,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) pTypeLibImpl->ptr_size = get_ptr_size(pTypeLibImpl->syskind); pTypeLibImpl->ver_major = LOWORD(tlbHeader.version); pTypeLibImpl->ver_minor = HIWORD(tlbHeader.version); - pTypeLibImpl->libflags = (WORD) tlbHeader.flags & 0xffff;/* check mask */ + pTypeLibImpl->libflags = ((WORD) tlbHeader.flags & 0xffff) /* check mask */ | LIBFLAG_FHASDISKIMAGE; pTypeLibImpl->set_lcid = tlbHeader.lcid2; pTypeLibImpl->lcid = tlbHeader.lcid;

1 0