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

lostwages/templates/en download-deb.template
by Jeremy Newman July 24, 2006

July 24, 2006

ChangeSet ID: 26797 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/07/24 14:03:39 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Update download-deb page to link to new package archive Patch: http://cvs.winehq.org/patch.py?id=26797 Old revision New revision Changes Path 1.10 1.11 +2 -2 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.10 lostwages/templates/en/download-deb.template:1.11 --- lostwages/templates/en/download-deb.template:1.10 24 Jul 2006 19: 3:39 -0000 +++ lostwages/templates/en/download-deb.template 24 Jul 2006 19: 3:39 -0000 @@ -105,8 +105,8 @@ as root.</p> <h2>Older .deb packages</h2> <p>Since the APT repository can only hold the latest packages, older versions of -packages are available here: -<a href=http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=…>Ubuntu/Debian Unstable Packages</a></p> +the packages are available at +<a href=http://wine.budgetdedicated.com/archive/index.html>the WineHQ .deb packages archive</a>.</p> <p>If you wish to use these packages, you'll have to install them by hand, such as by using dpkg -i</p>

1 0

lostwages/templates/en status.template status_ ...
by Jeremy Newman July 24, 2006

July 24, 2006

ChangeSet ID: 26796 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/07/24 14:03:00 Modified files: templates/en : status.template status_changelog.template status_directx.template Log message: Tom Wickline <twickline(a)gmail.com> Status and WWN coverage update to our DirectX page. Patch: http://cvs.winehq.org/patch.py?id=26796 Old revision New revision Changes Path 1.43 1.44 +1 -1 lostwages/templates/en/status.template 1.45 1.46 +27 -0 lostwages/templates/en/status_changelog.template 1.18 1.19 +18 -11 lostwages/templates/en/status_directx.template Index: lostwages/templates/en/status.template diff -u -p lostwages/templates/en/status.template:1.43 lostwages/templates/en/status.template:1.44 --- lostwages/templates/en/status.template:1.43 24 Jul 2006 19: 3: 0 -0000 +++ lostwages/templates/en/status.template 24 Jul 2006 19: 3: 0 -0000 @@ -8,7 +8,7 @@ <h1>Wine Status</h1> - <p>Last update: February 22, 2006.</p> + <p>Last update: July 17, 2006.</p> <div align=center> <table width="90%" border="0" cellspacing="0" cellpadding="2"> Index: lostwages/templates/en/status_changelog.template diff -u -p lostwages/templates/en/status_changelog.template:1.45 lostwages/templates/en/status_changelog.template:1.46 --- lostwages/templates/en/status_changelog.template:1.45 24 Jul 2006 19: 3: 0 -0000 +++ lostwages/templates/en/status_changelog.template 24 Jul 2006 19: 3: 0 -0000 @@ -2,6 +2,33 @@ <h1>Wine Status - ChangeLog</h1> +<p>Changes since July 17, 2006:</p> + + <ul> + <li>ADD - Stefan Dösinger as worker to d3d8.dll </li> + <li>ADD - Stefan Dösinger as worker to d3d9.dll </li> + <li>ADD - Stefan Dösinger as worker to ddraw.dll</li> + <li>ADD - Stefan Dösinger as worker to wined3d.dll</li> + <li>ADD - Ivan Gyurdiev as worker to d3d8.dll </li> + <li>ADD - Ivan Gyurdiev as worker to d3d9.dll </li> + <li>ADD - Ivan Gyurdiev as worker to wined3d.dll</li> + <li>ADD - Jason Green as worker to d3d8.dll </li> + <li>ADD - Jason Green as worker to d3d9.dll </li> + <li>ADD - Jason Green as worker to wined3d.dll</li> + <li>ADD - Roderick Colenbrander as worker to d3d8.dll</li> + <li>ADD - Roderick Colenbrander as worker to d3d9.dll</li> + <li>ADD - Roderick Colenbrander as worker to wined3d.dll</li> + <li>ADD - Christoph Frick as worker to dinput.dll</li> + <li>Remove - Raphaël Junqueira as worker on d3d8.dll</li> + <li>Remove - Raphaël Junqueira as worker on d3d9.dll</li> + <li>Remove - Raphaël Junqueira as worker on wined3d.dll</li> + <li>Remove - Lionel Ulmer as worker on dinput.dll</li> + <li>ddraw.dll 80% -> 85%</li> + <li>d3d9.dll 65% -> 85%</li> + <li>wined3d.dll 65% -> 85%</li> + </ul> + <br> + <p>Changes since February 22, 2006:</p> <ul> Index: lostwages/templates/en/status_directx.template diff -u -p lostwages/templates/en/status_directx.template:1.18 lostwages/templates/en/status_directx.template:1.19 --- lostwages/templates/en/status_directx.template:1.18 24 Jul 2006 19: 3: 0 -0000 +++ lostwages/templates/en/status_directx.template 24 Jul 2006 19: 3: 0 -0000 @@ -24,9 +24,10 @@ <td><a href="{$root}/site/?issue=152#Direct%203D%20Status">#152</a>, <a href="{$root}/site/?issue=170#Direct3D%20Status">#170</a>, <a href="{$root}/site/?issue=174#Direct3D%20To%20Do%20List">#174</a>, - <a href="{$root}/site/?issue=182#DirectX%20/%20Operation%20Flashpoint">#182</a></td> + <a href="{$root}/site/?issue=182#DirectX%20/%20Operation%20Flashpoint">#182</a>, + <a href="{$root}/site/?issue=306#D3D8%20Changes">#306</a></td> <td class="pct85">85% complete</a></td> - <td>Raphaël Junqueira,<br>H.Verbeet</td> + <td>H.Verbeet,<br>Stefan Dösinger,<br>Ivan Gyurdiev,<br>Jason Green,<br>R.Colenbrander</td> </tr> <tr> <td>d3d9.dll</td> @@ -43,8 +44,8 @@ <a href="{$root}/site/?issue=273#DirectX%209%20Updated,%20Not%20Merged">#273</a>, <a href="{$root}/site/?issue=282#DirectX9%20Work">#282</a>, <a href="{$root}/site/?issue=283#Direct3D%20Work">#283</a></td> - <td class="pct65">65% complete</td> - <td>Raphaël Junqueira,<br>H.Verbeet</td> + <td class="pct85">85% complete</td> + <td>H.Verbeet<br>Stefan Dösinger,<br>Ivan Gyurdiev,<br>Jason Green,<br>R.Colenbrander</td> </tr> <tr> <td>d3dx8.dll</td> @@ -57,9 +58,12 @@ <td>wined3d.dll</td> <td class="adequate"></td> <td><a href="{$root}/site/?issue=280#WineD3D%20Fun%20Project">#280</a>, - <a href="{$root}/site/?issue=300#Direct3D%20&%20WGL">#300</a></td> - <td class="pct65">65% complete</td> - <td>Raphaël Junqueira,<br>H.Verbeet</td> + <a href="{$root}/site/?issue=300#Direct3D%20&%20WGL">#300</a>, + <a href="{$root}/site/?issue=307#DirectDraw%20via%20WineD3D">#307</a>, + <a href="{$root}/site/?issue=308#WineD3D%20Issues">#308</a>, + <a href="{$root}/site/?issue=317#Vertex%20Buffer%20Objects">#317</a></td> + <td class="pct85">85% complete</td> + <td>H.Verbeet,<br>Stefan Dösinger,<br>Ivan Gyurdiev,<br>Jason Green,<br>R.Colenbrander</td> </tr> <td colspan="5"><strong>D3Dim</strong></td> <tr> @@ -85,9 +89,12 @@ <a href="{$root}/site/?issue=291#WineD3D%20and%20DirectX7">#291</a>, <a href="{$root}/site/?issue=294#Direct3D%207,%20version%202">#294</a>, <a href="{$root}/site/?issue=299#WineD3D%20and%20DirectX%207/8">#299</a>, - <a href="{$root}/site/?issue=301#Accelerating%20DirectDraw">#301</a></td> - <td class="pct80">80% complete</a></td> - <td>Lionel Ulmer</td> + <a href="{$root}/site/?issue=301#Accelerating%20DirectDraw">#301</a>, + <a href="{$root}/site/?issue=307#DirectDraw%20via%20WineD3D">#307</a>, + <a href="{$root}/site/?issue=311#DirectDraw%20Update">#311</a>, + <a href="{$root}/site/?issue=314#DirectDraw%20Patch">#314</a></td> + <td class="pct85">85% complete</a></td> + <td>Stefan Dösinger,<br>Lionel Ulmer</td> </tr> <td colspan="5"><strong>DirectInput</strong></td> <tr> @@ -103,7 +110,7 @@ <td><a href="{$root}/site/?issue=116#DirectInput%20Key%20Mapping">#116</a>, <a href="{$root}/site/?issue=137#MS%20Write%20Support%20(con't)">#137</a></td> <td class="pct70">70% complete</a></td> - <td>Lionel Ulmer</td> + <td>Christoph Frick</td> </tr> <td colspan="5"><strong>DirectMusic</strong></td> <tr>

1 0

Huw Davies : gdi32: Use the correct name when writing the fixed font registry value.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 5b27ce231364b72b6b170d90a32222466a2a2dd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b27ce231364b72b6b170d9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 14:08:45 2006 +0100 gdi32: Use the correct name when writing the fixed font registry value. --- dlls/gdi/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 2a6024c..f82112f 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1569,7 +1569,7 @@ static void update_font_info(void) hkey = create_config_fonts_registry_key(); RegSetValueExA(hkey, "OEMFONT.FON", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].oem, strlen(nls_update_font_list[i].oem)+1); - RegSetValueExA(hkey, "FIXED.FON", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].fixed, strlen(nls_update_font_list[i].fixed)+1); + RegSetValueExA(hkey, "FIXEDFON.FON", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].fixed, strlen(nls_update_font_list[i].fixed)+1); RegSetValueExA(hkey, "FONTS.FON", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].system, strlen(nls_update_font_list[i].system)+1); RegCloseKey(hkey);

1 0

Dmitry Timoshkov : user: Add more TrackMouseEvent tests, particularly a test with
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: a8af062baac2913fd0838813bd2783ddbcb96836 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8af062baac2913fd083881… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 25 00:45:30 2006 +0900 user: Add more TrackMouseEvent tests, particularly a test with injected mouse move events. Fix a problem detected by the test. --- dlls/user/input.c | 2 + dlls/user/tests/msg.c | 94 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 73 insertions(+), 23 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 131bcd8..26c3b96 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -894,6 +894,8 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) if (ptme->dwFlags & TME_QUERY ) { *ptme = tracking_info.tme; + /* set cbSize in the case it's not initialized yet */ + ptme->cbSize = sizeof(TRACKMOUSEEVENT); return TRUE; /* return here, TME_QUERY is retrieving information */ } diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index f462b43..5b7cd37 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -7624,6 +7624,48 @@ static const struct message WmMouseHover { 0 } }; +static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) +{ + MSG msg; + DWORD start_ticks, end_ticks; + + start_ticks = GetTickCount(); + /* add some deviation (5%) to cover not expected delays */ + start_ticks += timeout / 20; + + do + { + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + /* Timer proc messages are not dispatched to the window proc, + * and therefore not logged. + */ + if (msg.message == WM_TIMER || msg.message == WM_SYSTIMER) + { + struct message s_msg; + + s_msg.message = msg.message; + s_msg.flags = sent|wparam|lparam; + s_msg.wParam = msg.wParam; + s_msg.lParam = msg.lParam; + add_message(&s_msg); + } + DispatchMessage(&msg); + } + + end_ticks = GetTickCount(); + + /* inject WM_MOUSEMOVE to see how it changes tracking */ + if (inject_mouse_move && start_ticks + timeout / 2 >= end_ticks) + { + mouse_event(MOUSEEVENTF_MOVE, -1, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 1, 0, 0, 0); + + inject_mouse_move = FALSE; + } + } while (start_ticks + timeout >= end_ticks); +} + static void test_TrackMouseEvent(void) { MSG msg; @@ -7631,8 +7673,7 @@ static void test_TrackMouseEvent(void) BOOL ret; HWND hwnd, hchild; RECT rc_parent, rc_child; - UINT default_hover_time; - DWORD start_ticks, end_ticks; + UINT default_hover_time, hover_width = 0, hover_height = 0; #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ @@ -7651,6 +7692,7 @@ #define track_query(expected_track_flags SetLastError(0xdeadbeef); \ ret = TrackMouseEvent(&tme); \ ok(ret, "TrackMouseEvent(TME_QUERY) error %ld\n", GetLastError());\ + ok(tme.cbSize == sizeof(tme), "wrong tme.cbSize %lu\n", tme.cbSize); \ ok(tme.dwFlags == (expected_track_flags), \ "wrong tme.dwFlags %08lx, expected %08x\n", tme.dwFlags, (expected_track_flags)); \ ok(tme.hwndTrack == (expected_track_hwnd), \ @@ -7672,6 +7714,10 @@ #define track_hover_cancel(track_hwnd) \ ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERTIME) failed\n"); trace("SPI_GETMOUSEHOVERTIME returned %u ms\n", default_hover_time); + SystemParametersInfo(SPI_GETMOUSEHOVERWIDTH, 0, &hover_width, 0); + SystemParametersInfo(SPI_GETMOUSEHOVERHEIGHT, 0, &hover_height, 0); + trace("hover rect is %u x %d\n", hover_width, hover_height); + hwnd = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, @@ -7734,32 +7780,34 @@ #define track_hover_cancel(track_hwnd) \ track_hover(hwnd, 0); track_query(TME_HOVER, hwnd, default_hover_time); - start_ticks = GetTickCount(); - do - { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - /* Timer proc messages are not dispatched to the window proc, - * and therefore not logged. - */ - if (msg.message == WM_TIMER || msg.message == WM_SYSTIMER) - { - struct message s_msg; - s_msg.message = msg.message; - s_msg.flags = sent|wparam|lparam; - s_msg.wParam = msg.wParam; - s_msg.lParam = msg.lParam; - add_message(&s_msg); - } - DispatchMessage(&msg); - } + pump_msg_loop_timeout(default_hover_time, FALSE); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); - end_ticks = GetTickCount(); - } while (start_ticks + default_hover_time >= end_ticks); + track_query(0, NULL, 0); + + track_hover(hwnd, HOVER_DEFAULT); + track_query(TME_HOVER, hwnd, default_hover_time); + + Sleep(default_hover_time / 2); + mouse_event(MOUSEEVENTF_MOVE, -1, 0, 0, 0); + mouse_event(MOUSEEVENTF_MOVE, 1, 0, 0, 0); + + track_query(TME_HOVER, hwnd, default_hover_time); + + pump_msg_loop_timeout(default_hover_time / 2, FALSE); ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); track_query(0, NULL, 0); + + track_hover(hwnd, HOVER_DEFAULT); + track_query(TME_HOVER, hwnd, default_hover_time); + + pump_msg_loop_timeout(default_hover_time, TRUE); + ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); + + track_query(0, NULL, 0); + track_hover(hwnd, HOVER_DEFAULT); track_query(TME_HOVER, hwnd, default_hover_time); track_hover_cancel(hwnd);

1 0

Dmitry Timoshkov : user: Various TrackMouseEvent fixes.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 5292f976112d6e91f91ff6f46ff4634e3d2690de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5292f976112d6e91f91ff6f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 24 21:19:25 2006 +0900 user: Various TrackMouseEvent fixes. - Use WINPOS_WindowFromPoint instead of WindowFromPoint in order to use hittest directly to simplify the code. - WM_NCMOUSEHOVER and WM_MOUSEHOVER take different parameters. --- dlls/user/input.c | 88 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 32 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 46f4ae9..131bcd8 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -745,21 +745,26 @@ typedef struct __TRACKINGLIST { static _TRACKINGLIST tracking_info; static UINT_PTR timer; -static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR idEvent, - DWORD dwTime) +static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, + DWORD dwTime) { POINT pos; - POINT posClient; - HWND hwnd; - INT hoverwidth = 0, hoverheight = 0; - RECT client; + INT hoverwidth = 0, hoverheight = 0, hittest; + + TRACE("hwnd %p, msg %04x, id %04x, time %lu\n", hwnd, uMsg, idEvent, dwTime); GetCursorPos(&pos); - hwnd = WindowFromPoint(pos); + hwnd = WINPOS_WindowFromPoint(hwnd, pos, &hittest); + + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0); SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0); + TRACE("tracked pos %s, current pos %s, hover width %d, hover height %d\n", + wine_dbgstr_point(&tracking_info.pos), wine_dbgstr_point(&pos), + hoverwidth, hoverheight); + /* see if this tracking event is looking for TME_LEAVE and that the */ /* mouse has left the window */ if (tracking_info.tme.dwFlags & TME_LEAVE) @@ -776,9 +781,7 @@ static void CALLBACK TrackMouseEventProc } else { - GetClientRect(hwnd, &client); - MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2); - if (PtInRect(&client, pos)) + if (hittest == HTCLIENT) { if (tracking_info.tme.dwFlags & TME_NONCLIENT) { @@ -799,29 +802,38 @@ static void CALLBACK TrackMouseEventProc } } + if (tracking_info.tme.hwndTrack != hwnd) + { + /* mouse is gone, stop tracking mouse hover */ + tracking_info.tme.dwFlags &= ~TME_HOVER; + } + /* see if we are tracking hovering for this hwnd */ if (tracking_info.tme.dwFlags & TME_HOVER) { /* has the cursor moved outside the rectangle centered around pos? */ - if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2.0)) || - (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2.0))) + if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2)) || + (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2))) { - /* record this new position as the current position and reset */ - /* the iHoverTime variable to 0 */ + /* record this new position as the current position */ tracking_info.pos = pos; } else { - posClient.x = pos.x; - posClient.y = pos.y; - ScreenToClient(hwnd, &posClient); + if (hittest == HTCLIENT) + { + ScreenToClient(hwnd, &pos); + TRACE("client cursor pos %s\n", wine_dbgstr_point(&pos)); - if (tracking_info.tme.dwFlags & TME_NONCLIENT) - PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); - else PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER, - get_key_state(), MAKELPARAM( posClient.x, posClient.y )); + get_key_state(), MAKELPARAM( pos.x, pos.y )); + } + else + { + if (tracking_info.tme.dwFlags & TME_NONCLIENT) + PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER, + hittest, MAKELPARAM( pos.x, pos.y )); + } /* stop tracking mouse hover */ tracking_info.tme.dwFlags &= ~TME_HOVER; @@ -831,10 +843,11 @@ static void CALLBACK TrackMouseEventProc /* stop the timer if the tracking list is empty */ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - memset(&tracking_info, 0, sizeof(tracking_info)); - - KillSystemTimer(0, timer); + KillSystemTimer(tracking_info.tme.hwndTrack, timer); timer = 0; + tracking_info.tme.hwndTrack = 0; + tracking_info.tme.dwFlags = 0; + tracking_info.tme.dwHoverTime = 0; } } @@ -867,8 +880,9 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) HWND hwnd; POINT pos; DWORD hover_time; + INT hittest; - TRACE("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + TRACE("%lx, %lx, %p, %lu\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { WARN("wrong TRACKMOUSEEVENT size from app\n"); @@ -897,7 +911,8 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0); GetCursorPos(&pos); - hwnd = WindowFromPoint(pos); + hwnd = WINPOS_WindowFromPoint(ptme->hwndTrack, pos, &hittest); + TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); @@ -911,13 +926,23 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) /* if we aren't tracking on hover or leave remove this entry */ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE))) { - memset(&tracking_info, 0, sizeof(tracking_info)); - - KillSystemTimer(0, timer); + KillSystemTimer(tracking_info.tme.hwndTrack, timer); timer = 0; + tracking_info.tme.hwndTrack = 0; + tracking_info.tme.dwFlags = 0; + tracking_info.tme.dwHoverTime = 0; } } } else { + if (timer) + { + KillSystemTimer(tracking_info.tme.hwndTrack, timer); + timer = 0; + tracking_info.tme.hwndTrack = 0; + tracking_info.tme.dwFlags = 0; + tracking_info.tme.dwHoverTime = 0; + } + if (ptme->hwndTrack == hwnd) { /* Adding new mouse event to the tracking list */ @@ -927,8 +952,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) /* Initialize HoverInfo variables even if not hover tracking */ tracking_info.pos = pos; - if (!timer) - timer = SetSystemTimer(0, 0, hover_time, TrackMouseEventProc); + timer = SetSystemTimer(tracking_info.tme.hwndTrack, 0, hover_time, TrackMouseEventProc); } }

1 0

Dmitry Timoshkov : user: Add a trace to EndDeferWindowPos.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: e882cdf55cc004b5ffb7b85d912b4733da761ba6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e882cdf55cc004b5ffb7b85… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 24 21:13:36 2006 +0900 user: Add a trace to EndDeferWindowPos. --- dlls/user/winpos.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index a3b7648..6bc9056 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -1331,6 +1331,10 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp if (!pDWP) return FALSE; for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++) { + TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", + winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, + winpos->cx, winpos->cy, winpos->flags); + if (!(res = USER_Driver->pSetWindowPos( winpos ))) break; } USER_HEAP_FREE( hdwp );

1 0

Dmitry Timoshkov : user: Use (win) debug channel by default, add a TRACE to SendInput.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: b32597826e220b65c29e2feb19cfce56c36f40be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b32597826e220b65c29e2fe… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 24 21:13:53 2006 +0900 user: Use (win) debug channel by default, add a TRACE to SendInput. --- dlls/user/input.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index f8e94ae..46f4ae9 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -39,13 +39,14 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "wine/server.h" -#include "user_private.h" #include "winternl.h" -#include "wine/debug.h" #include "winerror.h" +#include "win.h" +#include "user_private.h" +#include "wine/server.h" +#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(key); +WINE_DEFAULT_DEBUG_CHANNEL(win); WINE_DECLARE_DEBUG_CHANNEL(keyboard); @@ -80,6 +81,38 @@ static WORD get_key_state(void) */ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) { + if (TRACE_ON(win)) + { + UINT i; + + for (i = 0; i < count; i++) + { + switch(inputs[i].type) + { + case INPUT_MOUSE: + TRACE("mouse: dx %ld, dy %ld, data %lx, flags %lx, time %lu, info %lx\n", + inputs[i].u.mi.dx, inputs[i].u.mi.dy, inputs[i].u.mi.mouseData, + inputs[i].u.mi.dwFlags, inputs[i].u.mi.time, inputs[i].u.mi.dwExtraInfo); + break; + + case INPUT_KEYBOARD: + TRACE("keyboard: vk %x, scan %x, flags %lx, time %lu, info %lx\n", + inputs[i].u.ki.wVk, inputs[i].u.ki.wScan, inputs[i].u.ki.dwFlags, + inputs[i].u.ki.time, inputs[i].u.ki.dwExtraInfo); + break; + + case INPUT_HARDWARE: + TRACE("hardware: msg %ld, wParamL %x, wParamH %x\n", + inputs[i].u.hi.uMsg, inputs[i].u.hi.wParamL, inputs[i].u.hi.wParamH); + break; + + default: + FIXME("unknown input type %lu\n", inputs[i].type); + break; + } + } + } + return USER_Driver->pSendInput( count, inputs, size ); }

1 0

Christian Gmeiner : setupapi: Move SetupDiGetClassDevsExW into devinst.c.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: c514700be28e33f5d237d5718a427fa07bc4e95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c514700be28e33f5d237d57… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Mon Jul 24 13:13:47 2006 +0200 setupapi: Move SetupDiGetClassDevsExW into devinst.c. --- dlls/setupapi/devinst.c | 16 ++++++++++++++++ dlls/setupapi/stubs.c | 11 ----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7c87b25..50d17e5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1026,6 +1026,22 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( } /*********************************************************************** + * SetupDiGetClassDevsExW (SETUPAPI.@) + */ +HDEVINFO WINAPI SetupDiGetClassDevsExW( + CONST GUID *class, + PCWSTR enumstr, + HWND parent, + DWORD flags, + HDEVINFO deviceset, + PCWSTR machine, + PVOID reserved) +{ + FIXME("stub"); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInterfaces (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInterfaces( diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index bb52803..eb3d06e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -80,17 +80,6 @@ HDEVINFO WINAPI SetupDiGetClassDevsExA(c } /*********************************************************************** - * (SETUPAPI.@) - * - * NO WINAPI in description given - */ -HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR filter, HWND parent, DWORD flags, HDEVINFO deviceset, PCWSTR machine, PVOID reserved) -{ - FIXME("\n"); - return FALSE; -} - -/*********************************************************************** * CM_Connect_MachineW (SETUPAPI.@) */ DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine)

1 0

Mike McCormack : msi: Make MsiConfigureFeature a bit more robust.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: bc673bff01b228fc99556dd1319d24a4b6cffc9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc673bff01b228fc99556dd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 20:34:14 2006 +0900 msi: Make MsiConfigureFeature a bit more robust. --- dlls/msi/msi.c | 19 +++++++++++++++---- dlls/msi/tests/msi.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 70f9c9b..5ef72bd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1715,6 +1715,21 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR if (!szProduct || !szFeature) return ERROR_INVALID_PARAMETER; + switch (eInstallState) + { + case INSTALLSTATE_DEFAULT: + /* FIXME: how do we figure out the default location? */ + eInstallState = INSTALLSTATE_LOCAL; + break; + case INSTALLSTATE_LOCAL: + case INSTALLSTATE_SOURCE: + case INSTALLSTATE_ABSENT: + case INSTALLSTATE_ADVERTISED: + break; + default: + return ERROR_INVALID_PARAMETER; + } + r = MSI_OpenProductW( szProduct, &package ); if (r != ERROR_SUCCESS) return r; @@ -1731,10 +1746,6 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); - /* FIXME: how do we figure out the default location? */ - if (eInstallState == INSTALLSTATE_DEFAULT) - eInstallState = INSTALLSTATE_LOCAL; - r = ACTION_PerformUIAction( package, szCostInit ); if (r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index d6ddf02..3b98d53 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -90,6 +90,18 @@ static void test_null(void) r = MsiEnumFeaturesW(NULL,0,NULL,NULL); ok( r == ERROR_INVALID_PARAMETER,"wrong error\n"); + + r = MsiConfigureFeatureW(NULL, NULL, 0); + ok( r == ERROR_INVALID_PARAMETER, "wrong error\n"); + + r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", NULL, 0); + ok( r == ERROR_INVALID_PARAMETER, "wrong error\n"); + + r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", "foo", 0); + ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); + + r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", "foo", INSTALLSTATE_DEFAULT); + ok( r == ERROR_UNKNOWN_PRODUCT, "wrong error %d\n", r); } static void test_getcomponentpath(void)

1 0

Mike McCormack : msi: Use CLSIDFromString to make squash_guid a bit more robust.
by Alexandre Julliard July 24, 2006

July 24, 2006

Module: wine Branch: refs/heads/master Commit: 9f89427291d54b94e3e390aea5f48504774a4f0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f89427291d54b94e3e390a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 20:34:05 2006 +0900 msi: Use CLSIDFromString to make squash_guid a bit more robust. --- dlls/msi/registry.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index fe51ae7..e9c33f1 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -189,39 +189,33 @@ BOOL unsquash_guid(LPCWSTR in, LPWSTR ou BOOL squash_guid(LPCWSTR in, LPWSTR out) { - DWORD i,n=0; + DWORD i,n=1; + GUID guid; - if(in[n++] != '{') + if (FAILED(CLSIDFromString((LPOLESTR)in, &guid))) return FALSE; + for(i=0; i<8; i++) out[7-i] = in[n++]; - if(in[n++] != '-') - return FALSE; + n++; for(i=0; i<4; i++) out[11-i] = in[n++]; - if(in[n++] != '-') - return FALSE; + n++; for(i=0; i<4; i++) out[15-i] = in[n++]; - if(in[n++] != '-') - return FALSE; + n++; for(i=0; i<2; i++) { out[17+i*2] = in[n++]; out[16+i*2] = in[n++]; } - if(in[n++] != '-') - return FALSE; + n++; for( ; i<8; i++) { out[17+i*2] = in[n++]; out[16+i*2] = in[n++]; } out[32]=0; - if(in[n++] != '}') - return FALSE; - if(in[n]) - return FALSE; return TRUE; }

1 0