September 2006 - Wine-commits

Alexandre Julliard : server: Kill the process without SIGTERM when the fd socket is closed.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: 81977b773bcff2c07f476c5ff3126323145480ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81977b773bcff2c07f476c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 11:14:45 2006 +0200 server: Kill the process without SIGTERM when the fd socket is closed. --- server/process.c | 40 ++++++++++++++++++++++++++++------------ server/process.h | 2 +- server/request.c | 12 ++++++------ 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/server/process.c b/server/process.c index b36ca37..c50641b 100644 --- a/server/process.c +++ b/server/process.c @@ -408,7 +408,7 @@ static void process_poll_event( struct f process->sigkill_timeout = NULL; process_died( process ); } - else kill_process( process, NULL, 0 ); + else kill_process( process, 0 ); } else if (event & POLLIN) receive_fd( process ); } @@ -512,6 +512,20 @@ static void process_unload_dll( struct p else set_error( STATUS_INVALID_PARAMETER ); } +/* terminate a process with the given exit code */ +static void terminate_process( struct process *process, struct thread *skip, int exit_code ) +{ + struct list *ptr, *next; + + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + + if (exit_code) thread->exit_code = exit_code; + if (thread != skip) kill_thread( thread, 1 ); + } +} + /* kill all processes */ void kill_all_processes( struct process *skip, int exit_code ) { @@ -525,7 +539,7 @@ void kill_all_processes( struct process if (process->running_threads) break; } if (&process->entry == &process_list) break; /* no process found */ - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -544,7 +558,7 @@ void kill_console_processes( struct thre if (process->console && process->console->renderer == renderer) break; } if (&process->entry == &process_list) break; /* no process found */ - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -638,16 +652,18 @@ void resume_process( struct process *pro } /* kill a process on the spot */ -void kill_process( struct process *process, struct thread *skip, int exit_code ) +void kill_process( struct process *process, int violent_death ) { - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + if (violent_death) terminate_process( process, NULL, 1 ); + else { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + struct list *ptr, *next; - if (exit_code) thread->exit_code = exit_code; - if (thread != skip) kill_thread( thread, 1 ); + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + kill_thread( thread, 0 ); + } } } @@ -666,7 +682,7 @@ void kill_debugged_processes( struct thr } if (&process->entry == &process_list) break; /* no process found */ process->debugger = NULL; - kill_process( process, NULL, exit_code ); + terminate_process( process, NULL, exit_code ); } } @@ -960,7 +976,7 @@ DECL_HANDLER(terminate_process) if ((process = get_process_from_handle( req->handle, PROCESS_TERMINATE ))) { reply->self = (current->process == process); - kill_process( process, current, req->exit_code ); + terminate_process( process, current, req->exit_code ); release_object( process ); } } diff --git a/server/process.h b/server/process.h index c447e2f..af84719 100644 --- a/server/process.h +++ b/server/process.h @@ -120,7 +120,7 @@ extern void remove_process_thread( struc extern void suspend_process( struct process *process ); extern void resume_process( struct process *process ); extern void kill_all_processes( struct process *skip, int exit_code ); -extern void kill_process( struct process *process, struct thread *skip, int exit_code ); +extern void kill_process( struct process *process, int violent_death ); extern void kill_console_processes( struct thread *renderer, int exit_code ); extern void kill_debugged_processes( struct thread *debugger, int exit_code ); extern void break_process( struct process *process ); diff --git a/server/request.c b/server/request.c index ac5a696..b0cebd5 100644 --- a/server/request.c +++ b/server/request.c @@ -402,13 +402,13 @@ #endif if (!ret) { - kill_process( process, NULL, 0 ); + kill_process( process, 0 ); } else if (ret > 0) { fprintf( stderr, "Protocol error: process %04x: partial recvmsg %d for fd\n", process->id, ret ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } else { @@ -416,7 +416,7 @@ #endif { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } } return -1; @@ -450,17 +450,17 @@ #endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIG if (ret >= 0) { fprintf( stderr, "Protocol error: process %04x: partial sendmsg %d\n", process->id, ret ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } else if (errno == EPIPE) { - kill_process( process, NULL, 0 ); + kill_process( process, 0 ); } else { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "sendmsg" ); - kill_process( process, NULL, 1 ); + kill_process( process, 1 ); } return -1; }

1 0

Stefan Dösinger : wined3d: Do not bind the 0 vbo when vbos are unsupported.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: fd65b9b4130b538c8065927c50c7acb30257857c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd65b9b4130b538c8065927… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 20 18:36:49 2006 +0200 wined3d: Do not bind the 0 vbo when vbos are unsupported. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index aa022e2..9078aee 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -827,7 +827,7 @@ static void loadNumberedArrays( WineDirect3DVertexStridedData *strided) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint curVBO = -1; + GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; int i; for (i = 0; i < MAX_ATTRIBS; i++) {

1 0

Juan Lang : crypt32: Test decoding a big CRL.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c3702346bcc91c492765ae032668bf031c36d090 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3702346bcc91c492765ae0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 11:55:40 2006 -0700 crypt32: Test decoding a big CRL. --- dlls/crypt32/tests/encode.c | 527 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 527 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c3702346bcc91c49276…

1 0

Juan Lang : crypt32: Test exporting key acquired through CryptAcquireCertificatePrivateKey.
by Alexandre Julliard 25 Sep '06

25 Sep '06

Module: wine Branch: master Commit: c33f0c555e95db754d7432a99ea6e666eec4f94e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c33f0c555e95db754d7432a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 20 12:01:33 2006 -0700 crypt32: Test exporting key acquired through CryptAcquireCertificatePrivateKey. --- dlls/crypt32/tests/cert.c | 69 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5c23607..d9749d5 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1715,12 +1715,27 @@ static const BYTE selfSignedCert[] = { 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, 0xa8, 0x76, 0x57, 0x92, 0x36 }; +static const BYTE exportedPublicKeyBlob[] = { +0x06,0x02,0x00,0x00,0x00,0xa4,0x00,0x00,0x52,0x53,0x41,0x31,0x00,0x02,0x00,0x00, +0x01,0x00,0x01,0x00,0x79,0x10,0x1c,0xd0,0x6b,0x10,0x18,0x30,0x94,0x61,0xdc,0x0e, +0xcb,0x96,0x4e,0x21,0x3f,0x79,0xcd,0xa9,0x17,0x62,0xbc,0xbb,0x61,0x4c,0xe0,0x75, +0x38,0x6c,0xf3,0xde,0x60,0x86,0x03,0x97,0x65,0xeb,0x1e,0x6b,0xdb,0x53,0x85,0xad, +0x68,0x21,0xf1,0x5d,0xe7,0x1f,0xe6,0x53,0xb4,0xbb,0x59,0x3e,0x14,0x27,0xb1,0x83, +0xa7,0x3a,0x54,0xe2 }; + +static const BYTE asnEncodedPublicKey[] = { +0x30,0x48,0x02,0x41,0x00,0xe2,0x54,0x3a,0xa7,0x83,0xb1,0x27,0x14,0x3e,0x59,0xbb, +0xb4,0x53,0xe6,0x1f,0xe7,0x5d,0xf1,0x21,0x68,0xad,0x85,0x53,0xdb,0x6b,0x1e,0xeb, +0x65,0x97,0x03,0x86,0x60,0xde,0xf3,0x6c,0x38,0x75,0xe0,0x4c,0x61,0xbb,0xbc,0x62, +0x17,0xa9,0xcd,0x79,0x3f,0x21,0x4e,0x96,0xcb,0x0e,0xdc,0x61,0x94,0x30,0x18,0x10, +0x6b,0xd0,0x1c,0x10,0x79,0x02,0x03,0x01,0x00,0x01 }; + static void testAcquireCertPrivateKey(void) { BOOL ret; PCCERT_CONTEXT cert; HCRYPTPROV csp; - DWORD keySpec; + DWORD size, keySpec; BOOL callerFree; CRYPT_KEY_PROV_INFO keyProvInfo; HCRYPTKEY key; @@ -1834,6 +1849,58 @@ static void testAcquireCertPrivateKey(vo CryptDestroyKey(key); } + /* Some sanity-checking on public key exporting */ + ret = CryptImportPublicKeyInfo(csp, X509_ASN_ENCODING, + &cert->pCertInfo->SubjectPublicKeyInfo, &key); + ok(ret, "CryptImportPublicKeyInfo failed: %08lx\n", GetLastError()); + if (ret) + { + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, NULL, &size); + ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); + if (ret) + { + LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size), encodedKey; + + ret = CryptExportKey(key, 0, PUBLICKEYBLOB, 0, buf, &size); + ok(ret, "CryptExportKey failed: %08lx\n", GetLastError()); + ok(size == sizeof(exportedPublicKeyBlob), "Unexpected size %ld\n", + size); + ok(!memcmp(buf, exportedPublicKeyBlob, size), "Unexpected value\n"); + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, RSA_CSP_PUBLICKEYBLOB, + buf, CRYPT_ENCODE_ALLOC_FLAG, NULL, &encodedKey, &size); + ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError()); + if (ret) + { + ok(size == sizeof(asnEncodedPublicKey), "Unexpected size %ld\n", + size); + ok(!memcmp(encodedKey, asnEncodedPublicKey, size), + "Unexpected value\n"); + LocalFree(encodedKey); + } + HeapFree(GetProcessHeap(), 0, buf); + } + CryptDestroyKey(key); + } + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + NULL, 0, NULL, NULL, &size); + ok(ret, "CryptExportPublicKeyInfoEx failed: %08lx\n", GetLastError()); + if (ret) + { + PCERT_PUBLIC_KEY_INFO info = HeapAlloc(GetProcessHeap(), 0, size); + + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + NULL, 0, NULL, info, &size); + ok(ret, "CryptExportPublicKeyInfoEx failed: %08lx\n", GetLastError()); + if (ret) + { + ok(info->PublicKey.cbData == sizeof(asnEncodedPublicKey), + "Unexpected size %ld\n", info->PublicKey.cbData); + ok(!memcmp(info->PublicKey.pbData, asnEncodedPublicKey, + info->PublicKey.cbData), "Unexpected value\n"); + } + HeapFree(GetProcessHeap(), 0, info); + } + CryptReleaseContext(csp, 0); CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

Paul Vriens : crypt32: Simplify by removing unneeded backslash.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 4c32875e9226498fcb9ab821f0a7ae6584934da8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c32875e9226498fcb9ab82… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 20 15:51:23 2006 +0200 crypt32: Simplify by removing unneeded backslash. --- dlls/crypt32/sip.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 15ec3f5..3b1e17d 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -41,22 +41,20 @@ static const WCHAR szOID[] = { 'E','n','c','o','d','i','n','g','T','y','p','e',' ','0','\\', 'C','r','y','p','t','S','I','P','D','l','l', 0 }; -static const WCHAR szBackSlash[] = { '\\', 0 }; - static const WCHAR szPutSigned[] = { - 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szGetSigned[] = { - 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szRemoveSigned[] = { - 'R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g',0}; + 'R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g','\\',0}; static const WCHAR szCreate[] = { - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a',0}; + 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a','\\',0}; static const WCHAR szVerify[] = { - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a',0}; + 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a','\\',0}; static const WCHAR szIsMyFile[] = { - 'I','s','M','y','F','i','l','e','T','y','p','e', 0 }; + 'I','s','M','y','F','i','l','e','T','y','p','e','\\',0}; static const WCHAR szIsMyFile2[] = { - 'I','s','M','y','F','i','l','e','T','y','p','e','2', 0}; + 'I','s','M','y','F','i','l','e','T','y','p','e','2','\\',0}; /* convert a guid to a wide character string */ static void CRYPT_guid2wstr( LPGUID guid, LPWSTR wstr ) @@ -83,9 +81,7 @@ static LONG CRYPT_SIPDeleteFunction( LPG /* max length of szFullKey depends on our code only, so we won't overrun */ lstrcpyW( szFullKey, szOID ); lstrcatW( szFullKey, szKey ); - lstrcatW( szFullKey, szBackSlash ); CRYPT_guid2wstr( guid, &szFullKey[ lstrlenW( szFullKey ) ] ); - lstrcatW( szFullKey, szBackSlash ); r = RegDeleteKeyW(HKEY_LOCAL_MACHINE, szFullKey); @@ -166,9 +162,7 @@ static LONG CRYPT_SIPWriteFunction( LPGU /* max length of szFullKey depends on our code only, so we won't overrun */ lstrcpyW( szFullKey, szOID ); lstrcatW( szFullKey, szKey ); - lstrcatW( szFullKey, szBackSlash ); CRYPT_guid2wstr( guid, &szFullKey[ lstrlenW( szFullKey ) ] ); - lstrcatW( szFullKey, szBackSlash ); TRACE("key is %s\n", debugstr_w( szFullKey ) );

1 0

Alexandre Julliard : Makefile: Fixed rule for building makedep when cross-compiling.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 9cc11a3d53f7a9c99ba89d105e1087923f48368c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cc11a3d53f7a9c99ba89d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 20:16:19 2006 +0200 Makefile: Fixed rule for building makedep when cross-compiling. --- Makefile.in | 2 +- tools/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index b94782f..4bbcc44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,7 +117,7 @@ RECURSE_TARGETS = \ depend $(RECURSE_TARGETS): $(MAKEDEP) $(MAKEDEP): - @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(EXEEXT) + @cd $(TOOLSDIR)/tools && $(MAKE) makedep # Test rules diff --git a/tools/Makefile.in b/tools/Makefile.in index 14ded8a..aa69d97 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -54,7 +54,7 @@ all: $(PROGRAMS) $(MANPAGES) $(SUBDIRS) @MAKE_RULES@ -makedep$(EXEEXT): makedep.o +makedep$(EXEEXT) $(EXEEXT:%=makedep): makedep.o $(CC) $(CFLAGS) -o $@ makedep.o $(LDFLAGS) make_ctests$(EXEEXT): make_ctests.o

1 0

Huw Davies : gdi32: GetTextExtentPoint and GetTextExtentExPoint behave differently if there' s a \n in the string.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 8b368b9cee916e6c803f0fa00744ee47b7259675 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b368b9cee916e6c803f0fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 14:02:36 2006 +0100 gdi32: GetTextExtentPoint and GetTextExtentExPoint behave differently if there's a \n in the string. --- dlls/gdi/tests/font.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 57d097b..beb7436 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -381,8 +381,13 @@ static void test_text_extents(void) if the extents array is untouched. */ GetTextExtentExPointW(hdc, wt, len, 32767, &fit1, extents, &sz1); GetTextExtentPointW(hdc, wt, len, &sz2); - ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, - "results from GetTextExtentExPointW and GetTextExtentPointW differ\n"); + ok(sz1.cy == sz2.cy, + "cy from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) differ\n", sz1.cy, sz2.cy); +todo_wine { + /* The \n in the string is apparently handled differently in GetTextExtentPoint and GetTextExtentExPoint */ + ok(sz1.cx != sz2.cx, + "cx from GetTextExtentExPointW (%ld) and GetTextExtentPointW (%ld) are the same\n", sz1.cx, sz2.cx); + } for (i = 1; i < len; ++i) ok(extents[i-1] <= extents[i], "GetTextExtentExPointW generated a non-increasing sequence of partial extents (at position %d)\n",

1 0

Huw Davies : gdi32: Fix ppem in the case that there isn' t an exact height match in the vdmx table.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 7be29570986efe02a3771305a0a63b85fc0a816c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7be29570986efe02a377130… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 11:53:06 2006 +0100 gdi32: Fix ppem in the case that there isn't an exact height match in the vdmx table. --- dlls/gdi/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 10f3f28..d3fcf06 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -2092,6 +2092,7 @@ static LONG load_VDMX(GdiFont font, LONG } font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]); font->yMin = GET_BE_WORD(vTable[(i * 3) + 2]); + ppem = GET_BE_WORD(vTable[i * 3]); TRACE("ppem %ld found; height=%ld yMax=%d yMin=%d\n", ppem, height, font->yMax, font->yMin); break; }

1 0

Huw Davies : gdi32: Only run the GetGlyphIndices test if Symbol is installed.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 0c06ec1bb300a52ad12226e0105c764e733914c6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c06ec1bb300a52ad12226e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 20 12:43:10 2006 +0100 gdi32: Only run the GetGlyphIndices test if Symbol is installed. --- dlls/gdi/tests/font.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 699d9b2..57d097b 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -29,6 +29,23 @@ #include "winuser.h" #include "wine/test.h" +static INT CALLBACK is_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char *name) +{ + HDC hdc = GetDC(0); + BOOL ret = FALSE; + + if(!EnumFontFamiliesA(hdc, name, is_font_installed_proc, 0)) + ret = TRUE; + + ReleaseDC(0, hdc); + return ret; +} + static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont) { LOGFONTA getobj_lf; @@ -410,6 +427,12 @@ static void test_GetGlyphIndices() return; } + if(!is_font_installed("Symbol")) + { + trace("Symbol is not installed so skipping this test\n"); + return; + } + memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Symbol"); lf.lfHeight = 20;

1 0

Benjamin Arai : msi: Adds test to check if "AND" operator returns the correct result for the "WHERE" clause.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: f84c1463c1325528f6c664f3b369de3861a03cc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f84c1463c1325528f6c664f… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Tue Sep 19 19:22:22 2006 -0700 msi: Adds test to check if "AND" operator returns the correct result for the "WHERE" clause. --- dlls/msi/tests/db.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4ea7c35..400e920 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1262,9 +1262,12 @@ static void test_streamtable(void) static void test_where(void) { - MSIHANDLE hdb = 0, rec; + MSIHANDLE hdb = 0, rec, view; LPCSTR query; UINT r; + DWORD size; + CHAR buf[MAX_PATH]; + UINT count; hdb = create_db(); ok( hdb, "failed to create db\n"); @@ -1311,6 +1314,40 @@ static void test_where(void) r = MsiRecordGetInteger(rec, 2); ok( 1 == r, "field wrong\n"); + query = "SELECT `DiskId` FROM `Media` WHERE `LastSequence` >= 1 AND DiskId >= 0"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r ); + + r = MsiViewExecute(view, 0); + ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + count = MsiRecordGetFieldCount( rec ); + ok( count == 1, "Expected 1 record fields, got %d\n", count ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, "2" ), + "For (row %d, column 1) expected '%d', got %s\n", 0, 2, buf ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_SUCCESS, "failed to fetch view: %d\n", r ); + + size = MAX_PATH; + r = MsiRecordGetString( rec, 1, buf, &size ); + ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); + ok( !lstrcmp( buf, "3" ), + "For (row %d, column 1) expected '%d', got %s\n", 1, 3, buf ); + + r = MsiViewFetch(view, &rec); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle( rec ); MsiCloseHandle( hdb );

1 0