May 2006 - Wine-commits - list.winehq.org

Hans Leidekker : dnsapi: Implement and test DnsRecordSetCompare.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: efe9cedab282c6028ab970a74fe4e1580c22fa94 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efe9cedab282c6028ab970a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon May 8 16:39:23 2006 +0200 dnsapi: Implement and test DnsRecordSetCompare. --- dlls/dnsapi/dnsapi.spec | 2 + dlls/dnsapi/record.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dnsapi/tests/record.c | 75 +++++++++++++++++++++++++++++++++------- 3 files changed, 144 insertions(+), 15 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index a2502b8..e6a42b0 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -86,7 +86,7 @@ @ stdcall DnsRecordCompare(ptr ptr) @ stdcall DnsRecordCopyEx(ptr long long) @ stdcall DnsRecordListFree(ptr long) -@ stub DnsRecordSetCompare +@ stdcall DnsRecordSetCompare(ptr ptr ptr ptr) @ stdcall DnsRecordSetCopyEx(ptr long long) @ stub DnsRecordSetDetach @ stub DnsRecordStringForType diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 08c3cd8..8b68314 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -640,6 +640,88 @@ void WINAPI DnsRecordListFree( PDNS_RECO } /****************************************************************************** + * DnsRecordSetCompare [DNSAPI.@] + * + */ +BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, + PDNS_RECORD *diff1, PDNS_RECORD *diff2 ) +{ + BOOL ret = TRUE; + DNS_RECORD *r, *s1, *s2, *t, *u; + DNS_RRSET rr1, rr2; + + TRACE( "(%p,%p,%p,%p)\n", set1, set2, diff1, diff2 ); + + if (!set1 && !set2) return FALSE; + + if (diff1) *diff1 = NULL; + if (diff2) *diff2 = NULL; + + if (set1 && !set2) + { + if (diff1) *diff1 = DnsRecordSetCopyEx( set1, 0, set1->Flags.S.CharSet ); + return FALSE; + } + if (!set1 && set2) + { + if (diff2) *diff2 = DnsRecordSetCopyEx( set2, 0, set2->Flags.S.CharSet ); + return FALSE; + } + + DNS_RRSET_INIT( rr1 ); + DNS_RRSET_INIT( rr2 ); + + for (r = s1 = set1; (s1 = r); r = r->pNext) + { + for (t = s2 = set2; (s2 = t); t = t->pNext) + { + u = DnsRecordCopyEx( r, r->Flags.S.CharSet, t->Flags.S.CharSet ); + if (!u) goto error; + + if (!DnsRecordCompare( t, u )) + { + DNS_RRSET_ADD( rr1, u ); + ret = FALSE; + } + else dns_free( u ); + } + } + + for (t = s2 = set2; (s2 = t); t = t->pNext) + { + for (r = s1 = set1; (s1 = r); r = r->pNext) + { + u = DnsRecordCopyEx( t, t->Flags.S.CharSet, r->Flags.S.CharSet ); + if (!u) goto error; + + if (!DnsRecordCompare( r, u )) + { + DNS_RRSET_ADD( rr2, u ); + ret = FALSE; + } + else dns_free( u ); + } + } + + DNS_RRSET_TERMINATE( rr1 ); + DNS_RRSET_TERMINATE( rr2 ); + + if (diff1) *diff1 = rr1.pFirstRR; + if (diff2) *diff2 = rr2.pFirstRR; + + return ret; + +error: + DNS_RRSET_TERMINATE( rr1 ); + DNS_RRSET_TERMINATE( rr2 ); + + DnsRecordListFree( rr1.pFirstRR, DnsFreeRecordList ); + DnsRecordListFree( rr2.pFirstRR, DnsFreeRecordList ); + + return FALSE; +} + +/****************************************************************************** * DnsRecordSetCopyEx [DNSAPI.@] * */ diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 307ecaa..6173e57 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -30,6 +31,7 @@ #include "wine/test.h" static HMODULE dnsapi; static BOOL (WINAPI *pDnsRecordCompare)(PDNS_RECORD,PDNS_RECORD); +static BOOL (WINAPI *pDnsRecordSetCompare)(PDNS_RECORD,PDNS_RECORD,PDNS_RECORD*,PDNS_RECORD*); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( dnsapi, #func ); \ if (!p##func) return FALSE; @@ -37,25 +39,18 @@ #define GETFUNCPTR(func) p##func = (void static BOOL init_function_ptrs( void ) { GETFUNCPTR( DnsRecordCompare ) + GETFUNCPTR( DnsRecordSetCompare ) return TRUE; } +static char name1[] = "localhost"; +static char name2[] = "LOCALHOST"; + +static DNS_RECORDA r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDA r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; + static void test_DnsRecordCompare( void ) { - char name1[] = "localhost"; - char name2[] = "LOCALHOST"; - static DNS_RECORDA r1, r2; - - r1.pName = name1; - r1.wType = DNS_TYPE_A; - r1.wDataLength = sizeof(DNS_A_DATA); - r1.Data.A.IpAddress = 0xffffffff; - - r2.pName = name1; - r2.wType = DNS_TYPE_A; - r2.wDataLength = sizeof(DNS_A_DATA); - r2.Data.A.IpAddress = 0xffffffff; - ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r1 ) == TRUE, "failed unexpectedly\n" ); r2.pName = name2; @@ -74,6 +69,57 @@ static void test_DnsRecordCompare( void ok( pDnsRecordCompare( (PDNS_RECORD)&r1, (PDNS_RECORD)&r2 ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsRecordSetCompare( void ) +{ + DNS_RECORD *diff1; + DNS_RECORD *diff2; + DNS_RRSET rr1, rr2; + + r1.Flags.DW = 0x2019; + r2.Flags.DW = 0x2019; + r2.Data.A.IpAddress = 0xffffffff; + + DNS_RRSET_INIT( rr1 ); + DNS_RRSET_INIT( rr2 ); + + DNS_RRSET_ADD( rr1, &r1 ); + DNS_RRSET_ADD( rr2, &r2 ); + + DNS_RRSET_TERMINATE( rr1 ); + DNS_RRSET_TERMINATE( rr2 ); + + ok( pDnsRecordSetCompare( NULL, NULL, NULL, NULL ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsRecordSetCompare( rr1.pFirstRR, NULL, NULL, NULL ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsRecordSetCompare( NULL, rr2.pFirstRR, NULL, NULL ) == FALSE, "succeeded unexpectedly\n" ); + + diff1 = NULL; + diff2 = NULL; + + ok( pDnsRecordSetCompare( NULL, NULL, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( diff1 == NULL && diff2 == NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + + ok( pDnsRecordSetCompare( rr1.pFirstRR, NULL, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( diff1 != NULL && diff2 == NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + + ok( pDnsRecordSetCompare( NULL, rr2.pFirstRR, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( diff1 == NULL && diff2 != NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, NULL, &diff2 ) == TRUE, "failed unexpectedly\n" ); + ok( diff2 == NULL, "unexpected result: %p\n", diff2 ); + + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, NULL ) == TRUE, "failed unexpectedly\n" ); + ok( diff1 == NULL, "unexpected result: %p\n", diff1 ); + + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, &diff2 ) == TRUE, "failed unexpectedly\n" ); + ok( diff1 == NULL && diff2 == NULL, "unexpected result: %p, %p\n", diff1, diff2 ); + + r2.Data.A.IpAddress = 0; + + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, NULL, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, NULL ) == FALSE, "succeeded unexpectedly\n" ); + ok( pDnsRecordSetCompare( rr1.pFirstRR, rr2.pFirstRR, &diff1, &diff2 ) == FALSE, "succeeded unexpectedly\n" ); +} + START_TEST(record) { dnsapi = LoadLibraryA( "dnsapi.dll" ); @@ -86,6 +132,7 @@ START_TEST(record) } test_DnsRecordCompare(); + test_DnsRecordSetCompare(); FreeLibrary( dnsapi ); }

1 0

Tomas Carnecky : x11drv: Return correct PBuffer drawable.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: f09dfe93b1df710f488b24b047623016a3880d3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f09dfe93b1df710f488b24b… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Mon May 1 22:53:38 2006 +0200 x11drv: Return correct PBuffer drawable. --- dlls/x11drv/init.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 9774c6f..83eac53 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -412,9 +412,13 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph { if(physDev->bitmap) { - if(!physDev->bitmap->glxpixmap) - physDev->bitmap->glxpixmap = create_glxpixmap(physDev); - *(Drawable *)out_data = physDev->bitmap->glxpixmap; + if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) + *(Drawable *)out_data = physDev->drawable; /* PBuffer */ + else { + if(!physDev->bitmap->glxpixmap) + physDev->bitmap->glxpixmap = create_glxpixmap(physDev); + *(Drawable *)out_data = physDev->bitmap->glxpixmap; + } } else *(Drawable *)out_data = physDev->drawable;

1 0

Michael Jung : riched20: Don't append '\r' to the last paragraph in EM_GETTEXTEX.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 0dec18a3d688eded7cfabc15f27c5e93999f1f71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0dec18a3d688eded7cfabc1… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Sun Apr 23 21:09:30 2006 +0200 riched20: Don't append '\r' to the last paragraph in EM_GETTEXTEX. --- dlls/riched20/editor.c | 29 +++++++++++++++++------------ dlls/riched20/tests/editor.c | 5 +---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 3bc27a4..d73690c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1956,7 +1956,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND DWORD flags = 0; buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, -1, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); HeapFree(GetProcessHeap(),0,buffer); return rc; @@ -2499,21 +2499,26 @@ int ME_GetTextW(ME_TextEditor *editor, W int nLen = ME_StrLen(item->member.run.strText); if (nLen > nChars) nLen = nChars; - + if (item->member.run.nFlags & MERF_ENDPARA) { - *buffer = '\r'; - if (bCRLF) - { - *(++buffer) = '\n'; - nWritten++; + if (!ME_FindItemFwd(item, diRun)) + /* No '\r' is appended to the last paragraph. */ + nLen = 0; + else { + *buffer = '\r'; + if (bCRLF) + { + *(++buffer) = '\n'; + nWritten++; + } + assert(nLen == 1); + /* our end paragraph consists of 2 characters now */ + if (editor->bEmulateVersion10) + nChars--; } - assert(nLen == 1); - /* our end paragraph consists of 2 characters now */ - if (editor->bEmulateVersion10) - nChars--; } - else + else CopyMemory(buffer, item->member.run.strText->szData, sizeof(WCHAR)*nLen); nChars -= nLen; nWritten += nLen; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fa5abca..6b80903 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -494,7 +494,6 @@ static void test_TM_PLAINTEXT() DestroyWindow(hwndRichEdit); } -/* FIXME: Extra '\r' appended at end of gotten text*/ static void test_WM_GETTEXT() { HWND hwndRichEdit = new_richedit(NULL); @@ -505,10 +504,8 @@ static void test_WM_GETTEXT() SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,text); - todo_wine{ - ok(result == 0, + ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); - } } /* FIXME: need to test unimplemented options and robustly test wparam */

1 0

qingdoa daoo : msvcrt: Don't duplicate handle in _get_osfhandle.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 4f7adfb04aa4df2c52453aa8c043bde57ae7fd44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f7adfb04aa4df2c52453aa… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Tue Apr 25 10:36:02 2006 +0800 msvcrt: Don't duplicate handle in _get_osfhandle. --- dlls/msvcrt/file.c | 17 +---------------- dlls/msvcrt/tests/file.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a02a29..eadde05 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1206,24 +1206,9 @@ int _futime(int fd, struct MSVCRT__utimb long _get_osfhandle(int fd) { HANDLE hand = msvcrt_fdtoh(fd); - HANDLE newhand = hand; TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand != INVALID_HANDLE_VALUE) - { - /* FIXME: I'm not convinced that I should be copying the - * handle here - it may be leaked if the app doesn't - * close it (and the API docs don't say that it should) - * Not duplicating it means that it can't be inherited - * and so lcc's wedit doesn't cope when it passes it to - * child processes. I've an idea that it should either - * be copied by CreateProcess, or marked as inheritable - * when initialised, or maybe both? JG 21-9-00. - */ - DuplicateHandle(GetCurrentProcess(),hand,GetCurrentProcess(), - &newhand,0,TRUE,DUPLICATE_SAME_ACCESS); - } - return (long)newhand; + return (long)hand; } /********************************************************************* diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9166ee9..d1a8d7f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <fcntl.h> +#include <share.h> #include <sys/stat.h> #include <io.h> #include <windef.h> @@ -464,6 +465,24 @@ static void test_fopen_fclose_fcloseall( ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); } +static void test_get_osfhandle(void) +{ + int fd; + char fname[] = "t_get_osfhanle"; + DWORD bytes_written; + HANDLE handle; + + fd = _sopen(fname, _O_CREAT|_O_RDWR, _SH_DENYRW, 0); + handle = (HANDLE)_get_osfhandle(fd); + WriteFile(handle, "bar", 3, &bytes_written, NULL); + _close(fd); + fd = _open(fname, _O_RDONLY, 0); + ok(fd != -1, "Coudn't open '%s' after _get_osfhanle()\n", fname); + + CloseHandle(handle); + _unlink(fname); +} + START_TEST(file) { int arg_c; @@ -489,4 +508,5 @@ START_TEST(file) test_fgetwc(); test_file_put_get(); test_tmpnam(); + test_get_osfhandle(); }

1 0

Andrew Ziem : setupapi: Improve unit tests for case sensitivity in string tables.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 5c23aa19dcf129dcff99256db56db9a99b1a0e30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c23aa19dcf129dcff99256… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Sun May 7 16:16:33 2006 -0600 setupapi: Improve unit tests for case sensitivity in string tables. --- dlls/setupapi/tests/stringtable.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 426c75e..908a91e 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -49,6 +49,7 @@ HMODULE hdll; static WCHAR string[] = {'s','t','r','i','n','g',0}; static WCHAR String[] = {'S','t','r','i','n','g',0}; static WCHAR foo[] = {'f','o','o',0}; +DWORD hstring, hString, hfoo; /* Handles pointing to our strings */ HANDLE table, table2; /* Handles pointing to our tables */ static void load_it_up(void) @@ -90,23 +91,23 @@ static void test_StringTableInitialize(v static void test_StringTableAddString(void) { - DWORD retval, retval2, retval3, retval4; + DWORD retval; /* case insensitive */ - retval=pStringTableAddString(table,string,0); - ok(retval!=-1,"Failed to add string to String Table\n"); + hstring=pStringTableAddString(table,string,0); + ok(hstring!=-1,"Failed to add string to String Table\n"); - retval2=pStringTableAddString(table,String,0); - ok(retval2!=-1,"Failed to add String to String Table\n"); - ok(retval=retval2,"string and String have different IDs in String Table\n"); + retval=pStringTableAddString(table,String,0); + ok(retval!=-1,"Failed to add String to String Table\n"); + ok(hstring==retval,"string handle %lx != String handle %lx in String Table\n", hstring, retval); - retval3=pStringTableAddString(table,foo,0); - ok(retval3!=-1,"Failed to add foo to String Table\n"); - ok(retval3!=retval2,"foo and String share the same ID in String Table\n"); + hfoo=pStringTableAddString(table,foo,0); + ok(hfoo!=-1,"Failed to add foo to String Table\n"); + ok(hfoo!=hstring,"foo and string share the same ID %lx in String Table\n", hfoo); /* case sensitive */ - retval4=pStringTableAddString(table,String,ST_CASE_SENSITIVE_COMPARE); - ok(retval!=retval4,"String and string share same ID in Table\n"); + hString=pStringTableAddString(table,String,ST_CASE_SENSITIVE_COMPARE); + ok(hstring!=hString,"String handle and string share same ID %lx in Table\n", hstring); } static void test_StringTableDuplicate(void) @@ -122,6 +123,9 @@ static void test_StringTableLookUpString /* case insensitive */ retval=pStringTableLookUpString(table,string,0); ok(retval!=-1,"Failed find string in String Table 1\n"); + ok(retval==hstring, + "Lookup for string (%lx) does not match previous handle (%lx) in String Table 1\n", + retval, hstring); retval=pStringTableLookUpString(table2,string,0); ok(retval!=-1,"Failed find string in String Table 2\n"); @@ -134,6 +138,9 @@ static void test_StringTableLookUpString retval=pStringTableLookUpString(table,foo,0); ok(retval!=-1,"Failed find foo in String Table 1\n"); + ok(retval==hfoo, + "Lookup for foo (%lx) does not match previous handle (%lx) in String Table 1\n", + retval, hfoo); retval=pStringTableLookUpString(table2,foo,0); ok(retval!=-1,"Failed find foo in String Table 2\n"); @@ -141,7 +148,10 @@ static void test_StringTableLookUpString /* case sensitive */ retval=pStringTableLookUpString(table,string,ST_CASE_SENSITIVE_COMPARE); retval2=pStringTableLookUpString(table,String,ST_CASE_SENSITIVE_COMPARE); - ok(retval!=retval2,"Lookup of string = String in Table 1\n"); + ok(retval!=retval2,"Lookup of string equals String in Table 1\n"); + ok(retval2==hString, + "Lookup for String (%lx) does not match previous handle (%lx) in String Table 1\n", + retval, hString); } static void test_StringTableStringFromId(void)

1 0

Alexandre Julliard : ole32: Properly initialize hash value in CompositeMonikerImpl_Hash.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: fec050c88d0f93f4b78c9e9793670240794f32d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fec050c88d0f93f4b78c9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 8 16:04:41 2006 +0200 ole32: Properly initialize hash value in CompositeMonikerImpl_Hash. --- dlls/ole32/compositemoniker.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 15d137b..439fbca 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -618,6 +618,8 @@ CompositeMonikerImpl_Hash(IMoniker* ifac if(FAILED(res)) return res; + *pdwHash = 0; + while(IEnumMoniker_Next(enumMoniker,1,&tempMk,NULL)==S_OK){ res = IMoniker_Hash(tempMk, &tempHash); if(FAILED(res))

1 0

Mike Hearn : ole32: Add StgCreateFile test and conformance fix.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 27800ef4ccee02dfb74821be318fbcce8d3c5f15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27800ef4ccee02dfb74821b… Author: Mike Hearn <mike(a)plan99.net> Date: Mon May 1 18:33:26 2006 +0100 ole32: Add StgCreateFile test and conformance fix. --- dlls/ole32/storage32.c | 25 ++++++++++++------------- dlls/ole32/tests/storage32.c | 19 +++++++++++++++---- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fdb3946..a42841a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5646,7 +5646,7 @@ HRESULT WINAPI StgCreateDocfile( if ( FAILED( validateSTGM(grfMode) )) goto end; - /* StgCreateDocFile always opens for write */ + /* StgCreateDocFile seems to refuse readonly access, despite MSDN */ switch(STGM_ACCESS_MODE(grfMode)) { case STGM_WRITE: @@ -5656,21 +5656,20 @@ HRESULT WINAPI StgCreateDocfile( goto end; } - /* can't share write */ - switch(STGM_SHARE_MODE(grfMode)) - { - case STGM_SHARE_EXCLUSIVE: - case STGM_SHARE_DENY_WRITE: - break; - default: - goto end; - } + /* if no share mode given then DENY_NONE is the default */ + if (STGM_SHARE_MODE(grfMode) == 0) + grfMode |= STGM_SHARE_DENY_NONE; - /* shared reading requires transacted mode */ - if( STGM_SHARE_MODE(grfMode) == STGM_SHARE_DENY_WRITE && - !(grfMode&STGM_TRANSACTED) ) + /* must have at least one access mode */ + if (STGM_ACCESS_MODE(grfMode) == 0) + goto end; + + /* in direct mode, can only use SHARE_EXCLUSIVE */ + if (!(grfMode & STGM_TRANSACTED) && (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE)) goto end; + /* but in transacted mode, any share mode is valid */ + /* * Generate a unique name. */ diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7085089..e579897 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -116,15 +116,15 @@ static void test_create_storage_modes(vo ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile succeeded\n"); ok(stg == NULL, "stg was set\n"); - /* check what happens if the file already exists */ + /* check what happens if the file already exists (which is how it's meant to be used) */ r = StgCreateDocfile( filename, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Release(stg); ok(r == 0, "storage not released\n"); r = StgCreateDocfile( filename, STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); - ok(r==STG_E_FILEALREADYEXISTS, "StgCreateDocfile wrong error\n"); + ok(r==STG_E_FILEALREADYEXISTS, "StgCreateDocfile wrong error\n"); /* FAILIFTHERE is default */ r = StgCreateDocfile( filename, STGM_READ, 0, &stg); - ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile succeeded\n"); + ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile succeeded\n"); /* need at least readmode and sharemode */ r = StgCreateDocfile( filename, STGM_SHARE_EXCLUSIVE, 0, &stg); ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile succeeded\n"); r = StgCreateDocfile( filename, STGM_SHARE_DENY_WRITE, 0, &stg); @@ -141,6 +141,8 @@ static void test_create_storage_modes(vo ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile failed\n"); r = StgCreateDocfile( filename, STGM_SHARE_DENY_WRITE | STGM_READ, 0, &stg); ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile wrong error\n"); + r = StgCreateDocfile( filename, STGM_TRANSACTED | STGM_SHARE_DENY_WRITE | STGM_READ, 0, &stg); + ok(r==STG_E_INVALIDFLAG, "StgCreateDocfile wrong error\n"); ok(DeleteFileW(filename), "failed to delete file\n"); r = StgCreateDocfile( filename, STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); @@ -158,7 +160,6 @@ static void test_create_storage_modes(vo ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Release(stg); ok(r == 0, "storage not released\n"); - ok(DeleteFileW(filename), "failed to delete file\n"); /* test the way excel uses StgCreateDocFile */ @@ -171,6 +172,16 @@ static void test_create_storage_modes(vo ok(DeleteFileW(filename), "failed to delete file\n"); } + /* and the way windows media uses it ... */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_DENY_NONE | STGM_READWRITE | STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile the windows media way failed\n"); + if (r == S_OK) + { + r = IStorage_Release(stg); + ok(r == 0, "storage not released\n"); + ok(DeleteFileW(filename), "failed to delete file\n"); + } + /* looks like we need STGM_TRANSACTED or STGM_CREATE */ r = StgCreateDocfile( filename, STGM_TRANSACTED|STGM_SHARE_DENY_WRITE|STGM_READWRITE, 0, &stg); ok(r==S_OK, "StgCreateDocfile the excel way failed\n");

1 0

Robert Shearman : ole32: Fix typos in CompositeMonikerImpl_BindToObject and CompositeMonikerImpl_BindToStorage .
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: b6592efa83c376a10ad96d32703cbf768087aad5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6592efa83c376a10ad96d3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 13:05:47 2006 +0100 ole32: Fix typos in CompositeMonikerImpl_BindToObject and CompositeMonikerImpl_BindToStorage. --- dlls/ole32/compositemoniker.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 5fe88a7..15d137b 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -385,7 +385,7 @@ CompositeMonikerImpl_BindToObject(IMonik res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - res=CompositeMonikerImpl_BindToObject(mostRigthMk,pbc,tempMk,riid,ppvResult); + res=IMoniker_BindToObject(mostRigthMk,pbc,tempMk,riid,ppvResult); IMoniker_Release(tempMk); IMoniker_Release(mostRigthMk); @@ -422,7 +422,7 @@ CompositeMonikerImpl_BindToStorage(IMoni res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); IMoniker_Release(antiMk); - res=CompositeMonikerImpl_BindToStorage(mostRigthMk,pbc,tempMk,riid,ppvResult); + res=IMoniker_BindToStorage(mostRigthMk,pbc,tempMk,riid,ppvResult); IMoniker_Release(tempMk);

1 0

Robert Shearman : ole32: Create moniker enumerator with an initial reference count.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 806f6e7bd62d3dba14326b8d4d72bf9c0cecac0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=806f6e7bd62d3dba14326b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:44:37 2006 +0100 ole32: Create moniker enumerator with an initial reference count. --- dlls/ole32/compositemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 13a7e31..5fe88a7 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1658,7 +1658,7 @@ EnumMonikerImpl_CreateEnumMoniker(IMonik /* Initialize the virtual function table. */ newEnumMoniker->lpVtbl = &VT_EnumMonikerImpl; - newEnumMoniker->ref = 0; + newEnumMoniker->ref = 1; newEnumMoniker->tabSize=tabSize; newEnumMoniker->currentPos=currentPos;

1 0

Robert Shearman : ole32: Test moniker display names.
by Alexandre Julliard 08 May '06

08 May '06

Module: wine Branch: refs/heads/master Commit: 91e51971c0de9ca450fe684e3373b3d7030ae10f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91e51971c0de9ca450fe684… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon May 8 12:44:08 2006 +0100 ole32: Test moniker display names. --- dlls/ole32/tests/moniker.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index fcc3c3d..2e7cd7d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -194,6 +194,13 @@ static const BYTE expected_class_moniker 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46, }; +static const WCHAR expected_class_moniker_display_name[] = +{ + 'c','l','s','i','d',':','0','0','0','2','E','0','0','5','-','0','0','0', + '0','-','0','0','0','0','-','C','0','0','0','-','0','0','0','0','0','0', + '0','0','0','0','4','6',':',0 +}; + static const BYTE expected_item_moniker_comparison_data[] = { 0x04,0x03,0x00,0x00,0x00,0x00,0x00,0x00, @@ -299,7 +306,8 @@ static void test_moniker( const char *testname, IMoniker *moniker, const BYTE *expected_moniker_marshal_data, size_t sizeof_expected_moniker_marshal_data, const BYTE *expected_moniker_saved_data, size_t sizeof_expected_moniker_saved_data, - const BYTE *expected_moniker_comparison_data, size_t sizeof_expected_moniker_comparison_data) + const BYTE *expected_moniker_comparison_data, size_t sizeof_expected_moniker_comparison_data, + LPCWSTR expected_display_name) { IStream * stream; IROTData * rotdata; @@ -311,10 +319,24 @@ static void test_moniker( BOOL same = TRUE; BYTE buffer[128]; IMoniker * moniker_proxy; + LPOLESTR display_name; + IBindCtx *bindctx; hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "%s: IMoniker_IsDirty should return S_FALSE, not 0x%08lx\n", testname, hr); + /* Display Name */ + + hr = CreateBindCtx(0, &bindctx); + ok_ole_success(hr, CreateBindCtx); + + hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &display_name); + ok_ole_success(hr, IMoniker_GetDisplayName); + ok(!lstrcmpW(display_name, expected_display_name), "display name wasn't what was expected\n"); + + CoTaskMemFree(display_name); + IBindCtx_Release(bindctx); + /* IROTData::GetComparisonData test */ hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); @@ -468,7 +490,8 @@ static void test_class_moniker(void) test_moniker("class moniker", moniker, expected_class_moniker_marshal_data, sizeof(expected_class_moniker_marshal_data), expected_class_moniker_saved_data, sizeof(expected_class_moniker_saved_data), - expected_class_moniker_comparison_data, sizeof(expected_class_moniker_comparison_data)); + expected_class_moniker_comparison_data, sizeof(expected_class_moniker_comparison_data), + expected_class_moniker_display_name); /* Hashing */ @@ -561,6 +584,7 @@ static void test_item_moniker(void) DWORD hash; static const WCHAR wszDelimeter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; + static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; hr = CreateItemMoniker(wszDelimeter, wszObjectName, &moniker); ok_ole_success(hr, CreateItemMoniker); @@ -568,7 +592,8 @@ static void test_item_moniker(void) test_moniker("item moniker", moniker, expected_item_moniker_marshal_data, sizeof(expected_item_moniker_marshal_data), expected_item_moniker_saved_data, sizeof(expected_item_moniker_saved_data), - expected_item_moniker_comparison_data, sizeof(expected_item_moniker_comparison_data)); + expected_item_moniker_comparison_data, sizeof(expected_item_moniker_comparison_data), + expected_display_name); /* Hashing */ @@ -598,6 +623,7 @@ static void test_anti_moniker(void) IMoniker *inverse; DWORD moniker_type; DWORD hash; + static const WCHAR expected_display_name[] = { '\\','.','.',0 }; hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); @@ -606,7 +632,8 @@ static void test_anti_moniker(void) test_moniker("anti moniker", moniker, expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data), expected_anti_moniker_saved_data, sizeof(expected_anti_moniker_saved_data), - expected_anti_moniker_comparison_data, sizeof(expected_anti_moniker_comparison_data)); + expected_anti_moniker_comparison_data, sizeof(expected_anti_moniker_comparison_data), + expected_display_name); /* Hashing */ hr = IMoniker_Hash(moniker, &hash); @@ -641,6 +668,7 @@ static void test_generic_composite_monik static const WCHAR wszObjectName1[] = {'T','e','s','t',0}; static const WCHAR wszDelimeter2[] = {'#',0}; static const WCHAR wszObjectName2[] = {'W','i','n','e',0}; + static const WCHAR expected_display_name[] = { '!','T','e','s','t','#','W','i','n','e',0 }; hr = CreateItemMoniker(wszDelimeter1, wszObjectName1, &moniker1); ok_ole_success(hr, CreateItemMoniker); @@ -652,7 +680,8 @@ static void test_generic_composite_monik test_moniker("generic composite moniker", moniker, expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), - expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data)); + expected_gc_moniker_comparison_data, sizeof(expected_gc_moniker_comparison_data), + expected_display_name); /* Hashing */

1 0