wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

André Hentschel : vcomp90: Add new stub dll.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: a6086e1161aa12c17fa880f83c4120f6dccc4c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6086e1161aa12c17fa880f83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 16 17:10:20 2012 +0200 vcomp90: Add new stub dll. --- configure | 1 + configure.ac | 1 + dlls/vcomp100/vcomp100.spec | 6 +- dlls/vcomp90/Makefile.in | 6 ++ dlls/vcomp90/main.c | 48 ++++++++++++++++++ dlls/vcomp90/vcomp90.spec | 112 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 172 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d9157fa..87f93f9 100755 --- a/configure +++ b/configure @@ -15731,6 +15731,7 @@ wine_fn_config_dll vbscript enable_vbscript wine_fn_config_test dlls/vbscript/tests vbscript_test wine_fn_config_dll vcomp enable_vcomp wine_fn_config_dll vcomp100 enable_vcomp100 +wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 2c9e582..8a69570 100644 --- a/configure.ac +++ b/configure.ac @@ -3004,6 +3004,7 @@ WINE_CONFIG_DLL(vbscript) WINE_CONFIG_TEST(dlls/vbscript/tests) WINE_CONFIG_DLL(vcomp) WINE_CONFIG_DLL(vcomp100) +WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index cd5a964..d888577 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -85,7 +85,7 @@ @ stub _vcomp_reduction_u8 @ stub _vcomp_sections_init @ stub _vcomp_sections_next -@ stub _vcomp_set_num_threads +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads @ stub _vcomp_single_begin @ stub _vcomp_single_end @ stub omp_destroy_lock @@ -93,11 +93,11 @@ @ stub omp_get_dynamic @ stub omp_get_max_threads @ stub omp_get_nested -@ stub omp_get_num_procs +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs @ stub omp_get_num_threads @ stub omp_get_thread_num @ stub omp_get_wtick -@ stub omp_get_wtime +@ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock diff --git a/dlls/vcomp90/Makefile.in b/dlls/vcomp90/Makefile.in new file mode 100644 index 0000000..48dafbd --- /dev/null +++ b/dlls/vcomp90/Makefile.in @@ -0,0 +1,6 @@ +MODULE = vcomp90.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/vcomp90/main.c b/dlls/vcomp90/main.c new file mode 100644 index 0000000..4c2d864 --- /dev/null +++ b/dlls/vcomp90/main.c @@ -0,0 +1,48 @@ +/* + * + * vcomp90 implementation + * + * Copyright 2012 André Hentschel + * + * 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp90); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec new file mode 100644 index 0000000..d888577 --- /dev/null +++ b/dlls/vcomp90/vcomp90.spec @@ -0,0 +1,112 @@ +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ stub _vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ stub _vcomp_atomic_add_r4 +@ stub _vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ stub _vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ stub _vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ stub _vcomp_atomic_div_r4 +@ stub _vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ stub _vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ stub _vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ stub _vcomp_atomic_mul_r4 +@ stub _vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ stub _vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ stub _vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ stub _vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ stub _vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ stub _vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ stub _vcomp_atomic_sub_r4 +@ stub _vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ stub _vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ stub _vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ stub _vcomp_enter_critsect +@ stub _vcomp_flush +@ stub _vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ stub _vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ stub _vcomp_for_static_end +@ stub _vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ stub _vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ stub _vcomp_fork +@ stub _vcomp_get_thread_num +@ stub _vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ stub _vcomp_master_begin +@ stub _vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ stub _vcomp_sections_init +@ stub _vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ stub _vcomp_single_begin +@ stub _vcomp_single_end +@ stub omp_destroy_lock +@ stub omp_destroy_nest_lock +@ stub omp_get_dynamic +@ stub omp_get_max_threads +@ stub omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ stub omp_get_num_threads +@ stub omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ stub omp_in_parallel +@ stub omp_init_lock +@ stub omp_init_nest_lock +@ stub omp_set_dynamic +@ stub omp_set_lock +@ stub omp_set_nest_lock +@ stub omp_set_nested +@ stub omp_set_num_threads +@ stub omp_test_lock +@ stub omp_test_nest_lock +@ stub omp_unset_lock +@ stub omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index a39889f..301345c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -109,6 +109,7 @@ my @dll_groups = [ "vcomp", "vcomp100", + "vcomp90", ], [ "atl",

1 0

Alistair Leslie-Hughes : oledb32: Register typelib.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 65a15809d57fd18a9283545f5b5652b07c479b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a15809d57fd18a9283545f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 17 13:58:17 2012 +1000 oledb32: Register typelib. --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/oledb32_typelib.idl | 20 ++++++++++++++++++++ include/msdasc.idl | 2 +- 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index c5c11e4..5c66a2c 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -10,4 +10,6 @@ IDL_I_SRCS = convert.idl IDL_R_SRCS = oledb32_classes.idl +IDL_TLB_SRCS = oledb32_typelib.idl + @MAKE_DLL_RULES@ diff --git a/dlls/oledb32/oledb32_typelib.idl b/dlls/oledb32/oledb32_typelib.idl new file mode 100644 index 0000000..e47ab8e --- /dev/null +++ b/dlls/oledb32/oledb32_typelib.idl @@ -0,0 +1,20 @@ +/* + * Typelib Classes for oledb32 + * + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 "msdasc.idl" diff --git a/include/msdasc.idl b/include/msdasc.idl index 1033516..ca879e8 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -64,7 +64,7 @@ library MSDASC [ uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), progid("MSDASC.MSDAINITIALIZE.1"), - vi_progid("MSDASC.MSDAINITIALIZE.1"), + vi_progid("MSDASC.MSDAINITIALIZE"), ] coclass MSDAINITIALIZE {

1 0

Alexandre Julliard : ddraw/tests: Fix clip region tests for older ddraw too .
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8ab2ed64fd28b357bba355fb3b7c7e3f52a4b34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab2ed64fd28b357bba355fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 12:10:55 2012 +0200 ddraw/tests: Fix clip region tests for older ddraw too. --- dlls/ddraw/tests/ddraw1.c | 11 ++--------- dlls/ddraw/tests/ddraw2.c | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb8b0be..2a84dc1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -536,7 +536,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC surface_desc; unsigned int i, j, x, y; @@ -602,19 +602,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16 || broken(rgn_data->rdh.nRgnSize == 168 /* NT4 */), - "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c6641ae..6426576 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -478,7 +478,7 @@ static void test_coop_level_create_device_window(void) static void test_clipper_blt(void) { IDirectDrawSurface *src_surface, *dst_surface; - RECT client_rect, src_rect, *rect; + RECT client_rect, src_rect; IDirectDrawClipper *clipper; DDSURFACEDESC surface_desc; unsigned int i, j, x, y; @@ -544,19 +544,12 @@ static void test_clipper_blt(void) ok(SUCCEEDED(hr), "Failed to get clip list, hr %#x.\n", hr); ok(rgn_data->rdh.dwSize == sizeof(rgn_data->rdh), "Got unexpected structure size %#x.\n", rgn_data->rdh.dwSize); ok(rgn_data->rdh.iType == RDH_RECTANGLES, "Got unexpected type %#x.\n", rgn_data->rdh.iType); - ok(rgn_data->rdh.nCount == 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); - ok(rgn_data->rdh.nRgnSize == 16 || broken(rgn_data->rdh.nRgnSize == 168 /* NT4 */), - "Got unexpected region size %u.\n", rgn_data->rdh.nRgnSize); + ok(rgn_data->rdh.nCount >= 1, "Got unexpected count %u.\n", rgn_data->rdh.nCount); ok(EqualRect(&rgn_data->rdh.rcBound, &client_rect), "Got unexpected bounding rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", rgn_data->rdh.rcBound.left, rgn_data->rdh.rcBound.top, rgn_data->rdh.rcBound.right, rgn_data->rdh.rcBound.bottom, client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); - rect = (RECT *)&rgn_data->Buffer[0]; - ok(EqualRect(rect, &client_rect), - "Got unexpected clip rect {%d, %d, %d, %d}, expected {%d, %d, %d, %d}.\n", - rect->left, rect->top, rect->right, rect->bottom, - client_rect.left, client_rect.top, client_rect.right, client_rect.bottom); HeapFree(GetProcessHeap(), 0, rgn_data); r1 = CreateRectRgn(0, 0, 320, 240);

1 0

Piotr Caban : msvcp71: Removed unused functions.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 06d5c487c7e8fcf0fff64e3f1fde50ce49da4216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d5c487c7e8fcf0fff64e3f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:27:48 2012 +0200 msvcp71: Removed unused functions. --- dlls/msvcp71/cxx.h | 2 - dlls/msvcp71/exception.c | 24 +-- dlls/msvcp71/ios.c | 547 ++-------------------------------------------- dlls/msvcp71/locale.c | 450 ++++---------------------------------- dlls/msvcp71/memory.c | 248 +-------------------- dlls/msvcp71/misc.c | 49 +---- dlls/msvcp71/msvcp.h | 12 +- dlls/msvcp71/msvcp71.c | 16 -- dlls/msvcp71/string.c | 417 +---------------------------------- 9 files changed, 103 insertions(+), 1662 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06d5c487c7e8fcf0fff64…

1 0

Piotr Caban : msvcp71: Updated spec file.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: e0936feebd40437214ee20afbd94c9ab6bed3b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0936feebd40437214ee20afb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:27:32 2012 +0200 msvcp71: Updated spec file. --- dlls/msvcp71/msvcp71.spec | 7630 ++++++++++++++++++++++---------------------- 1 files changed, 3815 insertions(+), 3815 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0936feebd40437214ee2…

1 0

Piotr Caban : msvcp71: Don't forward _Getcat functions to msvcp80.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 08eab0ed229ded05aba8175433887ffe1b4f52b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08eab0ed229ded05aba817543… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:26:03 2012 +0200 msvcp71: Don't forward _Getcat functions to msvcp80. --- dlls/msvcp71/locale.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 48 +++++++++++++------------- 2 files changed, 109 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08eab0ed229ded05aba81…

1 0

Piotr Caban : msvcp71: Fixed basic_streambuf virtual functions table.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: ca171741d05488c4622123c3cc7dea5da8e1afc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca171741d05488c4622123c3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:47 2012 +0200 msvcp71: Fixed basic_streambuf virtual functions table. --- dlls/msvcp71/ios.c | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index ea07e37..8d15622 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -637,7 +637,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_streambuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_streambuf_char_seekoff) VTABLE_ADD_FUNC(basic_streambuf_char_seekpos) @@ -682,7 +681,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_filebuf_char_underflow) VTABLE_ADD_FUNC(basic_filebuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_filebuf_char_seekoff) VTABLE_ADD_FUNC(basic_filebuf_char_seekpos) @@ -727,7 +725,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(basic_stringbuf_char_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(basic_stringbuf_char_seekoff) VTABLE_ADD_FUNC(basic_stringbuf_char_seekpos) @@ -826,7 +823,6 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(strstreambuf_underflow) VTABLE_ADD_FUNC(basic_streambuf_char_uflow) VTABLE_ADD_FUNC(basic_streambuf_char_xsgetn) - VTABLE_ADD_FUNC(basic_streambuf_char__Xsgetn_s) VTABLE_ADD_FUNC(basic_streambuf_char_xsputn) VTABLE_ADD_FUNC(strstreambuf_seekoff) VTABLE_ADD_FUNC(strstreambuf_seekpos) @@ -1064,8 +1060,6 @@ int __thiscall basic_streambuf_char_uflow(basic_streambuf_char *this) /* ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADIH@Z */ /* ?_Xsgetn_s@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_K_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Xsgetn_s, 16) -#define call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count) CALL_VTBL_FUNC(this, 28, \ - streamsize, (basic_streambuf_char*, char*, MSVCP_size_t, streamsize), (this, ptr, size, count)) streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { streamsize copied, chunk; @@ -1102,7 +1096,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Sgetn_s, 16) streamsize __thiscall basic_streambuf_char__Sgetn_s(basic_streambuf_char *this, char *ptr, MSVCP_size_t size, streamsize count) { TRACE("(%p %p %lu %ld)\n", this, ptr, size, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, size, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, size, count); } /* ?_Unlock@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEXXZ */ @@ -1172,7 +1166,7 @@ locale* __thiscall basic_streambuf_char_getloc(const basic_streambuf_char *this, /* ?imbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEXABVlocale@2@@Z */ /* ?imbue@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAXAEBVlocale@2@@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_imbue, 8) -#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 52, \ +#define call_basic_streambuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 48, \ void, (basic_streambuf_char*, const locale*), (this, loc)) void __thiscall basic_streambuf_char_imbue(basic_streambuf_char *this, const locale *loc) { @@ -1244,7 +1238,7 @@ locale* __thiscall basic_streambuf_char_pubimbue(basic_streambuf_char *this, loc /* ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JHH@Z */ /* ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@_JHH@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekoff, 20) -#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 36, \ +#define call_basic_streambuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 32, \ fpos_int*, (basic_streambuf_char*, fpos_int*, streamoff, int, int), (this, ret, off, way, mode)) fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) @@ -1279,7 +1273,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekoff_old(basic_streambuf_char *t /* ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z */ /* ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_seekpos, 36) -#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 40, \ +#define call_basic_streambuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 36, \ fpos_int*, (basic_streambuf_char*, fpos_int*, fpos_int, int), (this, ret, pos, mode)) fpos_int* __thiscall basic_streambuf_char_seekpos(basic_streambuf_char *this, fpos_int *ret, fpos_int pos, int mode) @@ -1314,7 +1308,7 @@ fpos_int* __thiscall basic_streambuf_char_pubseekpos_old(basic_streambuf_char *t /* ?setbuf@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEPAV12@PADH@Z */ /* ?setbuf@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAPEAV12@PEAD_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_setbuf, 12) -#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 44, \ +#define call_basic_streambuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 40, \ basic_streambuf_char*, (basic_streambuf_char*, char*, streamsize), (this, buf, count)) basic_streambuf_char* __thiscall basic_streambuf_char_setbuf(basic_streambuf_char *this, char *buf, streamsize count) { @@ -1334,7 +1328,7 @@ basic_streambuf_char* __thiscall basic_streambuf_char_pubsetbuf(basic_streambuf_ /* ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ */ /* ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sync, 4) -#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 48, \ +#define call_basic_streambuf_char_sync(this) CALL_VTBL_FUNC(this, 44, \ int, (basic_streambuf_char*), (this)) int __thiscall basic_streambuf_char_sync(basic_streambuf_char *this) { @@ -1357,7 +1351,7 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_sgetn, 12) streamsize __thiscall basic_streambuf_char_sgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); } /* ?showmanyc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ */ @@ -1478,13 +1472,13 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsgetn, 12) streamsize __thiscall basic_streambuf_char_xsgetn(basic_streambuf_char *this, char *ptr, streamsize count) { TRACE("(%p %p %ld)\n", this, ptr, count); - return call_basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); + return basic_streambuf_char__Xsgetn_s(this, ptr, -1, count); } /* ?xsputn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPBDH@Z */ /* ?xsputn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEBD_J@Z */ DEFINE_THISCALL_WRAPPER(basic_streambuf_char_xsputn, 12) -#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 32, \ +#define call_basic_streambuf_char_xsputn(this, ptr, count) CALL_VTBL_FUNC(this, 28, \ streamsize, (basic_streambuf_char*, const char*, streamsize), (this, ptr, count)) streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, const char *ptr, streamsize count) {

1 0

Piotr Caban : msvcp71: Fixed ctype class virtual functions table.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: da0c0c6bd43447d45aecebdd9e0d729e0dee19dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0c0c6bd43447d45aecebdd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:37 2012 +0200 msvcp71: Fixed ctype class virtual functions table. --- dlls/msvcp71/locale.c | 40 +++++++++++----------------------------- 1 files changed, 11 insertions(+), 29 deletions(-) diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index c8fd22e..888a990 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -1366,7 +1366,7 @@ ctype_char* __thiscall ctype_char_vector_dtor(ctype_char *this, unsigned int fla /* ?do_narrow@?$ctype@D@std@@MBEDDD@Z */ /* ?do_narrow@?$ctype@D@std@@MEBADDD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow_ch, 12) -#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 36, \ +#define call_ctype_char_do_narrow_ch(this, ch, unused) CALL_VTBL_FUNC(this, 32, \ char, (const ctype_char*, char, char), (this, ch, unused)) char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char unused) { @@ -1377,7 +1377,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype@D@std@@MBEPBDPBD0DPAD@Z */ /* ?do_narrow@?$ctype@D@std@@MEBAPEBDPEBD0DPEAD@Z */ DEFINE_THISCALL_WRAPPER(ctype_char_do_narrow, 20) -#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 32, \ +#define call_ctype_char_do_narrow(this, first, last, unused, dest) CALL_VTBL_FUNC(this, 28, \ const char*, (const ctype_char*, const char*, const char*, char, char*), \ (this, first, last, unused, dest)) const char* __thiscall ctype_char_do_narrow(const ctype_char *this, @@ -1391,9 +1391,6 @@ const char* __thiscall ctype_char_do_narrow(const ctype_char *this, /* ?_Do_narrow_s@?$ctype@D@std@@MBEPBDPBD0DPADI@Z */ /* ?_Do_narrow_s@?$ctype@D@std@@MEBAPEBDPEBD0DPEAD_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_narrow_s, 24) -#define call_ctype_char__Do_narrow_s(this, first, last, unused, dest, size) CALL_VTBL_FUNC(this, 40, \ - const char*, (const ctype_char*, const char*, const char*, char, char*, MSVCP_size_t), \ - (this, first, last, unused, dest, size)) const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const char *first, const char *last, char unused, char *dest, MSVCP_size_t size) { @@ -1428,7 +1425,7 @@ const char* __thiscall ctype_char__Narrow_s(const ctype_char *this, const char * const char *last, char dflt, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); + return ctype_char__Do_narrow_s(this, first, last, dflt, dest, size); } /* ?do_widen@?$ctype@D@std@@MBEDD@Z */ @@ -1459,9 +1456,6 @@ const char* __thiscall ctype_char_do_widen(const ctype_char *this, /* ?_Do_widen_s@?$ctype@D@std@@MBEPBDPBD0PADI@Z */ /* ?_Do_widen_s@?$ctype@D@std@@MEBAPEBDPEBD0PEAD_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_char__Do_widen_s, 20) -#define call_ctype_char__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 28, \ - const char*, (const ctype_char*, const char*, const char*, char*, MSVCP_size_t), \ - (this, first, last, dest, size)) const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { @@ -1496,7 +1490,7 @@ const char* __thiscall ctype_char__Widen_s(const ctype_char *this, const char *first, const char *last, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_char__Do_widen_s(this, first, last, dest, size); + return ctype_char__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype@D@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ @@ -1988,7 +1982,7 @@ char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char /* ?do_narrow@?$ctype@G@std@@MBEDGD@Z */ /* ?do_narrow@?$ctype@G@std@@MEBADGD@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow_ch, 12) -#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 52, \ +#define call_ctype_wchar_do_narrow_ch(this, ch, dflt) CALL_VTBL_FUNC(this, 48, \ char, (const ctype_wchar*, wchar_t, char), (this, ch, dflt)) char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, char dflt) { @@ -2000,7 +1994,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype@G@std@@MBEPBGPBG0DPAD@Z */ /* ?do_narrow@?$ctype@G@std@@MEBAPEBGPEBG0DPEAD@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar_do_narrow, 20) -#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 48, \ +#define call_ctype_wchar_do_narrow(this, first, last, dflt, dest) CALL_VTBL_FUNC(this, 44, \ const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*), \ (this, first, last, dflt, dest)) const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, @@ -2017,9 +2011,6 @@ const wchar_t* __thiscall ctype_wchar_do_narrow(const ctype_wchar *this, /* ?_Do_narrow_s@?$ctype@G@std@@MBEPBGPBG0DPADI@Z */ /* ?_Do_narrow_s@?$ctype@G@std@@MEBAPEBGPEBG0DPEAD_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_narrow_s, 24) -#define call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size) CALL_VTBL_FUNC(this, 56, \ - const wchar_t*, (const ctype_wchar*, const wchar_t*, const wchar_t*, char, char*, MSVCP_size_t), \ - (this, first, last, dflt, dest, size)) const wchar_t* __thiscall ctype_wchar__Do_narrow_s(const ctype_wchar *this, const wchar_t *first, const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { @@ -2063,7 +2054,7 @@ const wchar_t* __thiscall ctype_wchar__Narrow_s(const ctype_wchar *this, const w const wchar_t *last, char dflt, char *dest, MSVCP_size_t size) { TRACE("(%p %p %p %d %p %lu)\n", this, first, last, dflt, dest, size); - return call_ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size); + return ctype_wchar__Do_narrow_s(this, first, last, dflt, dest, size); } /* _Mbrtowc */ @@ -2182,9 +2173,6 @@ const char* __thiscall ctype_wchar_do_widen(const ctype_wchar *this, /* ?_Do_widen_s@?$ctype@G@std@@MBEPBDPBD0PAGI@Z */ /* ?_Do_widen_s@?$ctype@G@std@@MEBAPEBDPEBD0PEAG_K@Z */ DEFINE_THISCALL_WRAPPER(ctype_wchar__Do_widen_s, 20) -#define call_ctype_wchar__Do_widen_s(this, first, last, dest, size) CALL_VTBL_FUNC(this, 44, \ - const char*, (const ctype_wchar*, const char*, const char*, wchar_t*, MSVCP_size_t), \ - (this, first, last, dest, size)) const char* __thiscall ctype_wchar__Do_widen_s(const ctype_wchar *this, const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) { @@ -2228,7 +2216,7 @@ const char* __thiscall ctype_wchar__Widen_s(const ctype_wchar *this, const char *first, const char *last, wchar_t *dest, MSVCP_size_t size) { TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); - return call_ctype_wchar__Do_widen_s(this, first, last, dest, size); + return ctype_wchar__Do_widen_s(this, first, last, dest, size); } /* ?_Getcat@?$ctype@_W@std@@SAIPAPBVfacet@locale@2@PBV42@@Z */ @@ -8577,10 +8565,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_char_do_toupper_ch) VTABLE_ADD_FUNC(ctype_char_do_widen) VTABLE_ADD_FUNC(ctype_char_do_widen_ch) - VTABLE_ADD_FUNC(ctype_char__Do_widen_s) VTABLE_ADD_FUNC(ctype_char_do_narrow) - VTABLE_ADD_FUNC(ctype_char_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_char__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_char_do_narrow_ch)); __ASM_VTABLE(ctype_wchar, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8593,10 +8579,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(ctype_short, VTABLE_ADD_FUNC(ctype_wchar_vector_dtor) VTABLE_ADD_FUNC(ctype_wchar_do_is) @@ -8609,10 +8593,8 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ctype_wchar_do_toupper_ch) VTABLE_ADD_FUNC(ctype_wchar_do_widen) VTABLE_ADD_FUNC(ctype_wchar_do_widen_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_widen_s) VTABLE_ADD_FUNC(ctype_wchar_do_narrow) - VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch) - VTABLE_ADD_FUNC(ctype_wchar__Do_narrow_s)); + VTABLE_ADD_FUNC(ctype_wchar_do_narrow_ch)); __ASM_VTABLE(codecvt_base, VTABLE_ADD_FUNC(codecvt_base_vector_dtor) VTABLE_ADD_FUNC(codecvt_base_do_always_noconv)

1 0

Piotr Caban : msvp71: Copy source files from msvcp90.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 9cf1910db75e5451b84cbc03820424a81dd46663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf1910db75e5451b84cbc038… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:25:14 2012 +0200 msvp71: Copy source files from msvcp90. --- dlls/msvcp71/Makefile.in | 13 +- dlls/msvcp71/cxx.h | 329 ++ dlls/msvcp71/exception.c | 767 +++ dlls/msvcp71/ios.c |13180 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/locale.c | 8784 ++++++++++++++++++++++++++++++ dlls/msvcp71/math.c | 896 ++++ dlls/msvcp71/memory.c | 338 ++ dlls/msvcp71/misc.c | 221 + dlls/msvcp71/msvcp.h | 469 ++ dlls/msvcp71/msvcp71.c | 402 +-- dlls/msvcp71/string.c | 4421 ++++++++++++++++ 11 files changed, 29504 insertions(+), 316 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9cf1910db75e5451b84cb…

1 0

Piotr Caban : msvcp80: Make some internal variables static.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 9ebc5f047819fce944ddd0c96ac4a42a91f793bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ebc5f047819fce944ddd0c96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 17 10:23:22 2012 +0200 msvcp80: Make some internal variables static. --- dlls/msvcp80/msvcp80.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp80/msvcp80.c b/dlls/msvcp80/msvcp80.c index d42614a..a662848 100644 --- a/dlls/msvcp80/msvcp80.c +++ b/dlls/msvcp80/msvcp80.c @@ -88,19 +88,19 @@ typedef struct { const wchar_t *pos; } basic_string_wchar_reverse_iter; -const struct locale* (CDECL *plocale_classic)(void); -MSVCP_size_t (CDECL *pcollate_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcollate_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcollate_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*); -MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*); +static const struct locale* (CDECL *plocale_classic)(void); +static MSVCP_size_t (CDECL *pcollate_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcollate_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcollate_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pctype_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pcodecvt_short__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_char__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_wchar__Getcat)(const struct locale_facet**,const struct locale*); +static MSVCP_size_t (CDECL *pnumpunct_short__Getcat)(const struct locale_facet**,const struct locale*); static BOOL init_funcs(void) {

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012