November 2008 - Wine-Commits

Juan Lang : wintrust: Add stub for WVTAsn1SpcFinancialCriteriaInfoEncode.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: c196e2eea0875fd2d475328709d12add75f10e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c196e2eea0875fd2d47532870… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 14:54:32 2008 -0800 wintrust: Add stub for WVTAsn1SpcFinancialCriteriaInfoEncode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index cc877dc..d64a9e3 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -936,6 +936,15 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, return ret; } +BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); + return FALSE; +} + /* Gets the number of length bytes from the given (leading) length byte */ #define GET_LEN_BYTES(b) ((b) <= 0x7f ? 1 : 1 + ((b) & 0x7f)) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 83d41db..2d03bdf 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -91,7 +91,7 @@ @ stdcall WVTAsn1CatNameValueDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcFinancialCriteriaInfoDecode -@ stub WVTAsn1SpcFinancialCriteriaInfoEncode +@ stdcall WVTAsn1SpcFinancialCriteriaInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentEncode(long str ptr ptr ptr) @ stdcall WVTAsn1SpcLinkDecode(long str ptr long long ptr ptr)

1 0

Alexandre Julliard : winemenubuilder: Move the xdg global variables out of the libpng ifdef block.
by Alexandre Julliard Nov. 4, 2008

Nov. 4, 2008

Module: wine Branch: master Commit: 394e97feeae47abde6464085e6b2ab50f1d278d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394e97feeae47abde6464085e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 20:19:30 2008 +0100 winemenubuilder: Move the xdg global variables out of the libpng ifdef block. --- programs/winemenubuilder/winemenubuilder.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index fd3a260..90c613a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -144,6 +144,8 @@ typedef struct int nIndex; } ENUMRESSTRUCT; +static char *xdg_config_dir; +static char *xdg_data_dir; /* Icon extraction routines * @@ -170,9 +172,6 @@ MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_row); #undef MAKE_FUNCPTR -static char *xdg_config_dir; -static char *xdg_data_dir; - static void *load_libpng(void) { if ((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL)

1 0

Andrew Fenn : xinput: Added header file that defines a lot of the functionality of the library.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: cefa1e883fd3da4bdd10b3dcbf34d0ad1cd2eee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefa1e883fd3da4bdd10b3dcb… Author: Andrew Fenn <andrewfenn(a)gmail.com> Date: Fri Oct 31 17:49:47 2008 +0000 xinput: Added header file that defines a lot of the functionality of the library. --- include/Makefile.in | 1 + include/xinput.h | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c70e6db..8d229bb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -461,6 +461,7 @@ SRCDIR_INCLUDES = \ wsnwlink.h \ wtsapi32.h \ xcmc.h \ + xinput.h \ xmldomdid.h \ xmldsodid.h \ zmouse.h diff --git a/include/xinput.h b/include/xinput.h new file mode 100644 index 0000000..7ec5e69 --- /dev/null +++ b/include/xinput.h @@ -0,0 +1,205 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_XINPUT_H +#define __WINE_XINPUT_H + +#include <windef.h> + +/* + * Bitmasks for the joysticks buttons, determines what has + * been pressed on the joystick, these need to be mapped + * to whatever device you're using instead of an xbox 360 + * joystick + */ + +#define XINPUT_GAMEPAD_DPAD_UP 0x0001 +#define XINPUT_GAMEPAD_DPAD_DOWN 0x0002 +#define XINPUT_GAMEPAD_DPAD_LEFT 0x0004 +#define XINPUT_GAMEPAD_DPAD_RIGHT 0x0008 +#define XINPUT_GAMEPAD_START 0x0010 +#define XINPUT_GAMEPAD_BACK 0x0020 +#define XINPUT_GAMEPAD_LEFT_THUMB 0x0040 +#define XINPUT_GAMEPAD_RIGHT_THUMB 0x0080 +#define XINPUT_GAMEPAD_LEFT_SHOULDER 0x0100 +#define XINPUT_GAMEPAD_RIGHT_SHOULDER 0x0200 +#define XINPUT_GAMEPAD_A 0x1000 +#define XINPUT_GAMEPAD_B 0x2000 +#define XINPUT_GAMEPAD_X 0x4000 +#define XINPUT_GAMEPAD_Y 0x8000 + +/* + * Defines the flags used to determine if the user is pushing + * down on a button, not holding a button, etc + */ + +#define XINPUT_KEYSTROKE_KEYDOWN 0x0001 +#define XINPUT_KEYSTROKE_KEYUP 0x0002 +#define XINPUT_KEYSTROKE_REPEAT 0x0004 + +/* + * Defines the codes which are returned by XInputGetKeystroke + */ + +#define VK_PAD_A 0x5800 +#define VK_PAD_B 0x5801 +#define VK_PAD_X 0x5802 +#define VK_PAD_Y 0x5803 +#define VK_PAD_RSHOULDER 0x5804 +#define VK_PAD_LSHOULDER 0x5805 +#define VK_PAD_LTRIGGER 0x5806 +#define VK_PAD_RTRIGGER 0x5807 +#define VK_PAD_DPAD_UP 0x5810 +#define VK_PAD_DPAD_DOWN 0x5811 +#define VK_PAD_DPAD_LEFT 0x5812 +#define VK_PAD_DPAD_RIGHT 0x5813 +#define VK_PAD_START 0x5814 +#define VK_PAD_BACK 0x5815 +#define VK_PAD_LTHUMB_PRESS 0x5816 +#define VK_PAD_RTHUMB_PRESS 0x5817 +#define VK_PAD_LTHUMB_UP 0x5820 +#define VK_PAD_LTHUMB_DOWN 0x5821 +#define VK_PAD_LTHUMB_RIGHT 0x5822 +#define VK_PAD_LTHUMB_LEFT 0x5823 +#define VK_PAD_LTHUMB_UPLEFT 0x5824 +#define VK_PAD_LTHUMB_UPRIGHT 0x5825 +#define VK_PAD_LTHUMB_DOWNRIGHT 0x5826 +#define VK_PAD_LTHUMB_DOWNLEFT 0x5827 +#define VK_PAD_RTHUMB_UP 0x5830 +#define VK_PAD_RTHUMB_DOWN 0x5831 +#define VK_PAD_RTHUMB_RIGHT 0x5832 +#define VK_PAD_RTHUMB_LEFT 0x5833 +#define VK_PAD_RTHUMB_UPLEFT 0x5834 +#define VK_PAD_RTHUMB_UPRIGHT 0x5835 +#define VK_PAD_RTHUMB_DOWNRIGHT 0x5836 +#define VK_PAD_RTHUMB_DOWNLEFT 0x5837 + +/* + * Deadzones are for analogue joystick controls on the joypad + * which determine when input should be assumed to be in the + * middle of the pad. This is a threshold to stop a joypad + * controlling the game when the player isn't touching the + * controls. + */ + +#define XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE 7849 +#define XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689 +#define XINPUT_GAMEPAD_TRIGGER_THRESHOLD 30 + + +/* + * Defines what type of abilities the type of joystick has + * DEVTYPE_GAMEPAD is avaliable for all joysticks, however + * there may be more specfic identifiers for other joysticks + * which are being used. + */ + +#define XINPUT_DEVTYPE_GAMEPAD 0x01 +#define XINPUT_DEVSUBTYPE_GAMEPAD 0x01 +#define XINPUT_DEVSUBTYPE_WHEEL 0x02 +#define XINPUT_DEVSUBTYPE_ARCADE_STICK 0x03 +#define XINPUT_DEVSUBTYPE_FLIGHT_SICK 0x04 +#define XINPUT_DEVSUBTYPE_DANCE_PAD 0x05 +#define XINPUT_DEVSUBTYPE_GUITAR 0x06 +#define XINPUT_DEVSUBTYPE_DRUM_KIT 0x08 + +/* + * These are used with the XInputGetCapabilities function to + * determine the abilities to the joystick which has been + * plugged in. + */ + +#define XINPUT_CAPS_VOICE_SUPPORTED 0x0004 +#define XINPUT_FLAG_GAMEPAD 0x00000001 + +/* + * Defines the status of the battery if one is used in the + * attached joystick. The first two define if the joystick + * supports a battery. Disconnected means that the joystick + * isn't connected. Wired shows that the joystick is a wired + * joystick. + */ + +#define BATTERY_DEVTYPE_GAMEPAD 0x00 +#define BATTERY_DEVTYPE_HEADSET 0x01 +#define BATTERY_TYPE_DISCONNECTED 0x00 +#define BATTERY_TYPE_WIRED 0x01 +#define BATTERY_TYPE_ALKALINE 0x02 +#define BATTERY_TYPE_NIMH 0x03 +#define BATTERY_TYPE_UNKNOWN 0xFF +#define BATTERY_LEVEL_EMPTY 0x00 +#define BATTERY_LEVEL_LOW 0x01 +#define BATTERY_LEVEL_MEDIUM 0x02 +#define BATTERY_LEVEL_FULL 0x03 + +/* + * How many joysticks can be used with this library. Games that + * use the xinput library will not go over this number. + */ + +#define XUSER_MAX_COUNT 4 +#define XUSER_INDEX_ANY 0x000000FF + +/* + * Defines the structure of an xbox 360 joystick. + */ + +typedef struct _XINPUT_GAMEPAD { + WORD wButtons; + BYTE bLeftTrigger; + BYTE bRightTrigger; + SHORT sThumbLX; + SHORT sThumbLY; + SHORT sThumbRX; + SHORT sThumbRY; +} XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; + +typedef struct _XINPUT_STATE { + DWORD dwPacketNumber; + XINPUT_GAMEPAD Gamepad; +} XINPUT_STATE, *PXINPUT_STATE; + +/* + * Defines the structure of how much vibration is set on both the + * right and left motors in a joystick. If you're not using a 360 + * joystick you will have to map these to your device. + */ + +typedef struct _XINPUT_VIBRATION { + WORD wLeftMotorSpeed; + WORD wRightMotorSpeed; +} XINPUT_VIBRATION, *PXINPUT_VIBRATION; + +/* + * Defines the structure for what kind of abilities the joystick has + * such abilites are things such as if the joystick has the ability + * to send and recieve audio, if the joystick is infact a driving + * wheel or perhaps if the joystick is some kind of dance pad or + * guitar. + */ + +typedef struct _XINPUT_CAPABILITIES { + BYTE Type; + BYTE SubType; + WORD Flags; + XINPUT_GAMEPAD Gamepad; + XINPUT_VIBRATION Vibration; +} XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; + +#endif /* __WINE_XINPUT_H */

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLElement get_document.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: f5c5951a3c1ea5ef10333eae4418fe0078e8181f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c5951a3c1ea5ef10333eae4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 30 21:38:23 2008 +1100 mshtml: Implement IHTMLElement get_document. --- dlls/mshtml/htmlelem.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4e7b747..7cc1a62 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -579,8 +579,16 @@ static HRESULT WINAPI HTMLElement_get_onmouseup(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_get_document(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + *p = (IDispatch*)This->node.doc; + IDispatch_AddRef(*p); + + return S_OK; } static HRESULT WINAPI HTMLElement_put_title(IHTMLElement *iface, BSTR v)

1 0

Andrew Talbot : oleaut32: Sign-compare warnings fix.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 5af3af2b2f7227a05b61b17b76540cac73f7cad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af3af2b2f7227a05b61b17b7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Nov 2 18:46:53 2008 +0000 oleaut32: Sign-compare warnings fix. --- dlls/oleaut32/recinfo.c | 3 +- dlls/oleaut32/safearray.c | 2 +- dlls/oleaut32/typelib.c | 47 +++++++++++++++++++++++---------------------- dlls/oleaut32/typelib2.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index a4da4d3..8fdf85a 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -412,8 +412,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetFieldNames(IRecordInfo *iface, ULONG *p BSTR *rgBstrNames) { IRecordInfoImpl *This = (IRecordInfoImpl*)iface; - ULONG n = This->n_vars; - int i; + ULONG n = This->n_vars, i; TRACE("(%p)->(%p %p)\n", This, pcNames, rgBstrNames); diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index bf82a5a..c717ac6 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -207,7 +207,7 @@ static void SAFEARRAY_SetFeatures(VARTYPE vt, SAFEARRAY *psa) static SAFEARRAY* SAFEARRAY_Create(VARTYPE vt, UINT cDims, const SAFEARRAYBOUND *rgsabound, ULONG ulSize) { SAFEARRAY *psa = NULL; - int i; + unsigned int i; if (!rgsabound) return NULL; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7e069d6..f807c05 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1294,7 +1294,7 @@ static void dump_Variant(const VARIANT * pvar) static void dump_DispParms(const DISPPARAMS * pdp) { - int index; + unsigned int index; TRACE("args=%u named args=%u\n", pdp->cArgs, pdp->cNamedArgs); @@ -2973,7 +2973,7 @@ static WORD *SLTG_DoElem(WORD *pType, char *pBlk, static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, char *pNameTable) { - int ref; + unsigned int ref; char *name; TLBRefType *ref_type; sltg_ref_lookup_t *table; @@ -3904,7 +3904,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( UINT index, ITypeInfo **ppTInfo) { - int i; + UINT i; ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTypeInfo = This->pTypeInfo; @@ -3942,9 +3942,9 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( TYPEKIND *pTKind) { ITypeLibImpl *This = (ITypeLibImpl *)iface; - int i; + UINT i; ITypeInfoImpl *pTInfo = This->pTypeInfo; - + if (ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) return TYPE_E_ELEMENTNOTFOUND; @@ -4678,7 +4678,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) for (pFInfo = This->funclist; pFInfo; pFInfo = pFInfoNext) { - UINT i; + INT i; for(i = 0;i < pFInfo->funcdesc.cParams; i++) { ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[i]; @@ -4913,7 +4913,7 @@ HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const F { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; const TLBFuncDesc *pFDesc; - int i; + UINT i; for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) ; @@ -5106,7 +5106,7 @@ static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, LPVARDESC *ppVarDesc) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; + UINT i; const TLBVarDesc *pVDesc; TRACE("(%p) index %d\n", This, index); @@ -5198,7 +5198,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( HREFTYPE *pRefType) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; + UINT i; HRESULT hr = S_OK; const TLBImplType *pImpl = This->impltypelist; @@ -5261,7 +5261,7 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, UINT index, INT *pImplTypeFlags) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; + UINT i; TLBImplType *pImpl; TRACE("(%p) index %d\n", This, index); @@ -5287,7 +5287,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, const TLBFuncDesc *pFDesc; const TLBVarDesc *pVDesc; HRESULT ret=S_OK; - int i; + UINT i; TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), cNames); @@ -5663,7 +5663,8 @@ DispCallFunc( void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { - int i, argsize, argspos; + int argsize, argspos; + UINT i; DWORD *args; HRESULT hres; @@ -5677,7 +5678,7 @@ DispCallFunc( for (i=0;i<cActuals;i++) { - TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_dispargsize(prgvt[i])); + TRACE("arg %u: type %d, size %d\n",i,prgvt[i],_dispargsize(prgvt[i])); dump_Variant(prgpvarg[i]); argsize += _dispargsize(prgvt[i]); } @@ -5693,7 +5694,7 @@ DispCallFunc( for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; - TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); + TRACE("Storing arg %u (%d as %d)\n",i,V_VT(arg),prgvt[i]); if (prgvt[i] == VT_VARIANT) memcpy(&args[argspos], arg, _dispargsize(prgvt[i]) * sizeof(DWORD)); else @@ -6802,7 +6803,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; - int i; + UINT i; for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next); @@ -6834,7 +6835,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; - int i; + UINT i; for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,pFDesc=pFDesc->next); @@ -6867,7 +6868,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBVarDesc * pVDesc; - int i; + UINT i; for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++, pVDesc=pVDesc->next); @@ -6903,7 +6904,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBImplType * pRDesc; - int i; + UINT i; for(i=0, pRDesc=This->impltypelist; i!=index && pRDesc; i++, pRDesc=pRDesc->next); @@ -7030,7 +7031,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBFuncDesc * pFDesc; - int i; + UINT i; TRACE("(%p) index %d\n", This, index); for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) @@ -7066,7 +7067,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; - int i; + UINT i; TRACE("(%p) index %d\n", This, indexFunc); for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++, pFDesc=pFDesc->next) @@ -7103,7 +7104,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllVarCustData( ITypeInfo2 * iface, ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBVarDesc * pVDesc; - int i; + UINT i; TRACE("(%p) index %d\n", This, index); for(i=0, pVDesc=This->varlist; i!=index && pVDesc; i++, pVDesc=pVDesc->next) @@ -7141,7 +7142,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBImplType * pRDesc; - int i; + UINT i; TRACE("(%p) index %d\n", This, index); for(i=0, pRDesc=This->impltypelist; i!=index && pRDesc; i++, pRDesc=pRDesc->next) @@ -7231,7 +7232,7 @@ HRESULT WINAPI CreateDispTypeInfo( { ITypeInfoImpl *pTIClass, *pTIIface; ITypeLibImpl *pTypeLibImpl; - int param, func; + unsigned int param, func; TLBFuncDesc **ppFuncDesc; TLBRefType *ref; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 0d10f53..3d092e5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1708,7 +1708,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( { ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; - int i; + UINT i; int offset; char *namedata;

1 0

Michael Karcher : msxml3: Clean up initialization.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 813da72423ee37262873f905d61e89116745a9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813da72423ee37262873f905d… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Nov 2 12:46:41 2008 +0100 msxml3: Clean up initialization. --- dlls/msxml3/main.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index b301ab7..8dbacbf 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -55,17 +55,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) #ifdef HAVE_LIBXML2 xmlInitParser(); - /* Set the default indent character to a single tab. */ + /* Set the default indent character to a single tab, + for this thread and as default for new threads */ + xmlTreeIndentString = "\t"; xmlThrDefTreeIndentString("\t"); #endif #ifdef HAVE_XSLTINIT xsltInit(); #endif - -#ifdef HAVE_LIBXML2 - /* Set the current ident to the default */ - xmlTreeIndentString = "\t"; -#endif DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH:

1 0

Michael Karcher : msxml3: Simplify IXMLDOMNodeMap::removeNamedItem.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 2adcef79544fe17797a4a5b60ce784e2fabfd358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2adcef79544fe17797a4a5b60… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Nov 2 13:34:44 2008 +0100 msxml3: Simplify IXMLDOMNodeMap::removeNamedItem. --- dlls/msxml3/nodemap.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index e4150e5..8c7c1d0 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -289,7 +289,7 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); xmlChar *element_name; - xmlAttrPtr attr, attr_copy; + xmlAttrPtr attr; xmlNodePtr node; TRACE("%p %s %p\n", This, debugstr_w(name), namedItem ); @@ -314,13 +314,15 @@ static HRESULT WINAPI xmlnodemap_removeNamedItem( if ( namedItem ) { - attr_copy = xmlCopyProp( NULL, attr ); - attr_copy->doc = node->doc; - /* The cast here is OK, xmlFreeNode handles xmlAttrPtr pointers */ - xmldoc_add_orphan(attr_copy->doc, (xmlNodePtr) attr_copy); - *namedItem = create_node( (xmlNodePtr) attr_copy ); + xmlUnlinkNode( (xmlNodePtr) attr ); + xmldoc_add_orphan( attr->doc, (xmlNodePtr) attr ); + *namedItem = create_node( (xmlNodePtr) attr ); + } + else + { + if( xmlRemoveProp( attr ) == -1 ) + ERR("xmlRemoveProp failed\n"); } - xmlRemoveProp( attr ); return S_OK; }

1 0

Damjan Jovanovic : winemenubuilder: Generate icons in winemenubuilder instead of wineshelllink.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 26fcfb4b240678d120c448dee1572db72ec7d4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fcfb4b240678d120c448dee… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Nov 2 15:10:40 2008 +0200 winemenubuilder: Generate icons in winemenubuilder instead of wineshelllink. --- programs/winemenubuilder/winemenubuilder.c | 128 +++++++++++++++++++-------- tools/wineshelllink | 19 +---- 2 files changed, 91 insertions(+), 56 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index cbdb154..fd3a260 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -6,6 +6,7 @@ * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2004 Dmitry Timoshkov * Copyright 2005 Bill Medland + * Copyright 2008 Damjan Jovanovic * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -169,6 +170,9 @@ MAKE_FUNCPTR(png_write_info); MAKE_FUNCPTR(png_write_row); #undef MAKE_FUNCPTR +static char *xdg_config_dir; +static char *xdg_data_dir; + static void *load_libpng(void) { if ((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) @@ -665,60 +669,77 @@ static unsigned short crc16(const char* string) return crc; } +static char* heap_printf(const char *format, ...) +{ + va_list args; + int size = 4096; + char *buffer; + int n; + + va_start(args, format); + while (1) + { + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer == NULL) + break; + n = vsnprintf(buffer, size, format, args); + if (n == -1) + size *= 2; + else if (n >= size) + size = n + 1; + else + break; + HeapFree(GetProcessHeap(), 0, buffer); + } + va_end(args); + return buffer; +} + +static BOOL create_directories(char *directory) +{ + BOOL ret = TRUE; + int i; + + for (i = 0; directory[i]; i++) + { + if (i > 0 && directory[i] == '/') + { + directory[i] = 0; + mkdir(directory, 0777); + directory[i] = '/'; + } + } + if (mkdir(directory, 0777) && errno != EEXIST) + ret = FALSE; + + return ret; +} + /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) { unsigned short crc; - char *iconsdir, *ico_path, *ico_name, *xpm_path; + char *iconsdir = NULL, *ico_path = NULL, *ico_name, *xpm_path = NULL; char* s; - HKEY hkey; int n; /* Where should we save the icon? */ WINE_TRACE("path=[%s] index=%d\n", wine_dbgstr_w(path), index); - iconsdir=NULL; /* Default is no icon */ - /* @@ Wine registry key: HKCU\Software\Wine\WineMenuBuilder */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\WineMenuBuilder", &hkey )) + iconsdir = heap_printf("%s/icons", xdg_data_dir); + if (iconsdir) { - static const WCHAR IconsDirW[] = {'I','c','o','n','s','D','i','r',0}; - LPWSTR iconsdirW; - DWORD size = 0; - - if (!RegQueryValueExW(hkey, IconsDirW, 0, NULL, NULL, &size)) + if (mkdir(iconsdir, 0777) && errno != EEXIST) { - iconsdirW = HeapAlloc(GetProcessHeap(), 0, size); - RegQueryValueExW(hkey, IconsDirW, 0, NULL, (LPBYTE)iconsdirW, &size); - - if (!(iconsdir = wine_get_unix_file_name(iconsdirW))) - { - int n = WideCharToMultiByte(CP_UNIXCP, 0, iconsdirW, -1, NULL, 0, NULL, NULL); - iconsdir = HeapAlloc(GetProcessHeap(), 0, n); - WideCharToMultiByte(CP_UNIXCP, 0, iconsdirW, -1, iconsdir, n, NULL, NULL); - } - HeapFree(GetProcessHeap(), 0, iconsdirW); + WINE_WARN("couldn't make icons directory %s\n", wine_dbgstr_a(iconsdir)); + goto end; } - RegCloseKey( hkey ); } - - if (!iconsdir) + else { - WCHAR path[MAX_PATH]; - if (GetTempPathW(MAX_PATH, path)) - iconsdir = wine_get_unix_file_name(path); - if (!iconsdir) - { - WINE_TRACE("no IconsDir\n"); - return NULL; /* No icon created */ - } + WINE_TRACE("no icon created\n"); + return NULL; } - if (!*iconsdir) - { - WINE_TRACE("icon generation disabled\n"); - HeapFree(GetProcessHeap(), 0, iconsdir); - return NULL; /* No icon created */ - } - /* Determine the icon base name */ n = WideCharToMultiByte(CP_UNIXCP, 0, path, -1, NULL, 0, NULL, NULL); ico_path = HeapAlloc(GetProcessHeap(), 0, n); @@ -1364,6 +1385,35 @@ static CHAR *next_token( LPSTR *p ) return token; } +static BOOL init_xdg(void) +{ + if (getenv("XDG_CONFIG_HOME")) + xdg_config_dir = heap_printf("%s/menus/applications-merged", getenv("XDG_CONFIG_HOME")); + else + xdg_config_dir = heap_printf("%s/.config/menus/applications-merged", getenv("HOME")); + if (xdg_config_dir) + { + if (getenv("XDG_DATA_HOME")) + xdg_data_dir = heap_printf("%s", getenv("XDG_DATA_HOME")); + else + xdg_data_dir = heap_printf("%s/.local/share", getenv("HOME")); + if (xdg_data_dir) + { + char *buffer; + create_directories(xdg_data_dir); + buffer = heap_printf("%s/desktop-directories", xdg_data_dir); + if (buffer) + { + mkdir(buffer, 0777); + HeapFree(GetProcessHeap(), 0, buffer); + } + return TRUE; + } + HeapFree(GetProcessHeap(), 0, xdg_config_dir); + } + return FALSE; +} + /*********************************************************************** * * WinMain @@ -1374,6 +1424,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show BOOL bWait = FALSE; int ret = 0; + init_xdg(); + for( p = cmdline; p && *p; ) { token = next_token( &p ); diff --git a/tools/wineshelllink b/tools/wineshelllink index 0c02bda..297c38e 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -93,7 +93,7 @@ StartupWMClass=Wine EOF [ -z "$descr" ] || echo "Comment=$descr" [ -z "$workdir" ] || echo "Path=$workdir" - [ -z "$xpmicon" ] || echo "Icon=$xpmicon" + [ -z "$icon" ] || echo "Icon=$icon" } directory_entry() @@ -111,21 +111,6 @@ EOF fi } -# copy the icon file to a specified dir and set xpmicon to the resulting path -copy_icon() -{ - if [ -f "$icon" ] - then - xpmicon=`basename "$icon"` - xpmicon=${xpmicon%.*} - - mkdir -p "$1" - cp "$icon" "$1" - else - xpmicon="" - fi -} - # XDG xdg_config_dir="${XDG_CONFIG_HOME:-$HOME/.config}/menus/applications-merged" @@ -207,8 +192,6 @@ write_menu_file() } -copy_icon "$xdg_data_dir/icons" - linkname=`basename "$link"` if [ $mode = "menu" ] ; then

1 0

Michael Stefaniuc : uxtheme: Remove superflous casts.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 373f8ff1033cf50281e8f83446fc818b4bfe5fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=373f8ff1033cf50281e8f8344… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:35:17 2008 +0100 uxtheme: Remove superflous casts. --- dlls/uxtheme/draw.c | 12 ++++++------ dlls/uxtheme/msstyles.c | 6 +++--- dlls/uxtheme/system.c | 4 ++-- dlls/uxtheme/uxini.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index ff0ac9e..8280c66 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1177,8 +1177,8 @@ static HRESULT draw_diag_edge (HDC hdc, HTHEME theme, int part, int state, + (LTRBOuterMono[uType & (BDR_INNER|BDR_OUTER)] != -1 ? 1 : 0); /* Init some vars */ - OuterPen = InnerPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, InnerPen); + OuterPen = InnerPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, InnerPen); spx = spy = epx = epy = 0; /* Satisfy the compiler... */ /* Determine the colors of the edges */ @@ -1373,8 +1373,8 @@ static HRESULT draw_diag_edge (HDC hdc, HTHEME theme, int part, int state, HPEN hpsave; HPEN hp = get_edge_pen ((uFlags & BF_MONO) ? EDGE_WINDOW : EDGE_FILL, theme, part, state); - hbsave = (HBRUSH)SelectObject(hdc, hb); - hpsave = (HPEN)SelectObject(hdc, hp); + hbsave = SelectObject(hdc, hb); + hpsave = SelectObject(hdc, hp); Polygon(hdc, Points, 4); SelectObject(hdc, hbsave); SelectObject(hdc, hpsave); @@ -1426,8 +1426,8 @@ static HRESULT draw_rect_edge (HDC hdc, HTHEME theme, int part, int state, && !(uFlags & (BF_FLAT|BF_MONO)) ) ? E_FAIL : S_OK; /* Init some vars */ - LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = (HPEN)GetStockObject(NULL_PEN); - SavePen = (HPEN)SelectObject(hdc, LTInnerPen); + LTInnerPen = LTOuterPen = RBInnerPen = RBOuterPen = GetStockObject(NULL_PEN); + SavePen = SelectObject(hdc, LTInnerPen); /* Determine the colors of the edges */ if(uFlags & BF_MONO) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index d0fbb11..8aa67fd 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -132,14 +132,14 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszColors = (LPWSTR)LoadResource(hTheme, hrsc); + pszColors = LoadResource(hTheme, hrsc); if(!(hrsc = FindResourceW(hTheme, MAKEINTRESOURCEW(1), szSizeNamesResource))) { TRACE("Size names resource not found\n"); hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT); goto invalid_theme; } - pszSizes = (LPWSTR)LoadResource(hTheme, hrsc); + pszSizes = LoadResource(hTheme, hrsc); /* Validate requested color against what's available from the theme */ if(pszColorName) { @@ -298,7 +298,7 @@ static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) TRACE("FILERESNAMES map not found\n"); return NULL; } - tmp = (LPWSTR)LoadResource(tf->hTheme, hrsc); + tmp = LoadResource(tf->hTheme, hrsc); dwResourceIndex = (dwSizeCount * dwColorNum) + dwSizeNum; for(i=0; i < dwResourceIndex; i++) { tmp += lstrlenW(tmp)+1; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 3630a6d..d213ba2 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -122,7 +122,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, WCHAR cNull = '\0'; nBytesToAlloc = dwUnExpDataLen; - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc); RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc); dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1); dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen); @@ -131,7 +131,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue, else { nBytesToAlloc = (lstrlenW(pvData) + 1) * sizeof(WCHAR); - szData = (LPWSTR) LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); + szData = LocalAlloc(LMEM_ZEROINIT, nBytesToAlloc ); lstrcpyW(szData, pvData); dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, MAX_PATH ); if (dwExpDataLen > MAX_PATH) dwRet = ERROR_MORE_DATA; diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 85efdb1..02c5443 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -68,7 +68,7 @@ PUXINI_FILE UXINI_LoadINI(HMODULE hTheme, LPCWSTR lpName) { TRACE("Loading resource INI %s\n", debugstr_w(lpName)); if((hrsc = FindResourceW(hTheme, lpName, szTextFileResource))) { - if(!(lpThemesIni = (LPCWSTR)LoadResource(hTheme, hrsc))) { + if(!(lpThemesIni = LoadResource(hTheme, hrsc))) { TRACE("%s resource not found\n", debugstr_w(lpName)); return NULL; }

1 0

Michael Stefaniuc : avifil32: Remove superfluous casts of void pointers.
by Alexandre Julliard Nov. 3, 2008

Nov. 3, 2008

Module: wine Branch: master Commit: 83c4ae561dac036cb9990be6930cf6f0b212e9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c4ae561dac036cb9990be69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 22:34:43 2008 +0100 avifil32: Remove superfluous casts of void pointers. --- dlls/avifil32/editstream.c | 2 +- dlls/avifil32/icmstream.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index f2c6e5d..f19f3ac 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -935,7 +935,7 @@ static HRESULT WINAPI IEditAVIStream_fnReadFormat(IAVIStream*iface,LONG pos, if (! This->bDecompress) return IAVIStream_ReadFormat(stream, n, format, fmtsize); - lp = (LPBITMAPINFOHEADER)AVIFILE_ReadFrame(This, stream, n); + lp = AVIFILE_ReadFrame(This, stream, n); if (lp == NULL) return AVIERR_ERROR; if (lp->biBitCount <= 8) { diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index cb79fa4..8276e41 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -393,7 +393,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, return hr; } - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, pos); + lpbi = AVIStreamGetFrame(This->pg, pos); if (lpbi == NULL) return AVIERR_MEMORY; @@ -611,7 +611,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, /* compress or decompress? */ if (This->hic == NULL) { /* decompress */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, start); + lpbi = AVIStreamGetFrame(This->pg, start); if (lpbi == NULL) return AVIERR_MEMORY; @@ -634,7 +634,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, while (start > This->lCurrent) { HRESULT hr; - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, ++This->lCurrent); + lpbi = AVIStreamGetFrame(This->pg, ++This->lCurrent); if (lpbi == NULL) { AVIFILE_Reset(This); return AVIERR_MEMORY; @@ -902,7 +902,7 @@ static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This) assert(This->lpbiOutput == NULL); /* get input format */ - lpbi = (LPBITMAPINFOHEADER)AVIStreamGetFrame(This->pg, This->sInfo.dwStart); + lpbi = AVIStreamGetFrame(This->pg, This->sInfo.dwStart); if (lpbi == NULL) return AVIERR_MEMORY;

1 0