March 2007 - Wine-commits - list.winehq.org

Dan Kegel : advapi32: RegGetKeySecurity needs to pass length of struct to caller.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 60cb73b573d139f49b4445318ce3762685a9ff87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cb73b573d139f49b4445318… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Mar 12 09:16:28 2007 -0700 advapi32: RegGetKeySecurity needs to pass length of struct to caller. --- dlls/advapi32/registry.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 6589a23..7f673c0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2234,8 +2234,10 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInformati /* FIXME: Check for valid SecurityInformation values */ - if (*lpcbSecurityDescriptor < sizeof(SECURITY_DESCRIPTOR)) + if (*lpcbSecurityDescriptor < sizeof(SECURITY_DESCRIPTOR)) { + *lpcbSecurityDescriptor = sizeof(SECURITY_DESCRIPTOR); return ERROR_INSUFFICIENT_BUFFER; + } FIXME("(%p,%d,%p,%d): stub\n",hkey,SecurityInformation, pSecurityDescriptor,lpcbSecurityDescriptor?*lpcbSecurityDescriptor:0); @@ -2243,6 +2245,7 @@ LONG WINAPI RegGetKeySecurity( HKEY hkey, SECURITY_INFORMATION SecurityInformati /* Do not leave security descriptor filled with garbage */ RtlCreateSecurityDescriptor(pSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION); + *lpcbSecurityDescriptor = sizeof(SECURITY_DESCRIPTOR); return ERROR_SUCCESS; }

1 0

H. Verbeet : wined3d: Correct various texture limits checks.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 23cd4475f6ff941a1f26d20ac6f6d8e67540f3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cd4475f6ff941a1f26d20ac… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:21:44 2007 +0100 wined3d: Correct various texture limits checks. --- dlls/wined3d/state.c | 19 +++++++++++-------- dlls/wined3d/stateblock.c | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cf1b7f4..0e12a23 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1173,7 +1173,7 @@ static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, W val = GL_FALSE; } - for (i = 0; i < GL_LIMITS(texture_stages); i++) { + for (i = 0; i < GL_LIMITS(textures); i++) { /* Note the WINED3DRS value applies to all textures, but GL has one * per texture, so apply it now ready to be used! */ @@ -1496,7 +1496,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D if (mapped_stage != -1) { if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (mapped_stage >= GL_LIMITS(sampler_stages)) { + if (mapped_stage >= GL_LIMITS(textures)) { if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { FIXME("Attempt to enable unsupported stage!\n"); @@ -1569,7 +1569,7 @@ static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D /* Do not care for enabled / disabled stages, just assign the settigns. colorop disables / enables required stuff */ if (mapped_stage != -1) { if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (stage >= GL_LIMITS(sampler_stages)) { + if (stage >= GL_LIMITS(textures)) { if (stateblock->textureState[stage][WINED3DTSS_COLOROP] != WINED3DTOP_DISABLE && stateblock->textureState[stage][WINED3DTSS_COLOROP] != 0) { FIXME("Attempt to enable unsupported stage!\n"); @@ -1625,14 +1625,17 @@ static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD texUnit = state - STATE_TRANSFORM(WINED3DTS_TEXTURE0); + DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; + + if (mapped_stage < 0) return; if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if(texUnit >= GL_LIMITS(sampler_stages)) { + if(mapped_stage >= GL_LIMITS(textures)) { return; } - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stateblock->wineD3DDevice->texUnitMap[texUnit])); + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); - } else if (texUnit > 0) { + } else if (mapped_stage > 0) { /* We can't do anything here */ WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); return; @@ -1656,7 +1659,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if(stage >= GL_LIMITS(sampler_stages)) { + if(mapped_stage >= GL_LIMITS(samplers)) { return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); @@ -1881,7 +1884,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if(sampler >= GL_LIMITS(sampler_stages)) { + if (mapped_stage >= GL_LIMITS(samplers)) { return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f9be5e9..5ccd5ee 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1062,7 +1062,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat then the default texture will kick in until replaced by a SetTexture call */ ENTER_GL(); - for (i = 0; i < GL_LIMITS(texture_stages); i++) { + for (i = 0; i < GL_LIMITS(textures); i++) { GLubyte white = 255; /* Note this avoids calling settexture, so pretend it has been called */

1 0

Huw Davies : rpcrt4: Tests that show that the allocation rules for unmarshaling a conformant array are the same as those for a simple structure .
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 6fcff278b34820749ef5ed505f03b5f9bb660a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcff278b34820749ef5ed505… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 12 14:08:52 2007 +0000 rpcrt4: Tests that show that the allocation rules for unmarshaling a conformant array are the same as those for a simple structure. --- dlls/rpcrt4/tests/ndr_marshall.c | 116 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index a1d8f5e..4100822 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -984,6 +984,121 @@ todo_wine { /* NdrFree isn't exported so we can't test free'ing */ } +static void test_conformant_array(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + unsigned char *mem, *mem_orig; + unsigned char memsrc[20]; + + static const unsigned char fmtstr_conf_array[] = + { + 0x1b, /* FC_CARRAY */ + 0x0, /* align */ + NdrFcShort( 0x1 ), /* elem size */ + 0x40, /* Corr desc: const */ + 0x0, + NdrFcShort(0x10), /* const = 0x10 */ + 0x1, /* FC_BYTE */ + 0x5b /* FC_END */ + }; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_conf_array; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + NdrConformantArrayBufferSize( &StubMsg, + memsrc, + fmtstr_conf_array ); + ok(StubMsg.BufferLength >= 20, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrConformantArrayMarshall( &StubMsg, memsrc, fmtstr_conf_array ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == 20, "Buffer %p Start %p len %d\n", StubMsg.Buffer, StubMsg.BufferStart, 20); + ok(!memcmp(StubMsg.BufferStart + 4, memsrc, 16), "incorrectly marshaled\n"); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + /* passing mem == NULL with must_alloc == 0 crashes under Windows */ + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 1); + ok(mem != NULL, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 4, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem_orig = mem; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(mem != StubMsg.BufferStart + 4, "mem pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 1); + ok(mem != mem_orig, "mem not alloced\n"); + ok(mem != StubMsg.BufferStart + 4, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayFree( &StubMsg, mem, fmtstr_conf_array ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + StubMsg.pfnFree(mem); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 0); +todo_wine { + ok(mem == StubMsg.BufferStart + 4, "mem not pointing at buffer\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); +} + my_alloc_called = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 1); + ok(mem != StubMsg.BufferStart + 4, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + StubMsg.pfnFree(mem); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + mem = mem_orig; + StubMsg.Buffer = StubMsg.BufferStart; + NdrConformantArrayUnmarshall( &StubMsg, &mem, fmtstr_conf_array, 1); + ok(mem != StubMsg.BufferStart + 4, "mem pointing at buffer\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + StubMsg.pfnFree(mem); + StubMsg.pfnFree(mem_orig); + + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + START_TEST( ndr_marshall ) { test_ndr_simple_type(); @@ -992,4 +1107,5 @@ START_TEST( ndr_marshall ) test_fullpointer_xlat(); test_client_init(); test_ndr_allocate(); + test_conformant_array(); }

1 0

Huw Davies : ole32: Only retrieve posted and paint messages in an STA message loop.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: a8c72b76cf1c5b5015f8c10e393cc408b450e69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c72b76cf1c5b5015f8c10e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 12 15:11:45 2007 +0000 ole32: Only retrieve posted and paint messages in an STA message loop. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a5a3220..fe180aa 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3128,7 +3128,7 @@ static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) /* first try to retrieve messages for incoming COM calls to the apartment window */ return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ - PeekMessageW(msg, NULL, 0, WM_USER - 1, PM_REMOVE|PM_NOYIELD); + PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0

Andrew Talbot : advapi32: Explicitly initialize nested array element.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: dea58c017d3c0bfdf2be3943ac36eb0aeaac9683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea58c017d3c0bfdf2be3943a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 12 12:06:31 2007 +0000 advapi32: Explicitly initialize nested array element. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5d66d0a..a0b4b3c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -86,7 +86,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'C','G'}, WinCreatorGroupSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_RID } } }, { {0,0}, WinCreatorOwnerServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_OWNER_SERVER_RID } } }, { {0,0}, WinCreatorGroupServerSid, { SID_REVISION, 1, { SECURITY_CREATOR_SID_AUTHORITY }, { SECURITY_CREATOR_GROUP_SERVER_RID } } }, - { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { } } }, + { {0,0}, WinNtAuthoritySid, { SID_REVISION, 0, { SECURITY_NT_AUTHORITY }, { SECURITY_NULL_RID } } }, { {0,0}, WinDialupSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_DIALUP_RID } } }, { {'N','U'}, WinNetworkSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_RID } } }, { {0,0}, WinBatchSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_BATCH_RID } } },

1 0

Andrew Talbot : advpack: Constify some variables.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 982a6a5a60226f95efab2b0e45abcda4ebb692a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982a6a5a60226f95efab2b0e4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 12 20:49:29 2007 +0000 advpack: Constify some variables. --- dlls/advpack/files.c | 4 ++-- dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index df7b06d..134ed1c 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -603,7 +603,7 @@ static void free_file_node(struct ExtractFileList *pNode) } /* determines whether szFile is in the NULL-separated szFileList */ -static BOOL file_in_list(LPSTR szFile, LPSTR szFileList) +static BOOL file_in_list(LPCSTR szFile, LPCSTR szFileList) { DWORD dwLen = lstrlenA(szFile); DWORD dwTestLen; @@ -627,7 +627,7 @@ static BOOL file_in_list(LPSTR szFile, LPSTR szFileList) /* removes nodes from the linked list that aren't specified in szFileList * returns the number of files that are in both the linked list and szFileList */ -static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR szFileList) +static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPCSTR szFileList) { DWORD dwNumFound = 0; struct ExtractFileList *pNode; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 0c12d9d..1209ea8 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -214,7 +214,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator) return token; } -static BOOL is_full_path(LPWSTR path) +static BOOL is_full_path(LPCWSTR path) { const int MIN_PATH_LEN = 3; @@ -229,7 +229,7 @@ static BOOL is_full_path(LPWSTR path) /* retrieves the contents of a field, dynamically growing the buffer if necessary */ static WCHAR *get_field_string(INFCONTEXT *context, DWORD index, WCHAR *buffer, - WCHAR *static_buffer, DWORD *size) + const WCHAR *static_buffer, DWORD *size) { DWORD required; diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index cd52514..bfa136f 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -98,7 +98,7 @@ error: return FALSE; } -static void strentry_atow(STRENTRYA *aentry, STRENTRYW *wentry) +static void strentry_atow(const STRENTRYA *aentry, STRENTRYW *wentry) { DWORD name_len, val_len; @@ -171,7 +171,7 @@ HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTa return hr; } -static HRESULT write_predefined_strings(HMODULE hm, LPWSTR ini_path) +static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) { WCHAR mod_path[MAX_PATH + 2]; WCHAR sys_mod_path[MAX_PATH + 2];

1 0

Fabian Bieler : wined3d: Set wrapmode for cubemags to clamp regardless of the sampler state.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 89843f2c279e5dc45690c480ab04ab81fa075b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89843f2c279e5dc45690c480a… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Sat Mar 10 14:37:28 2007 +0100 wined3d: Set wrapmode for cubemags to clamp regardless of the sampler state. --- dlls/wined3d/basetexture.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index c55ceda..c34b9c8 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -279,6 +279,12 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface) { TRACE("Setting GL_TEXTURE_MAX_LEVEL to %d\n", This->baseTexture.levels - 1); glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels - 1); checkGLcall("glTexParameteri(textureDimensions, GL_TEXTURE_MAX_LEVEL, This->baseTexture.levels)"); + if(textureDimensions==GL_TEXTURE_CUBE_MAP_ARB) { + /* Cubemaps are always set to clamp, regardeless of the sampler state. */ + glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(textureDimensions, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + } } } else { /* this only happened if we've run out of openGL textures */ @@ -355,7 +361,13 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface if (*state < minLookup[WINELOOKUP_WARPPARAM] || *state > maxLookup[WINELOOKUP_WARPPARAM]) { FIXME("Unrecognized or unsupported WINED3DTADDRESS_* value %d, state %d\n", *state, textureObjectSamplerStates[i].function); } else { - GLint wrapParm = stateLookup[WINELOOKUP_WARPPARAM][*state - minLookup[WINELOOKUP_WARPPARAM]]; + GLint wrapParm; + if(textureDimensions==GL_TEXTURE_CUBE_MAP_ARB) { + /* Cubemaps are always set to clamp, regardeless of the sampler state. */ + wrapParm = GL_CLAMP_TO_EDGE; + } else { + wrapParm = stateLookup[WINELOOKUP_WARPPARAM][*state - minLookup[WINELOOKUP_WARPPARAM]]; + } TRACE("Setting WRAP_R to %d for %x\n", wrapParm, textureDimensions); glTexParameteri(textureDimensions, warpLookupType(textureObjectSamplerStates[i].function), wrapParm); checkGLcall("glTexParameteri(..., GL_TEXTURE_WRAP_R, wrapParm)");

1 0

Fabian Bieler : wined3d: Implemented signed texture formats via NV_TEXTURE_SHADER.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 8dae597f24ad6df879cd5cbf07b1a7e79d494cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dae597f24ad6df879cd5cbf0… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Mon Mar 12 13:11:04 2007 +0100 wined3d: Implemented signed texture formats via NV_TEXTURE_SHADER. --- dlls/wined3d/arb_program_shader.c | 8 +++++--- dlls/wined3d/surface.c | 32 ++++++++++++++++++++++++++++++-- dlls/wined3d/utils.c | 8 ++++---- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 79148e5..2e636ad 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -694,6 +694,7 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(((IWineD3DDeviceImpl *)(This->baseShader.device))->wineD3D))->gl_info; DWORD dst = arg->dst; DWORD src = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -714,11 +715,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { * So the surface loading code converts the -128 ... 127 signed integers to * 0 ... 255 unsigned ones. The following line undoes that. * - * TODO: Both GL_NV_texture_shader and GL_ATI_envmap_bumpmap provide pixel formats - * suitable for loading the Direct3D perturbation data. If one of them is used, do + * TODO: GL_ATI_envmap_bumpmap provides pixel formats + * suitable for loading the Direct3D perturbation data. If it is used, do * not correct the signedness */ - shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); + if(!GL_SUPPORT(NV_TEXTURE_SHADER3)) + shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); shader_addline(buffer, "DP3 TMP.r, TMP2, T%u;\n", src); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c8d39f6..8d6494b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1455,10 +1455,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; case WINED3DFMT_V8U8: - /* TODO: GL_NV_texture_shader and GL_ATI_envmap_bumpmap provide suitable formats. - * use one of them instead of converting + /* TODO: GL_ATI_envmap_bumpmap provides suitable formats. + * use it instead of converting * Remember to adjust the texbem instruction in the shader */ + if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; @@ -1466,6 +1467,33 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 3; break; + case WINED3DFMT_X8L8V8U8: + if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + FIXME("Conversion for D3D_X8L8V8U8 not implemented\n"); + *format = GL_BGRA; + *internal = GL_RGBA8; + *type = GL_BYTE; + *target_bpp = 4; + break; + + case WINED3DFMT_Q8W8V8U8: + if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + FIXME("Conversion for D3D_Q8W8V8U8 not implemented\n"); + *format = GL_BGRA; + *internal = GL_RGBA8; + *type = GL_BYTE; + *target_bpp = 4; + break; + + case WINED3DFMT_V16U16: + if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + FIXME("Conversion for D3D_V16U16 not implemented\n"); + *format = GL_COLOR_INDEX; + *internal = GL_COLOR_INDEX; + *type = GL_SHORT; + *target_bpp = 4; + break; + default: break; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9c82ef0..510855c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -82,11 +82,11 @@ static const PixelFormatDesc formats[] = { {WINED3DFMT_A8L8 ,0x0000ff00 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_LUMINANCE8_ALPHA8 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_A4L4 ,0x000000f0 ,0x0 ,0x0 ,0x0 ,1 ,FALSE ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, /* Bump mapping stuff */ - {WINED3DFMT_V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_RGB8 ,GL_BGR ,GL_BYTE /* needs conversion! */}, + {WINED3DFMT_V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_DSDT8_NV ,GL_DSDT_NV ,GL_BYTE }, {WINED3DFMT_L6V5U5 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT_5_5_5_1 }, - {WINED3DFMT_X8L8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_BGRA ,GL_UNSIGNED_BYTE }, - {WINED3DFMT_Q8W8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_RGBA8 ,GL_RGBA ,GL_UNSIGNED_INT_8_8_8_8_REV/*?*/}, - {WINED3DFMT_V16U16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT }, + {WINED3DFMT_X8L8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DSDT8_MAG8_INTENSITY8_NV,GL_DSDT_MAG_INTENSITY_NV,GL_BYTE }, + {WINED3DFMT_Q8W8V8U8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_SIGNED_RGBA8_NV ,GL_RGBA ,GL_BYTE }, + {WINED3DFMT_V16U16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_SIGNED_HILO16_NV ,GL_HILO_NV ,GL_SHORT }, {WINED3DFMT_W11V11U10 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_A2W10V10U10 ,0xb0000000 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, /* Depth stencil formats */

1 0

Alexandre Julliard : Fixed some compilation issues on Mac OS X Leopard.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 0d16a7bbe4b4ab510dfb68e267109418ca9f2ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d16a7bbe4b4ab510dfb68e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 16:14:18 2007 +0100 Fixed some compilation issues on Mac OS X Leopard. --- dlls/ntdll/signal_i386.c | 28 +++++++++++++++++++++++----- server/mach.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 75385c2..0c32374 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -243,6 +243,27 @@ typedef struct ucontext SIGCONTEXT; typedef ucontext_t SIGCONTEXT; +/* work around silly renaming of struct members in OS X 10.5 */ +#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32) +#define EAX_sig(context) ((context)->uc_mcontext->__ss.__eax) +#define EBX_sig(context) ((context)->uc_mcontext->__ss.__ebx) +#define ECX_sig(context) ((context)->uc_mcontext->__ss.__ecx) +#define EDX_sig(context) ((context)->uc_mcontext->__ss.__edx) +#define ESI_sig(context) ((context)->uc_mcontext->__ss.__esi) +#define EDI_sig(context) ((context)->uc_mcontext->__ss.__edi) +#define EBP_sig(context) ((context)->uc_mcontext->__ss.__ebp) +#define CS_sig(context) ((context)->uc_mcontext->__ss.__cs) +#define DS_sig(context) ((context)->uc_mcontext->__ss.__ds) +#define ES_sig(context) ((context)->uc_mcontext->__ss.__es) +#define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) +#define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) +#define SS_sig(context) ((context)->uc_mcontext->__ss.__ss) +#define EFL_sig(context) ((context)->uc_mcontext->__ss.__eflags) +#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__eip)) +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) +#define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) +#define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) +#else #define EAX_sig(context) ((context)->uc_mcontext->ss.eax) #define EBX_sig(context) ((context)->uc_mcontext->ss.ebx) #define ECX_sig(context) ((context)->uc_mcontext->ss.ecx) @@ -250,21 +271,18 @@ typedef ucontext_t SIGCONTEXT; #define ESI_sig(context) ((context)->uc_mcontext->ss.esi) #define EDI_sig(context) ((context)->uc_mcontext->ss.edi) #define EBP_sig(context) ((context)->uc_mcontext->ss.ebp) - #define CS_sig(context) ((context)->uc_mcontext->ss.cs) #define DS_sig(context) ((context)->uc_mcontext->ss.ds) #define ES_sig(context) ((context)->uc_mcontext->ss.es) #define FS_sig(context) ((context)->uc_mcontext->ss.fs) #define GS_sig(context) ((context)->uc_mcontext->ss.gs) #define SS_sig(context) ((context)->uc_mcontext->ss.ss) - #define EFL_sig(context) ((context)->uc_mcontext->ss.eflags) - #define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.eip)) #define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->ss.esp)) - #define TRAP_sig(context) ((context)->uc_mcontext->es.trapno) #define ERROR_sig(context) ((context)->uc_mcontext->es.err) +#endif #endif /* __APPLE__ */ @@ -1335,7 +1353,7 @@ BOOL SIGNAL_Init(void) struct sigaction sig_act; #ifdef HAVE_SIGALTSTACK - struct sigaltstack ss; + stack_t ss; #ifdef __APPLE__ int mib[2], val = 1; diff --git a/server/mach.c b/server/mach.c index 5996ba4..4e643ce 100644 --- a/server/mach.c +++ b/server/mach.c @@ -162,7 +162,8 @@ void finish_process_tracing( struct process *process ) /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int flags ) { - struct x86_debug_state32 state; +#ifdef __i386__ + x86_debug_state32_t state; mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); @@ -180,21 +181,33 @@ void get_thread_context( struct thread *thread, CONTEXT *context, unsigned int f if (!thread_get_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, &count )) { +/* work around silly renaming of struct members in OS X 10.5 */ +#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) + context->Dr0 = state.__dr0; + context->Dr1 = state.__dr1; + context->Dr2 = state.__dr2; + context->Dr3 = state.__dr3; + context->Dr6 = state.__dr6; + context->Dr7 = state.__dr7; +#else context->Dr0 = state.dr0; context->Dr1 = state.dr1; context->Dr2 = state.dr2; context->Dr3 = state.dr3; context->Dr6 = state.dr6; context->Dr7 = state.dr7; +#endif context->ContextFlags |= CONTEXT_DEBUG_REGISTERS; } mach_port_deallocate( mach_task_self(), port ); +#endif } /* set the thread x86 registers */ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned int flags ) { - struct x86_debug_state32 state; +#ifdef __i386__ + x86_debug_state32_t state; mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); @@ -210,6 +223,16 @@ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned return; } +#if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) + state.__dr0 = context->Dr0; + state.__dr1 = context->Dr1; + state.__dr2 = context->Dr2; + state.__dr3 = context->Dr3; + state.__dr4 = 0; + state.__dr5 = 0; + state.__dr6 = context->Dr6; + state.__dr7 = context->Dr7; +#else state.dr0 = context->Dr0; state.dr1 = context->Dr1; state.dr2 = context->Dr2; @@ -218,6 +241,7 @@ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned state.dr5 = 0; state.dr6 = context->Dr6; state.dr7 = context->Dr7; +#endif if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count )) { if (thread->context) /* update the cached values */ @@ -231,6 +255,7 @@ void set_thread_context( struct thread *thread, const CONTEXT *context, unsigned } } mach_port_deallocate( mach_task_self(), port ); +#endif } int send_thread_signal( struct thread *thread, int sig )

1 0

appdb/include appData.php application.php scre ...
by WineHQ 13 Mar '07

13 Mar '07

ChangeSet ID: 30959 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/03/12 19:26:31 Modified files: include : appData.php application.php screenshot.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Let objectManager handle screenshot queue processing Patch: http://cvs.winehq.org/patch.py?id=30959 Old revision New revision Changes Path 1.7 1.8 +44 -4 appdb/include/appData.php 1.90 1.91 +7 -0 appdb/include/application.php 1.57 1.58 +57 -0 appdb/include/screenshot.php 1.104 1.105 +8 -1 appdb/include/version.php

1 0