October 2007 - Wine-commits

Chris Robinson : winex11: Store a GL-specific drawable with the window.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: a8124f97e6560b87935a2a4f85ae6a827214f757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8124f97e6560b87935a2a4f8… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 25 10:20:58 2007 -0700 winex11: Store a GL-specific drawable with the window. --- dlls/winex11.drv/dce.c | 3 +++ dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/opengl.c | 2 ++ dlls/winex11.drv/window.c | 15 +++++++++++++++ dlls/winex11.drv/x11drv.h | 4 ++++ 5 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/dce.c b/dlls/winex11.drv/dce.c index aa37a4a..222a4d6 100644 --- a/dlls/winex11.drv/dce.c +++ b/dlls/winex11.drv/dce.c @@ -151,11 +151,13 @@ static void update_visible_region( struct dce *dce ) { escape.drawable = data->icon_window; escape.fbconfig_id = 0; + escape.gl_drawable = 0; } else { escape.drawable = X11DRV_get_whole_window( top ); escape.fbconfig_id = X11DRV_get_fbconfig_id( dce->hwnd ); + escape.gl_drawable = X11DRV_get_gl_drawable( dce->hwnd ); } escape.code = X11DRV_SET_DRAWABLE; @@ -192,6 +194,7 @@ static void release_dce( struct dce *dce ) SetRect( &escape.dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); escape.fbconfig_id = 0; + escape.gl_drawable = 0; ExtEscape( dce->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 9000d0a..d6c538a 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -341,6 +341,7 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID physDev->drawable = data->drawable; physDev->drawable_rect = data->drawable_rect; physDev->current_pf = pixelformat_from_fbconfig_id( data->fbconfig_id ); + physDev->gl_drawable = data->gl_drawable; wine_tsx11_lock(); XSetSubwindowMode( gdi_display, physDev->gc, data->mode ); wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e3d3285..14b5a81 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3308,6 +3308,8 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) ret = physDev->bitmap->glxpixmap; } } + else if(physDev->gl_drawable) + ret = physDev->gl_drawable; else ret = physDev->drawable; return ret; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 122370f..f4be4a5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -56,6 +56,7 @@ static XContext win_data_context; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char icon_window_prop[] = "__wine_x11_icon_window"; static const char fbconfig_id_prop[] = "__wine_x11_fbconfig_id"; +static const char gl_drawable_prop[] = "__wine_x11_gl_drawable"; static const char managed_prop[] = "__wine_x11_managed"; static const char visual_id_prop[] = "__wine_x11_visual_id"; @@ -955,6 +956,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) data->whole_window = 0; data->icon_window = 0; data->fbconfig_id = 0; + data->gl_drawable = 0; data->xic = 0; data->managed = FALSE; data->dce = NULL; @@ -1260,6 +1262,19 @@ XID X11DRV_get_fbconfig_id( HWND hwnd ) return data->fbconfig_id; } +/*********************************************************************** + * X11DRV_get_gl_drawable + * + * Return the GL drawable for this window. + */ +Drawable X11DRV_get_gl_drawable( HWND hwnd ) +{ + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + + if (!data) return (Drawable)GetPropA( hwnd, gl_drawable_prop ); + return data->gl_drawable; +} + /*********************************************************************** * X11DRV_get_ic diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f61dc98..e26835d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -139,6 +139,7 @@ typedef struct int exposures; /* count of graphics exposures operations */ struct dce *dce; /* opaque pointer to DCE */ int current_pf; + Drawable gl_drawable; XRENDERINFO xrender; } X11DRV_PDEVICE; @@ -486,6 +487,7 @@ struct x11drv_escape_set_drawable RECT dc_rect; /* DC rectangle relative to drawable */ RECT drawable_rect;/* Drawable rectangle relative to screen */ XID fbconfig_id; /* fbconfig id used by the GL drawable */ + Drawable gl_drawable; /* GL drawable */ }; struct x11drv_escape_set_dce @@ -645,6 +647,7 @@ struct x11drv_win_data Window whole_window; /* X window for the complete window */ Window icon_window; /* X window for the icon */ XID fbconfig_id; /* fbconfig id for the GL drawable this hwnd uses */ + Drawable gl_drawable; /* Optional GL drawable for rendering the client area */ RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to whole window */ @@ -660,6 +663,7 @@ struct x11drv_win_data extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); extern Window X11DRV_get_whole_window( HWND hwnd ); extern XID X11DRV_get_fbconfig_id( HWND hwnd ); +extern Drawable X11DRV_get_gl_drawable( HWND hwnd ); extern BOOL X11DRV_is_window_rect_mapped( const RECT *rect ); extern XIC X11DRV_get_ic( HWND hwnd ); extern BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig );

1 0

Chris Robinson : wgl: Remove GL scissors/viewport override.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: ebfba49e275c3b3837dc8d9aee21da69d8124125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebfba49e275c3b3837dc8d9ae… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 25 10:21:40 2007 -0700 wgl: Remove GL scissors/viewport override. --- dlls/opengl32/make_opengl | 5 -- dlls/opengl32/opengl_norm.c | 52 +++++++++++++++ dlls/opengl32/wgl.c | 55 --------------- dlls/winex11.drv/opengl.c | 153 ------------------------------------------- 4 files changed, 52 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebfba49e275c3b3837dc8…

1 0

Chris Robinson : winex11: Use an offscreen redirected window for child OpenGL rendering.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 00633e37bcc8da1032f34ea2d87814739de07db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00633e37bcc8da1032f34ea2d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 25 22:43:38 2007 -0700 winex11: Use an offscreen redirected window for child OpenGL rendering. --- dlls/winex11.drv/opengl.c | 41 +++++++++++++++ dlls/winex11.drv/window.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 164 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8c3496d..eba5c26 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1393,6 +1393,8 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, ERR("Couldn't set format of the window, returning failure\n"); return FALSE; } + + physDev->gl_drawable = X11DRV_get_gl_drawable(hwnd); } physDev->current_pf = iPixelFormat; @@ -1914,10 +1916,32 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) wine_tsx11_unlock(); } +static inline void update_drawable(X11DRV_PDEVICE *physDev) +{ + int w, h; + + if(!physDev->gl_drawable) + return; + + w = physDev->dc_rect.right - physDev->dc_rect.left; + h = physDev->dc_rect.bottom - physDev->dc_rect.top; + + if(w > 0 && h > 0) { + /* The GL drawable may be lagged behind if we don't flush first, so + * flush the display make sure we copy up-to-date data */ + XFlush(gdi_display); + XCopyArea(gdi_display, physDev->gl_drawable, physDev->drawable, + physDev->gc, 0, 0, w, h, physDev->dc_rect.left, + physDev->dc_rect.top); + } +} + + static void WINAPI X11DRV_wglFinish(void) { wine_tsx11_lock(); pglFinish(); + update_drawable(((Wine_GLContext*)NtCurrentTeb()->glContext)->physDev); wine_tsx11_unlock(); } @@ -1925,6 +1949,7 @@ static void WINAPI X11DRV_wglFlush(void) { wine_tsx11_lock(); pglFlush(); + update_drawable(((Wine_GLContext*)NtCurrentTeb()->glContext)->physDev); wine_tsx11_unlock(); } @@ -3188,6 +3213,7 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) drawable = get_glxdrawable(physDev); wine_tsx11_lock(); pglXSwapBuffers(gdi_display, drawable); + update_drawable(physDev); wine_tsx11_unlock(); /* FPS support */ @@ -3249,6 +3275,16 @@ XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) return visual; } +XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) +{ + WineGLPixelFormat *fmt; + + fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fbconfig_id); + if(fmt == NULL) + return NULL; + return pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); +} + #else /* no OpenGL includes */ int pixelformat_from_fbconfig_id(XID fbconfig_id) @@ -3405,4 +3441,9 @@ BOOL destroy_glxpixmap(XID glxpixmap) return FALSE; } +XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ) +{ + return NULL; +} + #endif /* defined(HAVE_OPENGL) */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f4be4a5..e2cb90c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -40,6 +40,7 @@ #include "wine/unicode.h" #include "x11drv.h" +#include "xcomposite.h" #include "wine/debug.h" #include "wine/server.h" #include "win.h" @@ -63,6 +64,8 @@ static const char visual_id_prop[] = "__wine_x11_visual_id"; /* for XDG systray icons */ #define SYSTEM_TRAY_REQUEST_DOCK 0 +extern int usexcomposite; + /*********************************************************************** * is_window_managed * @@ -172,16 +175,123 @@ void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data ) */ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) { + Display *display = thread_display(); struct x11drv_win_data *data; + XVisualInfo *vis; + Drawable parent; + HWND next_hwnd; + int w, h; if (!(data = X11DRV_get_win_data(hwnd))) return FALSE; + wine_tsx11_lock(); + + vis = visual_from_fbconfig_id(fbconfig_id); + if(!vis) return FALSE; + + if(data->whole_window && vis->visualid == XVisualIDFromVisual(visual)) + { + TRACE("Whole window available and visual match, rendering onscreen\n"); + goto done; + } + + wine_tsx11_unlock(); + + parent = data->whole_window; + next_hwnd = hwnd; + while(!parent) + { + next_hwnd = GetAncestor(next_hwnd, GA_PARENT); + if(!next_hwnd) + { + ERR("Could not find parent HWND with a drawable!\n"); + return FALSE; + } + parent = X11DRV_get_whole_window(next_hwnd); + } + + w = data->client_rect.right - data->client_rect.left; + h = data->client_rect.bottom - data->client_rect.top; + + if(w <= 0) w = 1; + if(h <= 0) h = 1; + + wine_tsx11_lock(); +#ifdef SONAME_LIBXCOMPOSITE + if(usexcomposite) + { + XSetWindowAttributes attrib; + + attrib.override_redirect = True; + attrib.colormap = XCreateColormap(display, parent, vis->visual, + (vis->class == PseudoColor || + vis->class == GrayScale || + vis->class == DirectColor) ? + AllocAll : AllocNone); + XInstallColormap(gdi_display, attrib.colormap); + + data->gl_drawable = XCreateWindow(display, parent, -w, 0, w, h, 0, + vis->depth, InputOutput, vis->visual, + CWColormap | CWOverrideRedirect, + &attrib); + if(data->gl_drawable) + { + pXCompositeRedirectWindow(display, data->gl_drawable, + CompositeRedirectManual); + XMapWindow(display, data->gl_drawable); + } + } +#endif + + if(!data->gl_drawable) + { + ERR("Failed to create drawable for offscreen rendering\n"); + XFree(vis); + wine_tsx11_unlock(); + return FALSE; + } + +done: + XFree(vis); + + XFlush(display); + wine_tsx11_unlock(); + + TRACE("Created GL drawable 0x%lx, using FBConfigID 0x%lx\n", + data->gl_drawable, fbconfig_id); + data->fbconfig_id = fbconfig_id; SetPropA(hwnd, fbconfig_id_prop, (HANDLE)data->fbconfig_id); + SetPropA(hwnd, gl_drawable_prop, (HANDLE)data->gl_drawable); invalidate_dce( hwnd, &data->window_rect ); return TRUE; } +static void update_gl_drawable(Display *display, struct x11drv_win_data *data, const RECT *old_client_rect) +{ + int w = data->client_rect.right - data->client_rect.left; + int h = data->client_rect.bottom - data->client_rect.top; + + if((w == old_client_rect->right - old_client_rect->left && + h == old_client_rect->bottom - old_client_rect->top) || + w <= 0 || h <= 0) + { + TRACE("No resize needed\n"); + return; + } + + TRACE("Resizing GL drawable 0x%lx to %dx%d\n", data->gl_drawable, w, h); +#ifdef SONAME_LIBXCOMPOSITE + if(usexcomposite) + { + wine_tsx11_lock(); + XMoveResizeWindow(display, data->gl_drawable, -w, 0, w, h); + wine_tsx11_unlock(); + return; + } +#endif +} + /*********************************************************************** * get_window_changes @@ -726,13 +836,18 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data XWindowChanges changes; int mask; RECT old_whole_rect; + RECT old_client_rect; old_whole_rect = data->whole_rect; data->whole_rect = *new_whole_rect; + old_client_rect = data->client_rect; data->client_rect = *new_client_rect; OffsetRect( &data->client_rect, -data->whole_rect.left, -data->whole_rect.top ); + if (data->gl_drawable) + update_gl_drawable(display, data, &old_client_rect); + if (!data->whole_window || data->lock_changes) return; mask = get_window_changes( &changes, &old_whole_rect, &data->whole_rect ); @@ -931,6 +1046,13 @@ void X11DRV_DestroyWindow( HWND hwnd ) if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (data->gl_drawable) + { + wine_tsx11_lock(); + XDestroyWindow(display, data->gl_drawable); + wine_tsx11_unlock(); + } + free_window_dce( data ); destroy_whole_window( display, data ); destroy_icon_window( display, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e26835d..36c5853 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -669,6 +669,7 @@ extern XIC X11DRV_get_ic( HWND hwnd ); extern BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig ); extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); +extern XVisualInfo *visual_from_fbconfig_id( XID fbconfig_id ); extern void alloc_window_dce( struct x11drv_win_data *data ); extern void free_window_dce( struct x11drv_win_data *data );

1 0

Chris Robinson : winex11: Pass a display parameter when destroying glxpixmaps.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 86a9b7607622b27d70a71e2d1844ae5bce1317d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9b7607622b27d70a71e2d1… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 26 01:03:39 2007 -0700 winex11: Pass a display parameter when destroying glxpixmaps. --- dlls/winex11.drv/bitmap.c | 3 ++- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 053c959..6d4180b 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -431,7 +431,8 @@ BOOL X11DRV_DeleteBitmap( HBITMAP hbitmap ) if (GetObjectW( hbitmap, sizeof(dib), &dib ) == sizeof(dib)) X11DRV_DIB_DeleteDIBSection( physBitmap, &dib ); - if (physBitmap->glxpixmap) destroy_glxpixmap(physBitmap->glxpixmap); + if (physBitmap->glxpixmap) + destroy_glxpixmap( gdi_display, physBitmap->glxpixmap ); wine_tsx11_lock(); if (physBitmap->pixmap) XFreePixmap( gdi_display, physBitmap->pixmap ); XDeleteContext( gdi_display, (XID)hbitmap, bitmap_context ); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index eba5c26..780e7d6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3187,10 +3187,10 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) return ret; } -BOOL destroy_glxpixmap(XID glxpixmap) +BOOL destroy_glxpixmap(Display *display, XID glxpixmap) { wine_tsx11_lock(); - pglXDestroyGLXPixmap(gdi_display, glxpixmap); + pglXDestroyGLXPixmap(display, glxpixmap); wine_tsx11_unlock(); return TRUE; } @@ -3436,7 +3436,7 @@ Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) return 0; } -BOOL destroy_glxpixmap(XID glxpixmap) +BOOL destroy_glxpixmap(Display *display, XID glxpixmap) { return FALSE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 36c5853..55abffb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -273,7 +273,7 @@ extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display); extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); -extern BOOL destroy_glxpixmap(XID glxpixmap); +extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* XIM support */ extern XIC X11DRV_CreateIC(XIM xim, Display *display, Window win);

1 0

Rob Shearman : server: Add a new get_security_object call for getting the security descriptor of an object .
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 5356bfde2c7a150181b31b633474355bb8a99023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5356bfde2c7a150181b31b633… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 2 15:55:13 2007 +0100 server: Add a new get_security_object call for getting the security descriptor of an object. Use it to implement NtQuerySecurityObject. --- dlls/ntdll/om.c | 208 ++++++++++++++-------------------------- include/wine/server_protocol.h | 18 ++++- server/handle.c | 65 +++++++++++++ server/protocol.def | 8 ++ server/request.h | 2 + server/trace.c | 16 +++ 6 files changed, 178 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5356bfde2c7a150181b31…

1 0

Rob Shearman : server: Use ACL_REVISION in create_default_dacl instead of MAX_ACL_REVISION since we don 't use any features from later ACL revisions.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 45b6706a327641a1093e9799a3b96cface6ecb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b6706a327641a1093e9799a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 2 15:57:02 2007 +0100 server: Use ACL_REVISION in create_default_dacl instead of MAX_ACL_REVISION since we don't use any features from later ACL revisions. --- server/token.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index f5a95bc..00cd6db 100644 --- a/server/token.c +++ b/server/token.c @@ -544,7 +544,7 @@ static ACL *create_default_dacl( const SID *user ) default_dacl = mem_alloc( default_dacl_size ); if (!default_dacl) return NULL; - default_dacl->AclRevision = MAX_ACL_REVISION; + default_dacl->AclRevision = ACL_REVISION; default_dacl->Sbz1 = 0; default_dacl->AclSize = default_dacl_size; default_dacl->AceCount = 2;

1 0

Rob Shearman : advapi32: Implement SetFileSecurityW on top of NtSetSecurityObject.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 1262d7dbefe65a072bf02244293ea8536262fa77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1262d7dbefe65a072bf022442… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 2 16:34:42 2007 +0100 advapi32: Implement SetFileSecurityW on top of NtSetSecurityObject. --- dlls/advapi32/security.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index cfe73f4..3d070a3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2096,8 +2096,29 @@ SetFileSecurityW( LPCWSTR lpFileName, SECURITY_INFORMATION RequestedInformation, PSECURITY_DESCRIPTOR pSecurityDescriptor ) { - FIXME("(%s) : stub\n", debugstr_w(lpFileName) ); - return TRUE; + HANDLE file; + DWORD access = 0; + NTSTATUS status; + + TRACE("(%s, 0x%x, %p)\n", debugstr_w(lpFileName), RequestedInformation, + pSecurityDescriptor ); + + if (RequestedInformation & OWNER_SECURITY_INFORMATION || + RequestedInformation & GROUP_SECURITY_INFORMATION) + access |= WRITE_OWNER; + if (RequestedInformation & SACL_SECURITY_INFORMATION) + access |= ACCESS_SYSTEM_SECURITY; + if (RequestedInformation & DACL_SECURITY_INFORMATION) + access |= WRITE_DAC; + + file = CreateFileW( lpFileName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + status = NtSetSecurityObject( file, RequestedInformation, pSecurityDescriptor ); + CloseHandle( file ); + return set_ntstatus( status ); } /******************************************************************************

1 0

Rob Shearman : advapi32: Allow GetFileSecurityA/ W to work on files that have been opened already with restricted sharing flags .
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 00bc3d9e48c7eb7119df8b2f43930c354ce6f4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bc3d9e48c7eb7119df8b2f4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 2 15:56:35 2007 +0100 advapi32: Allow GetFileSecurityA/W to work on files that have been opened already with restricted sharing flags. Only use the minimum required access rights for the information being retrieved. --- dlls/advapi32/security.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3d070a3..23e9ad2 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1819,8 +1819,15 @@ GetFileSecurityW( LPCWSTR lpFileName, { HANDLE hfile; NTSTATUS status; + DWORD access = 0; + + if (RequestedInformation & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION| + DACL_SECURITY_INFORMATION)) + access |= READ_CONTROL; + if (RequestedInformation & SACL_SECURITY_INFORMATION) + access |= ACCESS_SYSTEM_SECURITY; - hfile = CreateFileW( lpFileName, GENERIC_READ, FILE_SHARE_READ, + hfile = CreateFileW( lpFileName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); if ( hfile == INVALID_HANDLE_VALUE ) return FALSE;

1 0

Rémi Assailly : user32: Moved some 16-bit functions.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 6e9fea22f82fe60624e1081d74ad990a5c428eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9fea22f82fe60624e1081d7… Author: Rémi Assailly <remi.assailly(a)free.fr> Date: Tue Oct 2 20:13:09 2007 +0200 user32: Moved some 16-bit functions. --- dlls/user32/clipboard.c | 51 ----------------------------------------------- dlls/user32/desktop.c | 9 -------- dlls/user32/user16.c | 27 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 60 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 137ace9..59d93ab 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -486,35 +486,6 @@ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext) /************************************************************************** - * SetClipboardData (USER.141) - */ -HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData) -{ - CLIPBOARDINFO cbinfo; - HANDLE16 hResult = 0; - - TRACE("(%04X, %04x) !\n", wFormat, hData); - - /* If it's not owned, data can only be set if the format doesn't exists - and its rendering is not delayed */ - if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || - (!(cbinfo.flags & CB_OWNER) && !hData)) - { - WARN("Clipboard not owned by calling task. Operation failed.\n"); - return 0; - } - - if (USER_Driver->pSetClipboardData(wFormat, hData, 0, cbinfo.flags & CB_OWNER)) - { - hResult = hData; - bCBHasChanged = TRUE; - } - - return hResult; -} - - -/************************************************************************** * SetClipboardData (USER32.@) */ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) @@ -586,28 +557,6 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) /************************************************************************** - * GetClipboardData (USER.142) - */ -HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat) -{ - HANDLE16 hData = 0; - CLIPBOARDINFO cbinfo; - - if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || - (~cbinfo.flags & CB_OPEN)) - { - WARN("Clipboard not opened by calling task.\n"); - SetLastError(ERROR_CLIPBOARD_NOT_OPEN); - return 0; - } - - if (!USER_Driver->pGetClipboardData(wFormat, &hData, NULL)) hData = 0; - - return hData; -} - - -/************************************************************************** * GetClipboardData (USER32.@) */ HANDLE WINAPI GetClipboardData(UINT wFormat) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 4fbb2d9..40bf184 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -188,15 +188,6 @@ BOOL16 WINAPI SetDeskPattern(void) /*********************************************************************** - * SetDeskWallPaper (USER.285) - */ -BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) -{ - return SetDeskWallPaper( filename ); -} - - -/*********************************************************************** * SetDeskWallPaper (USER32.@) * * FIXME: is there a unicode version? diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 1566f2c..f056fbb 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -447,6 +447,24 @@ BOOL16 WINAPI EmptyClipboard16(void) /************************************************************************** + * SetClipboardData (USER.141) + */ +HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData) +{ + return HANDLE_16(SetClipboardData(wFormat, HANDLE_32(hData))); +} + + +/************************************************************************** + * GetClipboardData (USER.142) + */ +HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat) +{ + return HANDLE_16(GetClipboardData(wFormat)); +} + + +/************************************************************************** * CountClipboardFormats (USER.143) */ INT16 WINAPI CountClipboardFormats16(void) @@ -983,6 +1001,15 @@ WORD WINAPI GetFreeSystemResources16( WORD resType ) /*********************************************************************** + * SetDeskWallPaper (USER.285) + */ +BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) +{ + return SetDeskWallPaper( filename ); +} + + +/*********************************************************************** * GetClipCursor (USER.309) */ void WINAPI GetClipCursor16( RECT16 *rect )

1 0

Rémi Assailly : user32: Renamed and moved SetDeskPattern.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 06b3967978b1ae703079498f6da622964fca3735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b3967978b1ae703079498f6… Author: Rémi Assailly <remi.assailly(a)free.fr> Date: Tue Oct 2 20:19:29 2007 +0200 user32: Renamed and moved SetDeskPattern. --- dlls/user32/desktop.c | 9 --------- dlls/user32/user.exe.spec | 2 +- dlls/user32/user16.c | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 40bf184..37774b8 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -179,15 +179,6 @@ BOOL WINAPI PaintDesktop(HDC hdc) } /*********************************************************************** - * OldSetDeskPattern (USER.279) - */ -BOOL16 WINAPI SetDeskPattern(void) -{ - return SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); -} - - -/*********************************************************************** * SetDeskWallPaper (USER32.@) * * FIXME: is there a unicode version? diff --git a/dlls/user32/user.exe.spec b/dlls/user32/user.exe.spec index b1dbe92..9a22d87 100644 --- a/dlls/user32/user.exe.spec +++ b/dlls/user32/user.exe.spec @@ -276,7 +276,7 @@ 276 stub LockMyTask 277 pascal -ret16 GetDlgCtrlID(word) GetDlgCtrlID16 278 pascal -ret16 GetDesktopHwnd() GetDesktopHwnd16 -279 pascal -ret16 OldSetDeskPattern() SetDeskPattern +279 pascal -ret16 OldSetDeskPattern() SetDeskPattern16 280 pascal -ret16 SetSystemMenu(word word) SetSystemMenu16 281 pascal -ret16 GetSysColorBrush(word) GetSysColorBrush16 282 pascal -ret16 SelectPalette(word word word) SelectPalette16 diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index f056fbb..b8951f2 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -927,6 +927,15 @@ void WINAPI ControlPanelInfo16( INT16 nInfoType, WORD wData, LPSTR lpBuffer ) /*********************************************************************** + * OldSetDeskPattern (USER.279) + */ +BOOL16 WINAPI SetDeskPattern16(void) +{ + return SystemParametersInfoA( SPI_SETDESKPATTERN, -1, NULL, FALSE ); +} + + +/*********************************************************************** * GetSysColorBrush (USER.281) */ HBRUSH16 WINAPI GetSysColorBrush16( INT16 index )

1 0