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

André Hentschel : winemaker: Improved check for libXML at runtime.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 6fb4e062984fc3fe49ebc396698d1f805b0b3906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb4e062984fc3fe49ebc3966… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 8 00:10:43 2013 +0200 winemaker: Improved check for libXML at runtime. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index c6eb480..af26243 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -873,8 +873,12 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_DEFINES]},$prj_target_defines; push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags; } elsif ($filename =~ /.vcproj$/i) { - # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl) - require XML::LibXML; + eval { + require XML::LibXML; + }; + if ($@) { + die "Error: You need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)"; + } my $xmlparser = XML::LibXML->new(); my $project_xml = $xmlparser->parse_file($filename);

1 0

Qian Hong : ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: f56edbf5379d969dd4997ee8627c2ceab2f8af9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56edbf5379d969dd4997ee86… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Aug 6 15:55:25 2013 +0800 ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6f592b4..5caff45 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -939,7 +939,7 @@ @ stdcall RtlpNtEnumerateSubKey(ptr ptr long) @ stdcall RtlpNtMakeTemporaryKey(ptr) @ stdcall RtlpNtOpenKey(ptr long ptr) -@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr) +@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr ptr) @ stdcall RtlpNtSetValueKey(ptr long ptr long) @ stdcall RtlpUnWaitCriticalSection(ptr) @ stdcall RtlpWaitForCriticalSection(ptr)

1 0

Jacek Caban : inputscope.idl: Imported from mingw-w64.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: b25983ff7ea98ab14c22810006f5f222bbf7733e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25983ff7ea98ab14c2281000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 5 13:14:50 2013 +0200 inputscope.idl: Imported from mingw-w64. --- .gitignore | 1 + dlls/msctf/msctf.c | 5 ++- include/Makefile.in | 1 + include/inputscope.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 2 - 5 files changed, 98 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8c51c2a..5147285 100644 --- a/.gitignore +++ b/.gitignore @@ -194,6 +194,7 @@ include/iextag.h include/imnact.h include/imnxport.h include/indexsrv.h +include/inputscope.h include/mediaobj.h include/metahost.h include/mimeinfo.h diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 2a8b0e1..78992f7 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -35,6 +35,7 @@ #include "comcat.h" #include "rpcproxy.h" #include "msctf.h" +#include "inputscope.h" #include "msctf_internal.h" @@ -602,7 +603,7 @@ HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) /*********************************************************************** * SetInputScope(MSCTF.@) */ -HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) +HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope) { FIXME("STUB: %p %i\n",hwnd,inputscope); return S_OK; @@ -611,7 +612,7 @@ HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) /*********************************************************************** * SetInputScopes(MSCTF.@) */ -HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, +HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { diff --git a/include/Makefile.in b/include/Makefile.in index 7f26dca..b1e48fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -49,6 +49,7 @@ PUBLIC_IDL_H_SRCS = \ imnact.idl \ imnxport.idl \ indexsrv.idl \ + inputscope.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inputscope.idl b/include/inputscope.idl new file mode 100644 index 0000000..059b6f8 --- /dev/null +++ b/include/inputscope.idl @@ -0,0 +1,93 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given. + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; + +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);") +cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);") + +cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);") + +[ + object, + uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d), + pointer_default(unique) +] +interface ITfInputScope : IUnknown +{ + HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount); + HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount); + HRESULT GetRegularExpression([out] BSTR *pbstrRegExp); + HRESULT GetSRGS([out] BSTR *pbstrSRGS); + HRESULT GetXML([out] BSTR *pbstrXML); +} diff --git a/include/msctf.idl b/include/msctf.idl index e17132b..a3db32e 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -29,8 +29,6 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") -cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);") -cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);")

1 0

Aric Stewart : wineps.drv: Handle empty strings when building vertical runs .
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 7bd8623810f9d5e524ca1dcc58a633974f576e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd8623810f9d5e524ca1dcc5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 9 12:36:16 2013 -0500 wineps.drv: Handle empty strings when building vertical runs. --- dlls/wineps.drv/text.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 1a54510..a9623a1 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -91,15 +91,16 @@ static BOOL check_unicode_tategaki(WCHAR uchar) static Run* build_vertical_runs(PHYSDEV dev, UINT flags, LPCWSTR str, UINT count, INT *run_count) { - BOOL last_vert = check_unicode_tategaki(str[0]); + BOOL last_vert; INT start, end; INT array_size = 5; Run *run = HeapAlloc(GetProcessHeap(),0,sizeof(Run)*array_size); int index = 0; LOGFONTW lf; - if ((!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) + if (count && str && (!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) { + last_vert = check_unicode_tategaki(str[0]); start = end = 0; while (start < count) {

1 0

Henri Verbeet : wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area().
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: cbaa17d3cf7d6f3bd6a050aff33cce9942287c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa17d3cf7d6f3bd6a050aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:46 2013 +0200 wined3d: Assume the buffer has a buffer object in buffer_add_dirty_area(). --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2ba88e..4bfca33 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -34,11 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define VB_MAXFULLCONVERSIONS 5 /* Number of full conversions before we stop converting */ #define VB_RESETFULLCONVS 20 /* Reset full conversion counts after that number of draws */ -static void buffer_add_dirty_area(struct wined3d_buffer *buffer, UINT offset, UINT size) +static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, UINT offset, UINT size) { - if (!buffer->buffer_object) - return; - if (!offset && !size) goto invalidate_all; @@ -188,7 +185,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_add_dirty_area(This, 0, 0); + buffer_invalidate_bo_range(This, 0, 0); } else { @@ -808,7 +805,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* The declaration changed, reload the whole buffer. */ WARN("Reloading buffer because of a vertex declaration change.\n"); - buffer_add_dirty_area(buffer, 0, 0); + buffer_invalidate_bo_range(buffer, 0, 0); /* Avoid unfenced updates, we might overwrite more areas of the buffer than the application * cleared for unsynchronized updates @@ -990,19 +987,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) - buffer_add_dirty_area(buffer, 0, 0); - else if (!(flags & WINED3D_MAP_READONLY)) - buffer_add_dirty_area(buffer, offset, size); - count = ++buffer->resource.map_count; if (buffer->buffer_object) { + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) + buffer_invalidate_bo_range(buffer, 0, 0); + else if (!(flags & WINED3D_MAP_READONLY)) + buffer_invalidate_bo_range(buffer, offset, size); + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { if (count == 1)

1 0

Henri Verbeet : wined3d: Don' t bother downloading buffer contents on destruction.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 5e64fd70496d8a85a3dd8983f01d28a2f9c831bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e64fd70496d8a85a3dd8983f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 13 08:51:44 2013 +0200 wined3d: Don't bother downloading buffer contents on destruction. --- dlls/wined3d/buffer.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 586b16c..3f692e2 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -551,12 +551,21 @@ static void buffer_unload(struct wined3d_resource *resource) ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); + struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) { - buffer_unload(&buffer->resource); + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); HeapFree(GetProcessHeap(), 0, buffer->maps);

1 0

Andrew Eikum : oleaut32: Save typelib SYSKIND.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 6f5cc0887ef19eb2d72a17a5906801b640e6c4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5cc0887ef19eb2d72a17a59… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 12 15:24:19 2013 -0500 oleaut32: Save typelib SYSKIND. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 031f2b1..fa37737 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9698,7 +9698,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) file.header.magic2 = 0x00010002; file.header.lcid = This->set_lcid ? This->set_lcid : MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); file.header.lcid2 = This->set_lcid; - file.header.varflags = 0x41; /* TODO?? */ + file.header.varflags = 0x40 | This->syskind; if (This->HelpFile) file.header.varflags |= 0x10; if (This->HelpStringDll)

1 0

Ken Thomases : winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 4b24fce4e2390fbcc0e6ba8fc607595c3d05df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b24fce4e2390fbcc0e6ba8fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 9 16:37:29 2013 -0500 winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK. --- dlls/winemac.drv/gdi.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index e05f9ab..951b569 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -49,7 +49,6 @@ static int vert_res; /* height in pixels of screen */ static int desktop_horz_res; /* width in pixels of virtual desktop */ static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ -static int palette_size; /* number of color entries in palette */ static int device_data_valid; /* do the above variables have up-to-date values? */ static CRITICAL_SECTION device_data_section; @@ -141,7 +140,6 @@ static void device_init(void) CGDirectDisplayID mainDisplay = CGMainDisplayID(); CGSize size_mm = CGDisplayScreenSize(mainDisplay); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); - CGDirectPaletteRef palette; /* Initialize device caps */ log_pixels_x = log_pixels_y = get_dpi(); @@ -187,15 +185,6 @@ static void device_init(void) desktop_horz_res = desktop_rect.size.width; desktop_vert_res = desktop_rect.size.height; - palette = CGPaletteCreateWithDisplay(mainDisplay); - if (palette) - { - palette_size = CGPaletteGetNumberOfSamples(palette); - CGPaletteRelease(palette); - } - else - palette_size = 0; - device_data_valid = TRUE; } @@ -368,7 +357,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case RASTERCAPS: ret = (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | - (palette_size ? RC_PALETTE : 0)); + (bits_per_pixel <= 8 ? RC_PALETTE : 0)); break; case SHADEBLENDCAPS: ret = (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); @@ -393,7 +382,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) ret = 0; break; case SIZEPALETTE: - ret = palette_size; + ret = bits_per_pixel <= 8 ? 1 << bits_per_pixel : 0; break; case NUMRESERVED: case PHYSICALWIDTH:

1 0

André Hentschel : msvcp90/tests: Add dynamically loaded functions for ARM.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 1151546ce05439ee6570a1b2e52170ad39cec81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1151546ce05439ee6570a1b2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 21:51:20 2013 +0200 msvcp90/tests: Add dynamically loaded functions for ARM. --- dlls/msvcp90/tests/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/tests/misc.c | 56 ++++++++++++++++++++++ 2 files changed, 168 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1151546ce05439ee6570a…

1 0

Piotr Caban : jscript: Fix compilation issues when dtoa is defined in headers.
by Alexandre Julliard Aug. 15, 2013

Aug. 15, 2013

Module: wine Branch: master Commit: 2e752a115ac814fc252af592d01c816b34e96cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e752a115ac814fc252af592d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 5 13:59:34 2013 +0200 jscript: Fix compilation issues when dtoa is defined in headers. --- dlls/jscript/number.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 4dc07af..d60925c 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -54,7 +54,7 @@ static inline NumberInstance *number_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_NUMBER) ? number_from_vdisp(jsthis) : NULL; } -static inline void dtoa(double d, WCHAR *buf, int size, int *dec_point) +static inline void number_to_str(double d, WCHAR *buf, int size, int *dec_point) { ULONGLONG l; int i; @@ -113,7 +113,7 @@ static inline jsstr_t *number_to_fixed(double val, int prec) if(buf_size > NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; - dtoa(val, buf, buf_size, &dec_point); + number_to_str(val, buf, buf_size, &dec_point); dec_point++; size = 0; if(neg) @@ -171,7 +171,7 @@ static inline jsstr_t *number_to_exponential(double val, int prec) buf_size = prec+2; if(buf_size<2 || buf_size>NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; - dtoa(val, buf, buf_size, &dec_point); + number_to_str(val, buf, buf_size, &dec_point); buf_size--; if(prec == -1) for(; buf_size>1 && buf[buf_size-1]=='0'; buf_size--)

1 0