April 2006 - Wine-Commits - list.winehq.org

qingdoa daoo : comctl32: Change return code comparison in AVI control.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 5e18834217e07bf321d46fe0152f18cf4be0e7f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e18834217e07bf321d46fe… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Thu Apr 13 20:56:10 2006 -0700 comctl32: Change return code comparison in AVI control. --- dlls/comctl32/animate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 3c2c648..229eb25 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -660,7 +660,7 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_ return FALSE; if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, - (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != outSize) + (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) { WARN("Can't get output BIH\n"); return FALSE;

1 0

Anssi Hannula : shell32: Fix common files directory location in shell32_Fi. rc.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: eb1c4fff93aa9c9cbcae44b5c3c59dd2f7b07b8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb1c4fff93aa9c9cbcae44b… Author: Anssi Hannula <anssi.hannula(a)gmail.com> Date: Thu Apr 13 19:05:09 2006 +0300 shell32: Fix common files directory location in shell32_Fi.rc. --- dlls/shell32/shell32_Fi.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index c13daa3..c03593a 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -194,7 +194,7 @@ STRINGTABLE DISCARDABLE IDS_HISTORY "Paikalliset asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmatiedostot" IDS_MYPICTURES "Omat kuvatiedostot" - IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset tiedostot" + IDS_PROGRAM_FILES_COMMON "Ohjelmatiedostot\\Yhteiset tiedostot" IDS_COMMON_DOCUMENTS "Dokumentit" IDS_ADMINTOOLS "K�ynnist�-valikko\\Ohjelmat\\Administrative Tools" IDS_COMMON_MUSIC "Dokumentit\\Omat musiikkitiedostot"

1 0

Thomas Kho : x11drv: Properly handle VK_LMENU input.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 0e81484c45863b4005023f0159661f746a4a3d50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e81484c45863b4005023f0… Author: Thomas Kho <tkho(a)ucla.edu> Date: Wed Apr 12 11:13:46 2006 -0700 x11drv: Properly handle VK_LMENU input. --- dlls/user/tests/input.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/x11drv/keyboard.c | 20 +++++- server/queue.c | 12 +++ 3 files changed, 190 insertions(+), 4 deletions(-) diff --git a/dlls/user/tests/input.c b/dlls/user/tests/input.c index e728913..7f41525 100644 --- a/dlls/user/tests/input.c +++ b/dlls/user/tests/input.c @@ -336,7 +336,7 @@ static LRESULT CALLBACK WndProc( HWND hW return 0; } -START_TEST(input) +static void test_Input_whitebox(void) { MSG msg; WNDCLASSA wclass; @@ -366,3 +366,163 @@ START_TEST(input) SendMessageA(hWndTest, WM_USER, 0, 0); DestroyWindow(hWndTest); } + +static void empty_message_queue(void) { + MSG msg; + while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +struct transition_s { + WORD wVk; + BYTE before_state; + BOOL _todo_wine; +}; + +struct sendinput_test_s { + WORD wVk; + DWORD dwFlags; + struct transition_s expected_transitions[MAXKEYEVENTS+1]; + UINT expected_messages[MAXKEYMESSAGES+1]; +} sendinput_test[] = { + /* test ALT+F */ + {VK_LMENU, 0, {{VK_MENU, 0x00, 0}, {VK_LMENU, 0x00, 0}, {0}}, + {WM_SYSKEYDOWN, 0}}, + {'F', 0, {{'F', 0x00, 0}, {0}}, + {WM_SYSKEYDOWN, WM_SYSCHAR, WM_SYSCOMMAND, 0}}, + {'F', KEYEVENTF_KEYUP, {{'F', 0x80, 0}, {0}}, {WM_SYSKEYUP, 0}}, + {VK_LMENU, KEYEVENTF_KEYUP, {{VK_MENU, 0x80, 0}, {VK_LMENU, 0x80, 0}, {0}}, + {WM_KEYUP, 0}}, + + /* test CTRL+O */ + {VK_LCONTROL, 0, {{VK_CONTROL, 0x00, 0}, {VK_LCONTROL, 0x00, 0}, {0}}, + {WM_KEYDOWN, 0}}, + {'O', 0, {{'O', 0x00, 0}, {0}}, {WM_KEYDOWN, WM_CHAR, 0}}, + {'O', KEYEVENTF_KEYUP, {{'O', 0x80, 0}, {0}}, {WM_KEYUP, 0}}, + {VK_LCONTROL, KEYEVENTF_KEYUP, + {{VK_CONTROL, 0x80, 0}, {VK_LCONTROL, 0x80, 0}, {0}}, {WM_KEYUP, 0}}, + + /* test ALT+CTRL+X */ + {VK_LMENU, 0, {{VK_MENU, 0x00, 0}, {VK_LMENU, 0x00, 0}, {0}}, + {WM_SYSKEYDOWN, 0}}, + {VK_LCONTROL, 0, {{VK_CONTROL, 0x00, 0}, {VK_LCONTROL, 0x00, 0}, {0}}, + {WM_KEYDOWN, 0}}, + {'X', 0, {{'X', 0x00, 0}, {0}}, {WM_KEYDOWN, 0}}, + {'X', KEYEVENTF_KEYUP, {{'X', 0x80, 0}, {0}}, {WM_KEYUP, 0}}, + {VK_LCONTROL, KEYEVENTF_KEYUP, + {{VK_CONTROL, 0x80, 0}, {VK_LCONTROL, 0x80, 0}, {0}}, + {WM_SYSKEYUP, 0}}, + {VK_LMENU, KEYEVENTF_KEYUP, {{VK_MENU, 0x80, 0}, {VK_LMENU, 0x80, 0}, {0}}, + {WM_KEYUP, 0}}, + + /* test SHIFT+A */ + {VK_LSHIFT, 0, + {{VK_SHIFT, 0x00, 0}, {VK_LSHIFT, 0x00, 0}, {0}}, {WM_KEYDOWN, 0}}, + {'A', 0, {{'A', 0x00, 0}, {0}}, {WM_KEYDOWN, WM_CHAR, 0}}, + {'A', KEYEVENTF_KEYUP, {{'A', 0x80, 0}, {0}}, {WM_KEYUP, 0}}, + {VK_LSHIFT, KEYEVENTF_KEYUP, + {{VK_SHIFT, 0x80, 0}, {VK_LSHIFT, 0x80, 0}, {0}}, {WM_KEYUP, 0}}, + + {0, 0, {{0}}, {0}} /* end */ +}; + +static struct sendinput_test_s *pTest = sendinput_test; +static UINT *pMsg = sendinput_test[0].expected_messages; + +/* Verify that only specified key state transitions occur */ +static void compare_and_check(int id, BYTE *ks1, BYTE *ks2, struct transition_s *t) { + int i; + while (t->wVk) { + int matched = ((ks1[t->wVk]&0x80) == (t->before_state&0x80) + && (ks2[t->wVk]&0x80) == (~t->before_state&0x80)); + if (t->_todo_wine) { + todo_wine { + ok(matched, "%02d: %02x from %02x -> %02x " + "instead of %02x -> %02x\n", id, t->wVk, + ks1[t->wVk]&0x80, ks2[t->wVk]&0x80, t->before_state, + ~t->before_state&0x80); + } + } else { + ok(matched, "%02d: %02x from %02x -> %02x " + "instead of %02x -> %02x\n", id, t->wVk, + ks1[t->wVk]&0x80, ks2[t->wVk]&0x80, t->before_state, + ~t->before_state&0x80); + } + ks2[t->wVk] = ks1[t->wVk]; /* clear the match */ + t++; + } + for (i = 0; i < 256; i++) + ok(ks2[i] == ks1[i], "%02d: %02x from %02x -> %02x unexpected\n", + id, i, ks1[i], ks2[i]); +} + +/* WndProc2 checks that we get at least the messages specified */ +static LRESULT CALLBACK WndProc2(HWND hWnd, UINT Msg, WPARAM wParam, + LPARAM lParam) +{ + if (pTest->wVk != 0) { /* not end */ + while(pTest->wVk != 0 && *pMsg == 0) { + pTest++; + pMsg = pTest->expected_messages; + } + if (Msg == *pMsg) + pMsg++; + } + return DefWindowProc(hWnd, Msg, wParam, lParam); +} + +static void test_Input_blackbox(void) +{ + INPUT i; + int ii; + BYTE ks1[256], ks2[256]; + LONG_PTR prevWndProc; + + HWND window; + window = CreateWindow("Static", NULL, WS_POPUP|WS_HSCROLL|WS_VSCROLL + |WS_VISIBLE, 0, 0, 200, 60, NULL, NULL, + NULL, NULL); + ok(window != NULL, "error: %d\n", (int) GetLastError()); + + /* must process all initial messages, otherwise X11DRV_KeymapNotify unsets + * key state set by SendInput(). */ + empty_message_queue(); + + prevWndProc = SetWindowLongPtr(window, GWLP_WNDPROC, (LONG_PTR) WndProc2); + ok(prevWndProc != 0 || (prevWndProc == 0 && GetLastError() == 0), + "error: %d\n", (int) GetLastError()); + + i.type = INPUT_KEYBOARD; + i.ki.wScan = 0; + i.ki.time = 0; + i.ki.dwExtraInfo = 0; + + for (ii = 0; ii < sizeof(sendinput_test)/sizeof(struct sendinput_test_s)-1; + ii++) { + GetKeyboardState(ks1); + i.ki.dwFlags = sendinput_test[ii].dwFlags; + i.ki.wVk = sendinput_test[ii].wVk; + SendInput(1, &i, sizeof(INPUT)); + empty_message_queue(); + GetKeyboardState(ks2); + compare_and_check(ii, ks1, ks2, + sendinput_test[ii].expected_transitions); + } + + /* *pMsg should be 0 and (++pTest)->wVk should be 0 */ + if (pTest->wVk && *pMsg == 0) pTest++; + while(pTest->wVk && pTest->expected_messages[0] == 0) { + ++pTest; + } + ok(*pMsg == 0 && pTest->wVk == 0, + "not enough messages found; looking for %x\n", *pMsg); + DestroyWindow(window); +} + +START_TEST(input) +{ + test_Input_whitebox(); + test_Input_blackbox(); +} diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index b500b26..d14de89 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -1113,6 +1113,17 @@ void X11DRV_send_keyboard_input( WORD wV UINT message; KEYLP keylp; KBDLLHOOKSTRUCT hook; + WORD wVkStripped; + + /* strip left/right for menu, control, shift */ + if (wVk == VK_LMENU || wVk == VK_RMENU) + wVkStripped = VK_MENU; + else if (wVk == VK_LCONTROL || wVk == VK_RCONTROL) + wVkStripped = VK_CONTROL; + else if (wVk == VK_LSHIFT || wVk == VK_RSHIFT) + wVkStripped = VK_SHIFT; + else + wVkStripped = wVk; keylp.lp2 = 0; keylp.lp1.count = 1; @@ -1128,14 +1139,16 @@ void X11DRV_send_keyboard_input( WORD wV { message = WM_KEYUP; if ((key_state_table[VK_MENU] & 0x80) && - ((wVk == VK_MENU) || (wVk == VK_CONTROL) || !(key_state_table[VK_CONTROL] & 0x80))) + ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) + || !(key_state_table[VK_CONTROL] & 0x80))) { if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ - (wVk != VK_MENU)) /* <ALT>-down...<something else>-up */ + (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ message = WM_SYSKEYUP; TrackSysKey = 0; } key_state_table[wVk] &= ~0x80; + key_state_table[wVkStripped] &= ~0x80; keylp.lp1.previous = 1; keylp.lp1.transition = 1; } @@ -1145,12 +1158,13 @@ void X11DRV_send_keyboard_input( WORD wV keylp.lp1.transition = 0; if (!(key_state_table[wVk] & 0x80)) key_state_table[wVk] ^= 0x01; key_state_table[wVk] |= 0xc0; + key_state_table[wVkStripped] |= 0xc0; message = WM_KEYDOWN; if ((key_state_table[VK_MENU] & 0x80) && !(key_state_table[VK_CONTROL] & 0x80)) { message = WM_SYSKEYDOWN; - TrackSysKey = wVk; + TrackSysKey = wVkStripped; } } diff --git a/server/queue.c b/server/queue.c index f26197d..45caefe 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1132,6 +1132,18 @@ static void update_input_key_state( stru case VK_MENU: set_input_key_state( input, extended ? VK_RMENU : VK_LMENU, down ); break; + case VK_LCONTROL: + case VK_RCONTROL: + set_input_key_state( input, VK_CONTROL, down ); + break; + case VK_LMENU: + case VK_RMENU: + set_input_key_state( input, VK_MENU, down ); + break; + case VK_LSHIFT: + case VK_RSHIFT: + set_input_key_state( input, VK_SHIFT, down ); + break; } break; }

1 0

Detlef Riekenberg : kernel: Load tests again on NT 3.51 ( toolhelp API not present).
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 513c35a363c89b84b0ec7391450e6c0365560956 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=513c35a363c89b84b0ec739… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 14 09:17:06 2006 +0200 kernel: Load tests again on NT 3.51 (toolhelp API not present). --- dlls/kernel/tests/toolhelp.c | 71 ++++++++++++++++++++++++++++-------------- 1 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/kernel/tests/toolhelp.c b/dlls/kernel/tests/toolhelp.c index 16fa906..5b96a99 100644 --- a/dlls/kernel/tests/toolhelp.c +++ b/dlls/kernel/tests/toolhelp.c @@ -32,6 +32,15 @@ static char selfname[MAX_PATH]; +/* Some functions are only in later versions of kernel32.dll */ +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); +static BOOL (WINAPI *pModule32First)(HANDLE, LPMODULEENTRY32); +static BOOL (WINAPI *pModule32Next)(HANDLE, LPMODULEENTRY32); +static BOOL (WINAPI *pProcess32First)(HANDLE, LPPROCESSENTRY32); +static BOOL (WINAPI *pProcess32Next)(HANDLE, LPPROCESSENTRY32); +static BOOL (WINAPI *pThread32First)(HANDLE, LPTHREADENTRY32); +static BOOL (WINAPI *pThread32Next)(HANDLE, LPTHREADENTRY32); + /* 1 minute should be more than enough */ #define WAIT_TIME (60 * 1000) @@ -100,12 +109,12 @@ static void test_process(DWORD curr_pid, unsigned found = 0; int num = 0; - hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); /* check that this current process is enumerated */ pe.dwSize = sizeof(pe); - if (Process32First( hSnapshot, &pe )) + if (pProcess32First( hSnapshot, &pe )) { do { @@ -113,13 +122,13 @@ static void test_process(DWORD curr_pid, if (pe.th32ProcessID == sub_pcs_pid) found++; trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile); num++; - } while (Process32Next( hSnapshot, &pe )); + } while (pProcess32Next( hSnapshot, &pe )); } ok(found == 2, "couldn't find self and/or sub-process in process list\n"); /* check that first really resets the enumeration */ found = 0; - if (Process32First( hSnapshot, &pe )) + if (pProcess32First( hSnapshot, &pe )) { do { @@ -127,19 +136,19 @@ static void test_process(DWORD curr_pid, if (pe.th32ProcessID == sub_pcs_pid) found++; trace("PID=%lx %s\n", pe.th32ProcessID, pe.szExeFile); num--; - } while (Process32Next( hSnapshot, &pe )); + } while (pProcess32Next( hSnapshot, &pe )); } ok(found == 2, "couldn't find self and/or sub-process in process list\n"); ok(!num, "mismatch in counting\n"); te.dwSize = sizeof(te); - ok(!Thread32First( hSnapshot, &te ), "shouldn't return a thread\n"); + ok(!pThread32First( hSnapshot, &te ), "shouldn't return a thread\n"); me.dwSize = sizeof(me); - ok(!Module32First( hSnapshot, &me ), "shouldn't return a module\n"); + ok(!pModule32First( hSnapshot, &me ), "shouldn't return a module\n"); CloseHandle(hSnapshot); - ok(!Process32First( hSnapshot, &pe ), "shouldn't return a process\n"); + ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); } static void test_thread(DWORD curr_pid, DWORD sub_pcs_pid) @@ -152,12 +161,12 @@ static void test_thread(DWORD curr_pid, unsigned curr_found = 0; unsigned sub_found = 0; - hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); /* check that this current process is enumerated */ te.dwSize = sizeof(te); - if (Thread32First( hSnapshot, &te )) + if (pThread32First( hSnapshot, &te )) { do { @@ -165,7 +174,7 @@ static void test_thread(DWORD curr_pid, if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num++; - } while (Thread32Next( hSnapshot, &te )); + } while (pThread32Next( hSnapshot, &te )); } ok(curr_found == 1, "couldn't find self in thread list\n"); ok(sub_found == 2, "couldn't find sub-process thread's in thread list\n"); @@ -173,7 +182,7 @@ static void test_thread(DWORD curr_pid, /* check that first really resets enumeration */ curr_found = 0; sub_found = 0; - if (Thread32First( hSnapshot, &te )) + if (pThread32First( hSnapshot, &te )) { do { @@ -181,19 +190,19 @@ static void test_thread(DWORD curr_pid, if (te.th32OwnerProcessID == sub_pcs_pid) sub_found++; trace("PID=%lx TID=%lx %ld\n", te.th32OwnerProcessID, te.th32ThreadID, te.tpBasePri); num--; - } while (Thread32Next( hSnapshot, &te )); + } while (pThread32Next( hSnapshot, &te )); } ok(curr_found == 1, "couldn't find self in thread list\n"); ok(sub_found == 2, "couldn't find sub-process thread's in thread list\n"); pe.dwSize = sizeof(pe); - ok(!Process32First( hSnapshot, &pe ), "shouldn't return a process\n"); + ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); me.dwSize = sizeof(me); - ok(!Module32First( hSnapshot, &me ), "shouldn't return a module\n"); + ok(!pModule32First( hSnapshot, &me ), "shouldn't return a module\n"); CloseHandle(hSnapshot); - ok(!Thread32First( hSnapshot, &te ), "shouldn't return a thread\n"); + ok(!pThread32First( hSnapshot, &te ), "shouldn't return a thread\n"); } static const char* curr_expected_modules[] = @@ -222,12 +231,12 @@ static void test_module(DWORD pid, const ok(NUM_OF(found) >= num_expected, "Internal: bump found[] size\n"); - hSnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPMODULE, pid ); + hSnapshot = pCreateToolhelp32Snapshot( TH32CS_SNAPMODULE, pid ); ok(hSnapshot != NULL, "Cannot create snapshot\n"); for (i = 0; i < num_expected; i++) found[i] = 0; me.dwSize = sizeof(me); - if (Module32First( hSnapshot, &me )) + if (pModule32First( hSnapshot, &me )) { do { @@ -237,7 +246,7 @@ static void test_module(DWORD pid, const for (i = 0; i < num_expected; i++) if (!strcmp(expected[i], me.szModule)) found[i]++; num++; - } while (Module32Next( hSnapshot, &me )); + } while (pModule32Next( hSnapshot, &me )); } for (i = 0; i < num_expected; i++) ok(found[i] == 1, "Module %s is %s\n", @@ -246,7 +255,7 @@ static void test_module(DWORD pid, const /* check that first really resets the enumeration */ for (i = 0; i < num_expected; i++) found[i] = 0; me.dwSize = sizeof(me); - if (Module32First( hSnapshot, &me )) + if (pModule32First( hSnapshot, &me )) { do { @@ -255,7 +264,7 @@ static void test_module(DWORD pid, const for (i = 0; i < num_expected; i++) if (!strcmp(expected[i], me.szModule)) found[i]++; num--; - } while (Module32Next( hSnapshot, &me )); + } while (pModule32Next( hSnapshot, &me )); } for (i = 0; i < num_expected; i++) ok(found[i] == 1, "Module %s is %s\n", @@ -263,13 +272,13 @@ static void test_module(DWORD pid, const ok(!num, "mismatch in counting\n"); pe.dwSize = sizeof(pe); - ok(!Process32First( hSnapshot, &pe ), "shouldn't return a process\n"); + ok(!pProcess32First( hSnapshot, &pe ), "shouldn't return a process\n"); me.dwSize = sizeof(me); - ok(!Thread32First( hSnapshot, &te ), "shouldn't return a thread\n"); + ok(!pThread32First( hSnapshot, &te ), "shouldn't return a thread\n"); CloseHandle(hSnapshot); - ok(!Module32First( hSnapshot, &me ), "shouldn't return a module\n"); + ok(!pModule32First( hSnapshot, &me ), "shouldn't return a module\n"); } START_TEST(toolhelp) @@ -282,6 +291,20 @@ START_TEST(toolhelp) STARTUPINFOA startup; HANDLE ev1, ev2; DWORD w; + HANDLE hkernel32 = GetModuleHandleA("kernel32"); + + pCreateToolhelp32Snapshot = (VOID *) GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); + pModule32First = (VOID *) GetProcAddress(hkernel32, "Module32First"); + pModule32Next = (VOID *) GetProcAddress(hkernel32, "Module32Next"); + pProcess32First = (VOID *) GetProcAddress(hkernel32, "Process32First"); + pProcess32Next = (VOID *) GetProcAddress(hkernel32, "Process32Next"); + pThread32First = (VOID *) GetProcAddress(hkernel32, "Thread32First"); + pThread32Next = (VOID *) GetProcAddress(hkernel32, "Thread32Next"); + + if (!pCreateToolhelp32Snapshot || + !pModule32First || !pModule32Next || + !pProcess32First || !pProcess32Next || + !pThread32First || !pThread32Next) return; r = init(); ok(r == 0, "Basic init of sub-process test\n");

1 0

Stefan Dösinger : wined3d: Add GetHWND and SetHWND methods to IWineD3DDevice.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: d9cd05db80f91d6bbcf96316c9721fdf4d1e5619 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9cd05db80f91d6bbcf9631… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 13 23:37:47 2006 +0200 wined3d: Add GetHWND and SetHWND methods to IWineD3DDevice. --- dlls/wined3d/device.c | 15 +++++++++++++++ include/wine/wined3d_interface.h | 4 ++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7362e7..3d4ae9e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4770,6 +4770,19 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetDis } return hr; } + +HRESULT WINAPI IWineD3DDeviceImpl_SetHWND(IWineD3DDevice *iface, HWND hWnd) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DDeviceImpl_GetHWND(IWineD3DDevice *iface, HWND *hWnd) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + + return WINED3DERR_INVALIDCALL; +} + /***** * Stateblock related functions *****/ @@ -6811,6 +6824,8 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_GetDeviceCaps, IWineD3DDeviceImpl_GetDirect3D, IWineD3DDeviceImpl_GetDisplayMode, + IWineD3DDeviceImpl_GetHWND, + IWineD3DDeviceImpl_SetHWND, IWineD3DDeviceImpl_GetNumberOfSwapChains, IWineD3DDeviceImpl_GetRasterStatus, IWineD3DDeviceImpl_GetSwapChain, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 385ca4c..f48cae3 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -371,6 +371,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetDeviceCaps)(THIS_ WINED3DCAPS* pCaps) PURE; STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; + STDMETHOD(GetHWND)(THIS_ HWND *hwnd) PURE; + STDMETHOD(SetHWND)(THIS_ HWND hwnd) PURE; STDMETHOD_(UINT, GetNumberOfSwapChains)(THIS) PURE; STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) PURE; STDMETHOD(GetSwapChain)(THIS_ UINT iSwapChain, struct IWineD3DSwapChain **pSwapChain) PURE; @@ -511,6 +513,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_GetDeviceCaps(p,a) (p)->lpVtbl->GetDeviceCaps(p,a) #define IWineD3DDevice_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a) #define IWineD3DDevice_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) +#define IWineD3DDevice_GetHWND(p, a) (p)->lpVtbl->GetHWND(p, a) +#define IWineD3DDevice_SetHWND(p, a) (p)->lpVtbl->SetHWND(p, a) #define IWineD3DDevice_GetNumberOfSwapChains(p) (p)->lpVtbl->GetNumberOfSwapChains(p) #define IWineD3DDevice_Reset(p,a) (p)->lpVtbl->Reset(p,a) #define IWineD3DDevice_SetDialogBoxMode(p,a) (p)->lpVtbl->SetDialogBoxMode(p,a)

1 0

Stefan Dösinger : wined3d: Add macros for (Un) Init3D and Flip.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 29022c49df47e0bafbebfb350bdbfa422c52f693 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29022c49df47e0bafbebfb3… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 13 18:35:59 2006 +0200 wined3d: Add macros for (Un)Init3D and Flip. --- include/wine/wined3d_interface.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index c163104..385ca4c 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -502,6 +502,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_CreateVertexDeclaration(p,b,c,d) (p)->lpVtbl->CreateVertexDeclaration(p,b,c,d) #define IWineD3DDevice_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IWineD3DDevice_CreatePixelShader(p,a,b,c) (p)->lpVtbl->CreatePixelShader(p,a,b,c) +#define IWineD3DDevice_Init3D(p, a, b) (p)->lpVtbl->Init3D(p, a, b) +#define IWineD3DDevice_Uninit3D(p) (p)->lpVtbl->Uninit3D(p) #define IWineD3DDevice_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) #define IWineD3DDevice_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p) #define IWineD3DDevice_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) @@ -1139,6 +1141,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine #define IWineD3DSurface_UnlockRect(p) (p)->lpVtbl->UnlockRect(p) #define IWineD3DSurface_GetDC(p,a) (p)->lpVtbl->GetDC(p,a) #define IWineD3DSurface_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a) +#define IWineD3DSurface_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a)

1 0

Antonio Codazzi : shell32: Italian resources update.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: b758ea053c1e1756847001298b9efc49c1e482d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b758ea053c1e17568470012… Author: Antonio Codazzi <f_sophia(a)libero.it> Date: Thu Apr 13 13:57:45 2006 +0200 shell32: Italian resources update. --- dlls/shell32/shell32_It.rc | 99 +++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 7511b18..5f08423 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2003-2004 Puoti + * Copyright 2006 Antonio Codazzi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,8 +22,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "Icone &Grandi", FCIDM_SHVIEW_BIGICON + MENUITEM "Icone &Piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END @@ -36,8 +37,8 @@ BEGIN BEGIN POPUP "&Visualizza" BEGIN - MENUITEM "&Icone Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "&Icone Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "Icone &Grandi", FCIDM_SHVIEW_BIGICON + MENUITEM "Icone &Piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END @@ -46,7 +47,7 @@ BEGIN BEGIN MENUITEM "Per &Nome", 0x30 /* column 0 */ MENUITEM "Per &Tipo", 0x32 /* column 2 */ - MENUITEM "Per &Dimensione", 0x31 /* ... */ + MENUITEM "Per Di&mensione", 0x31 /* ... */ MENUITEM "Per &Data", 0x33 MENUITEM SEPARATOR MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE @@ -61,7 +62,7 @@ BEGIN POPUP "Nuovo" BEGIN MENUITEM "Nuova &Cartella", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nuovo &Collegamento", FCIDM_SHVIEW_NEWLINK + MENUITEM "Nuovo Co&llegamento", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -82,7 +83,7 @@ BEGIN MENUITEM "&Taglia", FCIDM_SHVIEW_CUT MENUITEM "&Copia", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "&Crea Collegamento", FCIDM_SHVIEW_CREATELINK + MENUITEM "Crea Co&llegamento", FCIDM_SHVIEW_CREATELINK MENUITEM "&Cancella", FCIDM_SHVIEW_DELETE MENUITEM "&Rinomina", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -129,63 +130,75 @@ FONT 8, "MS Shell Dlg" CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Esplora...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "E&splora...", 12288, 170, 63, 50, 14, WS_TABSTOP } -/* - special folders -*/ STRINGTABLE DISCARDABLE { + /* columns in the shellview */ + IDS_SHV_COLUMN1 "File" + IDS_SHV_COLUMN2 "Dimensione" + IDS_SHV_COLUMN3 "Tipo" + IDS_SHV_COLUMN4 "Modificato" + IDS_SHV_COLUMN5 "Attributi" + IDS_SHV_COLUMN6 "Spazio" + IDS_SHV_COLUMN7 "Spazio disponibile" + IDS_SHV_COLUMN8 "Nome" + IDS_SHV_COLUMN9 "Commenti" + + /* special folder */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Risorse del Computer" -} -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ - IDS_VIEW_LARGE "&Icone Grandi" - IDS_VIEW_SMALL "I&cone Piccole" + /* context menus */ + IDS_VIEW_LARGE "Icone &Grandi" + IDS_VIEW_SMALL "Icone &Piccole" IDS_VIEW_LIST "&Lista" IDS_VIEW_DETAILS "&Dettagli" IDS_SELECT "Selezione" IDS_OPEN "Apri" -} -STRINGTABLE DISCARDABLE -{ IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" - IDS_DELETEITEM_CAPTION "Confermare la cancallazione del file" + IDS_DELETEITEM_CAPTION "Confermare la cancellazione del file" IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" IDS_OVERWRITEFILE_TEXT "Sovrascrivere il File %1?" IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrizione del File" -} - -/* columns in the shellview */ -STRINGTABLE -BEGIN - IDS_SHV_COLUMN1 "File" - IDS_SHV_COLUMN2 "Dimensione" - IDS_SHV_COLUMN3 "Tipo" - IDS_SHV_COLUMN4 "Modificato" - IDS_SHV_COLUMN5 "Attributi" - IDS_SHV_COLUMN6 "Dimensione" - IDS_SHV_COLUMN7 "Dimensione disponibile" - IDS_SHV_COLUMN8 "Nome" - IDS_SHV_COLUMN9 "Commenti" -END - -/* message box strings */ -STRINGTABLE DISCARDABLE -{ + /* message box strings */ IDS_RESTART_TITLE "Riavvia" - IDS_RESTART_PROMPT "Vuoi simulare un riavvio do Windows?" + IDS_RESTART_PROMPT "Vuoi simulare un riavvio di Windows?" IDS_SHUTDOWN_TITLE "Termina sessione" IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di Wine?" + + /* shell folder path default values */ + IDS_STARTMENU "Start Menu" + IDS_PROGRAMS "Start Menu\\Programmi" + IDS_STARTUP "Start Menu\\Programmi\\StartUp" + IDS_ADMINTOOLS "Start Menu\\Programmi\\Administrative Tools" + IDS_INTERNET_CACHE "Settaggi Locali\\Temporary Internet Files" + IDS_HISTORY "Settaggi Locali\\Cronologia" + IDS_LOCAL_APPDATA "Settaggi Locali\\Applicazioni" + IDS_CDBURN_AREA "Settaggi Locali\\Applicazioni\\Microsoft\\CD Burning" + IDS_PROGRAM_FILES "Programmi" + IDS_PROGRAM_FILES_COMMON "Programmi\\Common Files" + IDS_COMMON_DOCUMENTS "Documenti" + IDS_COMMON_MUSIC "Documenti\\Musica" + IDS_COMMON_PICTURES "Documenti\\Immagini" + IDS_COMMON_VIDEO "Documenti\\Video" + IDS_PERSONAL "Miei Documenti" + IDS_MYMUSIC "Musica" + IDS_MYVIDEO "Video" + IDS_MYPICTURES "Immagini" + IDS_FAVORITES "Favoriti" + IDS_RECENT "Recenti" + IDS_SENDTO "SendTo" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Modelli" + IDS_APPDATA "Applicazioni" + IDS_PRINTHOOD "PrintHood" + IDS_COOKIES "Cookies" }

1 0

Mikołaj Zalewski : winefile: Use header full drag.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: ec328c1e70409e55321063ec8259609a5605bbad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec328c1e70409e55321063e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Apr 13 10:38:00 2006 +0200 winefile: Use header full drag. --- programs/winefile/winefile.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 745df4a..d2159c8 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2618,7 +2618,7 @@ static HWND create_header(HWND parent, P HD_ITEM hdi; int idx; - HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ/*TODO: |HDS_BUTTONS + sort orders*/, + 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); if (!hwnd) return 0; @@ -3608,8 +3608,7 @@ static void set_header(Pane* pane) static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) { switch(pnmh->code) { - case HDN_TRACK: - case HDN_ENDTRACK: { + case HDN_ITEMCHANGED: { HD_NOTIFY* phdn = (HD_NOTIFY*) pnmh; int idx = phdn->iItem; int dx = phdn->pitem->cxy - pane->widths[idx]; @@ -3618,9 +3617,6 @@ static LRESULT pane_notify(Pane* pane, N RECT clnt; GetClientRect(pane->hwnd, &clnt); - /* move immediate to simulate HDS_FULLDRAG (for now [04/2000] not really needed with WINELIB) */ - SendMessage(pane->hwndHeader, HDM_SETITEM, idx, (LPARAM) phdn->pitem); - pane->widths[idx] += dx; for(i=idx; ++i<=COLUMNS; )

1 0

Mikołaj Zalewski : include: Fix a mistake in the declaration of _sntprintf.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 61512b202128041523ef64ceaafc954fdb7f7270 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61512b202128041523ef64c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Apr 13 10:21:51 2006 +0200 include: Fix a mistake in the declaration of _sntprintf. --- include/tchar.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 9af9f0a..e220485 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -95,7 +95,7 @@ extern "C" { #define _puttc WINE_tchar_routine(putc, putc, putwc) #define _puttchar WINE_tchar_routine(putchar, putchar, putwchar) #define _putts WINE_tchar_routine(puts, puts, putws) -#define _sntprintf WINE_tchar_routine(sprintf, sprintf, swprintf) +#define _sntprintf WINE_tchar_routine(snprintf, snprintf, snwprintf) #define _stprintf WINE_tchar_routine(sprintf, sprintf, swprintf) #define _stscanf WINE_tchar_routine(sscanf, sscanf, swscanf) #define _taccess WINE_tchar_routine(access, _access, _waccess)

1 0

Anssi Hannula : twain_32: Add Finnish resources.
by Alexandre Julliard April 14, 2006

April 14, 2006

Module: wine Branch: refs/heads/master Commit: 66b548ac81b50c9df3aaf0d57a06a3274aee30af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66b548ac81b50c9df3aaf0d… Author: Anssi Hannula <anssi.hannula(a)gmail.com> Date: Thu Apr 13 19:02:08 2006 +0300 twain_32: Add Finnish resources. --- dlls/twain_32/rsrc.rc | 1 + dlls/twain_32/twain_Fi.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 dlls/twain_32/twain_Fi.rc diff --git a/dlls/twain_32/rsrc.rc b/dlls/twain_32/rsrc.rc index 4aaafce..1f86ef3 100644 --- a/dlls/twain_32/rsrc.rc +++ b/dlls/twain_32/rsrc.rc @@ -27,4 +27,5 @@ #include "twain_De.rc" #include "twain_En.rc" +#include "twain_Fi.rc" #include "twain_Ko.rc" diff --git a/dlls/twain_32/twain_Fi.rc b/dlls/twain_32/twain_Fi.rc new file mode 100644 index 0000000..751d493 --- /dev/null +++ b/dlls/twain_32/twain_Fi.rc @@ -0,0 +1,40 @@ +/* + * Finnish resources for Twain + * + * Copyright 2006 Anssi Hannula + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Skannataan" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SKANNATAAN.... Odota hetki",IDC_STATIC,53,19,85,8 +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0