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

Chris Robinson : openal32: Add support for ALC_EXT_thread_local_context.
by Alexandre Julliard 02 Apr '10

02 Apr '10

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

Alexandre Julliard : server: Fix 64-bit alignment of the context structure.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 27f2a35742d481f1c90287e5c4968ba91c15f165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f2a35742d481f1c90287e5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 19:56:09 2010 +0200 server: Fix 64-bit alignment of the context structure. --- include/wine/server_protocol.h | 8 ++++---- server/protocol.def | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1a20438..edb2d9d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -142,10 +142,10 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags; } x86_64_regs; + unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned __int64 fir; - unsigned int psr; } alpha_regs; - struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; + unsigned int psr, __pad; } alpha_regs; + struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union @@ -5418,6 +5418,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 397 +#define SERVER_PROTOCOL_VERSION 398 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0aa8f6c..4aaff10 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -158,10 +158,10 @@ typedef struct { struct { unsigned int eip, ebp, esp, eflags, cs, ss; } i386_regs; struct { unsigned __int64 rip, rbp, rsp; - unsigned int cs, ss, flags; } x86_64_regs; + unsigned int cs, ss, flags, __pad; } x86_64_regs; struct { unsigned __int64 fir; - unsigned int psr; } alpha_regs; - struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap; } powerpc_regs; + unsigned int psr, __pad; } alpha_regs; + struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union

1 0

Alexandre Julliard : server: Update trace for new error codes.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 45e0e3df47d14b8274051f3a2c391d42cdcecaa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e0e3df47d14b8274051f3a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 20:30:49 2010 +0200 server: Update trace for new error codes. --- server/trace.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/server/trace.c b/server/trace.c index 914d8f1..7958781 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4564,6 +4564,7 @@ static const struct { "ABANDONED_WAIT_0", STATUS_ABANDONED_WAIT_0 }, { "ACCESS_DENIED", STATUS_ACCESS_DENIED }, { "ACCESS_VIOLATION", STATUS_ACCESS_VIOLATION }, + { "ADDRESS_ALREADY_ASSOCIATED", STATUS_ADDRESS_ALREADY_ASSOCIATED }, { "ALERTED", STATUS_ALERTED }, { "ALIAS_EXISTS", STATUS_ALIAS_EXISTS }, { "BAD_DEVICE_TYPE", STATUS_BAD_DEVICE_TYPE }, @@ -4574,7 +4575,12 @@ static const struct { "CANCELLED", STATUS_CANCELLED }, { "CANNOT_DELETE", STATUS_CANNOT_DELETE }, { "CANT_OPEN_ANONYMOUS", STATUS_CANT_OPEN_ANONYMOUS }, + { "CANT_WAIT", STATUS_CANT_WAIT }, { "CHILD_MUST_BE_VOLATILE", STATUS_CHILD_MUST_BE_VOLATILE }, + { "CONNECTION_ABORTED", STATUS_CONNECTION_ABORTED }, + { "CONNECTION_DISCONNECTED", STATUS_CONNECTION_DISCONNECTED }, + { "CONNECTION_REFUSED", STATUS_CONNECTION_REFUSED }, + { "CONNECTION_RESET", STATUS_CONNECTION_RESET }, { "DEBUGGER_INACTIVE", STATUS_DEBUGGER_INACTIVE }, { "DEVICE_BUSY", STATUS_DEVICE_BUSY }, { "DIRECTORY_NOT_EMPTY", STATUS_DIRECTORY_NOT_EMPTY }, @@ -4607,6 +4613,8 @@ static const struct { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, { "MUTANT_NOT_OWNED", STATUS_MUTANT_NOT_OWNED }, { "NAME_TOO_LONG", STATUS_NAME_TOO_LONG }, + { "NETWORK_BUSY", STATUS_NETWORK_BUSY }, + { "NETWORK_UNREACHABLE", STATUS_NETWORK_UNREACHABLE }, { "NOTIFY_ENUM_DIR", STATUS_NOTIFY_ENUM_DIR }, { "NOT_ALL_ASSIGNED", STATUS_NOT_ALL_ASSIGNED }, { "NOT_A_DIRECTORY", STATUS_NOT_A_DIRECTORY },

1 0

Eric Pouech : dbghelp: Implement the new register methods for x86.
by Alexandre Julliard 02 Apr '10

02 Apr '10

Module: wine Branch: master Commit: 51bce9b049aa6f7fe96212bb5788a0cf28e985e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bce9b049aa6f7fe96212bb5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Apr 1 21:24:07 2010 +0200 dbghelp: Implement the new register methods for x86. --- dlls/dbghelp/cpu_i386.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 094b241..7a951f7 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -452,12 +452,73 @@ reg: fop 31 static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) { - FIXME("NIY\n"); +#ifdef __i386__ + switch (regno) + { + case CV_REG_EAX: *size = sizeof(ctx->Eax); return &ctx->Eax; + case CV_REG_EDX: *size = sizeof(ctx->Edx); return &ctx->Edx; + case CV_REG_ECX: *size = sizeof(ctx->Ecx); return &ctx->Ecx; + case CV_REG_EBX: *size = sizeof(ctx->Ebx); return &ctx->Ebx; + case CV_REG_ESI: *size = sizeof(ctx->Esi); return &ctx->Esi; + case CV_REG_EDI: *size = sizeof(ctx->Edi); return &ctx->Edi; + case CV_REG_EBP: *size = sizeof(ctx->Ebp); return &ctx->Ebp; + case CV_REG_ESP: *size = sizeof(ctx->Esp); return &ctx->Esp; + case CV_REG_EIP: *size = sizeof(ctx->Eip); return &ctx->Eip; + + case CV_REG_ST0 + 0: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[0*sizeof(long double)]; + case CV_REG_ST0 + 1: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[1*sizeof(long double)]; + case CV_REG_ST0 + 2: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[2*sizeof(long double)]; + case CV_REG_ST0 + 3: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[3*sizeof(long double)]; + case CV_REG_ST0 + 4: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[4*sizeof(long double)]; + case CV_REG_ST0 + 5: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[5*sizeof(long double)]; + case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; + case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + + case CV_REG_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; + case CV_REG_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; + case CV_REG_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; + case CV_REG_SS: *size = sizeof(ctx->SegSs); return &ctx->SegSs; + case CV_REG_DS: *size = sizeof(ctx->SegDs); return &ctx->SegDs; + case CV_REG_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; + case CV_REG_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + + } +#endif + FIXME("Unknown register %x\n", regno); return NULL; } static const char* i386_fetch_regname(unsigned regno) { + switch (regno) + { + case CV_REG_EAX: return "eax"; + case CV_REG_EDX: return "edx"; + case CV_REG_ECX: return "ecx"; + case CV_REG_EBX: return "ebx"; + case CV_REG_ESI: return "esi"; + case CV_REG_EDI: return "edi"; + case CV_REG_EBP: return "ebp"; + case CV_REG_ESP: return "esp"; + case CV_REG_EIP: return "eip"; + + case CV_REG_ST0 + 0: return "st0"; + case CV_REG_ST0 + 1: return "st1"; + case CV_REG_ST0 + 2: return "st2"; + case CV_REG_ST0 + 3: return "st3"; + case CV_REG_ST0 + 4: return "st4"; + case CV_REG_ST0 + 5: return "st5"; + case CV_REG_ST0 + 6: return "st6"; + case CV_REG_ST0 + 7: return "st7"; + + case CV_REG_EFLAGS: return "eflags"; + case CV_REG_ES: return "es"; + case CV_REG_CS: return "cs"; + case CV_REG_SS: return "ss"; + case CV_REG_DS: return "ds"; + case CV_REG_FS: return "fs"; + case CV_REG_GS: return "gs"; + } FIXME("Unknown register %x\n", regno); return NULL; }

1 0

Henri Verbeet : wined3d: Use the rep instead of the apply function to determine if a state is used.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f70193b9156b2c2f2cb9912d29b56fe4dc2a2d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70193b9156b2c2f2cb9912d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:45 2010 +0200 wined3d: Use the rep instead of the apply function to determine if a state is used. --- 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 04de86f..3602b83 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5723,7 +5723,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * applying later lines, but do not record anything in the state * table */ - if(!cur[i].content.apply) continue; + if (!cur[i].content.representative) continue; handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply;

1 0

Henri Verbeet : wined3d: Explicitly set the state handler to NULL for states with a representative.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 57cfd613a59022c48ca4ca45996a85115c2d4c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cfd613a59022c48ca4ca459… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:46 2010 +0200 wined3d: Explicitly set the state handler to NULL for states with a representative. We should never call the handler for states that have a rep. --- dlls/wined3d/arb_program_shader.c | 216 +++++++++++----------- dlls/wined3d/ati_fragment_shader.c | 196 ++++++++++---------- dlls/wined3d/nvidia_texture_shader.c | 168 +++++++++--------- dlls/wined3d/state.c | 334 +++++++++++++++++----------------- 4 files changed, 457 insertions(+), 457 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57cfd613a59022c48ca4c…

1 0

Henri Verbeet : wined3d: Verify each state table entry has either a handler or a representative.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f4330add3928e06131ddc5ede6148ca4c268e9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4330add3928e06131ddc5ede… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:47 2010 +0200 wined3d: Verify each state table entry has either a handler or a representative. --- dlls/wined3d/state.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 607ceab..4465b9d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5662,11 +5662,24 @@ static void validate_state_table(struct StateEntry *state_table) for (i = 0; i < STATE_HIGHEST + 1; ++i) { DWORD rep = state_table[i].representative; - if (rep && !state_table[rep].representative) + if (rep) { - ERR("State %s (%#x) has invalid representative %s (%#x).\n", - debug_d3dstate(i), i, debug_d3dstate(rep), rep); - state_table[i].representative = 0; + if (!state_table[rep].representative) + { + ERR("State %s (%#x) has invalid representative %s (%#x).\n", + debug_d3dstate(i), i, debug_d3dstate(rep), rep); + state_table[i].representative = 0; + } + + if (rep != i) + { + if (state_table[i].apply) + ERR("State %s (%#x) has both a handler and representative.\n", debug_d3dstate(i), i); + } + else if (!state_table[i].apply) + { + ERR("Self representing state %s (%#x) has no handler.\n", debug_d3dstate(i), i); + } } } }

1 0

Henri Verbeet : wined3d: Add a state table entry for WINED3DRS_INDEXEDVERTEXBLENDENABLE.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 8afeb34559ef89008270fbfa582817cade4c9f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8afeb34559ef89008270fbfa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:48 2010 +0200 wined3d: Add a state table entry for WINED3DRS_INDEXEDVERTEXBLENDENABLE. --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4465b9d..ddf4f77 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5405,6 +5405,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), NULL }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_TWEENFACTOR), { STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_INDEXEDVERTEXBLENDENABLE), { STATE_RENDER(WINED3DRS_VERTEXBLEND), NULL }, WINED3D_GL_EXT_NONE }, /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states.

1 0

Henri Verbeet : wined3d: Remove some superfluous white space and braces from the card selection functions .
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: a2344e7288a35dad2678456ac8dc34b49e724999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2344e7288a35dad2678456ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:49 2010 +0200 wined3d: Remove some superfluous white space and braces from the card selection functions. --- dlls/wined3d/directx.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 464e43e..bddb40e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1247,8 +1247,8 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s -enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. @@ -1491,8 +1491,8 @@ enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info * } -enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * @@ -1647,8 +1647,8 @@ enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_info *gl_ } -enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { if (strstr(gl_renderer, "X3100")) { @@ -1673,8 +1673,8 @@ enum wined3d_pci_device select_card_intel_binary(const struct wined3d_gl_info *g } -enum wined3d_pci_device (select_card_ati_mesa)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * @@ -1882,8 +1882,8 @@ enum wined3d_pci_device (select_card_ati_mesa)(const struct wined3d_gl_info *gl_ } -enum wined3d_pci_device (select_card_nvidia_mesa)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { FIXME_(d3d_caps)("Card selection not handled for Mesa Nouveau driver\n"); if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; @@ -1893,8 +1893,8 @@ enum wined3d_pci_device (select_card_nvidia_mesa)(const struct wined3d_gl_info * return CARD_NVIDIA_RIVA_128; } -enum wined3d_pci_device (select_card_intel_mesa)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - unsigned int *vidmem ) +enum wined3d_pci_device select_card_intel_mesa(const struct wined3d_gl_info *gl_info, + const char *gl_renderer, unsigned int *vidmem) { FIXME_(d3d_caps)("Card selection not handled for Mesa Intel driver\n"); return CARD_INTEL_I915G;

1 0

Piotr Caban : msvcrt: Move invalid parameter tests to msvcr90.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: f377e4be6b97db27d58a6da96d4867cd39fa2188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f377e4be6b97db27d58a6da96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 1 12:39:50 2010 +0200 msvcrt: Move invalid parameter tests to msvcr90. --- dlls/msvcr90/tests/msvcr90.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 32 -------------------------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 5fe00b2..3ff7135 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -35,6 +35,8 @@ static int *p_sys_nerr; static int* (__cdecl *p__sys_nerr)(void); static char **p_sys_errlist; static char** (__cdecl *p__sys_errlist)(void); +static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); +static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); int cb_called[4]; @@ -193,6 +195,37 @@ static void test_error_messages(void) ok(*p_sys_errlist == *(p__sys_errlist()), "p_sys_errlist != p__sys_errlist()\n"); } +static void test__strtoi64(void) +{ + __int64 res; + unsigned __int64 ures; + + if(!p_strtoi64 || !p_strtoui64) { + win_skip("_strtoi64 or _strtoui64 not found\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + errno = 0xdeadbeef; + res = p_strtoi64(NULL, NULL, 10); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 1); + ok(res == 0, "res != 0\n"); + res = p_strtoi64("123", NULL, 37); + ok(res == 0, "res != 0\n"); + ures = p_strtoui64(NULL, NULL, 10); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 1); + ok(ures == 0, "res = %d\n", (int)ures); + ures = p_strtoui64("123", NULL, 37); + ok(ures == 0, "res = %d\n", (int)ures); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); +} + /* ########## */ START_TEST(msvcr90) @@ -219,8 +252,11 @@ START_TEST(msvcr90) p__sys_nerr = (void *) GetProcAddress(hcrt, "__sys_nerr"); p_sys_errlist = (void *) GetProcAddress(hcrt, "_sys_errlist"); p__sys_errlist = (void *) GetProcAddress(hcrt, "__sys_errlist"); + p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); + p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); test__initterm_e(); test__encode_pointer(); test_error_messages(); + test__strtoi64(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a4926d9..c873d18 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,7 +56,6 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); -static _invalid_parameter_handler *p_invalid_parameter; static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -65,17 +64,6 @@ static unsigned char *p_mbctype; HMODULE hMsvcrt; -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, - const wchar_t *function, const wchar_t *file, - unsigned line, unsigned *res) -{ - ok(expression == NULL, "expression is not NULL\n"); - ok(function == NULL, "function is not NULL\n"); - ok(file == NULL, "file is not NULL\n"); - ok(line == 0, "line = %u\n", line); - ok(res == NULL, "res = %p\n", res); -} - static void test_swab( void ) { char original[] = "BADCFEHGJILKNMPORQTSVUXWZY@#"; char expected1[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ@#"; @@ -968,23 +956,6 @@ static void test__strtoi64(void) return; } - if(p_invalid_parameter) { - errno = 0xdeadbeef; - res = p_strtoi64(NULL, NULL, 10); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 1); - ok(res == 0, "res != 0\n"); - res = p_strtoi64(no1, NULL, 37); - ok(res == 0, "res != 0\n"); - ures = p_strtoui64(NULL, NULL, 10); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 1); - ok(ures == 0, "res = %d\n", (int)ures); - ures = p_strtoui64(no1, NULL, 37); - ok(ures == 0, "res = %d\n", (int)ures); - ok(errno == 0xdeadbeef, "errno = %x\n", errno); - } - errno = 0xdeadbeef; res = p_strtoi64(no1, NULL, 10); ok(res == 31923, "res != 31923\n"); @@ -1123,9 +1094,6 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(p_mbctype,"_mbctype"); SET(p__mb_cur_max,"__mb_cur_max"); - p_invalid_parameter = (void *)GetProcAddress( hMsvcrt,"_invalid_parameter"); - if(p_invalid_parameter) - *p_invalid_parameter = test_invalid_parameter_handler; pstrcpy_s = (void *)GetProcAddress( hMsvcrt,"strcpy_s" ); pstrcat_s = (void *)GetProcAddress( hMsvcrt,"strcat_s" ); p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" );

1 0