September 2009 - Wine-commits

Alexandre Julliard : kernel32/tests: Avoid size_t in traces.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: d916ce2fc9c068c91439f1a134d423b0ef8c411d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d916ce2fc9c068c91439f1a13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 11:53:06 2009 +0200 kernel32/tests: Avoid size_t in traces. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ca1fb5a..fe54907 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1802,7 +1802,7 @@ static void test_FoldStringA(void) { ok(ret == 2 || ret == lstrlenA(foldczone_special[j].dst) + 1, "Expected ret == 2 or %d, got %d, error %d\n", - strlen(foldczone_special[j].dst) + 1, ret, GetLastError()); + lstrlenA(foldczone_special[j].dst) + 1, ret, GetLastError()); ok(src[0] == dst[0] || lstrcmpA(foldczone_special[j].dst, dst) == 0, "MAP_FOLDCZONE: string mismatch for 0x%02x\n", (unsigned char)src[0]);

1 0

Alexandre Julliard : setupapi: Fix a compiler warning.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 838823b00866752689457dec3927afe4d8f78bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=838823b00866752689457dec3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 2 11:52:57 2009 +0200 setupapi: Fix a compiler warning. --- dlls/setupapi/fakedll.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 51d7790..1b39d2e 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -375,6 +375,7 @@ static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, un ptr = prepend( ptr, path, strlen(path) ); if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; } + goto done; found: if (!fstat( fd, &st ))

1 0

Ismael Barros : dpwsockx: Stub implementation.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 17afb0ddd43979b8df71bf70ac5cb8ea20ae011a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17afb0ddd43979b8df71bf70a… Author: Ismael Barros <razielmine(a)gmail.com> Date: Tue Sep 1 01:50:46 2009 +0200 dpwsockx: Stub implementation. --- dlls/dpwsockx/Makefile.in | 2 +- dlls/dpwsockx/dpwsockx_main.c | 164 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index cebac28..c2c5f8c 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dpwsockx.dll -IMPORTS = kernel32 +IMPORTS = dxguid kernel32 C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index 271915a..e8fe902 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -28,9 +28,9 @@ #include "dplay.h" #include "wine/dplaysp.h" - WINE_DEFAULT_DEBUG_CHANNEL(dplay); + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -53,11 +53,169 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } +static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) +{ + FIXME( "(%p,%d,%p,%u) stub\n", + data->lpMessage, data->dwMessageSize, + data->lpISP, data->bReturnStatus ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_Reply( LPDPSP_REPLYDATA data ) +{ + FIXME( "(%p,%p,%d,%d,%p) stub\n", + data->lpSPMessageHeader, data->lpMessage, data->dwMessageSize, + data->idNameServer, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_Send( LPDPSP_SENDDATA data ) +{ + FIXME( "(0x%08x,%d,%d,%p,%d,%u,%p) stub\n", + data->dwFlags, data->idPlayerTo, data->idPlayerFrom, + data->lpMessage, data->dwMessageSize, + data->bSystemMessage, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_CreatePlayer( LPDPSP_CREATEPLAYERDATA data ) +{ + FIXME( "(%d,0x%08x,%p,%p) stub\n", + data->idPlayer, data->dwFlags, + data->lpSPMessageHeader, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_DeletePlayer( LPDPSP_DELETEPLAYERDATA data ) +{ + FIXME( "(%d,0x%08x,%p) stub\n", + data->idPlayer, data->dwFlags, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_GetAddress( LPDPSP_GETADDRESSDATA data ) +{ + FIXME( "(%d,0x%08x,%p,%p,%p) stub\n", + data->idPlayer, data->dwFlags, data->lpAddress, + data->lpdwAddressSize, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_GetCaps( LPDPSP_GETCAPSDATA data ) +{ + FIXME( "(%d,%p,0x%08x,%p)\n", + data->idPlayer, data->lpCaps, data->dwFlags, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_Open( LPDPSP_OPENDATA data ) +{ + FIXME( "(%u,%p,%p,%u,0x%08x,0x%08x) stub\n", + data->bCreate, data->lpSPMessageHeader, data->lpISP, + data->bReturnStatus, data->dwOpenFlags, data->dwSessionFlags ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_CloseEx( LPDPSP_CLOSEDATA data ) +{ + FIXME( "(%p) stub\n", data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_ShutdownEx( LPDPSP_SHUTDOWNDATA data ) +{ + FIXME( "(%p) stub\n", data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_GetAddressChoices( LPDPSP_GETADDRESSCHOICESDATA data ) +{ + FIXME( "(%p,%p,%p) stub\n", + data->lpAddress, data->lpdwAddressSize, data->lpISP ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_SendEx( LPDPSP_SENDEXDATA data ) +{ + FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p,%u) stub\n", + data->lpISP, data->dwFlags, data->idPlayerTo, data->idPlayerFrom, + data->lpSendBuffers, data->cBuffers, data->dwMessageSize, + data->dwPriority, data->dwTimeout, data->lpDPContext, + data->lpdwSPMsgID, data->bSystemMessage ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_SendToGroupEx( LPDPSP_SENDTOGROUPEXDATA data ) +{ + FIXME( "(%p,0x%08x,%d,%d,%p,%d,%d,%d,%d,%p,%p) stub\n", + data->lpISP, data->dwFlags, data->idGroupTo, data->idPlayerFrom, + data->lpSendBuffers, data->cBuffers, data->dwMessageSize, + data->dwPriority, data->dwTimeout, data->lpDPContext, + data->lpdwSPMsgID ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_Cancel( LPDPSP_CANCELDATA data ) +{ + FIXME( "(%p,0x%08x,%p,%d,0x%08x,0x%08x) stub\n", + data->lpISP, data->dwFlags, data->lprglpvSPMsgID, data->cSPMsgID, + data->dwMinPriority, data->dwMaxPriority ); + return DPERR_UNSUPPORTED; +} + +static HRESULT WINAPI DPWSCB_GetMessageQueue( LPDPSP_GETMESSAGEQUEUEDATA data ) +{ + FIXME( "(%p,0x%08x,%d,%d,%p,%p) stub\n", + data->lpISP, data->dwFlags, data->idFrom, data->idTo, + data->lpdwNumMsgs, data->lpdwNumBytes ); + return DPERR_UNSUPPORTED; +} + +static void setup_callbacks( LPDPSP_SPCALLBACKS lpCB ) +{ + lpCB->EnumSessions = DPWSCB_EnumSessions; + lpCB->Reply = DPWSCB_Reply; + lpCB->Send = DPWSCB_Send; + lpCB->CreatePlayer = DPWSCB_CreatePlayer; + lpCB->DeletePlayer = DPWSCB_DeletePlayer; + lpCB->GetAddress = DPWSCB_GetAddress; + lpCB->GetCaps = DPWSCB_GetCaps; + lpCB->Open = DPWSCB_Open; + lpCB->CloseEx = DPWSCB_CloseEx; + lpCB->ShutdownEx = DPWSCB_ShutdownEx; + lpCB->GetAddressChoices = DPWSCB_GetAddressChoices; + lpCB->SendEx = DPWSCB_SendEx; + lpCB->SendToGroupEx = DPWSCB_SendToGroupEx; + lpCB->Cancel = DPWSCB_Cancel; + lpCB->GetMessageQueue = DPWSCB_GetMessageQueue; + + lpCB->AddPlayerToGroup = NULL; + lpCB->Close = NULL; + lpCB->CreateGroup = NULL; + lpCB->DeleteGroup = NULL; + lpCB->RemovePlayerFromGroup = NULL; + lpCB->SendToGroup = NULL; + lpCB->Shutdown = NULL; +} + + + /****************************************************************** * SPInit (DPWSOCKX.1) */ HRESULT WINAPI SPInit( LPSPINITDATA lpspData ) { - /* TODO: Initialize callbacks and needed fields in lpspData */ - return DPERR_UNSUPPORTED; + TRACE( "Initializing library for %s (%s)\n", + wine_dbgstr_guid(lpspData->lpGuid), debugstr_w(lpspData->lpszName) ); + + /* We only support TCP/IP service */ + if ( !IsEqualGUID(lpspData->lpGuid, &DPSPGUID_TCPIP) ) + { + return DPERR_UNAVAILABLE; + } + + /* Assign callback functions */ + setup_callbacks( lpspData->lpCB ); + + return DP_OK; }

1 0

Henri Verbeet : wined3d: Print a warning when an ARB program exceeds the native resource limits.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 4cdb1c92119738eb49fb7e811950cb96f9b9262f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cdb1c92119738eb49fb7e811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 2 09:27:58 2009 +0200 wined3d: Print a warning when an ARB program exceeds the native resource limits. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index be2dfd2..a26950c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3016,6 +3016,14 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf FIXME("Vertex program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } return program_id; } @@ -3070,6 +3078,14 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_i FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } return program_id; } @@ -3515,6 +3531,14 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); retval = 0; } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } /* Load immediate constants */ if(lconst_map) { @@ -3909,7 +3933,15 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct FIXME("HW VertexShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); ret = -1; - } else { + } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + /* Load immediate constants */ if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { @@ -5742,6 +5774,15 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } + shader_buffer_free(&buffer); return ret; } @@ -6433,6 +6474,15 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } + shader_buffer_free(&buffer); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Properly check for ARB program compile errors.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 055906e2a9466ca70a7b7ac7aeafb30938e024a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055906e2a9466ca70a7b7ac7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 2 09:27:57 2009 +0200 wined3d: Properly check for ARB program compile errors. --- dlls/wined3d/arb_program_shader.c | 62 ++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dd35113..be2dfd2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2994,6 +2994,8 @@ static void shader_hw_call(const struct wined3d_shader_instruction *ins) static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_info) { GLuint program_id = 0; + GLint pos; + const char *blt_vprogram = "!!ARBvp1.0\n" "PARAM c[1] = { { 1, 0.5 } };\n" @@ -3004,11 +3006,13 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGenProgramsARB(1, &program_id)); GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_id)); - GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(blt_vprogram), blt_vprogram)); + GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(blt_vprogram), blt_vprogram)); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Vertex program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } @@ -3020,6 +3024,8 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_inf static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_info, enum tex_types tex_type) { GLuint program_id = 0; + GLint pos; + static const char * const blt_fprograms[tex_type_count] = { /* tex_1d */ @@ -3054,11 +3060,13 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_i GL_EXTCALL(glGenProgramsARB(1, &program_id)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, program_id)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(blt_fprograms[tex_type]), blt_fprograms[tex_type])); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(blt_fprograms[tex_type]), blt_fprograms[tex_type])); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } @@ -3214,6 +3222,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = This->backend_priv; + GLint errPos; DWORD map; char srgbtmp[4][4]; @@ -3497,10 +3506,11 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, buffer->bsize, buffer->buffer)); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint errPos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + if (errPos != -1) + { FIXME("HW PixelShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); retval = 0; @@ -3781,6 +3791,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; unsigned int i; + GLint errPos; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -3890,10 +3901,11 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, buffer->bsize, buffer->buffer)); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint errPos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + if (errPos != -1) + { FIXME("HW VertexShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); ret = -1; @@ -5486,6 +5498,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; const char *final_combiner_src = "ret"; + GLint pos; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -5719,11 +5732,13 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi /* Generate the shader */ GL_EXTCALL(glGenProgramsARB(1, &ret)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, ret)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(buffer.buffer), buffer.buffer)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } @@ -6305,6 +6320,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct wined3d_shader_buffer buffer; char luminance_component; struct arbfp_blit_priv *priv = device->blit_priv; + GLint pos; /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -6407,11 +6423,13 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu shader_addline(&buffer, "END\n"); ENTER_GL(); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(buffer.buffer), buffer.buffer)); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); }

1 0

Henri Verbeet : wined3d: Release the GL lock on IWineD3DImpl_FillGLCaps() error paths.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: c951f6925c9f2a86c7bb990cad2112ae26e6d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c951f6925c9f2a86c7bb990ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 2 09:27:56 2009 +0200 wined3d: Release the GL lock on IWineD3DImpl_FillGLCaps() error paths. --- dlls/wined3d/directx.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9608f5..9c79bd5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1481,6 +1481,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) TRACE_(d3d_caps)("GL_RENDERER: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_RENDERER.\n"); return FALSE; } @@ -1489,6 +1490,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) gl_renderer = HeapAlloc(GetProcessHeap(), 0, len); if (!gl_renderer) { + LEAVE_GL(); ERR_(d3d_caps)("Failed to allocate gl_renderer memory.\n"); return FALSE; } @@ -1498,6 +1500,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) TRACE_(d3d_caps)("GL_VENDOR: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VENDOR.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; @@ -1510,6 +1513,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) TRACE_(d3d_caps)("GL_VERSION: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VERSION.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; @@ -1560,11 +1564,14 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) GL_Extensions = (const char *)glGetString(GL_EXTENSIONS); if (!GL_Extensions) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_EXTENSIONS.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } + LEAVE_GL(); + TRACE_(d3d_caps)("GL_Extensions reported:\n"); gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE; @@ -1596,8 +1603,6 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } } - LEAVE_GL(); - /* Now work out what GL support this card really has */ #define USE_GL_FUNC(type, pfn, ext, replace) \ { \

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectDepthStencilVariable interface.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 996e8f0dbb09dc8e207c6f3d86ea2502a4a506e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=996e8f0dbb09dc8e207c6f3d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 2 09:27:55 2009 +0200 d3d10: Add the ID3D10EffectDepthStencilVariable interface. --- include/d3d10effect.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b1b3a6f..b96bbe0 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -588,6 +588,44 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable, + 0xaf482368, 0x330a, 0x46a5, 0x9a, 0x5c, 0x01, 0xc7, 0x1a, 0xf2, 0x4c, 0x8d); + +#define INTERFACE ID3D10EffectDepthStencilVariable +DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectDepthStencilVariable methods */ + STDMETHOD(GetDepthStencilState)(THIS_ UINT index, ID3D10DepthStencilState **depth_stencil_state) PURE; + STDMETHOD(GetBackingStore)(THIS_ UINT index, D3D10_DEPTH_STENCIL_DESC *desc) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectBlendVariable interface.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: f8b5a83dd79e2e8b29c5f8ea6b4ea18469fd3a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b5a83dd79e2e8b29c5f8ea6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 2 09:27:54 2009 +0200 d3d10: Add the ID3D10EffectBlendVariable interface. --- include/d3d10effect.h | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 2178e7d..b1b3a6f 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -551,6 +551,43 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectBlendVariable, 0x1fcd2294, 0xdf6d, 0x4eae, 0x86, 0xb3, 0x0e, 0x91, 0x60, 0xcf, 0xb0, 0x7b); + +#define INTERFACE ID3D10EffectBlendVariable +DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectBlendVariable methods */ + STDMETHOD(GetBlendState)(THIS_ UINT index, ID3D10BlendState **blend_state) PURE; + STDMETHOD(GetBackingStore)(THIS_ UINT index, D3D10_BLEND_DESC *desc) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Vincent Povirk : gdiplus: Use WIC to decode JPEG files.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: faad683e47137f8a34d77b6f324da050889cd2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faad683e47137f8a34d77b6f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 1 17:54:45 2009 -0500 gdiplus: Use WIC to decode JPEG files. --- dlls/gdiplus/image.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 61e7b03..0292979 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1507,6 +1507,11 @@ static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, GpImage **ima return decode_image_wic(stream, &CLSID_WICIcoDecoder, image); } +static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image) +{ + return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); +} + static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, GpImage **image) { IPicture *pic; @@ -2060,7 +2065,7 @@ static const struct image_codec codecs[NUM_CODECS] = { /* SigMask */ jpeg_sig_mask, }, NULL, - decode_image_olepicture_bitmap + decode_image_jpeg }, { { /* GIF */

1 0

Vincent Povirk : gdiplus: Use WIC to decode GIF files.
by Alexandre Julliard 02 Sep '09

02 Sep '09

Module: wine Branch: master Commit: 6c2d85ca84858ae79b3244549c88b8560da9c196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2d85ca84858ae79b3244549… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 1 17:56:42 2009 -0500 gdiplus: Use WIC to decode GIF files. --- dlls/gdiplus/image.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0292979..b1e831f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1512,6 +1512,11 @@ static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **ima return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); } +static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) +{ + return decode_image_wic(stream, &CLSID_WICGifDecoder, image); +} + static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, GpImage **image) { IPicture *pic; @@ -2084,7 +2089,7 @@ static const struct image_codec codecs[NUM_CODECS] = { /* SigMask */ gif_sig_mask, }, NULL, - decode_image_olepicture_bitmap + decode_image_gif }, { { /* EMF */

1 0