April 2013 - Wine-commits - list.winehq.org

Roderick Colenbrander : opengl32: Add a test for WGL_EXT_swap_control.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 074d89a078b945410cae62479dfc451b17f9125e URL: http://source.winehq.org/git/wine.git/?a=commit;h=074d89a078b945410cae62479… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Apr 28 16:39:28 2013 -0700 opengl32: Add a test for WGL_EXT_swap_control. --- dlls/opengl32/tests/opengl.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 02a72c8..066b026 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -86,6 +86,10 @@ static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const i static HPBUFFERARB* (WINAPI *pwglCreatePbufferARB)(HDC, int, int, int, const int *); static HDC (WINAPI *pwglGetPbufferDCARB)(HPBUFFERARB); +/* WGL_EXT_swap_control */ +static BOOL (WINAPI *pwglSwapIntervalEXT)(int interval); +static int (WINAPI *pwglGetSwapIntervalEXT)(void); + static const char* wgl_extensions = NULL; static void init_functions(void) @@ -114,6 +118,10 @@ static void init_functions(void) GET_PROC(wglGetPbufferDCARB) GET_PROC(wglReleasePbufferDCARB) + /* WGL_EXT_swap_control */ + GET_PROC(wglSwapIntervalEXT) + GET_PROC(wglGetSwapIntervalEXT) + #undef GET_PROC } @@ -1478,6 +1486,116 @@ static void test_destroy_read(HDC oldhdc) wglMakeCurrent(oldhdc, oldctx); } +static void test_swap_control(HDC oldhdc) +{ + PIXELFORMATDESCRIPTOR pf_desc = + { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + int pixel_format; + HWND window1, window2; + HGLRC ctx1, ctx2, oldctx; + BOOL ret; + HDC dc1, dc2; + int interval; + + oldctx = wglGetCurrentContext(); + ok(!!oldctx, "Expected to find a valid current context.\n"); + + window1 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window1, "Failed to create window1, last error %#x.\n", GetLastError()); + + dc1 = GetDC(window1); + ok(!!dc1, "Failed to get DC.\n"); + + pixel_format = ChoosePixelFormat(dc1, &pf_desc); + if (!pixel_format) + { + win_skip("Failed to find pixel format.\n"); + ReleaseDC(window1, dc1); + DestroyWindow(window1); + return; + } + + ret = SetPixelFormat(dc1, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ctx1 = wglCreateContext(dc1); + ok(!!ctx1, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 1, "Expected default swap interval 1, got %d\n", interval); + + ret = pwglSwapIntervalEXT(0); + ok(ret, "Failed to set swap interval to 0, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected default swap interval 0, got %d\n", interval); + + /* Check what interval we get on a second context on the same drawable.*/ + ctx2 = wglCreateContext(dc1); + ok(!!ctx2, "Failed to create GL context, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc1, ctx2); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + interval = pwglGetSwapIntervalEXT(); + ok(interval == 0, "Expected swap interval 0, got %d\n", interval); + + /* A second window is created to see whether its swap interval was affected + * by previous calls. + */ + window2 = CreateWindowA("static", "opengl32_test", + WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window2, "Failed to create window2, last error %#x.\n", GetLastError()); + + dc2 = GetDC(window2); + ok(!!dc2, "Failed to get DC.\n"); + + ret = SetPixelFormat(dc2, pixel_format, &pf_desc); + ok(ret, "Failed to set pixel format, last error %#x.\n", GetLastError()); + + ret = wglMakeCurrent(dc2, ctx1); + ok(ret, "Failed to make context current, last error %#x.\n", GetLastError()); + + /* Since the second window lacks the swap interval, this proves that the interval + * is not global or shared among contexts. + */ + interval = pwglGetSwapIntervalEXT(); + todo_wine ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + + ret = wglDeleteContext(ctx1); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); + + ReleaseDC(window1, dc1); + DestroyWindow(window1); + ReleaseDC(window2, dc2); + DestroyWindow(window2); + + wglMakeCurrent(oldhdc, oldctx); +} + START_TEST(opengl) { HWND hwnd; @@ -1595,6 +1713,11 @@ START_TEST(opengl) else skip("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); + if(strstr(wgl_extensions, "WGL_EXT_swap_control")) + test_swap_control(hdc); + else + skip("WGL_EXT_swap_control not supported, skipping test\n"); + cleanup: ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

Andrew Eikum : winmm/tests: Only test non-mapper devices in interactive mode.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: ace442f3b755ac73ce9b63693c46873aa0a87020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace442f3b755ac73ce9b63693… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 26 13:08:56 2013 -0500 winmm/tests: Only test non-mapper devices in interactive mode. Other devices might be less reliable, but we should generally expect WAVE_MAPPER to behave well. This also massively reduces test runtime, depending on how many devices are present. --- dlls/winmm/tests/wave.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 09c7c89..fd05f7b 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1469,8 +1469,9 @@ static void wave_out_tests(void) "waveOutOpen(%s): MMSYSERR_BADDEVICEID expected, got %s\n", dev_name(ndev+1),mmsys_error(rc)); - for (d=0;d<ndev;d++) - wave_out_test_device(d); + if(winetest_interactive) + for (d=0;d<ndev;d++) + wave_out_test_device(d); if (ndev>0) wave_out_test_device(WAVE_MAPPER);

1 0

Detlef Riekenberg : shell32: Fix a copy & paste typo.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: ea516bfc10bfe807cf0ea875cdbc567676b09ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea516bfc10bfe807cf0ea875c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 26 22:12:57 2013 +0200 shell32: Fix a copy & paste typo. --- dlls/shell32/iconcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 0c21214..91f0eb5 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -904,7 +904,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO GetSystemDirectoryW(sii->szPath, MAX_PATH); /* no icons defined: use default */ - sii->iIcon = -IDI_SHELL_DOCUMENT, + sii->iIcon = -IDI_SHELL_DOCUMENT; lstrcatW(sii->szPath, shell32dll); if (flags)

1 0

André Hentschel : qedit/tests: Improve test messages.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 171abcc401fc935535583a9f3ea0d16592e1279f URL: http://source.winehq.org/git/wine.git/?a=commit;h=171abcc401fc935535583a9f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 27 17:50:57 2013 +0200 qedit/tests: Improve test messages. --- dlls/qedit/tests/mediadet.c | 94 +++++++++++++++++++++--------------------- 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=171abcc401fc935535583…

1 0

Erich Hoover : server: Add builtin admins ACE to default registry DACL.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 03d99df597821376e982a1f547bec3b218697662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d99df597821376e982a1f54… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Apr 27 21:09:17 2013 -0600 server: Add builtin admins ACE to default registry DACL. --- dlls/advapi32/tests/security.c | 18 ++++++++++++++++-- server/registry.c | 11 +++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index e10c1ed..32dfb2a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3012,12 +3012,12 @@ static void test_GetNamedSecurityInfoA(void) PSID system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; + int users_ace_id = -1, admins_ace_id = -1, i; char software_key[] = "MACHINE\\Software"; char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; - int users_ace_id = -1, i; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; BOOL bret = TRUE, isNT4; @@ -3030,6 +3030,7 @@ static void test_GetNamedSecurityInfoA(void) PSID owner, group; BOOL dacl_present; PACL pDacl; + BYTE flags; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { @@ -3228,6 +3229,8 @@ static void test_GetNamedSecurityInfoA(void) ok(bret, "Failed to get ACE %d.\n", i); bret = EqualSid(&ace->SidStart, users_sid); if (bret) users_ace_id = i; + bret = EqualSid(&ace->SidStart, admin_sid); + if (bret) admins_ace_id = i; } ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); if (users_ace_id != -1) @@ -3240,7 +3243,18 @@ static void test_GetNamedSecurityInfoA(void) ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ); } - + ok(admins_ace_id != -1, "Bultin Admins ACE not found.\n"); + if (admins_ace_id != -1) + { + bret = pGetAce(pDacl, admins_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Admins ACE.\n"); + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == 0x0 + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); + ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, + "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS); + } LocalFree(pSD); } diff --git a/server/registry.c b/server/registry.c index eb182f2..809a6d2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -347,7 +347,8 @@ static struct security_descriptor *key_get_sd( struct object *obj ) { size_t users_sid_len = security_sid_len( security_builtin_users_sid ); size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); - size_t dacl_len = sizeof(ACL) + offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + size_t dacl_len = sizeof(ACL) + 2 * offsetof( ACCESS_ALLOWED_ACE, SidStart ) + + users_sid_len + admins_sid_len; ACCESS_ALLOWED_ACE *aaa; ACL *dacl; @@ -364,7 +365,7 @@ static struct security_descriptor *key_get_sd( struct object *obj ) dacl->AclRevision = ACL_REVISION; dacl->Sbz1 = 0; dacl->AclSize = dacl_len; - dacl->AceCount = 1; + dacl->AceCount = 2; dacl->Sbz2 = 0; aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; @@ -372,6 +373,12 @@ static struct security_descriptor *key_get_sd( struct object *obj ) aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; aaa->Mask = GENERIC_READ; memcpy( &aaa->SidStart, security_builtin_users_sid, users_sid_len ); + aaa = (ACCESS_ALLOWED_ACE *)((char *)aaa + aaa->Header.AceSize); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = 0; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + admins_sid_len; + aaa->Mask = KEY_ALL_ACCESS; + memcpy( &aaa->SidStart, security_builtin_admins_sid, admins_sid_len ); } return key_default_sd; }

1 0

Erich Hoover : advapi32: Fix default DACL test on win2k and w2k8 server editions.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: c6896f357c15f2c1107ecb70297e6d140a0065b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6896f357c15f2c1107ecb702… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Apr 27 21:09:28 2013 -0600 advapi32: Fix default DACL test on win2k and w2k8 server editions. --- dlls/advapi32/tests/security.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 32dfb2a..30da864 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3232,13 +3232,16 @@ static void test_GetNamedSecurityInfoA(void) bret = EqualSid(&ace->SidStart, admin_sid); if (bret) admins_ace_id = i; } - ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); + ok(users_ace_id != -1 || broken(users_ace_id == -1) /* win2k */, + "Bultin Users ACE not found.\n"); if (users_ace_id != -1) { bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); ok(bret, "Failed to get Builtin Users ACE.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), - "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, + flags = ((ACE_HEADER *)ace)->AceFlags; + ok(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE) + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */, + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", flags, INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, GENERIC_READ);

1 0

Dmitry Timoshkov : winedump: Add support for 1st, 2nd and long names linker COFF archive members.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: ad3a3c3ea5f1e78827493c6b4c7532a6f82ee90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3a3c3ea5f1e78827493c6b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 29 10:23:20 2013 +0900 winedump: Add support for 1st, 2nd and long names linker COFF archive members. --- tools/winedump/lib.c | 97 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 76 insertions(+), 21 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index de5184a..6afef25 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -43,20 +43,19 @@ #include "winedump.h" -static void dump_import_object(const IMPORT_OBJECT_HEADER *ioh) +static inline USHORT ushort_bswap(USHORT s) { - if (ioh->Version >= 1) - { -#if 0 /* FIXME: supposed to handle uuid.lib but it doesn't */ - const ANON_OBJECT_HEADER *aoh = (const ANON_OBJECT_HEADER *)ioh; + return (s >> 8) | (s << 8); +} - printf("CLSID {%08x-%04x-%04x-%02X%02X-%02X%02X%02X%02X%02X%02X}", - aoh->ClassID.Data1, aoh->ClassID.Data2, aoh->ClassID.Data3, - aoh->ClassID.Data4[0], aoh->ClassID.Data4[1], aoh->ClassID.Data4[2], aoh->ClassID.Data4[3], - aoh->ClassID.Data4[4], aoh->ClassID.Data4[5], aoh->ClassID.Data4[6], aoh->ClassID.Data4[7]); -#endif - } - else +static inline ULONG ulong_bswap(ULONG l) +{ + return ((ULONG)ushort_bswap((USHORT)l) << 16) | ushort_bswap((USHORT)(l >> 16)); +} + +static void dump_import_object(const IMPORT_OBJECT_HEADER *ioh) +{ + if (ioh->Version == 0) { static const char * const obj_type[] = { "code", "data", "const" }; static const char * const name_type[] = { "ordinal", "name", "no prefix", "undecorate" }; @@ -150,15 +149,17 @@ enum FileSig get_kind_lib(void) void lib_dump(void) { - long cur_file_pos; + int first_linker_member = 1; + unsigned long cur_file_pos, long_names_size = 0; const IMAGE_ARCHIVE_MEMBER_HEADER *iamh; + const char *long_names = NULL; cur_file_pos = IMAGE_ARCHIVE_START_SIZE; for (;;) { const IMPORT_OBJECT_HEADER *ioh; - long size; + unsigned long size; if (!(iamh = PRD(cur_file_pos, sizeof(*iamh)))) break; @@ -169,11 +170,18 @@ void lib_dump(void) printf("Name %.16s", iamh->Name); if (!strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LINKER_MEMBER, sizeof(iamh->Name))) { - printf(" - %s archive linker member\n", - cur_file_pos == IMAGE_ARCHIVE_START_SIZE ? "1st" : "2nd"); + printf(" - %s archive linker member\n", first_linker_member ? "1st" : "2nd"); } else + { + if (long_names && iamh->Name[0] == '/') + { + unsigned long long_names_offset = atol((const char *)&iamh->Name[1]); + if (long_names_offset < long_names_size) + printf("%s\n", long_names + long_names_offset); + } printf("\n"); + } printf("Date %.12s %s\n", iamh->Date, get_time_str(strtoul((const char *)iamh->Date, NULL, 10))); printf("UserID %.6s\n", iamh->UserID); printf("GroupID %.6s\n", iamh->GroupID); @@ -186,17 +194,63 @@ void lib_dump(void) size = strtoul((const char *)iamh->Size, NULL, 10); size = (size + 1) & ~1; /* align to an even address */ - /* FIXME: only import library contents with the short format are - * recognized. - */ if (!(ioh = PRD(cur_file_pos, sizeof(*ioh)))) break; + if (ioh->Sig1 == IMAGE_FILE_MACHINE_UNKNOWN && ioh->Sig2 == IMPORT_OBJECT_HDR_SIG2) { dump_import_object(ioh); } - else if (strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LINKER_MEMBER, sizeof(iamh->Name))) + else if (!strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LINKER_MEMBER, sizeof(iamh->Name))) + { + const DWORD *offset = (const DWORD *)ioh; + const char *name; + DWORD i, count; + + if (first_linker_member) /* 1st archive linker member, BE format */ + { + count = ulong_bswap(*offset++); + name = (const char *)(offset + count); + printf("%u public symbols\n", count); + for (i = 0; i < count; i++) + { + printf("%8x %s\n", ulong_bswap(offset[i]), name); + name += strlen(name) + 1; + } + printf("\n"); + } + else /* 2nd archive linker member, LE format */ + { + const WORD *idx; + + count = *offset++; + printf("%u offsets\n", count); + for (i = 0; i < count; i++) + { + printf("%8x %8x\n", i, offset[i]); + } + printf("\n"); + + offset += count; + count = *offset++; + idx = (const WORD *)offset; + name = (const char *)(idx + count); + printf("%u public symbols\n", count); + for (i = 0; i < count; i++) + { + printf("%8x %s\n", idx[i], name); + name += strlen(name) + 1; + } + printf("\n"); + } + } + else if (!strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LONGNAMES_MEMBER, sizeof(iamh->Name))) + { + long_names = PRD(cur_file_pos, size); + long_names_size = size; + } + else { - long expected_size; + unsigned long expected_size; const IMAGE_FILE_HEADER *fh = (const IMAGE_FILE_HEADER *)ioh; if (globals.do_dumpheader) @@ -214,6 +268,7 @@ void lib_dump(void) dump_long_import(fh, (const IMAGE_SECTION_HEADER *)((const char *)fh + sizeof(*fh) + fh->SizeOfOptionalHeader), fh->NumberOfSections); } + first_linker_member = 0; cur_file_pos += size; } }

1 0

Nikolay Sivov : advapi32: Fix allocation length for domain list (Valgrind).
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: bc52f1c02989b3032d8c55db8c506803bc96cd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc52f1c02989b3032d8c55db8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 09:22:30 2013 +0400 advapi32: Fix allocation length for domain list (Valgrind). --- dlls/advapi32/lsa.c | 3 ++- dlls/advapi32/tests/lsa.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 5c3ffc4..fd270ff 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -405,7 +405,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, /* use maximum domain count */ if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count + - sid_size_total + domainname_size_total))) + sid_size_total + domainname_size_total*sizeof(WCHAR)))) { heap_free(*sids); return STATUS_NO_MEMORY; @@ -440,6 +440,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, if (domain_size) { domain.Length = domain_size * sizeof(WCHAR); + domain.MaximumLength = (domain_size + 1) * sizeof(WCHAR); (*sids)[i].DomainIndex = lsa_reflist_add_domain(*domains, &domain, &domain_data); } } diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index bffb7c0..b1dcc78 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -390,6 +390,8 @@ static void test_LsaLookupSids(void) { ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); + ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, + list->Domains[0].Name.Length); } pLsaFreeMemory(names);

1 0

Nikolay Sivov : advapi32: Allocate temporary name buffer once.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: 397c2200a6b76b274a43b64bf9cb065a5251848b URL: http://source.winehq.org/git/wine.git/?a=commit;h=397c2200a6b76b274a43b64bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 29 09:30:24 2013 +0400 advapi32: Allocate temporary name buffer once. --- dlls/advapi32/lsa.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index fd270ff..255704b 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -371,6 +371,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, { ULONG i, sid_size_total = 0, domain_size_max = 0, size, domainname_size_total = 0; ULONG sid_size, domain_size, mapped; + LSA_UNICODE_STRING domain; BOOL handled = FALSE; char *domain_data; SID_NAME_USE use; @@ -414,13 +415,11 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST)); domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count; + domain.Buffer = heap_alloc(domain_size_max*sizeof(WCHAR)); for (i = 0; i < count; i++) { - LSA_UNICODE_STRING domain; - domain.Length = domain_size_max*sizeof(WCHAR); domain.MaximumLength = domain_size_max*sizeof(WCHAR); - domain.Buffer = heap_alloc(domain.Length); (*sids)[i].Use = SidTypeUnknown; (*sids)[i].DomainIndex = -1; @@ -444,9 +443,8 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, (*sids)[i].DomainIndex = lsa_reflist_add_domain(*domains, &domain, &domain_data); } } - - heap_free(domain.Buffer); } + heap_free(domain.Buffer); if (mapped == count) return STATUS_SUCCESS; if (mapped > 0 && mapped < count) return STATUS_SOME_NOT_MAPPED;

1 0

Dmitry Timoshkov : include: Make IMAGE_RESOURCE_DIRECTORY_ENTRY match PSDK definition.
by Alexandre Julliard 29 Apr '13

29 Apr '13

Module: wine Branch: master Commit: e2791cdfb1345d8ad5e58a3dd696354a08b9c802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2791cdfb1345d8ad5e58a3dd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 29 16:19:17 2013 +0900 include: Make IMAGE_RESOURCE_DIRECTORY_ENTRY match PSDK definition. --- dlls/kernel32/resource.c | 62 +++++++++++++++++++++++----------------------- dlls/ntdll/resource.c | 22 ++++++++-------- dlls/user32/exticon.c | 12 ++++---- dlls/ver.dll16/version.c | 12 ++++---- dlls/version/version.c | 8 +++--- include/winnt.h | 16 +++++------ libs/wine/loader.c | 4 +- tools/winedump/pe.c | 29 ++++++++++----------- 8 files changed, 81 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2791cdfb1345d8ad5e58…

1 0