May 2013 - Wine-commits - list.winehq.org

Dmitry Timoshkov : msi: Fix memory leak.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 30fc34b881594fd73ae60c85379302e13e797404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fc34b881594fd73ae60c853… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 21 16:08:17 2013 +0900 msi: Fix memory leak. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a6b858..5b58976 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -878,6 +878,7 @@ static UINT HANDLE_CustomType50( MSIPACKAGE *package, const WCHAR *source, const TRACE("exe %s arg %s\n", debugstr_w(exe), debugstr_w(arg)); handle = execute_command( exe, arg, szCRoot ); + msi_free( exe ); msi_free( arg ); if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; return wait_process_handle( package, type, handle, action );

1 0

Aric Stewart : gdi32: Vertical glyph replacements are not applied in GetGlyphOutline if glyph is specified by index .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 70cdd2ff9a09ad32123311f5c7bde21144d7a708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cdd2ff9a09ad32123311f5c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 20 11:24:03 2013 -0500 gdi32: Vertical glyph replacements are not applied in GetGlyphOutline if glyph is specified by index. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ae48914..ea13c37 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5905,7 +5905,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, font->font_desc.matrix.eM21, font->font_desc.matrix.eM22); if(format & GGO_GLYPH_INDEX) { - glyph_index = get_GSUB_vert_glyph(incoming_font,glyph); + glyph_index = glyph; original_index = glyph; format &= ~GGO_GLYPH_INDEX; } else {

1 0

Aric Stewart : gdi32: Load the vertical feature when loading the GSUB table .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: accad0957c18da3afa1406ffcd8969436ce1c86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=accad0957c18da3afa1406ffc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 20 11:24:21 2013 -0500 gdi32: Load the vertical feature when loading the GSUB table. --- dlls/gdi32/freetype.c | 257 +++++++++++++++++++++++++++---------------------- 1 files changed, 140 insertions(+), 117 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ea13c37..b0a124f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -354,6 +354,7 @@ struct tagGdiFont { FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; + const VOID *vert_feature; DWORD cache_num; }; @@ -4692,6 +4693,137 @@ done: return ret; } +static const GSUB_Script* GSUB_get_script_table( const GSUB_Header* header, const char* tag) +{ + const GSUB_ScriptList *script; + const GSUB_Script *deflt = NULL; + int i; + script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + + TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); + for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) + { + const GSUB_Script *scr; + int offset; + + offset = GET_BE_WORD(script->ScriptRecord[i].Script); + scr = (const GSUB_Script*)((const BYTE*)script + offset); + + if (strncmp(script->ScriptRecord[i].ScriptTag, tag,4)==0) + return scr; + if (strncmp(script->ScriptRecord[i].ScriptTag, "dflt",4)==0) + deflt = scr; + } + return deflt; +} + +static const GSUB_LangSys* GSUB_get_lang_table( const GSUB_Script* script, const char* tag) +{ + int i; + int offset; + const GSUB_LangSys *Lang; + + TRACE("Deflang %x, LangCount %i\n",GET_BE_WORD(script->DefaultLangSys), GET_BE_WORD(script->LangSysCount)); + + for (i = 0; i < GET_BE_WORD(script->LangSysCount) ; i++) + { + offset = GET_BE_WORD(script->LangSysRecord[i].LangSys); + Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); + + if ( strncmp(script->LangSysRecord[i].LangSysTag,tag,4)==0) + return Lang; + } + offset = GET_BE_WORD(script->DefaultLangSys); + if (offset) + { + Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); + return Lang; + } + return NULL; +} + +static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GSUB_LangSys *lang, const char* tag) +{ + int i; + const GSUB_FeatureList *feature; + feature = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); + + TRACE("%i features\n",GET_BE_WORD(lang->FeatureCount)); + for (i = 0; i < GET_BE_WORD(lang->FeatureCount); i++) + { + int index = GET_BE_WORD(lang->FeatureIndex[i]); + if (strncmp(feature->FeatureRecord[index].FeatureTag,tag,4)==0) + { + const GSUB_Feature *feat; + feat = (const GSUB_Feature*)((const BYTE*)feature + GET_BE_WORD(feature->FeatureRecord[index].Feature)); + return feat; + } + } + return NULL; +} + +static const char* get_opentype_script(const GdiFont *font) +{ + /* + * I am not sure if this is the correct way to generate our script tag + */ + + switch (font->charset) + { + case ANSI_CHARSET: return "latn"; + case BALTIC_CHARSET: return "latn"; /* ?? */ + case CHINESEBIG5_CHARSET: return "hani"; + case EASTEUROPE_CHARSET: return "latn"; /* ?? */ + case GB2312_CHARSET: return "hani"; + case GREEK_CHARSET: return "grek"; + case HANGUL_CHARSET: return "hang"; + case RUSSIAN_CHARSET: return "cyrl"; + case SHIFTJIS_CHARSET: return "kana"; + case TURKISH_CHARSET: return "latn"; /* ?? */ + case VIETNAMESE_CHARSET: return "latn"; + case JOHAB_CHARSET: return "latn"; /* ?? */ + case ARABIC_CHARSET: return "arab"; + case HEBREW_CHARSET: return "hebr"; + case THAI_CHARSET: return "thai"; + default: return "latn"; + } +} + +static const VOID * get_GSUB_vert_feature(const GdiFont *font) +{ + const GSUB_Header *header; + const GSUB_Script *script; + const GSUB_LangSys *language; + const GSUB_Feature *feature; + + if (!font->GSUB_Table) + return NULL; + + header = font->GSUB_Table; + + script = GSUB_get_script_table(header, get_opentype_script(font)); + if (!script) + { + TRACE("Script not found\n"); + return NULL; + } + language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ + if (!language) + { + TRACE("Language not found\n"); + return NULL; + } + feature = GSUB_get_feature(header, language, "vrt2"); + if (!feature) + feature = GSUB_get_feature(header, language, "vert"); + if (!feature) + { + TRACE("vrt2/vert feature not found\n"); + return NULL; + } + return feature; +} + /************************************************************* * freetype_SelectFont */ @@ -5104,6 +5236,13 @@ found_face: ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); + ret->vert_feature = get_GSUB_vert_feature(ret); + if (!ret->vert_feature) + { + TRACE("Vertical feature not found\n"); + HeapFree(GetProcessHeap(), 0, ret->GSUB_Table); + ret->GSUB_Table = NULL; + } } } ret->aa_flags = HIWORD( face->flags ); @@ -5563,75 +5702,6 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } -static const GSUB_Script* GSUB_get_script_table( const GSUB_Header* header, const char* tag) -{ - const GSUB_ScriptList *script; - const GSUB_Script *deflt = NULL; - int i; - script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - - TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); - for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) - { - const GSUB_Script *scr; - int offset; - - offset = GET_BE_WORD(script->ScriptRecord[i].Script); - scr = (const GSUB_Script*)((const BYTE*)script + offset); - - if (strncmp(script->ScriptRecord[i].ScriptTag, tag,4)==0) - return scr; - if (strncmp(script->ScriptRecord[i].ScriptTag, "dflt",4)==0) - deflt = scr; - } - return deflt; -} - -static const GSUB_LangSys* GSUB_get_lang_table( const GSUB_Script* script, const char* tag) -{ - int i; - int offset; - const GSUB_LangSys *Lang; - - TRACE("Deflang %x, LangCount %i\n",GET_BE_WORD(script->DefaultLangSys), GET_BE_WORD(script->LangSysCount)); - - for (i = 0; i < GET_BE_WORD(script->LangSysCount) ; i++) - { - offset = GET_BE_WORD(script->LangSysRecord[i].LangSys); - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - - if ( strncmp(script->LangSysRecord[i].LangSysTag,tag,4)==0) - return Lang; - } - offset = GET_BE_WORD(script->DefaultLangSys); - if (offset) - { - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - return Lang; - } - return NULL; -} - -static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GSUB_LangSys *lang, const char* tag) -{ - int i; - const GSUB_FeatureList *feature; - feature = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - TRACE("%i features\n",GET_BE_WORD(lang->FeatureCount)); - for (i = 0; i < GET_BE_WORD(lang->FeatureCount); i++) - { - int index = GET_BE_WORD(lang->FeatureIndex[i]); - if (strncmp(feature->FeatureRecord[index].FeatureTag,tag,4)==0) - { - const GSUB_Feature *feat; - feat = (const GSUB_Feature*)((const BYTE*)feature + GET_BE_WORD(feature->FeatureRecord[index].Feature)); - return feat; - } - } - return NULL; -} - static FT_UInt GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* feature, UINT glyph) { int i; @@ -5692,65 +5762,18 @@ static FT_UInt GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature return glyph; } -static const char* get_opentype_script(const GdiFont *font) -{ - /* - * I am not sure if this is the correct way to generate our script tag - */ - - switch (font->charset) - { - case ANSI_CHARSET: return "latn"; - case BALTIC_CHARSET: return "latn"; /* ?? */ - case CHINESEBIG5_CHARSET: return "hani"; - case EASTEUROPE_CHARSET: return "latn"; /* ?? */ - case GB2312_CHARSET: return "hani"; - case GREEK_CHARSET: return "grek"; - case HANGUL_CHARSET: return "hang"; - case RUSSIAN_CHARSET: return "cyrl"; - case SHIFTJIS_CHARSET: return "kana"; - case TURKISH_CHARSET: return "latn"; /* ?? */ - case VIETNAMESE_CHARSET: return "latn"; - case JOHAB_CHARSET: return "latn"; /* ?? */ - case ARABIC_CHARSET: return "arab"; - case HEBREW_CHARSET: return "hebr"; - case THAI_CHARSET: return "thai"; - default: return "latn"; - } -} static FT_UInt get_GSUB_vert_glyph(const GdiFont *font, UINT glyph) { const GSUB_Header *header; - const GSUB_Script *script; - const GSUB_LangSys *language; const GSUB_Feature *feature; if (!font->GSUB_Table) return glyph; header = font->GSUB_Table; + feature = font->vert_feature; - script = GSUB_get_script_table(header, get_opentype_script(font)); - if (!script) - { - TRACE("Script not found\n"); - return glyph; - } - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ - if (!language) - { - TRACE("Language not found\n"); - return glyph; - } - feature = GSUB_get_feature(header, language, "vrt2"); - if (!feature) - feature = GSUB_get_feature(header, language, "vert"); - if (!feature) - { - TRACE("vrt2/vert feature not found\n"); - return glyph; - } return GSUB_apply_feature(header, feature, glyph); }

1 0

Aric Stewart : gdi32: Vertical glyphs can be written tategaki even without a vertical GSUB feature .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 1ff63bb8935d2a9a548de8d45c46a37129c5f544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff63bb8935d2a9a548de8d45… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 20 11:24:29 2013 -0500 gdi32: Vertical glyphs can be written tategaki even without a vertical GSUB feature. It is only based on the presence of the '@' character in the font name. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b0a124f..bc43772 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5915,7 +5915,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; BOOL needsTransform = FALSE; - BOOL tategaki = (font->GSUB_Table != NULL); + BOOL tategaki = (font->name[0] == '@'); UINT original_index; LONG avgAdvance = 0; FT_Fixed em_scale;

1 0

Andrew Eikum : dinput: Enumerate devices past the first non-matching device .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 0ba314ebfa6321d8ab4f01d0bcbb46b8d4fd920f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba314ebfa6321d8ab4f01d0b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 14:10:02 2013 -0500 dinput: Enumerate devices past the first non-matching device. --- dlls/dinput/dinput_main.c | 62 +++++++++++++++++++------------------ dlls/dinput/dinput_private.h | 4 +- dlls/dinput/joystick_linux.c | 24 +++++++------- dlls/dinput/joystick_linuxinput.c | 24 +++++++------- dlls/dinput/joystick_osx.c | 20 ++++++------ dlls/dinput/keyboard.c | 16 +++++----- dlls/dinput/mouse.c | 16 +++++----- 7 files changed, 84 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ba314ebfa6321d8ab4f0…

1 0

Andrew Eikum : dinput: Determine if OSX devices support force feedback.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: e6450b4ea4434a3724066ce671431d716448613b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6450b4ea4434a3724066ce67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 14:10:30 2013 -0500 dinput: Determine if OSX devices support force feedback. --- configure | 3 + configure.ac | 1 + dlls/dinput/Makefile.in | 2 +- dlls/dinput/joystick_osx.c | 158 ++++++++++++++++++++++++++++++++++++-------- 4 files changed, 136 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6450b4ea4434a3724066…

1 0

Andrew Eikum : dinput: Implement force feedback functions for OSX joysticks .
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 3de75b1e95187c6d1d68fe35f064cbea7edef3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de75b1e95187c6d1d68fe35f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 14:10:33 2013 -0500 dinput: Implement force feedback functions for OSX joysticks. --- dlls/dinput/joystick_osx.c | 230 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 228 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 66a4acb..0d3927a 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -111,6 +111,7 @@ struct JoystickImpl CFMutableArrayRef elementCFArrayRef; ObjProps **propmap; FFDeviceObjectReference ff; + struct list effects; }; static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -124,6 +125,24 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } +typedef struct _EffectImpl { + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; + + JoystickImpl *device; + FFEffectObjectReference effect; + GUID guid; + + struct list entry; +} EffectImpl; + +static EffectImpl *impl_from_IDirectInputEffect(IDirectInputEffect *iface) +{ + return CONTAINING_RECORD(iface, EffectImpl, IDirectInputEffect_iface); +} + +static const IDirectInputEffectVtbl EffectVtbl; + static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */ 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} }; @@ -831,6 +850,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); strcpy(newDevice->generic.name, name); + list_init(&newDevice->effects); device = get_device_ref(index); if(get_ff(device, &newDevice->ff) == S_OK){ newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; @@ -1038,6 +1058,82 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_DEVICENOTREG; } +static CFUUIDRef effect_win_to_mac(const GUID *effect) +{ +#define DO_MAP(X) \ + if(IsEqualGUID(&GUID_##X, effect)) \ + return kFFEffectType_##X##_ID; + DO_MAP(ConstantForce) + DO_MAP(RampForce) + DO_MAP(Square) + DO_MAP(Sine) + DO_MAP(Triangle) + DO_MAP(SawtoothUp) + DO_MAP(SawtoothDown) + DO_MAP(Spring) + DO_MAP(Damper) + DO_MAP(Inertia) + DO_MAP(Friction) + DO_MAP(CustomForce) +#undef DO_MAP + WARN("Unknown effect GUID! %s\n", debugstr_guid(effect)); + return 0; +} + +static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + EffectImpl *effect; + HRESULT hr; + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + + if(!This->ff){ + TRACE("No force feedback support\n"); + *out = NULL; + return S_OK; + } + + if(outer) + WARN("aggregation not implemented\n"); + + effect = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + effect->IDirectInputEffect_iface.lpVtbl = &EffectVtbl; + effect->ref = 1; + effect->guid = *type; + effect->device = This; + + /* Mac's FFEFFECT and Win's DIEFFECT are binary identical. */ + hr = FFDeviceCreateEffect(This->ff, effect_win_to_mac(type), + (FFEFFECT*)params, &effect->effect); + if(FAILED(hr)){ + WARN("FFDeviceCreateEffect failed: %08x\n", hr); + HeapFree(GetProcessHeap(), 0, effect); + return hr; + } + + list_add_tail(&This->effects, &effect->entry); + *out = &effect->IDirectInputEffect_iface; + + TRACE("allocated effect: %p\n", effect); + + return S_OK; +} + +static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + + return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, + type, params, out, outer); +} + const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", joydev_enum_deviceA, @@ -1065,7 +1161,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, - IDirectInputDevice2AImpl_CreateEffect, + JoystickAImpl_CreateEffect, IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, @@ -1101,7 +1197,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = JoystickWGenericImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, - IDirectInputDevice2WImpl_CreateEffect, + JoystickWImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, @@ -1117,6 +1213,136 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice8WImpl_GetImageInfo }; +static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, + const GUID *guid, void **out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(guid), out); + + if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + *out = iface; + IDirectInputEffect_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI effect_AddRef(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + return ref; +} + +static ULONG WINAPI effect_Release(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + + if(!ref){ + list_remove(&This->entry); + FFDeviceReleaseEffect(This->device->ff, This->effect); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI effect_Initialize(IDirectInputEffect *iface, HINSTANCE hinst, + DWORD version, const GUID *guid) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x, %s\n", This, hinst, version, debugstr_guid(guid)); + return S_OK; +} + +static HRESULT WINAPI effect_GetEffectGuid(IDirectInputEffect *iface, GUID *out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, out); + *out = This->guid; + return S_OK; +} + +static HRESULT WINAPI effect_GetParameters(IDirectInputEffect *iface, + DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + return FFEffectGetParameters(This->effect, (FFEFFECT*)effect, flags); +} + +static HRESULT WINAPI effect_SetParameters(IDirectInputEffect *iface, + const DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + return FFEffectSetParameters(This->effect, (FFEFFECT*)effect, flags); +} + +static HRESULT WINAPI effect_Start(IDirectInputEffect *iface, DWORD iterations, + DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p 0x%x 0x%x\n", This, iterations, flags); + return FFEffectStart(This->effect, iterations, flags); +} + +static HRESULT WINAPI effect_Stop(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectStop(This->effect); +} + +static HRESULT WINAPI effect_GetEffectStatus(IDirectInputEffect *iface, DWORD *flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, flags); + return FFEffectGetEffectStatus(This->effect, (UInt32*)flags); +} + +static HRESULT WINAPI effect_Download(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectDownload(This->effect); +} + +static HRESULT WINAPI effect_Unload(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectUnload(This->effect); +} + +static HRESULT WINAPI effect_Escape(IDirectInputEffect *iface, DIEFFESCAPE *escape) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, escape); + return FFEffectEscape(This->effect, (FFEFFESCAPE*)escape); +} + +static const IDirectInputEffectVtbl EffectVtbl = { + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_Initialize, + effect_GetEffectGuid, + effect_GetParameters, + effect_SetParameters, + effect_Start, + effect_Stop, + effect_GetEffectStatus, + effect_Download, + effect_Unload, + effect_Escape +}; + #else /* HAVE_IOHIDMANAGERCREATE */ const struct dinput_device joystick_osx_device = {

1 0

Daniel Jelinski : kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 614c45ad1c6d9141b45b6ecf87c44e23d9bad81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=614c45ad1c6d9141b45b6ecf8… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon May 20 23:18:22 2013 +0200 kernel32: Implement CAL_RETURN_NUMBER in EnumCalendarInfo*. Based on a patch by Mike Blumenkrantz. --- dlls/kernel32/lcformat.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 6240787..c1af253 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1975,7 +1975,9 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, { do /* loop until there's no error */ { - if (unicode) + if (caltype & CAL_RETURN_NUMBER) + ret = GetCalendarInfoW(locale, calendar, caltype, NULL, bufSz / sizeof(WCHAR), (LPDWORD)buf); + else if (unicode) ret = GetCalendarInfoW(locale, calendar, caltype, buf, bufSz / sizeof(WCHAR), NULL); else ret = GetCalendarInfoA(locale, calendar, caltype, (CHAR*)buf, bufSz / sizeof(CHAR), NULL);

1 0

Daniel Jelinski : kernel32: Implement CAL_ICALINTVALUE in GetCalendarInfo.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: 81dc0fe87b13aaadffd15e23ec69e485b5091724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dc0fe87b13aaadffd15e23e… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon May 20 22:32:36 2013 +0200 kernel32: Implement CAL_ICALINTVALUE in GetCalendarInfo. Based on patch by Mike Blumenkrantz. --- dlls/kernel32/time.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 39d3395..63dfc93 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -668,8 +668,10 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, * for the CALTYPES not requiring GetLocaleInfoA */ switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { case CAL_ICALINTVALUE: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return 0; + if (CalType & CAL_RETURN_NUMBER) + return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER | LOCALE_ICALENDARTYPE, + (LPWSTR)lpValue, 2); + return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); return 0;

1 0

Daniel Jelinski : kernel32: Improved stub for GetCalendarInfo' s CAL_SCALNAME.
by Alexandre Julliard 21 May '13

21 May '13

Module: wine Branch: master Commit: debd62cf9fbd63c04599c77696c8fa603de8238b URL: http://source.winehq.org/git/wine.git/?a=commit;h=debd62cf9fbd63c04599c7769… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon May 20 22:37:56 2013 +0200 kernel32: Improved stub for GetCalendarInfo's CAL_SCALNAME. Based on patch by Mike Blumenkrantz. --- dlls/kernel32/time.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 63dfc93..a1875f4 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -674,7 +674,8 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return 0; + if (lpCalData) *lpCalData = 0; + return 1; case CAL_IYEAROFFSETRANGE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); return 0;

1 0