January 2011 - Wine-commits

Henri Verbeet : wined3d: Store an IWineD3DClipperImpl pointer in IWineD3DSurfaceImpl.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: d91a413ade2fd1de9bb2a44ecff13edf76c4ca98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91a413ade2fd1de9bb2a44ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:31 2011 +0100 wined3d: Store an IWineD3DClipperImpl pointer in IWineD3DSurfaceImpl. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/surface_base.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8eedb90..7e19a02 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3507,16 +3507,16 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *dst_surface, } /* Destination must be full surface or match the clipping rectangle */ - if (dst_surface->clipper && ((IWineD3DClipperImpl *)dst_surface->clipper)->hWnd) + if (dst_surface->clipper && dst_surface->clipper->hWnd) { RECT cliprect; POINT pos[2]; - GetClientRect(((IWineD3DClipperImpl *)dst_surface->clipper)->hWnd, &cliprect); + GetClientRect(dst_surface->clipper->hWnd, &cliprect); pos[0].x = dst_rect.left; pos[0].y = dst_rect.top; pos[1].x = dst_rect.right; pos[1].y = dst_rect.bottom; - MapWindowPoints(GetDesktopWindow(), ((IWineD3DClipperImpl *)dst_surface->clipper)->hWnd, pos, 2); + MapWindowPoints(GetDesktopWindow(), dst_surface->clipper->hWnd, pos, 2); if(pos[0].x != cliprect.left || pos[0].y != cliprect.top || pos[1].x != cliprect.right || pos[1].y != cliprect.bottom) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index ae0643e..4449bf0 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -471,7 +471,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, IWineD IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; TRACE("(%p)->(%p)\n", This, clipper); - This->clipper = clipper; + This->clipper = (IWineD3DClipperImpl *)clipper; return WINED3D_OK; } @@ -480,10 +480,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; TRACE("(%p)->(%p)\n", This, clipper); - *clipper = This->clipper; - if(*clipper) { + *clipper = (IWineD3DClipper *)This->clipper; + if (*clipper) IWineD3DClipper_AddRef(*clipper); - } + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65db699..b1202f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2140,7 +2140,7 @@ struct IWineD3DSurfaceImpl SIZE ds_current_size; /* DirectDraw clippers */ - IWineD3DClipper *clipper; + struct IWineD3DClipperImpl *clipper; /* DirectDraw Overlay handling */ RECT overlay_srcrect;

1 0

Eric Pouech : winedump: Force the PDB_?? _ROOT to always be present in reader object.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: b7635f96ff9a338221fa6558008981572a525aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7635f96ff9a338221fa65580… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:08 2011 +0100 winedump: Force the PDB_??_ROOT to always be present in reader object. --- tools/winedump/pdb.c | 100 +++++++++++++++++++++++++------------------------ 1 files changed, 51 insertions(+), 49 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 1b7beeb..5bfdfb8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -54,11 +54,13 @@ struct pdb_reader { const struct PDB_JG_HEADER* header; const struct PDB_JG_TOC* toc; + const struct PDB_JG_ROOT* root; } jg; struct { const struct PDB_DS_HEADER* header; const struct PDB_DS_TOC* toc; + const struct PDB_DS_ROOT* root; } ds; } u; void* (*read_file)(struct pdb_reader*, DWORD); @@ -150,9 +152,15 @@ static void pdb_exit(struct pdb_reader* reader) } #endif if (reader->read_file == pdb_jg_read_file) + { + free((char*)reader->u.jg.root); free((char*)reader->u.jg.toc); + } else + { + free((char*)reader->u.ds.root); free((char*)reader->u.ds.toc); + } } static void *read_string_table(struct pdb_reader* reader) @@ -571,7 +579,6 @@ static const char pdb2[] = "Microsoft C/C++ program database 2.00"; static void pdb_jg_dump(void) { struct pdb_reader reader; - struct PDB_JG_ROOT* root = NULL; /* * Read in TOC and well-known files @@ -589,23 +596,22 @@ static void pdb_jg_dump(void) reader.u.jg.header->free_list, reader.u.jg.header->total_alloc); - root = reader.read_file(&reader, 1); - - if (root) + reader.u.jg.root = reader.read_file(&reader, 1); + if (reader.u.jg.root) { printf("Root:\n" "\tVersion: %u\n" "\tTimeDateStamp: %08x\n" "\tAge: %08x\n" "\tnames: %.*s\n", - root->Version, - root->TimeDateStamp, - root->Age, - (unsigned)root->cbNames, - root->names); + reader.u.jg.root->Version, + reader.u.jg.root->TimeDateStamp, + reader.u.jg.root->Age, + (unsigned)reader.u.jg.root->cbNames, + reader.u.jg.root->names); /* Check for unknown versions */ - switch (root->Version) + switch (reader.u.jg.root->Version) { case 19950623: /* VC 4.0 */ case 19950814: @@ -613,37 +619,36 @@ static void pdb_jg_dump(void) case 19970604: /* VC 6.0 */ break; default: - printf("-Unknown root block version %d\n", root->Version); + printf("-Unknown root block version %d\n", reader.u.jg.root->Version); } - free(root); - } - else printf("-Unable to get root\n"); - - pdb_dump_types(&reader); + pdb_dump_types(&reader); #if 0 - /* segments info, index is unknown */ - { - const void* segs = pdb_read_file(pdb, toc, 8); /* FIXME which index ??? */ - const void* ptr = segs; - - if (segs) while (ptr < segs + toc->file[8].size) + /* segments info, index is unknown */ { - printf("Segment %s\n", (const char*)ptr); - ptr += (strlen(ptr) + 1 + 3) & ~3; - printf("\tdword[0]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[1]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[2]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[3]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[4]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[5]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[6]: %08lx\n", *(DWORD*)ptr); ptr += 4; - printf("\tdword[7]: %08lx\n", *(DWORD*)ptr); ptr += 4; + const void* segs = pdb_read_file(pdb, toc, 8); /* FIXME which index ??? */ + const void* ptr = segs; + + if (segs) while (ptr < segs + toc->file[8].size) + { + printf("Segment %s\n", (const char*)ptr); + ptr += (strlen(ptr) + 1 + 3) & ~3; + printf("\tdword[0]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[1]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[2]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[3]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[4]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[5]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[6]: %08lx\n", *(DWORD*)ptr); ptr += 4; + printf("\tdword[7]: %08lx\n", *(DWORD*)ptr); ptr += 4; + } + free(segs); } - free(segs); - } #endif - pdb_dump_symbols(&reader); + pdb_dump_symbols(&reader); + } + else printf("-Unable to get root\n"); + pdb_exit(&reader); } @@ -700,7 +705,6 @@ static const char pdb7[] = "Microsoft C/C++ MSF 7.00"; static void pdb_ds_dump(void) { struct pdb_reader reader; - struct PDB_DS_ROOT* root; pdb_ds_init(&reader); printf("Header (DS)\n" @@ -730,8 +734,8 @@ static void pdb_ds_dump(void) * 10: extended FPO data * 12: string table (FPO unwinder, files for linetab2...) */ - root = reader.read_file(&reader, 1); - if (root) + reader.u.ds.root = reader.read_file(&reader, 1); + if (reader.u.ds.root) { const char* ptr; @@ -741,22 +745,20 @@ static void pdb_ds_dump(void) "\tAge: %08x\n" "\tguid %s\n" "\tcbNames: %08x\n", - root->Version, - root->TimeDateStamp, - root->Age, - get_guid_str(&root->guid), - root->cbNames); - for (ptr = &root->names[0]; ptr < &root->names[0] + root->cbNames; ptr += strlen(ptr) + 1) + reader.u.ds.root->Version, + reader.u.ds.root->TimeDateStamp, + reader.u.ds.root->Age, + get_guid_str(&reader.u.ds.root->guid), + reader.u.ds.root->cbNames); + for (ptr = &reader.u.ds.root->names[0]; ptr < &reader.u.ds.root->names[0] + reader.u.ds.root->cbNames; ptr += strlen(ptr) + 1) printf("\tString: %s\n", ptr); /* follows an unknown list of DWORDs */ - free(root); + pdb_dump_types(&reader); + pdb_dump_symbols(&reader); + pdb_dump_fpo(&reader); } else printf("-Unable to get root\n"); - pdb_dump_types(&reader); - pdb_dump_symbols(&reader); - pdb_dump_fpo(&reader); - pdb_exit(&reader); }

1 0

Eric Pouech : winedump: Dump streams names information out of ROOT object.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 40fb62c99f79a151d0b92db6a0da51926c389661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fb62c99f79a151d0b92db6a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:14 2011 +0100 winedump: Dump streams names information out of ROOT object. --- tools/winedump/pdb.c | 81 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 73 insertions(+), 8 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 5bfdfb8..e508530 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -599,16 +599,51 @@ static void pdb_jg_dump(void) reader.u.jg.root = reader.read_file(&reader, 1); if (reader.u.jg.root) { + DWORD* pdw; + DWORD* ok_bits; + DWORD numok, count; + unsigned i; + printf("Root:\n" "\tVersion: %u\n" "\tTimeDateStamp: %08x\n" "\tAge: %08x\n" - "\tnames: %.*s\n", + "\tnames: %d\n", reader.u.jg.root->Version, reader.u.jg.root->TimeDateStamp, reader.u.jg.root->Age, - (unsigned)reader.u.jg.root->cbNames, - reader.u.jg.root->names); + (unsigned)reader.u.jg.root->cbNames); + + pdw = (DWORD*)(&reader.u.jg.root->names[0] + reader.u.jg.root->cbNames); + numok = *pdw++; + count = *pdw++; + printf("\tStreams directory:\n" + "\t\tok: %08x\n" + "\t\tcount: %08x\n" + "\t\ttable:\n", + numok, count); + + /* bitfield: first dword is len (in dword), then data */ + ok_bits = pdw; + pdw += *ok_bits++ + 1; + if (*pdw++ != 0) + { + printf("unexpected value\n"); + return; + } + + for (i = 0; i < count; i++) + { + if (ok_bits[i / 32] & (1 << (i % 32))) + { + DWORD string_idx, stream_idx; + string_idx = *pdw++; + stream_idx = *pdw++; + printf("\t\t\t%2d) %-20s => %x\n", i, &reader.u.jg.root->names[string_idx], stream_idx); + numok--; + } + } + if (numok) printf(">>> unmatched present field with found\n"); /* Check for unknown versions */ switch (reader.u.jg.root->Version) @@ -644,7 +679,6 @@ static void pdb_jg_dump(void) free(segs); } #endif - pdb_dump_symbols(&reader); } else printf("-Unable to get root\n"); @@ -737,7 +771,10 @@ static void pdb_ds_dump(void) reader.u.ds.root = reader.read_file(&reader, 1); if (reader.u.ds.root) { - const char* ptr; + DWORD* pdw; + DWORD* ok_bits; + DWORD numok, count; + unsigned i; printf("Root:\n" "\tVersion: %u\n" @@ -750,9 +787,37 @@ static void pdb_ds_dump(void) reader.u.ds.root->Age, get_guid_str(&reader.u.ds.root->guid), reader.u.ds.root->cbNames); - for (ptr = &reader.u.ds.root->names[0]; ptr < &reader.u.ds.root->names[0] + reader.u.ds.root->cbNames; ptr += strlen(ptr) + 1) - printf("\tString: %s\n", ptr); - /* follows an unknown list of DWORDs */ + pdw = (DWORD*)(&reader.u.ds.root->names[0] + reader.u.ds.root->cbNames); + numok = *pdw++; + count = *pdw++; + printf("\tStreams directory:\n" + "\t\tok: %08x\n" + "\t\tcount: %08x\n" + "\t\ttable:\n", + numok, count); + + /* bitfield: first dword is len (in dword), then data */ + ok_bits = pdw; + pdw += *ok_bits++ + 1; + if (*pdw++ != 0) + { + printf("unexpected value\n"); + return; + } + + for (i = 0; i < count; i++) + { + if (ok_bits[i / 32] & (1 << (i % 32))) + { + DWORD string_idx, stream_idx; + string_idx = *pdw++; + stream_idx = *pdw++; + printf("\t\t\t%2d) %-20s => %x\n", i, &reader.u.ds.root->names[string_idx], stream_idx); + numok--; + } + } + if (numok) printf(">>> unmatched present field with found\n"); + pdb_dump_types(&reader); pdb_dump_symbols(&reader); pdb_dump_fpo(&reader);

1 0

Eric Pouech : winedump: Get string table stream index out of ROOT named streams list.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 2cba84027b4b4ec54141de9942e4bd5cc1a1829c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cba84027b4b4ec54141de994… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:20 2011 +0100 winedump: Get string table stream index out of ROOT named streams list. --- tools/winedump/pdb.c | 71 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 16 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index e508530..cd2eb50 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -163,17 +163,61 @@ static void pdb_exit(struct pdb_reader* reader) } } +static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) +{ + DWORD* pdw; + DWORD* ok_bits; + DWORD cbstr, count; + DWORD string_idx, stream_idx; + unsigned i; + const char* str; + + if (reader->read_file == pdb_jg_read_file) + { + str = &reader->u.jg.root->names[0]; + cbstr = reader->u.jg.root->cbNames; + } + else + { + str = &reader->u.ds.root->names[0]; + cbstr = reader->u.ds.root->cbNames; + } + + pdw = (DWORD*)(str + cbstr); + pdw++; /* number of ok entries */ + count = *pdw++; + + /* bitfield: first dword is len (in dword), then data */ + ok_bits = pdw; + pdw += *ok_bits++ + 1; + if (*pdw++ != 0) + { + printf("unexpected value\n"); + return -1; + } + + for (i = 0; i < count; i++) + { + if (ok_bits[i / 32] & (1 << (i % 32))) + { + string_idx = *pdw++; + stream_idx = *pdw++; + if (!strcmp(name, &str[string_idx])) return stream_idx; + } + } + return -1; +} + static void *read_string_table(struct pdb_reader* reader) { - void *ret; + unsigned stream_idx; + 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); + stream_idx = get_stream_by_name(reader, "/names"); + if (stream_idx == -1) return NULL; + ret = reader->read_file(reader, stream_idx); if (ret && *(const DWORD*)ret == 0xeffeeffe) return ret; + printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)ret); free( ret ); return NULL; } @@ -545,15 +589,9 @@ static void pdb_dump_fpo(struct pdb_reader* reader) } free(fpo); - strbase = reader->read_file(reader, 12); /* FIXME: really fixed ??? */ + strbase = read_string_table(reader); if (!strbase) return; - if (*(const DWORD*)strbase != 0xeffeeffe) - { - printf("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)strbase); - free(strbase); - return; - } strsize = *(const DWORD*)(strbase + 8); fpoext = reader->read_file(reader, 10); size = pdb_get_file_size(reader, 10); @@ -762,11 +800,12 @@ static void pdb_ds_dump(void) * 1: root structure * 2: types * 3: modules - * 4: string table (FIXME: in which case?) + * other known streams: + * string table: it's index is in the stream table from ROOT object under "/names" + * those other streams are likely not to have a fixed stream number * 5: FPO data * 8: segments * 10: extended FPO data - * 12: string table (FPO unwinder, files for linetab2...) */ reader.u.ds.root = reader.read_file(&reader, 1); if (reader.u.ds.root)

1 0

Eric Pouech : winedump: Added stream header support.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 5199d04b42c67efefac25c85a64e7e99cb5d6786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5199d04b42c67efefac25c85a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:25 2011 +0100 winedump: Added stream header support. --- include/wine/mscvpdb.h | 29 +++++++++++++++++++++- tools/winedump/pdb.c | 62 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 83 insertions(+), 8 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 637ed0f..99734c7 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1914,12 +1914,39 @@ typedef struct _PDB_SYMBOLS DWORD hash_size; DWORD srcmodule_size; DWORD pdbimport_size; - DWORD resvd[3]; + DWORD resvd0; + DWORD stream_index_size; + DWORD unknown2_size; WORD resvd3; WORD machine; DWORD resvd4; } PDB_SYMBOLS, *PPDB_SYMBOLS; +typedef struct +{ + WORD FPO; + WORD unk0; + WORD unk1; + WORD unk2; + WORD unk3; + WORD segments; +} PDB_STREAM_INDEXES_OLD; + +typedef struct +{ + WORD FPO; + WORD unk0; + WORD unk1; + WORD unk2; + WORD unk3; + WORD segments; + WORD unk4; + WORD unk5; + WORD unk6; + WORD FPO_EXT; + WORD unk7; +} PDB_STREAM_INDEXES; + typedef struct _PDB_FPO_DATA { DWORD start; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index cd2eb50..0ba5b46 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -257,10 +257,10 @@ static void pdb_dump_symbols(struct pdb_reader* reader) "\thash_size: %08x\n" "\tsrc_module_size: %08x\n" "\tpdbimport_size: %08x\n" - "\tresvd[0] %08x\n" - "\tresvd[1] %08x\n" - "\tresvd[2] %08x\n" - "\tresvd[3] %04x\n" + "\tresvd0: %08x\n" + "\tstream_idx_size: %08x\n" + "\tunknown2_size: %08x\n" + "\tresvd3: %04x\n" "\tmachine: %s\n" "\tresvd[4] %08x\n", symbols->signature, @@ -275,9 +275,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader) symbols->hash_size, symbols->srcmodule_size, symbols->pdbimport_size, - symbols->resvd[0], - symbols->resvd[1], - symbols->resvd[2], + symbols->resvd0, + symbols->stream_index_size, + symbols->unknown2_size, symbols->resvd3, get_machine_str( symbols->machine ), symbols->resvd4); @@ -375,6 +375,54 @@ static void pdb_dump_symbols(struct pdb_reader* reader) imp = (const PDB_SYMBOL_IMPORT*)(first + ((ptr - first + strlen(ptr) + 1 + 3) & ~3)); } } + if (symbols->stream_index_size) + { + const PDB_STREAM_INDEXES_OLD* sidx_old; + const PDB_STREAM_INDEXES* sidx; + + printf("\t------------stream indexes--------------\n"); + switch (symbols->stream_index_size) + { + case sizeof(PDB_STREAM_INDEXES_OLD): + sidx_old = (const PDB_STREAM_INDEXES_OLD*)((const char*)symbols + sizeof(PDB_SYMBOLS) + + symbols->module_size + symbols->offset_size + + symbols->hash_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size); + printf("\tFPO: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\tSegments: %04x\n", + sidx_old->FPO, sidx_old->unk0, sidx_old->unk1, sidx_old->unk2, sidx_old->unk3, + sidx_old->segments); + break; + case sizeof(PDB_STREAM_INDEXES): + sidx = (const PDB_STREAM_INDEXES*)((const char*)symbols + sizeof(PDB_SYMBOLS) + + symbols->module_size + symbols->offset_size + + symbols->hash_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size); + + printf("\tFPO: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\tSegments: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\t?: %04x\n" + "\tFPO-ext: %04x\n" + "\t?: %04x\n", + sidx->FPO, sidx->unk0, sidx->unk1, sidx->unk2, sidx->unk3, + sidx->segments, sidx->unk4, sidx->unk5, sidx->unk6, sidx->FPO_EXT, + sidx->unk7); + break; + default: + printf("unexpected size for stream index %d\n", symbols->stream_index_size); + break; + } + } /* Read global symbol table */ modimage = reader->read_file(reader, symbols->gsym_file);

1 0

Eric Pouech : winedump: Make use of PDB_STREAM_INDEXES in order to get rid of hardwired indexes.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: a7cdc540f3187fa34d1628f8adf3e5b8e48e4d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cdc540f3187fa34d1628f8a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 17 21:53:31 2011 +0100 winedump: Make use of PDB_STREAM_INDEXES in order to get rid of hardwired indexes. --- tools/winedump/pdb.c | 77 +++++++++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 32 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 0ba5b46..9f90c89 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -222,7 +222,7 @@ static void *read_string_table(struct pdb_reader* reader) return NULL; } -static void pdb_dump_symbols(struct pdb_reader* reader) +static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx) { PDB_SYMBOLS* symbols; unsigned char* modimage; @@ -230,8 +230,10 @@ static void pdb_dump_symbols(struct pdb_reader* reader) char* filesimage; DWORD filessize = 0; - symbols = reader->read_file(reader, 3); + sidx->FPO = sidx->unk0 = sidx->unk1 = sidx->unk2 = sidx->unk3 = sidx->segments = + sidx->unk4 = sidx->unk5 = sidx->unk6 = sidx->FPO_EXT = sidx->unk7 = -1; + symbols = reader->read_file(reader, 3); if (!symbols) return; switch (symbols->version) @@ -377,32 +379,33 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } if (symbols->stream_index_size) { - const PDB_STREAM_INDEXES_OLD* sidx_old; - const PDB_STREAM_INDEXES* sidx; - printf("\t------------stream indexes--------------\n"); switch (symbols->stream_index_size) { case sizeof(PDB_STREAM_INDEXES_OLD): - sidx_old = (const PDB_STREAM_INDEXES_OLD*)((const char*)symbols + sizeof(PDB_SYMBOLS) + - symbols->module_size + symbols->offset_size + - symbols->hash_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size); + /* PDB_STREAM_INDEXES is a superset of PDB_STREAM_INDEX_OLD + * FIXME: to be confirmed when all fields are fully understood + */ + memcpy(sidx, + (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + + symbols->offset_size + symbols->hash_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size, + sizeof(PDB_STREAM_INDEXES_OLD)); printf("\tFPO: %04x\n" "\t?: %04x\n" "\t?: %04x\n" "\t?: %04x\n" "\t?: %04x\n" "\tSegments: %04x\n", - sidx_old->FPO, sidx_old->unk0, sidx_old->unk1, sidx_old->unk2, sidx_old->unk3, - sidx_old->segments); + sidx->FPO, sidx->unk0, sidx->unk1, sidx->unk2, sidx->unk3, + sidx->segments); break; case sizeof(PDB_STREAM_INDEXES): - sidx = (const PDB_STREAM_INDEXES*)((const char*)symbols + sizeof(PDB_SYMBOLS) + - symbols->module_size + symbols->offset_size + - symbols->hash_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size); - + memcpy(sidx, + (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + + symbols->offset_size + symbols->hash_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size, + sizeof(*sidx)); printf("\tFPO: %04x\n" "\t?: %04x\n" "\t?: %04x\n" @@ -613,16 +616,15 @@ static void pdb_dump_types(struct pdb_reader* reader) free(types); } -static void pdb_dump_fpo(struct pdb_reader* reader) +static void pdb_dump_fpo(struct pdb_reader* reader, unsigned stream_idx) { FPO_DATA* fpo; - PDB_FPO_DATA* fpoext; - unsigned i, size, strsize; - char* strbase; + unsigned i, size; const char* frame_type[4] = {"Fpo", "Trap", "Tss", "NonFpo"}; - fpo = reader->read_file(reader, 5); - size = pdb_get_file_size(reader, 5); + if (stream_idx == (WORD)-1) return; + fpo = reader->read_file(reader, stream_idx); + size = pdb_get_file_size(reader, stream_idx); if (fpo && (size % sizeof(*fpo)) == 0) { size /= sizeof(*fpo); @@ -636,13 +638,21 @@ static void pdb_dump_fpo(struct pdb_reader* reader) } } free(fpo); +} + +static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) +{ + PDB_FPO_DATA* fpoext; + unsigned i, size, strsize; + char* strbase; + if (stream_idx == (WORD)-1) return; strbase = read_string_table(reader); if (!strbase) return; strsize = *(const DWORD*)(strbase + 8); - fpoext = reader->read_file(reader, 10); - size = pdb_get_file_size(reader, 10); + fpoext = reader->read_file(reader, stream_idx); + size = pdb_get_file_size(reader, stream_idx); if (fpoext && (size % sizeof(*fpoext)) == 0) { size /= sizeof(*fpoext); @@ -689,6 +699,7 @@ static void pdb_jg_dump(void) DWORD* ok_bits; DWORD numok, count; unsigned i; + PDB_STREAM_INDEXES sidx; printf("Root:\n" "\tVersion: %u\n" @@ -743,6 +754,7 @@ static void pdb_jg_dump(void) printf("-Unknown root block version %d\n", reader.u.jg.root->Version); } pdb_dump_types(&reader); + pdb_dump_symbols(&reader, &sidx); #if 0 /* segments info, index is unknown */ { @@ -765,7 +777,6 @@ static void pdb_jg_dump(void) free(segs); } #endif - pdb_dump_symbols(&reader); } else printf("-Unable to get root\n"); @@ -849,11 +860,11 @@ static void pdb_ds_dump(void) * 2: types * 3: modules * other known streams: - * string table: it's index is in the stream table from ROOT object under "/names" - * those other streams are likely not to have a fixed stream number - * 5: FPO data - * 8: segments - * 10: extended FPO data + * - string table: it's index is in the stream table from ROOT object under "/names" + * those streams get their indexes out of the PDB_STREAM_INDEXES object + * - FPO data + * - segments + * - extended FPO data */ reader.u.ds.root = reader.read_file(&reader, 1); if (reader.u.ds.root) @@ -862,6 +873,7 @@ static void pdb_ds_dump(void) DWORD* ok_bits; DWORD numok, count; unsigned i; + PDB_STREAM_INDEXES sidx; printf("Root:\n" "\tVersion: %u\n" @@ -906,8 +918,9 @@ static void pdb_ds_dump(void) if (numok) printf(">>> unmatched present field with found\n"); pdb_dump_types(&reader); - pdb_dump_symbols(&reader); - pdb_dump_fpo(&reader); + pdb_dump_symbols(&reader, &sidx); + pdb_dump_fpo(&reader, sidx.FPO); + pdb_dump_fpo_ext(&reader, sidx.FPO_EXT); } else printf("-Unable to get root\n");

1 0

André Hentschel : Update German Ubuntu download instructions for 10.10 and later
by Jeremy Newman 18 Jan '11

18 Jan '11

Module: website Branch: master Commit: 97e77f618e45e4801a38f5374f4f222e29b9aafe URL: http://source.winehq.org/git/website.git/?a=commit;h=97e77f618e45e4801a38f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 16 18:08:24 2011 +0100 Update German Ubuntu download instructions for 10.10 and later --- templates/de/download.template | 2 +- templates/de/download/deb.template | 62 ++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 4355c5b..8ef08e7 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/download/deb">Ubuntu</a></b> - binär und Quellcode .debs für Ubuntu Lucid (10.04 LTS) + binär und Quellcode .debs für Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), und Natty (11.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index 19cb94f..a437baf 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -2,60 +2,62 @@  <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> -Wine für Ubuntu und Ubuntu Derivate +Wine für Ubuntu und Ubuntu Derivate <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a></h1> <p>Ubuntu und Ubuntu derivate (wie Kubuntu) bekommen ihre Software als <i>Pakete</i> die in <i>Repositories</i> untergebracht sind. Ubuntu's -Standard Repository enthält Wine, wenn du allerdings mit der -neuesten Wine Beta auf dem Laufenden bleiben willst nutze das von -WineHQ mit der folgenden Anleitung. +Standard Repository enthält Wine, wenn du allerdings mit dem +neuesten Wine auf dem Laufenden bleiben willst nutze das von +WineHQ mit folgenden Anleitung. </p> -<h2>Warnung: Diese Pakete sind Betapakete für Ubuntu 10.04 und neuere.</h2> +<h2>Hinzufügen des WineHQ Repository:</h2> -<p><i>Die Pakete hier sind Betapakete. Das bedeutet, dass sie -in regelmäßigen Abständen -<a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch -eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die Version -von Ubuntu bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.</i></p> - -<h2>Hinzufügen des WineHQ Repository:</h2> - -<p>Öffne das Software-Paketquellenmenü durch -<b>System->Systemverwaltung->Software-Paketquellen</b>. Wähle dann den <b>Software -von Drittanbietern</b>-Reiter und klicke auf <b>Hinzufügen</b>.</p> +<p>Öffne das Software-Paketquellenmenü durch +<b>Anwendungen->Software-Center</b>, dann<b>Bearbeiten->Software-Paketquellen...</b>. +Wähle dann den <b>Software von Drittanbietern</b>-Reiter und klicke auf <b>Hinzufügen</b>.</p> <img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> -<p>Dann, <b>copy-paste die untere Zeile</b>.</p> +<p>Dann, <b>kopiere die untere Zeile</b> dort hinein.</p> <i>ppa:ubuntu-wine/ppa</i></p> +<h2>Warnung: Betapakete</h2> + +<p><i>Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie +in regelmäßigen Abständen +<a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch +eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version +Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.</i></p> + <h2>Installieren von Wine:</h2> -<p>Klick auf Schließen zum Beenden, anschließend <b>lade die Paketinformationen neu</b>, wenn -Du dazu aufgefordert wirst. Wenn Du Wine schon installiert hast, wird die Aktualisierungsverwaltung -Dir nun ein Upgrade auf die stabile Wine 1.2 Version anbieten. Um das neueste Wine 1.3 Betarelease zu -bekommen musst du das <i>wine1.3 Paket</i> installieren, oder <a href="apt://wine1.3">diesen Link klicken</a>.</p> +<p>Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren.</p> + +<p><i>Für die aktuellste Wine 1.3 Beta, +<a href="apt://wine1.3">klicke diesen Link um das wine1.3 Paket zu installieren</a>.</i></p> +<p><i>Für die ältere, stabile Wine 1.2 Version, +<a href="apt://wine1.3">klicke diesen Link um das wine1.2 Paket zu installieren</a>.</i></p> <h2>Aktualisierung auf eine neue Ubuntuversion</h2> -<p>Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 10.04 auf -10.10, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. +<p>Wenn Du dein gesamtes System aktualisierst, zum Beispiel von Ubuntu 10.04 auf +10.10, musst Du zu dieser Seite zurückkehren und das Repository nochmal hinzufügen. Die eingebaute Aktualisierungsverwaltung wird das Wine repository nicht automatisch umschalten.</p> -<h2>Alternative Kommandozeileninstruktionen für die Wine-Installation:</h2> +<h2>Alternative Kommandozeileninstruktionen für die Wine-Installation:</h2> -<p>Es ist auch möglich, das Hinzufügen des Wine PPA und die Installation -wie folgt mit der Kommandozeile durchzuführen. -Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu -Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</p> +<p>Es ist auch möglich, das Hinzufügen des Wine PPA und die Installation +wie folgt mit der Kommandozeile durchzuführen. +Die Instruktionen sind nützlich für Kubuntu, Xubuntu und andere Ubuntu +Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</p> <p><i>sudo add-apt-repository ppa:ubuntu-wine/ppa</i></p> -<p>Aktualisiere dann die APT-Paketinformationen durch Ausführen von '<b>sudo apt-get -update</b>'. Du kannst nun Wine durch Ausführen von '<b>sudo apt-get +<p>Aktualisiere dann die APT-Paketinformationen durch Ausführen von '<b>sudo apt-get +update</b>'. Du kannst nun Wine durch Ausführen von '<b>sudo apt-get install wine1.3</b>' im Terminal installieren.</p> <p>Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>.</p>

1 0

André Hentschel : Fix broken link on downloadpage
by Jeremy Newman 18 Jan '11

18 Jan '11

Module: website Branch: master Commit: e9f9c87fe62b6abc3ea65689fae3d84565200446 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9f9c87fe62b6abc3ea656… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 16 18:29:56 2011 +0100 Fix broken link on downloadpage see also http://bugs.winehq.org/show_bug.cgi?id=25783 --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/he/download.template | 2 +- templates/pl/download.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 8ef08e7..7617dce 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -196,7 +196,7 @@ erbeten hat, dass sie die Wine-Website hosten.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…" target="_blank">sourceforge.net</a></td> + <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> <td> Unsere offizielle Website für freigegebenen Quellcode. </td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 724f92f..3a80f23 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -172,7 +172,7 @@ requested in exchange for hosting the Wine web site.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…" target="_blank">sourceforge.net</a></td> + <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> <td> Our official source release site. </td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 61404ff..a428f89 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -188,7 +188,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…" target="_blank">sourceforge.net</a></td> + <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> <td> Site officiel de téléchargement. </td> </tr> diff --git a/templates/he/download.template b/templates/he/download.template index a8fd596..f5d22ae 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -172,7 +172,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…" target="_blank">sourceforge.net</a></td> + <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> <td> אתר הפצת קוד המקור הרשמי שלנו. </td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 2c865d3..fd8910a 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -178,7 +178,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich.</p> </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=7…" target="_blank">sourceforge.net</a></td> + <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> <td> Nasza oficjalna strona źródeł. </td> </tr>

1 0

Greg Geldorp : winhttp/tests: Fix tests when connecting via proxy.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 4745c567f5fb2c7c830760b54e8d232873416cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745c567f5fb2c7c830760b54… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 17 12:37:23 2011 +0100 winhttp/tests: Fix tests when connecting via proxy. --- dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3c725cf..37d71b8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -34,6 +34,25 @@ static const WCHAR test_useragent[] = static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} + static void test_QueryOption(void) { BOOL ret; @@ -796,7 +815,7 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret, "succeeded unexpectedly\n"); + ok(!ret || proxy_active(), "succeeded unexpectedly\n"); size = 0; ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); @@ -1668,28 +1687,33 @@ static void test_resolve_timeout(void) DWORD timeout; BOOL ret; - ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); - ok(ses != NULL, "failed to open session %u\n", GetLastError()); - - timeout = 10000; - ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); - ok(ret, "failed to set resolve timeout %u\n", GetLastError()); + if (! proxy_active()) + { + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); - con = WinHttpConnect(ses, nxdomain, 0, 0); - ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + timeout = 10000; + ret = WinHttpSetOption(ses, WINHTTP_OPTION_RESOLVE_TIMEOUT, &timeout, sizeof(timeout)); + ok(ret, "failed to set resolve timeout %u\n", GetLastError()); - req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); - ok(req != NULL, "failed to open a request %u\n", GetLastError()); + con = WinHttpConnect(ses, nxdomain, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(!ret, "sent request\n"); - ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, - "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); - WinHttpCloseHandle(req); - WinHttpCloseHandle(con); - WinHttpCloseHandle(ses); + SetLastError(0xdeadbeef); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(!ret, "sent request\n"); + ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, + "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); + } + else + skip("Skipping host resolution tests, host resolution preformed by proxy\n"); ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError());

1 0

Jacek Caban : urlmon: Fixed memory leaks in tests.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 31c23ad9b5b47ef16a44d66c401c687532d0d0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c23ad9b5b47ef16a44d66c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 17 14:21:33 2011 +0100 urlmon: Fixed memory leaks in tests. --- dlls/urlmon/tests/url.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 029f203..47b2e79 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -664,6 +664,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, "GetBindString(BINDSTRING_ACCEPT_MIMES) failed: %08x\n", hres); ok(fetched == 1, "fetched = %d, expected 1\n", fetched); ok(!lstrcmpW(wszMimes, accept_mimes[0]), "unexpected mimes\n"); + CoTaskMemFree(accept_mimes[0]); hres = IInternetBindInfo_GetBindString(pOIBindInfo, BINDSTRING_ACCEPT_MIMES, NULL, 256, &fetched); @@ -2921,6 +2922,7 @@ static void test_BindToObject(int protocol, DWORD flags) hres = IMoniker_GetDisplayName(mon, bctx, NULL, &display_name); ok(hres == S_OK, "GetDisplayName failed %08x\n", hres); ok(!lstrcmpW(display_name, urls[test_protocol]), "GetDisplayName got wrong name\n"); + CoTaskMemFree(display_name); SET_EXPECT(QueryInterface_IBindStatusCallbackEx); SET_EXPECT(Obj_GetBindInfo);

1 0