August 2012 - Wine-Commits - list.winehq.org

Detlef Riekenberg : advpack/tests: Avoid test failures without high access rights.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: a97f81ff320920d0196cbfb572d53a718ee8e256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97f81ff320920d0196cbfb57… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 5 15:55:20 2012 +0200 advpack/tests: Avoid test failures without high access rights. --- dlls/advpack/tests/Makefile.in | 2 +- dlls/advpack/tests/install.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index 115f180..af9d2ee 100644 --- a/dlls/advpack/tests/Makefile.in +++ b/dlls/advpack/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advpack.dll -IMPORTS = cabinet advapi32 +IMPORTS = cabinet advapi32 advpack C_SRCS = \ advpack.c \ diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6a4d8d6..4876d71 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -259,6 +259,12 @@ START_TEST(install) if (!init_function_pointers()) return; + if (!IsNTAdmin(0, NULL)) + { + skip("Most tests need admin rights\n"); + return; + } + GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPath(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);

1 0

Dmitry Timoshkov : gdiplus: GdipGetLogFontW should transform returned font height using font and device unit /resolution/scale.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: f8b11542266e78f9ac7b7161da2474cf772860fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b11542266e78f9ac7b7161d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:54:48 2012 +0900 gdiplus: GdipGetLogFontW should transform returned font height using font and device unit/resolution/scale. --- dlls/gdiplus/font.c | 19 +++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 12 ------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9d545e0..51fda73 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -449,8 +449,23 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) { - /* FIXME: use graphics */ - lf->lfHeight = -units_to_pixels(font->emSize, font->unit, font->family->dpi); + REAL height; + + if (font->unit == UnitPixel) + { + height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); + if (graphics->unit != UnitDisplay) + height *= graphics->scale; + } + else + { + if (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) + height = units_to_pixels(font->emSize, font->unit, graphics->xres); + else + height = units_to_pixels(font->emSize, font->unit, graphics->yres); + } + + lf->lfHeight = -(height + 0.5); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2c32390..5f1213c 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3479,19 +3479,8 @@ static void test_GdipMeasureString(void) height = units_to_pixels(font_size, td[i].unit, td[i].res_y); if (td[i].unit != UnitDisplay) height *= td[i].page_scale; - /* FIXME: remove once Wine is fixed */ - if (td[i].unit == UnitDisplay || (td[i].unit == UnitPixel && td[i].page_scale == 1.0)) - ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", - i, (LONG)(height + 0.5), height, lf.lfHeight); - else - { - todo_wine ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight); - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } height = font_size * font_to_pixel_scale; @@ -3572,7 +3561,6 @@ static void test_GdipMeasureString(void) else height = units_to_pixels(font_size, font_unit, td[i].res_y); /*trace("%.1f font units = %f pixels with %.1f dpi, page_scale %.1f\n", font_size, height, td[i].res_y, td[i].page_scale);*/ -todo_wine ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight);

1 0

Dmitry Timoshkov : Revert commit b20a1f56b0c915b24f70b8be83fbf76ea7378123.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: e9af648aeb3f6066ccf9fa2df6cb704a92b3310d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9af648aeb3f6066ccf9fa2df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:54:20 2012 +0900 Revert commit b20a1f56b0c915b24f70b8be83fbf76ea7378123. --- dlls/gdiplus/graphics.c | 35 +++-------------------------------- 1 files changed, 3 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ad2f56..101b73a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4910,30 +4910,6 @@ static GpStatus measure_ranges_callback(HDC hdc, return stat; } -static void rect_to_pixels(const RectF *in, const GpGraphics *graphics, RectF *out) -{ - REAL dpi; - - GdipGetDpiX((GpGraphics *)graphics, &dpi); - out->X = units_to_pixels(in->X, graphics->unit, dpi); - out->Width = units_to_pixels(in->Width, graphics->unit, dpi); - GdipGetDpiY((GpGraphics *)graphics, &dpi); - out->Y = units_to_pixels(in->Y, graphics->unit, dpi); - out->Height = units_to_pixels(in->Height, graphics->unit, dpi); -} - -static void rect_to_units(const RectF *in, const GpGraphics *graphics, RectF *out) -{ - REAL dpi; - - GdipGetDpiX((GpGraphics *)graphics, &dpi); - out->X = pixels_to_units(in->X, graphics->unit, dpi); - out->Width = pixels_to_units(in->Width, graphics->unit, dpi); - GdipGetDpiY((GpGraphics *)graphics, &dpi); - out->Y = pixels_to_units(in->Y, graphics->unit, dpi); - out->Height = pixels_to_units(in->Height, graphics->unit, dpi); -} - GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, @@ -5037,7 +5013,6 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, struct measure_string_args args; HDC temp_hdc=NULL, hdc; GpPointF pt[3]; - RectF rect_pixels; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5075,10 +5050,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); - rect_to_pixels(rect, graphics, &rect_pixels); - - bounds->X = rect_pixels.X; - bounds->Y = rect_pixels.Y; + bounds->X = rect->X; + bounds->Y = rect->Y; bounds->Width = 0.0; bounds->Height = 0.0; @@ -5086,11 +5059,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(hdc, string, length, font, &rect_pixels, format, + gdip_format_string(hdc, string, length, font, rect, format, measure_string_callback, &args); - rect_to_units(bounds, graphics, bounds); - SelectObject(hdc, oldfont); DeleteObject(gdifont);

1 0

Jacek Caban : mshtml: Store moniker in HTMLInnerWindow.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 1a25ed26376e1fd82ca5594d6a40638dae49d0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a25ed26376e1fd82ca5594d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:28:37 2012 +0200 mshtml: Store moniker in HTMLInnerWindow. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b5117f1..3884bf8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,6 +264,8 @@ static void release_inner_window(HTMLInnerWindow *This) IHTMLScreen_Release(This->screen); if(This->history) IOmHistory_Release(This->history); + if(This->mon) + IMoniker_Release(This->mon); heap_free(This); } @@ -2609,7 +2611,7 @@ static void *alloc_window(size_t size) return window; } -static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindow **ret) +static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, HTMLInnerWindow **ret) { HTMLInnerWindow *window; @@ -2628,6 +2630,11 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, HTMLInnerWindo window->task_magic = get_task_target_magic(); window->current_script_guid = CLSID_JScript; + if(mon) { + IMoniker_AddRef(mon); + window->mon = mon; + } + *ret = window; return S_OK; } @@ -2701,7 +2708,7 @@ HRESULT create_pending_window(HTMLOuterWindow *outer_window, nsChannelBSC *chann HTMLInnerWindow *pending_window; HRESULT hres; - hres = create_inner_window(outer_window, &pending_window); + hres = create_inner_window(outer_window, outer_window->mon /* FIXME */, &pending_window); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b0f00d3..f76ebaf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -400,6 +400,7 @@ struct HTMLInnerWindow { LONG task_magic; + IMoniker *mon; nsChannelBSC *bscallback; struct list bindings; }; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 8956dfd..91705dd 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1784,6 +1784,11 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_Release(&window->bscallback->bsc.IBindStatusCallback_iface); window->bscallback = NULL; } + + if(window->mon) { + IMoniker_Release(window->mon); + window->mon = NULL; + } } HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream)

1 0

Józef Kucia : d3dx9: Introduce a helper function for setting float shader constants.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: e67920f12fe3abf82cf70395ef01dec6d2fed227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67920f12fe3abf82cf70395e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:31 2012 +0200 d3dx9: Introduce a helper function for setting float shader constants. --- dlls/d3dx9_36/shader.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 0e6b071..6ae0b37 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -672,6 +672,15 @@ static inline D3DXHANDLE handle_from_constant_index(UINT index) return (D3DXHANDLE)(DWORD_PTR)(index + 1); } +static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, + UINT register_index, const FLOAT *data, UINT count) +{ + if (is_vertex_shader(table->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, register_index, data, count); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, register_index, data, count); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { @@ -882,10 +891,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi FIXME("Unhandled type passed to set_float_array\n"); return D3DERR_INVALIDCALL; } - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i, row, 1); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i, row, 1); + set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1); } break; default: @@ -1004,12 +1010,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable * switch (desc.RegisterSet) { case D3DXRS_FLOAT4: - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); + set_float_shader_constant(This, device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); break; default: FIXME("Handle other register sets\n"); @@ -1060,10 +1062,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * else D3DXMatrixTranspose(&temp, &matrix[i]); - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); + set_float_shader_constant(This, device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); } break; default:

1 0

Piotr Caban : msvcp90: Added basic_fstream<wchar> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 570ffbb4eadb8252e8c3bbef685de1fbf9d49f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570ffbb4eadb8252e8c3bbef6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:53:30 2012 +0200 msvcp90: Added basic_fstream<wchar> implementation. --- dlls/msvcp90/ios.c | 329 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 140 ++++++++++---------- 2 files changed, 399 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=570ffbb4eadb8252e8c3b…

1 0

Jacek Caban : mshtml: Use helper to get IUri in HTMLLocation implementation .
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 28f35f86c64fdc1f973cbc968ad43057df920903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f35f86c64fdc1f973cbc968… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:29:02 2012 +0200 mshtml: Use helper to get IUri in HTMLLocation implementation. --- dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 7a01039..1bcd048 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -46,6 +46,13 @@ static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) return S_OK; } +static IUri *get_uri(HTMLLocation *This) +{ + if(!This->window) + return NULL; + return This->window->uri; +} + static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) { const WCHAR *doc_url; @@ -278,6 +285,7 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR protocol, ret; unsigned len; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -285,12 +293,12 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetSchemeName(This->window->uri, &protocol); + hres = IUri_GetSchemeName(uri, &protocol); if(FAILED(hres)) return hres; if(hres == S_FALSE) { @@ -367,6 +375,7 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR hostname; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -374,12 +383,12 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetHost(This->window->uri, &hostname); + hres = IUri_GetHost(uri, &hostname); if(hres == S_OK) { *p = hostname; }else if(hres == S_FALSE) { @@ -403,6 +412,7 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); DWORD port; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -410,12 +420,12 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetPort(This->window->uri, &port); + hres = IUri_GetPort(uri, &port); if(FAILED(hres)) return hres; @@ -479,6 +489,7 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR query; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -486,12 +497,12 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetQuery(This->window->uri, &query); + hres = IUri_GetQuery(uri, &query); if(hres == S_OK) { *p = query; }else if(hres == S_FALSE) { @@ -515,6 +526,7 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR hash; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -522,12 +534,12 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetFragment(This->window->uri, &hash); + hres = IUri_GetFragment(uri, &hash); if(hres == S_OK) { *p = hash; }else if(hres == S_FALSE) {

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetDefaults.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: fea0b7dcbeaf0677ac06bff0a16aa5697feb2147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea0b7dcbeaf0677ac06bff0a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:33 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetDefaults. --- dlls/d3dx9_36/shader.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 0dcb3a1..728bff2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -905,10 +905,24 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + UINT i; - FIXME("(%p)->(%p): stub\n", This, device); + TRACE("(%p)->(%p)\n", This, device); - return E_NOTIMPL; + if (!device) + return D3DERR_INVALIDCALL; + + for (i = 0; i < This->desc.Constants; i++) + { + D3DXCONSTANT_DESC *desc = &This->constants[i].desc; + + if (!desc->DefaultValue) + continue; + + set_float_shader_constant(This, device, desc->RegisterIndex, desc->DefaultValue, desc->RegisterCount); + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Alexandre Julliard : msvcp90: Fix the calling convention of the basic_string helpers.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 8fdb55cf5c2b50df6cf580cadf7a6b3c623238c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdb55cf5c2b50df6cf580cad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 14 13:29:20 2012 +0200 msvcp90: Fix the calling convention of the basic_string helpers. --- dlls/msvcp90/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 63ef466..fb2ba1a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1992,7 +1992,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch } /* Not exported from msvcp90 */ -basic_string_char* basic_string_char_replace_helper(basic_string_char *this, +basic_string_char* __stdcall basic_string_char_replace_helper(basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len, const char *str, MSVCP_size_t str_len) { return basic_string_char_replace_cstr_len(this, off, len, str, str_len); @@ -3951,7 +3951,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ } /* Not exported from msvcp90 */ -basic_string_wchar* basic_string_wchar_replace_helper(basic_string_wchar *this, +basic_string_wchar* __stdcall basic_string_wchar_replace_helper(basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len, const wchar_t *str, MSVCP_size_t str_len) { return basic_string_wchar_replace_cstr_len(this, off, len ,str, str_len);

1 0

Piotr Caban : msvcp90: Added basic_istream<short> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 7d21ee14f19f126dbd504a4b0d40cf9069e052a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d21ee14f19f126dbd504a4b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:52:22 2012 +0200 msvcp90: Added basic_istream<short> implementation. --- dlls/msvcp90/ios.c | 417 +++++++++++++++++++++++++++++++++++++++------ dlls/msvcp90/locale.c | 4 +- dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp90.spec | 204 +++++++++++----------- 4 files changed, 470 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d21ee14f19f126dbd504…

1 0