November 2011 - Wine-commits

Alexandre Julliard : serialui: Convert dialogs to po files.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: c994db77e6efe802810805a9cd37f83db1b2aceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c994db77e6efe802810805a9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 17:51:45 2011 +0100 serialui: Convert dialogs to po files. --- configure | 2 +- configure.ac | 2 +- dlls/serialui/Bg.rc | 45 --------------------- dlls/serialui/Cs.rc | 48 ---------------------- dlls/serialui/Da.rc | 45 --------------------- dlls/serialui/De.rc | 45 --------------------- dlls/serialui/Eo.rc | 45 --------------------- dlls/serialui/Es.rc | 43 -------------------- dlls/serialui/Fi.rc | 43 -------------------- dlls/serialui/Fr.rc | 51 ------------------------ dlls/serialui/He.rc | 47 ---------------------- dlls/serialui/Hu.rc | 43 -------------------- dlls/serialui/It.rc | 49 ----------------------- dlls/serialui/Ja.rc | 46 --------------------- dlls/serialui/Ko.rc | 45 --------------------- dlls/serialui/Lt.rc | 46 --------------------- dlls/serialui/Makefile.in | 30 +------------- dlls/serialui/Nl.rc | 45 --------------------- dlls/serialui/No.rc | 43 -------------------- dlls/serialui/Pl.rc | 43 -------------------- dlls/serialui/Pt.rc | 71 --------------------------------- dlls/serialui/Ro.rc | 45 --------------------- dlls/serialui/Ru.rc | 48 ---------------------- dlls/serialui/Si.rc | 45 --------------------- dlls/serialui/Sr.rc | 70 --------------------------------- dlls/serialui/Sv.rc | 43 -------------------- dlls/serialui/Tr.rc | 45 --------------------- dlls/serialui/Uk.rc | 47 ---------------------- dlls/serialui/Zh.rc | 72 ---------------------------------- dlls/serialui/confdlg.c | 9 +--- dlls/serialui/{En.rc => serialui.rc} | 22 +++++----- po/ar.po | 58 ++++++++++++++++++++------- po/bg.po | 57 +++++++++++++++++++------- po/ca.po | 60 ++++++++++++++++++++------- po/cs.po | 57 +++++++++++++++++++------- po/da.po | 57 +++++++++++++++++++------- po/de.po | 57 +++++++++++++++++++------- po/el.po | 59 ++++++++++++++++++++------- po/en.po | 56 +++++++++++++++++++------- po/en_US.po | 56 +++++++++++++++++++------- po/eo.po | 57 +++++++++++++++++++------- po/es.po | 57 +++++++++++++++++++------- po/fa.po | 58 ++++++++++++++++++++------- po/fi.po | 57 +++++++++++++++++++------- po/fr.po | 57 +++++++++++++++++++------- po/he.po | 57 +++++++++++++++++++------- po/hi.po | 57 +++++++++++++++++++------- po/hu.po | 57 +++++++++++++++++++------- po/it.po | 57 +++++++++++++++++++------- po/ja.po | 57 +++++++++++++++++++------- po/ko.po | 57 +++++++++++++++++++------- po/lt.po | 57 +++++++++++++++++++------- po/ml.po | 57 +++++++++++++++++++------- po/nb_NO.po | 57 +++++++++++++++++++------- po/nl.po | 57 +++++++++++++++++++------- po/or.po | 57 +++++++++++++++++++------- po/pa.po | 57 +++++++++++++++++++------- po/pl.po | 57 +++++++++++++++++++------- po/pt_BR.po | 57 +++++++++++++++++++------- po/pt_PT.po | 57 +++++++++++++++++++------- po/rm.po | 56 +++++++++++++++++++------- po/ro.po | 57 +++++++++++++++++++------- po/ru.po | 57 +++++++++++++++++++------- po/sk.po | 61 +++++++++++++++++++++------- po/sl.po | 57 +++++++++++++++++++------- po/sr_RS(a)cyrillic.po | 57 +++++++++++++++++++------- po/sr_RS(a)latin.po | 57 +++++++++++++++++++------- po/sv.po | 57 +++++++++++++++++++------- po/te.po | 57 +++++++++++++++++++------- po/th.po | 58 ++++++++++++++++++++------- po/tr.po | 57 +++++++++++++++++++------- po/uk.po | 57 +++++++++++++++++++------- po/wa.po | 57 +++++++++++++++++++------- po/wine.pot | 56 +++++++++++++++++++------- po/zh_CN.po | 57 +++++++++++++++++++------- po/zh_TW.po | 57 +++++++++++++++++++------- 76 files changed, 1871 insertions(+), 2025 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c994db77e6efe80281080…

1 0

Alexandre Julliard : winex11: Implement rectangular gradients using XRender if supported.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 76358216f4e203d029afc1a1d5c4df6faf06a519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76358216f4e203d029afc1a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 13:22:21 2011 +0100 winex11: Implement rectangular gradients using XRender if supported. --- configure | 42 ++++++++++++++++ configure.ac | 7 ++- dlls/winex11.drv/xrender.c | 118 ++++++++++++++++++++++++++++++++++++++++++-- include/config.h.in | 3 + 4 files changed, 164 insertions(+), 6 deletions(-) diff --git a/configure b/configure index f573540..cba043f 100755 --- a/configure +++ b/configure @@ -8477,6 +8477,48 @@ $as_echo "#define HAVE_XRENDERSETPICTURETRANSFORM 1" >>confdefs.h fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderCreateLinearGradient in -lXrender" >&5 +$as_echo_n "checking for XRenderCreateLinearGradient in -lXrender... " >&6; } +if ${ac_cv_lib_Xrender_XRenderCreateLinearGradient+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XRenderCreateLinearGradient (); +int +main () +{ +return XRenderCreateLinearGradient (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xrender_XRenderCreateLinearGradient=yes +else + ac_cv_lib_Xrender_XRenderCreateLinearGradient=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderCreateLinearGradient" >&5 +$as_echo "$ac_cv_lib_Xrender_XRenderCreateLinearGradient" >&6; } +if test "x$ac_cv_lib_Xrender_XRenderCreateLinearGradient" = xyes; then : + +$as_echo "#define HAVE_XRENDERCREATELINEARGRADIENT 1" >>confdefs.h + +fi + fi fi diff --git a/configure.ac b/configure.ac index d6f5e6a..82f7c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -1021,8 +1021,11 @@ then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform, [AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1, - [Define if Xrender has the XRenderSetPictureTransform function])],, - [$X_LIBS $XLIB $X_EXTRA_LIBS])],,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + [Define if Xrender has the XRenderSetPictureTransform function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + AC_CHECK_LIB(Xrender,XRenderCreateLinearGradient, + [AC_DEFINE(HAVE_XRENDERCREATELINEARGRADIENT, 1, + [Define if Xrender has the XRenderCreateLinearGradient function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])],, + [$X_LIBS $XLIB $X_EXTRA_LIBS]) fi WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"], diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ebbf9fc..f7fd11e 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -198,6 +198,9 @@ MAKE_FUNCPTR(XRenderFindVisualFormat) MAKE_FUNCPTR(XRenderFreeGlyphSet) MAKE_FUNCPTR(XRenderFreePicture) MAKE_FUNCPTR(XRenderSetPictureClipRectangles) +#ifdef HAVE_XRENDERCREATELINEARGRADIENT +MAKE_FUNCPTR(XRenderCreateLinearGradient) +#endif #ifdef HAVE_XRENDERSETPICTURETRANSFORM MAKE_FUNCPTR(XRenderSetPictureTransform) #endif @@ -367,6 +370,7 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) if (!(xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) return NULL; #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) return NULL +#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) LOAD_FUNCPTR(XRenderAddGlyphs); LOAD_FUNCPTR(XRenderComposite); LOAD_FUNCPTR(XRenderCompositeText16); @@ -379,12 +383,14 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) LOAD_FUNCPTR(XRenderFreePicture); LOAD_FUNCPTR(XRenderSetPictureClipRectangles); LOAD_FUNCPTR(XRenderQueryExtension); -#undef LOAD_FUNCPTR +#ifdef HAVE_XRENDERCREATELINEARGRADIENT + LOAD_OPTIONAL_FUNCPTR(XRenderCreateLinearGradient); +#endif #ifdef HAVE_XRENDERSETPICTURETRANSFORM -#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform); -#undef LOAD_OPTIONAL_FUNCPTR #endif +#undef LOAD_OPTIONAL_FUNCPTR +#undef LOAD_FUNCPTR wine_tsx11_lock(); X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); @@ -2519,6 +2525,110 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, } /*********************************************************************** + * xrenderdrv_GradientFill + */ +static BOOL xrenderdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void * grad_array, ULONG ngrad, ULONG mode ) +{ +#ifdef HAVE_XRENDERCREATELINEARGRADIENT + static const XFixed stops[2] = { 0, 1 << 16 }; + struct xrender_physdev *physdev = get_xrender_dev( dev ); + XLinearGradient gradient; + XRenderColor colors[2]; + Picture src_pict, dst_pict; + unsigned int i; + const GRADIENT_RECT *rect = grad_array; + POINT pt[2]; + + if (!X11DRV_XRender_Installed) goto fallback; + if (!pXRenderCreateLinearGradient) goto fallback; + + /* 16-bpp uses dithering */ + if (!physdev->pict_format || physdev->pict_format->depth == 16) goto fallback; + + switch (mode) + { + case GRADIENT_FILL_RECT_H: + case GRADIENT_FILL_RECT_V: + X11DRV_LockDIBSection( physdev->x11dev, DIB_Status_GdiMod ); + for (i = 0; i < ngrad; i++, rect++) + { + const TRIVERTEX *v1 = vert_array + rect->UpperLeft; + const TRIVERTEX *v2 = vert_array + rect->LowerRight; + + colors[0].red = v1->Red * 257 / 256; + colors[0].green = v1->Green * 257 / 256; + colors[0].blue = v1->Blue * 257 / 256; + colors[1].red = v2->Red * 257 / 256; + colors[1].green = v2->Green * 257 / 256; + colors[1].blue = v2->Blue * 257 / 256; + if (has_alpha( physdev->format )) + { + colors[0].alpha = v1->Alpha * 257 / 256; + colors[1].alpha = v2->Alpha * 257 / 256; + } + else colors[0].alpha = colors[1].alpha = 65535; + + pt[0].x = v1->x; + pt[0].y = v1->y; + pt[1].x = v2->x; + pt[1].y = v2->y; + LPtoDP( dev->hdc, pt, 2 ); + if (mode == GRADIENT_FILL_RECT_H) + { + gradient.p1.y = gradient.p2.y = 0; + if (pt[1].x > pt[0].x) + { + gradient.p1.x = 0; + gradient.p2.x = (pt[1].x - pt[0].x) << 16; + } + else + { + gradient.p1.x = (pt[0].x - pt[1].x) << 16; + gradient.p2.x = 0; + } + } + else + { + gradient.p1.x = gradient.p2.x = 0; + if (pt[1].y > pt[0].y) + { + gradient.p1.y = 0; + gradient.p2.y = (pt[1].y - pt[0].y) << 16; + } + else + { + gradient.p1.y = (pt[0].y - pt[1].y) << 16; + gradient.p2.y = 0; + } + } + + TRACE( "%u gradient %d,%d - %d,%d colors %04x,%04x,%04x,%04x -> %04x,%04x,%04x,%04x\n", + mode, pt[0].x, pt[0].y, pt[1].x, pt[1].y, + colors[0].red, colors[0].green, colors[0].blue, colors[0].alpha, + colors[1].red, colors[1].green, colors[1].blue, colors[1].alpha ); + + wine_tsx11_lock(); + src_pict = pXRenderCreateLinearGradient( gdi_display, &gradient, stops, colors, 2 ); + dst_pict = get_xrender_picture( physdev, 0, NULL ); + xrender_blit( PictOpSrc, src_pict, 0, dst_pict, 0, 0, + physdev->x11dev->dc_rect.left + min( pt[0].x, pt[1].x ), + physdev->x11dev->dc_rect.top + min( pt[0].y, pt[1].y ), + 1, 1, abs(pt[1].x - pt[0].x), abs(pt[1].y - pt[0].y) ); + pXRenderFreePicture( gdi_display, src_pict ); + wine_tsx11_unlock(); + } + X11DRV_UnlockDIBSection( physdev->x11dev, TRUE ); + return TRUE; + } + +fallback: +#endif + dev = GET_NEXT_PHYSDEV( dev, pGradientFill ); + return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); +} + +/*********************************************************************** * xrenderdrv_SelectBrush */ static HBRUSH xrenderdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, @@ -2644,7 +2754,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ NULL, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + xrenderdrv_GradientFill, /* pGradientFill */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ NULL, /* pLineTo */ diff --git a/include/config.h.in b/include/config.h.in index bb13463..60179db 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1133,6 +1133,9 @@ /* Define if libxml2 has the xmlSchemaSetValidStructuredErrors function */ #undef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +/* Define if Xrender has the XRenderCreateLinearGradient function */ +#undef HAVE_XRENDERCREATELINEARGRADIENT + /* Define if Xrender has the XRenderSetPictureTransform function */ #undef HAVE_XRENDERSETPICTURETRANSFORM

1 0

Alexandre Julliard : user32: Use the correct alpha for the title bar gradient and simplify the mesh.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 174d2f6d72681c3acec0f8b0c6e41c1e4ca19e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=174d2f6d72681c3acec0f8b0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 14:26:25 2011 +0100 user32: Use the correct alpha for the title bar gradient and simplify the mesh. --- dlls/user32/nonclient.c | 55 +++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 32 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d2bcdcb..6bef9ff 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -182,55 +182,46 @@ static void NC_DrawCaptionBar (HDC hdc, const RECT *rect, DWORD dwStyle, { if (gradient) { - TRIVERTEX vertices[6]; + TRIVERTEX vertices[4]; DWORD colLeft = GetSysColor (active ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION); DWORD colRight = GetSysColor (active ? COLOR_GRADIENTACTIVECAPTION : COLOR_GRADIENTINACTIVECAPTION); - int v; int buttonsAreaSize = GetSystemMetrics(SM_CYCAPTION) - 1; - static GRADIENT_RECT mesh[] = {{0, 1}, {2, 3}, {4, 5}}; - - for (v = 0; v < 3; v++) - { - vertices[v].Red = GetRValue (colLeft) << 8; - vertices[v].Green = GetGValue (colLeft) << 8; - vertices[v].Blue = GetBValue (colLeft) << 8; - vertices[v].Alpha = 0x8000; - vertices[v+3].Red = GetRValue (colRight) << 8; - vertices[v+3].Green = GetGValue (colRight) << 8; - vertices[v+3].Blue = GetBValue (colRight) << 8; - vertices[v+3].Alpha = 0x8000; - } - - if ((dwStyle & WS_SYSMENU) + static GRADIENT_RECT mesh[] = {{0, 1}, {1, 2}, {2, 3}}; + + vertices[0].Red = vertices[1].Red = GetRValue (colLeft) << 8; + vertices[0].Green = vertices[1].Green = GetGValue (colLeft) << 8; + vertices[0].Blue = vertices[1].Blue = GetBValue (colLeft) << 8; + vertices[0].Alpha = vertices[1].Alpha = 0xff00; + vertices[2].Red = vertices[3].Red = GetRValue (colRight) << 8; + vertices[2].Green = vertices[3].Green = GetGValue (colRight) << 8; + vertices[2].Blue = vertices[3].Blue = GetBValue (colRight) << 8; + vertices[2].Alpha = vertices[3].Alpha = 0xff00; + + if ((dwStyle & WS_SYSMENU) && ((dwStyle & WS_MAXIMIZEBOX) || (dwStyle & WS_MINIMIZEBOX))) buttonsAreaSize += 2 * (GetSystemMetrics(SM_CXSIZE) + 1); - + /* area behind icon; solid filled with left color */ vertices[0].x = rect->left; vertices[0].y = rect->top; - if (dwStyle & WS_SYSMENU) - vertices[1].x = - min (rect->left + GetSystemMetrics(SM_CXSMICON), rect->right); + if (dwStyle & WS_SYSMENU) + vertices[1].x = min (rect->left + GetSystemMetrics(SM_CXSMICON), rect->right); else vertices[1].x = vertices[0].x; vertices[1].y = rect->bottom; - + /* area behind text; gradient */ - vertices[2].x = vertices[1].x; + vertices[2].x = max (vertices[1].x, rect->right - buttonsAreaSize); vertices[2].y = rect->top; - vertices[3].x = max (vertices[2].x, rect->right - buttonsAreaSize); - vertices[3].y = rect->bottom; - + /* area behind buttons; solid filled with right color */ - vertices[4].x = vertices[3].x; - vertices[4].y = rect->top; - vertices[5].x = rect->right; - vertices[5].y = rect->bottom; - - GdiGradientFill (hdc, vertices, 6, mesh, 3, GRADIENT_FILL_RECT_H); + vertices[3].x = rect->right; + vertices[3].y = rect->bottom; + + GdiGradientFill (hdc, vertices, 4, mesh, 3, GRADIENT_FILL_RECT_H); } else FillRect (hdc, rect, GetSysColorBrush (active ?

1 0

Alexandre Julliard : uxtheme: Use the correct alpha for theme gradients.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 74f528eb2865d39d33949d47422041cf8b2bef42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f528eb2865d39d33949d474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 30 14:33:54 2011 +0100 uxtheme: Use the correct alpha for theme gradients. --- dlls/uxtheme/draw.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 17900f8..f204bff 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -921,14 +921,14 @@ static HRESULT UXTHEME_DrawBackgroundFill(HTHEME hTheme, HDC hdc, int iPartId, vert[0].Red = GetRValue(gradient1) << 8; vert[0].Green = GetGValue(gradient1) << 8; vert[0].Blue = GetBValue(gradient1) << 8; - vert[0].Alpha = 0x0000; + vert[0].Alpha = 0xff00; vert[1].x = pRect->right; vert[1].y = pRect->bottom; vert[1].Red = GetRValue(gradient2) << 8; vert[1].Green = GetGValue(gradient2) << 8; vert[1].Blue = GetBValue(gradient2) << 8; - vert[1].Alpha = 0x0000; + vert[1].Alpha = 0xff00; gRect.UpperLeft = 0; gRect.LowerRight = 1;

1 0

Dmitry Timoshkov : kernel32: Add a test for protections accepted by CreateFileMapping, make it pass under Wine.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: f9bb1b7afd3aca19bfeceae0a46d96b3eca35e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bb1b7afd3aca19bfeceae0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 29 13:54:15 2011 +0800 kernel32: Add a test for protections accepted by CreateFileMapping, make it pass under Wine. --- dlls/kernel32/tests/virtual.c | 124 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/virtual.c | 9 +-- 2 files changed, 127 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 45832fe..f933398 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1627,6 +1627,129 @@ static void test_VirtualAlloc_protection(void) } } +static void test_CreateFileMapping_protection(void) +{ + static const struct test_data + { + DWORD prot; + BOOL success; + } td[] = + { + { 0, FALSE }, /* 0x00 */ + { PAGE_NOACCESS, FALSE }, /* 0x01 */ + { PAGE_READONLY, TRUE }, /* 0x02 */ + { PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x03 */ + { PAGE_READWRITE, TRUE }, /* 0x04 */ + { PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x05 */ + { PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x06 */ + { PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x07 */ + { PAGE_WRITECOPY, TRUE }, /* 0x08 */ + { PAGE_WRITECOPY | PAGE_NOACCESS, FALSE }, /* 0x09 */ + { PAGE_WRITECOPY | PAGE_READONLY, FALSE }, /* 0x0a */ + { PAGE_WRITECOPY | PAGE_NOACCESS | PAGE_READONLY, FALSE }, /* 0x0b */ + { PAGE_WRITECOPY | PAGE_READWRITE, FALSE }, /* 0x0c */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_NOACCESS, FALSE }, /* 0x0d */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY, FALSE }, /* 0x0e */ + { PAGE_WRITECOPY | PAGE_READWRITE | PAGE_READONLY | PAGE_NOACCESS, FALSE }, /* 0x0f */ + + { PAGE_EXECUTE, FALSE }, /* 0x10 */ + { PAGE_EXECUTE_READ, TRUE }, /* 0x20 */ + { PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x30 */ + { PAGE_EXECUTE_READWRITE, TRUE }, /* 0x40 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0x50 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0x60 */ + { PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0x70 */ + { PAGE_EXECUTE_WRITECOPY, TRUE }, /* 0x80 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE, FALSE }, /* 0x90 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ, FALSE }, /* 0xa0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE }, /* 0xb0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE, FALSE }, /* 0xc0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE, FALSE }, /* 0xd0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ + { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ + }; + char *base; + DWORD ret, i; + MEMORY_BASIC_INFORMATION info; + SYSTEM_INFO si; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + HANDLE hfile, hmap; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + GetTempPath(MAX_PATH, temp_path); + GetTempFileName(temp_path, "map", 0, file_name); + + SetLastError(0xdeadbeef); + hfile = CreateFile(file_name, GENERIC_READ|GENERIC_WRITE|GENERIC_EXECUTE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + SetFilePointer(hfile, si.dwPageSize, NULL, FILE_BEGIN); + SetEndOfFile(hfile); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + hmap = CreateFileMapping(hfile, NULL, td[i].prot | SEC_COMMIT, 0, si.dwPageSize, NULL); + + if (td[i].success) + { + if (!hmap) + { + /* NT4 and win2k don't support EXEC on file mappings */ + if (td[i].prot == PAGE_EXECUTE_READ || td[i].prot == PAGE_EXECUTE_READWRITE) + { + ok(broken(!hmap), "%d: CreateFileMapping doesn't support PAGE_EXECUTE\n", i); + continue; + } + /* Vista+ supports PAGE_EXECUTE_WRITECOPY, earlier versions don't */ + if (td[i].prot == PAGE_EXECUTE_WRITECOPY) + { + ok(broken(!hmap), "%d: CreateFileMapping doesn't support PAGE_EXECUTE_WRITECOPY\n", i); + continue; + } + } + ok(hmap != 0, "%d: CreateFileMapping error %d\n", i, GetLastError()); + + base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); + ok(base != NULL, "%d: MapViewOfFile failed %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == PAGE_READONLY, "%d: got %#x != expected PAGE_READONLY\n", i, info.Protect); + ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); + ok(info.AllocationProtect == PAGE_READONLY, "%d: %#x != PAGE_READONLY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == MEM_MAPPED, "%d: %#x != MEM_MAPPED\n", i, info.Type); + + if (is_mem_writable(info.Protect)) + { + base[0] = 0xfe; + + SetLastError(0xdeadbeef); + ret = VirtualQuery(base, &info, sizeof(info)); + ok(ret, "VirtualQuery failed %d\n", GetLastError()); + ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); + } + + UnmapViewOfFile(base); + CloseHandle(hmap); + } + else + { + ok(!hmap, "%d: CreateFileMapping should fail\n", i); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + } + + CloseHandle(hfile); + DeleteFile(file_name); +} + START_TEST(virtual) { int argc; @@ -1662,6 +1785,7 @@ START_TEST(virtual) pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandle("ntdll.dll"), "NtAreMappedFilesTheSame" ); + test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); test_VirtualProtect(); test_VirtualAllocEx(); diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index c878ed8..949ceb5 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -348,11 +348,11 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, protect &= ~sec_flags; if (!sec_type) sec_type = SEC_COMMIT; + /* Win9x compatibility */ + if (!protect && (GetVersion() & 0x80000000)) protect = PAGE_READONLY; + switch(protect) { - case 0: - protect = PAGE_READONLY; /* Win9x compatibility */ - /* fall through */ case PAGE_READONLY: case PAGE_WRITECOPY: access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; @@ -360,9 +360,6 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, case PAGE_READWRITE: access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; break; - case PAGE_EXECUTE: - access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT; - break; case PAGE_EXECUTE_READ: case PAGE_EXECUTE_WRITECOPY: access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_MAP_EXECUTE_EXPLICIT;

1 0

Jacek Caban : mshtml: Fixed nsEventStates handling.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 38371bed2950cdaaceeb3e9723c1a594eeef536f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38371bed2950cdaaceeb3e972… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 13:53:33 2011 +0100 mshtml: Fixed nsEventStates handling. It contains a copy-constructor in C++, so it's passed as a pointer. --- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/nsiface.idl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index ba98d41..19b4143 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -552,12 +552,12 @@ static void NSAPI nsDocumentObserver_EndLoad(nsIDocumentObserver *iface, nsIDocu } static void NSAPI nsDocumentObserver_ContentStatesChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsIContent *aContent, nsEventStates aStateMask) + nsIContent *aContent, nsEventStates *aStateMask) { } static void NSAPI nsDocumentObserver_DocumentStatesChanged(nsIDocumentObserver *iface, nsIDocument *aDocument, - nsEventStates aStateMask) + nsEventStates *aStateMask) { } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 7849ee5..1477f2d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3169,7 +3169,7 @@ interface nsIParser : nsISupports ] interface nsIDocumentObserver : nsIMutationObserver { - typedef int nsUpdateType; + typedef PRUint32 nsUpdateType; typedef struct { PRUint64 mStates; @@ -3179,8 +3179,8 @@ interface nsIDocumentObserver : nsIMutationObserver void EndUpdate(nsIDocument *aDocument, nsUpdateType aUpdateType); void BeginLoad(nsIDocument *aDocument); void EndLoad(nsIDocument *aDocument); - void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent, nsEventStates aStateMask); - void DocumentStatesChanged(nsIDocument *aDocument, nsEventStates aStateMask); + void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent, nsEventStates *aStateMask); + void DocumentStatesChanged(nsIDocument *aDocument, nsEventStates *aStateMask); void StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); void StyleSheetRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); void StyleSheetApplicableStateChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet,

1 0

Piotr Caban : include: Update winsvc.h header.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: eeb5c93ac7975a20ade0b233de9952bce927ac72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb5c93ac7975a20ade0b233d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:28:15 2011 +0100 include: Update winsvc.h header. --- include/winsvc.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/winsvc.h b/include/winsvc.h index 1031f0c..c1af509 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -64,6 +64,7 @@ extern "C" { #define SERVICE_CONTROL_HARDWAREPROFILECHANGE 0x0000000C #define SERVICE_CONTROL_POWEREVENT 0x0000000D #define SERVICE_CONTROL_SESSIONCHANGE 0x0000000E +#define SERVICE_CONTROL_PRESHUTDOWN 0x0000000F /* Service State */ #define SERVICE_STOPPED 0x00000001 @@ -83,6 +84,7 @@ extern "C" { #define SERVICE_ACCEPT_HARDWAREPROFILECHANGE 0x00000020 #define SERVICE_ACCEPT_POWEREVENT 0x00000040 #define SERVICE_ACCEPT_SESSIONCHANGE 0x00000080 +#define SERVICE_ACCEPT_PRESHUTDOWN 0x00000100 /* Service Control Manager Object access types */ #define SC_MANAGER_CONNECT 0x0001 @@ -294,6 +296,33 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { DECL_WINELIB_TYPE_AW(SERVICE_FAILURE_ACTIONS) DECL_WINELIB_TYPE_AW(LPSERVICE_FAILURE_ACTIONS) +typedef struct _SERVICE_DELAYED_AUTO_START_INFO { + BOOL fDelayedAutostart; +} SERVICE_DELAYED_AUTO_START_INFO,*LPSERVICE_DELAYED_AUTO_START_INFO; + +typedef struct _SERVICE_FAILURE_ACTIONS_FLAG { + BOOL fFailureActionsOnNonCrashFailures; +} SERVICE_FAILURE_ACTIONS_FLAG,*LPSERVICE_FAILURE_ACTIONS_FLAG; + +typedef struct _SERVICE_SID_INFO { + DWORD dwServiceSidType; +} SERVICE_SID_INFO,*LPSERVICE_SID_INFO; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOA { + LPSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOA,*LPSERVICE_REQUIRED_PRIVILEGES_INFOA; + +typedef struct _SERVICE_REQUIRED_PRIVILEGES_INFOW { + LPWSTR pmszRequiredPrivileges; +} SERVICE_REQUIRED_PRIVILEGES_INFOW,*LPSERVICE_REQUIRED_PRIVILEGES_INFOW; + +DECL_WINELIB_TYPE_AW(SERVICE_REQUIRED_PRIVILEGES_INFO) +DECL_WINELIB_TYPE_AW(LPSERVICE_REQUIRED_PRIVILEGES_INFO) + +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; + typedef struct _QUERY_SERVICE_LOCK_STATUSA { DWORD fIsLocked;

1 0

Piotr Caban : services: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: b8704a4929a9325242ad1fa2f5791734d5e84a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8704a4929a9325242ad1fa2f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:28:26 2011 +0100 services: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO. --- include/wine/svcctl.idl | 5 +++++ programs/services/rpc.c | 20 ++++++++++++++++++++ programs/services/services.c | 8 +++++++- programs/services/services.h | 1 + 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 895ee2e..f261702 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -114,6 +114,10 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { [size_is(cActions)] SC_ACTION *lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; +typedef struct _SERVICE_PRESHUTDOWN_INFO { + DWORD dwPreshutdownTimeout; +} SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; + #define SERVICE_CONFIG_DESCRIPTION 1 #define SERVICE_CONFIG_FAILURE_ACTIONS 2 #define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 @@ -134,6 +138,7 @@ typedef [switch_type(DWORD)] union { [case (SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW descr; [case (SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW actions; + [case (SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO preshutdown; } SERVICE_CONFIG2W; /* Compatible with Windows function 0x00 */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 2d853c0..66bd17b 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -737,6 +737,14 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, wine_dbgstr_w(config->actions.lpRebootMsg), wine_dbgstr_w(config->actions.lpCommand) ); break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + WINE_TRACE( "changing service %p preshutdown timeout to %d\n", + service, config->preshutdown.dwPreshutdownTimeout ); + service_lock_exclusive( service->service_entry ); + service->service_entry->preshutdown_timeout = config->preshutdown.dwPreshutdownTimeout; + save_service_config( service->service_entry ); + service_unlock( service->service_entry ); + break; default: WINE_FIXME("level %u not implemented\n", level); err = ERROR_INVALID_LEVEL; @@ -781,6 +789,18 @@ DWORD __cdecl svcctl_QueryServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, } break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + service_lock_shared(service->service_entry); + + *needed = sizeof(SERVICE_PRESHUTDOWN_INFO); + if (size >= *needed) + ((LPSERVICE_PRESHUTDOWN_INFO)buffer)->dwPreshutdownTimeout = + service->service_entry->preshutdown_timeout; + else err = ERROR_INSUFFICIENT_BUFFER; + + service_unlock(service->service_entry); + break; + default: WINE_FIXME("level %u not implemented\n", level); err = ERROR_INVALID_LEVEL; diff --git a/programs/services/services.c b/programs/services/services.c index 94b4747..ba6b697 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -41,6 +41,7 @@ struct scmdatabase *active_database; DWORD service_pipe_timeout = 10000; DWORD service_kill_timeout = 20000; +static DWORD default_preshutdown_timeout = 180000; static void *env = NULL; static const int is_win64 = (sizeof(void *) > sizeof(int)); @@ -64,6 +65,7 @@ static const WCHAR SZ_DEPEND_ON_GROUP[] = {'D','e','p','e','n','d','O','n','G' static const WCHAR SZ_OBJECT_NAME[] = {'O','b','j','e','c','t','N','a','m','e',0}; static const WCHAR SZ_TAG[] = {'T','a','g',0}; static const WCHAR SZ_DESCRIPTION[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR SZ_PRESHUTDOWN[] = {'P','r','e','s','h','u','t','d','o','w','n','T','i','m','e','o','u','t',0}; DWORD service_create(LPCWSTR name, struct service_entry **entry) @@ -80,6 +82,7 @@ DWORD service_create(LPCWSTR name, struct service_entry **entry) (*entry)->control_pipe = INVALID_HANDLE_VALUE; (*entry)->status.dwCurrentState = SERVICE_STOPPED; (*entry)->status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + (*entry)->preshutdown_timeout = default_preshutdown_timeout; /* all other fields are zero */ return ERROR_SUCCESS; } @@ -130,6 +133,8 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) return err; if ((err = load_reg_dword(hKey, SZ_TAG, &entry->config.dwTagId)) != 0) return err; + if ((err = load_reg_dword(hKey, SZ_PRESHUTDOWN, &entry->preshutdown_timeout)) != 0) + return err; WINE_TRACE("Image path = %s\n", wine_dbgstr_w(entry->config.lpBinaryPathName) ); WINE_TRACE("Group = %s\n", wine_dbgstr_w(entry->config.lpLoadOrderGroup) ); @@ -206,9 +211,10 @@ DWORD save_service_config(struct service_entry *entry) goto cleanup; if ((err = RegSetValueExW(hKey, SZ_ERROR, 0, REG_DWORD, (LPBYTE)&entry->config.dwErrorControl, sizeof(DWORD))) != 0) goto cleanup; - if ((err = RegSetValueExW(hKey, SZ_TYPE, 0, REG_DWORD, (LPBYTE)&entry->config.dwServiceType, sizeof(DWORD))) != 0) goto cleanup; + if ((err = RegSetValueExW(hKey, SZ_PRESHUTDOWN, 0, REG_DWORD, (LPBYTE)&entry->preshutdown_timeout, sizeof(DWORD))) != 0) + goto cleanup; if (entry->config.dwTagId) err = RegSetValueExW(hKey, SZ_TAG, 0, REG_DWORD, (LPBYTE)&entry->config.dwTagId, sizeof(DWORD)); diff --git a/programs/services/services.h b/programs/services/services.h index 448ddfa..d5fcf77 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -39,6 +39,7 @@ struct service_entry LPWSTR name; SERVICE_STATUS_PROCESS status; QUERY_SERVICE_CONFIGW config; + DWORD preshutdown_timeout; LPWSTR description; LPWSTR dependOnServices; LPWSTR dependOnGroups;

1 0

Piotr Caban : advapi32: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: e2172edca2097fc62c60922fd3d5d2a7fad7ba1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2172edca2097fc62c60922fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:28:49 2011 +0100 advapi32: Added support for SERVICE_CONFIG_PRESHUTDOWN_INFO. --- dlls/advapi32/service.c | 10 +++++++++- dlls/advapi32/tests/service.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index bb5e49c..7c45f94 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1400,6 +1400,10 @@ BOOL WINAPI QueryServiceConfig2A(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe else configA->lpDescription = NULL; } break; + case SERVICE_CONFIG_PRESHUTDOWN_INFO: + if (buffer && bufferW && *needed<=size) + memcpy(buffer, bufferW, *needed); + break; default: FIXME("conversation W->A not implemented for level %d\n", dwLevel); ret = FALSE; @@ -1421,7 +1425,7 @@ BOOL WINAPI QueryServiceConfig2W(SC_HANDLE hService, DWORD dwLevel, LPBYTE buffe { DWORD err; - if(dwLevel != SERVICE_CONFIG_DESCRIPTION) { + if(dwLevel!=SERVICE_CONFIG_DESCRIPTION && dwLevel!=SERVICE_CONFIG_PRESHUTDOWN_INFO) { FIXME("Level %d not implemented\n", dwLevel); SetLastError(ERROR_INVALID_LEVEL); return FALSE; @@ -2051,6 +2055,10 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, HeapFree( GetProcessHeap(), 0, faw.lpRebootMsg ); HeapFree( GetProcessHeap(), 0, faw.lpCommand ); } + else if (dwInfoLevel == SERVICE_CONFIG_PRESHUTDOWN_INFO) + { + r = ChangeServiceConfig2W( hService, dwInfoLevel, lpInfo); + } else SetLastError( ERROR_INVALID_PARAMETER ); diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c5dea2f..b6aff26 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1896,6 +1896,7 @@ static void test_queryconfig2(void) DWORD expected, needed; BYTE buffer[MAX_PATH]; LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; + SERVICE_PRESHUTDOWN_INFO preshutdown_info; static const CHAR servicename [] = "Winetest"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2062,6 +2063,33 @@ static void test_queryconfig2(void) ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_DESCRIPTION,buffer, needed,&needed); ok(ret, "expected QueryServiceConfig2W to succeed\n"); + SetLastError(0xdeadbeef); + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + if(!ret && GetLastError()==ERROR_INVALID_LEVEL) + { + /* Win2k3 and older */ + win_skip("SERVICE_CONFIG_PRESHUTDOWN_INFO not supported\n"); + goto cleanup; + } + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == 180000, "Default PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + + SetLastError(0xdeadbeef); + preshutdown_info.dwPreshutdownTimeout = -1; + ret = pChangeServiceConfig2A(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPVOID)&preshutdown_info); + ok(ret, "expected ChangeServiceConfig2A to succeed (%d)\n", GetLastError()); + + ret = pQueryServiceConfig2W(svc_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&preshutdown_info, sizeof(preshutdown_info), &needed); + ok(ret, "expected QueryServiceConfig2W to succeed (%d)\n", GetLastError()); + ok(needed == sizeof(preshutdown_info), "needed = %d\n", needed); + ok(preshutdown_info.dwPreshutdownTimeout == -1, "New PreshutdownTimeout = %d\n", + preshutdown_info.dwPreshutdownTimeout); + cleanup: DeleteService(svc_handle);

1 0

Piotr Caban : services: Wait for all services to terminate before exiting.
by Alexandre Julliard 30 Nov '11

30 Nov '11

Module: wine Branch: master Commit: 60a273569c0bf225cfe7712b913baa957aee3384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60a273569c0bf225cfe7712b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 30 15:29:01 2011 +0100 services: Wait for all services to terminate before exiting. --- programs/services/services.c | 34 +++++++++++++++++++++++++++++++--- programs/services/services.h | 1 + 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index ba6b697..4369d28 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -98,6 +98,7 @@ void free_service_entry(struct service_entry *entry) HeapFree(GetProcessHeap(), 0, entry->description); HeapFree(GetProcessHeap(), 0, entry->dependOnServices); HeapFree(GetProcessHeap(), 0, entry->dependOnGroups); + CloseHandle(entry->process); CloseHandle(entry->control_mutex); CloseHandle(entry->control_pipe); CloseHandle(entry->overlapped_event); @@ -312,6 +313,32 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) HeapFree(GetProcessHeap(), 0, services_list); } +static void scmdatabase_wait_terminate(struct scmdatabase *db) +{ + struct service_entry *service; + BOOL run = TRUE; + + scmdatabase_lock_shared(db); + while(run) + { + run = FALSE; + LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) + { + if(service->process) + { + scmdatabase_unlock(db); + WaitForSingleObject(service->process, INFINITE); + scmdatabase_lock_shared(db); + CloseHandle(service->process); + service->process = NULL; + run = TRUE; + break; + } + } + } + scmdatabase_unlock(db); +} + BOOL validate_service_name(LPCWSTR name) { return (name && name[0] && !strchrW(name, '/') && !strchrW(name, '\\')); @@ -662,6 +689,7 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * } service_entry->status.dwProcessId = pi.dwProcessId; + service_entry->process = pi.hProcess; *process = pi.hProcess; CloseHandle( pi.hThread ); @@ -808,9 +836,6 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) err = service_wait_for_startup(service, process_handle); - - if (process_handle) - CloseHandle(process_handle); } if (err == ERROR_SUCCESS) @@ -884,9 +909,12 @@ int main(int argc, char *argv[]) { scmdatabase_autostart_services(active_database); RPC_MainLoop(); + scmdatabase_wait_terminate(active_database); } scmdatabase_destroy(active_database); if (env) DestroyEnvironmentBlock(env); + + WINE_TRACE("services.exe exited with code %d\n", err); return err; } diff --git a/programs/services/services.h b/programs/services/services.h index d5fcf77..6a968d9 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -43,6 +43,7 @@ struct service_entry LPWSTR description; LPWSTR dependOnServices; LPWSTR dependOnGroups; + HANDLE process; HANDLE control_mutex; HANDLE control_pipe; HANDLE overlapped_event;

1 0