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

Alexandre Julliard : opengl32: Make some functions and variables static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 1249c64277e8e05247a8cbcc1ff903154496b191 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1249c64277e8e05247a8cbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:26:36 2006 +0200 opengl32: Make some functions and variables static. --- dlls/opengl32/wgl.c | 14 +++++++++++++- dlls/opengl32/wgl_ext.c | 30 +++++++++++++++--------------- dlls/opengl32/wgl_ext.h | 13 ------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 178cb6b..548ea7d 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -47,8 +47,20 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); +typedef struct wine_glx_s { + unsigned version; + /** SGIX / 1.3 */ + GLXFBConfig* (*p_glXChooseFBConfig) (Display *dpy, int screen, const int *attrib_list, int *nelements); + int (*p_glXGetFBConfigAttrib) (Display *dpy, GLXFBConfig config, int attribute, int *value); + XVisualInfo* (*p_glXGetVisualFromFBConfig) (Display *dpy, GLXFBConfig config); + /** 1.3 */ + GLXFBConfig* (*p_glXGetFBConfigs) (Display *dpy, int screen, int *nelements); + void (*p_glXQueryDrawable) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); + Bool (*p_glXMakeContextCurrent) (Display *, GLXDrawable, GLXDrawable, GLXContext); +} wine_glx_t; + /** global glx object */ -wine_glx_t wine_glx; +static wine_glx_t wine_glx; /* x11drv GDI escapes */ #define X11DRV_ESCAPE 6789 diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index f7c95df..0147e59 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -90,21 +90,21 @@ static char *WGL_extensions = NULL; * * @TODO: use a struct to handle parameters */ -BOOL query_function_make_current_read(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static BOOL query_function_make_current_read(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { return 0 <= strcmp("1.3", glx_version); } -BOOL query_function_multisample(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static BOOL query_function_multisample(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { return NULL != strstr(glx_extensions, "GLX_ARB_multisample"); } -BOOL query_function_pbuffer(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static BOOL query_function_pbuffer(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { @@ -114,7 +114,7 @@ BOOL query_function_pbuffer(glXGetProcAd return 0 <= strcmp("1.3", glx_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer"); } -BOOL query_function_pixel_format(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static BOOL query_function_pixel_format(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { @@ -126,12 +126,12 @@ BOOL query_function_pixel_format(glXGetP * http://oss.sgi.com/projects/ogl-sample/registry/ARB/wgl_render_texture.txt * ~/tmp/ogl/ogl_offscreen_rendering_3 */ -Bool (*p_glXBindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); -Bool (*p_glXReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); -Bool (*p_glXDrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList); -int use_render_texture_emulation = 0; -int use_render_texture_ati = 0; -BOOL query_function_render_texture(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static Bool (*p_glXBindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); +static Bool (*p_glXReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); +static Bool (*p_glXDrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList); +static int use_render_texture_emulation = 0; +static int use_render_texture_ati = 0; +static BOOL query_function_render_texture(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { @@ -165,8 +165,8 @@ BOOL query_function_render_texture(glXGe return bTest; } -int (*p_glXSwapIntervalSGI)(int); -BOOL query_function_swap_control(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, +static int (*p_glXSwapIntervalSGI)(int); +static BOOL query_function_swap_control(glXGetProcAddressARB_t proc, const char *gl_version, const char *gl_extensions, const char* glx_version, const char *glx_extensions, const char *server_glx_extensions, const char *client_glx_extensions) { @@ -1212,7 +1212,7 @@ GLboolean WINAPI wglQueryPbufferARB(HPBU return GL_TRUE; } -GLboolean WINAPI wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) +static GLboolean WINAPI wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; TRACE("(%p, %d)\n", hPbuffer, iBuffer); @@ -1255,7 +1255,7 @@ GLboolean WINAPI wglBindTexImageARB(HPBU return GL_FALSE; } -GLboolean WINAPI wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) +static GLboolean WINAPI wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; TRACE("(%p, %d)\n", hPbuffer, iBuffer); @@ -1295,7 +1295,7 @@ GLboolean WINAPI wglReleaseTexImageARB(H return GL_FALSE; } -GLboolean WINAPI wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList) +static GLboolean WINAPI wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList) { Wine_GLPBuffer* object = (Wine_GLPBuffer*) hPbuffer; WARN("(%p, %p): alpha-testing, report any problem\n", hPbuffer, piAttribList); diff --git a/dlls/opengl32/wgl_ext.h b/dlls/opengl32/wgl_ext.h index 29cbc5a..084c520 100644 --- a/dlls/opengl32/wgl_ext.h +++ b/dlls/opengl32/wgl_ext.h @@ -39,17 +39,4 @@ typedef struct { extern WGL_extension wgl_extension_registry[]; extern int wgl_extension_registry_size; -typedef struct wine_glx_s { - unsigned version; - /** SGIX / 1.3 */ - GLXFBConfig* (*p_glXChooseFBConfig) (Display *dpy, int screen, const int *attrib_list, int *nelements); - int (*p_glXGetFBConfigAttrib) (Display *dpy, GLXFBConfig config, int attribute, int *value); - XVisualInfo* (*p_glXGetVisualFromFBConfig) (Display *dpy, GLXFBConfig config); - /** 1.3 */ - GLXFBConfig* (*p_glXGetFBConfigs) (Display *dpy, int screen, int *nelements); - void (*p_glXQueryDrawable) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); - Bool (*p_glXMakeContextCurrent) (Display *, GLXDrawable, GLXDrawable, GLXContext); -} wine_glx_t; -extern wine_glx_t wine_glx; - #endif /* __DLLS_OPENGL32_WGL_EXT_H */

1 0

Alexandre Julliard : glu32: Make some functions static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 986e202ab4d4bfef7d523adebe97028e515e99f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=986e202ab4d4bfef7d523ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:26:24 2006 +0200 glu32: Make some functions static. --- dlls/glu32/glu.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 1811b21..46a2336 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -448,7 +448,7 @@ void WINAPI wine_gluTessEndPolygon(void } -void wine_glu_tess_begin_data(int type, wine_tess_t *wine_tess) +static void wine_glu_tess_begin_data(int type, wine_tess_t *wine_tess) { if(wine_tess->cb_tess_begin_data) wine_tess->cb_tess_begin_data(type, wine_tess->polygon_data); @@ -456,7 +456,7 @@ void wine_glu_tess_begin_data(int type, wine_tess->cb_tess_begin(type); } -void wine_glu_tess_vertex_data(void *vertex_data, wine_tess_t *wine_tess) +static void wine_glu_tess_vertex_data(void *vertex_data, wine_tess_t *wine_tess) { if(wine_tess->cb_tess_vertex_data) wine_tess->cb_tess_vertex_data(vertex_data, wine_tess->polygon_data); @@ -464,7 +464,7 @@ void wine_glu_tess_vertex_data(void *ver wine_tess->cb_tess_vertex(vertex_data); } -void wine_glu_tess_end_data(wine_tess_t *wine_tess) +static void wine_glu_tess_end_data(wine_tess_t *wine_tess) { if(wine_tess->cb_tess_end_data) wine_tess->cb_tess_end_data(wine_tess->polygon_data); @@ -472,7 +472,7 @@ void wine_glu_tess_end_data(wine_tess_t wine_tess->cb_tess_end(); } -void wine_glu_tess_error_data(int error, wine_tess_t *wine_tess) +static void wine_glu_tess_error_data(int error, wine_tess_t *wine_tess) { if(wine_tess->cb_tess_error_data) wine_tess->cb_tess_error_data(error, wine_tess->polygon_data); @@ -480,7 +480,7 @@ void wine_glu_tess_error_data(int error, wine_tess->cb_tess_error(error); } -void wine_glu_tess_edge_flag_data(int flag, wine_tess_t *wine_tess) +static void wine_glu_tess_edge_flag_data(int flag, wine_tess_t *wine_tess) { if(wine_tess->cb_tess_edge_flag_data) wine_tess->cb_tess_edge_flag_data(flag, wine_tess->polygon_data); @@ -488,8 +488,8 @@ void wine_glu_tess_edge_flag_data(int fl wine_tess->cb_tess_edge_flag(flag); } -void wine_glu_tess_combine_data(double *coords, void *vertex_data, float *weight, void **outData, - wine_tess_t *wine_tess) +static void wine_glu_tess_combine_data(double *coords, void *vertex_data, float *weight, void **outData, + wine_tess_t *wine_tess) { if(wine_tess->cb_tess_combine_data) wine_tess->cb_tess_combine_data(coords, vertex_data, weight, outData, wine_tess->polygon_data);

1 0

Alexandre Julliard : dsound: Make some functions static.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 179a4e0a2e7fb0b6b9c81dceb6c94c798d9b7a7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=179a4e0a2e7fb0b6b9c81dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:26:14 2006 +0200 dsound: Make some functions static. --- dlls/dsound/buffer.c | 21 ++++++- dlls/dsound/capture.c | 34 ++++++++++- dlls/dsound/dsound.c | 85 ++++++++++++++++++++++++--- dlls/dsound/dsound_main.c | 2 - dlls/dsound/dsound_private.h | 132 ------------------------------------------ dlls/dsound/duplex.c | 2 - dlls/dsound/mixer.c | 2 - dlls/dsound/primary.c | 2 - 8 files changed, 128 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=179a4e0a2e7fb0b6b9c…

1 0

Alexandre Julliard : winex11.drv: Make some functions and variables static, and get rid of x11ddraw.h.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 241abf4e1bc8a4c5cf31998f0d61fc6509daadac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=241abf4e1bc8a4c5cf31998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 2 13:21:58 2006 +0200 winex11.drv: Make some functions and variables static, and get rid of x11ddraw.h. --- dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/settings.c | 1 - dlls/winex11.drv/x11ddraw.c | 32 +++++++++++++++++-------- dlls/winex11.drv/x11ddraw.h | 55 ------------------------------------------- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 1 - dlls/winex11.drv/xvidmode.c | 1 - 7 files changed, 24 insertions(+), 69 deletions(-) delete mode 100644 dlls/winex11.drv/x11ddraw.h diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 8995295..90e2ab8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -26,7 +26,6 @@ #include "wine/winuser16.h" #include "win.h" #include "ddrawi.h" #include "x11drv.h" -#include "x11ddraw.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 49b8a8d..5de07eb 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -22,7 +22,6 @@ #include "config.h" #include <string.h> #include <stdio.h> #include "x11drv.h" -#include "x11ddraw.h" #include "windef.h" #include "wingdi.h" diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index b690ced..39a2e05 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -26,7 +26,6 @@ #include <X11/Xlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "x11drv.h" -#include "x11ddraw.h" #include "windef.h" #include "gdi.h" @@ -34,18 +33,31 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +typedef struct _X11DRIVERINFO { + const GUID * lpGuid; + DWORD dwSize; + LPVOID lpvData; + struct _X11DRIVERINFO*lpNext; +} X11DRIVERINFO,*LPX11DRIVERINFO; + +typedef struct _X11DEVICE { + LPX11DRIVERINFO lpInfo; +} X11DEVICE,*LPX11DEVICE; + extern int dxgrab; -LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary; -LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl; -HWND X11DRV_DD_PrimaryWnd; -HBITMAP X11DRV_DD_PrimaryDIB; -Drawable X11DRV_DD_PrimaryDrawable; -ATOM X11DRV_DD_UserClass; -BOOL X11DRV_DD_IsDirect; +static LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary; +static LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl; +static HWND X11DRV_DD_PrimaryWnd; +static HBITMAP X11DRV_DD_PrimaryDIB; +static Drawable X11DRV_DD_PrimaryDrawable; +static ATOM X11DRV_DD_UserClass; static UINT X11DRV_DD_GrabMessage; static WNDPROC X11DRV_DD_GrabOldProcedure; +static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries, + LPPALETTEENTRY lpEntries); + static void SetPrimaryDIB(HBITMAP hBmp) { X11DRV_DD_PrimaryDIB = hBmp; @@ -419,8 +431,8 @@ void X11DRV_DDHAL_SwitchMode(DWORD dwMod X11DRV_DDHAL_SetInfo(); } -void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries, - LPPALETTEENTRY lpEntries) +static void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries, + LPPALETTEENTRY lpEntries) { XColor c; unsigned int n; diff --git a/dlls/winex11.drv/x11ddraw.h b/dlls/winex11.drv/x11ddraw.h deleted file mode 100644 index bc191e5..0000000 --- a/dlls/winex11.drv/x11ddraw.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * DirectDraw HAL base interface - * - * Copyright 2001 TransGaming Technologies, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef __WINE_X11DDRAW_H -#define __WINE_X11DDRAW_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ddrawi.h" - -extern LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary; -extern LPDDRAWI_DDRAWSURFACE_GBL X11DRV_DD_PrimaryGbl; -extern HWND X11DRV_DD_PrimaryWnd; -extern HBITMAP X11DRV_DD_PrimaryDIB; -extern BOOL X11DRV_DD_IsDirect; - -void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); -void X11DRV_DDHAL_SetPalEntries(Colormap pal, DWORD dwBase, DWORD dwNumEntries, - LPPALETTEENTRY lpEntries); - -typedef struct _X11DRIVERINFO { - const GUID * lpGuid; - DWORD dwSize; - LPVOID lpvData; - struct _X11DRIVERINFO*lpNext; -} X11DRIVERINFO,*LPX11DRIVERINFO; - -typedef struct _X11DEVICE { - LPX11DRIVERINFO lpInfo; -} X11DEVICE,*LPX11DEVICE; - -#endif /* __WINE_X11DDRAW_H */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b3d547a..e5027c4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,4 +697,6 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandl unsigned int nmodes, int reserve_depths); +extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); + #endif /* __WINE_X11DRV_H */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fcc0b7c..5cf3027 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -29,7 +29,6 @@ #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h" -#include "x11ddraw.h" #include "xrandr.h" #include "windef.h" diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 46c7e68..dd5993a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -29,7 +29,6 @@ #ifdef HAVE_LIBXXF86VM #include <X11/extensions/xf86vmode.h> #endif /* HAVE_LIBXXF86VM */ -#include "x11ddraw.h" #include "xvidmode.h" #include "windef.h"

1 0

James Hawkins : msi: Add tests for SQL query markers.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 91ec65d7f150a7951d4b17119447bfb9167bcaa2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91ec65d7f150a7951d4b171… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 1 17:36:03 2006 -0700 msi: Add tests for SQL query markers. --- dlls/msi/tests/db.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 195 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=91ec65d7f150a7951d4…

1 0

James Hawkins : msi: A file that does not have the msidbFileAttributesCompressed bit set should be considered non-compressed .
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 1dd97aa15428c0fc97a4f909f28f252f4d85723d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1dd97aa15428c0fc97a4f90… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 1 15:10:21 2006 -0700 msi: A file that does not have the msidbFileAttributesCompressed bit set should be considered non-compressed. --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 92f4185..36caba7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -330,7 +330,7 @@ static BOOL extract_cabinet_file(MSIPACK static VOID set_file_source(MSIPACKAGE* package, MSIFILE* file, MSICOMPONENT* comp, LPCWSTR path) { - if (file->Attributes & msidbFileAttributesNoncompressed) + if (!(file->Attributes & msidbFileAttributesCompressed)) { LPWSTR p, path; p = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); @@ -419,7 +419,7 @@ static UINT ready_media_for_file( MSIPAC msi_free(mi->last_path); mi->last_path = NULL; - if (file->Attributes & msidbFileAttributesNoncompressed) + if (!(file->Attributes & msidbFileAttributesCompressed)) { mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); set_file_source(package,file,comp,mi->last_path); @@ -605,7 +605,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac continue; /* compressed files are extracted in ready_media_for_file */ - if (~file->Attributes & msidbFileAttributesNoncompressed) + if (file->Attributes & msidbFileAttributesCompressed) { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(file->TargetPath)) ERR("compressed file wasn't extracted (%s)\n",

1 0

James Hawkins : msi: Don' t crash if an empty record is given to MsiProcessMessage.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: f10365bb5dd9a0994368dfd82834691db5250598 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f10365bb5dd9a0994368dfd… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 1 13:15:34 2006 -0700 msi: Don't crash if an empty record is given to MsiProcessMessage. --- dlls/msi/package.c | 4 ++++ dlls/msi/tests/format.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 53433d0..283b0a6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -668,6 +668,10 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack action = MSI_RecordGetString(record, 1); action_text = MSI_RecordGetString(record, 2); + + if (!action || !action_text) + return IDOK; + deformat_string(package, action_text, &deformatted); len = strlenW(timet) + strlenW(action) + strlenW(template_s); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 1ea9ee3..c7d4fc5 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1360,9 +1360,35 @@ static void test_formatrecord_package(vo DeleteFile( filename ); } +static void test_processmessage(void) +{ + static const CHAR filename[] = "winetest.msi"; + MSIHANDLE hrec; + MSIHANDLE package; + int r; + + package = helper_createpackage( filename ); + ok(package!=0, "Unable to create package\n"); + + hrec = MsiCreateRecord(3); + ok( hrec, "failed to create record\n"); + + r = MsiRecordSetString(hrec, 1, ""); + ok( r == ERROR_SUCCESS, "set string failed\n"); + + r = MsiProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, hrec); + ok( r == IDOK, "expected IDOK, got %i\n", r); + + MsiCloseHandle(hrec); + MsiCloseHandle(package); + + DeleteFile(filename); +} + START_TEST(format) { test_createpackage(); test_formatrecord(); test_formatrecord_package(); + test_processmessage(); }

1 0

James Hawkins : msi: Set the install state to INSTALLSTATE_LOCAL for features with compressed files .
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 7edea0cc6868505252c65cbf0846b2f577660e51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7edea0cc6868505252c65cb… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 1 10:14:15 2006 -0700 msi: Set the install state to INSTALLSTATE_LOCAL for features with compressed files. --- dlls/msi/action.c | 7 +++++++ dlls/msi/action.h | 1 + dlls/msi/tests/package.c | 5 +---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 65cfa77..cce2a59 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1328,6 +1328,7 @@ static UINT load_file(MSIRECORD *row, LP if (file->Attributes & msidbFileAttributesCompressed) { + file->Component->ForceLocalState = TRUE; file->Component->Action = INSTALLSTATE_LOCAL; file->Component->ActionRequest = INSTALLSTATE_LOCAL; } @@ -1755,6 +1756,12 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa } } } + + if (component->ForceLocalState) + { + feature->Action = INSTALLSTATE_LOCAL; + feature->ActionRequest = INSTALLSTATE_LOCAL; + } } } diff --git a/dlls/msi/action.h b/dlls/msi/action.h index 8edfbb0..93d28c6 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -59,6 +59,7 @@ typedef struct tagMSICOMPONENT INSTALLSTATE ActionRequest; INSTALLSTATE Action; + BOOL ForceLocalState; BOOL Enabled; INT Cost; INT RefCount; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 62920fa..3f0299e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1683,10 +1683,7 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "three", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

Robert Reif : advapi32: LsaQueryInformationPolicy: do the right thing for both domains and accounts.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 0424424e341d76951d1ab220894e99aeacc14688 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0424424e341d76951d1ab22… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Aug 1 21:49:15 2006 -0400 advapi32: LsaQueryInformationPolicy: do the right thing for both domains and accounts. --- dlls/advapi32/lsa.c | 139 +++++++++++++++++++++++---------------------------- 1 files changed, 64 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0424424e341d76951d1…

1 0

Juan Lang : wintrust: Implement TrustIsCertificateSelfSigned.
by Alexandre Julliard Aug. 2, 2006

Aug. 2, 2006

Module: wine Branch: refs/heads/master Commit: 7fc56136be20fae833ca0249436f08c73ae492ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fc56136be20fae833ca024… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Aug 1 17:20:33 2006 -0700 wintrust: Implement TrustIsCertificateSelfSigned. --- dlls/wintrust/Makefile.in | 2 +- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index 22000f3..de2b25e 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wintrust.dll IMPORTLIB = libwintrust.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = crypt32 kernel32 C_SRCS = wintrust_main.c diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index d5d0994..28de155 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -71,7 +71,7 @@ @ stub TrustDecode @ stub TrustFindIssuerCertificate @ stub TrustFreeDecode -@ stub TrustIsCertificateSelfSigned +@ stdcall TrustIsCertificateSelfSigned(ptr) @ stub TrustOpenStores @ stub WTHelperCertFindIssuerCertificate @ stub WTHelperCertIsSelfSigned diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 9d5f4e6..6c56fcb 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -83,6 +83,19 @@ BOOL WINAPI CryptCATAdminReleaseContext( } /*********************************************************************** + * TrustIsCertificateSelfSigned (WINTRUST.@) + */ +BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) +{ + BOOL ret; + + TRACE("%p\n", cert); + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); + return ret; +} + +/*********************************************************************** * WinVerifyTrust (WINTRUST.@) */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData )

1 0