wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 369d414d59bb2845a35e5fdd0e1179dee72850f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369d414d59bb2845a35e5fdd0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 12 18:31:47 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/propsheet.c | 2 -- dlls/comctl32/toolbar.c | 3 +-- dlls/comctl32/trackbar.c | 3 +-- dlls/comctl32/treeview.c | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a193082..84b1b7f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3412,7 +3412,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheetInfo* psInfo = (PropSheetInfo*) lParam; WCHAR* strCaption = (WCHAR*)Alloc(MAX_CAPTION_LENGTH*sizeof(WCHAR)); HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL); - LPCPROPSHEETPAGEW ppshpage; int idx; LOGFONTW logFont; @@ -3508,7 +3507,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PSCB_INITIALIZED, (LPARAM)0); idx = psInfo->active_page; - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage; psInfo->active_page = -1; PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1bda0cc..9991683 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1280,7 +1280,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) TBUTTON_INFO *btnPtr; INT x, cx, i, j; RECT rc; - BOOL bWrap, bButtonWrap; + BOOL bButtonWrap; /* When the toolbar window style is not TBSTYLE_WRAPABLE, */ /* no layout is necessary. Applications may use this style */ @@ -1314,7 +1314,6 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) for (i = 0; i < infoPtr->nNumButtons; i++ ) { - bWrap = FALSE; btnPtr[i].fsState &= ~TBSTATE_WRAP; if (btnPtr[i].fsState & TBSTATE_HIDDEN) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 7cdfe71..e81d55f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -822,7 +822,6 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; - HTHEME theme; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -867,7 +866,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase background */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { + if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } else diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5650c46..2b71a3b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3575,12 +3575,11 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_ITEM *editItem = infoPtr->selectedItem; HDC hdc = GetDC(infoPtr->hwndEdit); SIZE sz; - int len; HFONT hFont, hOldFont = 0; infoPtr->bLabelChanged = TRUE; - len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); + GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); /* Select font to get the right dimension of the string */ hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0);

1 0

Aric Stewart : imm32: Implement ImmProcessKey and ImmTranslateMessage.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 43dc41168d776cebd05bffffc17a2ebda33687fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dc41168d776cebd05bffffc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 10:59:01 2008 -0500 imm32: Implement ImmProcessKey and ImmTranslateMessage. --- dlls/imm32/imm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/imm32/imm32.spec | 4 +- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ff6398c..c03d6fd 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -78,6 +78,7 @@ typedef struct tagInputContextData ImmHkl *immKbd; HWND imeWnd; + UINT lastVK; } InputContextData; typedef struct _tagTRANSMSG { @@ -2147,3 +2148,97 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) return TRUE; } + +/*********************************************************************** +* ImmTranslateMessage(IMM32.@) +* ( Undocumented, call internally and from user32.dll ) +*/ +BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) +{ + InputContextData *data; + HIMC imc = ImmGetContext(hwnd); + BYTE state[256]; + UINT scancode; + LPVOID list = 0; + UINT msg_count; + UINT uVirtKey; + static const int list_count = 10; + + TRACE("%p %x '%c' %x\n",hwnd, msg, chr, (UINT)lKeyData); + + if (imc) + data = (InputContextData*)imc; + else + return FALSE; + + if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx) + return FALSE; + + GetKeyboardState(state); + scancode = lKeyData >> 0x10 & 0xff; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD)); + ((DWORD*)list)[0] = list_count; + + if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) + { + if (!is_himc_ime_unicode(data)) + ToAscii(data->lastVK, scancode, state, &chr, 0); + uVirtKey = MAKELONG(data->lastVK,chr); + } + else + uVirtKey = data->lastVK; + + msg_count = data->immKbd->pImeToAsciiEx(uVirtKey, scancode, state, list, 0, imc); + TRACE("%i messages generated\n",msg_count); + if (msg_count && msg_count <= list_count) + { + int i; + LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD)); + + for (i = 0; i < msg_count; i++) + ImmInternalPostIMEMessage(data, msgs[i].message, msgs[i].wParam, msgs[i].lParam); + } + else if (msg_count > list_count) + ImmGenerateMessage(imc); + + HeapFree(GetProcessHeap(),0,list); + + return (msg_count > 0); +} + +/*********************************************************************** +* ImmProcessKey(IMM32.@) +* ( Undocumented, called from user32.dll ) +*/ +BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD unknown) +{ + InputContextData *data; + HIMC imc = ImmGetContext(hwnd); + BYTE state[256]; + + TRACE("%p %p %x %x %x\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown); + + if (imc) + data = (InputContextData*)imc; + else + return FALSE; + + if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) + return FALSE; + + GetKeyboardState(state); + data->lastVK = vKey; + + if (data->immKbd->pImeProcessKey(imc, vKey, lKeyData, state)) + { + WCHAR key; + UINT scancode; + + scancode = lKeyData >> 0x10 & 0xff; + ToUnicodeEx(vKey, scancode, state, &key, 1, 0, hKL); + return ImmTranslateMessage(hwnd, WM_KEYDOWN, key, lKeyData ); + } + + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0ecd1f9..4e0b023 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -72,7 +72,7 @@ @ stub ImmLockImeDpi @ stdcall ImmNotifyIME(long long long long) @ stub ImmPenAuxInput -@ stub ImmProcessKey +@ stdcall ImmProcessKey(long long long long long) @ stub ImmPutImeMenuItemsIntoMappedFile @ stdcall ImmReSizeIMCC(long long) @ stub ImmRegisterClient @@ -99,7 +99,7 @@ @ stub ImmShowSoftKeyboard @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler -@ stub ImmTranslateMessage +@ stdcall ImmTranslateMessage(long long long long) @ stub ImmUnlockClientImc @ stdcall ImmUnlockIMC(long) @ stdcall ImmUnlockIMCC(long)

1 0

Aric Stewart : imm32: All HIMCC in the InputContext should be initialized at creation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 3dde049f31efb63013be2b01f5a08d6457222dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dde049f31efb63013be2b01f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 10:58:42 2008 -0500 imm32: All HIMCC in the InputContext should be initialized at creation. --- dlls/imm32/imm.c | 16 ++++++++++++++-- include/ddk/imm.h | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3ff2228..ff6398c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -496,6 +496,8 @@ BOOL WINAPI ImmConfigureIMEW( HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; + LPGUIDELINE gl; + LPCANDIDATEINFO ci; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); @@ -509,9 +511,19 @@ HIMC WINAPI ImmCreateContext(void) return 0; } - /* hCompStr is never NULL */ + /* the HIMCCs are never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); - new_context->IMC.hMsgBuf = ImmCreateIMCC(1); + new_context->IMC.hMsgBuf = ImmCreateIMCC(0); + new_context->IMC.hCandInfo = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + ci = ImmLockIMCC(new_context->IMC.hCandInfo); + memset(ci,0,sizeof(CANDIDATEINFO)); + ci->dwSize = sizeof(CANDIDATEINFO); + ImmUnlockIMCC(new_context->IMC.hCandInfo); + new_context->IMC.hGuideLine = ImmCreateIMCC(sizeof(GUIDELINE)); + gl = ImmLockIMCC(new_context->IMC.hGuideLine); + memset(gl,0,sizeof(GUIDELINE)); + gl->dwSize = sizeof(GUIDELINE); + ImmUnlockIMCC(new_context->IMC.hGuideLine); /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); diff --git a/include/ddk/imm.h b/include/ddk/imm.h index c492092..ee10b27 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -84,6 +84,24 @@ typedef struct tagCOMPOSITIONSTRING { DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; +typedef struct tagGUIDELINE { + DWORD dwSize; + DWORD dwLevel; + DWORD dwIndex; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} GUIDELINE, *LPGUIDELINE; + +typedef struct tagCANDIDATEINFO { + DWORD dwSize; + DWORD dwCount; + DWORD dwOffset[32]; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} CANDIDATEINFO, *LPCANDIDATEINFO; + LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); BOOL WINAPI ImmUnlockIMC(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC);

1 0

John Klehm : wintab32: Implement WTSetA/W.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 352c98d7d57103b7a5f1bef03eb77ac8a6c98039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352c98d7d57103b7a5f1bef03… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed Apr 9 18:44:36 2008 -0500 wintab32: Implement WTSetA/W. --- dlls/wintab32/context.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 3147ec0..9551d87 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -692,11 +692,21 @@ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) */ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("hCtx=%p, lpLogCtx=%p\n", hCtx, lpLogCtx); - return FALSE; + if (!hCtx || !lpLogCtx) return FALSE; + + /* TODO: if cur process not owner of hCtx only modify + * attribs not locked by owner */ + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + LOGCONTEXTAtoW(lpLogCtx, &context->context); + LeaveCriticalSection(&csTablet); + + return TRUE; } /*********************************************************************** @@ -704,11 +714,21 @@ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) */ BOOL WINAPI WTSetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("hCtx=%p, lpLogCtx=%p\n", hCtx, lpLogCtx); - return FALSE; + if (!hCtx || !lpLogCtx) return FALSE; + + /* TODO: if cur process not hCtx owner only modify + * attribs not locked by owner */ + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + memmove(&context->context, lpLogCtx, sizeof(LOGCONTEXTW)); + LeaveCriticalSection(&csTablet); + + return TRUE; } /***********************************************************************

1 0

Vitaliy Margolen : gphoto2.ds: Add Russian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7a651e1c159852907f5f811d6ce1ee7655f14aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a651e1c159852907f5f811d6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 10:26:24 2008 -0600 gphoto2.ds: Add Russian translation. --- dlls/gphoto2.ds/gphoto2_Ru.rc | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ru.rc b/dlls/gphoto2.ds/gphoto2_Ru.rc new file mode 100644 index 0000000..9ac3c11 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Ru.rc @@ -0,0 +1,52 @@ +/* + * Russian resources for Twain + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "��1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "�� ",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "��",IDC_FETCH,7,252,64,14 + PUSHBUTTON "�� ",IDC_IMPORTALL,80,252,64,14 + CONTROL "�� ",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "��",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "��" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "��.... ��",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "�� " +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "�� ... ��",IDC_STATIC,128,58,116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 9df3c28..5359e66 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -34,5 +34,6 @@ #include "gphoto2_Nl.rc" #include "gphoto2_No.rc" #include "gphoto2_Pl.rc" +#include "gphoto2_Ru.rc" #include "gphoto2_Si.rc" #include "gphoto2_Sv.rc"

1 0

Vitaliy Margolen : Update Russian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a1eb6b7ece916c8457b91657eafc63a0dd3274a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1eb6b7ece916c8457b91657e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 10:26:03 2008 -0600 Update Russian translation. --- programs/notepad/Ru.rc | 2 +- programs/wineconsole/wineconsole_Ru.rc | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index 44152a9..a2184fa 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -28,9 +28,9 @@ MAIN_MENU MENU MENUITEM "&��\tCtrl+S", CMD_SAVE MENUITEM "�� &��...", CMD_SAVE_AS MENUITEM SEPARATOR + MENUITEM "&��...\tCtrl+P", CMD_PRINT MENUITEM "��&�� ...", CMD_PAGE_SETUP MENUITEM "&�� ...", CMD_PRINTER_SETUP - MENUITEM "&��...\tCtrl+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "�&��", CMD_EXIT } diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 3fc25b4..7e1f2ec 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -128,6 +128,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "�� " FONT 8, "MS Shell Dlg" { + GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP

1 0

Vitaliy Margolen : winex11.drv: Send scan code when adjusting modifier key states.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a3b21209b2c07d8d972bf12958792118d2570373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b21209b2c07d8d972bf1295… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 09:16:02 2008 -0600 winex11.drv: Send scan code when adjusting modifier key states. --- dlls/winex11.drv/keyboard.c | 43 ++++++++++++++++++++----------------------- 1 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 882b98c..6aa613f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1242,23 +1242,22 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD * Updates internal state for <vkey>, depending on key <state> under X * */ -static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) +static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DWORD time ) { /* Do something if internal table state != X state for keycode */ - if (((key_state_table[vkey] & 0x80)!=0) != state) + if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) { - DWORD flags = 0; + DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; if (!state) flags |= KEYEVENTF_KEYUP; - if (vkey == VK_RSHIFT || vkey == VK_RCONTROL || vkey == VK_RMENU) flags |= KEYEVENTF_EXTENDEDKEY; TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", - vkey, key_state_table[vkey]); + vkey, key_state_table[vkey & 0xff]); /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( vkey, 0, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); - TRACE("State after %#.2x\n",key_state_table[vkey]); + TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); } } @@ -1273,7 +1272,7 @@ static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) */ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { - int i, j, alt_r = 0, alt_l = 0, control_r = 0, control_l = 0, shift_r = 0, shift_l = 0; + int i, j; DWORD time = GetCurrentTime(); /* the minimum keycode is always greater or equal to 8, so we can @@ -1281,27 +1280,25 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) */ for (i = 1; i < 32; i++) { - if (!event->xkeymap.key_vector[i]) continue; for (j = 0; j < 8; j++) { - if (!(event->xkeymap.key_vector[i] & (1<<j))) continue; - switch(keyc2vkey[(i * 8) + j] & 0xff) + WORD vkey = keyc2vkey[(i * 8) + j]; + WORD scan = keyc2scan[(i * 8) + j]; + int state = (event->xkeymap.key_vector[i] & (1<<j)) != 0; + + switch(vkey & 0xff) { - case VK_LMENU: alt_l = 1; break; - case VK_RMENU: alt_r = 1; break; - case VK_LCONTROL: control_l = 1; break; - case VK_RCONTROL: control_r = 1; break; - case VK_LSHIFT: shift_l = 1; break; - case VK_RSHIFT: shift_r = 1; break; + case VK_LMENU: + case VK_RMENU: + case VK_LCONTROL: + case VK_RCONTROL: + case VK_LSHIFT: + case VK_RSHIFT: + KEYBOARD_UpdateOneState( vkey, scan, state, time ); + break; } } } - KEYBOARD_UpdateOneState( VK_LMENU, alt_l, time ); - KEYBOARD_UpdateOneState( VK_RMENU, alt_r, time ); - KEYBOARD_UpdateOneState( VK_LCONTROL, control_l, time ); - KEYBOARD_UpdateOneState( VK_RCONTROL, control_r, time ); - KEYBOARD_UpdateOneState( VK_LSHIFT, shift_l, time ); - KEYBOARD_UpdateOneState( VK_RSHIFT, shift_r, time ); } static void update_lock_state(BYTE vkey, WORD scan, DWORD time)

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0c6311ea35c99af5af5b50ebf4cc716c77b43141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6311ea35c99af5af5b50ebf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 13 01:48:36 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 384a197..2029336 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -60,9 +60,11 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 + GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,4,244,184 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "Tillat vindusbehandleren � &dekorere vinduer",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.",

1 0

Dmitry Timoshkov : gdi32: Clarify which font doesn't contain 'x'.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2a2c66c0620f9a08be36923da967f281de2b27d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2c66c0620f9a08be36923da… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 13 14:08:44 2008 +0900 gdi32: Clarify which font doesn't contain 'x'. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef250d9..803994b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1518,7 +1518,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) { SelectObject(hdc, hfont_prev); DeleteObject(hfont); - skip("This font doesn't contain 'x', skipping the test\n"); + skip("Font %s doesn't contain 'x', skipping the test\n", lf->lfFaceName); return; }

1 0

Francois Gouget : Spelling fix in the ldt bitfields.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d8c41a25da75d17f5430eb58b3942d68761b87ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c41a25da75d17f5430eb58b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:03:24 2008 +0200 Spelling fix in the ldt bitfields. --- libs/wine/ldt.c | 4 ++-- loader/preloader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index e05a962..c46ff6f 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -52,7 +52,7 @@ struct modify_ldt_s unsigned int read_exec_only : 1; unsigned int limit_in_pages : 1; unsigned int seg_not_present : 1; - unsigned int useable : 1; + unsigned int usable : 1; unsigned int garbage : 25; }; @@ -65,7 +65,7 @@ static inline void fill_modify_ldt_struct( struct modify_ldt_s *ptr, const LDT_E ptr->read_exec_only = !(entry->HighWord.Bits.Type & 2); ptr->limit_in_pages = entry->HighWord.Bits.Granularity; ptr->seg_not_present = !entry->HighWord.Bits.Pres; - ptr->useable = entry->HighWord.Bits.Sys; + ptr->usable = entry->HighWord.Bits.Sys; ptr->garbage = 0; } diff --git a/loader/preloader.c b/loader/preloader.c index 0034e9a..eef0b72 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -178,7 +178,7 @@ struct unsigned int read_exec_only : 1; unsigned int limit_in_pages : 1; unsigned int seg_not_present : 1; - unsigned int useable : 1; + unsigned int usable : 1; unsigned int garbage : 25; } thread_ldt = { -1, (unsigned long)thread_data, 0xfffff, 1, 0, 0, 1, 0, 1, 0 };

1 0

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 April 2008