December 2006 - Wine-commits

H. Verbeet : wined3d: Simplify the get_write_mask and get_swizzle functions .
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: a9f658f6a68fbe53bcf30ab0329e5ff91451bf30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f658f6a68fbe53bcf30ab03… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:32:10 2006 +0100 wined3d: Simplify the get_write_mask and get_swizzle functions. --- dlls/wined3d/arb_program_shader.c | 38 ++++++++++-------------------------- dlls/wined3d/glsl_shader.c | 38 ++++++++++-------------------------- 2 files changed, 22 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a8e4c9a..e0d10a6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -209,14 +209,11 @@ static const char * const shift_tab[] = static void shader_arb_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; - if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; - } - + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; *ptr = '\0'; } @@ -226,28 +223,15 @@ static void shader_arb_get_swizzle(const * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + size_t i = 0; + *ptr++ = '.'; /* swizzle bits fields: wwzzyyxx */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - DWORD swizzle_x = swizzle & 0x03; - DWORD swizzle_y = (swizzle >> 2) & 0x03; - DWORD swizzle_z = (swizzle >> 4) & 0x03; - DWORD swizzle_w = (swizzle >> 6) & 0x03; - - /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to - * generate a swizzle string. Unless we need to our own swizzling. */ - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { - *ptr++ = '.'; - if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { - *ptr++ = swizzle_chars[swizzle_x]; - } else { - *ptr++ = swizzle_chars[swizzle_x]; - *ptr++ = swizzle_chars[swizzle_y]; - *ptr++ = swizzle_chars[swizzle_z]; - *ptr++ = swizzle_chars[swizzle_w]; - } + for (i = 0; i < 4; ++i) { + *ptr++ = swizzle_chars[swizzle & 0x3]; + swizzle >>= 2; } - *ptr = '\0'; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4aed644..03d5dd3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -722,14 +722,11 @@ static void shader_glsl_get_register_nam static void shader_glsl_get_write_mask(const DWORD param, char *write_mask) { char *ptr = write_mask; - if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; - } - + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; *ptr = '\0'; } @@ -739,28 +736,15 @@ static void shader_glsl_get_swizzle(cons * and z components. */ const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + size_t i = 0; + *ptr++ = '.'; /* swizzle bits fields: wwzzyyxx */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - DWORD swizzle_x = swizzle & 0x03; - DWORD swizzle_y = (swizzle >> 2) & 0x03; - DWORD swizzle_z = (swizzle >> 4) & 0x03; - DWORD swizzle_w = (swizzle >> 6) & 0x03; - - /* If the swizzle is the default swizzle (ie, "xyzw"), we don't need to - * generate a swizzle string. Unless we need to our own swizzling. */ - if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) != swizzle || fixup) { - *ptr++ = '.'; - if (swizzle_x == swizzle_y && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { - *ptr++ = swizzle_chars[swizzle_x]; - } else { - *ptr++ = swizzle_chars[swizzle_x]; - *ptr++ = swizzle_chars[swizzle_y]; - *ptr++ = swizzle_chars[swizzle_z]; - *ptr++ = swizzle_chars[swizzle_w]; - } + for (i = 0; i < 4; ++i) { + *ptr++ = swizzle_chars[swizzle & 0x3]; + swizzle >>= 2; } - *ptr = '\0'; }

1 0

H. Verbeet : wined3d: Remove dead code in shader_get_registers_used().
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 845cd590d23649d523ecb9af2509c37ae5c421e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845cd590d23649d523ecb9af2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:31:16 2006 +0100 wined3d: Remove dead code in shader_get_registers_used(). As spotted by Christoph Bumiller, these branches are now never reached. Also, at least in the case of WINED3DSIO_TEXM3x3SPEC and WINED3DSIO_TEXM3x3VSPEC the old code was not quite correct, since we can lookup rather than guess the texture type these days. --- dlls/wined3d/baseshader.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 54ebfcd..5e58721 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -335,23 +335,6 @@ HRESULT shader_get_registers_used( reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D; } } - - } else if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && - (WINED3DSIO_TEXM3x3SPEC == curOpcode->opcode || - WINED3DSIO_TEXM3x3VSPEC == curOpcode->opcode)) { - - /* 3D sampler usage, only set reserved bit and ttype - * FIXME: This could be either Cube or Volume, but we wouldn't know unless - * we waited to generate the shader until the textures were all bound. - * For now, use Cube textures because they are more common. */ - DWORD sampler_code = *pToken & WINED3DSP_REGNUM_MASK; - reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_CUBE; - } else if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) == 1 && - (WINED3DSIO_TEXDP3TEX == curOpcode->opcode)) { - - /* 1D Sampler usage */ - DWORD sampler_code = *pToken & WINED3DSP_REGNUM_MASK; - reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_1D; } /* This will loop over all the registers and try to

1 0

H. Verbeet : wined3d: Cleanup shader_glsl_get_output_register_swizzle().
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 2b9a63b5d18c37adc8a6cfa1702485d3e9d8f3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9a63b5d18c37adc8a6cfa17… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:31:26 2006 +0100 wined3d: Cleanup shader_glsl_get_output_register_swizzle(). --- dlls/wined3d/glsl_shader.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc60c39..4c00036 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -718,19 +718,19 @@ static void shader_glsl_get_register_nam strcat(regstr, tmpStr); } -/* Writes the GLSL writemask for the destination register */ -static void shader_glsl_get_output_register_swizzle( - const DWORD param, - char *write_mask) { - - *write_mask = 0; +/* Get the GLSL write mask for the destination register */ +static void shader_glsl_get_write_mask(const DWORD param, char *write_mask) { + char *ptr = write_mask; + if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { - strcat(write_mask, "."); - if (param & WINED3DSP_WRITEMASK_0) strcat(write_mask, "x"); - if (param & WINED3DSP_WRITEMASK_1) strcat(write_mask, "y"); - if (param & WINED3DSP_WRITEMASK_2) strcat(write_mask, "z"); - if (param & WINED3DSP_WRITEMASK_3) strcat(write_mask, "w"); + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; } + + *ptr = '\0'; } static void shader_glsl_get_input_register_swizzle( @@ -804,7 +804,7 @@ static void shader_glsl_add_param( shader_glsl_get_input_register_swizzle(param, is_color, reg_mask); shader_glsl_gen_modifier(param, reg_name, reg_mask, out_str); } else { - shader_glsl_get_output_register_swizzle(param, reg_mask); + shader_glsl_get_write_mask(param, reg_mask); sprintf(out_str, "%s%s", reg_name, reg_mask); } } @@ -1788,7 +1788,7 @@ void pshader_glsl_input_pack( if (!usage_token) continue; usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_glsl_get_output_register_swizzle(register_token, reg_mask); + shader_glsl_get_write_mask(register_token, reg_mask); switch(usage) { @@ -1843,7 +1843,7 @@ void vshader_glsl_output_unpack( usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_glsl_get_output_register_swizzle(register_token, reg_mask); + shader_glsl_get_write_mask(register_token, reg_mask); switch(usage) {

1 0

H. Verbeet : wined3d: Cleanup & merge pshader_get_write_mask() and vshader_program_add_output_param_swizzle().
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 572cac4eecbc67ea76c290f0d70ed0e39ed44d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572cac4eecbc67ea76c290f0d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Dec 29 15:31:35 2006 +0100 wined3d: Cleanup & merge pshader_get_write_mask() and vshader_program_add_output_param_swizzle(). --- dlls/wined3d/arb_program_shader.c | 39 +++++++++++++++--------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 658552f..b3b6792 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -206,27 +206,18 @@ static const char * const shift_tab[] = "coefdiv.x" /* 15 (d2) */ }; -static void pshader_get_write_mask(const DWORD output_reg, char *write_mask) { - *write_mask = 0; - if ((output_reg & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { - strcat(write_mask, "."); - if (output_reg & WINED3DSP_WRITEMASK_0) strcat(write_mask, "r"); - if (output_reg & WINED3DSP_WRITEMASK_1) strcat(write_mask, "g"); - if (output_reg & WINED3DSP_WRITEMASK_2) strcat(write_mask, "b"); - if (output_reg & WINED3DSP_WRITEMASK_3) strcat(write_mask, "a"); - } -} +static void shader_arb_get_write_mask(const DWORD param, char *write_mask) { + char *ptr = write_mask; -/* TODO: merge with pixel shader */ -static void vshader_program_add_output_param_swizzle(const DWORD param, int is_color, char *hwLine) { - /** operand output */ if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { - strcat(hwLine, "."); - if (param & WINED3DSP_WRITEMASK_0) { strcat(hwLine, "x"); } - if (param & WINED3DSP_WRITEMASK_1) { strcat(hwLine, "y"); } - if (param & WINED3DSP_WRITEMASK_2) { strcat(hwLine, "z"); } - if (param & WINED3DSP_WRITEMASK_3) { strcat(hwLine, "w"); } + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; } + + *ptr = '\0'; } static void pshader_get_input_register_swizzle(const DWORD instr, char *swzstring) { @@ -417,7 +408,9 @@ static void vshader_program_add_param(SH } if (!is_input) { - vshader_program_add_output_param_swizzle(param, is_color, hwLine); + char write_mask[6]; + shader_arb_get_write_mask(param, write_mask); + strcat(hwLine, write_mask); } else { vshader_program_add_input_param_swizzle(param, is_color, hwLine); } @@ -550,7 +543,7 @@ void pshader_hw_cnd(SHADER_OPCODE_ARG* a /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - pshader_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -573,7 +566,7 @@ void pshader_hw_cmp(SHADER_OPCODE_ARG* a /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - pshader_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -633,7 +626,7 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG /* Handle output register */ pshader_get_register_name(dst, output_rname); strcpy(operands[0], output_rname); - pshader_get_write_mask(dst, output_wmask); + shader_arb_get_write_mask(dst, output_wmask); strcat(operands[0], output_wmask); if (saturate && (shift == 0)) @@ -697,7 +690,7 @@ void pshader_hw_texcoord(SHADER_OPCODE_A DWORD hex_version = This->baseShader.hex_version; char tmp[20]; - pshader_get_write_mask(dst, tmp); + shader_arb_get_write_mask(dst, tmp); if (hex_version != WINED3DPS_VERSION(1,4)) { DWORD reg = dst & WINED3DSP_REGNUM_MASK; shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg);

1 0

Vitaliy Margolen : dinput: Move keyboard to using new EnumObjects from base class.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 263d5ce171d0b02f25a57b2fcf05737dea99617a URL: http://source.winehq.org/git/wine.git/?a=commit;h=263d5ce171d0b02f25a57b2fc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 28 22:45:53 2006 -0700 dinput: Move keyboard to using new EnumObjects from base class. --- dlls/dinput/device.c | 4 ++ dlls/dinput/keyboard.c | 88 +++++++++++++++++------------------------------- 2 files changed, 35 insertions(+), 57 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index da3afa4..944091c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -835,6 +835,10 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ if (IsEqualGUID(&ddoi.guidType, &GUID_XAxis)) strcpy(ddoi.tszName, "X-Axis"); else if (IsEqualGUID(&ddoi.guidType, &GUID_YAxis)) strcpy(ddoi.tszName, "Y-Axis"); else if (IsEqualGUID(&ddoi.guidType, &GUID_ZAxis)) strcpy(ddoi.tszName, "Z-Axis"); + else if (IsEqualGUID(&ddoi.guidType, &GUID_Key )) + GetKeyNameTextA((DIDFT_GETINSTANCE(odf->dwType) & 0x80) << 17 | + (DIDFT_GETINSTANCE(odf->dwType) & 0x7f) << 16, + ddoi.tszName, sizeof(ddoi.tszName)); else if (type & DIDFT_AXIS) wsprintfA(ddoi.tszName, "%d-Axis", axis - 1); else if (type & DIDFT_BUTTON) wsprintfA(ddoi.tszName, "Button %d", button - 1); else FIXME("no name\n"); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 34800ff..f217e9a 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -188,6 +188,8 @@ static BOOL keyboarddev_enum_deviceW(DWO static SysKeyboardImpl *alloc_device(REFGUID rguid, const void *kvt, IDirectInputImpl *dinput) { SysKeyboardImpl* newDevice; + LPDIDATAFORMAT df = NULL; + int i, idx = 0; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboardImpl)); newDevice->base.lpVtbl = kvt; @@ -196,13 +198,30 @@ static SysKeyboardImpl *alloc_device(REF newDevice->dinput = dinput; InitializeCriticalSection(&newDevice->base.crit); - newDevice->base.data_format.wine_df = &c_dfDIKeyboard; - if (create_DataFormat(&c_dfDIKeyboard, &newDevice->base.data_format) == DI_OK) + /* Create copy of default data format */ + if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; + memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); + if (!(df->rgodf = HeapAlloc(GetProcessHeap(), 0, df->dwNumObjs * df->dwObjSize))) goto failed; + + for (i = 0; i < df->dwNumObjs; i++) { - IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); - return newDevice; + char buf[MAX_PATH]; + + if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) + continue; + + memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[i], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } + df->dwNumObjs = idx; + newDevice->base.data_format.wine_df = df; + IDirectInput_AddRef((LPDIRECTINPUTDEVICE8A)newDevice->dinput); + return newDevice; + +failed: + if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); + HeapFree(GetProcessHeap(), 0, df); HeapFree(GetProcessHeap(), 0, newDevice); return NULL; } @@ -265,6 +284,11 @@ static ULONG WINAPI SysKeyboardAImpl_Rel set_dinput_hook(WH_KEYBOARD_LL, NULL); HeapFree(GetProcessHeap(), 0, This->base.data_queue); + + /* Free data format */ + HeapFree(GetProcessHeap(), 0, (LPVOID)This->base.data_format.wine_df); + release_DataFormat(&This->base.data_format); + IDirectInput_Release((LPDIRECTINPUTDEVICE8A)This->dinput); DeleteCriticalSection(&This->base.crit); HeapFree(GetProcessHeap(), 0, This); @@ -301,56 +325,6 @@ static HRESULT WINAPI SysKeyboardAImpl_G return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_EnumObjects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - DIDEVICEOBJECTINSTANCEA ddoi; - int i; - - TRACE("(this=%p,%p,%p,%08x)\n", This, lpCallback, lpvRef, dwFlags); - if (TRACE_ON(dinput)) { - TRACE(" - flags = "); - _dump_EnumObjects_flags(dwFlags); - TRACE("\n"); - } - - /* Only the fields till dwFFMaxForce are relevant */ - memset(&ddoi, 0, sizeof(ddoi)); - ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce); - - for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) - { - if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) - continue; - ddoi.guidType = GUID_Key; - ddoi.dwOfs = i; - ddoi.dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_BUTTON; - _dump_OBJECTINSTANCEA(&ddoi); - if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK; - } - - return DI_OK; -} - -static HRESULT WINAPI SysKeyboardWImpl_EnumObjects(LPDIRECTINPUTDEVICE8W iface, - LPDIENUMDEVICEOBJECTSCALLBACKW lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - - device_enumobjects_AtoWcb_data data; - - data.lpCallBack = lpCallback; - data.lpvRef = lpvRef; - - return SysKeyboardAImpl_EnumObjects((LPDIRECTINPUTDEVICE8A) This, (LPDIENUMDEVICEOBJECTSCALLBACKA) DIEnumDevicesCallbackAtoW, (LPVOID) &data, dwFlags); -} - static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface); static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) @@ -417,7 +391,7 @@ static HRESULT WINAPI SysKeyboardAImpl_G else devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); devcaps.dwAxes = 0; - devcaps.dwButtons = WINE_DINPUT_KEYBOARD_MAX_KEYS; + devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; devcaps.dwFFSamplePeriod = 0; devcaps.dwFFMinTimeResolution = 0; @@ -555,7 +529,7 @@ static const IDirectInputDevice8AVtbl Sy IDirectInputDevice2AImpl_AddRef, SysKeyboardAImpl_Release, SysKeyboardAImpl_GetCapabilities, - SysKeyboardAImpl_EnumObjects, + IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, SysKeyboardAImpl_Acquire, @@ -597,7 +571,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(AddRef)IDirectInputDevice2AImpl_AddRef, XCAST(Release)SysKeyboardAImpl_Release, XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, - SysKeyboardWImpl_EnumObjects, + IDirectInputDevice2WImpl_EnumObjects, XCAST(GetProperty)IDirectInputDevice2AImpl_GetProperty, XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, XCAST(Acquire)SysKeyboardAImpl_Acquire,

1 0

Vitaliy Margolen : winex11drv: Make dxgrab global.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 291d7e05ce1cb040c511906007b942a749027d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=291d7e05ce1cb040c51190600… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Dec 29 12:26:35 2006 -0700 winex11drv: Make dxgrab global. --- dlls/winex11.drv/x11ddraw.c | 2 -- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index 3400b86..7400f5e 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -46,8 +46,6 @@ typedef struct _X11DEVICE { LPX11DRIVERINFO lpInfo; } X11DEVICE,*LPX11DEVICE; -extern int dxgrab; - static LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary; static LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl; static HWND X11DRV_DD_PrimaryWnd; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c56d94d..32c0db8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -526,6 +526,7 @@ extern unsigned int screen_height; extern unsigned int screen_depth; extern RECT virtual_screen_rect; extern unsigned int text_caps; +extern int dxgrab; extern int use_xkb; extern int use_take_focus; extern int use_primary_selection;

1 0

Frank Richter : comctl32: listview: Fix getting user params and subitems.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 8002c49ede44757041585c34541ab58670e4134e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8002c49ede44757041585c345… Author: Frank Richter <frank.richter(a)gmail.com> Date: Fri Dec 29 19:19:36 2006 +0100 comctl32: listview: Fix getting user params and subitems. When querying a listview subitem for the user param, the main item's user param is returned. Also, when a subitem is custom-drawn, the main item's user param is passed along. --- dlls/comctl32/listview.c | 12 +++--- dlls/comctl32/tests/listview.c | 85 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e7df207..a513eb6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3710,8 +3710,8 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_I TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos)); /* get information needed for drawing the item */ - lvItem.mask = LVIF_TEXT | LVIF_IMAGE; - if (nSubItem == 0) lvItem.mask |= LVIF_STATE | LVIF_PARAM; + lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; + if (nSubItem == 0) lvItem.mask |= LVIF_STATE; if (uView == LVS_REPORT) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED | LVIS_STATEIMAGEMASK; lvItem.iItem = nItem; @@ -5348,9 +5348,6 @@ static BOOL LISTVIEW_GetItemT(LISTVIEW_I else textcpynT(lpLVItem->pszText, isW, pItemHdr->pszText, TRUE, lpLVItem->cchTextMax); } - /* if this is a subitem, we're done */ - if (isubitem) return TRUE; - /* Next is the lParam field */ if (dispInfo.item.mask & LVIF_PARAM) { @@ -5361,8 +5358,11 @@ static BOOL LISTVIEW_GetItemT(LISTVIEW_I else if (lpLVItem->mask & LVIF_PARAM) lpLVItem->lParam = lpItem->lParam; + /* if this is a subitem, we're done */ + if (isubitem) return TRUE; + /* ... the state field (this one is different due to uCallbackmask) */ - if (lpLVItem->mask & LVIF_STATE) + if (lpLVItem->mask & LVIF_STATE) { lpLVItem->state = lpItem->state & lpLVItem->stateMask; if (dispInfo.item.mask & LVIF_STATE) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2bfca02..127208c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -63,6 +63,7 @@ static void test_images(void) item.iItem = 0; item.iSubItem = 1; item.iImage = 0; + item.pszText = 0; r = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM) &item); ok(r == -1, "should fail\n"); @@ -232,6 +233,89 @@ static void test_checkboxes(void) DestroyWindow(hwnd); } +static void test_items(void) +{ + const LPARAM lparamTest = 0x42; + HWND hwnd, hwndparent = 0; + LVITEMA item; + LVCOLUMNA column; + DWORD r; + static CHAR text[] = "Text"; + + hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + + /* + * Test setting/getting item params + */ + + /* Set up two columns */ + column.mask = LVCF_SUBITEM; + column.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&column); + ok(r == 0, "ret %d\n", r); + column.iSubItem = 1; + r = SendMessage(hwnd, LVM_INSERTCOLUMNA, 1, (LPARAM)&column); + ok(r == 1, "ret %d\n", r); + + /* Insert an item with just a param */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = lparamTest; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + + /* Test getting of the param */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); + + /* Set up a subitem */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = text; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + + /* Query param from subitem: returns main item param */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); + + /* Set up param on first subitem: no effect */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 1; + item.lParam = lparamTest+1; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + + /* Query param from subitem again: should still return main item param */ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_PARAM; + item.iItem = 0; + item.iSubItem = 1; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); + + DestroyWindow(hwnd); +} + START_TEST(listview) { INITCOMMONCONTROLSEX icc; @@ -242,4 +326,5 @@ START_TEST(listview) test_images(); test_checkboxes(); + test_items(); }

1 0

Alexandre Julliard : loader: Use the Mach thread port as thread id on Mac OS.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 150b5dcaef1f4e40aaf770c1c0ac8caea5887c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=150b5dcaef1f4e40aaf770c1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 20:02:02 2006 +0100 loader: Use the Mach thread port as thread id on Mac OS. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ loader/pthread.c | 5 +++++ 4 files changed, 11 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a1e7660..a68d2d1 100755 --- a/configure +++ b/configure @@ -7028,6 +7028,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7067,6 +7068,7 @@ for ac_header in \ linux/param.h \ linux/serial.h \ linux/ucdrom.h \ + mach/mach.h \ mach/machine.h \ machine/cpu.h \ machine/limits.h \ diff --git a/configure.ac b/configure.ac index 4dd936b..d56250f 100644 --- a/configure.ac +++ b/configure.ac @@ -197,6 +197,7 @@ AC_CHECK_HEADERS(\ linux/param.h \ linux/serial.h \ linux/ucdrom.h \ + mach/mach.h \ mach/machine.h \ machine/cpu.h \ machine/limits.h \ diff --git a/include/config.h.in b/include/config.h.in index 6f5387a..581a246 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -423,6 +423,9 @@ /* Define to 1 if you have the <mach/machine.h> header file. */ #undef HAVE_MACH_MACHINE_H +/* Define to 1 if you have the <mach/mach.h> header file. */ +#undef HAVE_MACH_MACH_H + /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE diff --git a/loader/pthread.c b/loader/pthread.c index 9a7834e..17be9e4 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -34,6 +34,9 @@ #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#ifdef HAVE_MACH_MACH_H +#include <mach/mach.h> +#endif #include "wine/library.h" #include "wine/pthread.h" @@ -144,6 +147,8 @@ static void init_current_teb( struct win info->pid = getpid(); #ifdef __sun info->tid = pthread_self(); /* this should return the lwp id on solaris */ +#elif defined(__APPLE__) + info->tid = mach_thread_self(); #else info->tid = gettid(); #endif

1 0

Alexandre Julliard : server: Implement process control using Mach primitives for Mac OS.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: c273498ef4221940c1e4de1193f5c4760fe48bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c273498ef4221940c1e4de119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 20:38:49 2006 +0100 server: Implement process control using Mach primitives for Mac OS. With help from Ken Thomases. --- dlls/ntdll/server.c | 47 ++++++ server/Makefile.in | 1 + server/mach.c | 414 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/process.h | 7 + server/ptrace.c | 4 + 5 files changed, 473 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c273498ef4221940c1e4d…

1 0

Hans Leidekker : usp10: Factor out script cache handling.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 7d37e8e9c713641febfc1a2b045dec5a0aae2d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d37e8e9c713641febfc1a2b0… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Dec 28 16:12:45 2006 +0100 usp10: Factor out script cache handling. --- dlls/usp10/usp10.c | 242 ++++++++++++++++------------------------------------ 1 files changed, 72 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d37e8e9c713641febfc1…

1 0