April 2008 - Wine-commits - list.winehq.org

Aric Stewart : imm32: Semi-stub implement ImmGetConversionList using loaded IME.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: f9414028cae05fdbd6abae02a57290b7ced81dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9414028cae05fdbd6abae02a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 9 09:41:43 2008 -0500 imm32: Semi-stub implement ImmGetConversionList using loaded IME. --- dlls/imm32/imm.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7bbb489..7f17b6f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1027,11 +1027,22 @@ DWORD WINAPI ImmGetConversionListA( LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %d, %d): stub\n", - hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst, + dwBufLen, uFlag); + if (immHkl->hIME && immHkl->pImeConversionList) + { + if (!is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConversionList(hIMC,(LPCWSTR)pSrc,lpDst,dwBufLen,uFlag); + else + { + FIXME("A procedure called with W ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /*********************************************************************** @@ -1042,11 +1053,22 @@ DWORD WINAPI ImmGetConversionListW( LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %d, %d): stub\n", - hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ImmHkl *immHkl = IMM_GetImmHkl(hKL); + TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst, + dwBufLen, uFlag); + if (immHkl->hIME && immHkl->pImeConversionList) + { + if (is_kbd_ime_unicode(immHkl)) + return immHkl->pImeConversionList(hIMC,pSrc,lpDst,dwBufLen,uFlag); + else + { + FIXME("W procedure called with A ime back end\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } + } + else + return 0; } /***********************************************************************

1 0

Dmitry Timoshkov : wineconsole: Fix Win64 warning.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 888d157bdaf0e3c45c550db4e77338acd2c9ba7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=888d157bdaf0e3c45c550db4e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 9 21:23:29 2008 +0900 wineconsole: Fix Win64 warning. --- programs/wineconsole/wineconsole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index a78e076..bdb695d 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -304,7 +304,7 @@ int WINECON_GrabChanges(struct inner_data* data) h = wine_server_call_err( req ) ? 0 : (HANDLE)reply->handle; } SERVER_END_REQ; - WINE_TRACE(" active(%d)", (int)h); + WINE_TRACE(" active(%p)", h); if (h) { CloseHandle(data->hConOut);

1 0

Dmitry Timoshkov : winefile: Fix Win64 warnings.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: cde3101b8e9bd7ebe44c9d16d7c02ae013cc7838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde3101b8e9bd7ebe44c9d16d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 9 21:23:47 2008 +0900 winefile: Fix Win64 warnings. --- programs/winefile/winefile.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index ec9b8b5..d21f595 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2406,7 +2406,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_EXECUTE), hwnd, ExecuteDialogDlgProc, (LPARAM)&dlg) == IDOK) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, dlg.cmd/*file*/, NULL/*parameters*/, NULL/*dir*/, dlg.cmdshow); - if ((int)hinst <= 32) + if (PtrToUlong(hinst) <= 32) display_error(hwnd, GetLastError()); } break;} @@ -2598,13 +2598,13 @@ static void resize_tree(ChildWnd* child, int cx, int cy) #ifndef _NO_EXTENSIONS -static HWND create_header(HWND parent, Pane* pane, int id) +static HWND create_header(HWND parent, Pane* pane, UINT id) { HD_ITEM hdi; int idx; HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ|HDS_FULLDRAG/*TODO: |HDS_BUTTONS + sort orders*/, - 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); + 0, 0, 0, 0, parent, (HMENU)ULongToHandle(id), Globals.hInstance, 0); if (!hwnd) return 0; @@ -2952,7 +2952,7 @@ static void set_space_status(void) static WNDPROC g_orgTreeWndProc; -static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, LPCTSTR pattern, int filter_flags) +static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, LPCTSTR pattern, int filter_flags) { static const TCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; @@ -2960,8 +2960,8 @@ static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, L Entry* entry = pane->root; pane->hwnd = CreateWindow(sListBox, sEmpty, WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL| - LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY, - 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); + LBS_DISABLENOSCROLL|LBS_NOINTEGRALHEIGHT|LBS_OWNERDRAWFIXED|LBS_NOTIFY, + 0, 0, 0, 0, parent, (HMENU)ULongToHandle(id), Globals.hInstance, 0); SetWindowLongPtr(pane->hwnd, GWLP_USERDATA, (LPARAM)pane); g_orgTreeWndProc = (WNDPROC) SetWindowLongPtr(pane->hwnd, GWLP_WNDPROC, (LPARAM)TreeWndProc); @@ -3936,7 +3936,7 @@ static BOOL launch_file(HWND hwnd, LPCTSTR cmd, UINT nCmdShow) { HINSTANCE hinst = ShellExecute(hwnd, NULL/*operation*/, cmd, NULL/*parameters*/, NULL/*dir*/, nCmdShow); - if ((int)hinst <= 32) { + if (PtrToUlong(hinst) <= 32) { display_error(hwnd, GetLastError()); return FALSE; } @@ -4780,7 +4780,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) /* create main window */ - Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)Globals.hframeClass, RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowEx(0, MAKEINTRESOURCE(Globals.hframeClass), RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, opts.start_x, opts.start_y, opts.width, opts.height, hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/);

1 0

Dmitry Timoshkov : wordpad: Fix Win64 warnings.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 2c8476a078df489cd0446cfe7b9faf4c6de6b494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8476a078df489cd0446cfe7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 9 21:24:27 2008 +0900 wordpad: Fix Win64 warnings. --- programs/wordpad/print.c | 6 +++--- programs/wordpad/registry.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 2a44132..aa9ac71 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -85,7 +85,7 @@ void registry_read_pagemargins(HKEY hKey) } } -static void AddTextButton(HWND hRebarWnd, int string, int command, int id) +static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id) { REBARBANDINFOW rb; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE); @@ -95,7 +95,7 @@ static void AddTextButton(HWND hRebarWnd, int string, int command, int id) LoadStringW(hInstance, string, text, MAX_STRING_LEN); hButton = CreateWindowW(WC_BUTTONW, text, WS_VISIBLE | WS_CHILD, 5, 5, 100, 15, - hRebarWnd, (HMENU)command, hInstance, NULL); + hRebarWnd, (HMENU)ULongToHandle(command), hInstance, NULL); rb.cbSize = sizeof(rb); rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_ID; @@ -702,7 +702,7 @@ LRESULT print_preview(HWND hMainWnd) if(preview.hdc2) { - if((int)preview.hdc2 != -1) + if(preview.hdc2 != (HDC)-1) DeleteDC(preview.hdc2); preview.hdc2 = CreateCompatibleDC(hdc); } diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index aef152a..b8e5283 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -223,7 +223,7 @@ void registry_read_filelist(HWND hMainWnd) != ERROR_SUCCESS) break; - mi.dwItemData = (DWORD)pFile[i]; + mi.dwItemData = (ULONG_PTR)pFile[i]; wsprintfW(itemText, numFormat, i+1); lstrcpyW(buffer, pFile[i]);

1 0

Mikołaj Zalewski : qedit/tests: Fix dependency.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 7656d8860ea86c7d7c0c45ed57ac594d9d93f32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7656d8860ea86c7d7c0c45ed5… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 9 13:21:31 2008 +0200 qedit/tests: Fix dependency. --- dlls/qedit/tests/qedit.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/qedit.rc b/dlls/qedit/tests/qedit.rc index a0b8b80..733beac 100644 --- a/dlls/qedit/tests/qedit.rc +++ b/dlls/qedit/tests/qedit.rc @@ -22,5 +22,5 @@ /* @makedep: test.avi */ TEST_AVI_RES AVI_RES_TYPE test.avi -/* @makedep: sound_test.avi */ +/* @makedep: test_sound.avi */ TEST_SOUND_AVI_RES AVI_RES_TYPE test_sound.avi

1 0

Dmitry Timoshkov : regedit: Fix Win64 warnings.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: a5816064f04a6bf138dbfd28f293522b2a6f4c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5816064f04a6bf138dbfd28f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 9 21:22:42 2008 +0900 regedit: Fix Win64 warnings. --- programs/regedit/listview.c | 10 +++++----- programs/regedit/main.c | 2 +- programs/regedit/main.h | 4 ++-- programs/regedit/treeview.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4798b51..4e2010f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -43,7 +43,7 @@ typedef struct tagLINE_INFO */ static WNDPROC g_orgListWndProc; -static DWORD g_columnToSort = ~0UL; +static DWORD g_columnToSort = ~0U; static BOOL g_invertSort = FALSE; static LPTSTR g_valueName; static LPTSTR g_currentPath; @@ -327,7 +327,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor if (!l->name) return -1; if (!r->name) return +1; - if (g_columnToSort == ~0UL) + if (g_columnToSort == ~0U) g_columnToSort = 0; if (g_columnToSort == 1 && l->dwValType != r->dwValType) @@ -454,7 +454,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR } -HWND CreateListView(HWND hwndParent, int id) +HWND CreateListView(HWND hwndParent, UINT id) { RECT rcClient; HWND hwndLV; @@ -467,7 +467,7 @@ HWND CreateListView(HWND hwndParent, int id) hwndLV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, _T("List View"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); if (!hwndLV) return NULL; SendMessage(hwndLV, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); @@ -510,7 +510,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR highli free(((LINE_INFO*)item.lParam)->name); HeapFree(GetProcessHeap(), 0, (void*)item.lParam); } - g_columnToSort = ~0UL; + g_columnToSort = ~0U; SendMessage( hwndLV, LVM_DELETEALLITEMS, 0, 0L ); /* get size information and resize the buffers if necessary */ diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 4a6b0ce..2b95287 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -118,7 +118,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) DWORD dwError = GetLastError(); } */ - hFrameWnd = CreateWindowEx(0, (LPCTSTR)(int)hFrameWndClass, szTitle, + hFrameWnd = CreateWindowEx(0, MAKEINTRESOURCE(hFrameWndClass), szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index a2a3c19..0c39101 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -106,7 +106,7 @@ extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); /* listview.c */ -extern HWND CreateListView(HWND hwndParent, int id); +extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR highlightValue); extern HWND StartValueRename(HWND hwndLV); extern LPCTSTR GetValueName(HWND hwndLV); @@ -114,7 +114,7 @@ extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Res extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); +extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id); extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 7a21f0d..bfce4aa 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -650,7 +650,7 @@ BOOL OnTreeExpanding(HWND hwndTV, NMTREEVIEW* pnmtv) * Returns the handle to the new control if successful, or NULL otherwise. * hwndParent - handle to the control's parent window. */ -HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id) +HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, UINT id) { RECT rcClient; HWND hwndTV; @@ -660,7 +660,7 @@ HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id) hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, _T("Tree View"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, (HMENU)ULongToHandle(id), hInst, NULL); /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) { DestroyWindow(hwndTV);

1 0

Dmitry Timoshkov : wineboot: Fix Win64 warnings.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: b9f78daf71e5411c33495838314aead8515d563a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f78daf71e5411c334958383… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 9 21:23:06 2008 +0900 wineboot: Fix Win64 warnings. --- programs/wineboot/wineboot.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 859e91f..5ea0f8d 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -637,7 +637,6 @@ static BOOL ProcessStartupItems(void) { BOOL ret = FALSE; HRESULT hr; - int iRet; IMalloc *ppM = NULL; IShellFolder *psfDesktop = NULL, *psfStartup = NULL; LPITEMIDLIST pidlStartup = NULL, pidlItem; @@ -695,8 +694,13 @@ static BOOL ProcessStartupItems(void) if (FAILED(hr)) WINE_TRACE("Unable to parse display name.\n"); else - if ((iRet = (int)ShellExecuteW(NULL, NULL, wszCommand, NULL, NULL, SW_SHOWNORMAL)) <= 32) - WINE_WARN("Error %d executing command %s.\n", iRet, wine_dbgstr_w(wszCommand)); + { + HINSTANCE hinst; + + hinst = ShellExecuteW(NULL, NULL, wszCommand, NULL, NULL, SW_SHOWNORMAL); + if (PtrToUlong(hinst) <= 32) + WINE_WARN("Error %p executing command %s.\n", hinst, wine_dbgstr_w(wszCommand)); + } } IMalloc_Free(ppM, pidlItem);

1 0

Alexandre Julliard : winex11: Fix KeymapNotify handler to take left/ right modifiers into account.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: dc1ee0d1429722d88c98f6111f5b38d4ed99e72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1ee0d1429722d88c98f6111… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 16:25:15 2008 +0200 winex11: Fix KeymapNotify handler to take left/right modifiers into account. --- dlls/winex11.drv/keyboard.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 4be6336..587ff2a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1274,11 +1274,16 @@ static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) /* Do something if internal table state != X state for keycode */ if (((key_state_table[vkey] & 0x80)!=0) != state) { + DWORD flags = 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]); /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( vkey, 0, state? 0 : KEYEVENTF_KEYUP, time, 0, 0 ); + X11DRV_send_keyboard_input( vkey, 0, flags, time, 0, 0 ); TRACE("State after %#.2x\n",key_state_table[vkey]); } @@ -1295,10 +1300,9 @@ static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) */ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { - int i, j, alt, control, shift; + int i, j, alt_r = 0, alt_l = 0, control_r = 0, control_l = 0, shift_r = 0, shift_l = 0; DWORD time = GetCurrentTime(); - alt = control = shift = 0; /* the minimum keycode is always greater or equal to 8, so we can * skip the first 8 values, hence start at 1 */ @@ -1310,15 +1314,21 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) if (!(event->xkeymap.key_vector[i] & (1<<j))) continue; switch(keyc2vkey[(i * 8) + j] & 0xff) { - case VK_MENU: alt = 1; break; - case VK_CONTROL: control = 1; break; - case VK_SHIFT: shift = 1; break; + 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; } } } - KEYBOARD_UpdateOneState( VK_MENU, alt, time ); - KEYBOARD_UpdateOneState( VK_CONTROL, control, time ); - KEYBOARD_UpdateOneState( VK_SHIFT, shift, time ); + 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

Alexandre Julliard : winex11: Get rid of the useless systray hidden flag.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 740b0e646b37b49de1989195a0fe45f74c415438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=740b0e646b37b49de1989195a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 16:22:57 2008 +0200 winex11: Get rid of the useless systray hidden flag. --- dlls/winex11.drv/systray.c | 33 +++++++++++---------------------- 1 files changed, 11 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 25d0e60..460fd47 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -55,7 +55,6 @@ struct tray_icon HWND tooltip; /* Icon tooltip */ UINT id; /* the unique id given by the app */ UINT callback_message; - BOOL hidden; /* icon display state */ WCHAR tiptext[128]; /* Tooltip text. If empty => tooltip disabled */ }; @@ -259,14 +258,12 @@ static BOOL hide_icon( struct tray_icon *icon ) { TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); - if (!icon->window || icon->hidden) return TRUE; /* already hidden */ + if (!icon->window) return TRUE; /* already hidden */ - if (icon->window) - { - DestroyWindow(icon->window); - DestroyWindow(icon->tooltip); - } - icon->hidden = TRUE; + DestroyWindow(icon->window); + DestroyWindow(icon->tooltip); + icon->window = 0; + icon->tooltip = 0; return TRUE; } @@ -279,7 +276,7 @@ static BOOL show_icon( struct tray_icon *icon ) TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); - if (icon->window && !icon->hidden) return TRUE; /* already shown */ + if (icon->window) return TRUE; /* already shown */ if (!class_registered) { @@ -315,7 +312,6 @@ static BOOL show_icon( struct tray_icon *icon ) dock_systray_window( icon->window, systray_window ); SetTimer( icon->window, 1, 1000, NULL ); ShowWindow( icon->window, SW_SHOWNA ); - icon->hidden = FALSE; return TRUE; } @@ -330,15 +326,11 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) else show_icon( icon ); } - /* startup case*/ - if (!icon->window && !icon->hidden) show_icon( icon ); - if (nid->uFlags & NIF_ICON) { if (icon->image) DestroyIcon(icon->image); icon->image = CopyIcon(nid->hIcon); - - if (!icon->hidden) + if (icon->window) { struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); @@ -352,8 +344,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) if (nid->uFlags & NIF_TIP) { lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); - if (!icon->hidden) - update_tooltip_text(icon); + if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { @@ -387,11 +378,9 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) list_add_tail(&icon_list, &icon->entry); - /* - * Both icon->window and icon->hidden are zero. modify_icon function - * will treat this case as a startup, i.e. icon window will be created if - * NIS_HIDDEN flag is not set. - */ + /* if hidden state is specified, modify_icon will take care of it */ + if (!((nid->uFlags & NIF_STATE) && (nid->dwStateMask & NIS_HIDDEN))) + show_icon( icon ); return modify_icon( icon, nid ); }

1 0

Alexandre Julliard : winex11: Add some generic support for XEMBED client windows.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: a0ac99c5360a0d65400f974a3143cddf517db014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ac99c5360a0d65400f974a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 9 15:46:33 2008 +0200 winex11: Add some generic support for XEMBED client windows. --- dlls/winex11.drv/systray.c | 18 +---------- dlls/winex11.drv/winpos.c | 71 +++++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 4 ++ 3 files changed, 66 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 347e5a7..25d0e60 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -69,8 +69,6 @@ static BOOL delete_icon( struct tray_icon *icon ); #define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_CANCEL_MESSAGE 2 -#define XEMBED_MAPPED (1 << 0) - #define ICON_BORDER 2 /* retrieves icon record by owner window and ID */ @@ -228,23 +226,13 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) struct x11drv_win_data *data; XEvent ev; XSetWindowAttributes attr; - unsigned long info[2]; if (!(data = X11DRV_get_win_data( hwnd )) && !(data = X11DRV_create_win_data( hwnd ))) return; TRACE( "icon window %p/%lx managed %u\n", data->hwnd, data->whole_window, data->managed ); - /* the window _cannot_ be mapped if we intend to dock with an XEMBED tray */ - assert( !data->mapped ); - - /* set XEMBED protocol data on the window */ - info[0] = 0; /* protocol version */ - info[1] = XEMBED_MAPPED; /* flags */ - - wine_tsx11_lock(); - XChangeProperty( display, data->whole_window, x11drv_atom(_XEMBED_INFO), - x11drv_atom(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*)info, 2 ); + make_window_embedded( display, data ); /* send the docking request message */ ev.xclient.type = ClientMessage; @@ -256,15 +244,13 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) ev.xclient.data.l[2] = data->whole_window; ev.xclient.data.l[3] = 0; ev.xclient.data.l[4] = 0; + wine_tsx11_lock(); XSendEvent( display, systray_window, False, NoEventMask, &ev ); attr.background_pixmap = ParentRelative; attr.bit_gravity = ForgetGravity; XChangeWindowAttributes( display, data->whole_window, CWBackPixmap | CWBitGravity, &attr ); XChangeWindowAttributes( display, data->client_window, CWBackPixmap | CWBitGravity, &attr ); wine_tsx11_unlock(); - - data->mapped = TRUE; - data->wm_state = NormalState; } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 9314027..2ae0aba 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -205,18 +205,41 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data /*********************************************************************** + * set_xembed_flags + */ +static void set_xembed_flags( Display *display, struct x11drv_win_data *data, unsigned long flags ) +{ + unsigned long info[2]; + + info[0] = 0; /* protocol version */ + info[1] = flags; + wine_tsx11_lock(); + XChangeProperty( display, data->whole_window, x11drv_atom(_XEMBED_INFO), + x11drv_atom(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*)info, 2 ); + wine_tsx11_unlock(); +} + + +/*********************************************************************** * map_window */ static void map_window( Display *display, struct x11drv_win_data *data, DWORD new_style ) { TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + wait_for_withdrawn_state( display, data, TRUE ); - update_net_wm_states( display, data ); - X11DRV_sync_window_style( display, data ); - wine_tsx11_lock(); - XMapWindow( display, data->whole_window ); - XFlush( display ); - wine_tsx11_unlock(); + + if (!data->embedded) + { + update_net_wm_states( display, data ); + X11DRV_sync_window_style( display, data ); + wine_tsx11_lock(); + XMapWindow( display, data->whole_window ); + XFlush( display ); + wine_tsx11_unlock(); + } + else set_xembed_flags( display, data, XEMBED_MAPPED ); + data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; } @@ -228,17 +251,43 @@ static void map_window( Display *display, struct x11drv_win_data *data, DWORD ne static void unmap_window( Display *display, struct x11drv_win_data *data ) { TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); - wait_for_withdrawn_state( display, data, FALSE ); - wine_tsx11_lock(); - if (data->managed) XWithdrawWindow( display, data->whole_window, DefaultScreen(display) ); - else XUnmapWindow( display, data->whole_window ); - wine_tsx11_unlock(); + + if (!data->embedded) + { + wait_for_withdrawn_state( display, data, FALSE ); + wine_tsx11_lock(); + if (data->managed) XWithdrawWindow( display, data->whole_window, DefaultScreen(display) ); + else XUnmapWindow( display, data->whole_window ); + wine_tsx11_unlock(); + } + else set_xembed_flags( display, data, 0 ); + data->mapped = FALSE; data->net_wm_state = 0; } /*********************************************************************** + * make_window_embedded + */ +void make_window_embedded( Display *display, struct x11drv_win_data *data ) +{ + if (data->mapped) + { + /* the window cannot be mapped before being embedded */ + unmap_window( display, data ); + data->embedded = TRUE; + map_window( display, data, 0 ); + } + else + { + data->embedded = TRUE; + set_xembed_flags( display, data, 0 ); + } +} + + +/*********************************************************************** * SetWindowStyle (X11DRV.@) * * Update the X state of a window to reflect a style change diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 14cb889..20dd91c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -695,6 +695,7 @@ struct x11drv_win_data BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ BOOL iconic : 1; /* is window in iconic state? */ + BOOL embedded : 1; /* is window an XEMBED client? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ HBITMAP hWMIconBitmap; @@ -717,6 +718,7 @@ extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern int get_window_wm_state( Display *display, struct x11drv_win_data *data ); extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); +extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); /* X context to associate a hwnd to an X window */ extern XContext winContext; @@ -773,4 +775,6 @@ extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect ); +#define XEMBED_MAPPED (1 << 0) + #endif /* __WINE_X11DRV_H */

1 0