January 2011 - Wine-commits

Ken Thomases : winemenubuilder: On Mac, understand and keep 256x256 Vista-style icons.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 3a5e6c43577f0efa6d1f740d36ab0322d40a1d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5e6c43577f0efa6d1f740d3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 12 00:17:20 2011 -0600 winemenubuilder: On Mac, understand and keep 256x256 Vista-style icons. --- programs/winemenubuilder/winemenubuilder.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8996836..684e130 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -863,17 +863,18 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico for (i = 0; i < numEntries; i++) { int slot; + int width = iconDirEntries[i].bWidth ? iconDirEntries[i].bWidth : 256; + int height = iconDirEntries[i].bHeight ? iconDirEntries[i].bHeight : 256; - WINE_TRACE("[%d]: %d x %d @ %d\n", i, iconDirEntries[i].bWidth, - iconDirEntries[i].bHeight, iconDirEntries[i].wBitCount); - slot = size_to_slot(iconDirEntries[i].bWidth); + WINE_TRACE("[%d]: %d x %d @ %d\n", i, width, height, iconDirEntries[i].wBitCount); + slot = size_to_slot(width); if (slot < 0) continue; if (iconDirEntries[i].wBitCount >= best[slot].maxBits && - (iconDirEntries[i].bHeight * iconDirEntries[i].bWidth) >= best[slot].maxPixels) + (height * width) >= best[slot].maxPixels) { best[slot].index = i; - best[slot].maxPixels = iconDirEntries[i].bHeight * iconDirEntries[i].bWidth; + best[slot].maxPixels = height * width; best[slot].maxBits = iconDirEntries[i].wBitCount; } }

1 0

Ken Thomases : winemenubuilder: On Mac, ignore non-square icon entries.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: eb4093909273b48abfecda5df4f59d9c2d310ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4093909273b48abfecda5df… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 12 00:17:25 2011 -0600 winemenubuilder: On Mac, ignore non-square icon entries. --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 684e130..8cafce0 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -867,6 +867,8 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico int height = iconDirEntries[i].bHeight ? iconDirEntries[i].bHeight : 256; WINE_TRACE("[%d]: %d x %d @ %d\n", i, width, height, iconDirEntries[i].wBitCount); + if (height != width) + continue; slot = size_to_slot(width); if (slot < 0) continue;

1 0

Ken Thomases : winemenubuilder: On Mac, size is implicit in ICNS slot; don' t search for best.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: e72a37e9604ae1a14d4928abbe7551aac8c38cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72a37e9604ae1a14d4928abb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 12 00:17:30 2011 -0600 winemenubuilder: On Mac, size is implicit in ICNS slot; don't search for best. --- programs/winemenubuilder/winemenubuilder.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8cafce0..56ff158 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -839,7 +839,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico int numEntries; struct { int index; - int maxPixels; int maxBits; } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; @@ -857,7 +856,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico for (i = 0; i < ICNS_SLOTS; i++) { best[i].index = -1; - best[i].maxPixels = 0; best[i].maxBits = 0; } for (i = 0; i < numEntries; i++) @@ -872,11 +870,9 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico slot = size_to_slot(width); if (slot < 0) continue; - if (iconDirEntries[i].wBitCount >= best[slot].maxBits && - (height * width) >= best[slot].maxPixels) + if (iconDirEntries[i].wBitCount >= best[slot].maxBits) { best[slot].index = i; - best[slot].maxPixels = height * width; best[slot].maxBits = iconDirEntries[i].wBitCount; } }

1 0

Dylan Smith : richedit: Clear non-default style when changing to plain text mode.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: d43cddcc8351215eb4f60e1a41439e29261f1268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43cddcc8351215eb4f60e1a4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 12 02:23:40 2011 -0500 richedit: Clear non-default style when changing to plain text mode. Although the text must be empty for the mode to change to plain text mode, there still may be a non-default style for the temporary insert style and style for the end of text run. --- dlls/riched20/editor.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 48b64c9..aace0ea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4332,6 +4332,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { mask |= TM_RICHTEXT | TM_PLAINTEXT; changes |= wParam & (TM_RICHTEXT | TM_PLAINTEXT); + if (wParam & TM_PLAINTEXT) { + /* Clear selection since it should be possible to select the + * end of text run for rich text */ + ME_InvalidateSelection(editor); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + editor->pCursors[1] = editor->pCursors[0]; + /* plain text can only have the default style. */ + ME_ClearTempStyle(editor); + ME_AddRefStyle(editor->pBuffer->pDefaultStyle); + ME_ReleaseStyle(editor->pCursors[0].pRun->member.run.style); + editor->pCursors[0].pRun->member.run.style = editor->pBuffer->pDefaultStyle; + } } /* FIXME: Currently no support for undo level and code page options */ editor->mode = (editor->mode & ~mask) | changes;

1 0

Andrew Nguyen : advapi32: Convert the trustee name buffer based on trustee form in SetEntriesInAclA.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 97fa635fc71d80252445e4f3c5d42a93c90c586b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fa635fc71d80252445e4f3c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 11 23:37:51 2011 -0600 advapi32: Convert the trustee name buffer based on trustee form in SetEntriesInAclA. --- dlls/advapi32/security.c | 178 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 142 insertions(+), 36 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 629a264..de090dc 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3515,6 +3515,114 @@ BOOL WINAPI SetAclInformation( PACL pAcl, LPVOID pAclInformation, return TRUE; } +DWORD trustee_name_A_to_W(TRUSTEE_FORM form, char *trustee_nameA, WCHAR **ptrustee_nameW) +{ + DWORD len; + + switch (form) + { + case TRUSTEE_IS_NAME: + { + WCHAR *wstr = NULL; + + if (trustee_nameA) + { + len = MultiByteToWideChar( CP_ACP, 0, trustee_nameA, -1, NULL, 0 ); + if (!(wstr = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return ERROR_NOT_ENOUGH_MEMORY; + + MultiByteToWideChar( CP_ACP, 0, trustee_nameA, -1, wstr, len ); + } + + *ptrustee_nameW = wstr; + return ERROR_SUCCESS; + } + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + OBJECTS_AND_NAME_A *objA = (OBJECTS_AND_NAME_A *)trustee_nameA; + OBJECTS_AND_NAME_W *objW = NULL; + + if (objA) + { + if (!(objW = HeapAlloc( GetProcessHeap(), 0, sizeof(OBJECTS_AND_NAME_W) ))) + return ERROR_NOT_ENOUGH_MEMORY; + + objW->ObjectsPresent = objA->ObjectsPresent; + objW->ObjectType = objA->ObjectType; + objW->ObjectTypeName = NULL; + objW->InheritedObjectTypeName = NULL; + objW->ptstrName = NULL; + + if (objA->ObjectTypeName) + { + len = MultiByteToWideChar( CP_ACP, 0, objA->ObjectTypeName, -1, NULL, 0 ); + if (!(objW->ObjectTypeName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + goto error; + MultiByteToWideChar( CP_ACP, 0, objA->ObjectTypeName, -1, objW->ObjectTypeName, len ); + } + + if (objA->InheritedObjectTypeName) + { + len = MultiByteToWideChar( CP_ACP, 0, objA->InheritedObjectTypeName, -1, NULL, 0 ); + if (!(objW->InheritedObjectTypeName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + goto error; + MultiByteToWideChar( CP_ACP, 0, objA->InheritedObjectTypeName, -1, objW->InheritedObjectTypeName, len ); + } + + if (objA->ptstrName) + { + len = MultiByteToWideChar( CP_ACP, 0, objA->ptstrName, -1, NULL, 0 ); + if (!(objW->ptstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + goto error; + MultiByteToWideChar( CP_ACP, 0, objA->ptstrName, -1, objW->ptstrName, len ); + } + } + + *ptrustee_nameW = (WCHAR *)objW; + return ERROR_SUCCESS; +error: + HeapFree( GetProcessHeap(), 0, objW->InheritedObjectTypeName ); + HeapFree( GetProcessHeap(), 0, objW->ObjectTypeName ); + HeapFree( GetProcessHeap(), 0, objW ); + return ERROR_NOT_ENOUGH_MEMORY; + } + /* These forms do not require conversion. */ + case TRUSTEE_IS_SID: + case TRUSTEE_IS_OBJECTS_AND_SID: + *ptrustee_nameW = (WCHAR *)trustee_nameA; + return ERROR_SUCCESS; + default: + return ERROR_INVALID_PARAMETER; + } +} + +void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW) +{ + switch (form) + { + case TRUSTEE_IS_NAME: + HeapFree( GetProcessHeap(), 0, trustee_nameW ); + break; + case TRUSTEE_IS_OBJECTS_AND_NAME: + { + OBJECTS_AND_NAME_W *objW = (OBJECTS_AND_NAME_W *)trustee_nameW; + + if (objW) + { + HeapFree( GetProcessHeap(), 0, objW->ptstrName ); + HeapFree( GetProcessHeap(), 0, objW->InheritedObjectTypeName ); + HeapFree( GetProcessHeap(), 0, objW->ObjectTypeName ); + HeapFree( GetProcessHeap(), 0, objW ); + } + + break; + } + /* Other forms did not require allocation, so no freeing is necessary. */ + default: + break; + } +} + /****************************************************************************** * SetEntriesInAclA [ADVAPI32.@] */ @@ -3522,7 +3630,8 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, PACL OldAcl, PACL* NewAcl ) { DWORD err = ERROR_SUCCESS; - PEXPLICIT_ACCESSW pEntriesW; + EXPLICIT_ACCESSW *pEntriesW; + int alloc_index, free_index; TRACE("%d %p %p %p\n", count, pEntries, OldAcl, NewAcl); @@ -3532,46 +3641,43 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, if (!count && !OldAcl) return ERROR_SUCCESS; - pEntriesW = HeapAlloc( GetProcessHeap(), 0, count*sizeof(EXPLICIT_ACCESSW) ); - if (pEntriesW) - { - int i, len; - LPWSTR wstr = NULL; - PEXPLICIT_ACCESSW ptrW = pEntriesW; - PEXPLICIT_ACCESSA ptrA = pEntries; + pEntriesW = HeapAlloc( GetProcessHeap(), 0, count * sizeof(EXPLICIT_ACCESSW) ); + if (!pEntriesW) + return ERROR_NOT_ENOUGH_MEMORY; - for (i = 0; i < count; ++i, ++ptrA, ++ptrW) + for (alloc_index = 0; alloc_index < count; ++alloc_index) + { + pEntriesW[alloc_index].grfAccessPermissions = pEntries[alloc_index].grfAccessPermissions; + pEntriesW[alloc_index].grfAccessMode = pEntries[alloc_index].grfAccessMode; + pEntriesW[alloc_index].grfInheritance = pEntries[alloc_index].grfInheritance; + pEntriesW[alloc_index].Trustee.pMultipleTrustee = NULL; /* currently not supported */ + pEntriesW[alloc_index].Trustee.MultipleTrusteeOperation = pEntries[alloc_index].Trustee.MultipleTrusteeOperation; + pEntriesW[alloc_index].Trustee.TrusteeForm = pEntries[alloc_index].Trustee.TrusteeForm; + pEntriesW[alloc_index].Trustee.TrusteeType = pEntries[alloc_index].Trustee.TrusteeType; + + err = trustee_name_A_to_W( pEntries[alloc_index].Trustee.TrusteeForm, + pEntries[alloc_index].Trustee.ptstrName, + &pEntriesW[alloc_index].Trustee.ptstrName ); + if (err != ERROR_SUCCESS) { - ptrW->grfAccessPermissions = ptrA->grfAccessPermissions; - ptrW->grfAccessMode = ptrA->grfAccessMode; - ptrW->grfInheritance = ptrA->grfInheritance; - ptrW->Trustee.pMultipleTrustee = NULL; /* currently not supported */ - ptrW->Trustee.MultipleTrusteeOperation = ptrA->Trustee.MultipleTrusteeOperation; - ptrW->Trustee.TrusteeForm = ptrA->Trustee.TrusteeForm; - ptrW->Trustee.TrusteeType = ptrA->Trustee.TrusteeType; - wstr = NULL; - if (ptrA->Trustee.ptstrName) - { - len = MultiByteToWideChar( CP_ACP, 0, ptrA->Trustee.ptstrName, -1, NULL, 0 ); - wstr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, ptrA->Trustee.ptstrName, -1, wstr, len ); - } - ptrW->Trustee.ptstrName = wstr; - } - - err = SetEntriesInAclW( count, pEntriesW, OldAcl, NewAcl ); + if (err == ERROR_INVALID_PARAMETER) + WARN("bad trustee form %d for trustee %d\n", + pEntries[alloc_index].Trustee.TrusteeForm, alloc_index); - ptrW = pEntriesW; - for (i = 0; i < count; ++i, ++ptrW) - { - HeapFree( GetProcessHeap(), 0, ptrW->Trustee.ptstrName ); + goto cleanup; } - HeapFree( GetProcessHeap(), 0, pEntriesW ); - } - else - { - err = ERROR_NOT_ENOUGH_MEMORY; } + + err = SetEntriesInAclW( count, pEntriesW, OldAcl, NewAcl ); + +cleanup: + /* Free any previously allocated trustee name buffers, taking into account + * a possible out-of-memory condition while building the EXPLICIT_ACCESSW + * list. */ + for (free_index = 0; free_index < alloc_index; ++free_index) + free_trustee_name( pEntriesW[free_index].Trustee.TrusteeForm, pEntriesW[free_index].Trustee.ptstrName ); + + HeapFree( GetProcessHeap(), 0, pEntriesW ); return err; }

1 0

Alexandre Julliard : dbghelp: Try to load the string table from file number 4 too.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 530e9c9b175c03f7592eaabdf8c34f45be50117a URL: http://source.winehq.org/git/wine.git/?a=commit;h=530e9c9b175c03f7592eaabdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 11 20:34:46 2011 +0100 dbghelp: Try to load the string table from file number 4 too. --- dlls/dbghelp/msc.c | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 93eef21..0514bc9 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2119,12 +2119,8 @@ static void* pdb_read_ds_file(const struct PDB_DS_HEADER* pdb, DWORD i; if (!toc || file_nr >= toc->num_files) return NULL; + if (toc->file_size[file_nr] == 0 || toc->file_size[file_nr] == 0xFFFFFFFF) return NULL; - if (toc->file_size[file_nr] == 0 || toc->file_size[file_nr] == 0xFFFFFFFF) - { - FIXME(">>> requesting NULL stream (%u)\n", file_nr); - return NULL; - } block_list = &toc->file_size[toc->num_files]; for (i = 0; i < file_nr; i++) block_list += (toc->file_size[i] + pdb->block_size - 1) / pdb->block_size; @@ -2177,6 +2173,23 @@ static void pdb_free_file(struct pdb_file_info* pdb_file) } } +static void* pdb_read_strings(const struct pdb_file_info* pdb_file) +{ + void *ret; + + /* FIXME: how to determine the correct file number? */ + /* 4 and 12 have been observed, there may be others */ + + ret = pdb_read_file( pdb_file, 4 ); + if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; + pdb_free( ret ); + ret = pdb_read_file( pdb_file, 12 ); + if (ret && *(const DWORD *)ret == 0xeffeeffe) return ret; + pdb_free( ret ); + WARN("string table not found\n"); + return NULL; +} + static void pdb_module_remove(struct process* pcsn, struct module_format* modfmt) { unsigned i; @@ -2596,20 +2609,8 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } - files_image = pdb_read_file(pdb_file, 12); /* FIXME: really fixed ??? */ - if (files_image) - { - if (*(const DWORD*)files_image == 0xeffeeffe) - { - files_size = *(const DWORD*)(files_image + 8); - } - else - { - WARN("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)files_image); - pdb_free(files_image); - files_image = NULL; - } - } + files_image = pdb_read_strings(pdb_file); + if (files_image) files_size = *(const DWORD*)(files_image + 8); pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, pdb_lookup, pdb_module_info, module_index); @@ -3015,13 +3016,8 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, TRACE("searching %lx => %lx\n", ip, ip - (DWORD_PTR)pair.effective->module.BaseOfImage); ip -= (DWORD_PTR)pair.effective->module.BaseOfImage; - strbase = pdb_read_file(&pdb_info->pdb_files[0], 12); /* FIXME: really fixed index ??? */ + strbase = pdb_read_strings(&pdb_info->pdb_files[0]); if (!strbase) return FALSE; - if (*(const DWORD*)strbase != 0xeffeeffe) - { - pdb_free(strbase); - return FALSE; - } strsize = *(const DWORD*)(strbase + 8); fpoext = pdb_read_file(&pdb_info->pdb_files[0], 10); size = pdb_get_file_size(&pdb_info->pdb_files[0], 10);

1 0

Alexandre Julliard : winedump: Try to load the PDB string table from file number 4 too.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 4f574ee942be99c7401a3bef472a81d0f2bb0b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f574ee942be99c7401a3bef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 10:45:54 2011 +0100 winedump: Try to load the PDB string table from file number 4 too. --- tools/winedump/pdb.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 5720c40..1b7beeb 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -155,6 +155,21 @@ static void pdb_exit(struct pdb_reader* reader) free((char*)reader->u.ds.toc); } +static void *read_string_table(struct pdb_reader* reader) +{ + void *ret; + + /* FIXME: how to determine the correct file number? */ + /* 4 and 12 have been observed, there may be others */ + ret = reader->read_file(reader, 4); + if (ret && *(const DWORD*)ret == 0xeffeeffe) return ret; + free( ret ); + ret = reader->read_file(reader, 12); + if (ret && *(const DWORD*)ret == 0xeffeeffe) return ret; + free( ret ); + return NULL; +} + static void pdb_dump_symbols(struct pdb_reader* reader) { PDB_SYMBOLS* symbols; @@ -224,20 +239,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader) dump_data(src, symbols->offset_size, " "); } - filesimage = reader->read_file(reader, 12); /* FIXME: really fixed ??? */ - if (filesimage) - { - if (*(const DWORD*)filesimage == 0xeffeeffe) - { - filessize = *(const DWORD*)(filesimage + 8); - } - else - { - printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)filesimage); - free(filesimage); - filesimage = NULL; - } - } + if (!(filesimage = read_string_table(reader))) printf("string table not found\n"); + else filessize = *(const DWORD*)(filesimage + 8); if (symbols->srcmodule_size) { @@ -721,6 +724,7 @@ static void pdb_ds_dump(void) * 1: root structure * 2: types * 3: modules + * 4: string table (FIXME: in which case?) * 5: FPO data * 8: segments * 10: extended FPO data

1 0

Michael Stefaniuc : urlmon: COM cleanup for the IInternetProtocolEx iface.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: c41cf7d6a5c22bd22aac842995bed46c7867ab44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41cf7d6a5c22bd22aac84299… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 00:43:44 2011 +0100 urlmon: COM cleanup for the IInternetProtocolEx iface. --- dlls/urlmon/binding.c | 24 +++++++------ dlls/urlmon/bindprot.c | 87 +++++++++++++++++++++++---------------------- dlls/urlmon/session.c | 2 +- dlls/urlmon/urlmon_main.h | 4 +-- 4 files changed, 59 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41cf7d6a5c22bd22aac8…

1 0

Michael Stefaniuc : urlmon: COM cleanup for the rest of the iface in BindProtocol.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 1515b36aaafd851dbe86aec71dee2aed296e098e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1515b36aaafd851dbe86aec71… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 00:47:19 2011 +0100 urlmon: COM cleanup for the rest of the iface in BindProtocol. --- dlls/urlmon/bindprot.c | 127 +++++++++++++++++++++++---------------------- dlls/urlmon/urlmon_main.h | 10 ++-- 2 files changed, 70 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1515b36aaafd851dbe86a…

1 0

Andrew Nguyen : kernel32: Improve parameter validation for ReadConsoleOutputCharacterW.
by Alexandre Julliard 11 Jan '11

11 Jan '11

Module: wine Branch: master Commit: c905b7e705edac861dd3bd3b01ce894060f9e8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c905b7e705edac861dd3bd3b0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 11 05:11:16 2011 -0600 kernel32: Improve parameter validation for ReadConsoleOutputCharacterW. --- dlls/kernel32/console.c | 12 ++++- dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9589cfc..8ad0a39 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -862,6 +862,14 @@ BOOL WINAPI ReadConsoleOutputCharacterW( HANDLE hConsoleOutput, LPWSTR buffer, D TRACE( "(%p,%p,%d,%dx%d,%p)\n", hConsoleOutput, buffer, count, coord.X, coord.Y, read_count ); + if (!read_count) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *read_count = 0; + SERVER_START_REQ( read_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -871,9 +879,7 @@ BOOL WINAPI ReadConsoleOutputCharacterW( HANDLE hConsoleOutput, LPWSTR buffer, D req->wrap = TRUE; wine_server_set_reply( req, buffer, count * sizeof(WCHAR) ); if ((ret = !wine_server_call_err( req ))) - { - if (read_count) *read_count = wine_server_reply_size(reply) / sizeof(WCHAR); - } + *read_count = wine_server_reply_size(reply) / sizeof(WCHAR); } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index fa26136..aa193b1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1855,6 +1855,90 @@ static void test_FillConsoleOutputAttribute(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_ReadConsoleOutputCharacterW(HANDLE output_handle) +{ + WCHAR read; + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + LPWSTR buffer; + DWORD length; + COORD coord; + LPDWORD read_count; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, + {NULL, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, + {INVALID_HANDLE_VALUE, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 10, origin, &count, 10, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].read_count) count = 0xdeadbeef; + ret = ReadConsoleOutputCharacterW(invalid_table[i].hConsoleOutput, + invalid_table[i].buffer, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].read_count); + ok(!ret, "[%d] Expected ReadConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].read_count) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = ReadConsoleOutputCharacterW(output_handle, NULL, 0, origin, &count); + ok(ret == TRUE, "Expected ReadConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = ReadConsoleOutputCharacterW(output_handle, &read, 0, origin, &count); + ok(ret == TRUE, "Expected ReadConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = ReadConsoleOutputCharacterW(output_handle, &read, 1, origin, &count); + ok(ret == TRUE, "Expected ReadConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -1969,4 +2053,5 @@ START_TEST(console) test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); test_FillConsoleOutputAttribute(hConOut); + test_ReadConsoleOutputCharacterW(hConOut); }

1 0