May 2011 - Wine-Commits - list.winehq.org

Nicolas Le Cam : msvcrt/tests: Avoid size_t in traces.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: acbb7b817a8193b24c2c7cca61dd002974f38382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acbb7b817a8193b24c2c7cca6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 02:45:06 2011 +0200 msvcrt/tests: Avoid size_t in traces. --- dlls/msvcrt/tests/string.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b72e001..06a4178 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1332,31 +1332,31 @@ static void test_mbstowcs(void) err = pmbstowcs_s(&ret, wOut, 6, mSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "mbstowcs_s did not return 5\n"); ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, wOut, 6, mHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 3, "ret = %d\n", (int)ret); + ok(ret == 3, "mbstowcs_s did not return 3\n"); ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); err = pmbstowcs_s(&ret, NULL, 0, mHiragana, 1); ok(err == 0, "err = %d\n", err); - ok(ret == 3, "ret = %d\n", (int)ret); + ok(ret == 3, "mbstowcs_s did not return 3\n"); err = pwcstombs_s(&ret, mOut, 6, wSimple, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); err = pwcstombs_s(&ret, mOut, 6, wHiragana, _TRUNCATE); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); err = pwcstombs_s(&ret, NULL, 0, wHiragana, 1); ok(err == 0, "err = %d\n", err); - ok(ret == 5, "ret = %d\n", (int)ret); + ok(ret == 5, "wcstombs_s did not return 5\n"); if(!pwcsrtombs) { win_skip("wcsrtombs not available\n"); @@ -1366,14 +1366,14 @@ static void test_mbstowcs(void) pwstr = wSimple; err = -3; ret = pwcsrtombs(mOut, &pwstr, 4, &err); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcsrtombs did not return 4\n"); ok(err == 0, "err = %d\n", err); ok(pwstr == wSimple+4, "pwstr = %p (wszSimple = %p)\n", pwstr, wSimple); ok(!memcmp(mOut, mSimple, ret), "mOut = %s\n", mOut); pwstr = wSimple; ret = pwcsrtombs(mOut, &pwstr, 5, NULL); - ok(ret == 4, "ret = %d\n", ret); + ok(ret == 4, "wcsrtombs did not return 4\n"); ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); }

1 0

Nicolas Le Cam : comctl32/tests: Remove a set but unused variable.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 401961f8fb69859f03a38ed40aa47c3d0fe93cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=401961f8fb69859f03a38ed40… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 00:46:30 2011 +0200 comctl32/tests: Remove a set but unused variable. --- dlls/comctl32/tests/listview.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c2bf70b..35c7734 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3023,7 +3023,7 @@ static void test_hittest(void) static CHAR text[] = "1234567890ABCDEFGHIJKLMNOPQRST"; POINT pos; INT x, y, i; - WORD horiz, vert; + WORD vert; HIMAGELIST himl, himl2; HBITMAP hbmp; @@ -3053,7 +3053,6 @@ static void test_hittest(void) ok(bounds.bottom - bounds.top > 0, "Expected non zero item height\n"); ok(bounds.right - bounds.left > 0, "Expected non zero item width\n"); r = SendMessage(hwnd, LVM_GETITEMSPACING, TRUE, 0); - horiz = LOWORD(r); vert = HIWORD(r); ok(bounds.bottom - bounds.top == vert, "Vertical spacing inconsistent (%d != %d)\n", bounds.bottom - bounds.top, vert);

1 0

Nicolas Le Cam : ole32/tests: Fix large integer overflow warnings.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: cfe11f1875215e8f9a8b3bf4f7903b0a2cb4ecb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe11f1875215e8f9a8b3bf4f… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Apr 30 02:46:02 2011 +0200 ole32/tests: Fix large integer overflow warnings. --- dlls/ole32/tests/hglobalstream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b2a6ee9..769d5a1 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -175,7 +175,7 @@ static void test_streamonhglobal(IStream *pStream) ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; - ll.u.LowPart = -sizeof(data); + ll.u.LowPart = -(DWORD)sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok_ole_success(hr, "IStream_Seek"); ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); @@ -190,7 +190,7 @@ static void test_streamonhglobal(IStream *pStream) ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; - ll.u.LowPart = -sizeof(data)-1; + ll.u.LowPart = -(DWORD)sizeof(data)-1; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart);

1 0

Marcus Meissner : advpack: Mark internal symbols as hidden.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 048999c79a95ea8adbd23685beb0f1a6694200d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048999c79a95ea8adbd23685b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 20:40:11 2011 +0200 advpack: Mark internal symbols as hidden. --- dlls/advpack/advpack_private.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 3f81bba..23babf6 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,10 +21,10 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); -LPWSTR get_parameter(LPWSTR *params, WCHAR separator); -void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) DECLSPEC_HIDDEN; +LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; +void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; -HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); +HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; #endif /* __ADVPACK_PRIVATE_H */

1 0

Marcus Meissner : ddraw: Added missing break (Coverity).
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 6d144cf0121320b76e5d7b697a162192c7274c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d144cf0121320b76e5d7b697… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 1 15:37:51 2011 +0200 ddraw: Added missing break (Coverity). --- dlls/ddraw/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3909987..001dff3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2384,6 +2384,7 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, WINED3DRS_DEPTHBIAS, &wined3d_value.d); if (SUCCEEDED(hr)) *Value = -wined3d_value.f * 16.0f; + break; } default:

1 0

Eric Pouech : dbghelp: Enhance a couple of register mapping functions for i386.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 108b63f5a61c91df6fefeef1c5a097df4a0d1837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108b63f5a61c91df6fefeef1c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:30 2011 +0200 dbghelp: Enhance a couple of register mapping functions for i386. --- dlls/dbghelp/cpu_i386.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 73cbe1a..8fe5eac 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -541,11 +541,11 @@ static unsigned i386_map_dwarf_register(unsigned regno) case 24: reg = CV_REG_CTRL; break; case 25: reg = CV_REG_STAT; break; case 26: reg = CV_REG_TAG; break; + case 27: reg = CV_REG_FPCS; break; + case 28: reg = CV_REG_FPIP; break; + case 29: reg = CV_REG_FPDS; break; + case 30: reg = CV_REG_FPDO; break; /* -reg: fiseg 27 -reg: fioff 28 -reg: foseg 29 -reg: fooff 30 reg: fop 31 */ case 32: case 33: case 34: case 35: @@ -583,6 +583,14 @@ static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + case CV_REG_CTRL: *size = sizeof(DWORD); return &ctx->FloatSave.ControlWord; + case CV_REG_STAT: *size = sizeof(DWORD); return &ctx->FloatSave.StatusWord; + case CV_REG_TAG: *size = sizeof(DWORD); return &ctx->FloatSave.TagWord; + case CV_REG_FPCS: *size = sizeof(DWORD); return &ctx->FloatSave.ErrorSelector; + case CV_REG_FPIP: *size = sizeof(DWORD); return &ctx->FloatSave.ErrorOffset; + case CV_REG_FPDS: *size = sizeof(DWORD); return &ctx->FloatSave.DataSelector; + case CV_REG_FPDO: *size = sizeof(DWORD); return &ctx->FloatSave.DataOffset; + case CV_REG_EFLAGS: *size = sizeof(ctx->EFlags); return &ctx->EFlags; case CV_REG_ES: *size = sizeof(ctx->SegEs); return &ctx->SegEs; case CV_REG_CS: *size = sizeof(ctx->SegCs); return &ctx->SegCs; @@ -627,6 +635,25 @@ static const char* i386_fetch_regname(unsigned regno) case CV_REG_DS: return "ds"; case CV_REG_FS: return "fs"; case CV_REG_GS: return "gs"; + + case CV_REG_CTRL: return "fpControl"; + case CV_REG_STAT: return "fpStatus"; + case CV_REG_TAG: return "fpTag"; + case CV_REG_FPCS: return "fpCS"; + case CV_REG_FPIP: return "fpIP"; + case CV_REG_FPDS: return "fpDS"; + case CV_REG_FPDO: return "fpData"; + + case CV_REG_XMM0 + 0: return "xmm0"; + case CV_REG_XMM0 + 1: return "xmm1"; + case CV_REG_XMM0 + 2: return "xmm2"; + case CV_REG_XMM0 + 3: return "xmm3"; + case CV_REG_XMM0 + 4: return "xmm4"; + case CV_REG_XMM0 + 5: return "xmm5"; + case CV_REG_XMM0 + 6: return "xmm6"; + case CV_REG_XMM0 + 7: return "xmm7"; + + case CV_REG_MXCSR: return "MxCSR"; } FIXME("Unknown register %x\n", regno); return NULL;

1 0

Eric Pouech : winedump: Correctly get to the optional header for 64 bit images.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 1d3dfd9e8d9cd2d575e6783d57dc6cee409d219c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3dfd9e8d9cd2d575e6783d5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:12 2011 +0200 winedump: Correctly get to the optional header for 64 bit images. --- tools/winedump/pe.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c1f6eb8..1974a42 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -941,13 +941,11 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) static void dump_dir_debug(void) { - const IMAGE_DEBUG_DIRECTORY*debugDir = get_dir(IMAGE_FILE_DEBUG_DIRECTORY); unsigned nb_dbg, i; + const IMAGE_DEBUG_DIRECTORY*debugDir = get_dir_and_size(IMAGE_FILE_DEBUG_DIRECTORY, &nb_dbg); - if (!debugDir) return; - nb_dbg = PE_nt_headers->OptionalHeader.DataDirectory[IMAGE_FILE_DEBUG_DIRECTORY].Size / - sizeof(*debugDir); - if (!nb_dbg) return; + nb_dbg /= sizeof(*debugDir); + if (!debugDir || !nb_dbg) return; printf("Debug Table (%u directories)\n", nb_dbg);

1 0

Eric Pouech : winedump: Simplify code a bit by using IMAGE_FIRST_SECTION() macro.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 0957cd03dd0ff98f22eb9f80a7973b01d1b21157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0957cd03dd0ff98f22eb9f80a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 1 09:46:27 2011 +0200 winedump: Simplify code a bit by using IMAGE_FIRST_SECTION() macro. --- tools/winedump/debug.c | 3 +-- tools/winedump/pe.c | 11 ++++------- tools/winedump/winedump.h | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 4f2cedf..c59efa6 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -570,12 +570,11 @@ void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sy } } -void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +void dump_coff(unsigned long coffbase, unsigned long len, const IMAGE_SECTION_HEADER* sectHead) { const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_symbols = (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); - const IMAGE_SECTION_HEADER *sectHead = pmt; dump_coff_symbol_table(coff_symbols, coff->NumberOfSymbols, sectHead); } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 2ab2f34..1f8ee38 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -882,8 +882,8 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_UNKNOWN: break; case IMAGE_DEBUG_TYPE_COFF: - dump_coff(idd->PointerToRawData, idd->SizeOfData, - (const char*)PE_nt_headers + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader); + dump_coff(idd->PointerToRawData, idd->SizeOfData, + IMAGE_FIRST_SECTION(PE_nt_headers)); break; case IMAGE_DEBUG_TYPE_CODEVIEW: dump_codeview(idd->PointerToRawData, idd->SizeOfData); @@ -1383,9 +1383,7 @@ static void dump_debug(void) unsigned i; const IMAGE_SECTION_HEADER* sectHead; - sectHead = (const IMAGE_SECTION_HEADER*) - ((const char*)PE_nt_headers + sizeof(DWORD) + - sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader); + sectHead = IMAGE_FIRST_SECTION(PE_nt_headers); for (i = 0; i < PE_nt_headers->FileHeader.NumberOfSections; i++, sectHead++) { @@ -1456,8 +1454,7 @@ void pe_dump(void) { dump_pe_header(); /* FIXME: should check ptr */ - dump_sections(PRD(0, 1), (const char*)PE_nt_headers + sizeof(DWORD) + - sizeof(IMAGE_FILE_HEADER) + PE_nt_headers->FileHeader.SizeOfOptionalHeader, + dump_sections(PRD(0, 1), IMAGE_FIRST_SECTION(PE_nt_headers), PE_nt_headers->FileHeader.NumberOfSections); } else if (!globals.dumpsect) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 82eb6d8..7141d0d 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -260,7 +260,8 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const ch void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len); -void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); +void dump_coff(unsigned long coffbase, unsigned long len, + const IMAGE_SECTION_HEADER *sectHead); void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, const IMAGE_SECTION_HEADER *sectHead); void dump_frame_pointer_omission(unsigned long base, unsigned long len);

1 0

Alexandre Julliard : msvcrt: Add stubs for the 64-bit msvcirt entry points.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: 9c76ed18b7642c7644b7a77419c317d7772f5c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c76ed18b7642c7644b7a7741… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 1 20:01:23 2011 +0200 msvcrt: Add stubs for the 64-bit msvcirt entry points. --- dlls/msvcirt/msvcirt.spec | 1092 ++++++++++++++++++++++++++-------------- dlls/msvcrt20/msvcrt20.spec | 1187 +++++++++++++++++++++++++++---------------- dlls/msvcrt40/msvcrt40.spec | 1191 +++++++++++++++++++++++++++---------------- 3 files changed, 2241 insertions(+), 1229 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c76ed18b7642c7644b7a…

1 0

Alexandre Julliard : msvcrt: Implemented a few trivial math functions.
by Alexandre Julliard May 2, 2011

May 2, 2011

Module: wine Branch: master Commit: abe0823b727ae498ecbb05adb468f2bb418b0645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0823b727ae498ecbb05adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 1 12:52:22 2011 +0200 msvcrt: Implemented a few trivial math functions. --- dlls/msvcr100/msvcr100.spec | 6 ++-- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/math.c | 60 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.spec | 10 +++--- 5 files changed, 65 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c95d98..3a157bb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -488,7 +488,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -1049,9 +1049,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl _scalb(double long) msvcrt._scalb @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bfa87e3..dc20b56 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -312,7 +312,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -897,9 +897,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b84e586..5e44d50 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -304,7 +304,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination -@ stub _abs64 +@ cdecl -ret64 _abs64(int64) msvcrt._abs64 @ cdecl _access(str long) msvcrt._access @ cdecl _access_s(str long) msvcrt._access_s @ extern _acmdln msvcrt._acmdln @@ -883,9 +883,9 @@ @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl -@ stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) msvcrt._rotl64 @ cdecl _rotr(long long) msvcrt._rotr -@ stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) msvcrt._rotr64 @ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3428398..9659f17 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -640,15 +640,6 @@ unsigned int CDECL _rotl(unsigned int num, int shift) } /********************************************************************* - * _logb (MSVCRT.@) - */ -double CDECL _logb(double num) -{ - if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return logb(num); -} - -/********************************************************************* * _lrotl (MSVCRT.@) */ MSVCRT_ulong CDECL MSVCRT__lrotl(MSVCRT_ulong num, int shift) @@ -676,6 +667,57 @@ unsigned int CDECL _rotr(unsigned int num, int shift) } /********************************************************************* + * _rotl64 (MSVCRT.@) + */ +unsigned __int64 CDECL _rotl64(unsigned __int64 num, int shift) +{ + shift &= 63; + return (num << shift) | (num >> (64-shift)); +} + +/********************************************************************* + * _rotr64 (MSVCRT.@) + */ +unsigned __int64 CDECL _rotr64(unsigned __int64 num, int shift) +{ + shift &= 63; + return (num >> shift) | (num << (64-shift)); +} + +/********************************************************************* + * abs (MSVCRT.@) + */ +int CDECL MSVCRT_abs( int n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * labs (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * _abs64 (MSVCRT.@) + */ +__int64 CDECL _abs64( __int64 n ) +{ + return n >= 0 ? n : -n; +} + +/********************************************************************* + * _logb (MSVCRT.@) + */ +double CDECL _logb(double num) +{ + if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; + return logb(num); +} + +/********************************************************************* * _scalb (MSVCRT.@) */ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7687f5c..104687b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -269,7 +269,7 @@ @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv @ cdecl _abnormal_termination() -# stub _abs64 +@ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) MSVCRT__access @ cdecl _access_s(str long) @ extern _acmdln MSVCRT__acmdln @@ -840,9 +840,9 @@ @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() @ cdecl _rotl(long long) -# stub _rotl64 +@ cdecl -ret64 _rotl64(int64 long) @ cdecl _rotr(long long) -# stub _rotr64 +@ cdecl -ret64 _rotr64(int64 long) @ cdecl -arch=i386 _safe_fdiv() @ cdecl -arch=i386 _safe_fdivr() @ cdecl -arch=i386 _safe_fprem() @@ -1210,7 +1210,7 @@ @ cdecl _y1(double) @ cdecl _yn(long double ) @ cdecl abort() MSVCRT_abort -@ cdecl abs(long) ntdll.abs +@ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos @ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @@ -1316,7 +1316,7 @@ @ cdecl iswupper(long) MSVCRT_iswupper @ cdecl iswxdigit(long) MSVCRT_iswxdigit @ cdecl isxdigit(long) MSVCRT_isxdigit -@ cdecl labs(long) ntdll.labs +@ cdecl labs(long) MSVCRT_labs @ cdecl ldexp( double long) MSVCRT_ldexp @ cdecl ldiv(long long) MSVCRT_ldiv @ cdecl localeconv() MSVCRT_localeconv

1 0