December 2006 - Wine-commits

Roderick Colenbrander : wgl: Fix wglGetPixelFormatAttribiv bug.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 8da7b13343edfa479f02d7e545c18acf2687d7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da7b13343edfa479f02d7e54… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Dec 27 22:01:37 2006 +0100 wgl: Fix wglGetPixelFormatAttribiv bug. --- dlls/winex11.drv/opengl.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cb7366a..384a29b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2572,7 +2572,16 @@ static GLboolean WINAPI X11DRV_wglGetPix FIXME("unsupported %x WGL Attribute\n", curWGLAttr); } - if (0 != curGLXAttr) { + /* Retrieve a GLX FBConfigAttrib when the attribute to query is valid and + * iPixelFormat != 0. When iPixelFormat is 0 the only value which makes + * sense to query is WGL_NUMBER_PIXEL_FORMATS_ARB. + * + * TODO: properly test the behavior of wglGetPixelFormatAttrib*v on Windows + * and check which options can work using iPixelFormat=0 and which not. + * A problem would be that this function is an extension. This would + * mean that the behavior could differ between different vendors (ATI, Nvidia, ..). + */ + if (0 != curGLXAttr && iPixelFormat != 0) { /* Check if the format is supported by checking if iPixelFormat isn't larger than the max number of * supported WGLFormats and also check if the GLX fmt_index is valid. */ if((iPixelFormat > 0) && ((iPixelFormat > nWGLFormats) || (fmt_index > nCfgs))) goto pix_error;

1 0

H. Verbeet : wined3d: Create samplers for all 1.x instructions that sample.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 74b85c8b382ca0f973e5798c445d7a62827d9c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b85c8b382ca0f973e5798c4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 28 03:14:28 2006 +0100 wined3d: Create samplers for all 1.x instructions that sample. --- dlls/wined3d/baseshader.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f87716a..54ebfcd 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -295,8 +295,15 @@ HRESULT shader_get_registers_used( if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && (WINED3DSIO_TEX == curOpcode->opcode || WINED3DSIO_TEXBEM == curOpcode->opcode || + WINED3DSIO_TEXBEML == curOpcode->opcode || + WINED3DSIO_TEXDP3TEX == curOpcode->opcode || WINED3DSIO_TEXM3x2TEX == curOpcode->opcode || - WINED3DSIO_TEXM3x3TEX == curOpcode->opcode)) { + WINED3DSIO_TEXM3x3SPEC == curOpcode->opcode || + WINED3DSIO_TEXM3x3TEX == curOpcode->opcode || + WINED3DSIO_TEXM3x3VSPEC == curOpcode->opcode || + WINED3DSIO_TEXREG2AR == curOpcode->opcode || + WINED3DSIO_TEXREG2GB == curOpcode->opcode || + WINED3DSIO_TEXREG2RGB == curOpcode->opcode)) { /* Fake sampler usage, only set reserved bit and ttype */ DWORD sampler_code = *pToken & WINED3DSP_REGNUM_MASK;

1 0

H. Verbeet : wined3d: The default debug channel for arb_program_shader. c & glsl_shader.c already is d3d_shader.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: a22933e08ecccf7e4d461ef9cec0d8e0f73e0338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22933e08ecccf7e4d461ef9c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 28 03:13:57 2006 +0100 wined3d: The default debug channel for arb_program_shader.c & glsl_shader.c already is d3d_shader. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b4aa371..658552f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -996,7 +996,7 @@ static void shader_arb_select(IWineD3DDe /* Enable OpenGL vertex programs */ glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); - TRACE_(d3d_shader)("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", + TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.prgId); } @@ -1011,7 +1011,7 @@ static void shader_arb_select(IWineD3DDe /* Enable OpenGL fragment programs */ glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); - TRACE_(d3d_shader)("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", + TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.prgId); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d95c51..fc60c39 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -66,7 +66,7 @@ void shader_glsl_load_psamplers( snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); if (name_loc != -1) { - TRACE_(d3d_shader)("Loading %s for texture %d\n", sampler_name, i); + TRACE("Loading %s for texture %d\n", sampler_name, i); GL_EXTCALL(glUniform1iARB(name_loc, i)); checkGLcall("glUniform1iARB"); }

1 0

H. Verbeet : wined3d: Move set_glsl_shader_program() to glsl_shader.c.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: c9723510513bea1e0b73668af1d9e8fc8a806144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9723510513bea1e0b73668af… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 28 03:13:24 2006 +0100 wined3d: Move set_glsl_shader_program() to glsl_shader.c. --- dlls/wined3d/device.c | 117 ---------------------------------------- dlls/wined3d/glsl_shader.c | 117 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 117 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9723510513bea1e0b736…

1 0

H. Verbeet : wined3d: Where possible, avoid using D3DCOLORTOGLFLOAT4.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 045975b1f439049da9405a8defbad82a39710f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045975b1f439049da9405a8de… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Dec 28 03:12:43 2006 +0100 wined3d: Where possible, avoid using D3DCOLORTOGLFLOAT4. --- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 6 ++++++ 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 9b9b5d7..4b6b0d5 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -363,11 +363,11 @@ void WINAPI IWineD3DBaseTextureImpl_Appl break; case WINED3DSAMP_BORDERCOLOR: { - float col[4]; + GLint col[4]; *state = samplerStates[textureObjectSamplerStates[i].state]; - D3DCOLORTOGLFLOAT4(*state, col); + D3DCOLORTOGLINT4(*state, col); TRACE("Setting border color for %u to %x\n", textureDimensions, *state); - glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); + glTexParameteriv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)"); } break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a858ba1..14d6d9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -438,7 +438,7 @@ static void delete_glsl_shader_list(IWin /* Apply the current values to the specified texture stage */ static void WINAPI IWineD3DDeviceImpl_SetupTextureStates(IWineD3DDevice *iface, DWORD Sampler, DWORD texture_idx, DWORD Flags) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - float col[4]; + GLint col[4]; union { float f; @@ -503,8 +503,8 @@ static void WINAPI IWineD3DDeviceImpl_Se checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); } - D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); - glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); + D3DCOLORTOGLINT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); + glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); /* TODO: NV_POINT_SPRITE */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 27fd9f4..a842a6f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -197,11 +197,11 @@ static void state_zfunc(DWORD state, IWi } static void state_ambient(DWORD state, IWineD3DStateBlockImpl *stateblock) { - float col[4]; - D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_AMBIENT], col); + GLint col[4]; + D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_AMBIENT], col); - TRACE("Setting ambient to (%f,%f,%f,%f)\n", col[0], col[1], col[2], col[3]); - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, col); + TRACE("Setting ambient to (%d,%d,%d,%d)\n", col[0], col[1], col[2], col[3]); + glLightModeliv(GL_LIGHT_MODEL_AMBIENT, col); checkGLcall("glLightModel for MODEL_AMBIENT"); } @@ -499,8 +499,8 @@ static void state_texfactor(DWORD state, /* Note the texture color applies to all textures whereas * GL_TEXTURE_ENV_COLOR applies to active only */ - float col[4]; - D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); + GLint col[4]; + D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { /* And now the default texture color as well */ @@ -515,11 +515,11 @@ static void state_texfactor(DWORD state, FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); } - glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); + glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); } } else { - GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &col[0])); + GL_EXTCALL(glCombinerParameterivNV(GL_CONSTANT_COLOR0_NV, &col[0])); } } @@ -786,10 +786,10 @@ static void state_fog(DWORD state, IWine } static void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock) { - float col[4]; - D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); + GLint col[4]; + D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); /* Set the default alpha blend color */ - glFogfv(GL_FOG_COLOR, &col[0]); + glFogiv(GL_FOG_COLOR, &col[0]); checkGLcall("glFog GL_FOG_COLOR"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0efe89b..e3af89b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -228,6 +228,12 @@ extern int num_lock; (vec)[2] = D3DCOLOR_B(dw); \ (vec)[3] = D3DCOLOR_A(dw); +#define D3DCOLORTOGLINT4(src, dst) \ + (dst)[0] = D3DCOLOR_B_R(src); \ + (dst)[1] = D3DCOLOR_B_G(src); \ + (dst)[2] = D3DCOLOR_B_B(src); \ + (dst)[3] = D3DCOLOR_B_A(src); + /* DirectX Device Limits */ /* --------------------- */ #define MAX_LEVELS 256 /* Maximum number of mipmap levels. Guessed at 256 */

1 0

Rob Shearman : advapi32: Change the test for the type parameter of RegQueryValueExA to only run on Win9x , since the value is set to a random value on NT.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 214eb389c994e52972032a278fde26bbfa460225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=214eb389c994e52972032a278… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 27 19:14:43 2006 +0000 advapi32: Change the test for the type parameter of RegQueryValueExA to only run on Win9x, since the value is set to a random value on NT. --- dlls/advapi32/tests/registry.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 152c8e7..45756c6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -345,8 +345,12 @@ static void test_query_value_ex(void) ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, NULL, &size); ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret); ok(size == 0, "size should have been set to 0 instead of %d\n", size); - ok(type == (DWORD)HKEY_CLASSES_ROOT /* NT */ || type == 0 /* Win9x */, - "type should have been set to 0x80000000 or 0 instead of 0x%x\n", type); + /* the type parameter is cleared on Win9x, but is set to a random value on + * NT, so don't do this test there */ + if (GetVersion() & 0x80000000) + ok(type == 0, "type should have been set to 0 instead of 0x%x\n", type); + else + trace("test_query_value_ex: type set to: 0x%08x\n", type); size = sizeof(buffer); ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, buffer, &size);

1 0

Rob Shearman : ole32: Output the HRESULT for clipboard tests that fail.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 3e8adc3d26b842f27dd6b36643bb3a443e26d12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8adc3d26b842f27dd6b3664… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 27 19:14:34 2006 +0000 ole32: Output the HRESULT for clipboard tests that fail. --- dlls/ole32/tests/clipboard.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index f2a71e4..165863d 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -320,27 +320,36 @@ static void test_set_clipboard(void) ULONG ref; LPDATAOBJECT data1, data2; hr = DataObjectImpl_CreateText("data1", &data1); - ok(SUCCEEDED(hr), "Failed to create data1 object: %d\n", hr); + ok(SUCCEEDED(hr), "Failed to create data1 object: 0x%08x\n", hr); if(FAILED(hr)) return; hr = DataObjectImpl_CreateText("data2", &data2); - ok(SUCCEEDED(hr), "Failed to create data2 object: %d\n", hr); + ok(SUCCEEDED(hr), "Failed to create data2 object: 0x%08x\n", hr); if(FAILED(hr)) return; - ok(OleSetClipboard(data1) == S_OK, "failed to set clipboard to data1\n"); - ok(OleIsCurrentClipboard(data1) == S_OK, "expected current clipboard to be data1\n"); - ok(OleIsCurrentClipboard(data2) == S_FALSE, "did not expect current clipboard to be data2\n"); - - ok(OleSetClipboard(data2) == S_OK, "failed to set clipboard to data2\n"); - ok(OleIsCurrentClipboard(data1) == S_FALSE, "did not expect current clipboard to be data1\n"); - ok(OleIsCurrentClipboard(data2) == S_OK, "expected current clipboard to be data2\n"); - - ok(OleFlushClipboard() == S_OK, "failed to flush clipboard\n"); - ok(OleIsCurrentClipboard(data1) == S_FALSE, "did not expect current clipboard to be data1\n"); - ok(OleIsCurrentClipboard(data2) == S_FALSE, "did not expect current clipboard to be data2\n"); - - ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard\n"); + hr = OleSetClipboard(data1); + ok(hr == S_OK, "failed to set clipboard to data1, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data1); + ok(hr == S_OK, "expected current clipboard to be data1, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data2); + ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr); + + hr = OleSetClipboard(data2); + ok(hr == S_OK, "failed to set clipboard to data2, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data1); + ok(hr == S_FALSE, "did not expect current clipboard to be data1, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data2); + ok(hr == S_OK, "expected current clipboard to be data2, hr = 0x%08x\n", hr); + + hr = OleFlushClipboard(); + ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data1); + ok(hr == S_FALSE, "did not expect current clipboard to be data1, hr = 0x%08x\n", hr); + hr = OleIsCurrentClipboard(data2); + ok(hr == S_FALSE, "did not expect current clipboard to be data2, hr = 0x%08x\n", hr); + + ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); ref = IDataObject_Release(data1); ok(ref == 0, "expected data1 ref=0, got %d\n", ref);

1 0

Rob Shearman : oleaut32: SafeArrayAllocData should succeed when cbElements is 0.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 72a84fbf06a350c3f1fd0a5b45ab26288f447da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a84fbf06a350c3f1fd0a5b4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 27 19:14:38 2006 +0000 oleaut32: SafeArrayAllocData should succeed when cbElements is 0. --- dlls/oleaut32/safearray.c | 19 ++++++++----------- dlls/oleaut32/tests/safearray.c | 5 +---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 93656f2..d0ca263 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -228,7 +228,7 @@ static SAFEARRAY* SAFEARRAY_Create(VARTY if (ulSize) psa->cbElements = ulSize; - if (FAILED(SafeArrayAllocData(psa))) + if (!psa->cbElements || FAILED(SafeArrayAllocData(psa))) { SafeArrayDestroyDescriptor(psa); psa = NULL; @@ -533,19 +533,16 @@ HRESULT WINAPI SafeArrayAllocData(SAFEAR { ULONG ulSize = SAFEARRAY_GetCellCount(psa); - hRet = E_OUTOFMEMORY; + psa->pvData = SAFEARRAY_Malloc(ulSize * psa->cbElements); - if (psa->cbElements) + if (psa->pvData) { - psa->pvData = SAFEARRAY_Malloc(ulSize * psa->cbElements); - - if (psa->pvData) - { - hRet = S_OK; - TRACE("%u bytes allocated for data at %p (%u objects).\n", - ulSize * psa->cbElements, psa->pvData, ulSize); - } + hRet = S_OK; + TRACE("%u bytes allocated for data at %p (%u objects).\n", + ulSize * psa->cbElements, psa->pvData, ulSize); } + else + hRet = E_OUTOFMEMORY; } return hRet; } diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 41ee3cb..b80c733 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -690,10 +690,7 @@ static void test_SafeArrayAllocDestroyDe sa->rgsabound[0].lLbound = 1; hres = SafeArrayAllocData(sa); - todo_wine - { - ok(hres == S_OK, "SafeArrayAllocData gave hres 0x%x\n", hres); - } + ok(hres == S_OK, "SafeArrayAllocData gave hres 0x%x\n", hres); } static void test_SafeArrayCreateLockDestroy(void)

1 0

Clinton Stimpson : usp10: Downgrade fixme's to trace's with comments.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: fd21610ca9cd09e12ab1d119e085170f9694d599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd21610ca9cd09e12ab1d119e… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Wed Dec 27 18:23:45 2006 -0700 usp10: Downgrade fixme's to trace's with comments. --- dlls/usp10/usp10.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b9a8b62..9127782 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -848,7 +848,7 @@ HRESULT WINAPI ScriptBreak(const WCHAR * { unsigned int i; - FIXME("(%p, %d, %p, %p) stub\n", chars, count, sa, la); + TRACE("(%p, %d, %p, %p)\n", chars, count, sa, la); if (!la) return S_FALSE; @@ -856,6 +856,7 @@ HRESULT WINAPI ScriptBreak(const WCHAR * { memset(&la[i], 0, sizeof(SCRIPT_LOGATTR)); + /* FIXME: set the other flags */ la[i].fWhiteSpace = isspaceW(chars[i]); la[i].fCharStop = 1; } @@ -1068,7 +1069,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI DWORD hr; Scriptcache *pScriptcache; *pcGlyphs = cChars; - FIXME("(%p, %p, %p, %d, %d, %p): semi-stub\n", hdc, psc, pwcChars, + TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, @@ -1115,6 +1116,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ for (cnt = 0; cnt < cChars; cnt++) { + /* FIXME: set to better values */ psva[cnt].uJustification = 2; psva[cnt].fClusterStart = 1; psva[cnt].fDiacritic = 0; @@ -1136,7 +1138,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI int wcnt; LPABC lpABC; Scriptcache *pScriptcache; - FIXME("(%p, %p, %p, %s, %d, %p, %p, %p): semi-stub\n", hdc, psc, pwGlyphs, + TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); @@ -1164,6 +1166,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI * has been converted to glyphs and we still need to translate back to the original chars * to get the correct ABC widths. */ + /* FIXME: set pGoffset to more reasonable values */ + lpABC = HeapAlloc(GetProcessHeap(), 0 , sizeof(ABC)*cGlyphs); pABC->abcA = 0; pABC->abcB = 0;

1 0

Alexandre Julliard : make_makefiles: Generate the top-level .gitignore file .
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 7035aa50413ef18f74a35a06c6aa258b0edb56a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7035aa50413ef18f74a35a06c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 27 21:23:36 2006 +0100 make_makefiles: Generate the top-level .gitignore file. Add a PROGRAMS variable in some makefiles to make things easier. --- .gitignore | 46 +++++++++++++++++++++++++++++++--- Makefile.in | 6 +--- dlls/.gitignore | 3 -- loader/.gitignore | 6 ---- loader/Makefile.in | 9 ++++++- programs/.gitignore | 3 -- programs/Makefile.in | 7 ++--- programs/winedbg/.gitignore | 1 - server/.gitignore | 2 - tools/.gitignore | 10 ------- tools/make_makefiles | 57 ++++++++++++++++++++++++++++++++++--------- tools/widl/.gitignore | 2 - tools/winebuild/.gitignore | 2 - tools/winedump/.gitignore | 2 - tools/winegcc/.gitignore | 4 --- tools/wmc/.gitignore | 2 - tools/wrc/.gitignore | 2 - 17 files changed, 100 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 158446c..2439e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,6 @@ *.cur *.ico *.mc.rc -*.orig -*.rej *.res *.so *.tab.[ch] @@ -14,12 +12,52 @@ *.yy.c *_[cips].c *~ -/Make.rules /TAGS /autom4te.cache /config.cache /config.log /config.status /tags -/wine Makefile +# Everything below this line is generated by make_makefiles +/Make.rules +/wine +dlls/Makedll.rules +dlls/Makeimplib.rules +dlls/Maketest.rules +loader/wine +loader/wine-glibc +loader/wine-kthread +loader/wine-preloader +loader/wine-pthread +loader/wine.man +programs/Makeprog.rules +programs/wineapploader +programs/winedbg/winedbg.man +programs/winelauncher +server/wineserver +server/wineserver.man +tools/bin2res +tools/fnt2bdf +tools/fnt2fon +tools/make_ctests +tools/makedep +tools/relpath +tools/sfnt2fnt +tools/widl/widl +tools/widl/widl.man +tools/winebuild/winebuild +tools/winebuild/winebuild.man +tools/winedump/winedump +tools/winedump/winedump.man +tools/winegcc/winecpp +tools/winegcc/wineg++ +tools/winegcc/winegcc +tools/winegcc/winegcc.man +tools/winemaker.man +tools/wineprefixcreate +tools/wineprefixcreate.man +tools/wmc/wmc +tools/wmc/wmc.man +tools/wrc/wrc +tools/wrc/wrc.man diff --git a/Makefile.in b/Makefile.in index af2c061..b988a3c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none +PROGRAMS = wine FONTSSUBDIRS = @FONTSSUBDIRS@ @@ -58,7 +59,7 @@ INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $( # Sub-directories to run make test into TESTSUBDIRS = dlls -all: Make.rules wine +all: Make.rules $(PROGRAMS) @echo "Wine build complete." WINAPI_CHECK_EXTRA_FLAGS = --global @@ -139,9 +140,6 @@ tags ctags: manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@ -clean:: - $(RM) wine - distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(RM) -r autom4te.cache diff --git a/dlls/.gitignore b/dlls/.gitignore index 8a6627c..0a3eebc 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -1,9 +1,6 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! */tests/*.ok */tests/testlist.c -/Makedll.rules -/Makeimplib.rules -/Maketest.rules /avifile.dll16 /comm.drv16 /commdlg.dll16 diff --git a/loader/.gitignore b/loader/.gitignore index 677df33..b047063 100644 --- a/loader/.gitignore +++ b/loader/.gitignore @@ -1,8 +1,2 @@ /version-stamp /version.c -/wine -/wine-glibc -/wine-kthread -/wine-preloader -/wine-pthread -/wine.man diff --git a/loader/Makefile.in b/loader/Makefile.in index 47a8629..f3e365f 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -18,6 +18,13 @@ MAIN_BINARY = @MAIN_BINARY@ EXTRA_BINARIES = @EXTRA_BINARIES@ WINE_BINARIES = $(MAIN_BINARY) $(EXTRA_BINARIES) +PROGRAMS = \ + wine \ + wine-glibc \ + wine-kthread \ + wine-preloader \ + wine-pthread\ + MANPAGES = wine.man INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -58,7 +65,7 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) clean:: - $(RM) $(WINE_BINARIES) $(MODULE) version.c version-stamp + $(RM) version.c version-stamp version-stamp: dummy (GIT_DIR=$(TOPSRCDIR)/.git git-describe 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1) diff --git a/programs/.gitignore b/programs/.gitignore index fbb5a64..08910ef 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -1,7 +1,4 @@ # Automatically generated by make_makefiles; DO NOT EDIT!! -/Makeprog.rules -/wineapploader -/winelauncher clock/clock cmd/cmd cmdlgtst/cmdlgtst diff --git a/programs/Makefile.in b/programs/Makefile.in index fb22ad4..8b61cde 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -99,9 +99,11 @@ INSTALLPROGS = \ INSTALLDIRS = $(DESTDIR)$(bindir) +PROGRAMS = wineapploader winelauncher + @MAKE_RULES@ -all: wineapploader winelauncher $(SUBDIRS) +all: $(PROGRAMS) $(SUBDIRS) wineapploader: wineapploader.in sed -e 's,@bindir\@,$(bindir),g' $(SRCDIR)/wineapploader.in >$@ || ($(RM) $@ && false) @@ -131,9 +133,6 @@ uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader winelauncher $(INSTALLPROGS) -rmdir $(DESTDIR)$(dlldir) -clean:: - $(RM) wineapploader winelauncher - # Rules for testing check test:: $(SUBDIRS:%=%/__test__) diff --git a/programs/winedbg/.gitignore b/programs/winedbg/.gitignore deleted file mode 100644 index e1bf13e..0000000 --- a/programs/winedbg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winedbg.man diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index fa0508c..0000000 --- a/server/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wineserver -/wineserver.man diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 767f5bd..0000000 --- a/tools/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/bin2res -/fnt2bdf -/fnt2fon -/make_ctests -/makedep -/relpath -/sfnt2fnt -/winemaker.man -/wineprefixcreate -/wineprefixcreate.man diff --git a/tools/make_makefiles b/tools/make_makefiles index 1fbd104..c0bfbc6 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -77,12 +77,16 @@ sub update_file($) if (!$ret) { unlink "$file.new"; - #print "$file is unchanged\n"; } else { rename "$file.new", "$file"; print "$file updated\n"; + if ($file eq "configure.ac") + { + system "autoconf"; + print "configure updated\n"; + } } return $ret; } @@ -129,6 +133,8 @@ sub parse_makefile($) my $file = shift; my %make; + ($make{"=dir"} = $file) =~ s/[^\/]+$//; + open MAKE, "$file.in" or die "cannot open $file.in\n"; while (<MAKE>) @@ -147,7 +153,7 @@ sub parse_makefile($) $make{$1} = $2; next; } - if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16)\s*=\s*(.*)/) + if (/^(IDL_H_SRCS|IMPLIB_SRCS|SPEC_SRCS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/) { my @list = split(/\s+/, $2); $make{$1} = \@list; @@ -275,9 +281,6 @@ sub update_dlls(@) my @ignores = ( - "/Makedll.rules", - "/Makeimplib.rules", - "/Maketest.rules", "*/tests/testlist.c", "*/tests/*.ok", ); @@ -526,7 +529,6 @@ sub update_dlls(@) } - ################################################################ # update programs/Makefile.in and programs/.gitignore @@ -534,12 +536,7 @@ sub update_progs(@) { my (@subdirs, @install_subdirs, @install_progs); - my @ignores = - ( - "/Makeprog.rules", - "/wineapploader", - "/winelauncher", - ); + my @ignores = (); foreach my $make (@_) { @@ -568,5 +565,41 @@ sub update_progs(@) join("\n", sort @ignores), "\n" ); } + +################################################################ +# update the main .gitignore + +sub update_gitignore() +{ + my @ignores = (); + + push @ignores, values %makerules; + + foreach my $make (@makefiles) + { + my %makefile = %{$makefiles{$make}}; + my $dir = $makefile{"=dir"}; + if (defined $makefile{"MANPAGES"}) + { + push @ignores, map { $dir . $_; } @{$makefile{"MANPAGES"}}; + } + if (defined $makefile{"PROGRAMS"}) + { + push @ignores, map { s/\$$EXEEXT$//; $dir . $_; } @{$makefile{"PROGRAMS"}}; + } + } + + # prepend a slash to paths that don't have one + @ignores = map { $_ =~ s/^([^\/]+)$/\/$1/; $_; } @ignores; + + replace_in_file( ".gitignore", + '^# Everything below this line is generated by make_makefiles', + undef, + "# Everything below this line is generated by make_makefiles\n", + join("\n", sort @ignores), "\n" ); +} + + update_dlls( sort grep /^dlls\//, @makefiles ); update_progs( sort grep /^programs\/.*\/Makefile$/, @makefiles ); +update_gitignore(); diff --git a/tools/widl/.gitignore b/tools/widl/.gitignore deleted file mode 100644 index 444551b..0000000 --- a/tools/widl/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/widl -/widl.man diff --git a/tools/winebuild/.gitignore b/tools/winebuild/.gitignore deleted file mode 100644 index bfcd432..0000000 --- a/tools/winebuild/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/winebuild -/winebuild.man diff --git a/tools/winedump/.gitignore b/tools/winedump/.gitignore deleted file mode 100644 index a36a82c..0000000 --- a/tools/winedump/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/winedump -/winedump.man diff --git a/tools/winegcc/.gitignore b/tools/winegcc/.gitignore deleted file mode 100644 index e20f448..0000000 --- a/tools/winegcc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/winecpp -/wineg++ -/winegcc -/winegcc.man diff --git a/tools/wmc/.gitignore b/tools/wmc/.gitignore deleted file mode 100644 index 4e7d73f..0000000 --- a/tools/wmc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wmc -/wmc.man diff --git a/tools/wrc/.gitignore b/tools/wrc/.gitignore deleted file mode 100644 index f0989d7..0000000 --- a/tools/wrc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/wrc -/wrc.man

1 0