January 2008 - Wine-commits

Alexander Dorofeyev : wined3d: Change colorkey fixup for stage 0 alphaop / alphaarg.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 536f98000d53191124cb5b43bbf0d2a7448b115c URL: http://source.winehq.org/git/wine.git/?a=commit;h=536f98000d53191124cb5b43b… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 20 20:17:49 2008 -0800 wined3d: Change colorkey fixup for stage 0 alphaop / alphaarg. --- dlls/wined3d/state.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5e6be54..a374c76 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -351,6 +351,12 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D TRACE("glBlendFunc src=%x, dst=%x\n", srcBlend, dstBlend); glBlendFunc(srcBlend, dstBlend); checkGLcall("glBlendFunc"); + + /* colorkey fixup for stage 0 alphaop depends on WINED3DRS_ALPHABLENDENABLE state, + so it may need updating */ + if (stateblock->renderState[WINED3DRS_COLORKEYENABLE]) { + StateTable[STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP)].apply(STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), stateblock, context); + } } static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -1950,13 +1956,38 @@ static void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D * cannot remove the texture's alpha channel entirely. * * The fixup is required for Prince of Persia 3D(prison bars), while Moto racer 2 requires D3DTOP_MODULATE to work - * on color keyed surfaces. + * on color keyed surfaces. Aliens vs Predator 1 uses color keyed textures and alpha component of diffuse color to + * draw things like translucent text and perform other blending effects. * + * Aliens vs Predator 1 relies on diffuse alpha having an effect, so it cannot be ignored. To provide the + * behavior expected by the game, while emulating the colorkey, diffuse alpha must be modulated with texture alpha. + * OTOH, Moto racer 2 at some points sets alphaop/alphaarg to SELECTARG/CURRENT, yet puts garbage in diffuse alpha + * (zeroes). This works on native, because the game disables alpha test and alpha blending. Alpha test is overwritten by + * wine's for purposes of color-keying though, so this will lead to missing geometry if texture alpha is modulated + * (pixels fail alpha test). To get around this, ALPHABLENDENABLE state is checked: if the app enables alpha blending, + * it can be expected to provide meaningful values in diffuse alpha, so it should be modulated with texture alpha; + * otherwise, selecting diffuse alpha is ignored in favour of texture alpha. + * What to do with multitexturing? So far no app has been found that uses color keying with multitexturing */ - if(op == WINED3DTOP_DISABLE) op = WINED3DTOP_SELECTARG1; - if(op == WINED3DTOP_SELECTARG1) arg1 = WINED3DTA_TEXTURE; - else if(op == WINED3DTOP_SELECTARG2) arg2 = WINED3DTA_TEXTURE; + if(op == WINED3DTOP_DISABLE) { + arg1 = WINED3DTA_TEXTURE; + op = WINED3DTOP_SELECTARG1; + } + else if(op == WINED3DTOP_SELECTARG1 && arg1 != WINED3DTA_TEXTURE) { + if (stateblock->renderState[WINED3DRS_ALPHABLENDENABLE]) { + arg2 = WINED3DTA_TEXTURE; + op = WINED3DTOP_MODULATE; + } + else arg1 = WINED3DTA_TEXTURE; + } + else if(op == WINED3DTOP_SELECTARG2 && arg2 != WINED3DTA_TEXTURE) { + if (stateblock->renderState[WINED3DRS_ALPHABLENDENABLE]) { + arg1 = WINED3DTA_TEXTURE; + op = WINED3DTOP_MODULATE; + } + else arg2 = WINED3DTA_TEXTURE; + } } }

1 0

Alexander Dorofeyev : ddraw: Fix handling of alpha with D3DTBLEND_MODULATE.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 6810ebb4c17628f2f6f7dc754914b853fbf066d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6810ebb4c17628f2f6f7dc754… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 20 20:17:54 2008 -0800 ddraw: Fix handling of alpha with D3DTBLEND_MODULATE. --- dlls/ddraw/device.c | 273 +++++++++++++++++++++++++++++++++++++------- dlls/ddraw/executebuffer.c | 2 +- 2 files changed, 233 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6810ebb4c17628f2f6f7d…

1 0

Alexander Dorofeyev : ddraw/tests: Add test for D3DTBLEND_MODULATE.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 320e2538054af2dcdb9ebe21650edc1225ea6bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=320e2538054af2dcdb9ebe216… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jan 20 20:18:03 2008 -0800 ddraw/tests: Add test for D3DTBLEND_MODULATE. --- dlls/ddraw/tests/visual.c | 781 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 781 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=320e2538054af2dcdb9eb…

1 0

Alexandre Julliard : winex11.drv: Fix handling of strange window sizes in CreateWindow, with tests.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 390ae9cc2845fe002bc2e68c14d104d927af68b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390ae9cc2845fe002bc2e68c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 10:16:19 2008 +0100 winex11.drv: Fix handling of strange window sizes in CreateWindow, with tests. --- dlls/user32/tests/win.c | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 42 +++++------------------- 2 files changed, 88 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 49fe766..d0a9673 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3733,6 +3733,43 @@ static LRESULT CALLBACK minmax_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM l return 1; } +static int expected_cx, expected_cy; +static RECT expected_rect; + +static LRESULT CALLBACK winsizes_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch(msg) + { + case WM_GETMINMAXINFO: + { + RECT rect; + GetWindowRect( hwnd, &rect ); + ok( !rect.left && !rect.top && !rect.right && !rect.bottom, + "wrong rect %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + return DefWindowProc(hwnd, msg, wp, lp); + } + case WM_NCCREATE: + case WM_CREATE: + { + CREATESTRUCTA *cs = (CREATESTRUCTA *)lp; + RECT rect; + GetWindowRect( hwnd, &rect ); + trace( "hwnd %p msg %x size %dx%d rect %d,%d-%d,%d\n", + hwnd, msg, cs->cx, cs->cy, rect.left, rect.top, rect.right, rect.bottom ); + ok( cs->cx == expected_cx, "wrong x size %d/%d\n", cs->cx, expected_cx ); + ok( cs->cy == expected_cy, "wrong y size %d/%d\n", cs->cy, expected_cy ); + ok( rect.right - rect.left == expected_rect.right - expected_rect.left && + rect.bottom - rect.top == expected_rect.bottom - expected_rect.top, + "wrong rect %d,%d-%d,%d / %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom, + expected_rect.left, expected_rect.top, expected_rect.right, expected_rect.bottom ); + return DefWindowProc(hwnd, msg, wp, lp); + } + default: + return DefWindowProc(hwnd, msg, wp, lp); + } +} + static void test_CreateWindow(void) { WNDCLASS cls; @@ -3986,11 +4023,53 @@ static void test_CreateWindow(void) ok(EqualRect(&rc, &rc_minmax), "rects don't match: (%d,%d-%d,%d) and (%d,%d-%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom, rc_minmax.left, rc_minmax.top, rc_minmax.right, rc_minmax.bottom); + DestroyWindow(hwnd); + + cls.lpfnWndProc = winsizes_wnd_proc; + cls.lpszClassName = "Sizes_WndClass"; + RegisterClass(&cls); + + expected_cx = expected_cy = 200000; + SetRect( &expected_rect, 0, 0, 200000, 200000 ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, 300000, 300000, 200000, 200000, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right == 200000, "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 200000, "invalid rect bottom %u\n", rc.bottom ); + DestroyWindow(hwnd); + + expected_cx = expected_cy = -10; + SetRect( &expected_rect, 0, 0, 0, 0 ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right == 0, "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0, "invalid rect bottom %u\n", rc.bottom ); + DestroyWindow(hwnd); + expected_cx = expected_cy = -200000; + SetRect( &expected_rect, 0, 0, 0, 0 ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right == 0, "invalid rect right %u\n", rc.right ); + ok( rc.bottom == 0, "invalid rect bottom %u\n", rc.bottom ); DestroyWindow(hwnd); + + /* top level window */ + expected_cx = expected_cy = 200000; + SetRect( &expected_rect, 0, 0, GetSystemMetrics(SM_CXMAXTRACK), GetSystemMetrics(SM_CYMAXTRACK) ); + hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_OVERLAPPEDWINDOW, 300000, 300000, 200000, 200000, 0, 0, 0, NULL); + ok( hwnd != 0, "creation failed err %u\n", GetLastError()); + GetClientRect( hwnd, &rc ); + ok( rc.right <= expected_cx, "invalid rect right %u\n", rc.right ); + ok( rc.bottom <= expected_cy, "invalid rect bottom %u\n", rc.bottom ); + DestroyWindow(hwnd); + DestroyWindow(parent); UnregisterClass("MinMax_WndClass", GetModuleHandle(0)); + UnregisterClass("Sizes_WndClass", GetModuleHandle(0)); #undef expect_menu #undef expect_style diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 84209b7..3f65602 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1296,37 +1296,13 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) CBT_CREATEWNDA cbtc; CREATESTRUCTA cbcs; BOOL ret = FALSE; + INT cx = cs->cx, cy = cs->cy; if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - if (cs->cx > 65535) - { - ERR( "invalid window width %d\n", cs->cx ); - cs->cx = 65535; - } - if (cs->cy > 65535) - { - ERR( "invalid window height %d\n", cs->cy ); - cs->cy = 65535; - } - if (cs->cx < 0) - { - ERR( "invalid window width %d\n", cs->cx ); - cs->cx = 0; - } - if (cs->cy < 0) - { - ERR( "invalid window height %d\n", cs->cy ); - cs->cy = 0; - } - if (hwnd == GetDesktopWindow()) get_desktop_xwin( display, data ); else { - /* initialize the dimensions before sending WM_GETMINMAXINFO */ - SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); - X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER | SWP_NOACTIVATE, NULL ); - /* create an X window if it's a top level window */ if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) { @@ -1360,16 +1336,16 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) POINT maxSize, maxPos, minTrack, maxTrack; WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); - if (maxTrack.x < cs->cx) cs->cx = maxTrack.x; - if (maxTrack.y < cs->cy) cs->cy = maxTrack.y; - if (cs->cx < 0) cs->cx = 0; - if (cs->cy < 0) cs->cy = 0; - - SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); - if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER | SWP_NOACTIVATE, NULL )) - return FALSE; + if (maxTrack.x < cx) cx = maxTrack.x; + if (maxTrack.y < cy) cy = maxTrack.y; } + if (cx < 0) cx = 0; + if (cy < 0) cy = 0; + SetRect( &rect, cs->x, cs->y, cs->x + cx, cs->y + cy ); + if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER | SWP_NOACTIVATE, NULL )) + return FALSE; + /* send WM_NCCREATE */ TRACE( "hwnd %p cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cs->cx, cs->cy ); if (unicode)

1 0

Alexandre Julliard : winex11.drv: Only allocate wm hints if we have an X11 window.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: dc07b6f969cd5878657d70cdf8f8f1182b2eaad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc07b6f969cd5878657d70cdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 10:17:52 2008 +0100 winex11.drv: Only allocate wm hints if we have an X11 window. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 3f65602..9ed5e1f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -773,6 +773,7 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); + data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); if (data->wm_hints) @@ -1100,6 +1101,8 @@ static void destroy_whole_window( Display *display, struct x11drv_win_data *data } /* Outlook stops processing messages after destroying a dialog, so we need an explicit flush */ XFlush( display ); + XFree( data->wm_hints ); + data->wm_hints = NULL; wine_tsx11_unlock(); RemovePropA( data->hwnd, whole_window_prop ); } @@ -1193,7 +1196,6 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); XDeleteContext( display, (XID)hwnd, win_data_context ); - XFree( data->wm_hints ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); } @@ -1210,7 +1212,6 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if (!winContext) winContext = XUniqueContext(); if (!win_data_context) win_data_context = XUniqueContext(); XSaveContext( display, (XID)hwnd, win_data_context, (char *)data ); - data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); } return data;

1 0

Alexandre Julliard : ntdll: Don't fetch extended FPU context if there' s no FPU context at all.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 0375b7a1f323b0bf77c08b7df57a8153443eae91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0375b7a1f323b0bf77c08b7df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 10:20:12 2008 +0100 ntdll: Don't fetch extended FPU context if there's no FPU context at all. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 172d362..a6ca6fd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -125,7 +125,7 @@ typedef ucontext_t SIGCONTEXT; #define ERROR_sig(context) ((context)->uc_mcontext.gregs[REG_ERR]) #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) -#define FPUX_sig(context) ((context)->uc_mcontext.fpregs->status >> 16 ? NULL : (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1)) +#define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) #define VM86_EAX 0 /* the %eax value while vm86_enter is executing */

1 0

Stefan Leichter : advapi32: Added some tests for QueryServiceConfig2A/W.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: d6748c9db79b528f203632000ed8d72697d4848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6748c9db79b528f203632000… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Jan 20 23:56:19 2008 +0100 advapi32: Added some tests for QueryServiceConfig2A/W. --- dlls/advapi32/tests/service.c | 175 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4b7bd31..fff5f24 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -843,6 +843,180 @@ static void test_sequence(void) HeapFree(GetProcessHeap(), 0, config); } +static void test_queryconfig2(void) +{ + SC_HANDLE scm_handle, svc_handle; + BOOL ret; + DWORD expected, needed; + BYTE buffer[MAX_PATH]; + LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + static const CHAR servicename [] = "Winetest"; + static const CHAR displayname [] = "Winetest dummy service"; + static const CHAR pathname [] = "we_dont_care.exe"; + static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; + static const CHAR password [] = ""; + static const CHAR description [] = "Description"; + HMODULE dllhandle = GetModuleHandleA("advapi32.dll"); + BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) + = (void*)GetProcAddress(dllhandle, "QueryServiceConfig2A"); + BOOL (WINAPI *pQueryServiceConfig2W)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD) + = (void*)GetProcAddress(dllhandle, "QueryServiceConfig2W"); + if(!pQueryServiceConfig2A) + { + skip("function QueryServiceConfig2A not present\n"); + return; + } + + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle) + { + if(GetLastError() == ERROR_ACCESS_DENIED) + skip("Not enough rights to get a handle to the manager\n"); + else + ok(FALSE, "Could not get a handle to the manager: %d\n", GetLastError()); + return; + } + + /* Create a dummy service */ + SetLastError(0xdeadbeef); + svc_handle = CreateServiceA(scm_handle, servicename, displayname, GENERIC_ALL, + SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, SERVICE_ERROR_IGNORE, + pathname, NULL, NULL, dependencies, NULL, password); + + if (!svc_handle) + { + if(GetLastError() == ERROR_SERVICE_EXISTS) + { + /* We try and open the service and do the rest of the tests. Some could + * fail if the tests were changed between these runs. + */ + trace("Deletion probably didn't work last time\n"); + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + if (!svc_handle) + { + if(GetLastError() == ERROR_ACCESS_DENIED) + skip("Not enough rights to open the service\n"); + else + ok(FALSE, "Could not open the service : %d\n", GetLastError()); + CloseServiceHandle(scm_handle); + return; + } + } + if (GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to create the service\n"); + CloseServiceHandle(scm_handle); + return; + } + ok(svc_handle != NULL, "Could not create the service : %d\n", GetLastError()); + if (!svc_handle) + { + CloseServiceHandle(scm_handle); + return; + } + } + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle,0xfff0,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INVALID_LEVEL == GetLastError(), "expected error ERROR_INVALID_LEVEL, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle,0xfff0,buffer,sizeof(SERVICE_DESCRIPTIONA),NULL); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INVALID_LEVEL == GetLastError(), "expected error ERROR_INVALID_LEVEL, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),NULL); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INVALID_ADDRESS == GetLastError(), "expected error ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,sizeof(SERVICE_DESCRIPTIONA),&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INVALID_ADDRESS == GetLastError(), "expected error ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,sizeof(SERVICE_DESCRIPTIONA),NULL); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INVALID_ADDRESS == GetLastError(), "expected error ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + + needed = 0; + pConfig->lpDescription = (LPSTR)0xdeadbeef; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); + ok(!pConfig->lpDescription, "expected lpDescription to be NULL, got %p", pConfig->lpDescription); + + SetLastError(0xdeadbeef); + needed = 0; + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,0,&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed == sizeof(SERVICE_DESCRIPTIONA), "expected needed to be %d, got %d\n", sizeof(SERVICE_DESCRIPTIONA), needed); + + pConfig->lpDescription = (LPSTR) description; + ret = ChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer); + ok(ret, "ChangeServiceConfig2A failed\n"); + if (!ret) { + goto cleanup; + } + + SetLastError(0xdeadbeef); + needed = 0; + expected = sizeof(SERVICE_DESCRIPTIONA) + sizeof(description) * sizeof(WCHAR); /* !! */ + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,sizeof(SERVICE_DESCRIPTIONA),&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed == expected, "expected needed to be %d, got %d\n", expected, needed); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,needed-1,&needed); + ok(!ret, "expected QueryServiceConfig2A to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer,needed,&needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description,pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n",description ,pConfig->lpDescription); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2A(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed + 1,&needed); + ok(ret, "expected QueryServiceConfig2A to succeed\n"); + ok(pConfig->lpDescription && !strcmp(description,pConfig->lpDescription), + "expected lpDescription to be %s, got %s\n",description ,pConfig->lpDescription); + + if(!pQueryServiceConfig2W) + { + skip("function QueryServiceConfig2W not present\n"); + goto cleanup; + } + SetLastError(0xdeadbeef); + needed = 0; + expected = sizeof(SERVICE_DESCRIPTIONW) + sizeof(WCHAR) * sizeof(description); + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,NULL,0,&needed); + ok(!ret, "expected QueryServiceConfig2W to fail\n"); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(needed == expected, "expected needed to be %d, got %d\n", expected, needed); + + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); + ok(ret, "expected QueryServiceConfig2W to succeed\n"); + +cleanup: + DeleteService(svc_handle); + + CloseServiceHandle(svc_handle); + + /* Wait a while. The following test does a CreateService again */ + Sleep(1000); + + CloseServiceHandle(scm_handle); +} + static void test_refcount(void) { SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; @@ -967,6 +1141,7 @@ START_TEST(service) test_close(); /* Test the creation, querying and deletion of a service */ test_sequence(); + test_queryconfig2(); /* The main reason for this test is to check if any refcounting is used * and what the rules are */

1 0

Alexandre Julliard : user32, server: Set the initial window rectangles to 0, 0-0,0.
by Alexandre Julliard 22 Jan '08

22 Jan '08

Module: wine Branch: master Commit: 30d84fcd77dc90624352b139bde8671eef8dd9ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d84fcd77dc90624352b139b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 22 10:15:38 2008 +0100 user32,server: Set the initial window rectangles to 0,0-0,0. --- dlls/user32/win.c | 2 ++ dlls/winex11.drv/window.c | 19 +++---------------- server/window.c | 2 ++ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b1dec05..9730df2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -166,6 +166,8 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, win->dwMagic = WND_MAGIC; win->flags = 0; win->cbWndExtra = extra_bytes; + SetRectEmpty( &win->rectWindow ); + SetRectEmpty( &win->rectClient ); memset( win->wExtra, 0, extra_bytes ); CLASS_AddWindow( class, win, unicode ); return win; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 109b142..84209b7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1203,22 +1203,9 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) { struct x11drv_win_data *data; - if ((data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)))) - { - data->hwnd = hwnd; - data->whole_window = 0; - data->icon_window = 0; - data->fbconfig_id = 0; - data->gl_drawable = 0; - data->pixmap = 0; - data->xic = 0; - data->managed = FALSE; - data->wm_state = 0; - data->dce = NULL; - data->lock_changes = 0; - data->hWMIconBitmap = 0; - data->hWMIconMask = 0; - + if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) + { + data->hwnd = hwnd; wine_tsx11_lock(); if (!winContext) winContext = XUniqueContext(); if (!win_data_context) win_data_context = XUniqueContext(); diff --git a/server/window.c b/server/window.c index 8cf8001..201f804 100644 --- a/server/window.c +++ b/server/window.c @@ -424,6 +424,7 @@ void close_desktop_window( struct desktop *desktop ) static struct window *create_window( struct window *parent, struct window *owner, atom_t atom, void *instance ) { + static const rectangle_t empty_rect; int extra_bytes; struct window *win; struct desktop *desktop; @@ -462,6 +463,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->prop_alloc = 0; win->properties = NULL; win->nb_extra_bytes = extra_bytes; + win->window_rect = win->visible_rect = win->client_rect = empty_rect; memset( win->extra_bytes, 0, extra_bytes ); list_init( &win->children ); list_init( &win->unlinked );

1 0

Jeremy Newman : change link to point to GPL v2
by Jeremy Newman 21 Jan '08

21 Jan '08

Module: website Branch: master Commit: 25476745e526f08238fdee22889f21d885c8c060 URL: http://source.winehq.org/git/website.git/?a=commit;h=25476745e526f08238fdee… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jan 21 09:43:21 2008 -0600 change link to point to GPL v2 --- templates/en/wwn.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/wwn.template b/templates/en/wwn.template index f911335..9884ec3 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -34,7 +34,7 @@ <td> <p align="center">All Kernel Cousin issues and summaries are copyright their original authors, and distributed under the terms of the<br> - <a href="http://www.gnu.org/licenses/gpl.txt">GNU General Public License, version 2.0</a>. + <a href="http://www.gnu.org/licenses/gpl2.txt">GNU General Public License, version 2.0</a>. </p> </td> </tr>

1 0

Rob Shearman : rpcrt4: Implement asynchronous RPC support.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 5f077bab07ba5cd7eebe7aeba48c6a570f39da4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f077bab07ba5cd7eebe7aeba… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jan 21 10:31:40 2008 +0000 rpcrt4: Implement asynchronous RPC support. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/rpc_binding.h | 2 + dlls/rpcrt4/rpc_message.c | 63 +++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/rpc_transport.c | 36 ++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 5cb090b..9fe0026 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = rpcrt4.dll IMPORTLIB = librpcrt4.$(IMPLIBEXT) IMPORTS = iphlpapi advapi32 kernel32 ntdll -DELAYIMPORTS = secur32 +DELAYIMPORTS = secur32 user32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index ed8d4ea..e3a3c95 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -73,6 +73,7 @@ typedef struct _RpcConnection /* client-only */ struct list conn_pool_entry; ULONG assoc_group_id; /* association group returned during binding */ + RPC_ASYNC_STATE *async_state; /* server-only */ /* The active interface bound to server. */ @@ -92,6 +93,7 @@ struct connection_ops { int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); + int (*wait_for_incoming_data)(RpcConnection *conn); size_t (*get_top_of_tower)(unsigned char *tower_data, const char *networkaddr, const char *endpoint); RPC_STATUS (*parse_top_of_tower)(const unsigned char *tower_data, size_t tower_size, char **networkaddr, char **endpoint); }; diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 07af1fc..ff1a808 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winuser.h" #include "rpc.h" #include "rpcndr.h" @@ -1039,6 +1040,49 @@ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) return RPC_S_OK; } +static void CALLBACK async_apc_notifier_proc(ULONG_PTR ulParam) +{ + RPC_ASYNC_STATE *state = (RPC_ASYNC_STATE *)ulParam; + state->u.APC.NotificationRoutine(state, NULL, state->Event); +} + +static DWORD WINAPI async_notifier_proc(LPVOID p) +{ + RpcConnection *conn = p; + RPC_ASYNC_STATE *state = conn->async_state; + + if (state && !conn->ops->wait_for_incoming_data(conn)) + { + state->Event = RpcCallComplete; + switch (state->NotificationType) + { + case RpcNotificationTypeEvent: + SetEvent(state->u.hEvent); + break; + case RpcNotificationTypeApc: + QueueUserAPC(async_apc_notifier_proc, state->u.APC.hThread, (ULONG_PTR)state); + break; + case RpcNotificationTypeIoc: + PostQueuedCompletionStatus(state->u.IOC.hIOPort, + state->u.IOC.dwNumberOfBytesTransferred, + state->u.IOC.dwCompletionKey, + state->u.IOC.lpOverlapped); + break; + case RpcNotificationTypeHwnd: + PostMessageW(state->u.HWND.hWnd, state->u.HWND.Msg, 0, 0); + break; + case RpcNotificationTypeCallback: + state->u.NotificationRoutine(state, NULL, state->Event); + break; + case RpcNotificationTypeNone: + default: + break; + } + } + + return 0; +} + /*********************************************************************** * I_RpcSend [RPCRT4.@] * @@ -1080,6 +1124,12 @@ RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) RPCRT4_FreeHeader(hdr); + if (status == RPC_S_OK && pMsg->RpcFlags & RPC_BUFFER_ASYNC) + { + if (!QueueUserWorkItem(async_notifier_proc, conn, WT_EXECUTEDEFAULT | WT_EXECUTELONGFUNCTION)) + status = RPC_S_OUT_OF_RESOURCES; + } + return status; } @@ -1198,8 +1248,17 @@ RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) */ RPC_STATUS WINAPI I_RpcAsyncSetHandle(PRPC_MESSAGE pMsg, PRPC_ASYNC_STATE pAsync) { - FIXME("(%p, %p): stub\n", pMsg, pAsync); - return RPC_S_INVALID_BINDING; + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + RpcConnection *conn; + + TRACE("(%p, %p)\n", pMsg, pAsync); + + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + + conn = pMsg->ReservedForRuntime; + conn->async_state = pAsync; + + return RPC_S_OK; } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index eb6bd8d..e3fd8c1 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -410,6 +410,12 @@ static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) /* FIXME: implement when named pipe writes use overlapped I/O */ } +static int rpcrt4_conn_np_wait_for_incoming_data(RpcConnection *Connection) +{ + /* FIXME: implement when named pipe writes use overlapped I/O */ + return -1; +} + static size_t rpcrt4_ncacn_np_get_top_of_tower(unsigned char *tower_data, const char *networkaddr, const char *endpoint) @@ -1047,6 +1053,32 @@ static void rpcrt4_conn_tcp_cancel_call(RpcConnection *Connection) write(tcpc->cancel_fds[1], &dummy, 1); } +static int rpcrt4_conn_tcp_wait_for_incoming_data(RpcConnection *Connection) +{ + RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; + struct pollfd pfds[2]; + + TRACE("%p\n", Connection); + + pfds[0].fd = tcpc->sock; + pfds[0].events = POLLIN; + pfds[1].fd = tcpc->cancel_fds[0]; + pfds[1].events = POLLIN; + if (poll(pfds, 2, -1 /* infinite */) == -1 && errno != EINTR) + { + ERR("poll() failed: %s\n", strerror(errno)); + return -1; + } + if (pfds[1].revents & POLLIN) /* canceled */ + { + char dummy; + read(pfds[1].fd, &dummy, sizeof(dummy)); + return -1; + } + + return 0; +} + static size_t rpcrt4_ncacn_ip_tcp_get_top_of_tower(unsigned char *tower_data, const char *networkaddr, const char *endpoint) @@ -1330,6 +1362,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncacn_np_get_top_of_tower, rpcrt4_ncacn_np_parse_top_of_tower, }, @@ -1342,6 +1375,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, }, @@ -1354,6 +1388,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, rpcrt4_conn_tcp_cancel_call, + rpcrt4_conn_tcp_wait_for_incoming_data, rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, } @@ -1470,6 +1505,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, NewConnection->QOS = QOS; list_init(&NewConnection->conn_pool_entry); + NewConnection->async_state = NULL; TRACE("connection: %p\n", NewConnection); *Connection = NewConnection;

1 0