October 2007 - Wine-commits

Mikolaj Zalewski : kernel32/tests: Support for spaces in actctx test executable path.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: ba24af0c3445c117c011c3e0c500a7cc7d3e9c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba24af0c3445c117c011c3e0c… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 17 11:38:55 2007 -0700 kernel32/tests: Support for spaces in actctx test executable path. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 0593909..d04e9ce 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -995,7 +995,7 @@ static void run_child_process(void) si.cb = sizeof(si); winetest_get_mainargs( &argv ); - sprintf(cmdline, "%s %s manifest1", argv[0], argv[1]); + sprintf(cmdline, "\"%s\" %s manifest1", argv[0], argv[1]); ok(CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi) != 0, "Could not create process: %u\n", GetLastError()); CloseHandle(pi.hThread);

1 0

Mikolaj Zalewski : kernel32/tests: Make the actctx test pass when the application is run from a different directory .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: e361c0d2847a826be8aaf6fff57ff239eb60b88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e361c0d2847a826be8aaf6fff… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 17 12:51:39 2007 -0700 kernel32/tests: Make the actctx test pass when the application is run from a different directory. --- dlls/kernel32/tests/actctx.c | 51 ++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index d04e9ce..da1650b 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -163,7 +163,7 @@ static const WCHAR wndClass2W[] = static const WCHAR acr_manifest[] = {'a','c','r','.','m','a','n','i','f','e','s','t',0}; -static WCHAR app_dir[MAX_PATH], exe_path[MAX_PATH]; +static WCHAR app_dir[MAX_PATH], exe_path[MAX_PATH], work_dir[MAX_PATH], work_dir_subdir[MAX_PATH]; static WCHAR app_manifest_path[MAX_PATH], manifest_path[MAX_PATH], depmanifest_path[MAX_PATH]; static int strcmp_aw(LPCWSTR strw, const char *stra) @@ -230,7 +230,7 @@ static const detailed_info_t detailed_info0 = { static const detailed_info_t detailed_info1 = { 1, 1, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, - app_dir, + work_dir, }; static const detailed_info_t detailed_info1_child = { @@ -242,7 +242,7 @@ static const detailed_info_t detailed_info1_child = { static const detailed_info_t detailed_info2 = { 1, 2, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, manifest_path, ACTIVATION_CONTEXT_PATH_TYPE_NONE, ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE, - app_dir, + work_dir, }; static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo) @@ -253,7 +253,7 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo) exsize = sizeof(ACTIVATION_CONTEXT_DETAILED_INFORMATION) + (exinfo->root_manifest_path ? (lstrlenW(exinfo->root_manifest_path)+1)*sizeof(WCHAR):0) - + (exinfo->app_dir ? (lstrlenW(app_dir)+1)*sizeof(WCHAR) : 0); + + (exinfo->app_dir ? (lstrlenW(exinfo->app_dir)+1)*sizeof(WCHAR) : 0); if(exsize != sizeof(ACTIVATION_CONTEXT_DETAILED_INFORMATION)) { size = 0xdeadbeef; @@ -298,9 +298,9 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo) ok(detailed_info->ulAppDirPathType == exinfo->app_dir_type, "detailed_info->ulAppDirPathType=%u, expected %u\n", detailed_info->ulAppDirPathType, exinfo->app_dir_type); - ok(detailed_info->ulAppDirPathChars == (exinfo->app_dir ? lstrlenW(app_dir) : 0), + ok(detailed_info->ulAppDirPathChars == (exinfo->app_dir ? lstrlenW(exinfo->app_dir) : 0), "detailed_info->ulAppDirPathChars=%u, expected %u\n", - detailed_info->ulAppDirPathChars, exinfo->app_dir ? lstrlenW(app_dir) : 0); + detailed_info->ulAppDirPathChars, exinfo->app_dir ? lstrlenW(exinfo->app_dir) : 0); if(exinfo->root_manifest_path) { ok(detailed_info->lpRootManifestPath != NULL, "detailed_info->lpRootManifestPath == NULL\n"); if(detailed_info->lpRootManifestPath) @@ -314,8 +314,8 @@ static void test_detailed_info(HANDLE handle, const detailed_info_t *exinfo) if(exinfo->app_dir) { ok(detailed_info->lpAppDirPath != NULL, "detailed_info->lpAppDirPath == NULL\n"); if(detailed_info->lpAppDirPath) - ok(!lstrcmpiW(app_dir, detailed_info->lpAppDirPath), - "unexpected detailed_info->lpAppDirPath %s\n",strw(detailed_info->lpAppDirPath)); + ok(!lstrcmpiW(exinfo->app_dir, detailed_info->lpAppDirPath), + "unexpected detailed_info->lpAppDirPath\n%s\n",strw(detailed_info->lpAppDirPath)); }else { ok(detailed_info->lpAppDirPath == NULL, "detailed_info->lpAppDirPath != NULL\n"); } @@ -959,6 +959,29 @@ static void test_actctx(void) test_info_in_assembly(handle, 2, &manifest_comctrl_info); pReleaseActCtx(handle); } + + trace("manifest1 in subdir\n"); + + CreateDirectoryW(work_dir_subdir, NULL); + if (SetCurrentDirectoryW(work_dir_subdir)) + { + /* the lpAddDirPath will point to the directory with the manifest */ + if(!create_manifest_file("..\\test1.manifest", manifest1, NULL, NULL)) { + skip("Could not create manifest file\n"); + return; + } + handle = test_create("..\\test1.manifest", manifest1); + DeleteFileA("..\\test1.manifest"); + if(handle != INVALID_HANDLE_VALUE) { + test_detailed_info(handle, &detailed_info1); + test_info_in_assembly(handle, 1, &manifest1_info); + pReleaseActCtx(handle); + } + SetCurrentDirectoryW(work_dir); + } + else + skip("Couldn't change directory\n"); + RemoveDirectoryW(work_dir_subdir); } static void test_app_manifest(void) @@ -1008,14 +1031,24 @@ static void run_child_process(void) static void init_paths(void) { LPWSTR ptr; + WCHAR last; static const WCHAR dot_manifest[] = {'.','M','a','n','i','f','e','s','t',0}; + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR subdir[] = {'T','e','s','t','S','u','b','d','i','r','\\',0}; GetModuleFileNameW(NULL, exe_path, sizeof(exe_path)/sizeof(WCHAR)); lstrcpyW(app_dir, exe_path); - for(ptr=app_dir+lstrlenW(app_dir); *ptr != '\\'; ptr--); + for(ptr=app_dir+lstrlenW(app_dir); *ptr != '\\' && *ptr != '/'; ptr--); ptr[1] = 0; + GetCurrentDirectoryW(MAX_PATH, work_dir); + last = work_dir[lstrlenW(work_dir) - 1]; + if (last != '\\' && last != '/') + lstrcatW(work_dir, backslash); + lstrcpyW(work_dir_subdir, work_dir); + lstrcatW(work_dir_subdir, subdir); + GetModuleFileNameW(NULL, app_manifest_path, sizeof(app_manifest_path)/sizeof(WCHAR)); lstrcpyW(app_manifest_path+lstrlenW(app_manifest_path), dot_manifest); }

1 0

Mikolaj Zalewski : ntdll: Manifests should be parsed as UTF-16 only if there is a BOM (with testcase ).
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 9f4001f7e032305990871ea8ba03113dbafd23fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4001f7e032305990871ea8b… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 17 13:36:34 2007 -0700 ntdll: Manifests should be parsed as UTF-16 only if there is a BOM (with testcase). --- dlls/kernel32/tests/actctx.c | 76 +++++++++++++++++++++++++++++++++++------- dlls/ntdll/actctx.c | 4 ++- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index da1650b..e2e6b24 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -180,7 +180,7 @@ static DWORD strlen_aw(const char *str) return MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0) - 1; } -static BOOL create_manifest_file(const char *filename, const char *manifest, +static BOOL create_manifest_file(const char *filename, const char *manifest, int manifest_len, const char *depfile, const char *depmanifest) { DWORD size; @@ -190,12 +190,15 @@ static BOOL create_manifest_file(const char *filename, const char *manifest, MultiByteToWideChar( CP_ACP, 0, filename, -1, path, MAX_PATH ); GetFullPathNameW(path, sizeof(manifest_path)/sizeof(WCHAR), manifest_path, NULL); + if (manifest_len == -1) + manifest_len = strlen(manifest); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return FALSE; - WriteFile(file, manifest, strlen(manifest), &size, NULL); + WriteFile(file, manifest, manifest_len, &size, NULL); CloseHandle(file); if (depmanifest) @@ -213,6 +216,19 @@ static BOOL create_manifest_file(const char *filename, const char *manifest, return TRUE; } +static BOOL create_wide_manifest(const char *filename, const char *manifest, BOOL fBOM) +{ + WCHAR *wmanifest = HeapAlloc(GetProcessHeap(), 0, (strlen(manifest)+2) * sizeof(WCHAR)); + BOOL ret; + int offset = (fBOM ? 0 : 1); + + MultiByteToWideChar(CP_ACP, 0, manifest, -1, &wmanifest[1], (strlen(manifest)+1) * sizeof(WCHAR)); + wmanifest[0] = 0xfeff; + ret = create_manifest_file(filename, (char *)&wmanifest[offset], (strlen(manifest)+1-offset) * sizeof(WCHAR), NULL, NULL); + HeapFree(GetProcessHeap(), 0, wmanifest); + return ret; +} + typedef struct { ULONG format_version; ULONG assembly_cnt; @@ -581,7 +597,7 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, actctx.cbSize = sizeof(ACTCTXW); actctx.lpSource = path; - create_manifest_file("bad.manifest", manifest, "testdep.manifest", depmanifest); + create_manifest_file("bad.manifest", manifest, -1, "testdep.manifest", depmanifest); handle = pCreateActCtxW(&actctx); if (todo) todo_wine { @@ -598,6 +614,26 @@ static void test_create_and_fail(const char *manifest, const char *depmanifest, DeleteFileA("testdep.manifest"); } +static void test_create_wide_and_fail(const char *manifest, BOOL fBOM) +{ + ACTCTXW actctx; + HANDLE handle; + WCHAR path[MAX_PATH]; + + MultiByteToWideChar( CP_ACP, 0, "bad.manifest", -1, path, MAX_PATH ); + memset(&actctx, 0, sizeof(ACTCTXW)); + actctx.cbSize = sizeof(ACTCTXW); + actctx.lpSource = path; + + create_wide_manifest("bad.manifest", manifest, fBOM); + handle = pCreateActCtxW(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "handle != INVALID_HANDLE_VALUE\n"); + ok(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX, "GetLastError == %u\n", GetLastError()); + + if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx( handle ); + DeleteFileA("bad.manifest"); +} + static void test_create_fail(void) { ACTCTXW actctx; @@ -629,6 +665,8 @@ static void test_create_fail(void) test_create_and_fail(wrong_manifest7, NULL, 1 ); trace("wrong_manifest8\n"); test_create_and_fail(wrong_manifest8, NULL, 0 ); + trace("UTF-16 manifest1 without BOM\n"); + test_create_wide_and_fail(manifest1, FALSE ); trace("manifest2\n"); test_create_and_fail(manifest2, NULL, 0 ); trace("manifest2+depmanifest1\n"); @@ -822,7 +860,7 @@ static void test_actctx(void) pReleaseActCtx(handle); } - if(!create_manifest_file("test1.manifest", manifest1, NULL, NULL)) { + if(!create_manifest_file("test1.manifest", manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; } @@ -845,7 +883,7 @@ static void test_actctx(void) pReleaseActCtx(handle); } - if(!create_manifest_file("test2.manifest", manifest2, "testdep.manifest", testdep_manifest1)) { + if(!create_manifest_file("test2.manifest", manifest2, -1, "testdep.manifest", testdep_manifest1)) { skip("Could not create manifest file\n"); return; } @@ -862,7 +900,7 @@ static void test_actctx(void) pReleaseActCtx(handle); } - if(!create_manifest_file("test3.manifest", manifest2, "testdep.manifest", testdep_manifest2)) { + if(!create_manifest_file("test3.manifest", manifest2, -1, "testdep.manifest", testdep_manifest2)) { skip("Could not create manifest file\n"); return; } @@ -891,7 +929,7 @@ static void test_actctx(void) trace("manifest2 depmanifest3\n"); - if(!create_manifest_file("test2-3.manifest", manifest2, "testdep.manifest", testdep_manifest3)) { + if(!create_manifest_file("test2-3.manifest", manifest2, -1, "testdep.manifest", testdep_manifest3)) { skip("Could not create manifest file\n"); return; } @@ -920,7 +958,7 @@ static void test_actctx(void) trace("manifest3\n"); - if(!create_manifest_file("test3.manifest", manifest3, NULL, NULL)) { + if(!create_manifest_file("test3.manifest", manifest3, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; } @@ -945,7 +983,7 @@ static void test_actctx(void) trace("manifest4\n"); - if(!create_manifest_file("test4.manifest", manifest4, NULL, NULL)) { + if(!create_manifest_file("test4.manifest", manifest4, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; } @@ -965,8 +1003,7 @@ static void test_actctx(void) CreateDirectoryW(work_dir_subdir, NULL); if (SetCurrentDirectoryW(work_dir_subdir)) { - /* the lpAddDirPath will point to the directory with the manifest */ - if(!create_manifest_file("..\\test1.manifest", manifest1, NULL, NULL)) { + if(!create_manifest_file("..\\test1.manifest", manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; } @@ -982,6 +1019,21 @@ static void test_actctx(void) else skip("Couldn't change directory\n"); RemoveDirectoryW(work_dir_subdir); + + trace("UTF-16 manifest1, with BOM\n"); + if(!create_wide_manifest("test1.manifest", manifest1, TRUE)) { + skip("Could not create manifest file\n"); + return; + } + + handle = test_create("test1.manifest", manifest1); + DeleteFileA("test1.manifest"); + if (handle != INVALID_HANDLE_VALUE) { + test_detailed_info(handle, &detailed_info1); + test_info_in_assembly(handle, 1, &manifest1_info); + pReleaseActCtx(handle); + } + } static void test_app_manifest(void) @@ -1011,7 +1063,7 @@ static void run_child_process(void) GetModuleFileNameA(NULL, path, MAX_PATH); strcat(path, ".manifest"); - if(!create_manifest_file(path, manifest1, NULL, NULL)) { + if(!create_manifest_file(path, manifest1, -1, NULL, NULL)) { skip("Could not create manifest file\n"); return; } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 2021cb8..e26dc02 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1484,6 +1484,7 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident xmlbuf_t xmlbuf; NTSTATUS status; struct assembly *assembly; + int unicode_tests; TRACE( "parsing manifest loaded from %s base dir %s\n", debugstr_w(filename), debugstr_w(directory) ); @@ -1497,7 +1498,8 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident assembly->manifest.type = assembly->manifest.info ? ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE : ACTIVATION_CONTEXT_PATH_TYPE_NONE; - if (!RtlIsTextUnicode( buffer, size, NULL )) + unicode_tests = IS_TEXT_UNICODE_SIGNATURE; + if (!RtlIsTextUnicode( buffer, size, &unicode_tests )) { /* let's assume utf-8 for now */ int len = wine_utf8_mbstowcs( 0, buffer, size, NULL, 0 );

1 0

James Hawkins : msi: Test adding nonpersistent strings to the string table.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 36df6a0655ebf2209e13e7bcf1587b3291b95ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36df6a0655ebf2209e13e7bcf… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 17 22:55:40 2007 -0500 msi: Test adding nonpersistent strings to the string table. --- dlls/msi/tests/db.c | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 277 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36df6a0655ebf2209e13e…

1 0

James Hawkins : msi: Save nonpersistent strings as holes in the string pool .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 227438832349fc8be7ba1f10d4b1ec57e2e25891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227438832349fc8be7ba1f10d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 17 22:57:18 2007 -0500 msi: Save nonpersistent strings as holes in the string pool. --- dlls/msi/string.c | 17 ++++++++++++----- dlls/msi/tests/db.c | 5 +---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 0cacf1e..fecd93f 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -457,20 +457,22 @@ UINT msi_strcmp( const string_table *st, UINT lval, UINT rval, UINT *res ) static void string_totalsize( const string_table *st, UINT *datasize, UINT *poolsize ) { - UINT i, len, max, holesize; + UINT i, len, holesize; if( st->strings[0].str || st->strings[0].persistent_refcount || st->strings[0].nonpersistent_refcount) ERR("oops. element 0 has a string\n"); *poolsize = 4; *datasize = 0; - max = 1; holesize = 0; for( i=1; i<st->maxcount; i++ ) { if( !st->strings[i].persistent_refcount ) - continue; - if( st->strings[i].str ) + { + TRACE("[%u] nonpersistent = %s\n", i, debugstr_w(st->strings[i].str)); + (*poolsize) += 4; + } + else if( st->strings[i].str ) { TRACE("[%u] = %s\n", i, debugstr_w(st->strings[i].str)); len = WideCharToMultiByte( st->codepage, 0, @@ -480,7 +482,6 @@ static void string_totalsize( const string_table *st, UINT *datasize, UINT *pool (*datasize) += len; if (len>0xffff) (*poolsize) += 4; - max = i + 1; (*poolsize) += holesize + 4; holesize = 0; } @@ -634,7 +635,13 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage ) for( i=1; i<st->maxcount; i++ ) { if( !st->strings[i].persistent_refcount ) + { + pool[ n*2 ] = 0; + pool[ n*2 + 1] = 0; + n++; continue; + } + sz = datasize - used; r = msi_id2stringA( st, i, data+used, &sz ); if( r != ERROR_SUCCESS ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 8def113..c620768 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4253,10 +4253,7 @@ static void test_stringtable(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 2, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmp(buffer, "five"), "Expected five, got %s\n", buffer); - } + ok(!lstrcmp(buffer, "five"), "Expected five, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Dan Hipschman : widl: Detect conformant arrays of user types correctly.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 1d0f9378bc855652bf45db0e29b07fa85724dbd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0f9378bc855652bf45db0e2… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 17 18:06:26 2007 -0700 widl: Detect conformant arrays of user types correctly. --- dlls/rpcrt4/tests/server.c | 54 ++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 16 ++++++++++++ tools/widl/header.c | 4 ++- tools/widl/parser.y | 41 ++++++++++++++------------------ tools/widl/typegen.c | 16 ++++++++++++ 5 files changed, 107 insertions(+), 24 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index d8ecff0..97f2e23 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -48,6 +48,14 @@ midl_user_free(void __RPC_FAR *p) free(p); } +static char * +xstrdup(const char *s) +{ + char *d = HeapAlloc(GetProcessHeap(), 0, strlen(s) + 1); + strcpy(d, s); + return d; +} + int s_int_return(void) { @@ -264,6 +272,26 @@ s_square_puint(puint_t p) } int +s_sum_puints(puints_t *p) +{ + int sum = 0; + int i; + for (i = 0; i < p->n; ++i) + sum += atoi(p->ps[i]); + return sum; +} + +int +s_sum_cpuints(cpuints_t *p) +{ + int sum = 0; + int i; + for (i = 0; i < p->n; ++i) + sum += atoi(p->ps[i]); + return sum; +} + +int s_dot_copy_vectors(vector_t u, vector_t v) { return u.x * v.x + u.y * v.y + u.z * v.z; @@ -724,9 +752,35 @@ pointer_tests(void) test_list_t *list = make_list(make_list(make_list(null_list()))); test_us_t tus = {{p1}}; int *pa[4]; + puints_t pus; + cpuints_t cpus; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); + pus.n = 4; + pus.ps = HeapAlloc(GetProcessHeap(), 0, pus.n * sizeof pus.ps[0]); + pus.ps[0] = xstrdup("5"); + pus.ps[1] = xstrdup("6"); + pus.ps[2] = xstrdup("7"); + pus.ps[3] = xstrdup("8"); + ok(sum_puints(&pus) == 26, "RPC sum_puints\n"); + HeapFree(GetProcessHeap(), 0, pus.ps[0]); + HeapFree(GetProcessHeap(), 0, pus.ps[1]); + HeapFree(GetProcessHeap(), 0, pus.ps[2]); + HeapFree(GetProcessHeap(), 0, pus.ps[3]); + HeapFree(GetProcessHeap(), 0, pus.ps); + cpus.n = 4; + cpus.ps = HeapAlloc(GetProcessHeap(), 0, cpus.n * sizeof cpus.ps[0]); + cpus.ps[0] = xstrdup("5"); + cpus.ps[1] = xstrdup("6"); + cpus.ps[2] = xstrdup("7"); + cpus.ps[3] = xstrdup("8"); + ok(sum_cpuints(&cpus) == 26, "RPC sum_puints\n"); + HeapFree(GetProcessHeap(), 0, cpus.ps[0]); + HeapFree(GetProcessHeap(), 0, cpus.ps[1]); + HeapFree(GetProcessHeap(), 0, cpus.ps[2]); + HeapFree(GetProcessHeap(), 0, cpus.ps[3]); + HeapFree(GetProcessHeap(), 0, cpus.ps); ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); pa[0] = &a[0]; diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 6233a1f..807bf44 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -153,6 +153,22 @@ cpp_quote("#endif") typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p); + + typedef struct + { + [size_is(n)] puint_t *ps; + int n; + } puints_t; + + /* Same thing as puints_t, but make it complex (needs padding). */ + typedef struct + { + [size_is(n)] puint_t *ps; + char n; + } cpuints_t; + + int sum_puints(puints_t *p); + int sum_cpuints(cpuints_t *p); int dot_copy_vectors(vector_t u, vector_t v); typedef struct wire_us *wire_us_t; diff --git a/tools/widl/header.c b/tools/widl/header.c index 2643f49..8de9b9f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -101,7 +101,9 @@ int is_void(const type_t *t) int is_conformant_array(const type_t *t) { - return t->type == RPC_FC_CARRAY || t->type == RPC_FC_CVARRAY; + return t->type == RPC_FC_CARRAY + || t->type == RPC_FC_CVARRAY + || (t->type == RPC_FC_BOGUS_ARRAY && t->size_is); } void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 96e9891..6a93995 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1434,24 +1434,24 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr, if (is_array(v->type)) { const type_t *rt = v->type->ref; - switch (rt->type) - { - case RPC_FC_BOGUS_STRUCT: - case RPC_FC_NON_ENCAPSULATED_UNION: - case RPC_FC_ENCAPSULATED_UNION: - case RPC_FC_ENUM16: + if (is_user_type(rt)) v->type->type = RPC_FC_BOGUS_ARRAY; - break; - /* FC_RP should be above, but widl overuses these, and will break things. */ - case RPC_FC_UP: - case RPC_FC_RP: - if (rt->ref->type == RPC_FC_IP) - v->type->type = RPC_FC_BOGUS_ARRAY; - break; - default: - if (is_user_type(rt)) - v->type->type = RPC_FC_BOGUS_ARRAY; - } + else + switch (rt->type) + { + case RPC_FC_BOGUS_STRUCT: + case RPC_FC_NON_ENCAPSULATED_UNION: + case RPC_FC_ENCAPSULATED_UNION: + case RPC_FC_ENUM16: + v->type->type = RPC_FC_BOGUS_ARRAY; + break; + /* FC_RP should be above, but widl overuses these, and will break things. */ + case RPC_FC_UP: + case RPC_FC_RP: + if (rt->ref->type == RPC_FC_IP) + v->type->type = RPC_FC_BOGUS_ARRAY; + break; + } } } @@ -1859,6 +1859,7 @@ static int get_struct_type(var_list_t *fields) case RPC_FC_OP: case RPC_FC_CARRAY: case RPC_FC_CVARRAY: + case RPC_FC_BOGUS_ARRAY: has_pointer = 1; break; @@ -1897,15 +1898,9 @@ static int get_struct_type(var_list_t *fields) /* fallthru - treat it as complex */ /* as soon as we see one of these these members, it's bogus... */ - case RPC_FC_IP: case RPC_FC_ENCAPSULATED_UNION: case RPC_FC_NON_ENCAPSULATED_UNION: - case RPC_FC_TRANSMIT_AS: - case RPC_FC_REPRESENT_AS: - case RPC_FC_PAD: - case RPC_FC_EMBEDDED_COMPLEX: case RPC_FC_BOGUS_STRUCT: - case RPC_FC_BOGUS_ARRAY: return RPC_FC_BOGUS_STRUCT; } } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 53ec78c..2245524 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1744,6 +1744,22 @@ static size_t write_struct_tfs(FILE *file, type_t *type, type_t *ft = f->type; if (is_ptr(ft)) write_pointer_tfs(file, ft, tfsoff); + else if (!ft->declarray && is_conformant_array(ft)) + { + unsigned int absoff = ft->typestring_offset; + short reloff = absoff - (*tfsoff + 2); + int ptr_type = get_attrv(f->attrs, ATTR_POINTERTYPE); + /* FIXME: We need to store pointer attributes for arrays + so we don't lose pointer_default info. */ + if (ptr_type == 0) + ptr_type = RPC_FC_UP; + print_file(file, 0, "/* %d */\n", *tfsoff); + print_file(file, 2, "0x%x, 0x0,\t/* %s */\n", ptr_type, + string_of_type(ptr_type)); + print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + reloff, reloff, absoff); + *tfsoff += 4; + } } if (type->ptrdesc == *tfsoff) type->ptrdesc = 0;

1 0

James Hawkins : msi: Return ERROR_FUNCTION_FAILED when inserting duplicate keys.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 46ec7ee183129cc1099a001febc5e77225ecacfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ec7ee183129cc1099a001fe… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 17 22:53:54 2007 -0500 msi: Return ERROR_FUNCTION_FAILED when inserting duplicate keys. --- dlls/msi/table.c | 2 +- dlls/msi/tests/db.c | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c5850e3..692f4a5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1490,7 +1490,7 @@ static UINT table_validate_new( MSITABLEVIEW *tv, MSIRECORD *rec ) /* check there's no duplicate keys */ r = msi_table_find_row( tv, rec, &row ); if (r == ERROR_SUCCESS) - return ERROR_INVALID_DATA; + return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 293cf0c..8887954 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -791,10 +791,8 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); /* should fail ... */ - todo_wine { r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec ); ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); - } r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

James Hawkins : msi: Return ERROR_FUNCTION_FAILED if a matching row is not found.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 26f86c55c92105770bcb43601e50ec3f54f8bee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f86c55c92105770bcb43601… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 17 22:54:39 2007 -0500 msi: Return ERROR_FUNCTION_FAILED if a matching row is not found. --- dlls/msi/table.c | 2 +- dlls/msi/tests/db.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 692f4a5..a817098 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1560,7 +1560,7 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) if (r != ERROR_SUCCESS) { ERR("can't find row to modify\n"); - return ERROR_SUCCESS; + return ERROR_FUNCTION_FAILED; } /* the row cannot be changed */ diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 8887954..76d1617 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -841,10 +841,7 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "MsiRecordSetInteger failed\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); - } + ok(r == ERROR_FUNCTION_FAILED, "MsiViewModify failed\n"); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -892,10 +889,7 @@ static void test_viewmodify(void) ok(r == ERROR_SUCCESS, "failed to set string\n"); r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); - todo_wine - { - ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); - } + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

Dan Hipschman : widl: Improve file cleanup when errors occur.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 67c634c2035bcf4ddefddac4dc4bc7fc72b22923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c634c2035bcf4ddefddac4d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 17 18:03:25 2007 -0700 widl: Improve file cleanup when errors occur. --- tools/widl/widl.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index c5e9d40..094195a 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -177,6 +177,16 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } +static void set_everything(int x) +{ + do_header = x; + do_typelib = x; + do_proxies = x; + do_client = x; + do_server = x; + do_idfile = x; +} + int main(int argc,char *argv[]) { extern char* optarg; @@ -279,7 +289,7 @@ int main(int argc,char *argv[]) } if(do_everything) { - do_header = do_typelib = do_proxies = do_client = do_server = do_idfile = 1; + set_everything(TRUE); } if(optind < argc) { input_name = xstrdup(argv[optind]); @@ -434,10 +444,9 @@ int main(int argc,char *argv[]) if(ret) { exit(1); } - header_name = NULL; - client_name = NULL; - server_name = NULL; - idfile_name = NULL; + + /* Everything has been done successfully, don't delete any files. */ + set_everything(FALSE); return 0; } @@ -446,10 +455,16 @@ static void rm_tempfile(void) abort_import(); if(temp_name) unlink(temp_name); - if (header_name) + if (do_header) unlink(header_name); - if (client_name) + if (do_client) unlink(client_name); - if (server_name) + if (do_server) unlink(server_name); + if (do_idfile) + unlink(idfile_name); + if (do_proxies) + unlink(proxy_name); + if (do_typelib) + unlink(typelib_name); }

1 0

Dan Hipschman : widl: Generate dlldata files.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 40e90aae25198e7a059520c0258eefe3e817fe00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e90aae25198e7a059520c02… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 17 18:03:57 2007 -0700 widl: Generate dlldata files. --- tools/widl/parser.y | 1 + tools/widl/utils.c | 29 ++++++++ tools/widl/utils.h | 1 + tools/widl/widl.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++---- tools/widl/widl.h | 3 + 5 files changed, 202 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40e90aae25198e7a05952…

1 0