January 2009 - Wine-commits

Alexandre Julliard : winedump: Implement dumping of relocations.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 83fc73395dc5bba3709951a6528ddff1e22337c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fc73395dc5bba3709951a65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 15:11:47 2009 +0100 winedump: Implement dumping of relocations. --- tools/winedump/pe.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 2f6c46b..491228f 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -803,6 +803,52 @@ static void dump_dir_clr_header(void) printf("\n"); } +static void dump_dir_reloc(void) +{ + unsigned int i, size = 0; + const USHORT *relocs; + const IMAGE_BASE_RELOCATION *rel = get_dir_and_size(IMAGE_DIRECTORY_ENTRY_BASERELOC, &size); + const IMAGE_BASE_RELOCATION *end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); + static const char * const names[] = + { + "BASED_ABSOLUTE", + "BASED_HIGH", + "BASED_LOW", + "BASED_HIGHLOW", + "BASED_HIGHADJ", + "BASED_MIPS_JMPADDR", + "BASED_SECTION", + "BASED_REL", + "unknown 8", + "BASED_IA64_IMM64", + "BASED_DIR64", + "BASED_HIGH3ADJ", + "unknown 12", + "unknown 13", + "unknown 14", + "unknown 15" + }; + + if (!rel) return; + + printf( "Relocations\n" ); + while (rel < end - 1 && rel->SizeOfBlock) + { + printf( " Page %x\n", rel->VirtualAddress ); + relocs = (const USHORT *)(rel + 1); + i = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT); + while (i--) + { + USHORT offset = *relocs & 0xfff; + int type = *relocs >> 12; + printf( " off %04x type %s\n", offset, names[type] ); + relocs++; + } + rel = (const IMAGE_BASE_RELOCATION *)relocs; + } + printf("\n"); +} + static void dump_dir_tls(void) { IMAGE_TLS_DIRECTORY64 dir; @@ -1247,11 +1293,8 @@ void pe_dump(void) dump_dir_tls(); if (all || !strcmp(globals.dumpsect, "clr")) dump_dir_clr_header(); -#if 0 - /* FIXME: not implemented yet */ if (all || !strcmp(globals.dumpsect, "reloc")) dump_dir_reloc(); -#endif } if (globals.do_debug) dump_debug();

1 0

Hans Leidekker : usp10: Improve handling of whitespace in ScriptBreak.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 020456f71b61c8d4868ca63ac5820611b3ef07d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020456f71b61c8d4868ca63ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 11:20:26 2009 +0100 usp10: Improve handling of whitespace in ScriptBreak. --- dlls/usp10/tests/usp10.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 8 +++++++- 2 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c63c6c8..429f51c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1382,6 +1382,50 @@ static void test_ScriptGetProperties(void) ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); } +static void test_ScriptBreak(void) +{ + static const WCHAR test[] = {' ','\r','\n',0}; + SCRIPT_ITEM items[4]; + SCRIPT_LOGATTR la; + HRESULT hr; + + hr = ScriptItemize(test, 3, 4, NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + + memset(&la, 0, sizeof(la)); + hr = ScriptBreak(test, 1, &items[0].a, &la); + ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + + ok(!la.fSoftBreak, "fSoftBreak set\n"); + ok(la.fWhiteSpace, "fWhiteSpace not set\n"); + ok(la.fCharStop, "fCharStop not set\n"); + ok(!la.fWordStop, "fWordStop set\n"); + ok(!la.fInvalid, "fInvalid set\n"); + ok(!la.fReserved, "fReserved set\n"); + + memset(&la, 0, sizeof(la)); + hr = ScriptBreak(test + 1, 1, &items[1].a, &la); + ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + + ok(!la.fSoftBreak, "fSoftBreak set\n"); + ok(!la.fWhiteSpace, "fWhiteSpace set\n"); + ok(la.fCharStop, "fCharStop not set\n"); + ok(!la.fWordStop, "fWordStop set\n"); + ok(!la.fInvalid, "fInvalid set\n"); + ok(!la.fReserved, "fReserved set\n"); + + memset(&la, 0, sizeof(la)); + hr = ScriptBreak(test + 2, 1, &items[2].a, &la); + ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); + + ok(!la.fSoftBreak, "fSoftBreak set\n"); + ok(!la.fWhiteSpace, "fWhiteSpace set\n"); + ok(la.fCharStop, "fCharStop not set\n"); + ok(!la.fWordStop, "fWordStop set\n"); + ok(!la.fInvalid, "fInvalid set\n"); + ok(!la.fReserved, "fReserved set\n"); +} + START_TEST(usp10) { HWND hwnd; @@ -1426,6 +1470,7 @@ START_TEST(usp10) test_ScriptLayout(); test_digit_substitution(); test_ScriptGetProperties(); + test_ScriptBreak(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4af14ae..fb920ca 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1041,8 +1041,14 @@ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS memset(&la[i], 0, sizeof(SCRIPT_LOGATTR)); /* FIXME: set the other flags */ - la[i].fWhiteSpace = isspaceW(chars[i]); + la[i].fWhiteSpace = (chars[i] == ' '); la[i].fCharStop = 1; + + if (i > 0 && la[i - 1].fWhiteSpace) + { + la[i].fSoftBreak = 1; + la[i].fWordStop = 1; + } } return S_OK; }

1 0

Hans Leidekker : usp10: Handle CR/LF in ScriptItemize.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 8a5eae2122478f5f057b1f696523157003d0dbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5eae2122478f5f057b1f696… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 11:20:41 2009 +0100 usp10: Handle CR/LF in ScriptItemize. --- dlls/usp10/tests/usp10.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 23 +++++++++++++++++++---- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 429f51c..1dba682 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1426,6 +1426,43 @@ static void test_ScriptBreak(void) ok(!la.fReserved, "fReserved set\n"); } +static void test_newlines(void) +{ + static const WCHAR test1[] = {'t','e','x','t','\r','t','e','x','t',0}; + static const WCHAR test2[] = {'t','e','x','t','\n','t','e','x','t',0}; + static const WCHAR test3[] = {'t','e','x','t','\r','\n','t','e','x','t',0}; + static const WCHAR test4[] = {'t','e','x','t','\n','\r','t','e','x','t',0}; + static const WCHAR test5[] = {'1','2','3','4','\n','\r','1','2','3','4',0}; + SCRIPT_ITEM items[5]; + HRESULT hr; + int count; + + count = 0; + hr = ScriptItemize(test1, lstrlenW(test1), 5, NULL, NULL, items, &count); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + ok(count == 3, "got %d expected 3\n", count); + + count = 0; + hr = ScriptItemize(test2, lstrlenW(test2), 5, NULL, NULL, items, &count); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + ok(count == 3, "got %d expected 3\n", count); + + count = 0; + hr = ScriptItemize(test3, lstrlenW(test3), 5, NULL, NULL, items, &count); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + ok(count == 4, "got %d expected 4\n", count); + + count = 0; + hr = ScriptItemize(test4, lstrlenW(test4), 5, NULL, NULL, items, &count); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + ok(count == 4, "got %d expected 4\n", count); + + count = 0; + hr = ScriptItemize(test5, lstrlenW(test5), 5, NULL, NULL, items, &count); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + ok(count == 4, "got %d expected 4\n", count); +} + START_TEST(usp10) { HWND hwnd; @@ -1471,6 +1508,7 @@ START_TEST(usp10) test_digit_substitution(); test_ScriptGetProperties(); test_ScriptBreak(); + test_newlines(); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fb920ca..0975dcb 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -519,6 +519,8 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem #define Script_Arabic 6 #define Script_Latin 1 #define Script_Numeric 5 +#define Script_CR 22 +#define Script_LF 23 int cnt = 0, index = 0; int New_Script = SCRIPT_UNDEFINED; @@ -532,6 +534,12 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].iCharPos = 0; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); + if (pwcInChars[cnt] == '\r') + pItems[index].a.eScript = Script_CR; + else + if (pwcInChars[cnt] == '\n') + pItems[index].a.eScript = Script_LF; + else if (pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) pItems[index].a.eScript = Script_Numeric; else @@ -546,10 +554,16 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", New_Script, pItems[index].a.eScript, index, cnt, - pItems[index].iCharPos = cnt); + pItems[index].iCharPos); - for (cnt=0; cnt < cInChars; cnt++) + for (cnt=1; cnt < cInChars; cnt++) { + if (pwcInChars[cnt] == '\r') + New_Script = Script_CR; + else + if (pwcInChars[cnt] == '\n') + New_Script = Script_LF; + else if ((pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) || (New_Script == Script_Numeric && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Numeric; @@ -558,7 +572,8 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem || (New_Script == Script_Arabic && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Arabic; else - if ((WCHAR) pwcInChars[cnt] >= Latin_start && (WCHAR) pwcInChars[cnt] <= Latin_stop) + if ((pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) + || (New_Script == Script_Latin && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Latin; else New_Script = SCRIPT_UNDEFINED; @@ -580,7 +595,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem if (New_Script == Script_Arabic) pItems[index].a.s.uBidiLevel = 1; - TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); + TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); } }

1 0

Hans Leidekker : usp10: Set better visual attribute values in ScriptShape.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 83f66d0246ecfe10208ee96e9829b6efaf3f89f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f66d0246ecfe10208ee96e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 11:20:57 2009 +0100 usp10: Set better visual attribute values in ScriptShape. --- dlls/usp10/usp10.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0975dcb..0c32c6f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1322,10 +1322,12 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, for (i = 0; i < cChars; i++) { /* FIXME: set to better values */ - psva[i].uJustification = 2; + psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; psva[i].fClusterStart = 1; psva[i].fDiacritic = 0; psva[i].fZeroWidth = 0; + psva[i].fReserved = 0; + psva[i].fShapeReserved = 0; if (pwLogClust) pwLogClust[i] = i; }

1 0

Hans Leidekker : usp10: Improve some traces.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 9a847b3ab02d1c8c2be0407843406c95e17f1734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a847b3ab02d1c8c2be040784… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 11:21:07 2009 +0100 usp10: Improve some traces. --- dlls/usp10/usp10.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0c32c6f..fc2f8e9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1287,7 +1287,9 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, HRESULT hr; unsigned int i; - TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); + TRACE("(%p, %p, %s, %d, %d, %p, %p, %p, %p, %p)\n", hdc, psc, debugstr_wn(pwcChars, cChars), + cChars, cMaxGlyphs, psa, pwOutGlyphs, pwLogClust, psva, pcGlyphs); + if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); @@ -1362,8 +1364,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, HRESULT hr; int i; - TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, - debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); + TRACE("(%p, %p, %p, %d, %p, %p, %p, %p, %p)\n", hdc, psc, pwGlyphs, cGlyphs, psva, psa, + piAdvance, pGoffset, pABC); if (!psva) return E_INVALIDARG; if ((hr = init_script_cache(hdc, psc)) != S_OK) return hr;

1 0

Alexandre Julliard : winedump: List exported functions sorted by ordinal.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: d6617258b71e6041bcbe72f4221f89e8f5a97369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6617258b71e6041bcbe72f42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 6 15:11:06 2009 +0100 winedump: List exported functions sorted by ordinal. --- tools/winedump/pe.c | 46 ++++++++++++++++++---------------------------- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 31a744e..2f6c46b 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -469,7 +469,7 @@ static void dump_dir_exported_functions(void) const DWORD* pFunc; const DWORD* pName; const WORD* pOrdl; - DWORD* map; + DWORD* funcs; if (!exportDir) return; @@ -496,37 +496,27 @@ static void dump_dir_exported_functions(void) pOrdl = RVA(exportDir->AddressOfNameOrdinals, exportDir->NumberOfNames * sizeof(WORD)); if (!pOrdl) {printf("Can't grab functions' ordinal table\n"); return;} - /* bit map of used funcs */ - map = calloc(((exportDir->NumberOfFunctions + 31) & ~31) / 32, sizeof(DWORD)); - if (!map) fatal("no memory"); + funcs = calloc( exportDir->NumberOfFunctions, sizeof(*funcs) ); + if (!funcs) fatal("no memory"); - for (i = 0; i < exportDir->NumberOfNames; i++, pName++, pOrdl++) - { - map[*pOrdl / 32] |= 1 << (*pOrdl % 32); + for (i = 0; i < exportDir->NumberOfNames; i++) funcs[pOrdl[i]] = pName[i]; - printf(" %08X %4u %s", pFunc[*pOrdl], exportDir->Base + *pOrdl, - get_symbol_str((const char*)RVA(*pName, sizeof(DWORD)))); - /* check for forwarded function */ - if ((const char *)RVA(pFunc[*pOrdl],sizeof(void*)) >= (const char *)exportDir && - (const char *)RVA(pFunc[*pOrdl],sizeof(void*)) < (const char *)exportDir + size) - printf( " (-> %s)", (const char *)RVA(pFunc[*pOrdl],1)); - printf("\n"); - } - pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); - if (!pFunc) - { - printf("Can't grab functions' address table\n"); - free(map); - return; - } for (i = 0; i < exportDir->NumberOfFunctions; i++) { - if (pFunc[i] && !(map[i / 32] & (1 << (i % 32)))) - { - printf(" %08X %4u <by ordinal>\n", pFunc[i], exportDir->Base + i); - } + if (!pFunc[i]) continue; + printf(" %08X %5u ", pFunc[i], exportDir->Base + i); + if (funcs[i]) + { + printf("%s", get_symbol_str((const char*)RVA(funcs[i], sizeof(DWORD)))); + /* check for forwarded function */ + if ((const char *)RVA(pFunc[i],1) >= (const char *)exportDir && + (const char *)RVA(pFunc[i],1) < (const char *)exportDir + size) + printf(" (-> %s)", (const char *)RVA(pFunc[i],1)); + printf("\n"); + } + else printf("<by ordinal>\n"); } - free(map); + free(funcs); printf("\n"); }

1 0

Hans Leidekker : setupapi: Have each test create and destroy its own string table.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: f820392fbfe21be8f04ad9d1e970adc0502d7931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f820392fbfe21be8f04ad9d1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 10:39:07 2009 +0100 setupapi: Have each test create and destroy its own string table. --- dlls/setupapi/tests/stringtable.c | 66 +++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 6a07b18..6a8f24d 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -54,8 +54,6 @@ 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) { @@ -86,15 +84,13 @@ static void load_it_up(void) pStringTableStringFromId = (void*)GetProcAddress(hdll, "pSetupStringTableStringFromId"); } -static void test_StringTableInitialize(void) -{ - table=pStringTableInitialize(); - ok(table!=NULL,"Failed to Initialize String Table\n"); -} - static void test_StringTableAddString(void) { - DWORD retval; + DWORD retval, hstring, hString, hfoo; + HANDLE table; + + table = pStringTableInitialize(); + ok(table != NULL, "failed to initialize string table\n"); /* case insensitive */ hstring=pStringTableAddString(table,string,0); @@ -111,18 +107,44 @@ static void test_StringTableAddString(void) /* case sensitive */ hString=pStringTableAddString(table,String,ST_CASE_SENSITIVE_COMPARE); ok(hstring!=hString,"String handle and string share same ID %x in Table\n", hstring); + + pStringTableDestroy(table); } static void test_StringTableDuplicate(void) { + HANDLE table, table2; + + table = pStringTableInitialize(); + ok(table != NULL,"Failed to Initialize String Table\n"); + table2=pStringTableDuplicate(table); ok(table2!=NULL,"Failed to duplicate String Table\n"); + + pStringTableDestroy(table); + pStringTableDestroy(table2); } static void test_StringTableLookUpString(void) { - DWORD retval, retval2; - + DWORD retval, retval2, hstring, hString, hfoo; + HANDLE table, table2; + + table = pStringTableInitialize(); + ok(table != NULL,"failed to initialize string table\n"); + + hstring = pStringTableAddString(table, string, 0); + ok(hstring != ~0u, "failed to add 'string' to string table\n"); + + hString = pStringTableAddString(table, String, 0); + ok(hString != ~0u,"failed to add 'String' to string table\n"); + + hfoo = pStringTableAddString(table, foo, 0); + ok(hfoo != ~0u, "failed to add 'foo' to string table\n"); + + table2 = pStringTableDuplicate(table); + ok(table2 != NULL, "Failed to duplicate String Table\n"); + /* case insensitive */ retval=pStringTableLookUpString(table,string,0); ok(retval!=-1,"Failed find string in String Table 1\n"); @@ -152,35 +174,43 @@ static void test_StringTableLookUpString(void) retval=pStringTableLookUpString(table,string,ST_CASE_SENSITIVE_COMPARE); retval2=pStringTableLookUpString(table,String,ST_CASE_SENSITIVE_COMPARE); ok(retval!=retval2,"Lookup of string equals String in Table 1\n"); - ok(retval2==hString, + ok(retval==hString, "Lookup for String (%x) does not match previous handle (%x) in String Table 1\n", - retval, hString); + retval, hString); + + pStringTableDestroy(table); + pStringTableDestroy(table2); } static void test_StringTableStringFromId(void) { + HANDLE table; + DWORD hstring; WCHAR *string2; int result; + table = pStringTableInitialize(); + ok(table != NULL,"Failed to Initialize String Table\n"); + + hstring = pStringTableAddString(table, string, 0); + ok(hstring != ~0u,"failed to add 'string' to string table\n"); + /* correct */ string2=pStringTableStringFromId(table,pStringTableLookUpString(table,string,0)); ok(string2!=NULL,"Failed to look up string by ID from String Table\n"); result=lstrcmpiW(string, string2); ok(result==0,"StringID %p does not match requested StringID %p\n",string,string2); + + pStringTableDestroy(table); } START_TEST(stringtable) { load_it_up(); - test_StringTableInitialize(); test_StringTableAddString(); test_StringTableDuplicate(); test_StringTableLookUpString(); test_StringTableStringFromId(); - - /* assume we can always destroy */ - pStringTableDestroy(table); - pStringTableDestroy(table2); }

1 0

Hans Leidekker : setupapi: Add tests for StringTableAddStringEx and StringTableLookupStringEx.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: b4dcc6b42a505a0d74e166ba706a054eff0fd4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dcc6b42a505a0d74e166ba7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 6 10:39:20 2009 +0100 setupapi: Add tests for StringTableAddStringEx and StringTableLookupStringEx. --- dlls/setupapi/tests/stringtable.c | 95 +++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 6a8f24d..f93f2d8 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -40,10 +40,12 @@ DECLARE_HANDLE(HSTRING_TABLE); #define ST_CASE_SENSITIVE_COMPARE 0x00000001 static DWORD (WINAPI *pStringTableAddString)(HSTRING_TABLE, LPWSTR, DWORD); +static DWORD (WINAPI *pStringTableAddStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, DWORD); static VOID (WINAPI *pStringTableDestroy)(HSTRING_TABLE); static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable); static HSTRING_TABLE (WINAPI *pStringTableInitialize)(VOID); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); +static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); #if 0 static BOOL (WINAPI *pStringTableStringFromIdEx)(HSTRING_TABLE, DWORD, LPWSTR, LPDWORD); @@ -67,6 +69,10 @@ static void load_it_up(void) if (!pStringTableAddString) pStringTableAddString = (void*)GetProcAddress(hdll, "pSetupStringTableAddString"); + pStringTableAddStringEx = (void*)GetProcAddress(hdll, "StringTableAddStringEx"); + if (!pStringTableAddStringEx) + pStringTableAddStringEx = (void*)GetProcAddress(hdll, "pSetupStringTableAddStringEx"); + pStringTableDuplicate = (void*)GetProcAddress(hdll, "StringTableDuplicate"); if (!pStringTableDuplicate) pStringTableDuplicate = (void*)GetProcAddress(hdll, "pSetupStringTableDuplicate"); @@ -79,6 +85,10 @@ static void load_it_up(void) if (!pStringTableLookUpString) pStringTableLookUpString = (void*)GetProcAddress(hdll, "pSetupStringTableLookUpString"); + pStringTableLookUpStringEx = (void*)GetProcAddress(hdll, "StringTableLookUpStringEx"); + if (!pStringTableLookUpStringEx) + pStringTableLookUpStringEx = (void*)GetProcAddress(hdll, "pSetupStringTableLookUpStringEx"); + pStringTableStringFromId = (void*)GetProcAddress(hdll, "StringTableStringFromId"); if (!pStringTableStringFromId) pStringTableStringFromId = (void*)GetProcAddress(hdll, "pSetupStringTableStringFromId"); @@ -111,6 +121,33 @@ static void test_StringTableAddString(void) pStringTableDestroy(table); } +static void test_StringTableAddStringEx(void) +{ + DWORD retval, hstring, hString, hfoo; + HANDLE table; + + table = pStringTableInitialize(); + ok(table != NULL,"Failed to Initialize String Table\n"); + + /* case insensitive */ + hstring = pStringTableAddStringEx(table, string, 0, NULL, 0); + ok(hstring != ~0u, "Failed to add string to String Table\n"); + + retval = pStringTableAddStringEx(table, String, 0, NULL, 0); + ok(retval != ~0u, "Failed to add String to String Table\n"); + ok(hstring == retval, "string handle %x != String handle %x in String Table\n", hstring, retval); + + hfoo = pStringTableAddStringEx(table, foo, 0, NULL, 0); + ok(hfoo != ~0u, "Failed to add foo to String Table\n"); + ok(hfoo != hstring, "foo and string share the same ID %x in String Table\n", hfoo); + + /* case sensitive */ + hString = pStringTableAddStringEx(table, String, ST_CASE_SENSITIVE_COMPARE, NULL, 0); + ok(hstring != hString, "String handle and string share same ID %x in Table\n", hstring); + + pStringTableDestroy(table); +} + static void test_StringTableDuplicate(void) { HANDLE table, table2; @@ -182,6 +219,62 @@ static void test_StringTableLookUpString(void) pStringTableDestroy(table2); } +static void test_StringTableLookUpStringEx(void) +{ + DWORD retval, retval2, hstring, hString, hfoo; + HANDLE table, table2; + + table = pStringTableInitialize(); + ok(table != NULL,"Failed to Initialize String Table\n"); + + hstring = pStringTableAddString(table, string, 0); + ok(hstring != ~0u, "failed to add 'string' to string table\n"); + + hString = pStringTableAddString(table, String, 0); + ok(hString != ~0u,"failed to add 'String' to string table\n"); + + hfoo = pStringTableAddString(table, foo, 0); + ok(hfoo != ~0u, "failed to add 'foo' to string table\n"); + + table2 = pStringTableDuplicate(table); + ok(table2 != NULL, "Failed to duplicate String Table\n"); + + /* case insensitive */ + retval = pStringTableLookUpStringEx(table, string, 0, NULL, NULL); + ok(retval != ~0u, "Failed find string in String Table 1\n"); + ok(retval == hstring, + "Lookup for string (%x) does not match previous handle (%x) in String Table 1\n", + retval, hstring); + + retval = pStringTableLookUpStringEx(table2, string, 0, NULL, NULL); + ok(retval != ~0u, "Failed find string in String Table 2\n"); + + retval = pStringTableLookUpStringEx(table, String, 0, NULL, NULL); + ok(retval != ~0u, "Failed find String in String Table 1\n"); + + retval = pStringTableLookUpStringEx(table2, String, 0, NULL, NULL); + ok(retval != ~0u, "Failed find String in String Table 2\n"); + + retval=pStringTableLookUpStringEx(table, foo, 0, NULL, NULL); + ok(retval != ~0u, "Failed find foo in String Table 1\n"); + ok(retval == hfoo, + "Lookup for foo (%x) does not match previous handle (%x) in String Table 1\n", + retval, hfoo); + + retval = pStringTableLookUpStringEx(table2, foo, 0, NULL, NULL); + ok(retval != ~0u, "Failed find foo in String Table 2\n"); + + /* case sensitive */ + retval = pStringTableLookUpStringEx(table, string,ST_CASE_SENSITIVE_COMPARE, NULL, NULL); + retval2 = pStringTableLookUpStringEx(table, String, ST_CASE_SENSITIVE_COMPARE, NULL, NULL); + ok(retval != retval2, "Lookup of string equals String in Table 1\n"); + ok(retval == hString, + "Lookup for String (%x) does not match previous handle (%x) in String Table 1\n", + retval, hString); + + pStringTableDestroy(table); +} + static void test_StringTableStringFromId(void) { HANDLE table; @@ -210,7 +303,9 @@ START_TEST(stringtable) load_it_up(); test_StringTableAddString(); + test_StringTableAddStringEx(); test_StringTableDuplicate(); test_StringTableLookUpString(); + test_StringTableLookUpStringEx(); test_StringTableStringFromId(); }

1 0

Paul Vriens : shell32/tests: Fix some test failures on Win9x and NT4.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 7c1885181e84358fe82b9f3f97d00ea44f19fe5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1885181e84358fe82b9f3f9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 09:16:37 2009 +0100 shell32/tests: Fix some test failures on Win9x and NT4. --- dlls/shell32/tests/shlfileop.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 262e7a6..91ffe0b 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -736,7 +736,7 @@ static void test_copy(void) } else { - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("test6.txt"), "The file is copied - many files are " "specified as a target\n"); } @@ -771,7 +771,7 @@ static void test_copy(void) } else { - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("test6.txt"), "The file is copied - many files are " "specified as a target\n"); } @@ -1552,7 +1552,7 @@ static void test_move(void) } else { - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(!file_exists("test6.txt"), "The file is not moved - many files are " "specified as a target\n"); } @@ -1580,7 +1580,7 @@ static void test_move(void) } else { - ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %d\n", retval); + expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x, NT4 */); ok(file_exists("test1.txt"), "The file is moved. Many files are specified\n"); ok(dir_exists("test4.txt"), "The directory is moved. Many files are specified\n"); }

1 0

Paul Vriens : shell32/tests: Change some tests with respect to Vista.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: dda78ca69bd8aec90706f49872dc7fcc1aa6cc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda78ca69bd8aec90706f4987… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 6 11:34:32 2009 +0100 shell32/tests: Change some tests with respect to Vista. --- dlls/shell32/tests/shlfileop.c | 81 ++++++++++++++++++++++----------------- 1 files changed, 46 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dda78ca69bd8aec90706f…

1 0