December 2009 - Wine-commits

Huw Davies : riched20: Initialise the style flags.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: d4383b4498af9617c632abe6cb39af0e31e4f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4383b4498af9617c632abe6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:52:02 2009 +0000 riched20: Initialise the style flags. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6790a6a..3dc1133 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2648,6 +2648,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hwndParent = NULL; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; + ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD|

1 0

Erich Hoover : ws2_32: Fix allocating a hostent with no h_aliases list.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 896af79093f3d6f8a81b4ed5c6fd41e0e91b7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896af79093f3d6f8a81b4ed5c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Dec 14 08:30:14 2009 -0700 ws2_32: Fix allocating a hostent with no h_aliases list. --- dlls/ws2_32/socket.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6668b9..9a65cb0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3639,7 +3639,11 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) /* Allocate a hostent and enough memory for all the IPs, * including the NULL at the end of the list. */ - hostlist = WS_create_he(hostname, 0, numroutes, TRUE); + hostlist = WS_create_he(hostname, 1, numroutes+1, TRUE); + if (hostlist == NULL) + goto cleanup; /* Failed to allocate a hostent for the list of IPs */ + hostlist->h_addr_list[numroutes] = NULL; /* NULL-terminate the address list */ + hostlist->h_aliases[0] = NULL; /* NULL-terminate the alias list */ hostlist->h_addrtype = AF_INET; hostlist->h_length = sizeof(struct in_addr); /* = 4 */ /* Reorder the entries when placing them in the host list, Windows expects @@ -4602,9 +4606,14 @@ static int list_dup(char** l_src, char** l_to, int item_size) * * Creates the entry with enough memory for the name, aliases * addresses, and the address pointers. Also copies the name - * and sets up all the pointers. If "fill_address" is set then + * and sets up all the pointers. If "fill_addresses" is set then * sufficient memory for the addresses is also allocated and the * address pointers are set to this memory. + * + * NOTE: The alias and address lists must be allocated with room + * for the NULL item terminating the list. This is true even if + * the list has no items ("aliases" and "addresses" must be + * at least "1", a truly empty list is invalid). */ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, int fill_addresses) { @@ -4616,11 +4625,9 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i sizeof(char *)*aliases + sizeof(char *)*addresses); - /* Place addresses in the allocated memory, making sure to have enough - * room for the NULL at the end of the list. - */ + /* Allocate enough memory for the addresses */ if (fill_addresses) - size += sizeof(struct in_addr)*(addresses+1); + size += sizeof(struct in_addr)*addresses; if (!(p_to = check_buffer_he(size))) return NULL; memset(p_to, 0, size); @@ -4630,24 +4637,21 @@ static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses, i strcpy(p, name); p += strlen(p) + 1; - if (aliases != 0) - { - p_to->h_aliases = (char **)p; - p += sizeof(char *)*aliases; - } - if (addresses != 0) - { - p_to->h_addr_list = (char **)p; - p += sizeof(char *)*addresses; - } + p_to->h_aliases = (char **)p; + p += sizeof(char *)*aliases; + p_to->h_addr_list = (char **)p; + p += sizeof(char *)*addresses; if (fill_addresses) { int i; - /* Fill in the list of address pointers and NULL-terminate the list*/ + /* NOTE: h_aliases must be filled in manually, leave these + * pointers NULL (already set to NULL by memset earlier). + */ + + /* Fill in the list of address pointers */ for (i = 0; i < addresses; i++) p_to->h_addr_list[i] = (p += sizeof(struct in_addr)); - p_to->h_addr_list[i] = NULL; p += sizeof(struct in_addr); } return p_to;

1 0

Stefan Dösinger : wined3d: Properly release client storage memory.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: cde321726820e0430089b5d4db32eadd66c1d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde321726820e0430089b5d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 15 11:25:14 2009 +0100 wined3d: Properly release client storage memory. --- dlls/wined3d/surface.c | 50 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 59dda6e..1c5f012 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1624,6 +1624,37 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { return WINED3D_OK; } +static void surface_release_client_storage(IWineD3DSurface *iface) +{ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + struct wined3d_context *context; + + context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD); + + ENTER_GL(); + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + if(This->texture_name) + { + surface_bind_and_dirtify(This, FALSE); + glTexImage2D(This->texture_target, This->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + } + if(This->texture_name_srgb) + { + surface_bind_and_dirtify(This, TRUE); + glTexImage2D(This->texture_target, This->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + } + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + + LEAVE_GL(); + context_release(context); + + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + surface_force_reload(iface); +} + static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1650,11 +1681,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHD /* Create a DIB section if there isn't a hdc yet */ if(!This->hDC) { - hr = IWineD3DBaseSurfaceImpl_CreateDIBSection(iface); - if(FAILED(hr)) return WINED3DERR_INVALIDCALL; if(This->Flags & SFLAG_CLIENT) { - surface_internal_preload(iface, SRGB_RGB); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + surface_release_client_storage(iface); } + hr = IWineD3DBaseSurfaceImpl_CreateDIBSection(iface); + if(FAILED(hr)) return WINED3DERR_INVALIDCALL; /* Use the dib section from now on if we are not using a PBO */ if(!(This->Flags & SFLAG_PBO)) @@ -2911,11 +2943,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M /* For client textures opengl has to be notified */ if(This->Flags & SFLAG_CLIENT) { - DWORD oldFlags = This->Flags; - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - if(oldFlags & SFLAG_ALLOCATED) surface_internal_preload(iface, SRGB_RGB); - if(oldFlags & SFLAG_SRGBALLOCATED) surface_internal_preload(iface, SRGB_SRGB); - /* And hope that the app behaves correctly and did not free the old surface memory before setting a new pointer */ + surface_release_client_storage(iface); } /* Now free the old memory if any */ @@ -2928,11 +2956,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M This->Flags &= ~SFLAG_USERPTR; if(This->Flags & SFLAG_CLIENT) { - DWORD oldFlags = This->Flags; - This->Flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); - /* This respecifies an empty texture and opengl knows that the old memory is gone */ - if(oldFlags & SFLAG_ALLOCATED) surface_internal_preload(iface, SRGB_RGB); - if(oldFlags & SFLAG_SRGBALLOCATED) surface_internal_preload(iface, SRGB_SRGB); + surface_release_client_storage(iface); } } return WINED3D_OK;

1 0

Eric Pouech : dbghelp: Wrap the symt* <=> index transformations.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 92b9b0940dc3ecd02b00b6fbbac3e24d3d8a0115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b9b0940dc3ecd02b00b6fbb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:46 2009 +0100 dbghelp: Wrap the symt* <=> index transformations. --- dlls/dbghelp/coff.c | 5 ++- dlls/dbghelp/dbghelp_private.h | 13 +++++++- dlls/dbghelp/dwarf.c | 3 +- dlls/dbghelp/elf_module.c | 8 ++-- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 67 ++++++++++++++++++++++------------------ dlls/dbghelp/type.c | 58 +++++++++++++++++----------------- 8 files changed, 89 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92b9b0940dc3ecd02b00b…

1 0

Eric Pouech : dbghelp: Rewrite the symt* <=> index wrappers to that they work on 64bit platforms.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 7b83b70b06ce6453cf3dc1d81d2af5264ea66a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b83b70b06ce6453cf3dc1d81… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:54 2009 +0100 dbghelp: Rewrite the symt* <=> index wrappers to that they work on 64bit platforms. --- dlls/dbghelp/dbghelp_private.h | 13 +++---------- dlls/dbghelp/module.c | 2 ++ dlls/dbghelp/symbol.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index bb5b990..a0b40a1 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -335,6 +335,7 @@ struct module struct pool pool; /* symbols & symbol tables */ + struct vector vsymt; int sortlist_valid; unsigned num_sorttab; /* number of symbols with addresses */ unsigned num_symbols; @@ -418,16 +419,6 @@ struct pdb_lookup } u; }; -static inline DWORD symt_ptr2index(struct module* module, const struct symt* sym) -{ - return (DWORD)sym; -} - -static inline struct symt* symt_index2ptr(struct module* module, DWORD id) -{ - return (struct symt*)id; -} - /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess); extern HANDLE hMsvcrt; @@ -614,6 +605,8 @@ extern struct symt_hierarchy_point* symt_new_label(struct module* module, struct symt_compiland* compiland, const char* name, unsigned long address); +extern struct symt* symt_index2ptr(struct module* module, DWORD id); +extern DWORD symt_ptr2index(struct module* module, const struct symt* sym); /* type.c */ extern void symt_init_basic(struct module* module); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 55eca44..53f56c2 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -173,6 +173,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->addr_sorttab = NULL; module->num_sorttab = 0; module->num_symbols = 0; + + vector_init(&module->vsymt, sizeof(struct symt*), 128); /* FIXME: this seems a bit too high (on a per module basis) * need some statistics about this */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 17fd6c7..ede588c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -69,6 +69,37 @@ int symt_cmp_addr(const void* p1, const void* p2) return cmp_addr(a1, a2); } +DWORD symt_ptr2index(struct module* module, const struct symt* sym) +{ +#ifdef _WIN64 + const struct symt** c; + int len = vector_length(&module->vsymt), i; + + /* FIXME: this is inefficient */ + for (i = 0; i < len; i++) + { + if (*(struct symt**)vector_at(&module->vsymt, i) == sym) + return i + 1; + } + /* not found */ + c = vector_add(&module->vsymt, &module->pool); + if (c) *c = sym; + return len + 1; +#else + return (DWORD)sym; +#endif +} + +struct symt* symt_index2ptr(struct module* module, DWORD id) +{ +#ifdef _WIN64 + if (!id-- || id >= vector_length(&module->vsymt)) return NULL; + return *(struct symt**)vector_at(&module->vsymt, id); +#else + return (struct symt*)id; +#endif +} + static BOOL symt_grow_sorttab(struct module* module, unsigned sz) { struct symt_ht** new;

1 0

Eric Pouech : winedbg: Implement breakpoint management for x86_64 targets.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 4195c2f3bb646a14d1730f83797a6b7646979a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4195c2f3bb646a14d1730f837… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:00 2009 +0100 winedbg: Implement breakpoint management for x86_64 targets. --- programs/winedbg/be_x86_64.c | 135 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 128 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index ed5cdf2..2f58c88 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -2,6 +2,7 @@ * Debugger x86_64 specific functions * * Copyright 2004 Vincent Béron + * Copyright 2009 Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,9 @@ */ #include "debugger.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #if defined(__x86_64__) @@ -187,31 +191,148 @@ static void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display) dbg_printf("Disasm NIY\n"); } +#define DR7_CONTROL_SHIFT 16 +#define DR7_CONTROL_SIZE 4 + +#define DR7_RW_EXECUTE (0x0) +#define DR7_RW_WRITE (0x1) +#define DR7_RW_READ (0x3) + +#define DR7_LEN_1 (0x0) +#define DR7_LEN_2 (0x4) +#define DR7_LEN_4 (0xC) + +#define DR7_LOCAL_ENABLE_SHIFT 0 +#define DR7_GLOBAL_ENABLE_SHIFT 1 +#define DR7_ENABLE_SIZE 2 + +#define DR7_LOCAL_ENABLE_MASK (0x55) +#define DR7_GLOBAL_ENABLE_MASK (0xAA) + +#define DR7_CONTROL_RESERVED (0xFC00) +#define DR7_LOCAL_SLOWDOWN (0x100) +#define DR7_GLOBAL_SLOWDOWN (0x200) + +#define DR7_ENABLE_MASK(dr) (1<<(DR7_LOCAL_ENABLE_SHIFT+DR7_ENABLE_SIZE*(dr))) +#define IS_DR7_SET(ctrl,dr) ((ctrl)&DR7_ENABLE_MASK(dr)) + +static inline int be_x86_64_get_unused_DR(CONTEXT* ctx, DWORD64** r) +{ + if (!IS_DR7_SET(ctx->Dr7, 0)) + { + *r = &ctx->Dr0; + return 0; + } + if (!IS_DR7_SET(ctx->Dr7, 1)) + { + *r = &ctx->Dr1; + return 1; + } + if (!IS_DR7_SET(ctx->Dr7, 2)) + { + *r = &ctx->Dr2; + return 2; + } + if (!IS_DR7_SET(ctx->Dr7, 3)) + { + *r = &ctx->Dr3; + return 3; + } + dbg_printf("All hardware registers have been used\n"); + + return -1; +} + static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { - dbg_printf("not done insert_Xpoint\n"); - return 0; + unsigned char ch; + SIZE_T sz; + DWORD64 *pr; + int reg; + unsigned long bits; + + switch (type) + { + case be_xpoint_break: + if (size != 0) return 0; + if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + *val = ch; + ch = 0xcc; + if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + break; + case be_xpoint_watch_exec: + bits = DR7_RW_EXECUTE; + goto hw_bp; + case be_xpoint_watch_read: + bits = DR7_RW_READ; + goto hw_bp; + case be_xpoint_watch_write: + bits = DR7_RW_WRITE; + hw_bp: + if ((reg = be_x86_64_get_unused_DR(ctx, &pr)) == -1) return 0; + *pr = (DWORD64)addr; + if (type != be_xpoint_watch_exec) switch (size) + { + case 4: bits |= DR7_LEN_4; break; + case 2: bits |= DR7_LEN_2; break; + case 1: bits |= DR7_LEN_1; break; + default: return 0; + } + *val = reg; + /* clear old values */ + ctx->Dr7 &= ~(0x0F << (DR7_CONTROL_SHIFT + DR7_CONTROL_SIZE * reg)); + /* set the correct ones */ + ctx->Dr7 |= bits << (DR7_CONTROL_SHIFT + DR7_CONTROL_SIZE * reg); + ctx->Dr7 |= DR7_ENABLE_MASK(reg) | DR7_LOCAL_SLOWDOWN; + break; + default: + dbg_printf("Unknown bp type %c\n", type); + return 0; + } + return 1; } static unsigned be_x86_64_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { - dbg_printf("not done remove_Xpoint\n"); - return FALSE; + SIZE_T sz; + unsigned char ch; + + switch (type) + { + case be_xpoint_break: + if (size != 0) return 0; + if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + if (ch != (unsigned char)0xCC) + WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", + ch, (unsigned long)addr); + ch = (unsigned char)val; + if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + break; + case be_xpoint_watch_exec: + case be_xpoint_watch_read: + case be_xpoint_watch_write: + /* simply disable the entry */ + ctx->Dr7 &= ~DR7_ENABLE_MASK(val); + break; + default: + dbg_printf("Unknown bp type %c\n", type); + return 0; + } + return 1; } static unsigned be_x86_64_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) { - dbg_printf("not done is_watchpoint_set\n"); - return FALSE; + return ctx->Dr6 & (1 << idx); } static void be_x86_64_clear_watchpoint(CONTEXT* ctx, unsigned idx) { - dbg_printf("not done clear_watchpoint\n"); + ctx->Dr6 &= ~(1 << idx); } static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way)

1 0

Eric Pouech : dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms .
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 776e75e43cfab6654dbf7d47e454f9b5c23fd628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776e75e43cfab6654dbf7d47e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:06 2009 +0100 dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a0b40a1..fd5ec0d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -538,7 +538,7 @@ extern struct module* symt_cmp_addr_module; extern int symt_cmp_addr(const void* p1, const void* p2); extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si); extern struct symt_ht* - symt_find_nearest(struct module* module, DWORD addr); + symt_find_nearest(struct module* module, DWORD_PTR addr); extern struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ede588c..d686b4a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -900,7 +900,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* assume addr is in module */ -struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) +struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { int mid, high, low; ULONG64 ref_addr, ref_size;

1 0

Eric Pouech : dbghelp: Move the core of some line related functions to 64bit interface.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 9500df82f1d64cb413527b182b8805b8f990c60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9500df82f1d64cb413527b182… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:17 2009 +0100 dbghelp: Move the core of some line related functions to 64bit interface. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 134 +++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9500df82f1d64cb413527…

1 0

Stefan Dösinger : wined3d: Frontbuffers are onscreen.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 2ee6bb1cbb4ddfdfcc5eb17344c4fd20734e5672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee6bb1cbb4ddfdfcc5eb1734… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 14 23:58:13 2009 +0100 wined3d: Frontbuffers are onscreen. --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/device.c | 1 - dlls/wined3d/swapchain.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62eb0ac..f923a6f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1348,6 +1348,7 @@ struct wined3d_context *context_create(IWineD3DDeviceImpl *This, IWineD3DSurface ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; ret->current_rt = (IWineD3DSurface *)target; + ret->render_offscreen = surface_is_offscreen((IWineD3DSurface *) target); ret->tid = GetCurrentThreadId(); if(This->shader_backend->shader_dirtifyable_constants((IWineD3DDevice *) This)) { /* Create the dirty constants array and initialize them to dirty */ @@ -1893,7 +1894,7 @@ static inline struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWin context = findThreadContextForSwapChain(swapchain, tid); old_render_offscreen = context->render_offscreen; - context->render_offscreen = ((IWineD3DSwapChainImpl *)swapchain)->render_to_fbo; + context->render_offscreen = surface_is_offscreen(target); /* The context != This->activeContext will catch a NOP context change. This can occur * if we are switching back to swapchain rendering in case of FBO or Back Buffer offscreen * rendering. No context change is needed in that case diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c71d4eb..a55f3e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6297,7 +6297,6 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * } swapchain->context[0] = context_create(This, target, swapchain->win_handle, FALSE, &swapchain->presentParms); swapchain->num_contexts = 1; - swapchain->context[0]->render_offscreen = swapchain->render_to_fbo; create_dummy_textures(This); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 91791de..fb902ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -809,8 +809,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface hr = WINED3DERR_NOTAVAILABLE; goto err; } - - swapchain->context[0]->render_offscreen = swapchain->render_to_fbo; } else {

1 0

Alexandre Julliard : user32: Return failure in WaitForInputIdle if we can' t open the idle event.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 6c253bb143886d6ef9a1bfe0efd55491ecfb62f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c253bb143886d6ef9a1bfe0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:10:10 2009 +0100 user32: Return failure in WaitForInputIdle if we can't open the idle event. --- dlls/user32/message.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a1d7779..8916cae 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3322,12 +3322,11 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut ) SERVER_START_REQ( get_process_idle_event ) { req->handle = wine_server_obj_handle( hProcess ); - if (!(ret = wine_server_call_err( req ))) - handles[1] = wine_server_ptr_handle( reply->event ); + wine_server_call_err( req ); + handles[1] = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; - if (ret) return WAIT_FAILED; /* error */ - if (!handles[1]) return 0; /* no event to wait on */ + if (!handles[1]) return WAIT_FAILED; /* no event to wait on */ start_time = GetTickCount(); elapsed = 0;

1 0