wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

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: 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

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

Henri Verbeet : wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view.
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 098cdf4ae390f378357a6ce17f678ccbe5e7b210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098cdf4ae390f378357a6ce17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:30 2011 +0100 wined3d: Store an IWineD3DResourceImpl pointer in struct wined3d_rendertarget_view. --- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 28dc401..2b98de3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -65,7 +65,7 @@ static ULONG STDMETHODCALLTYPE rendertarget_view_Release(IWineD3DRendertargetVie if (!refcount) { - IWineD3DResource_Release(This->resource); + IWineD3DResource_Release((IWineD3DResource *)This->resource); HeapFree(GetProcessHeap(), 0, This); } @@ -88,8 +88,8 @@ static HRESULT STDMETHODCALLTYPE rendertarget_view_GetResource(IWineD3DRendertar { struct wined3d_rendertarget_view *This = (struct wined3d_rendertarget_view *)iface; - IWineD3DResource_AddRef(This->resource); - *resource = This->resource; + IWineD3DResource_AddRef((IWineD3DResource *)This->resource); + *resource = (IWineD3DResource *)This->resource; return WINED3D_OK; } @@ -112,6 +112,6 @@ void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, view->vtbl = &wined3d_rendertarget_view_vtbl; view->refcount = 1; IWineD3DResource_AddRef((IWineD3DResource *)resource); - view->resource = (IWineD3DResource *)resource; + view->resource = resource; view->parent = parent; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e53d1a1..65db699 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2569,7 +2569,7 @@ struct wined3d_rendertarget_view const struct IWineD3DRendertargetViewVtbl *vtbl; LONG refcount; - IWineD3DResource *resource; + struct IWineD3DResourceImpl *resource; void *parent; };

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to wined3d_rendertarget_view_init().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: e42e5247dd3548936d938897d865efc885e479ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42e5247dd3548936d938897d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:29 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to wined3d_rendertarget_view_init(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a225e53..a099c90 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,7 +1088,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateRendertargetView(IWineD3DDevice * return E_OUTOFMEMORY; } - wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, (IWineD3DResourceImpl *)resource, parent); TRACE("Created render target view %p.\n", object); *rendertarget_view = (IWineD3DRendertargetView *)object; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e4e40fc..28dc401 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -107,11 +107,11 @@ static const struct IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl }; void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) + struct IWineD3DResourceImpl *resource, void *parent) { view->vtbl = &wined3d_rendertarget_view_vtbl; view->refcount = 1; - IWineD3DResource_AddRef(resource); - view->resource = resource; + IWineD3DResource_AddRef((IWineD3DResource *)resource); + view->resource = (IWineD3DResource *)resource; view->parent = parent; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb39dad..e53d1a1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2574,7 +2574,7 @@ struct wined3d_rendertarget_view }; void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - IWineD3DResource *resource, void *parent) DECLSPEC_HIDDEN; + struct IWineD3DResourceImpl *resource, void *parent) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown)

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded().
by Alexandre Julliard 18 Jan '11

18 Jan '11

Module: wine Branch: master Commit: 2ceb2a8cdd2c79b40b3d3a65ad5bb0d4b9d73965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ceb2a8cdd2c79b40b3d3a65a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 17 18:49:28 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_unloaded(). --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/resource.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c001577..40fd2e3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -711,7 +711,8 @@ static void context_detach_fbo_entry(struct wined3d_context *context, struct fbo entry->attached = FALSE; } -void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +void context_resource_unloaded(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) { switch (type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 370861e..623706f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -125,8 +125,8 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource) void resource_unload(IWineD3DResourceImpl *resource) { - context_resource_unloaded(resource->resource.device, (IWineD3DResource *)resource, - resource->resource.resourceType); + context_resource_unloaded(resource->resource.device, + resource, resource->resource.resourceType); } static struct private_data *resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dcb461..fb39dad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1230,8 +1230,8 @@ DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; -void context_resource_unloaded(IWineD3DDeviceImpl *device, - IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; +void context_resource_unloaded(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;

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

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@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

Stefan Dösinger : wined3d: Don' t set cube and volume POW2 caps if np2 textures are supported.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e98a0e5bb1d1d3cdd2ab76313726d2567f8a79b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a0e5bb1d1d3cdd2ab76313… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Nov 21 18:08:41 2010 +0100 wined3d: Don't set cube and volume POW2 caps if np2 textures are supported. --- dlls/wined3d/directx.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da179a7..e39bd3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4343,16 +4343,21 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if (gl_info->supported[EXT_TEXTURE3D]) { pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | - WINED3DPTEXTURECAPS_MIPVOLUMEMAP | - WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + WINED3DPTEXTURECAPS_MIPVOLUMEMAP; + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + { + pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + } } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | - WINED3DPTEXTURECAPS_MIPCUBEMAP | - WINED3DPTEXTURECAPS_CUBEMAP_POW2; - + WINED3DPTEXTURECAPS_MIPCUBEMAP; + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + { + pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; + } } pCaps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR |

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

← Newer
1
...
35
36
37
38
39
40
41
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011