January 2007 - Wine-commits

H. Verbeet : wined3d: Give shader constants their own debug channel.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 955fb95eb6f927458b29ef74f0b183c5195a8d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=955fb95eb6f927458b29ef74f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 17 21:41:46 2007 +0100 wined3d: Give shader constants their own debug channel. --- dlls/wined3d/arb_program_shader.c | 7 ++++--- dlls/wined3d/glsl_shader.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 073a3ad..f76e4c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -33,6 +33,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); #define GLINFO_LOCATION (*gl_info) @@ -56,7 +57,7 @@ static void shader_arb_load_constantsF(I if (!constant_list) { if (TRACE_ON(d3d_shader)) { for (i = 0; i < max_constants; ++i) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -69,7 +70,7 @@ static void shader_arb_load_constantsF(I if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(constant, constant_list, constant_entry, entry) { i = constant->idx; - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -85,7 +86,7 @@ static void shader_arb_load_constantsF(I if (TRACE_ON(d3d_shader)) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { GLfloat* values = (GLfloat*)lconst->value; - TRACE("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, + TRACE_(d3d_constants)("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, values[0], values[1], values[2], values[3]); } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4bc4e21..9a11b5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -32,6 +32,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); #define GLINFO_LOCATION (*gl_info) @@ -113,7 +114,7 @@ static void shader_glsl_load_constantsF( for (i = 0; i < max_constants; ++i) { tmp_loc = constant_locations[i]; if (tmp_loc != -1) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -134,7 +135,7 @@ static void shader_glsl_load_constantsF( i = constant->idx; tmp_loc = constant_locations[i]; if (tmp_loc != -1) { - TRACE("Loading constants %i: %f, %f, %f, %f\n", i, + TRACE_(d3d_constants)("Loading constants %i: %f, %f, %f, %f\n", i, constants[i * 4 + 0], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); } @@ -157,7 +158,7 @@ static void shader_glsl_load_constantsF( tmp_loc = constant_locations[lconst->idx]; if (tmp_loc != -1) { GLfloat* values = (GLfloat*)lconst->value; - TRACE("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, + TRACE_(d3d_constants)("Loading local constants %i: %f, %f, %f, %f\n", lconst->idx, values[0], values[1], values[2], values[3]); } } @@ -194,7 +195,7 @@ void shader_glsl_load_constantsI( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE("Loading constants %i: %i, %i, %i, %i\n", + TRACE_(d3d_constants)("Loading constants %i: %i, %i, %i, %i\n", i, constants[i*4], constants[i*4+1], constants[i*4+2], constants[i*4+3]); /* TODO: Benchmark and see if it would be beneficial to store the @@ -216,7 +217,7 @@ void shader_glsl_load_constantsI( unsigned int idx = lconst->idx; GLint* values = (GLint*) lconst->value; - TRACE("Loading local constants %i: %i, %i, %i, %i\n", idx, + TRACE_(d3d_constants)("Loading local constants %i: %i, %i, %i, %i\n", idx, values[0], values[1], values[2], values[3]); snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx); @@ -252,7 +253,7 @@ void shader_glsl_load_constantsB( for (i=0; i<max_constants; ++i) { if (NULL == constants_set || constants_set[i]) { - TRACE("Loading constants %i: %i;\n", i, constants[i*4]); + TRACE_(d3d_constants)("Loading constants %i: %i;\n", i, constants[i*4]); /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ @@ -273,7 +274,7 @@ void shader_glsl_load_constantsB( unsigned int idx = lconst->idx; GLint* values = (GLint*) lconst->value; - TRACE("Loading local constants %i: %i\n", idx, values[0]); + TRACE_(d3d_constants)("Loading local constants %i: %i\n", idx, values[0]); snprintf(tmp_name, sizeof(tmp_name), "%s[%i]", prefix, idx); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name));

1 0

H. Verbeet : wined3d: When switching color material, apply the material we were previously tracking.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: d429ff5b6917fc27cf9898b353d3c716553e6392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429ff5b6917fc27cf9898b35… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 17 21:41:35 2007 +0100 wined3d: When switching color material, apply the material we were previously tracking. This fixes a regression introduced by 329670c7f129343ef0086f76b08a40d0fd5e3242. --- dlls/wined3d/state.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b0f74c7..adcd9c5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -812,14 +812,15 @@ static void state_fogdensity(DWORD state /* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)stateblock->wineD3DDevice; GLenum Parm = 0; - WineDirect3DStridedData *diffuse = &stateblock->wineD3DDevice->strided_streams.u.s.diffuse; + WineDirect3DStridedData *diffuse = &device->strided_streams.u.s.diffuse; BOOL isDiffuseSupplied; /* Depends on the decoded vertex declaration to read the existance of diffuse data. * The vertex declaration will call this function if the fixed function pipeline is used. */ - if(isStateDirty(stateblock->wineD3DDevice, STATE_VDECL)) { + if(isStateDirty(device, STATE_VDECL)) { return; } @@ -847,6 +848,9 @@ static void state_colormat(DWORD state, } } + /* Nothing changed, return. */ + if (Parm == device->tracking_parm) return; + if(!Parm) { glDisable(GL_COLOR_MATERIAL); checkGLcall("glDisable GL_COLOR_MATERIAL"); @@ -856,6 +860,45 @@ static void state_colormat(DWORD state, glEnable(GL_COLOR_MATERIAL); checkGLcall("glEnable(GL_COLOR_MATERIAL)"); } + + /* Apparently calls to glMaterialfv are ignored for properties we're + * tracking with glColorMaterial, so apply those here. */ + switch (device->tracking_parm) { + case GL_AMBIENT_AND_DIFFUSE: + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + checkGLcall("glMaterialfv"); + break; + + case GL_DIFFUSE: + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*)&device->updateStateBlock->material.Diffuse); + checkGLcall("glMaterialfv"); + break; + + case GL_AMBIENT: + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*)&device->updateStateBlock->material.Ambient); + checkGLcall("glMaterialfv"); + break; + + case GL_EMISSION: + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*)&device->updateStateBlock->material.Emissive); + checkGLcall("glMaterialfv"); + break; + + case GL_SPECULAR: + /* Only change material color if specular is enabled, otherwise it is set to black */ + if (device->stateBlock->renderState[WINED3DRS_SPECULARENABLE]) { + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*)&device->updateStateBlock->material.Specular); + checkGLcall("glMaterialfv"); + } else { + float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); + checkGLcall("glMaterialfv"); + } + break; + } + + device->tracking_parm = Parm; } static void state_linepattern(DWORD state, IWineD3DStateBlockImpl *stateblock) {

1 0

H. Verbeet : wined3d: Don' t set Parm when isDiffuseSupplied is FALSE in state_colormat(), it isn' t used anyway.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 612a74a994d01896feb09aa90592674550b1998a URL: http://source.winehq.org/git/wine.git/?a=commit;h=612a74a994d01896feb09aa90… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 17 21:41:21 2007 +0100 wined3d: Don't set Parm when isDiffuseSupplied is FALSE in state_colormat(), it isn't used anyway. --- dlls/wined3d/state.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8d74006..b0f74c7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -812,7 +812,7 @@ static void state_fogdensity(DWORD state /* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock) { - GLenum Parm = -1; + GLenum Parm = 0; WineDirect3DStridedData *diffuse = &stateblock->wineD3DDevice->strided_streams.u.s.diffuse; BOOL isDiffuseSupplied; @@ -825,7 +825,7 @@ static void state_colormat(DWORD state, isDiffuseSupplied = diffuse->lpData || diffuse->VBO; - if (stateblock->renderState[WINED3DRS_COLORVERTEX]) { + if (isDiffuseSupplied && stateblock->renderState[WINED3DRS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", stateblock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE], stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE], @@ -847,7 +847,7 @@ static void state_colormat(DWORD state, } } - if(Parm == -1 || !isDiffuseSupplied) { + if(!Parm) { glDisable(GL_COLOR_MATERIAL); checkGLcall("glDisable GL_COLOR_MATERIAL"); } else {

1 0

Francois Gouget : d3d: Fix the D3DFMT_XXX constant declarations.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: d4ca34dd9bf98ea71226460092c7095847b97509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ca34dd9bf98ea7122646009… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 17 17:32:09 2007 +0100 d3d: Fix the D3DFMT_XXX constant declarations. --- dlls/d3d9/tests/device.c | 9 +++++---- dlls/ddraw/utils.c | 2 +- dlls/wined3d/utils.c | 4 ++-- include/d3d8types.h | 3 +++ include/d3d9types.h | 5 ++--- include/wine/wined3d_types.h | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 91fbfd5..34108d5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -868,9 +868,11 @@ static void test_display_modes(void) ok(res==(r), "EnumAdapterModes("#x") did not return "#r" (got %s)!\n", DXGetErrorString9(res)); \ } while(0) - TEST_FMT(D3DFMT_X1R5G5B5, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_R8G8B8, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_A8R8G8B8, D3DERR_INVALIDCALL); + TEST_FMT(D3DFMT_X8B8G8R8, D3DERR_INVALIDCALL); + /* D3DFMT_R5G6B5 */ + TEST_FMT(D3DFMT_X1R5G5B5, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_A1R5G5B5, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_A4R4G4B4, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_R3G3B2, D3DERR_INVALIDCALL); @@ -896,7 +898,6 @@ static void test_display_modes(void) TEST_FMT(D3DFMT_X8L8V8U8, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_Q8W8V8U8, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_V16U16, D3DERR_INVALIDCALL); - TEST_FMT(D3DFMT_W11V11U10, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_A2W10V10U10, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_UYVY, D3DERR_INVALIDCALL); @@ -906,7 +907,7 @@ static void test_display_modes(void) TEST_FMT(D3DFMT_DXT3, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_DXT4, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_DXT5, D3DERR_INVALIDCALL); - TEST_FMT(D3DFMT_MULTI2_ARGB, D3DERR_INVALIDCALL); + TEST_FMT(D3DFMT_MULTI2_ARGB8, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_G8R8_G8B8, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_R8G8_B8G8, D3DERR_INVALIDCALL); @@ -925,7 +926,7 @@ static void test_display_modes(void) TEST_FMT(D3DFMT_INDEX16, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_INDEX32, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_Q16W16V16U16, D3DERR_INVALIDCALL); - /* Flaoting point formats */ + /* Floating point formats */ TEST_FMT(D3DFMT_R16F, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_G16R16F, D3DERR_INVALIDCALL); TEST_FMT(D3DFMT_A16B16G16R16F, D3DERR_INVALIDCALL); diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index a80688c..e1f02bb 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -255,7 +255,7 @@ PixelFormat_WineD3DtoDD(DDPIXELFORMAT *D case WINED3DFMT_DXT3: case WINED3DFMT_DXT4: case WINED3DFMT_DXT5: - case WINED3DFMT_MULTI2_ARGB: + case WINED3DFMT_MULTI2_ARGB8: case WINED3DFMT_G8R8_G8B8: case WINED3DFMT_R8G8_B8G8: DDPixelFormat->dwFlags = DDPF_FOURCC; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 94a29d2..6670c18 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -43,7 +43,7 @@ static const PixelFormatDesc formats[] = {WINED3DFMT_DXT3 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT3_EXT,GL_RGBA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_DXT4 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,GL_RGBA ,GL_UNSIGNED_BYTE }, {WINED3DFMT_DXT5 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,TRUE ,GL_COMPRESSED_RGBA_S3TC_DXT5_EXT,GL_RGBA ,GL_UNSIGNED_BYTE }, - {WINED3DFMT_MULTI2_ARGB ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, + {WINED3DFMT_MULTI2_ARGB8,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, {WINED3DFMT_G8R8_G8B8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, {WINED3DFMT_R8G8_B8G8 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,TRUE ,0 ,0 ,0 }, /* IEEE formats */ @@ -174,7 +174,7 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_DXT3); FMT_TO_STR(WINED3DFMT_DXT4); FMT_TO_STR(WINED3DFMT_DXT5); - FMT_TO_STR(WINED3DFMT_MULTI2_ARGB); + FMT_TO_STR(WINED3DFMT_MULTI2_ARGB8); FMT_TO_STR(WINED3DFMT_G8R8_G8B8); FMT_TO_STR(WINED3DFMT_R8G8_B8G8); FMT_TO_STR(WINED3DFMT_D16_LOCKABLE); diff --git a/include/d3d8types.h b/include/d3d8types.h index 6f9dc58..9f7f984 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -613,6 +613,8 @@ typedef enum _D3DFORMAT { D3DFMT_A8 = 28, D3DFMT_A8R3G3B2 = 29, D3DFMT_X4R4G4B4 = 30, + D3DFMT_A2B10G10R10 = 31, + D3DFMT_G16R16 = 34, D3DFMT_A8P8 = 40, D3DFMT_P8 = 41, @@ -627,6 +629,7 @@ typedef enum _D3DFORMAT { D3DFMT_Q8W8V8U8 = 63, D3DFMT_V16U16 = 64, D3DFMT_W11V11U10 = 65, + D3DFMT_A2W10V10U10 = 67, D3DFMT_UYVY = MAKEFOURCC('U', 'Y', 'V', 'Y'), D3DFMT_YUY2 = MAKEFOURCC('Y', 'U', 'Y', '2'), diff --git a/include/d3d9types.h b/include/d3d9types.h index c986169..d1f58b9 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -797,7 +797,6 @@ typedef enum _D3DFORMAT { D3DFMT_X8L8V8U8 = 62, D3DFMT_Q8W8V8U8 = 63, D3DFMT_V16U16 = 64, - D3DFMT_W11V11U10 = 65, D3DFMT_A2W10V10U10 = 67, D3DFMT_UYVY = MAKEFOURCC('U', 'Y', 'V', 'Y'), @@ -807,7 +806,7 @@ typedef enum _D3DFORMAT { D3DFMT_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'), D3DFMT_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'), D3DFMT_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'), - D3DFMT_MULTI2_ARGB = MAKEFOURCC('M', 'E', 'T', '1'), + D3DFMT_MULTI2_ARGB8 = MAKEFOURCC('M', 'E', 'T', '1'), D3DFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), D3DFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), @@ -826,7 +825,7 @@ typedef enum _D3DFORMAT { D3DFMT_INDEX16 = 101, D3DFMT_INDEX32 = 102, D3DFMT_Q16W16V16U16 = 110, - /* Flaoting point formats */ + /* Floating point formats */ D3DFMT_R16F = 111, D3DFMT_G16R16F = 112, D3DFMT_A16B16G16R16F = 113, diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a75c4d4..587b7cd 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -267,7 +267,7 @@ typedef enum _WINED3DFORMAT { WINED3DFMT_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'), WINED3DFMT_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'), WINED3DFMT_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'), - WINED3DFMT_MULTI2_ARGB = MAKEFOURCC('M', 'E', 'T', '1'), + WINED3DFMT_MULTI2_ARGB8 = MAKEFOURCC('M', 'E', 'T', '1'), WINED3DFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), WINED3DFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), @@ -286,7 +286,7 @@ typedef enum _WINED3DFORMAT { WINED3DFMT_INDEX16 = 101, WINED3DFMT_INDEX32 = 102, WINED3DFMT_Q16W16V16U16 = 110, - /* Flaoting point formats */ + /* Floating point formats */ WINED3DFMT_R16F = 111, WINED3DFMT_G16R16F = 112, WINED3DFMT_A16B16G16R16F = 113,

1 0

Francois Gouget : winspool.drv: Reorder a couple of functions and remove the forward declarations.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 0c31ca34cb009ecfdf1e6ffd6cefc1b633ade159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c31ca34cb009ecfdf1e6ffd6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 17:18:54 2007 +0100 winspool.drv: Reorder a couple of functions and remove the forward declarations. --- dlls/winspool.drv/info.c | 314 ++++++++++++++++++++++----------------------- 1 files changed, 154 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c31ca34cb009ecfdf1e6…

1 0

Francois Gouget : tests: The non-gcc case was missing a forward declaration for winetest_skip().
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 442fec32d0bcf60806fd74dd6394d44210b427ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=442fec32d0bcf60806fd74dd6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 17 17:17:51 2007 +0100 tests: The non-gcc case was missing a forward declaration for winetest_skip(). --- include/wine/test.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 4f2e863..f4557ab 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -76,6 +76,7 @@ extern void winetest_trace( const char * #else /* __GNUC__ */ extern int winetest_ok( int condition, const char *msg, ... ); +extern void winetest_skip( const char *msg, ... ); extern void winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */

1 0

Francois Gouget : odbccp32/tests: Add missing '\n' to an ok() call.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: ec6463470d70a1f0e5ce9019e905d820f25a8c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6463470d70a1f0e5ce9019e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 17 17:16:48 2007 +0100 odbccp32/tests: Add missing '\n' to an ok() call. --- dlls/odbccp32/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 20ba1cc..0779b44 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -38,7 +38,7 @@ static void test_SQLConfigMode(void) bool_ret = SQLSetConfigMode(3); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly"); + ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n"); ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n"); for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i)

1 0

Stefan Leichter : winecoreaudio.drv: Print each 64-bit integer as two 32-bit integers.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: b8e9e3fbe4d5c993f7ef2d04f5788e4f7ea92400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e9e3fbe4d5c993f7ef2d04f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jan 17 23:05:50 2007 +0100 winecoreaudio.drv: Print each 64-bit integer as two 32-bit integers. --- dlls/winecoreaudio.drv/audio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 4723928..0c90afe 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -2186,8 +2186,11 @@ OSStatus CoreAudio_wiAudioUnitIOProc(voi if (wwi->trace_on) - fprintf(stderr, "trace:wave:CoreAudio_wiAudioUnitIOProc (ioActionFlags = %08lx, inTimeStamp = { %f, %llu, %f, %llu, %08lx }, inBusNumber = %lu, inNumberFrames = %lu)\n", - *ioActionFlags, inTimeStamp->mSampleTime, inTimeStamp->mHostTime, inTimeStamp->mRateScalar, inTimeStamp->mWordClockTime, inTimeStamp->mFlags, inBusNumber, inNumberFrames); + fprintf(stderr, "trace:wave:CoreAudio_wiAudioUnitIOProc (ioActionFlags = %08lx, " + "inTimeStamp = { %f, %lx%08lx, %f, %lx%08lx, %08lx }, inBusNumber = %lu, inNumberFrames = %lu)\n", + *ioActionFlags, inTimeStamp->mSampleTime, (DWORD)(inTimeStamp->mHostTime >>32), + (DWORD)inTimeStamp->mHostTime, inTimeStamp->mRateScalar, (DWORD)(inTimeStamp->mWordClockTime >> 32), + (DWORD)inTimeStamp->mWordClockTime, inTimeStamp->mFlags, inBusNumber, inNumberFrames); /* Render into audio buffer */ /* FIXME: implement sample rate conversion on input. This will require

1 0

Mike McCormack : msi: Register IMsiServer.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 208cdde0f5774e078ba36c279a46cfc19aa50643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208cdde0f5774e078ba36c279… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 17 20:06:44 2007 +0900 msi: Register IMsiServer. --- dlls/msi/regsvr.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index dca1c80..dca44e2 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -588,22 +588,28 @@ static struct regsvr_coclass const cocla */ /* * we should declare: (@see ole32/regsvr.c for examples) - [-HKEY_CLASSES_ROOT\Interface\{000C101C-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C101D-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1025-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1033-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1090-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1093-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1095-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109A-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109B-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109C-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109D-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109E-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C101D-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1025-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1033-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1090-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1093-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1095-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109A-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109B-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109C-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109D-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109E-0000-0000-C000-000000000046}] [-HKEY_CLASSES_ROOT\Interface\{000C109F-0000-0000-C000-000000000046}] */ + static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ + { &CLSID_IMsiServer, + "IMsiServer", + NULL, + 18, + NULL, + NULL }, + { NULL } /* list terminator */ }; static HRESULT register_msiexec(void)

1 0

Vitaliy Margolen : ws2_32: Fix trace for WS_setsockopt to look closer to WS_getsockopt.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: e437a0c302e9df68c35df2f742222f3042c4ec55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e437a0c302e9df68c35df2f74… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 17 12:22:27 2007 -0700 ws2_32: Fix trace for WS_setsockopt to look closer to WS_getsockopt. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d4d6595..a5c20d1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2938,7 +2938,7 @@ int WINAPI WS_setsockopt(SOCKET s, int l struct linger linger; struct timeval tval; - TRACE("socket: %04x, level %d, name %d, ptr %p, len %d\n", + TRACE("socket: %04x, level 0x%x, name 0x%x, ptr %p, len %d\n", s, level, optname, optval, optlen); switch(level)

1 0