wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Dmitry Timoshkov : windowscodecs: Implement MetadataReaderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: bae3f2afede3f582e6349b0937e2e47b9f8c3a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3f2afede3f582e6349b093… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:14:06 2012 +0900 windowscodecs: Implement MetadataReaderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 1bfbfc7..36d2e87 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1527,8 +1527,12 @@ static HRESULT WINAPI MetadataReaderInfo_GetVersion(IWICMetadataReaderInfo *ifac static HRESULT WINAPI MetadataReaderInfo_GetSpecVersion(IWICMetadataReaderInfo *iface, UINT length, WCHAR *version, UINT *actual_length) { - FIXME("(%p,%u,%p,%p): stub\n", iface, length, version, actual_length); - return E_NOTIMPL; + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, length, version, actual_length); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + length, version, actual_length); } static HRESULT WINAPI MetadataReaderInfo_GetFriendlyName(IWICMetadataReaderInfo *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement PixelFormatInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 497e8840ca5b30c94e6406ded3217d5c33779a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=497e8840ca5b30c94e6406ded… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:13:21 2012 +0900 windowscodecs: Implement PixelFormatInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 4c7fcc2..1bfbfc7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1238,8 +1238,12 @@ static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UI static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 1cd84c1..cae64ff 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -209,8 +209,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); - todo_wine ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); - todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ + ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ memset(&guid, 0xaa, sizeof(guid)); hr = IWICComponentInfo_GetVendorGUID(info, &guid);

1 0

Dmitry Timoshkov : windowscodecs: Implement FormatConverterInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 7c191379963647f1ec734e237048731b83613a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c191379963647f1ec734e237… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:46:17 2012 +0900 windowscodecs: Implement FormatConverterInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index bd277b8..4c7fcc2 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1013,8 +1013,12 @@ static HRESULT WINAPI FormatConverterInfo_GetVersion(IWICFormatConverterInfo *if static HRESULT WINAPI FormatConverterInfo_GetSpecVersion(IWICFormatConverterInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetFriendlyName(IWICFormatConverterInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3dd73e90b55ad8029b9e0694511e271f65d2837d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd73e90b55ad8029b9e06945… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 17:45:05 2012 +0900 windowscodecs: Implement BitmapEncoderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index debbf78..bd277b8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -723,8 +723,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *iface, UINT cchFriendlyName,

1 0

Dmitry Timoshkov : windowscodecs: Implement BitmapDecoderInfo_GetSpecVersion.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 67fc1a49e18280a5f4a6727eb1a4e295f6dc6c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fc1a49e18280a5f4a6727eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 2 16:11:16 2012 +0900 windowscodecs: Implement BitmapDecoderInfo_GetSpecVersion. --- dlls/windowscodecs/info.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index b403310..debbf78 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -46,6 +46,7 @@ static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e static const WCHAR metadataformat_valuename[] = {'M','e','t','a','d','a','t','a','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR specversion_valuename[] = {'S','p','e','c','V','e','r','s','i','o','n',0}; static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t','h',0}; static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; @@ -257,8 +258,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetVersion(IWICBitmapDecoderInfo *iface, static HRESULT WINAPI BitmapDecoderInfo_GetSpecVersion(IWICBitmapDecoderInfo *iface, UINT cchSpecVersion, WCHAR *wzSpecVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, specversion_valuename, + cchSpecVersion, wzSpecVersion, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetFriendlyName(IWICBitmapDecoderInfo *iface, UINT cchFriendlyName,

1 0

Piotr Caban : msvcp90/tests: Added _Getcoll tests.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: b4da8894e637b08902ab8ad1000a4d90798ded67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4da8894e637b08902ab8ad10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:32:33 2012 +0200 msvcp90/tests: Added _Getcoll tests. --- dlls/msvcp90/tests/misc.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 19a5854..7d9ef39 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -30,6 +30,11 @@ typedef struct { int delfl; } MSVCP__Ctypevec; +typedef struct { + LCID handle; + unsigned page; +} MSVCP__Collvec; + /* basic_string<char, char_traits<char>, allocator<char>> */ #define BUF_SIZE_CHAR 16 typedef struct @@ -59,6 +64,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); +static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); #undef __thiscall #ifdef __i386__ @@ -172,6 +178,7 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); + SET(p__Getcoll, "_Getcoll"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAEA_WAEB_W@Z"); @@ -378,6 +385,27 @@ static void test__Getctype(void) p_free(ret.table); } +static void test__Getcoll(void) +{ + ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); + + union { + MSVCP__Collvec collvec; + ULONGLONG ull; + }ret; + + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x7654321; + ret.ull = 0; + p__Getcoll_arg = (void*)p__Getcoll; + p__Getcoll_arg(&ret.collvec); + ok(ret.collvec.handle == 0, "ret.handle = %x\n", ret.collvec.handle); + ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); + + ret.ull = p__Getcoll(); + ok(ret.collvec.handle == 0x7654321, "ret.collvec.handle = %x\n", ret.collvec.handle); + ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -446,6 +474,7 @@ START_TEST(misc) test_Copy_s(); test_wctype(); test__Getctype(); + test__Getcoll(); test_virtual_call(); test_allocator_char();

1 0

Piotr Caban : msvcp90/tests: Fixed _Getctype tests.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: e16922f3f3282fa3f093c98656690bf985dec04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16922f3f3282fa3f093c9865… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:32:05 2012 +0200 msvcp90/tests: Fixed _Getctype tests. --- dlls/msvcp90/tests/misc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index e7f88c5..19a5854 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -58,7 +58,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); +static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); #undef __thiscall #ifdef __i386__ @@ -362,16 +362,16 @@ static void test__Getctype(void) { MSVCP__Ctypevec ret; - ret = p__Getctype(); + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); p_free(ret.table); - p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; - ret = p__Getctype(); - ok(ret.handle == 1, "ret.handle = %d\n", ret.handle); + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 0x1234567; + ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); ok(ret.table[0] == 32, "ret.table[0] = %d\n", ret.table[0]); @@ -418,6 +418,7 @@ static void test_virtual_call(void) char str2[] = "TEST"; int ret; + p__get_current_locale()->locinfo->lc_handle[LC_COLLATE] = 1; call_func2(p_collate_char_ctor_refs, this, 0); ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret);

1 0

Piotr Caban : msvcp90: Fix __cdecl functions definitions that returns structures.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 8a15e426b3495b24a3ff30943017efef9c388c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15e426b3495b24a3ff30943… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 2 18:31:50 2012 +0200 msvcp90: Fix __cdecl functions definitions that returns structures. --- dlls/msvcp100/msvcp100.spec | 6 ++-- dlls/msvcp60/msvcp60.spec | 6 ++-- dlls/msvcp70/msvcp70.spec | 6 ++-- dlls/msvcp71/msvcp71.spec | 6 ++-- dlls/msvcp80/msvcp80.spec | 6 ++-- dlls/msvcp90/locale.c | 46 ++++++++++++++++++++++++------------------ dlls/msvcp90/msvcp90.spec | 6 ++-- dlls/msvcp90/string.c | 20 +++++++----------- 8 files changed, 52 insertions(+), 50 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index fcfe427..523ca2f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2808,9 +2808,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig @ stub _GetLocaleForCP -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ stub _Getdateorder @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 3c9e2ed..7af0c29 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4274,9 +4274,9 @@ @ stub _FSinh @ extern _FSnan msvcp90._FSnan # extern _FXbig -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ extern _Hugeval msvcp90._Hugeval @ extern _Inf msvcp90._Inf @ stub _LCosh diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index efdced6..0964d83 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5061,9 +5061,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig # extern _FZero -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ extern _Hugeval msvcp90._Hugeval @ extern _Inf msvcp90._Inf @ stub _LCosh diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index a38e1c4..671950b 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5115,9 +5115,9 @@ @ extern _FSnan msvcp90._FSnan # extern _FXbig # extern _FZero -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes @ extern _Hugeval msvcp90._Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 2209c60..61a21ff 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5724,9 +5724,9 @@ @ stub _FSinh @ extern _FSnan msvcp90._FSnan # extern _FXbig -@ cdecl _Getcoll() msvcp90._Getcoll -@ cdecl _Getctype() msvcp90._Getctype -@ cdecl _Getcvt() msvcp90._Getcvt +@ cdecl -ret64 _Getcoll() msvcp90._Getcoll +@ cdecl _Getctype(ptr) msvcp90._Getctype +@ cdecl -ret64 _Getcvt() msvcp90._Getcvt @ stub _Getdateorder @ cdecl _Getwctype(long ptr) msvcp90._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp90._Getwctypes diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6fbe349..c8d4aca 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -542,17 +542,20 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char } /* _Getcoll */ -_Collvec __cdecl _Getcoll(void) +ULONGLONG __cdecl _Getcoll(void) { - _Collvec ret; + union { + _Collvec collvec; + ULONGLONG ull; + } ret; _locale_t locale = _get_current_locale(); TRACE("\n"); - ret.page = locale->locinfo->lc_collate_cp; - ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret.collvec.page = locale->locinfo->lc_collate_cp; + ret.collvec.handle = locale->locinfo->lc_handle[LC_COLLATE]; _free_locale(locale); - return ret; + return ret.ull; } /* ?_Getcoll@_Locinfo@std@@QBE?AU_Collvec@@XZ */ @@ -560,29 +563,29 @@ _Collvec __cdecl _Getcoll(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 8) _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) { - *ret = _Getcoll(); + ULONGLONG ull = _Getcoll(); + memcpy(ret, &ull, sizeof(ull)); return ret; } /* _Getctype */ -_Ctypevec __cdecl _Getctype(void) +_Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { - _Ctypevec ret; _locale_t locale = _get_current_locale(); short *table; TRACE("\n"); - ret.page = locale->locinfo->lc_codepage; - ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; - ret.delfl = TRUE; + ret->page = locale->locinfo->lc_codepage; + ret->handle = locale->locinfo->lc_handle[LC_COLLATE]; + ret->delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) { _free_locale(locale); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } memcpy(table, locale->locinfo->pctype, sizeof(short[256])); - ret.table = table; + ret->table = table; _free_locale(locale); return ret; } @@ -592,22 +595,24 @@ _Ctypevec __cdecl _Getctype(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getctype, 8) _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) { - *ret = _Getctype(); - return ret; + return _Getctype(ret); } /* _Getcvt */ -_Cvtvec __cdecl _Getcvt(void) +ULONGLONG __cdecl _Getcvt(void) { - _Cvtvec ret; _locale_t locale = _get_current_locale(); + union { + _Cvtvec cvtvec; + ULONGLONG ull; + } ret; TRACE("\n"); - ret.page = locale->locinfo->lc_codepage; - ret.handle = locale->locinfo->lc_handle[LC_CTYPE]; + ret.cvtvec.page = locale->locinfo->lc_codepage; + ret.cvtvec.handle = locale->locinfo->lc_handle[LC_CTYPE]; _free_locale(locale); - return ret; + return ret.ull; } /* ?_Getcvt@_Locinfo@std@@QBE?AU_Cvtvec@@XZ */ @@ -615,7 +620,8 @@ _Cvtvec __cdecl _Getcvt(void) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { - *ret = _Getcvt(); + ULONGLONG ull = _Getcvt(); + memcpy(ret, &ull, sizeof(ull)); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c0eff7f..35fe11d 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,9 +5750,9 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl _Getcoll() -@ cdecl _Getctype() -@ cdecl _Getcvt() +@ cdecl -ret64 _Getcoll() +@ cdecl _Getctype(ptr) +@ cdecl -ret64 _Getcvt() @ stub _Getdateorder @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 163fce0..f4811cd 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -3218,15 +3218,13 @@ basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate(basic_string_wc /* ??$?H_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@AEBV10@_W@Z */ /* ??$?HGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@ABV10@G@Z */ /* ??$?HGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@AEBV10@G@Z */ -basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( - const basic_string_wchar *left, wchar_t right) +basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( + basic_string_wchar *ret, const basic_string_wchar *left, wchar_t right) { - basic_string_wchar ret = { 0 }; - TRACE("%p %c\n", left, right); - MSVCP_basic_string_wchar_copy_ctor(&ret, left); - MSVCP_basic_string_wchar_append_ch(&ret, right); + MSVCP_basic_string_wchar_copy_ctor(ret, left); + MSVCP_basic_string_wchar_append_ch(ret, right); return ret; } @@ -3234,15 +3232,13 @@ basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_bstr_ch( /* ??$?H_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YA?AV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@_WAEBV10@@Z */ /* ??$?HGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@GABV10@@Z */ /* ??$?HGU?$char_traits@G@std@@V?$allocator@G@1@@std@@YA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@0@GAEBV10@@Z */ -basic_string_wchar __cdecl MSVCP_basic_string_wchar_concatenate_ch_bstr( - wchar_t left, const basic_string_wchar *right) +basic_string_wchar* __cdecl MSVCP_basic_string_wchar_concatenate_ch_bstr( + basic_string_wchar* ret, wchar_t left, const basic_string_wchar *right) { - basic_string_wchar ret = { 0 }; - TRACE("%c %p\n", left, right); - MSVCP_basic_string_wchar_ctor_cstr_len(&ret, &left, 1); - MSVCP_basic_string_wchar_append(&ret, right); + MSVCP_basic_string_wchar_ctor_cstr_len(ret, &left, 1); + MSVCP_basic_string_wchar_append(ret, right); return ret; }

1 0

Jacek Caban : wininet: Try harder to reuse connection after authorization.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: c40011702770b748ad565c654a1b9abee4124135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40011702770b748ad565c654… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 2 17:15:04 2012 +0200 wininet: Try harder to reuse connection after authorization. --- dlls/wininet/http.c | 70 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1788bf2..7f82cb8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -219,6 +219,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWOR static LPWSTR HTTP_GetRedirectURL(http_request_t *req, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(http_request_t *req, LPCWSTR field); +static BOOL drain_content(http_request_t*,BOOL); static CRITICAL_SECTION connection_pool_cs; static CRITICAL_SECTION_DEBUG connection_pool_debug = @@ -1906,22 +1907,6 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } -static void drain_content(http_request_t *req) -{ - BOOL try_reuse; - - if (!req->netconn) return; - - if (req->contentLength == -1) - try_reuse = FALSE; - else if(!strcmpW(req->verb, szHEAD)) - try_reuse = TRUE; - else - try_reuse = req->data_stream->vtbl->drain_content(req->data_stream, req); - - http_release_netconn(req, try_reuse); -} - static BOOL HTTP_KeepAlive(http_request_t *request) { WCHAR szVersion[10]; @@ -1951,7 +1936,7 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) { http_request_t *req = (http_request_t*)hdr; - drain_content(req); + http_release_netconn(req, drain_content(req, FALSE)); } static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) @@ -2757,6 +2742,39 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * return res; } +static BOOL drain_content(http_request_t *req, BOOL blocking) +{ + BOOL ret; + + if(!req->netconn || req->contentLength == -1) + return FALSE; + + if(!strcmpW(req->verb, szHEAD)) + return TRUE; + + if(!blocking) + return req->data_stream->vtbl->drain_content(req->data_stream, req); + + EnterCriticalSection( &req->read_section ); + + while(1) { + DWORD bytes_read, res; + BYTE buf[4096]; + + res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); + if(res != ERROR_SUCCESS) { + ret = FALSE; + break; + } + if(!bytes_read) { + ret = TRUE; + break; + } + } + + LeaveCriticalSection( &req->read_section ); + return ret; +} static DWORD HTTPREQ_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) { @@ -4769,10 +4787,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, char *ascii_req; loop_next = FALSE; + reusing_connection = request->netconn != NULL; - /* like native, just in case the caller forgot to call InternetReadFile - * for all the data */ - drain_content(request); if(redirected) { request->contentLength = ~0u; request->bytesToWrite = 0; @@ -4807,7 +4823,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, TRACE("Request header -> %s\n", debugstr_w(requestString) ); - if ((res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS) + if (!reusing_connection && (res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS) break; /* send the request as ASCII, tack on the optional data */ @@ -4895,7 +4911,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, heap_free(request->verb); request->verb = heap_strdupW(szGET); } - drain_content(request); + http_release_netconn(request, drain_content(request, FALSE)); if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) { INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, @@ -4928,6 +4944,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, Host->lpszValue)) { heap_free(requestString); + if(!drain_content(request, TRUE)) { + FIXME("Could not drain content\n"); + http_release_netconn(request, FALSE); + } loop_next = TRUE; break; } @@ -4950,6 +4970,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->appInfo->proxyPassword, NULL)) { + if(!drain_content(request, TRUE)) { + FIXME("Could not drain content\n"); + http_release_netconn(request, FALSE); + } loop_next = TRUE; break; } @@ -5064,7 +5088,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ heap_free(request->verb); request->verb = heap_strdupW(szGET); } - drain_content(request); + http_release_netconn(request, drain_content(request, FALSE)); if ((new_url = HTTP_GetRedirectURL( request, szNewLocation ))) { INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT,

1 0

Hans Leidekker : wbemprox: Fix the CIM to VARIANT type mapping for a couple of properties.
by Alexandre Julliard 02 Jul '12

02 Jul '12

Module: wine Branch: master Commit: 8fc1c948c7caebb48c5bb78347ee45f719382b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1c948c7caebb48c5bb7834… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 2 16:01:17 2012 +0200 wbemprox: Fix the CIM to VARIANT type mapping for a couple of properties. --- dlls/wbemprox/builtin.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b564f19..75f37dc 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -136,14 +136,14 @@ static const struct column col_compsys[] = { prop_descriptionW, CIM_STRING }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, - { prop_numprocessorsW, CIM_UINT32 }, + { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, + { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivetypeW, CIM_UINT32 }, + { prop_drivetypeW, CIM_UINT32, VT_I4 }, { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_freespaceW, CIM_UINT64 }, { prop_sizeW, CIM_UINT64 } @@ -151,8 +151,8 @@ static const struct column col_logicaldisk[] = static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_interfaceindexW, CIM_UINT32 }, - { prop_netconnectionstatusW, CIM_UINT16 }, + { prop_interfaceindexW, CIM_UINT32, VT_I4 }, + { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = @@ -160,7 +160,7 @@ static const struct column col_os[] = { prop_captionW, CIM_STRING }, { prop_csdversionW, CIM_STRING }, { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32 }, + { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_systemdirectoryW, CIM_STRING } }; static const struct column col_process[] = @@ -169,9 +169,9 @@ static const struct column col_process[] = { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_pprocessidW, CIM_UINT32 }, - { prop_processidW, CIM_UINT32 }, - { prop_threadcountW, CIM_UINT32 } + { prop_pprocessidW, CIM_UINT32, VT_I4 }, + { prop_processidW, CIM_UINT32, VT_I4 }, + { prop_threadcountW, CIM_UINT32, VT_I4 } }; static const struct column col_processor[] = {

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012