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

Mikhail Maroukhine : rsaenh/tests: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 1d9e32175148b32d4b52b0c0c51890329eaeaba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9e32175148b32d4b52b0c0c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Apr 1 01:41:23 2010 +0700 rsaenh/tests: Fix compiler warnings with flag -Wcast-qual. --- dlls/rsaenh/tests/rsaenh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index a13ca8e..5fe0033 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -476,7 +476,7 @@ static void test_hashes(void) ok(result, "CryptReleaseContext failed 0x%08x\n", GetLastError()); SetLastError(0xdeadbeef); - result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + result = CryptHashData(hHash, (const BYTE *)"data", sizeof("data"), 0); error = GetLastError(); ok(!result, "CryptHashData succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", error); @@ -493,7 +493,7 @@ static void test_hashes(void) result = CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash); ok(result, "CryptCreateHash failed 0x%08x\n", GetLastError()); - result = CryptHashData(hHash, (BYTE *)"data", sizeof("data"), 0); + result = CryptHashData(hHash, (const BYTE *)"data", sizeof("data"), 0); ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); result = CryptDuplicateHash(hHash, NULL, 0, &hHashClone); @@ -504,7 +504,7 @@ static void test_hashes(void) ok(result, "CryptGetHashParam failed 0x%08x\n", GetLastError()); /* add data after duplicating the hash */ - result = CryptHashData(hHash, (BYTE *)"more data", sizeof("more data"), 0); + result = CryptHashData(hHash, (const BYTE *)"more data", sizeof("more data"), 0); ok(result, "CryptHashData failed 0x%08x\n", GetLastError()); result = CryptDestroyHash(hHash);

1 0

Mikhail Maroukhine : imm32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 42e897f22894a2f8527ffe89641f816f603f91ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e897f22894a2f8527ffe896… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 imm32: Fix compiler warnings with flag -Wcast-qual. --- dlls/imm32/imm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6f97448..2898e5e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1843,10 +1843,10 @@ HKL WINAPI ImmInstallIMEW( if (rc == ERROR_SUCCESS) { - rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (LPBYTE)lpszIMEFileName, + rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (const BYTE*)lpszIMEFileName, (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); if (rc == ERROR_SUCCESS) - rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (LPBYTE)lpszLayoutText, + rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (const BYTE*)lpszLayoutText, (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return hkl;

1 0

Mikhail Maroukhine : quartz: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 0a671deb92000dc18d77c2a2cf32aab04fdbf88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a671deb92000dc18d77c2a2c… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 quartz: Fix compiler warnings with flag -Wcast-qual. --- dlls/quartz/avidec.c | 2 +- dlls/quartz/avisplit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 68b1908..8469bbc 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -203,7 +203,7 @@ static HRESULT AVIDec_ConnectInput(InputPin *pin, const AM_MEDIA_TYPE * pmt) bmi = &format2->bmiHeader; else goto failed; - TRACE("Fourcc: %s\n", debugstr_an((char *)&pmt->subtype.Data1, 4)); + TRACE("Fourcc: %s\n", debugstr_an((const char *)&pmt->subtype.Data1, 4)); This->hvid = ICLocate(pmt->majortype.Data1, pmt->subtype.Data1, bmi, NULL, ICMODE_DECOMPRESS); if (This->hvid) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index faa844b..42ec2ae 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -692,7 +692,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE amt.formattype = FORMAT_WaveFormatEx; break; default: - FIXME("fccType %.4s not handled yet\n", (char *)&pStrHdr->fccType); + FIXME("fccType %.4s not handled yet\n", (const char *)&pStrHdr->fccType); amt.formattype = FORMAT_None; } amt.majortype = MEDIATYPE_Video; @@ -793,7 +793,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); TRACE("bIndexType: %hd\n", pIndex->bIndexType); TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); - TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); if (pIndex->dwReserved[2])

1 0

Mikhail Maroukhine : rpcrt4: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 9b933a35944522dd871d1f8530d2c6818e0aa221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b933a35944522dd871d1f853… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 rpcrt4: Fix compiler warnings with flag -Wcast-qual. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9946bd1..f36069c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2395,7 +2395,7 @@ unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubM TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; if (*pFormat == RPC_FC_CSTRING) { @@ -2445,7 +2445,7 @@ unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", pStubMsg, *ppMemory, pFormat, fMustAlloc); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; ReadVariance(pStubMsg, NULL, maxsize); if (pStubMsg->Offset) @@ -2495,7 +2495,7 @@ void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; SizeVariance(pStubMsg); @@ -2538,7 +2538,7 @@ ULONG WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, TRACE("(pStubMsg == ^%p, pFormat == ^%p)\n", pStubMsg, pFormat); - maxsize = *(USHORT *)&pFormat[2]; + maxsize = *(const USHORT *)&pFormat[2]; ReadVariance(pStubMsg, NULL, maxsize); @@ -6268,7 +6268,7 @@ static unsigned char *WINAPI NdrRangeMarshall( unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); @@ -6294,7 +6294,7 @@ unsigned char *WINAPI NdrRangeUnmarshall( PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false"); @@ -6391,7 +6391,7 @@ static void WINAPI NdrRangeBufferSize( unsigned char *pMemory, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); @@ -6413,7 +6413,7 @@ static ULONG WINAPI NdrRangeMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + const NDR_RANGE *pRange = (const NDR_RANGE *)pFormat; unsigned char base_type; if (pRange->type != RPC_FC_RANGE)

1 0

Mikhail Maroukhine : user32: Fix compiler warnings with flag -Wcast-qual.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 5e78bab2660ec74e0c4cb8fa6b67af49e316b25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e78bab2660ec74e0c4cb8fa6… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Sat Mar 27 02:53:36 2010 +0600 user32: Fix compiler warnings with flag -Wcast-qual. --- dlls/user32/cursoricon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6f2359d..fcdb278 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1038,11 +1038,11 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ while (ptr < end) { - if ((!chunk_type && *(DWORD *)ptr == chunk_id ) - || (chunk_type && *(DWORD *)ptr == chunk_type && *((DWORD *)ptr + 2) == chunk_id )) + if ((!chunk_type && *(const DWORD *)ptr == chunk_id ) + || (chunk_type && *(const DWORD *)ptr == chunk_type && *((const DWORD *)ptr + 2) == chunk_id )) { ptr += sizeof(DWORD); - chunk->data_size = (*(DWORD *)ptr + 1) & ~1; + chunk->data_size = (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); if (chunk_type == ANI_LIST_ID || chunk_type == ANI_RIFF_ID) ptr += sizeof(DWORD); chunk->data = ptr; @@ -1051,7 +1051,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ } ptr += sizeof(DWORD); - ptr += (*(DWORD *)ptr + 1) & ~1; + ptr += (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); } }

1 0

Alexandre Julliard : server: Don' t set the Wow64 flag on a Wow6432Node since it's already a 32-bit node.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 0ea2806c3f75fd1e7758bd6b747bc812929c2386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea2806c3f75fd1e7758bd6b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 1 14:09:12 2010 +0200 server: Don't set the Wow64 flag on a Wow6432Node since it's already a 32-bit node. --- server/registry.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index ff378f5..93d42c9 100644 --- a/server/registry.c +++ b/server/registry.c @@ -537,7 +537,8 @@ static struct key *alloc_subkey( struct key *parent, const struct unicode_str *n for (i = ++parent->last_subkey; i > index; i--) parent->subkeys[i] = parent->subkeys[i-1]; parent->subkeys[index] = key; - if (is_wow6432node( key->name, key->namelen )) parent->flags |= KEY_WOW64; + if (is_wow6432node( key->name, key->namelen ) && !is_wow6432node( parent->name, parent->namelen )) + parent->flags |= KEY_WOW64; } return key; }

1 0

Henri Verbeet : wined3d: Don't call directly into the state table.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 03c472bff09e702689c1d97a32bb832013dee8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c472bff09e702689c1d97a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 1 11:34:44 2010 +0200 wined3d: Don't call directly into the state table. --- dlls/wined3d/arb_program_shader.c | 19 +++++++------------ dlls/wined3d/ati_fragment_shader.c | 5 ++--- dlls/wined3d/state.c | 21 ++++++--------------- dlls/wined3d/wined3d_private.h | 8 ++++++++ 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8e613c9..3c67877 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5377,9 +5377,8 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, s /* The pixel shader has to know the bump env matrix. Do a constants update if it isn't scheduled * anyway */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) + stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } if(device->shader_backend == &arb_program_shader_backend) { @@ -5414,9 +5413,8 @@ static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock /* The pixel shader has to know the luminance offset. Do a constants update if it * isn't scheduled anyway */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_PIXELSHADERCONSTANT)) + stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } if(device->shader_backend == &arb_program_shader_backend) { @@ -6007,13 +6005,10 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select(context, use_pshader, use_vshader); - if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vshader || use_pshader)) { - device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } - } - if(use_pshader) { - device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vshader || use_pshader)) + stateblock_apply_state(STATE_VERTEXSHADERCONSTANT, stateblock, context); } + if (use_pshader) stateblock_apply_state(STATE_PIXELSHADERCONSTANT, stateblock, context); } /* We can't link the fog states to the fragment state directly since the vertex pipeline links them diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0f911e9..c81dffc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -907,9 +907,8 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select(context, FALSE, use_vshader); - if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) { - device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); - } + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && use_vshader) + stateblock_apply_state(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7e6f13..04de86f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -450,10 +450,7 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct /* colorkey fixup for stage 0 alphaop depends on WINED3DRS_ALPHABLENDENABLE state, so it may need updating */ if (stateblock->renderState[WINED3DRS_COLORKEYENABLE]) - { - const struct StateEntry *StateTable = stateblock->device->StateTable; - StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); - } + stateblock_apply_state(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); } static void state_blendfactor_w(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) @@ -506,10 +503,7 @@ static void state_alpha(DWORD state, IWineD3DStateBlockImpl *stateblock, struct } if (enable_ckey || context->last_was_ckey) - { - const struct StateEntry *StateTable = stateblock->device->StateTable; - StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); - } + stateblock_apply_state(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); context->last_was_ckey = enable_ckey; if (stateblock->renderState[WINED3DRS_ALPHATESTENABLE] || @@ -3633,10 +3627,8 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w * while it was enabled, so re-apply them. */ for (i = 0; i < context->gl_info->limits.texture_stages; ++i) { - if(!isStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) { - device->StateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply - (STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); - } + if (!isStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) + stateblock_apply_state(STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); } context->last_was_pshader = FALSE; } @@ -4648,9 +4640,8 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, s context->last_was_vshader = useVertexShaderFunction; - if(updateFog) { - device->StateTable[STATE_RENDER(WINED3DRS_FOGVERTEXMODE)].apply(STATE_RENDER(WINED3DRS_FOGVERTEXMODE), stateblock, context); - } + if (updateFog) stateblock_apply_state(STATE_RENDER(WINED3DRS_FOGVERTEXMODE), stateblock, context); + if(!useVertexShaderFunction) { int i; for(i = 0; i < MAX_TEXTURES; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a812114..097232e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2432,6 +2432,14 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl *device, WINED3DSTATEBLOCKTYPE type) DECLSPEC_HIDDEN; void stateblock_init_contained_states(IWineD3DStateBlockImpl *object) DECLSPEC_HIDDEN; +static inline void stateblock_apply_state(DWORD state, IWineD3DStateBlockImpl *stateblock, + struct wined3d_context *context) +{ + const struct StateEntry *statetable = stateblock->device->StateTable; + DWORD rep = statetable[state].representative; + statetable[rep].apply(rep, stateblock, context); +} + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

André Hentschel : c2man: Replace link to documentation .sgml.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 7cb303b83f73e72aca58eb56e1872f829659c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb303b83f73e72aca58eb56e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 31 19:19:39 2010 +0200 c2man: Replace link to documentation.sgml. --- tools/c2man.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 62d7e17..4fff8d7 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# Generate API documentation. See documentation/documentation.sgml for details. +# Generate API documentation. See http://www.winehq.org/docs/winedev-guide/api-docs for details. # # Copyright (C) 2000 Mike McCormack # Copyright (C) 2003 Jon Griffiths

1 0

Christian Costa : d3dx9_36: Add stub for D3DXLoadVolumeFromMemory.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 60f736af87971143887e526b0ae36bb7dd73163d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f736af87971143887e526b0… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 31 22:45:27 2010 +0200 d3dx9_36: Add stub for D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/Makefile.in | 3 ++- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/volume.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index d7f558b..e38c62a 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -21,7 +21,8 @@ C_SRCS = \ sprite.c \ surface.c \ texture.c \ - util.c + util.c \ + volume.c LEX_SRCS = asmshader.l BISON_SRCS = asmshader.y diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 3e64218..a847aac 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -192,7 +192,7 @@ @ stub D3DXLoadVolumeFromFileA @ stub D3DXLoadVolumeFromFileInMemory @ stub D3DXLoadVolumeFromFileW -@ stub D3DXLoadVolumeFromMemory +@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) @ stub D3DXLoadVolumeFromResourceA @ stub D3DXLoadVolumeFromResourceW @ stub D3DXLoadVolumeFromVolume diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c new file mode 100644 index 0000000..1eae9f4 --- /dev/null +++ b/dlls/d3dx9_36/volume.c @@ -0,0 +1,40 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume, + CONST PALETTEENTRY* destpalette, + CONST D3DBOX* destbox, + LPCVOID srcmemory, + D3DFORMAT srcformat, + UINT srcrowpitch, + UINT srcslicepitch, + CONST PALETTEENTRY* srcpalette, + CONST D3DBOX* srcbox, + DWORD filter, + D3DCOLOR colorkey) +{ + FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat, + srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey); + + return E_NOTIMPL; +}

1 0

Vincent Povirk : advapi32: Add tests for registry keys that have been deleted.
by Alexandre Julliard 01 Apr '10

01 Apr '10

Module: wine Branch: master Commit: 37235a9b46943dc4109ac0296b01ae01fb05c295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37235a9b46943dc4109ac0296… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 31 17:01:22 2010 -0500 advapi32: Add tests for registry keys that have been deleted. --- dlls/advapi32/tests/registry.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 3a65339..9684a2f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1910,6 +1910,41 @@ static void test_redirection(void) RegCloseKey( root64 ); } +static void test_deleted_key(void) +{ + HKEY hkey, hkey2; + char value[20]; + DWORD val_count, type; + LONG res; + + /* Open the test key, then delete it while it's open */ + RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey ); + + delete_key( hkey_main ); + + val_count = 20; + type = 0; + res = RegEnumValueA( hkey, 0, value, &val_count, NULL, &type, 0, 0 ); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + + res = RegSetValueExA( hkey, "test", 0, REG_SZ, (const BYTE*)"value", 6); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + + res = RegOpenKeyA( hkey, "test", &hkey2 ); + todo_wine ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + if (res == 0) + RegCloseKey( hkey2 ); + + res = RegCreateKeyA( hkey, "test", &hkey2 ); + ok(res == ERROR_KEY_DELETED, "expect ERROR_KEY_DELETED, got %i\n", res); + if (res == 0) + RegCloseKey( hkey2 ); + + RegCloseKey( hkey ); + + setup_main_key(); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -1944,6 +1979,7 @@ START_TEST(registry) test_reg_delete_tree(); test_rw_order(); + test_deleted_key(); /* cleanup */ delete_key( hkey_main );

1 0