October 2014 - Wine-Commits

Stefan Dösinger : d3d8/tests: Update create_device to match d3d9.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: f33aacd4d0397e4a6cfdaef8237a9031334face0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33aacd4d0397e4a6cfdaef82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:53 2014 +0200 d3d8/tests: Update create_device to match d3d9. --- dlls/d3d8/tests/device.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 02ec210..2278c06 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -31,12 +31,14 @@ struct vec3 float x, y, z; }; +#define CREATE_DEVICE_FULLSCREEN 0x01 + struct device_desc { HWND device_window; unsigned int width; unsigned int height; - BOOL windowed; + DWORD flags; }; #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) @@ -105,7 +107,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons present_parameters.BackBufferWidth = desc->width; present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; - present_parameters.Windowed = desc->windowed; + present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -2265,7 +2267,7 @@ static void test_wndproc(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2408,7 +2410,7 @@ static void test_wndproc_windowed(void) device_desc.device_window = device_window; device_desc.width = 640; device_desc.height = 480; - device_desc.windowed = TRUE; + device_desc.flags = 0; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2783,7 +2785,7 @@ static void test_window_style(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -2988,7 +2990,7 @@ static void test_mode_change(void) device_desc.device_window = device_window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -3086,7 +3088,7 @@ static void test_device_window_reset(void) device_desc.device_window = NULL; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6353,7 +6355,7 @@ static void test_lost_device(void) device_desc.device_window = window; device_desc.width = screen_width; device_desc.height = screen_height; - device_desc.windowed = FALSE; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n");

1 0

Nikolay Sivov : dwrite: Store registered collection loaders in a list.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: 00e352992e75ad8e9962d273e7a72ee414f667aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e352992e75ad8e9962d273e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:50:27 2014 +0400 dwrite: Store registered collection loaders in a list. --- dlls/dwrite/main.c | 82 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6ac3852..cdd27c2 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -30,6 +30,7 @@ #include "dwrite_private.h" #include "wine/debug.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -391,6 +392,12 @@ HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedSt return S_OK; } +struct collectionloader +{ + struct list entry; + IDWriteFontCollectionLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -399,8 +406,7 @@ struct dwritefactory { IDWriteFontCollection *system_collection; IDWriteGdiInterop *gdiinterop; - IDWriteFontCollectionLoader **loaders; - LONG loader_count; + struct list collection_loaders; IDWriteFontFileLoader **file_loaders; LONG file_loader_count; }; @@ -412,14 +418,18 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct collectionloader *loader, *loader2; int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); - for (i = 0; i < factory->loader_count; i++) - if (factory->loaders[i]) - IDWriteFontCollectionLoader_Release(factory->loaders[i]); - heap_free(factory->loaders); + + LIST_FOR_EACH_ENTRY_SAFE(loader, loader2, &factory->collection_loaders, struct collectionloader, entry) { + list_remove(&loader->entry); + IDWriteFontCollectionLoader_Release(loader->loader); + heap_free(loader); + } + for (i = 0; i < factory->file_loader_count; i++) if (factory->file_loaders[i]) IDWriteFontFileLoader_Release(factory->file_loaders[i]); @@ -512,37 +522,25 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->loaders[i] == NULL) - break; - - if (i == This->loader_count) - { - IDWriteFontCollectionLoader **new_list = NULL; - int new_count = 0; + } - new_count = This->loader_count * 2; - new_list = heap_realloc_zero(This->loaders, new_count * sizeof(*This->loaders)); + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->loader_count = new_count; - This->loaders = new_list; - } - } + entry->loader = loader; IDWriteFontCollectionLoader_AddRef(loader); - This->loaders[i] = loader; + list_add_tail(&This->collection_loaders, &entry->entry); return S_OK; } @@ -551,19 +549,26 @@ static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactor IDWriteFontCollectionLoader *loader) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - int i; + struct collectionloader *entry, *found = NULL; TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->loader_count; i++) - if (This->loaders[i] == loader) break; - if (i == This->loader_count) - return E_INVALIDARG; - IDWriteFontCollectionLoader_Release(This->loaders[i]); - This->loaders[i] = NULL; + LIST_FOR_EACH_ENTRY(entry, &This->collection_loaders, struct collectionloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + if (!found) + return E_INVALIDARG; + + IDWriteFontCollectionLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,18 +880,15 @@ static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct ID factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->loader_count = 2; - factory->loaders = heap_alloc_zero(sizeof(*factory->loaders) * 2); factory->file_loader_count = 2; factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; - if (!factory->loaders || !factory->file_loaders) { - heap_free(factory->loaders); - heap_free(factory->file_loaders); + list_init(&factory->collection_loaders); + + if (!factory->file_loaders) return E_OUTOFMEMORY; - } return S_OK; }

1 0

Stefan Dösinger : d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES.
by Alexandre Julliard Oct. 21, 2014

Oct. 21, 2014

Module: wine Branch: master Commit: ee0733863ee6f754e7a68fa850ac9a46b7601747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee0733863ee6f754e7a68fa85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 20 13:08:50 2014 +0200 d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES. --- dlls/d3d9/tests/d3d9ex.c | 108 ++++++++++++++++---------- dlls/d3d9/tests/device.c | 198 ++++++++++++++++++++++++++++------------------- 2 files changed, 185 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee0733863ee6f754e7a68…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: 85c70956f0f4197c16083f5e09a7e364f0a86706 URL: http://source.winehq.org/git/website.git/?a=commit;h=85c70956f0f4197c16083f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 18 07:33:21 2014 +0200 Polish translation for release 1.7.29 --- news/pl/2014101701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014101701.xml b/news/pl/2014101701.xml new file mode 100644 index 0000000..2f761f8 --- /dev/null +++ b/news/pl/2014101701.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 17, 2014</date> +<title>Wydano Wine 1.7.29</title> +<body> + Wydanie rozwojowe Wine 1.7.29 jest już dostępne. + <a href="{$root}/announce/1.7.29">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla kształtowania i odzwierciedlania BiDi w DirectWrite.</li> + <li>Kilka poprawek do obsługi błędów stronnicowania.</li> + <li>Kilka nowych funkcji biblioteki uruchomieniowej C.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.29
by Jeremy Newman Oct. 20, 2014

Oct. 20, 2014

Module: website Branch: master Commit: c934da6e6a3e5c191eaa73317498a4a2373acbc6 URL: http://source.winehq.org/git/website.git/?a=commit;h=c934da6e6a3e5c191eaa73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 19 08:36:41 2014 +0200 French translation for release 1.7.29 --- news/fr/2014101701.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014101701.xml b/news/fr/2014101701.xml new file mode 100644 index 0000000..fcbf019 --- /dev/null +++ b/news/fr/2014101701.xml @@ -0,0 +1,14 @@ +<news> +<date>17 octobre 2014</date> +<title>Sortie de Wine 1.7.29</title> +<body> + La version de développement 1.7.29 de Wine est disponible. + <a href="{$root}/announce/1.7.29">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du façonnage de texte et de la réflexion BiDi dans DirectWrite.</li> + <li>Quelques correctifs dans la gestion des défauts de pages.</li> + <li>Plusieurs fonctions additionnelles dans le moteur d'exécution C.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.29.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Amine Khaldi : strmbase: Remove unused TransformFilter_Vtbl (Clang).
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 9a26f0f0d992135d0d7ae77ee1bff8e3d227fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a26f0f0d992135d0d7ae77ee… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Oct 18 19:53:56 2014 +0100 strmbase: Remove unused TransformFilter_Vtbl (Clang). --- dlls/strmbase/transform.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 0fc7515..4d872be 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; -static const IBaseFilterVtbl TransformFilter_Vtbl; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; @@ -439,25 +438,6 @@ HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin return E_NOTIMPL; } -static const IBaseFilterVtbl TransformFilter_Vtbl = -{ - TransformFilterImpl_QueryInterface, - BaseFilterImpl_AddRef, - TransformFilterImpl_Release, - BaseFilterImpl_GetClassID, - TransformFilterImpl_Stop, - TransformFilterImpl_Pause, - TransformFilterImpl_Run, - BaseFilterImpl_GetState, - BaseFilterImpl_SetSyncSource, - BaseFilterImpl_GetSyncSource, - BaseFilterImpl_EnumPins, - TransformFilterImpl_FindPin, - BaseFilterImpl_QueryFilterInfo, - BaseFilterImpl_JoinFilterGraph, - BaseFilterImpl_QueryVendorInfo -}; - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface);

1 0

Jacek Caban : mshtml: Return S_OK in IHTMLDocument3::recalc.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 114f32c8b6000b6770d5f5aeb87bd9313fa9b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114f32c8b6000b6770d5f5aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 17 16:58:39 2014 +0200 mshtml: Return S_OK in IHTMLDocument3::recalc. --- dlls/mshtml/htmldoc.c | 7 +++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c91298f..0324a6f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1820,8 +1820,11 @@ static HRESULT WINAPI HTMLDocument3_releaseCapture(IHTMLDocument3 *iface) static HRESULT WINAPI HTMLDocument3_recalc(IHTMLDocument3 *iface, VARIANT_BOOL fForce) { HTMLDocument *This = impl_from_IHTMLDocument3(iface); - FIXME("(%p)->(%x)\n", This, fForce); - return E_NOTIMPL; + + WARN("(%p)->(%x)\n", This, fForce); + + /* Doing nothing here should be fine for us. */ + return S_OK; } static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR text, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5dc9a8f..c1ca092 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7613,6 +7613,9 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); IHTMLElement_Release(elem); + hres = IHTMLDocument3_recalc(doc3, VARIANT_TRUE); + ok(hres == S_OK, "recalc failed: %08x\n", hres); + IHTMLDocument3_Release(doc3); elem = get_elem_by_id(doc, "s", TRUE);

1 0

Nikolay Sivov : dwrite: Implement CreateFontFromLOGFONT() on top of system font collection.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: a088f7d381b822eab7150f5c3f13285fa8dcd5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a088f7d381b822eab7150f5c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 00:25:26 2014 +0400 dwrite: Implement CreateFontFromLOGFONT() on top of system font collection. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 246 +++++++++++++++++++++---------------------- dlls/dwrite/gdiinterop.c | 38 ++++++- dlls/dwrite/tests/font.c | 20 ++-- 4 files changed, 167 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a088f7d381b822eab7150…

1 0

Nikolay Sivov : dwrite: Store factory pointer gdiinterop was created from.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: ea11f85a94a2aff57d6701e7990f77127ca062a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea11f85a94a2aff57d6701e79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 19 23:57:53 2014 +0400 dwrite: Store factory pointer gdiinterop was created from. --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/gdiinterop.c | 31 +++++----- dlls/dwrite/main.c | 19 +++++- dlls/dwrite/tests/font.c | 143 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 176 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea11f85a94a2aff57d670…

1 0

Piotr Caban : msvcp100: Fix basic_string class definition.
by Alexandre Julliard Oct. 20, 2014

Oct. 20, 2014

Module: wine Branch: master Commit: 40ef9b2d78a7b02b258e8fe450bf5f175c01fa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40ef9b2d78a7b02b258e8fe45… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 17 12:07:29 2014 +0200 msvcp100: Fix basic_string class definition. --- dlls/msvcp90/memory.c | 4 ++-- dlls/msvcp90/msvcp90.h | 14 ++++++++++++-- dlls/msvcp90/string.c | 24 ++++++++++++++++-------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index c5cae50..5d43910 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -111,7 +111,7 @@ void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ /* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(const void *this) { return UINT_MAX/sizeof(char); } @@ -208,7 +208,7 @@ void __thiscall MSVCP_allocator_wchar_destroy(void *this, char *ptr) /* ?max_size@?$allocator(a)_W@std@@QBEIXZ */ /* ?max_size@?$allocator(a)_W@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_max_size, 4) -MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void *this) +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void *this) { return UINT_MAX/sizeof(wchar_t); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3fb6790..0a60d46 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -74,13 +74,18 @@ extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #define BUF_SIZE_CHAR 16 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { char buf[BUF_SIZE_CHAR]; char *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_char; basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); @@ -97,13 +102,18 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign(basic_string_char*, #define BUF_SIZE_WCHAR 8 typedef struct { +#if _MSVCP_VER <= 90 void *allocator; +#endif union { wchar_t buf[BUF_SIZE_WCHAR]; wchar_t *ptr; } data; MSVCP_size_t size; MSVCP_size_t res; +#if _MSVCP_VER == 100 + char allocator; +#endif } basic_string_wchar; basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); @@ -117,10 +127,10 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar 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(void*); +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(void*); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(const void*); typedef struct { diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ce05613..810fb5a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -29,6 +29,14 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#if _MSVCP_VER <= 90 +#define STRING_ALLOCATOR(this) ((this)->allocator) +#elif _MSVCP_VER == 100 +#define STRING_ALLOCATOR(this) (&(this)->allocator) +#else +#define STRING_ALLOCATOR(this) NULL +#endif + /* size_t_noverify structure */ typedef struct { MSVCP_size_t val; @@ -546,7 +554,7 @@ void __thiscall basic_string_char_tidy(basic_string_char *this, if(new_size > 0) MSVCP_char_traits_char__Copy_s(this->data.buf, BUF_SIZE_CHAR, ptr, new_size); - MSVCP_allocator_char_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_char_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_CHAR-1; @@ -577,9 +585,9 @@ MSVCP_bool __thiscall basic_string_char_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_char_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -988,7 +996,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_max_size, 4) MSVCP_size_t __thiscall basic_string_char_max_size(const basic_string_char *this) { TRACE("%p\n", this); - return MSVCP_allocator_char_max_size(this->allocator)-1; + return MSVCP_allocator_char_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE_NXZ */ @@ -2228,7 +2236,7 @@ void __thiscall basic_string_wchar_tidy(basic_string_wchar *this, if(new_size > 0) MSVCP_char_traits_wchar__Copy_s(this->data.buf, BUF_SIZE_WCHAR, ptr, new_size); - MSVCP_allocator_wchar_deallocate(this->allocator, ptr, this->res+1); + MSVCP_allocator_wchar_deallocate(STRING_ALLOCATOR(this), ptr, this->res+1); } this->res = BUF_SIZE_WCHAR-1; @@ -2252,9 +2260,9 @@ MSVCP_bool __thiscall basic_string_wchar_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_res+1); if(!ptr) - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); + ptr = MSVCP_allocator_wchar_allocate(STRING_ALLOCATOR(this), new_size+1); else new_size = new_res; if(!ptr) { @@ -2733,7 +2741,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_max_size, 4) MSVCP_size_t __thiscall basic_string_wchar_max_size(const basic_string_wchar *this) { TRACE("%p\n", this); - return MSVCP_allocator_wchar_max_size(this->allocator)-1; + return MSVCP_allocator_wchar_max_size(STRING_ALLOCATOR(this))-1; } /* ?empty@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE_NXZ */

1 0