March 2015 - Wine-commits - list.winehq.org

Andrew Eikum : shell32/tests: Fix win8 knownfolders relative and parsed paths.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: dd275615db9294e18c59675d8e1a21d4cd1bbdb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd275615db9294e18c59675d8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:11:48 2015 -0500 shell32/tests: Fix win8 knownfolders relative and parsed paths. --- dlls/shell32/tests/shellpath.c | 196 ++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd275615db9294e18c596…

1 0

Andrew Eikum : shell32/tests: Remove unused flag.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 7a55f5461aa02e7d8b7b3003d265320a4a1c0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a55f5461aa02e7d8b7b3003d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:12:04 2015 -0500 shell32/tests: Remove unused flag. --- dlls/shell32/tests/shellpath.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index b727e1d..2036b51 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -887,7 +887,6 @@ if (0) { /* crashes */ /* Standard CSIDL values (and their flags) uses only two less-significant bytes */ #define NO_CSIDL 0x10000 -#define CSIDL_TODO_WINE 0x20000 #define KNOWN_FOLDER(id, csidl, name, category, parent, relative_path, parsing_name, attributes, definitionFlags) \ { &id, # id, csidl, # csidl, name, category, &parent, # parent, relative_path, parsing_name, attributes, definitionFlags, __LINE__ } @@ -1940,17 +1939,15 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId *current_known_folder_found = TRUE; found = TRUE; /* verify CSIDL */ - if(known_folder->csidl != NO_CSIDL) + if(!(known_folder->csidl & NO_CSIDL)) { - expectedCsidl = known_folder->csidl & (~CSIDL_TODO_WINE); + /* mask off winetest flags */ + expectedCsidl = known_folder->csidl & 0xFFFF; hr = IKnownFolderManager_FolderIdToCsidl(mgr, folderId, &csidl); ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot retrieve CSIDL for folder %s\n", known_folder->sFolderId); - if(known_folder->csidl & CSIDL_TODO_WINE) - todo_wine ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); - else - ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); + ok_(__FILE__, known_folder->line)(csidl == expectedCsidl, "invalid CSIDL retrieved for folder %s. %d (%s) expected, but %d found\n", known_folder->sFolderId, expectedCsidl, known_folder->sCsidl, csidl); } hr = IKnownFolderManager_GetFolder(mgr, folderId, &folder); @@ -2028,7 +2025,6 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId } } #undef NO_CSIDL -#undef CSIDL_TODO_WINE static void test_knownFolders(void) {

1 0

Andrew Eikum : shell32/tests: Fix win8 knownfolder attributes.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 122f71866e1c4386656a25a01f0de14e925727c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122f71866e1c4386656a25a01… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:12:43 2015 -0500 shell32/tests: Fix win8 knownfolder attributes. --- dlls/shell32/tests/shellpath.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2036b51..5147b19 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -887,6 +887,7 @@ if (0) { /* crashes */ /* Standard CSIDL values (and their flags) uses only two less-significant bytes */ #define NO_CSIDL 0x10000 +#define WINE_ATTRIBUTES_OPTIONAL 0x20000 #define KNOWN_FOLDER(id, csidl, name, category, parent, relative_path, parsing_name, attributes, definitionFlags) \ { &id, # id, csidl, # csidl, name, category, &parent, # parent, relative_path, parsing_name, attributes, definitionFlags, __LINE__ } @@ -1587,7 +1588,7 @@ static const struct knownFolderDef known_folders[] = { 0, 0), KNOWN_FOLDER(FOLDERID_SampleMusic, - NO_CSIDL, + NO_CSIDL|WINE_ATTRIBUTES_OPTIONAL /* win8 */, "SampleMusic", KF_CATEGORY_COMMON, FOLDERID_PublicMusic, @@ -1596,7 +1597,7 @@ static const struct knownFolderDef known_folders[] = { FILE_ATTRIBUTE_READONLY, KFDF_PRECREATE), KNOWN_FOLDER(FOLDERID_SamplePictures, - NO_CSIDL, + NO_CSIDL|WINE_ATTRIBUTES_OPTIONAL /* win8 */, "SamplePictures", KF_CATEGORY_COMMON, FOLDERID_PublicPictures, @@ -1614,7 +1615,7 @@ static const struct knownFolderDef known_folders[] = { FILE_ATTRIBUTE_READONLY, 0), KNOWN_FOLDER(FOLDERID_SampleVideos, - NO_CSIDL, + NO_CSIDL|WINE_ATTRIBUTES_OPTIONAL /* win8 */, "SampleVideos", KF_CATEGORY_COMMON, FOLDERID_PublicVideos, @@ -1975,7 +1976,9 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(is_in_strarray(kfd.pszParsingName, known_folder->sParsingName), "invalid known folder parsing name returned for %s: %s retrieved\n", known_folder->sFolderId, wine_dbgstr_w(kfd.pszParsingName)); - ok_(__FILE__, known_folder->line)(known_folder->attributes == kfd.dwAttributes, "invalid known folder attributes for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->attributes, kfd.dwAttributes); + ok_(__FILE__, known_folder->line)(known_folder->attributes == kfd.dwAttributes || + (known_folder->csidl & WINE_ATTRIBUTES_OPTIONAL && kfd.dwAttributes == 0), + "invalid known folder attributes for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->attributes, kfd.dwAttributes); ok_(__FILE__, known_folder->line)(!(kfd.kfdFlags & (~known_folder->definitionFlags)), "invalid known folder flags for %s: 0x%08x expected, but 0x%08x retrieved\n", known_folder->sFolderId, known_folder->definitionFlags, kfd.kfdFlags);

1 0

Andrew Eikum : shell32/tests: Support alternate parent folders.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: fdbdad03f35fc0771effacc20565c5cff4aaa58c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbdad03f35fc0771effacc20… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 11 12:12:54 2015 -0500 shell32/tests: Support alternate parent folders. --- dlls/shell32/tests/shellpath.c | 228 ++++++++++++++++++++--------------------- 1 file changed, 114 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdbdad03f35fc0771effa…

1 0

Nikolay Sivov : dwrite: Make a deep copy of family name string (Valgrind).
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: c1ecf862a4bdfd704e9c472f5dfdf9b14b7a8e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ecf862a4bdfd704e9c472f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 20:46:11 2015 +0300 dwrite: Make a deep copy of family name string (Valgrind). --- dlls/dwrite/layout.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 88a83cc..b4833c2 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -703,6 +703,12 @@ static struct layout_range *alloc_layout_range_from(struct layout_range *from, c *range = *from; range->range = *r; + range->fontfamily = heap_strdupW(from->fontfamily); + if (!range->fontfamily) { + heap_free(range); + return NULL; + } + /* update refcounts */ if (range->object) IDWriteInlineObject_AddRef(range->object);

1 0

Nikolay Sivov : dwrite: Fix excessive refcount increment when setting interface pointers as range attributes.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 985bff76be11799a1317e8195318ef31a6162e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=985bff76be11799a1317e8195… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 22:20:34 2015 +0300 dwrite: Fix excessive refcount increment when setting interface pointers as range attributes. --- dlls/dwrite/layout.c | 34 ++++++++++++++++------------------ dlls/dwrite/tests/layout.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b4833c2..2665664 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -775,6 +775,19 @@ static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *la return NULL; } +static inline BOOL set_layout_range_iface_attr(IUnknown **dest, IUnknown *value) +{ + if (*dest == value) return FALSE; + + if (*dest) + IUnknown_Release(*dest); + *dest = value; + if (*dest) + IUnknown_AddRef(*dest); + + return TRUE; +} + static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_range_attr_kind attr, struct layout_range_attr_value *value) { BOOL changed = FALSE; @@ -797,20 +810,10 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang dest->fontsize = value->u.fontsize; break; case LAYOUT_RANGE_ATTR_INLINE: - changed = dest->object != value->u.object; - if (changed && dest->object) - IDWriteInlineObject_Release(dest->object); - dest->object = value->u.object; - if (dest->object) - IDWriteInlineObject_AddRef(dest->object); + changed = set_layout_range_iface_attr((IUnknown**)&dest->object, (IUnknown*)value->u.object); break; case LAYOUT_RANGE_ATTR_EFFECT: - changed = dest->effect != value->u.effect; - if (changed && dest->effect) - IUnknown_Release(dest->effect); - dest->effect = value->u.effect; - if (dest->effect) - IUnknown_AddRef(dest->effect); + changed = set_layout_range_iface_attr((IUnknown**)&dest->effect, (IUnknown*)value->u.effect); break; case LAYOUT_RANGE_ATTR_UNDERLINE: changed = dest->underline != value->u.underline; @@ -821,12 +824,7 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang dest->strikethrough = value->u.strikethrough; break; case LAYOUT_RANGE_ATTR_FONTCOLL: - changed = dest->collection != value->u.collection; - if (changed && dest->collection) - IDWriteFontCollection_Release(dest->collection); - dest->collection = value->u.collection; - if (dest->collection) - IDWriteFontCollection_AddRef(dest->collection); + changed = set_layout_range_iface_attr((IUnknown**)&dest->collection, (IUnknown*)value->u.collection); break; case LAYOUT_RANGE_ATTR_LOCALE: changed = strcmpW(dest->locale, value->u.locale) != 0; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 98358a4..89c96e4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -691,6 +691,9 @@ static void test_SetInlineObject(void) hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &inlineobj2); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 1); + EXPECT_REF(inlineobj2, 1); + inlinetest = (void*)0x1; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -701,6 +704,8 @@ static void test_SetInlineObject(void) hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 2); + inlinetest = (void*)0x1; hr = IDWriteTextLayout_GetInlineObject(layout, 2, &inlinetest, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -714,6 +719,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + /* get from somewhere inside a range */ inlinetest = NULL; r2.startPosition = r2.length = 100; @@ -723,6 +730,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj2, range); @@ -736,6 +745,9 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 1 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + EXPECT_REF(inlineobj2, 2); + inlinetest = NULL; r2.startPosition = r2.length = 100; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); @@ -744,6 +756,8 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 1, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 1; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); @@ -756,11 +770,15 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 2, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + range.startPosition = 1; range.length = 2; hr = IDWriteTextLayout_SetInlineObject(layout, inlineobj, range); ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(inlineobj, 2); + r2.startPosition = r2.length = 100; hr = IDWriteTextLayout_GetInlineObject(layout, 0, &inlinetest, &r2); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -768,7 +786,15 @@ static void test_SetInlineObject(void) ok(r2.startPosition == 0 && r2.length == 3, "got %d, %d\n", r2.startPosition, r2.length); IDWriteInlineObject_Release(inlinetest); + EXPECT_REF(inlineobj, 2); + EXPECT_REF(inlineobj2, 1); + IDWriteTextLayout_Release(layout); + + EXPECT_REF(inlineobj, 1); + + IDWriteInlineObject_Release(inlineobj); + IDWriteInlineObject_Release(inlineobj2); IDWriteTextFormat_Release(format); }

1 0

Austin English : include: Add remaining function prototypes in msasn1.h.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 603bc1d3f808be6fbc823811acee7d77ee899d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=603bc1d3f808be6fbc823811a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 11 15:33:03 2015 -0500 include: Add remaining function prototypes in msasn1.h. --- include/msasn1.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 757236d..89a6255 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -70,6 +70,11 @@ typedef struct tagASN1bitstring_t ASN1octet_t *value; } ASN1bitstring_t; +typedef enum tagASN1blocktype_e +{ + ASN1_DER_SET_OF_BLOCK, +} ASN1blocktype_e; + typedef struct tagASN1charstring_t { ASN1uint32_t length; @@ -88,6 +93,12 @@ typedef struct tagASN1char32string_t ASN1char32_t *value; } ASN1char32string_t; +typedef struct tagASN1encodedOID_t +{ + ASN1uint16_t length; + ASN1octet_t *value; +} ASN1encodedOID_t; + typedef enum { ASN1_PER_RULE_ALIGNED = 0x0001,ASN1_PER_RULE_UNALIGNED = 0x0002,ASN1_PER_RULE = ASN1_PER_RULE_ALIGNED | ASN1_PER_RULE_UNALIGNED, ASN1_BER_RULE_BER = 0x0100,ASN1_BER_RULE_CER = 0x0200,ASN1_BER_RULE_DER = 0x0400, @@ -117,6 +128,25 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +typedef struct tagASN1generalizedtime_t +{ + ASN1uint16_t year; + ASN1uint8_t month; + ASN1uint8_t day; + ASN1uint8_t hour; + ASN1uint8_t minute; + ASN1uint8_t second; + ASN1uint16_t millisecond; + ASN1bool_t universal; + ASN1int16_t diff; +} ASN1generalizedtime_t; + +typedef struct tagASN1intx_t +{ + ASN1uint32_t length; + ASN1octet_t *value; +} ASN1intx_t; + typedef struct tagASN1module_t { ASN1magic_t nModuleName; ASN1encodingrule_e eRule; @@ -130,12 +160,34 @@ typedef struct tagASN1module_t { }; } *ASN1module_t; +typedef struct ASN1objectidentifier_s +{ + struct ASN1objectidentifier_s *next; + ASN1uint32_t value; +} *ASN1objectidentifier_t; + +typedef struct tagASN1objectidentifier2_t +{ + ASN1uint16_t count; + ASN1uint32_t value[16]; +} ASN1objectidentifier2_t; + typedef struct tagASN1octetstring_t { ASN1uint32_t length; ASN1octet_t *value; } ASN1octetstring_t; +typedef struct tagASN1open_t +{ + ASN1uint32_t length; + union + { + void *encoded; + void *value; + }; +} ASN1open_t; + typedef enum tagASN1option_e { ASN1OPT_CHANGE_RULE = 0x101, @@ -161,6 +213,18 @@ typedef struct tagASN1optionparam_t { }; } ASN1optionparam_t, ASN1optionparam_s; +typedef struct tagASN1utctime_t +{ + ASN1uint8_t year; + ASN1uint8_t month; + ASN1uint8_t day; + ASN1uint8_t hour; + ASN1uint8_t minute; + ASN1uint8_t second; + ASN1bool_t universal; + ASN1int16_t diff; +} ASN1utctime_t; + typedef struct tagASN1wstring_t { ASN1uint32_t length; @@ -190,9 +254,29 @@ int WINAPI ASN1char32string_cmp(ASN1char32string_t*,ASN1char32string_t* void WINAPI ASN1char32string_free(ASN1char32string_t*); int WINAPI ASN1charstring_cmp(ASN1charstring_t*,ASN1charstring_t*); void WINAPI ASN1charstring_free(ASN1charstring_t*); +LPVOID WINAPI ASN1DecAlloc(ASN1decoding_t,ASN1uint32_t); +LPVOID WINAPI ASN1DecRealloc(ASN1decoding_t,LPVOID,ASN1uint32_t); +ASN1error_e WINAPI ASN1DecSetError(ASN1decoding_t,ASN1error_e); +ASN1error_e WINAPI ASN1EncSetError(ASN1encoding_t,ASN1error_e); +void WINAPI ASN1Free(LPVOID); +int WINAPI ASN1generalizedtime_cmp(ASN1generalizedtime_t*,ASN1generalizedtime_t*); +int WINAPI ASN1intx_cmp(ASN1intx_t*,ASN1intx_t*); +void WINAPI ASN1intx_free(ASN1intx_t*); +void WINAPI ASN1intx_setuint32(ASN1intx_t*,ASN1uint32_t); +ASN1uint32_t WINAPI ASN1intx_uoctets(ASN1intx_t*); +ASN1int32_t WINAPI ASN1intx2int32(ASN1intx_t*); +ASN1uint32_t WINAPI ASN1intx2uint32(ASN1intx_t*); +int WINAPI ASN1intxisuint32(ASN1intx_t*); +int WINAPI ASN1objectidentifier_cmp(ASN1objectidentifier_t*,ASN1objectidentifier_t*); +void WINAPI ASN1objectidentifier_free(ASN1objectidentifier_t*); +int WINAPI ASN1objectidentifier2_cmp(ASN1objectidentifier2_t*,ASN1objectidentifier2_t*); int WINAPI ASN1octetstring_cmp(ASN1octetstring_t*,ASN1octetstring_t*); void WINAPI ASN1octetstring_free(ASN1octetstring_t*); +int WINAPI ASN1open_cmp(ASN1open_t*,ASN1open_t*); +void WINAPI ASN1open_free(ASN1open_t*); +ASN1uint32_t WINAPI ASN1uint32_uoctets(ASN1uint32_t); void WINAPI ASN1utf8string_free(ASN1wstring_t*); +int WINAPI ASN1utctime_cmp(ASN1utctime_t*,ASN1utctime_t*); int WINAPI ASN1ztchar16string_cmp(ASN1ztchar16string_t*,ASN1ztchar16string_t*); void WINAPI ASN1ztchar16string_free(ASN1ztchar16string_t*); void WINAPI ASN1ztchar32string_free(ASN1ztchar32string_t*);

1 0

Alexandre Julliard : ole32: Remove confusing uses of the __thiscall specifier.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: c6c3ccad3661420e0bd1cadb5667e34c5afc983e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c3ccad3661420e0bd1cadb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 14:20:14 2015 +0900 ole32: Remove confusing uses of the __thiscall specifier. --- dlls/ole32/stg_prop.c | 16 +++++----------- dlls/ole32/tests/propvariant.c | 10 ++-------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 8c91a12..b0cd542 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1034,13 +1034,7 @@ static HRESULT PropertyStorage_ReadDictionary(PropertyStorage_impl *This, return hr; } -#ifdef __i386__ -#define __thiscall __stdcall -#else -#define __thiscall __cdecl -#endif - -static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size) +static void* WINAPI Allocate_CoTaskMemAlloc(void *this, ULONG size) { return CoTaskMemAlloc(size); } @@ -1049,7 +1043,7 @@ static __thiscall void* Allocate_CoTaskMemAlloc(void *userdata, ULONG size) * end of the buffer. */ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, - UINT codepage, void* (__thiscall *allocate)(void *userdata, ULONG size), void *allocate_data) + UINT codepage, void* (WINAPI *allocate)(void *this, ULONG size), void *allocate_data) { HRESULT hr = S_OK; @@ -2738,13 +2732,13 @@ end: "jmp *(4*(" #num "))(%eax)" ) DEFINE_STDCALL_WRAPPER(0,Allocate_PMemoryAllocator,8) -extern void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize); +extern void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize); #else -static void* __thiscall Allocate_PMemoryAllocator(void *this, ULONG cbSize) +static void* WINAPI Allocate_PMemoryAllocator(void *this, ULONG cbSize) { - void* (__thiscall *fn)(void*,ULONG) = **(void***)this; + void* (WINAPI *fn)(void*,ULONG) = **(void***)this; return fn(this, cbSize); } diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 1c9c447..c45ca2a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -349,18 +349,12 @@ typedef struct _PMemoryAllocator { struct _PMemoryAllocator_vtable *vt; } PMemoryAllocator; -#ifdef __i386__ -#define __thiscall __stdcall -#else -#define __thiscall __cdecl -#endif - -static void * __thiscall PMemoryAllocator_Allocate(PMemoryAllocator *_this, ULONG cbSize) +static void * WINAPI PMemoryAllocator_Allocate(PMemoryAllocator *_this, ULONG cbSize) { return CoTaskMemAlloc(cbSize); } -static void __thiscall PMemoryAllocator_Free(PMemoryAllocator *_this, void *pv) +static void WINAPI PMemoryAllocator_Free(PMemoryAllocator *_this, void *pv) { CoTaskMemFree(pv); }

1 0

Alexandre Julliard : msvcp60: Share math functions implementation with msvcp90.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 0c9b55ef24ecd6439ea2be7793878c6ba12c6cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9b55ef24ecd6439ea2be779… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 14:49:00 2015 +0900 msvcp60: Share math functions implementation with msvcp90. --- dlls/msvcp60/Makefile.in | 3 + dlls/msvcp60/msvcp60.spec | 880 +++++++++++++++++++++++----------------------- 2 files changed, 443 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c9b55ef24ecd6439ea2b…

1 0

Alexandre Julliard : msvcp60: Share memory functions implementation with msvcp90.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 2466ed265e3ed9cd31c99359cb53c1c4408db026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2466ed265e3ed9cd31c99359c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 12 16:14:27 2015 +0900 msvcp60: Share memory functions implementation with msvcp90. --- dlls/msvcp60/Makefile.in | 1 + dlls/msvcp60/memory.c | 86 ------------------------------------------------ dlls/msvcp60/msvcp.h | 12 +++---- 3 files changed, 7 insertions(+), 92 deletions(-) diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index fcd149b..2a3e726 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = msvcrt EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 + C_SRCS = \ exception.c \ ios.c \ diff --git a/dlls/msvcp60/memory.c b/dlls/msvcp60/memory.c deleted file mode 100644 index fc2a0b4..0000000 --- a/dlls/msvcp60/memory.c +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2010 Piotr Caban for CodeWeavers - * - * 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 - */ - -#include "config.h" - -#include <stdarg.h> -#include <limits.h> - -#include "msvcp.h" - -#include "windef.h" -#include "winbase.h" - - -/* ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z */ -/* ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z */ -void MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size) -{ - MSVCRT_operator_delete(ptr); -} - -/* ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z */ -/* ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z */ -char* MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) -{ - return MSVCRT_operator_new(count); -} - -/* ?max_size@?$allocator(a)D@std@@QBEIXZ */ -/* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ -MSVCP_size_t MSVCP_allocator_char_max_size(void *this) -{ - return UINT_MAX/sizeof(char); -} - - -/* allocator<wchar_t> */ -/* ?deallocate@?$allocator(a)_W@std@@QAEXPA_WI(a)Z */ -/* ?deallocate@?$allocator(a)_W@std@@QEAAXPEA_W_K(a)Z */ -void MSVCP_allocator_wchar_deallocate(void *this, - wchar_t *ptr, MSVCP_size_t size) -{ - MSVCRT_operator_delete(ptr); -} - -/* ?allocate@?$allocator(a)_W@std@@QAEPA_WI(a)Z */ -/* ?allocate@?$allocator(a)_W@std@@QEAAPEA_W_K(a)Z */ -wchar_t* MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t count) -{ - if(UINT_MAX/count < sizeof(wchar_t)) { - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - - return MSVCRT_operator_new(count * sizeof(wchar_t)); -} - -/* ?max_size@?$allocator(a)_W@std@@QBEIXZ */ -/* ?max_size@?$allocator(a)_W@std@@QEBA_KXZ */ -MSVCP_size_t MSVCP_allocator_wchar_max_size(void *this) -{ - return UINT_MAX/sizeof(wchar_t); -} - -/* ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z */ -/* ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8) -void* __thiscall MSVCP_allocator_void_assign(void *this, void *assign) -{ - return this; -} diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 0a8c57c..7974479 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -70,12 +70,12 @@ void basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); MSVCP_size_t __thiscall basic_string_wchar_length(const basic_string_wchar*); -char* MSVCP_allocator_char_allocate(void*, MSVCP_size_t); -void MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); -MSVCP_size_t MSVCP_allocator_char_max_size(void*); -wchar_t* MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); -void MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); -MSVCP_size_t MSVCP_allocator_wchar_max_size(void*); +char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void*); +wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void*); /* class locale::facet */ typedef struct {

1 0