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

Alexandre Julliard : winex11: Add a critical section to protect the keyboard mapping tables.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 26fb3d4a69d3d63d79442bb782db9a946118eba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fb3d4a69d3d63d79442bb78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:43:19 2012 +0200 winex11: Add a critical section to protect the keyboard mapping tables. --- dlls/winex11.drv/keyboard.c | 292 +++++++++++++++++++++---------------------- 1 files changed, 143 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26fb3d4a69d3d63d79442…

1 0

Alexandre Julliard : winex11: Remove the remaining X11 locking calls.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: cf1be58706ef617215641e2d43f9bb70d9b68b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1be58706ef617215641e2d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:46:37 2012 +0200 winex11: Remove the remaining X11 locking calls. --- dlls/winex11.drv/brush.c | 6 ++-- dlls/winex11.drv/clipboard.c | 51 ++++++--------------------------------- dlls/winex11.drv/desktop.c | 5 ---- dlls/winex11.drv/event.c | 17 +------------ dlls/winex11.drv/mouse.c | 24 ++++--------------- dlls/winex11.drv/systray.c | 2 - dlls/winex11.drv/window.c | 48 ++++++++----------------------------- dlls/winex11.drv/wintab.c | 8 ------ dlls/winex11.drv/x11drv_main.c | 16 ++---------- dlls/winex11.drv/xdnd.c | 6 +--- dlls/winex11.drv/xim.c | 30 ++++------------------- dlls/winex11.drv/xinerama.c | 4 --- dlls/winex11.drv/xrandr.c | 30 +++++------------------ dlls/winex11.drv/xvidmode.c | 2 - 14 files changed, 44 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1be58706ef617215641…

1 0

Alexandre Julliard : wined3d: Remove references to the (no longer used) X11 lock.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 3bd185c3df38509b1ee71cebf4cf2373cdf792f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd185c3df38509b1ee71cebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:16 2012 +0200 wined3d: Remove references to the (no longer used) X11 lock. --- dlls/wined3d/wined3d_main.c | 20 -------------------- dlls/wined3d/wined3d_private.h | 13 ------------- 2 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index fb8493c..2247e9c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,10 +48,6 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; -int num_lock = 0; -void (CDECL *wine_tsx11_lock_ptr)(void) = NULL; -void (CDECL *wine_tsx11_unlock_ptr)(void) = NULL; - static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { @@ -132,14 +128,9 @@ static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DW return ERROR_FILE_NOT_FOUND; } -static void CDECL wined3d_do_nothing(void) -{ -} - static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; - HMODULE mod; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); HKEY hkey = 0; @@ -183,17 +174,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DisableThreadLibraryCalls(hInstDLL); - mod = GetModuleHandleA( "winex11.drv" ); - if (mod) - { - wine_tsx11_lock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_lock" ); - wine_tsx11_unlock_ptr = (void *)GetProcAddress( mod, "wine_tsx11_unlock" ); - } - else /* We are most likely on Windows */ - { - wine_tsx11_lock_ptr = wined3d_do_nothing; - wine_tsx11_unlock_ptr = wined3d_do_nothing; - } /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c0b00bf..c23a6fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -784,21 +784,8 @@ extern const struct wined3d_shader_backend_ops glsl_shader_backend DECLSPEC_HIDD extern const struct wined3d_shader_backend_ops arb_program_shader_backend DECLSPEC_HIDDEN; extern const struct wined3d_shader_backend_ops none_shader_backend DECLSPEC_HIDDEN; -/* X11 locking */ - -extern void (CDECL *wine_tsx11_lock_ptr)(void) DECLSPEC_HIDDEN; -extern void (CDECL *wine_tsx11_unlock_ptr)(void) DECLSPEC_HIDDEN; - -/* As GLX relies on X, this is needed */ -extern int num_lock DECLSPEC_HIDDEN; - -#if 0 -#define ENTER_GL() wine_tsx11_lock_ptr() -#define LEAVE_GL() wine_tsx11_unlock_ptr() -#else #define ENTER_GL() do {} while(0) #define LEAVE_GL() do {} while(0) -#endif /***************************************************************************** * Defines

1 0

Alexandre Julliard : winex11: Get rid of the X11 locking functions.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 9980868b81844528f3c3610d67e0be45b218f23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9980868b81844528f3c3610d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 16 16:52:31 2012 +0200 winex11: Get rid of the X11 locking functions. --- dlls/winex11.drv/winex11.drv.spec | 4 ---- dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/x11drv_main.c | 26 -------------------------- 3 files changed, 0 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 038c3e4..5b64dd7 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -61,10 +61,6 @@ @ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo @ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW -# X11 locks -@ cdecl -norelay wine_tsx11_lock() -@ cdecl -norelay wine_tsx11_unlock() - # Desktop @ cdecl wine_create_desktop(long long) X11DRV_create_desktop diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3aaedef..8566cd2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -63,9 +63,6 @@ typedef int Status; #define WINE_XDND_VERSION 4 -extern void CDECL wine_tsx11_lock(void); -extern void CDECL wine_tsx11_unlock(void); - /* X physical pen */ typedef struct { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f3c9d3f..0f94716 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -56,15 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); WINE_DECLARE_DEBUG_CHANNEL(synchronous); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static CRITICAL_SECTION X11DRV_CritSection; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &X11DRV_CritSection, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": X11DRV_CritSection") } -}; -static CRITICAL_SECTION X11DRV_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 }; - static Screen *screen; Visual *visual; XPixmapFormatValues **pixmap_formats; @@ -300,23 +291,6 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) } /*********************************************************************** - * wine_tsx11_lock (X11DRV.@) - */ -void CDECL wine_tsx11_lock(void) -{ - EnterCriticalSection( &X11DRV_CritSection ); -} - -/*********************************************************************** - * wine_tsx11_unlock (X11DRV.@) - */ -void CDECL wine_tsx11_unlock(void) -{ - LeaveCriticalSection( &X11DRV_CritSection ); -} - - -/*********************************************************************** * init_pixmap_formats */ static void init_pixmap_formats( Display *display )

1 0

Francois Gouget : msvcp90: Make basic_istream_read_str() static.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 0b8fc03379dadc117b8ee39d03784a8a43367425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8fc03379dadc117b8ee39d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 13:39:24 2012 +0200 msvcp90: Make basic_istream_read_str() static. --- dlls/msvcp90/ios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 14e852d..cfef2f7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -9574,7 +9574,7 @@ basic_istream_wchar* __cdecl basic_istream_short_read_bstr( basic_istream_wchar_get_basic_ios(istream)->strbuf->loc)); } -basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype) +static basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_t *str, const ctype_wchar *ctype) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); IOSB_iostate state = IOSTATE_failbit;

1 0

Francois Gouget : gdiplus/tests: Make pixels_to_units() static.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 1051a107a47a6a3f0927ad196c7ab914bf6a3d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1051a107a47a6a3f0927ad196… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 16 13:39:30 2012 +0200 gdiplus/tests: Make pixels_to_units() static. --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1c6ef6e..ded80be 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -59,7 +59,7 @@ static REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) } /* converts value in pixels to a given unit */ -REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) +static REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) { switch (unit) {

1 0

Piotr Caban : msvcp100: Copy source files from msvcp90.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 4fe6e583752915161142089c3c0d916eefde5ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe6e583752915161142089c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:35:15 2012 +0200 msvcp100: Copy source files from msvcp90. --- dlls/msvcp100/Makefile.in | 12 +- dlls/msvcp100/cxx.h | 224 + dlls/msvcp100/exception.c | 759 +++ dlls/msvcp100/ios.c |13037 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/locale.c | 8755 ++++++++++++++++++++++++++++++ dlls/msvcp100/math.c | 896 ++++ dlls/msvcp100/memory.c | 338 ++ dlls/msvcp100/misc.c | 221 + dlls/msvcp100/msvcp.h | 467 ++ dlls/msvcp100/msvcp100.c | 93 +- dlls/msvcp100/string.c | 4473 ++++++++++++++++ 11 files changed, 29250 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fe6e5837529151611420…

1 0

Piotr Caban : msvcp100: Fixed streamoff and streamsize definition.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 6b5e9e3e3f45fa9f700f6d1904c82a21b3ffd0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5e9e3e3f45fa9f700f6d190… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:35:36 2012 +0200 msvcp100: Fixed streamoff and streamsize definition. --- dlls/msvcp100/ios.c | 232 ++++++++++++++++++++++++------------------------ dlls/msvcp100/msvcp.h | 4 +- dlls/msvcp90/ios.c | 2 +- 3 files changed, 119 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5e9e3e3f45fa9f700f6…

1 0

Piotr Caban : msvcp100: Fixed basic_streambuf virtual functions table.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 197de8d6ece36c7e3a7058b4b1931608bbea26cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=197de8d6ece36c7e3a7058b4b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:36:04 2012 +0200 msvcp100: Fixed basic_streambuf virtual functions table. --- dlls/msvcp100/ios.c | 90 +++++++++++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=197de8d6ece36c7e3a705…

1 0

Piotr Caban : msvcp100: Fixed ctype class virtual functions table.
by Alexandre Julliard 16 Aug '12

16 Aug '12

Module: wine Branch: master Commit: 0446d426ad4ab8c055e60c86a8612ba720274687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0446d426ad4ab8c055e60c86a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 16 10:36:17 2012 +0200 msvcp100: Fixed ctype class virtual functions table. --- dlls/msvcp100/locale.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 58068c9..fedaea2 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -1372,7 +1372,7 @@ ctype_char* __thiscall MSVCP_ctype_char_vector_dtor(ctype_char *this, unsigned i /* ?do_narrow@?$ctype(a)D@std@@MBEDDD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBADDD(a)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) { @@ -1383,7 +1383,7 @@ char __thiscall ctype_char_do_narrow_ch(const ctype_char *this, char ch, char un /* ?do_narrow@?$ctype(a)D@std@@MBEPBDPBD0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)D@std@@MEBAPEBDPEBD0DPEAD(a)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, @@ -2000,7 +2000,7 @@ char __thiscall ctype_wchar__Donarrow(const ctype_wchar *this, wchar_t ch, char /* ?do_narrow@?$ctype(a)G@std@@MBEDGD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBADGD(a)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) { @@ -2012,7 +2012,7 @@ char __thiscall ctype_wchar_do_narrow_ch(const ctype_wchar *this, wchar_t ch, ch /* ?do_narrow@?$ctype(a)G@std@@MBEPBGPBG0DPAD(a)Z */ /* ?do_narrow@?$ctype(a)G@std@@MEBAPEBGPEBG0DPEAD(a)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, @@ -8590,10 +8590,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_do_is) VTABLE_ADD_FUNC(ctype_wchar_do_is_ch) @@ -8605,10 +8603,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_do_is) VTABLE_ADD_FUNC(ctype_wchar_do_is_ch) @@ -8620,10 +8616,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_do_always_noconv) VTABLE_ADD_FUNC(codecvt_base_do_max_length)

1 0