January 2011 - Wine-commits

Nikolay Sivov : oleaut32: Use alloc/ free helpers for all typelib parse methods.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: a90d2efd536c54cc21475d4e77f34554a30040b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90d2efd536c54cc21475d4e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 3 17:32:43 2011 +0300 oleaut32: Use alloc/free helpers for all typelib parse methods. --- dlls/oleaut32/typelib.c | 260 ++++++++++++++++++++++------------------------- 1 files changed, 122 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a90d2efd536c54cc21475…

1 0

Greg Geldorp : ole32/tests: Disable target device clipboard tests.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 8cbb8cc38d01027407976a10b32a59f6a4cb705c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbb8cc38d01027407976a10b… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 15:41:22 2011 +0100 ole32/tests: Disable target device clipboard tests. --- dlls/ole32/tests/clipboard.c | 72 ++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 34 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index d97426c..8a44f50 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -428,18 +428,21 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) InitFormatEtc(obj->fmtetc[1], cf_stream, TYMED_ISTREAM); InitFormatEtc(obj->fmtetc[2], cf_storage, TYMED_ISTORAGE); InitFormatEtc(obj->fmtetc[3], cf_another, TYMED_ISTORAGE|TYMED_ISTREAM|TYMED_HGLOBAL); - memset(&dm, 0, sizeof(dm)); - dm.dmSize = sizeof(dm); - dm.dmDriverExtra = 0; - lstrcpyW(dm.dmDeviceName, device_name); - obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); - obj->fmtetc[3].ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; - obj->fmtetc[3].ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); - obj->fmtetc[3].ptd->tdDeviceNameOffset = 0; - obj->fmtetc[3].ptd->tdPortNameOffset = 0; - obj->fmtetc[3].ptd->tdExtDevmodeOffset = obj->fmtetc[3].ptd->tdDriverNameOffset + sizeof(device_name); - lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, device_name); - memcpy(obj->fmtetc[3].ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); + if (0) /* Causes crashes on both Wine and Windows */ + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; + lstrcpyW(dm.dmDeviceName, device_name); + obj->fmtetc[3].ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); + obj->fmtetc[3].ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; + obj->fmtetc[3].ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); + obj->fmtetc[3].ptd->tdDeviceNameOffset = 0; + obj->fmtetc[3].ptd->tdPortNameOffset = 0; + obj->fmtetc[3].ptd->tdExtDevmodeOffset = obj->fmtetc[3].ptd->tdDriverNameOffset + sizeof(device_name); + lstrcpyW((WCHAR*)obj->fmtetc[3].ptd->tdData, device_name); + memcpy(obj->fmtetc[3].ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); + } InitFormatEtc(obj->fmtetc[4], cf_global, TYMED_HGLOBAL); InitFormatEtc(obj->fmtetc[5], cf_another, TYMED_HGLOBAL); @@ -1192,31 +1195,32 @@ static void test_flushed_getdata(void) InitFormatEtc(fmt, cf_another, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); - ok(hr == DV_E_FORMATETC || - broken(hr == S_OK), /* win9x, winme & nt4 */ - "got %08x\n", hr); - if(SUCCEEDED(hr)) ReleaseStgMedium(&med); - - InitFormatEtc(fmt, cf_another, 0xffff); - memset(&dm, 0, sizeof(dm)); - dm.dmSize = sizeof(dm); - dm.dmDriverExtra = 0; - lstrcpyW(dm.dmDeviceName, device_name); - fmt.ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); - fmt.ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; - fmt.ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); - fmt.ptd->tdDeviceNameOffset = 0; - fmt.ptd->tdPortNameOffset = 0; - fmt.ptd->tdExtDevmodeOffset = fmt.ptd->tdDriverNameOffset + sizeof(device_name); - lstrcpyW((WCHAR*)fmt.ptd->tdData, device_name); - memcpy(fmt.ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); - - hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); - ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); if(SUCCEEDED(hr)) ReleaseStgMedium(&med); - HeapFree(GetProcessHeap(), 0, fmt.ptd); + if (0) /* Causes crashes on both Wine and Windows */ + { + InitFormatEtc(fmt, cf_another, 0xffff); + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; + lstrcpyW(dm.dmDeviceName, device_name); + fmt.ptd = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra); + fmt.ptd->tdSize = FIELD_OFFSET(DVTARGETDEVICE, tdData) + sizeof(device_name) + dm.dmSize + dm.dmDriverExtra; + fmt.ptd->tdDriverNameOffset = FIELD_OFFSET(DVTARGETDEVICE, tdData); + fmt.ptd->tdDeviceNameOffset = 0; + fmt.ptd->tdPortNameOffset = 0; + fmt.ptd->tdExtDevmodeOffset = fmt.ptd->tdDriverNameOffset + sizeof(device_name); + lstrcpyW((WCHAR*)fmt.ptd->tdData, device_name); + memcpy(fmt.ptd->tdData + sizeof(device_name), &dm, dm.dmSize + dm.dmDriverExtra); + + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); + + HeapFree(GetProcessHeap(), 0, fmt.ptd); + } IDataObject_Release(get);

1 0

Nikolay Sivov : oleaut32: Use structure size instead of hardcoded values.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 30b516b8d4ddff15c1824f14811ce48f4346c038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b516b8d4ddff15c1824f148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 13:41:44 2011 +0300 oleaut32: Use structure size instead of hardcoded values. --- dlls/oleaut32/typelib2.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 82915a7..fdf712b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1976,7 +1976,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( insert = alloc_cyclic_list_item(CyclicListFunc); if(!insert) return E_OUTOFMEMORY; - insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); + insert->u.data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MSFT_FuncRecord, HelpContext)+ + sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); if(!insert->u.data) { HeapFree(GetProcessHeap(), 0, insert); return E_OUTOFMEMORY; @@ -1984,7 +1985,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( /* fill out the basic type information */ typedata = insert->u.data; - typedata[0] = 0x18 + pFuncDesc->cParams*(num_defaults?16:12); + typedata[0] = FIELD_OFFSET(MSFT_FuncRecord, HelpContext) + pFuncDesc->cParams*(num_defaults?16:12); ctl2_encode_typedesc(This->typelib, &pFuncDesc->elemdescFunc.tdesc, &typedata[1], NULL, NULL, &decoded_size); typedata[2] = pFuncDesc->wFuncFlags; typedata[3] = ((sizeof(FUNCDESC) + decoded_size) << 16) | (unsigned short)(pFuncDesc->oVft?pFuncDesc->oVft+1:0); @@ -2048,7 +2049,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( } /* update type data size */ - This->typedata->next->u.val += 0x18 + pFuncDesc->cParams*(num_defaults?16:12); + This->typedata->next->u.val += FIELD_OFFSET(MSFT_FuncRecord, HelpContext) + pFuncDesc->cParams*(num_defaults?16:12); /* Increment the number of function elements */ This->typeinfo->cElement += 1;

1 0

Nikolay Sivov : oleaut32/tests: Cleanup some test macros.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 4e17e38aa2b451849550f22b1e6dfa91a0c5c328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e17e38aa2b451849550f22b1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 2 17:26:44 2011 +0300 oleaut32/tests: Cleanup some test macros. --- dlls/oleaut32/tests/typelib.c | 4 +- dlls/oleaut32/tests/vartype.c | 275 +++++++++++++++++++---------------------- 2 files changed, 129 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e17e38aa2b451849550f…

1 0

Jacek Caban : mshtml: Use IUri for nsURL::[Get|Set]Password implementation.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 0aefffe9b4570374d8fc1874ab5e1cb438ba9eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aefffe9b4570374d8fc1874a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 14:52:34 2011 +0100 mshtml: Use IUri for nsURL::[Get|Set]Password implementation. --- dlls/mshtml/nsio.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e7f8a70..ed098e3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1780,26 +1780,33 @@ static nsresult NSAPI nsURI_GetPassword(nsIURL *iface, nsACString *aPassword) TRACE("(%p)->(%p)\n", This, aPassword); - if(This->nsuri) - return nsIURI_GetPassword(This->nsuri, aPassword); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_PASSWORD, aPassword); } static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPassword) { nsWineURI *This = NSURI_THIS(iface); + const char *passa; + WCHAR *pass; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPassword)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetPassword(This->nsuri, aPassword); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aPassword, &passa); + pass = heap_strdupAtoW(passa); + if(!pass) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetPassword(This->uri_builder, pass); + heap_free(pass); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort)

1 0

Jacek Caban : mshtml: Don' t prefer to forward a few more calls in nsIURL implementation.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 64c1b7922e28b1ffff8d9a60fa6b82627f98de27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1b7922e28b1ffff8d9a60f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 3 14:52:51 2011 +0100 mshtml: Don't prefer to forward a few more calls in nsIURL implementation. --- dlls/mshtml/nsio.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ed098e3..e5cfa78 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1933,9 +1933,6 @@ static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath) TRACE("(%p)->(%p)\n", This, aPath); - if(This->nsuri) - return nsIURI_GetPath(This->nsuri, aPath); - return get_uri_string(This, Uri_PROPERTY_PATH, aPath); } @@ -2060,9 +2057,6 @@ static nsresult NSAPI nsURI_Resolve(nsIURL *iface, const nsACString *aRelativePa TRACE("(%p)->(%s %p)\n", This, debugstr_nsacstr(aRelativePath), _retval); - if(This->nsuri) - return nsIURI_Resolve(This->nsuri, aRelativePath, _retval); - nsACString_GetData(aRelativePath, &patha); path = heap_strdupAtoW(patha); if(!path) @@ -2184,9 +2178,6 @@ static nsresult NSAPI nsURL_GetQuery(nsIURL *iface, nsACString *aQuery) TRACE("(%p)->(%p)\n", This, aQuery); - if(This->nsurl) - return nsIURL_GetQuery(This->nsurl, aQuery); - return get_uri_string(This, Uri_PROPERTY_QUERY, aQuery); }

1 0

Vitaliy Margolen : dinput: COM cleanup - use interface instead of lpvtbl in joystick effects.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 0adc4708548d824ddad1bc3d73d655dfcbad033b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0adc4708548d824ddad1bc3d7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:24:34 2011 -0700 dinput: COM cleanup - use interface instead of lpvtbl in joystick effects. --- dlls/dinput/effect_linuxinput.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7802271..e35a96f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -49,9 +49,9 @@ static const IDirectInputEffectVtbl LinuxInputEffectVtbl; typedef struct LinuxInputEffectImpl LinuxInputEffectImpl; struct LinuxInputEffectImpl { - const void *lpVtbl; - LONG ref; - GUID guid; + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; + GUID guid; struct ff_effect effect; /* Effect data */ int gain; /* Effect gain */ @@ -60,6 +60,10 @@ struct LinuxInputEffectImpl struct list *entry; /* Entry into the parent's list of effects */ }; +static inline LinuxInputEffectImpl *impl_from_IDirectInputEffect(IDirectInputEffect *iface) +{ + return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); +} /****************************************************************************** * DirectInputEffect Functional Helper @@ -244,14 +248,14 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); return InterlockedIncrement(&(This->ref)); } static HRESULT WINAPI LinuxInputEffectImpl_Download( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); @@ -281,7 +285,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectGuid( LPDIRECTINPUTEFFECT iface, LPGUID pguid) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%p)\n", This, pguid); @@ -312,7 +316,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( DWORD dwFlags) { HRESULT diErr = DI_OK; - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); /* Major conversion factors are: @@ -474,7 +478,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_QueryInterface( REFIID riid, void **ppvObject) { - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%s,%p)\n", This, debugstr_guid(riid), ppvObject); @@ -495,7 +499,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Start( DWORD dwFlags) { struct input_event event; - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p,%d,%d)\n", This, dwIterations, dwFlags); @@ -527,8 +531,8 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( LPDIRECTINPUTEFFECT iface, LPCDIEFFECT peff, DWORD dwFlags) -{ - LinuxInputEffectImpl* This = (LinuxInputEffectImpl*)iface; +{ + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); DWORD type = _typeFromGUID(&This->guid); HRESULT retval = DI_OK; @@ -727,7 +731,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Stop( LPDIRECTINPUTEFFECT iface) { struct input_event event; - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); @@ -743,7 +747,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Stop( static HRESULT WINAPI LinuxInputEffectImpl_Unload( LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); /* Erase the downloaded effect */ @@ -758,7 +762,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Unload( static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) { - LinuxInputEffectImpl *This = (LinuxInputEffectImpl *)iface; + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); if (ref == 0) @@ -786,7 +790,7 @@ HRESULT linuxinput_create_effect( HEAP_ZERO_MEMORY, sizeof(LinuxInputEffectImpl)); DWORD type = _typeFromGUID(rguid); - newEffect->lpVtbl = &LinuxInputEffectVtbl; + newEffect->IDirectInputEffect_iface.lpVtbl = &LinuxInputEffectVtbl; newEffect->ref = 1; newEffect->guid = *rguid; newEffect->fd = fd;

1 0

Vitaliy Margolen : dinput: Rename IDirectInputDevice2AImpl into IDirectInputDeviceImpl.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 179b862738aae3b84b87c8e421cef868fe60e87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=179b862738aae3b84b87c8e42… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:25:07 2011 -0700 dinput: Rename IDirectInputDevice2AImpl into IDirectInputDeviceImpl. --- dlls/dinput/device.c | 34 +++++++++++++++++----------------- dlls/dinput/device_private.h | 4 ++-- dlls/dinput/dinput_main.c | 18 +++++++++--------- dlls/dinput/joystick_private.h | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=179b862738aae3b84b87c…

1 0

Thomas Mullaly : include: Added IDN support functions and types.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 148b38d9237c61029f7ca022aeb9269a00012a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=148b38d9237c61029f7ca022a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 2 16:20:20 2011 -0500 include: Added IDN support functions and types. --- include/winnls.h | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/include/winnls.h b/include/winnls.h index adefcee..6ce50e1 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -24,6 +24,12 @@ extern "C" { #endif +#ifndef _NORMALIZE_ +# define WINNORMALIZEAPI DECLSPEC_IMPORT +#else +# define WINNORMALIZEAPI +#endif + /* Country codes */ #define CTRY_DEFAULT (0) #define CTRY_ALBANIA (355) @@ -532,9 +538,21 @@ extern "C" { #define LGRPID_GEORGIAN 0x10 #define LGRPID_ARMENIAN 0x11 +/* IDN defines. */ +#define IDN_ALLOW_UNASSIGNED 0x1 +#define IDN_USE_STD3_ASCII_RULES 0x2 + /* Types */ +typedef enum _NORM_FORM { + NormalizationOther = 0, + NormalizationC = 0x1, + NormalizationD = 0x2, + NormalizationKC = 0x5, + NormalizationKD = 0x6 +} NORM_FORM; + typedef DWORD CALID; typedef DWORD CALTYPE; typedef LONG GEOID; @@ -790,8 +808,12 @@ WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultUILanguage(void); WINBASEAPI GEOID WINAPI GetUserGeoID(GEOCLASS); +WINNORMALIZEAPI INT WINAPI IdnToAscii(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI IdnToUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); +WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); @@ -801,6 +823,7 @@ WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT); #define LCMapString WINELIB_NAME_AW(LCMapString) WINBASEAPI LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); WINBASEAPI INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); +WINNORMALIZEAPI INT WINAPI NormalizeString(NORM_FORM,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); WINBASEAPI INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo)

1 0

Greg Geldorp : msi/tests: Fix some failures on Wow64.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 536876afc3228606bfadd9ae42621d0a7cee3915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536876afc3228606bfadd9ae4… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Mon Jan 3 01:06:08 2011 +0100 msi/tests: Fix some failures on Wow64. --- dlls/msi/tests/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1db7845..86abecc 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3428,6 +3428,8 @@ static void test_publish(void) else { res = RegOpenKeyExA(uninstall, prodcode, 0, access, &prodkey); + if (is_wow64 && res == ERROR_FILE_NOT_FOUND) /* XP - Vista, Wow64 */ + res = RegOpenKeyExA(uninstall, prodcode, 0, KEY_ALL_ACCESS, &prodkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); }

1 0