wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Hwang YunSong : winspool.drv: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: ac2b56162a742b36f2d30fe5a8af55fccb8e17a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2b56162a742b36f2d30fe5a… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:41:46 2011 +0900 winspool.drv: Update Korean resource. --- dlls/winspool.drv/Ko.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/Ko.rc b/dlls/winspool.drv/Ko.rc index f8ac166..8a3279e 100644 --- a/dlls/winspool.drv/Ko.rc +++ b/dlls/winspool.drv/Ko.rc @@ -1,7 +1,7 @@ /* * Korean resources for winspool * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "wspool.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT FILENAME_DIALOG DIALOG 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "��Ϸ� �μ�" +CAPTION "파일로 인쇄" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�� ̸�(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "출력 파일 이름(&O):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END STRINGTABLE { - IDS_CAPTION "�� Ʈ" - IDS_FILE_EXISTS "�� մϴ�. 'Ȯ��'�� ��̴ϴ�." - IDS_CANNOT_OPEN "�� ϴ�." + IDS_CAPTION "지역 포트" + IDS_FILE_EXISTS "출력 파일은 존재합니다. '확인'을 누르면 덮어쓰여질겁니다." + IDS_CANNOT_OPEN "출력 파일을 만들수 없습니다." }

1 0

Hwang YunSong : wininet: Update Korean resource.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e1c71291cc6038c08ba7ca6f1fa215ff7e70c5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c71291cc6038c08ba7ca6f1… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:40:14 2011 +0900 wininet: Update Korean resource. --- dlls/wininet/wininet_Ko.rc | 59 +++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/wininet_Ko.rc b/dlls/wininet/wininet_Ko.rc index 1c4a87b..9bbd489 100644 --- a/dlls/wininet/wininet_Ko.rc +++ b/dlls/wininet/wininet_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2003 Mike McCormack for CodeWeavers - * Copyright 2005,2007,2010 YunSong Hwang + * Copyright 2005,2007,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,49 +19,68 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��Ʈ��ũ ��ȣ �Է�" +CAPTION "네트워크 암호 입력" FONT 9, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻʽÿ�:", -1, 40, 6, 150, 15 - LTEXT "��Ͻ�", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "당신의 사용자 이름과 암호를 입력하십시오:", -1, 40, 6, 150, 15 + LTEXT "프록시", -1, 40, 26, 50, 10 + LTEXT "영역", -1, 40, 46, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S)(�� )", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S)(안전하지 못함)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } IDD_AUTHDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� ʿ�" +CAPTION "인증 필요" FONT 8, "MS Shell Dlg" { - LTEXT "�� ̸�� ȣ�� Է��Ͻʽÿ�:", -1, 40, 6, 150, 15 - LTEXT "��", -1, 40, 26, 50, 10 - LTEXT "��", -1, 40, 46, 50, 10 - LTEXT "��", -1, 40, 66, 50, 10 - LTEXT "��ȣ", -1, 40, 86, 50, 10 + LTEXT "당신의 사용자 이름과 암호를 입력하십시오:", -1, 40, 6, 150, 15 + LTEXT "서버", -1, 40, 26, 50, 10 + LTEXT "영역", -1, 40, 46, 50, 10 + LTEXT "사용자", -1, 40, 66, 50, 10 + LTEXT "암호", -1, 40, 86, 50, 10 LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "��ȣ ��(&S) (�� )", IDC_SAVEPASSWORD, + CHECKBOX "암호 저장(&S) (안전하지 못함)", IDC_SAVEPASSWORD, 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "취소", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "보안 경고" +FONT 8, "MS Shell Dlg" +{ + LTEXT "이 사이트의 인증서에 문제가 있습니다.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "그래도 계속 진행하겠습니까?", -1, 40, 46, 200, 20 + PUSHBUTTON "예", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "아니오", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + + STRINGTABLE { - IDS_LANCONNECTION "�� " + IDS_LANCONNECTION "랜 연결" + IDS_CERT_CA_INVALID "이 인증서는 알 수 없거나 신뢰할 수없는 게시자에 의해 발행되었습니다." + IDS_CERT_DATE_INVALID "이 인증서의 날짜는 올바르지 않습니다." + IDS_CERT_CN_INVALID "이 인증서의 이름이 사이트하고 일치 하지 않습니다." + IDS_CERT_ERRORS "이 인증서에는 최소한 하나의 지정되지 않은 보안 문제가 있습니다." }

1 0

Vitaliy Margolen : dinput: COM cleanup - use interfaces instead of vtbl. Combine both Unicode and ASCII interfaces into the same classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 6b30480021862ea7bb6475b21b3d709f80a9f9e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b30480021862ea7bb6475b21… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:19 2011 -0700 dinput: COM cleanup - use interfaces instead of vtbl. Combine both Unicode and ASCII interfaces into the same classes. --- dlls/dinput/device.c | 8 ++++---- dlls/dinput/device_private.h | 3 ++- dlls/dinput/dinput_main.c | 23 ++++++++++++++++++----- dlls/dinput/joystick.c | 8 ++++---- dlls/dinput/joystick_linux.c | 33 ++++++++++++++++++++++----------- dlls/dinput/joystick_linuxinput.c | 30 ++++++++++++++++++------------ dlls/dinput/joystick_osx.c | 29 ++++++++++++++++++++--------- dlls/dinput/keyboard.c | 31 +++++++++++++++++++++---------- dlls/dinput/mouse.c | 37 +++++++++++++++++++++++++------------ 9 files changed, 134 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b30480021862ea7bb647…

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in joydev joystick.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: e6a8aa67d0481693a8c69d02e9f8d76862a778ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a8aa67d0481693a8c69d02e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:11 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in joydev joystick. --- dlls/dinput/joystick_linux.c | 45 +++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index c7958ae..a858ecd 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -107,6 +107,14 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W { return (JoystickImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed9, @@ -502,14 +510,14 @@ const struct dinput_device joystick_linux_device = { /****************************************************************************** * Acquire : gets exclusive control of the joystick */ -static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI JoystickLinuxWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(%p)\n",This); - res = IDirectInputDevice2AImpl_Acquire(iface); + res = IDirectInputDevice2WImpl_Acquire(iface); if (res != DI_OK) return res; @@ -520,7 +528,7 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) This->joyfd = open(This->joydev->device, O_RDONLY); if (This->joyfd==-1) { ERR("open(%s) failed: %s\n", This->joydev->device, strerror(errno)); - IDirectInputDevice2AImpl_Unacquire(iface); + IDirectInputDevice2WImpl_Unacquire(iface); return DIERR_NOTFOUND; } } @@ -528,17 +536,23 @@ static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } +static HRESULT WINAPI JoystickLinuxAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * Unacquire : frees the joystick */ -static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI JoystickLinuxWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { - JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(%p)\n",This); - res = IDirectInputDevice2AImpl_Unacquire(iface); + res = IDirectInputDevice2WImpl_Unacquire(iface); if (res != DI_OK) return res; @@ -553,6 +567,12 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) return DI_NOEFFECT; } +static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + return JoystickLinuxWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); +} + static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; @@ -665,12 +685,6 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(JoystickWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl JoystickWvt = { IDirectInputDevice2WImpl_QueryInterface, @@ -680,8 +694,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_EnumObjects, JoystickWGenericImpl_GetProperty, JoystickWGenericImpl_SetProperty, - XCAST(Acquire)JoystickLinuxAImpl_Acquire, - XCAST(Unacquire)JoystickLinuxAImpl_Unacquire, + JoystickLinuxWImpl_Acquire, + JoystickLinuxWImpl_Unacquire, JoystickWGenericImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, @@ -706,7 +720,6 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST #else /* HAVE_LINUX_22_JOYSTICK_API */

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in evdev joystick.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: d88cbac1c535f79e56eb4474688c8cd5489eac3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88cbac1c535f79e56eb44746… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:08 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in evdev joystick. --- dlls/dinput/joystick_linuxinput.c | 147 +++++++++++++++++++++++------------- 1 files changed, 94 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d88cbac1c535f79e56eb4…

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in joystick base class. Use new methods in child classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 6a07885029beb3b737806b6cff4cbdd3d498663a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a07885029beb3b737806b6cf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:05 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in joystick base class. Use new methods in child classes. --- dlls/dinput/joystick.c | 80 +++++++++++++++++++++++++------------ dlls/dinput/joystick_linux.c | 10 ++-- dlls/dinput/joystick_linuxinput.c | 6 +- dlls/dinput/joystick_osx.c | 17 ++------ dlls/dinput/joystick_private.h | 17 ++++---- 5 files changed, 76 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a07885029beb3b737806…

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in mouse.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 30ab6c1749bf1435f70f058b2b727ce681b961a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ab6c1749bf1435f70f058b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:44:02 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in mouse. --- dlls/dinput/mouse.c | 116 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 75 insertions(+), 41 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 1b91e84..943c3c8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -86,6 +86,14 @@ static inline SysMouseImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W { return (SysMouseImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM lparam ); @@ -419,16 +427,16 @@ static BOOL dinput_window_check(SysMouseImpl* This) { /****************************************************************************** * Acquire : gets exclusive control of the mouse */ -static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); RECT rect; POINT point; HRESULT res; - + TRACE("(this=%p)\n",This); - if ((res = IDirectInputDevice2AImpl_Acquire(iface)) != DI_OK) return res; + if ((res = IDirectInputDevice2WImpl_Acquire(iface)) != DI_OK) return res; /* Init the mouse state */ GetCursorPos( &point ); @@ -486,17 +494,23 @@ static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_Acquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * Unacquire : frees the mouse */ -static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +static HRESULT WINAPI SysMouseWImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; TRACE("(this=%p)\n",This); - if ((res = IDirectInputDevice2AImpl_Unacquire(iface)) != DI_OK) return res; + if ((res = IDirectInputDevice2WImpl_Unacquire(iface)) != DI_OK) return res; if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { @@ -510,20 +524,25 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) TRACE(" warping mouse back to (%d , %d)\n", This->org_coords.x, This->org_coords.y); SetCursorPos(This->org_coords.x, This->org_coords.y); } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_Unacquire(IDirectInputDevice8W_from_impl(This)); +} + /****************************************************************************** * GetDeviceState : returns the "state" of the mouse. * * For the moment, only the "standard" return structure (DIMOUSESTATE) is * supported. */ -static HRESULT WINAPI SysMouseAImpl_GetDeviceState( - LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr -) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); +static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); if(This->base.acquired == 0) return DIERR_NOTACQUIRED; @@ -554,20 +573,26 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState( This->need_warp = FALSE; } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); +} + /****************************************************************************** * GetDeviceData : gets buffered input data. */ -static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, +static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; - res = IDirectInputDevice2AImpl_GetDeviceData(iface, dodsize, dod, entries, flags); + res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); if (FAILED(res)) return res; /* Check if we need to do a mouse warping */ @@ -584,14 +609,19 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, return res; } +static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, + DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetDeviceData(IDirectInputDevice8W_from_impl(This), dodsize, dod, entries, flags); +} + /****************************************************************************** * GetProperty : get input device properties */ -static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, - LPDIPROPHEADER pdiph) +static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -624,21 +654,25 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, } default: - return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); + return IDirectInputDevice2WImpl_GetProperty(iface, rguid, pdiph); } } - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, REFGUID rguid, LPDIPROPHEADER pdiph) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + /****************************************************************************** * GetCapabilities : get the device capabilities */ -static HRESULT WINAPI SysMouseAImpl_GetCapabilities( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVCAPS lpDIDevCaps) +static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -664,10 +698,16 @@ static HRESULT WINAPI SysMouseAImpl_GetCapabilities( devcaps.dwFFDriverVersion = 0; memcpy(lpDIDevCaps, &devcaps, lpDIDevCaps->dwSize); - + return DI_OK; } +static HRESULT WINAPI SysMouseAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) +{ + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysMouseWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -697,12 +737,13 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) { + SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; DWORD dwSize = pdidoi->dwSize; didoiW.dwSize = sizeof(didoiW); - res = SysMouseWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); + res = SysMouseWImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; memset(pdidoi, 0, pdidoi->dwSize); @@ -786,25 +827,19 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysMouseWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl SysMouseWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, IDirectInputDevice2WImpl_Release, - XCAST(GetCapabilities)SysMouseAImpl_GetCapabilities, + SysMouseWImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - XCAST(GetProperty)SysMouseAImpl_GetProperty, + SysMouseWImpl_GetProperty, IDirectInputDevice2WImpl_SetProperty, - XCAST(Acquire)SysMouseAImpl_Acquire, - XCAST(Unacquire)SysMouseAImpl_Unacquire, - XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState, - XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData, + SysMouseWImpl_Acquire, + SysMouseWImpl_Unacquire, + SysMouseWImpl_GetDeviceState, + SysMouseWImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, @@ -827,4 +862,3 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in keyboard.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 9f9e376239731c859bd7f20e5bcee35ab81b6ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9e376239731c859bd7f20e5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:58 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in keyboard. --- dlls/dinput/keyboard.c | 131 +++++++++++++++++++++++++++--------------------- 1 files changed, 74 insertions(+), 57 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 68d8b47..bdb7a83 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -58,6 +58,14 @@ static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice { return (SysKeyboardImpl *) iface; } +static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysKeyboardImpl *This) +{ + return (IDirectInputDevice8A *)This; +} +static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardImpl *This) +{ + return (IDirectInputDevice8W *)This; +} static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) { @@ -302,11 +310,9 @@ const struct dinput_device keyboard_device = { keyboarddev_create_deviceW }; -static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( - LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr -) +static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); TRACE("(%p)->(%d,%p)\n", This, len, ptr); if (!This->base.acquired) return DIERR_NOTACQUIRED; @@ -330,14 +336,18 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); +} + /****************************************************************************** * GetCapabilities : get the device capabilities */ -static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( - LPDIRECTINPUTDEVICE8A iface, - LPDIDEVCAPS lpDIDevCaps) +static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -346,7 +356,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( WARN("invalid parameter\n"); return DIERR_INVALIDPARAM; } - + devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED; if (This->base.dinput->dwVersion >= 0x0800) @@ -363,10 +373,16 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( devcaps.dwFFDriverVersion = 0; memcpy(lpDIDevCaps, &devcaps, lpDIDevCaps->dwSize); - + return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -450,9 +466,11 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface /****************************************************************************** * GetProperty : Retrieves information about the input device. */ -static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, - REFGUID rguid, LPDIPROPHEADER pdiph) +static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, + REFGUID rguid, LPDIPROPHEADER pdiph) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); @@ -471,72 +489,72 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, didoi.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW); - hr = SysKeyboardWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface , &didoi, - ps->diph.dwObj, ps->diph.dwHow); + hr = SysKeyboardWImpl_GetObjectInfo(iface, &didoi, ps->diph.dwObj, ps->diph.dwHow); if (hr == DI_OK) memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } default: - return IDirectInputDevice2AImpl_GetProperty( iface, rguid, pdiph ); + return IDirectInputDevice2AImpl_GetProperty( IDirectInputDevice8A_from_impl(This), rguid, pdiph ); } return DI_OK; } +static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, + REFGUID rguid, LPDIPROPHEADER pdiph) +{ + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); + return SysKeyboardWImpl_GetProperty(IDirectInputDevice8W_from_impl(This), rguid, pdiph); +} + static const IDirectInputDevice8AVtbl SysKeyboardAvt = { - IDirectInputDevice2AImpl_QueryInterface, - IDirectInputDevice2AImpl_AddRef, - IDirectInputDevice2AImpl_Release, - SysKeyboardAImpl_GetCapabilities, - IDirectInputDevice2AImpl_EnumObjects, - SysKeyboardAImpl_GetProperty, - IDirectInputDevice2AImpl_SetProperty, - IDirectInputDevice2AImpl_Acquire, - IDirectInputDevice2AImpl_Unacquire, - SysKeyboardAImpl_GetDeviceState, - IDirectInputDevice2AImpl_GetDeviceData, - IDirectInputDevice2AImpl_SetDataFormat, - IDirectInputDevice2AImpl_SetEventNotification, - IDirectInputDevice2AImpl_SetCooperativeLevel, - SysKeyboardAImpl_GetObjectInfo, - SysKeyboardAImpl_GetDeviceInfo, - IDirectInputDevice2AImpl_RunControlPanel, - IDirectInputDevice2AImpl_Initialize, - IDirectInputDevice2AImpl_CreateEffect, - IDirectInputDevice2AImpl_EnumEffects, - IDirectInputDevice2AImpl_GetEffectInfo, - IDirectInputDevice2AImpl_GetForceFeedbackState, - IDirectInputDevice2AImpl_SendForceFeedbackCommand, - IDirectInputDevice2AImpl_EnumCreatedEffectObjects, - IDirectInputDevice2AImpl_Escape, - IDirectInputDevice2AImpl_Poll, - IDirectInputDevice2AImpl_SendDeviceData, - IDirectInputDevice7AImpl_EnumEffectsInFile, - IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, - IDirectInputDevice8AImpl_GetImageInfo + IDirectInputDevice2AImpl_QueryInterface, + IDirectInputDevice2AImpl_AddRef, + IDirectInputDevice2AImpl_Release, + SysKeyboardAImpl_GetCapabilities, + IDirectInputDevice2AImpl_EnumObjects, + SysKeyboardAImpl_GetProperty, + IDirectInputDevice2AImpl_SetProperty, + IDirectInputDevice2AImpl_Acquire, + IDirectInputDevice2AImpl_Unacquire, + SysKeyboardAImpl_GetDeviceState, + IDirectInputDevice2AImpl_GetDeviceData, + IDirectInputDevice2AImpl_SetDataFormat, + IDirectInputDevice2AImpl_SetEventNotification, + IDirectInputDevice2AImpl_SetCooperativeLevel, + SysKeyboardAImpl_GetObjectInfo, + SysKeyboardAImpl_GetDeviceInfo, + IDirectInputDevice2AImpl_RunControlPanel, + IDirectInputDevice2AImpl_Initialize, + IDirectInputDevice2AImpl_CreateEffect, + IDirectInputDevice2AImpl_EnumEffects, + IDirectInputDevice2AImpl_GetEffectInfo, + IDirectInputDevice2AImpl_GetForceFeedbackState, + IDirectInputDevice2AImpl_SendForceFeedbackCommand, + IDirectInputDevice2AImpl_EnumCreatedEffectObjects, + IDirectInputDevice2AImpl_Escape, + IDirectInputDevice2AImpl_Poll, + IDirectInputDevice2AImpl_SendDeviceData, + IDirectInputDevice7AImpl_EnumEffectsInFile, + IDirectInputDevice7AImpl_WriteEffectToFile, + IDirectInputDevice8AImpl_BuildActionMap, + IDirectInputDevice8AImpl_SetActionMap, + IDirectInputDevice8AImpl_GetImageInfo }; -#if !defined(__STRICT_ANSI__) && defined(__GNUC__) -# define XCAST(fun) (typeof(SysKeyboardWvt.fun)) -#else -# define XCAST(fun) (void*) -#endif - static const IDirectInputDevice8WVtbl SysKeyboardWvt = { IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_AddRef, IDirectInputDevice2WImpl_Release, - XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, + SysKeyboardWImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - XCAST(GetProperty)SysKeyboardAImpl_GetProperty, + SysKeyboardWImpl_GetProperty, IDirectInputDevice2WImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, - XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState, + SysKeyboardWImpl_GetDeviceState, IDirectInputDevice2WImpl_GetDeviceData, IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, @@ -560,4 +578,3 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice8WImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; -#undef XCAST

1 0

Vitaliy Margolen : dinput: Explicitly define ASCII and Unicode methods in DirectInputDevice base class . Make ASCII methods call Unicode. Use new methods in child classes.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 0f24b9e86fd51d9c6c8b39f4144947c0e8bd2d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f24b9e86fd51d9c6c8b39f41… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:55 2011 -0700 dinput: Explicitly define ASCII and Unicode methods in DirectInputDevice base class. Make ASCII methods call Unicode. Use new methods in child classes. --- dlls/dinput/device.c | 262 +++++++++++++++++++++++++------------ dlls/dinput/device_private.h | 96 +++++++------- dlls/dinput/joystick_linux.c | 50 ++++---- dlls/dinput/joystick_linuxinput.c | 42 +++--- dlls/dinput/joystick_osx.c | 32 +++--- dlls/dinput/keyboard.c | 58 ++++---- dlls/dinput/mouse.c | 30 ++-- 7 files changed, 333 insertions(+), 237 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f24b9e86fd51d9c6c8b3…

1 0

Vitaliy Margolen : dinput: Change internal check_dinput_hooks method to take W iface.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 9594be7f79046fdb10035348f973f90002f08979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9594be7f79046fdb10035348f… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jan 9 15:43:52 2011 -0700 dinput: Change internal check_dinput_hooks method to take W iface. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 12846bf..770a2c9 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -590,7 +590,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) if (res == DI_OK) { This->queue_head = This->queue_tail = This->overflow = 0; - check_dinput_hooks(iface); + check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); } LeaveCriticalSection(&This->crit); @@ -610,7 +610,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; if (res == DI_OK) - check_dinput_hooks(iface); + check_dinput_hooks((LPDIRECTINPUTDEVICE8W)iface); LeaveCriticalSection(&This->crit); return res; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 646a4f8..14f7ca8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1093,7 +1093,7 @@ static BOOL check_hook_thread(void) return hook_thread_id != 0; } -void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface) +void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) { static HHOOK callwndproc_hook; static ULONG foreground_cnt; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index b2b4c00..73f3049 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -60,7 +60,7 @@ extern const struct dinput_device joystick_linux_device; extern const struct dinput_device joystick_linuxinput_device; extern const struct dinput_device joystick_osx_device; -extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8A); +extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W); typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
88
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 January 2011