April 2010 - Wine-Commits - list.winehq.org

Chris Robinson : openal32: Add support for ALC_EXT_thread_local_context.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 61fe7b3f1d6b1cf6df1901521eb0ab4d2162ef67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fe7b3f1d6b1cf6df1901521… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Apr 1 12:38:24 2010 -0700 openal32: Add support for ALC_EXT_thread_local_context. --- dlls/openal32/openal.c | 114 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 37 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index ab6bbbd..784fbb5 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -39,6 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(openal32); +static ALCboolean (ALC_APIENTRY*alcSetThreadContext)(ALCcontext *context); +static ALCcontext* (ALC_APIENTRY*alcGetThreadContext)(ALCvoid); + static ALboolean loaded_procs; static ALvoid (AL_APIENTRY*alBufferDataStatic)(const ALuint bid, ALenum format, const ALvoid* data, ALsizei size, ALsizei freq); @@ -103,6 +106,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); +#define LOADFUNC(x) x = alcGetProcAddress(NULL, #x) + LOADFUNC(alcSetThreadContext); + LOADFUNC(alcGetThreadContext); +#undef LOADFUNC break; } @@ -110,6 +117,46 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } +static void LoadProcs(void) +{ +#define LOADFUNC(x) x = alGetProcAddress(#x) + LOADFUNC(alBufferDataStatic); + LOADFUNC(alGenFilters); + LOADFUNC(alDeleteFilters); + LOADFUNC(alIsFilter); + LOADFUNC(alFilterf); + LOADFUNC(alFilterfv); + LOADFUNC(alFilteri); + LOADFUNC(alFilteriv); + LOADFUNC(alGetFilterf); + LOADFUNC(alGetFilterfv); + LOADFUNC(alGetFilteri); + LOADFUNC(alGetFilteriv); + LOADFUNC(alGenEffects); + LOADFUNC(alDeleteEffects); + LOADFUNC(alIsEffect); + LOADFUNC(alEffectf); + LOADFUNC(alEffectfv); + LOADFUNC(alEffecti); + LOADFUNC(alEffectiv); + LOADFUNC(alGetEffectf); + LOADFUNC(alGetEffectfv); + LOADFUNC(alGetEffecti); + LOADFUNC(alGetEffectiv); + LOADFUNC(alGenAuxiliaryEffectSlots); + LOADFUNC(alDeleteAuxiliaryEffectSlots); + LOADFUNC(alIsAuxiliaryEffectSlot); + LOADFUNC(alAuxiliaryEffectSlotf); + LOADFUNC(alAuxiliaryEffectSlotfv); + LOADFUNC(alAuxiliaryEffectSloti); + LOADFUNC(alAuxiliaryEffectSlotiv); + LOADFUNC(alGetAuxiliaryEffectSlotf); + LOADFUNC(alGetAuxiliaryEffectSlotfv); + LOADFUNC(alGetAuxiliaryEffectSloti); + LOADFUNC(alGetAuxiliaryEffectSlotiv); +#undef LOADFUNC +} + /*********************************************************************** * OpenAL thunk routines */ @@ -133,43 +180,7 @@ ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context) if(context && !loaded_procs) { loaded_procs = AL_TRUE; - -#define LOADFUNC(x) x = alGetProcAddress(#x) - LOADFUNC(alBufferDataStatic); - LOADFUNC(alGenFilters); - LOADFUNC(alDeleteFilters); - LOADFUNC(alIsFilter); - LOADFUNC(alFilterf); - LOADFUNC(alFilterfv); - LOADFUNC(alFilteri); - LOADFUNC(alFilteriv); - LOADFUNC(alGetFilterf); - LOADFUNC(alGetFilterfv); - LOADFUNC(alGetFilteri); - LOADFUNC(alGetFilteriv); - LOADFUNC(alGenEffects); - LOADFUNC(alDeleteEffects); - LOADFUNC(alIsEffect); - LOADFUNC(alEffectf); - LOADFUNC(alEffectfv); - LOADFUNC(alEffecti); - LOADFUNC(alEffectiv); - LOADFUNC(alGetEffectf); - LOADFUNC(alGetEffectfv); - LOADFUNC(alGetEffecti); - LOADFUNC(alGetEffectiv); - LOADFUNC(alGenAuxiliaryEffectSlots); - LOADFUNC(alDeleteAuxiliaryEffectSlots); - LOADFUNC(alIsAuxiliaryEffectSlot); - LOADFUNC(alAuxiliaryEffectSlotf); - LOADFUNC(alAuxiliaryEffectSlotfv); - LOADFUNC(alAuxiliaryEffectSloti); - LOADFUNC(alAuxiliaryEffectSlotiv); - LOADFUNC(alGetAuxiliaryEffectSlotf); - LOADFUNC(alGetAuxiliaryEffectSlotfv); - LOADFUNC(alGetAuxiliaryEffectSloti); - LOADFUNC(alGetAuxiliaryEffectSlotiv); -#undef LOADFUNC + LoadProcs(); } LeaveCriticalSection(&openal_cs); @@ -846,6 +857,33 @@ ALvoid CDECL wine_alGetAuxiliaryEffectSlotiv(ALuint sid, ALenum param, ALint* va } +/* Thread-local context functions */ +ALCboolean CDECL wine_alcSetThreadContext(ALCcontext *context) +{ + EnterCriticalSection(&openal_cs); + if(alcSetThreadContext(context) == ALC_FALSE) + { + WARN("Failed to make context %p current\n", context); + LeaveCriticalSection(&openal_cs); + return ALC_FALSE; + } + + if(context && !loaded_procs) + { + loaded_procs = AL_TRUE; + LoadProcs(); + } + LeaveCriticalSection(&openal_cs); + + return ALC_TRUE; +} + +ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) +{ + return alcGetThreadContext(); +} + + static const struct FuncList ALCFuncs[] = { { "alcCreateContext", wine_alcCreateContext }, { "alcMakeContextCurrent", wine_alcMakeContextCurrent }, @@ -867,6 +905,8 @@ static const struct FuncList ALCFuncs[] = { { "alcCaptureStart", wine_alcCaptureStart }, { "alcCaptureStop", wine_alcCaptureStop }, { "alcCaptureSamples", wine_alcCaptureSamples }, + { "alcSetThreadContext", wine_alcSetThreadContext }, + { "alcGetThreadContext", wine_alcGetThreadContext }, { NULL, NULL } }; static const struct FuncList ALFuncs[] = {

1 0

Henri Verbeet : wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 2e5976a8c581ac523e9e6e3fbf67b9e12b738be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5976a8c581ac523e9e6e3fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 21:28:53 2010 +0200 wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw. --- dlls/ddraw/device.c | 12 ++++++++++++ dlls/wined3d/state.c | 8 -------- dlls/wined3d/utils.c | 1 - include/wine/wined3d.idl | 1 - 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 136d73e..a231a50 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2441,6 +2441,11 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, Value); break; + case D3DRENDERSTATE_BORDERCOLOR: + FIXME("Unhandled render state D3DRENDERSTATE_BORDERCOLOR.\n"); + hr = E_NOTIMPL; + break; + default: /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice, @@ -2723,6 +2728,13 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, Value); break; + case D3DRENDERSTATE_BORDERCOLOR: + /* This should probably just forward to the corresponding sampler + * state. Needs tests. */ + FIXME("Unhandled render state D3DRENDERSTATE_BORDERCOLOR.\n"); + hr = E_NOTIMPL; + break; + default: /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f343a36..048cf77 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1873,13 +1873,6 @@ static void state_stippleenable(DWORD state, IWineD3DStateBlockImpl *stateblock, } } -static void state_bordercolor(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) -{ - if(stateblock->renderState[WINED3DRS_BORDERCOLOR]) { - FIXME("Render state WINED3DRS_BORDERCOLOR not implemented yet\n"); - } -} - static void state_mipmaplodbias(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if(stateblock->renderState[WINED3DRS_MIPMAPLODBIAS]) { @@ -5528,7 +5521,6 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }, WINED3D_GL_EXT_NONE }, { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pixelshader }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3DRS_BORDERCOLOR), { STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b879f7a..363bf4b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1533,7 +1533,6 @@ const char* debug_d3drenderstate(DWORD state) { D3DSTATE_TO_STR(WINED3DRS_STIPPLEENABLE ); D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS ); D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE ); - D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR ); D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS ); D3DSTATE_TO_STR(WINED3DRS_ZBIAS ); D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE ); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d6068f0..ede80ad 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -315,7 +315,6 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_STIPPLEENABLE = 39, /* d3d7 */ WINED3DRS_EDGEANTIALIAS = 40, /* d3d7, d3d8 */ WINED3DRS_COLORKEYENABLE = 41, /* d3d7 */ - WINED3DRS_BORDERCOLOR = 43, /* d3d7 */ WINED3DRS_MIPMAPLODBIAS = 46, /* d3d7 */ WINED3DRS_ZBIAS = 47, /* d3d7, d3d8 */ WINED3DRS_RANGEFOGENABLE = 48,

1 0

Chris Robinson : openal32: Remove the ALCcontext wrapper.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 0540af5be33a54f39eb45291ed75f53b58110b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0540af5be33a54f39eb45291e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Apr 1 12:43:49 2010 -0700 openal32: Remove the ALCcontext wrapper. Assume the function pointers retrieved by alGetProcAddress are context independent. This is not likely to change in any implementation we care about any time soon. --- dlls/openal32/openal.c | 238 +++++++++++++++--------------------------------- 1 files changed, 75 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0540af5be33a54f39eb45…

1 0

Eric Pouech : dbghelp: Extend dwarf stack unwinding by reading information out of . debug_frame sections.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 1b68d4e7cec5b6d79b3811a34f59c3790d5a5e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b68d4e7cec5b6d79b3811a34… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:20 2010 +0200 dbghelp: Extend dwarf stack unwinding by reading information out of .debug_frame sections. Implement dwarf stack unwinding for i386 CPU. --- dlls/dbghelp/cpu_i386.c | 31 +++++++++++++++++++++++++++++++ dlls/dbghelp/dwarf.c | 24 +++++++++++++++++------- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 7a951f7..dc00410 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -107,6 +107,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO DWORD p; WORD val; BOOL do_switch; + unsigned deltapc = 1; /* sanity check */ if (curr_mode >= stm_done) return FALSE; @@ -132,6 +133,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO /* Init done */ curr_mode = (frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit; + deltapc = 0; /* cur_switch holds address of WOW32Reserved field in TEB in debuggee * address space @@ -191,6 +193,21 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO * we will get it in the next frame */ memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); +#ifdef __i386__ + if (curr_mode == stm_32bit) + { + DWORD_PTR xframe; + + if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, &xframe)) + { + frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; + frame->AddrStack.Offset = context->Esp = xframe; + frame->AddrFrame.Offset = context->Ebp; + frame->AddrReturn.Offset = context->Eip; + goto done_pep; + } + } +#endif } else { @@ -317,6 +334,18 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } else { +#ifdef __i386__ + DWORD_PTR xframe; + + if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, &xframe)) + { + frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; + frame->AddrStack.Offset = context->Esp = xframe; + frame->AddrFrame.Offset = context->Ebp; + frame->AddrReturn.Offset = context->Eip; + goto done_pep; + } +#endif frame->AddrStack.Offset = frame->AddrFrame.Offset + 2 * sizeof(DWORD); /* "pop up" previous EBP value */ if (!sw_read_mem(csw, frame->AddrFrame.Offset, @@ -381,6 +410,8 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO sw_read_mem(csw, frame->AddrFrame.Offset + 2 * sizeof(DWORD), frame->Params, sizeof(frame->Params)); } + goto done_pep; /* just to ensure done_pep label is referenced */ +done_pep: frame->Far = TRUE; frame->Virtual = TRUE; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 78860d7..68e322c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2403,14 +2403,17 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR delta, dwarf2_traverse_context_t* fde_ctx, dwarf2_traverse_context_t* cie_ctx, - struct frame_info* info) + struct frame_info* info, BOOL in_eh_frame) { const unsigned char* ptr_blk; const unsigned char* cie_ptr; const unsigned char* last_cie_ptr = (const unsigned char*)~0; unsigned len, id; unsigned long start, range; + unsigned cie_id; + const BYTE* start_data = fde_ctx->data; + cie_id = in_eh_frame ? 0 : DW_CIE_ID; for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) { /* find the FDE for address addr (skip CIE) */ @@ -2418,7 +2421,7 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR if (len == 0xffffffff) FIXME("Unsupported yet 64-bit CIEs\n"); ptr_blk = fde_ctx->data + len; id = dwarf2_parse_u4(fde_ctx); - if (id == 0) /* FIXME DW_CIE_ID */ + if (id == cie_id) { last_cie_ptr = fde_ctx->data - 8; /* we need some bits out of the CIE in order to parse all contents */ @@ -2428,7 +2431,7 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR cie_ctx->word_size = fde_ctx->word_size; continue; } - cie_ptr = fde_ctx->data - id - 4; + cie_ptr = (in_eh_frame) ? fde_ctx->data - id - 4 : start_data + id; if (cie_ptr != last_cie_ptr) { last_cie_ptr = cie_ptr; @@ -2436,7 +2439,7 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR cie_ctx->word_size = fde_ctx->word_size; cie_ctx->end_data = cie_ptr + 4; cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); - if (dwarf2_parse_u4(cie_ctx) != 0) /* FIXME DW_CIE_ID */ + if (dwarf2_parse_u4(cie_ctx) != cie_id) { FIXME("wrong CIE pointer\n"); return FALSE; @@ -2925,10 +2928,17 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk* csw, ULONG_PTR ip, CONTEXT* co */ delta = pair.effective->module.BaseOfImage + modfmt->u.dwarf2_info->eh_frame.rva - (DWORD_PTR)modfmt->u.dwarf2_info->eh_frame.address; - if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info)) + if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, TRUE)) { - TRACE("Couldn't find information for %lx\n", ip); - return FALSE; + fde_ctx.data = modfmt->u.dwarf2_info->debug_frame.address; + fde_ctx.end_data = fde_ctx.data + modfmt->u.dwarf2_info->debug_frame.size; + fde_ctx.word_size = modfmt->u.dwarf2_info->word_size; + delta = pair.effective->reloc_delta; + if (!dwarf2_get_cie(ip, pair.effective, delta, &fde_ctx, &cie_ctx, &info, FALSE)) + { + TRACE("Couldn't find information for %lx\n", ip); + return FALSE; + } } TRACE("function %lx/%lx code_align %lu data_align %ld retaddr %s\n",

1 0

Henri Verbeet : wined3d: Add a state handler for WINED3DRS_ZVISIBLE.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: e62771f7f717a8c2207a2e7c3866663d99bc7aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62771f7f717a8c2207a2e7c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 21:28:51 2010 +0200 wined3d: Add a state handler for WINED3DRS_ZVISIBLE. --- dlls/wined3d/state.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 893e0ed..f343a36 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1730,6 +1730,12 @@ static void state_depthbias(DWORD state, IWineD3DStateBlockImpl *stateblock, str } } +static void state_zvisible(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + if (stateblock->renderState[WINED3DRS_ZVISIBLE]) + FIXME("WINED3DRS_ZVISIBLE not implemented.\n"); +} + static void state_perspective(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { if (stateblock->renderState[WINED3DRS_TEXTUREPERSPECTIVE]) { @@ -5016,6 +5022,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor_w }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_ZVISIBLE), { STATE_RENDER(WINED3DRS_ZVISIBLE), state_zvisible }, WINED3D_GL_EXT_NONE }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : wined3d: Verify state representatives represent themselves.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: ef34b0ba069078716eff4691c4f0a42fd46458f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef34b0ba069078716eff4691c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 21:28:50 2010 +0200 wined3d: Verify state representatives represent themselves. This ensures there's no multilevel indirection in the state table. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ddf4f77..893e0ed 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5665,7 +5665,7 @@ static void validate_state_table(struct StateEntry *state_table) DWORD rep = state_table[i].representative; if (rep) { - if (!state_table[rep].representative) + if (state_table[rep].representative != rep) { ERR("State %s (%#x) has invalid representative %s (%#x).\n", debug_d3dstate(i), i, debug_d3dstate(rep), rep);

1 0

Henri Verbeet : wined3d: Remove some unused render states.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: af9510f400d1c126a3e4173dac8a486030390782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9510f400d1c126a3e4173da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 21:28:52 2010 +0200 wined3d: Remove some unused render states. --- dlls/wined3d/utils.c | 7 ------- include/wine/wined3d.idl | 7 ------- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 46252eb..b879f7a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1497,9 +1497,7 @@ const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) { const char* debug_d3drenderstate(DWORD state) { switch (state) { #define D3DSTATE_TO_STR(u) case u: return #u - D3DSTATE_TO_STR(WINED3DRS_TEXTUREHANDLE ); D3DSTATE_TO_STR(WINED3DRS_ANTIALIAS ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESS ); D3DSTATE_TO_STR(WINED3DRS_TEXTUREPERSPECTIVE ); D3DSTATE_TO_STR(WINED3DRS_WRAPU ); D3DSTATE_TO_STR(WINED3DRS_WRAPV ); @@ -1513,11 +1511,8 @@ const char* debug_d3drenderstate(DWORD state) { D3DSTATE_TO_STR(WINED3DRS_ZWRITEENABLE ); D3DSTATE_TO_STR(WINED3DRS_ALPHATESTENABLE ); D3DSTATE_TO_STR(WINED3DRS_LASTPIXEL ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAG ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREMIN ); D3DSTATE_TO_STR(WINED3DRS_SRCBLEND ); D3DSTATE_TO_STR(WINED3DRS_DESTBLEND ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREMAPBLEND ); D3DSTATE_TO_STR(WINED3DRS_CULLMODE ); D3DSTATE_TO_STR(WINED3DRS_ZFUNC ); D3DSTATE_TO_STR(WINED3DRS_ALPHAREF ); @@ -1539,8 +1534,6 @@ const char* debug_d3drenderstate(DWORD state) { D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS ); D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE ); D3DSTATE_TO_STR(WINED3DRS_BORDERCOLOR ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSU ); - D3DSTATE_TO_STR(WINED3DRS_TEXTUREADDRESSV ); D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS ); D3DSTATE_TO_STR(WINED3DRS_ZBIAS ); D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE ); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index f784774..d6068f0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -279,9 +279,7 @@ typedef enum _WINED3DFORMAT typedef enum _WINED3DRENDERSTATETYPE { - WINED3DRS_TEXTUREHANDLE = 1, /* d3d7 */ WINED3DRS_ANTIALIAS = 2, /* d3d7 */ - WINED3DRS_TEXTUREADDRESS = 3, /* d3d7 */ WINED3DRS_TEXTUREPERSPECTIVE = 4, /* d3d7 */ WINED3DRS_WRAPU = 5, /* d3d7 */ WINED3DRS_WRAPV = 6, /* d3d7 */ @@ -295,11 +293,8 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_ZWRITEENABLE = 14, WINED3DRS_ALPHATESTENABLE = 15, WINED3DRS_LASTPIXEL = 16, - WINED3DRS_TEXTUREMAG = 17, /* d3d7 */ - WINED3DRS_TEXTUREMIN = 18, /* d3d7 */ WINED3DRS_SRCBLEND = 19, WINED3DRS_DESTBLEND = 20, - WINED3DRS_TEXTUREMAPBLEND = 21, /* d3d7 */ WINED3DRS_CULLMODE = 22, WINED3DRS_ZFUNC = 23, WINED3DRS_ALPHAREF = 24, @@ -321,8 +316,6 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_EDGEANTIALIAS = 40, /* d3d7, d3d8 */ WINED3DRS_COLORKEYENABLE = 41, /* d3d7 */ WINED3DRS_BORDERCOLOR = 43, /* d3d7 */ - WINED3DRS_TEXTUREADDRESSU = 44, /* d3d7 */ - WINED3DRS_TEXTUREADDRESSV = 45, /* d3d7 */ WINED3DRS_MIPMAPLODBIAS = 46, /* d3d7 */ WINED3DRS_ZBIAS = 47, /* d3d7, d3d8 */ WINED3DRS_RANGEFOGENABLE = 48,

1 0

Henri Verbeet : wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw .
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 1289842da32d56f4cc3ab2f53031ca20dcd9dc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1289842da32d56f4cc3ab2f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 21:28:54 2010 +0200 wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw. --- dlls/ddraw/device.c | 19 ++++++++++++++++--- dlls/wined3d/utils.c | 32 -------------------------------- include/wine/wined3d.idl | 32 -------------------------------- 3 files changed, 16 insertions(+), 67 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a231a50..f70fdba 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2447,7 +2447,14 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, break; default: - /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ + if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 + && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) + { + FIXME("Unhandled stipple pattern render state (%#x).\n", + RenderStateType); + hr = E_NOTIMPL; + break; + } hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice, RenderStateType, Value); @@ -2736,8 +2743,14 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, break; default: - - /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ + if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 + && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) + { + FIXME("Unhandled stipple pattern render state (%#x).\n", + RenderStateType); + hr = E_NOTIMPL; + break; + } hr = IWineD3DDevice_SetRenderState(This->wineD3DDevice, RenderStateType, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 363bf4b..9a37a35 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1548,38 +1548,6 @@ const char* debug_d3drenderstate(DWORD state) { D3DSTATE_TO_STR(WINED3DRS_STENCILMASK ); D3DSTATE_TO_STR(WINED3DRS_STENCILWRITEMASK ); D3DSTATE_TO_STR(WINED3DRS_TEXTUREFACTOR ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN00 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN01 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN02 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN03 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN04 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN05 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN06 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN07 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN08 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN09 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN10 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN11 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN12 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN13 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN14 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN15 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN16 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN17 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN18 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN19 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN20 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN21 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN22 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN23 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN24 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN25 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN26 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN27 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN28 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN29 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN30 ); - D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN31 ); D3DSTATE_TO_STR(WINED3DRS_WRAP0 ); D3DSTATE_TO_STR(WINED3DRS_WRAP1 ); D3DSTATE_TO_STR(WINED3DRS_WRAP2 ); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ede80ad..d8eee95 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -330,38 +330,6 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_STENCILMASK = 58, WINED3DRS_STENCILWRITEMASK = 59, WINED3DRS_TEXTUREFACTOR = 60, - WINED3DRS_STIPPLEPATTERN00 = 64, - WINED3DRS_STIPPLEPATTERN01 = 65, - WINED3DRS_STIPPLEPATTERN02 = 66, - WINED3DRS_STIPPLEPATTERN03 = 67, - WINED3DRS_STIPPLEPATTERN04 = 68, - WINED3DRS_STIPPLEPATTERN05 = 69, - WINED3DRS_STIPPLEPATTERN06 = 70, - WINED3DRS_STIPPLEPATTERN07 = 71, - WINED3DRS_STIPPLEPATTERN08 = 72, - WINED3DRS_STIPPLEPATTERN09 = 73, - WINED3DRS_STIPPLEPATTERN10 = 74, - WINED3DRS_STIPPLEPATTERN11 = 75, - WINED3DRS_STIPPLEPATTERN12 = 76, - WINED3DRS_STIPPLEPATTERN13 = 77, - WINED3DRS_STIPPLEPATTERN14 = 78, - WINED3DRS_STIPPLEPATTERN15 = 79, - WINED3DRS_STIPPLEPATTERN16 = 80, - WINED3DRS_STIPPLEPATTERN17 = 81, - WINED3DRS_STIPPLEPATTERN18 = 82, - WINED3DRS_STIPPLEPATTERN19 = 83, - WINED3DRS_STIPPLEPATTERN20 = 84, - WINED3DRS_STIPPLEPATTERN21 = 85, - WINED3DRS_STIPPLEPATTERN22 = 86, - WINED3DRS_STIPPLEPATTERN23 = 87, - WINED3DRS_STIPPLEPATTERN24 = 88, - WINED3DRS_STIPPLEPATTERN25 = 89, - WINED3DRS_STIPPLEPATTERN26 = 90, - WINED3DRS_STIPPLEPATTERN27 = 91, - WINED3DRS_STIPPLEPATTERN28 = 92, - WINED3DRS_STIPPLEPATTERN29 = 93, - WINED3DRS_STIPPLEPATTERN30 = 94, - WINED3DRS_STIPPLEPATTERN31 = 95, WINED3DRS_WRAP0 = 128, WINED3DRS_WRAP1 = 129, WINED3DRS_WRAP2 = 130,

1 0

Eric Pouech : dbghelp: When handling a P augmentation in FDE/DIE parsing, throw away the DW_EH_indirect flag, as we don't handle the result.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: a185435243b863066ba6f65032e7e3fc3b395704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a185435243b863066ba6f6503… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:26 2010 +0200 dbghelp: When handling a P augmentation in FDE/DIE parsing, throw away the DW_EH_indirect flag, as we don't handle the result. It's needed as long as we don't support DW_EH_indirect while reading encoded values. --- dlls/dbghelp/dwarf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 68e322c..41e2397 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2383,6 +2383,8 @@ static BOOL parse_cie_details(dwarf2_traverse_context_t* ctx, struct frame_info* case 'P': { unsigned char encoding = dwarf2_parse_byte(ctx); + /* throw away the indirect bit, as we don't care for the result */ + encoding &= ~DW_EH_PE_indirect; dwarf2_parse_augmentation_ptr(ctx, encoding); /* handler */ continue; }

1 0

Eric Pouech : dbghelp: Store delta used for re-locating a module.
by Alexandre Julliard April 2, 2010

April 2, 2010

Module: wine Branch: master Commit: 34ef8d21131ff2396e3ae432c403d546385a820f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ef8d21131ff2396e3ae432c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:14 2010 +0200 dbghelp: Store delta used for re-locating a module. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/elf_module.c | 1 + dlls/dbghelp/module.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a341b03..de764ae 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; + DWORD64 reloc_delta; /* specific information for debug types */ struct module_format* format_info[DFI_LAST]; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index e0fab9c..132e40c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1080,6 +1080,7 @@ static BOOL elf_load_file(struct process* pcs, const WCHAR* filename, HeapFree(GetProcessHeap(), 0, modfmt); goto leave; } + elf_info->module->reloc_delta = elf_info->module->module.BaseOfImage - fmap.u.elf.elf_start; elf_module_info = (void*)(modfmt + 1); elf_info->module->format_info[DFI_ELF] = modfmt; modfmt->module = elf_info->module; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 8f12fef..e99bd7f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -167,6 +167,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.SourceIndexed = FALSE; module->module.Publics = FALSE; + module->reloc_delta = 0; module->type = type; module->is_virtual = virtual ? TRUE : FALSE; for (i = 0; i < DFI_LAST; i++) module->format_info[i] = NULL;

1 0