ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

explorer,shell32: Improve ABM_GETTASKBARPOS stub.

This commit is contained in:
Vincent Povirk 2008-12-06 12:43:03 -06:00 committed by Alexandre Julliard
parent 341d55b400
commit 3f68641b92
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shell32/appbar.c
View File

@ -46,7 +46,7 @@ struct appbar_cmd
struct appbar_response struct appbar_response
{ {
UINT_PTR result; UINT_PTR result;
RECT rc; APPBARDATA abd;
}; };
/************************************************************************* /*************************************************************************
@ -112,7 +112,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
response = (struct appbar_response*)return_view; response = (struct appbar_response*)return_view;
ret = response->result; ret = response->result;
data->rc = response->rc; *data = response->abd;
UnmapViewOfFile(return_view); UnmapViewOfFile(return_view);

3
dlls/shell32/tests/appbar.c
View File

@ -400,11 +400,8 @@ static void test_appbarget(void)
if(ret) if(ret)
{ {
ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n");
todo_wine
{
ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n");
ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); ok(abd.rc.left != 0xcccccccc, "rc not updated\n");
}
} }
return; return;

12
programs/explorer/appbar.c
View File

@ -47,7 +47,7 @@ struct appbar_cmd
struct appbar_response struct appbar_response
{ {
UINT_PTR result; UINT_PTR result;
RECT rc; APPBARDATA abd;
}; };
static HWND appbarmsg_window = NULL; static HWND appbarmsg_window = NULL;
@ -195,7 +195,13 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd)
return ABS_ALWAYSONTOP | ABS_AUTOHIDE; return ABS_ALWAYSONTOP | ABS_AUTOHIDE;
case ABM_GETTASKBARPOS: case ABM_GETTASKBARPOS:
WINE_FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", abd->hWnd); WINE_FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", abd->hWnd);
return FALSE; /* Report the taskbar is at the bottom of the screen. */
abd->rc.left = 0;
abd->rc.right = GetSystemMetrics(SM_CXSCREEN);
abd->rc.bottom = GetSystemMetrics(SM_CYSCREEN);
abd->rc.top = abd->rc.bottom-1;
abd->uEdge = ABE_BOTTOM;
return TRUE;
case ABM_ACTIVATE: case ABM_ACTIVATE:
WINE_FIXME("SHAppBarMessage(ABM_ACTIVATE, hwnd=%p, lparam=%lx): stub\n", abd->hWnd, abd->lParam); WINE_FIXME("SHAppBarMessage(ABM_ACTIVATE, hwnd=%p, lparam=%lx): stub\n", abd->hWnd, abd->lParam);
return TRUE; return TRUE;
@ -256,7 +262,7 @@ LRESULT CALLBACK appbar_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara
{ {
response = (struct appbar_response*)return_view; response = (struct appbar_response*)return_view;
response->result = result; response->result = result;
response->rc = cmd.abd.rc; response->abd = cmd.abd;
UnmapViewOfFile(return_view); UnmapViewOfFile(return_view);
} }