July 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Use SaveDC, RestoreDC in GdipDrawLineI.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: d9ef172e04397ffe4a14ba2c87a210e3ad87f45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ef172e04397ffe4a14ba2c8… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 2 15:13:05 2007 -0700 gdiplus: Use SaveDC, RestoreDC in GdipDrawLineI. --- dlls/gdiplus/graphics.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ac16f7..453cbe5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -247,15 +247,18 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { - HGDIOBJ old_obj; + INT save_state; if(!pen || !graphics) return InvalidParameter; - old_obj = SelectObject(graphics->hdc, pen->gdipen); + save_state = SaveDC(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); + MoveToEx(graphics->hdc, x1, y1, NULL); LineTo(graphics->hdc, x2, y2); - SelectObject(graphics->hdc, old_obj); + + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

Evan Stade : gdiplus: Call EndPath() in GdipDrawLineI in case there is an open path.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: c60c030c95b17e089fd9b1302c5391fbf708413c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60c030c95b17e089fd9b1302… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 3 11:39:22 2007 -0700 gdiplus: Call EndPath() in GdipDrawLineI in case there is an open path. --- dlls/gdiplus/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 453cbe5..4765e33 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -253,6 +253,7 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, return InvalidParameter; save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); MoveToEx(graphics->hdc, x1, y1, NULL);

1 0

Huw Davies : winex11.drv: Pass root_window to XCreatePixmap to avoid BadDrawable errors.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: ee40cb4b9f67eb5aa93033b25d2bba0ad881a01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee40cb4b9f67eb5aa93033b25… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 3 15:03:23 2007 +0100 winex11.drv: Pass root_window to XCreatePixmap to avoid BadDrawable errors. --- dlls/winex11.drv/xrender.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index eafe0e7..e677cea 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1207,7 +1207,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag XRenderPictFormat *format = (physDev->depth == 1) ? mono_format : screen_format; wine_tsx11_lock(); physDev->xrender->tile_xpm = XCreatePixmap(gdi_display, - physDev->drawable, + root_window, 1, 1, format->depth); pa.repeat = True; @@ -1425,7 +1425,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag image_w, image_h, AllPlanes, ZPixmap, physDev->depth, image); if(!image) { - Pixmap xpm = XCreatePixmap(gdi_display, physDev->drawable, image_w, image_h, + Pixmap xpm = XCreatePixmap(gdi_display, root_window, image_w, image_h, physDev->depth); GC gc; XGCValues gcv; @@ -1622,7 +1622,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, TRACE("dst_pict %08lx\n", dst_pict); TRACE("src_drawable = %08lx\n", devSrc->drawable); xpm = XCreatePixmap(gdi_display, - devSrc->drawable, + root_window, widthSrc, heightSrc, 32); gcv.graphics_exposures = False; gc = XCreateGC(gdi_display, xpm, GCGraphicsExposures, &gcv);

1 0

Huw Davies : winex11.drv: Move the PictFormats into an array.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 030ef1ef0567ab77c1c5bbcadd70e6ec48f5f034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030ef1ef0567ab77c1c5bbcad… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 3 15:18:55 2007 +0100 winex11.drv: Move the PictFormats into an array. --- dlls/winex11.drv/xrender.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e677cea..33da629 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -46,8 +46,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrender); #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> -static XRenderPictFormat *screen_format; /* format of screen */ -static XRenderPictFormat *mono_format; /* format of mono bitmap */ + +enum drawable_depth_type {mono_drawable, color_drawable}; +static XRenderPictFormat *pict_formats[2]; typedef struct { @@ -203,8 +204,8 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) if(pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base)) { X11DRV_XRender_Installed = TRUE; TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); - screen_format = pXRenderFindVisualFormat(gdi_display, visual); - if(!screen_format) + pict_formats[color_drawable] = pXRenderFindVisualFormat(gdi_display, visual); + if(!pict_formats[color_drawable]) { /* Xrender doesn't like DirectColor visuals, try to find a TrueColor one instead */ if (visual->class == DirectColor) @@ -213,12 +214,12 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) if (XMatchVisualInfo( gdi_display, DefaultScreen(gdi_display), screen_depth, TrueColor, &info )) { - screen_format = pXRenderFindVisualFormat(gdi_display, info.visual); - if (screen_format) visual = info.visual; + pict_formats[color_drawable] = pXRenderFindVisualFormat(gdi_display, info.visual); + if (pict_formats[color_drawable]) visual = info.visual; } } } - if(!screen_format) /* This fails in buggy versions of libXrender.so */ + if(!pict_formats[color_drawable]) /* This fails in buggy versions of libXrender.so */ { wine_tsx11_unlock(); WINE_MESSAGE( @@ -232,10 +233,10 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) pf.depth = 1; pf.direct.alpha = 0; pf.direct.alphaMask = 1; - mono_format = pXRenderFindFormat(gdi_display, PictFormatType | - PictFormatDepth | PictFormatAlpha | - PictFormatAlphaMask, &pf, 0); - if(!mono_format) { + pict_formats[mono_drawable] = pXRenderFindFormat(gdi_display, PictFormatType | + PictFormatDepth | PictFormatAlpha | + PictFormatAlphaMask, &pf, 0); + if(!pict_formats[mono_drawable]) { ERR("mono_format == NULL?\n"); X11DRV_XRender_Installed = FALSE; } @@ -1098,6 +1099,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag unsigned int idx; double cosEsc, sinEsc; LOGFONTW lf; + enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable; /* Do we need to disable antialiasing because of palette mode? */ if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) { @@ -1176,8 +1178,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag wine_tsx11_lock(); physDev->xrender->pict = pXRenderCreatePicture(gdi_display, physDev->drawable, - (physDev->depth == 1) ? - mono_format : screen_format, + pict_formats[depth_type], CPSubwindowMode, &pa); wine_tsx11_unlock(); @@ -1204,7 +1205,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag if(!physDev->xrender->tile_xpm) { XRenderPictureAttributes pa; - XRenderPictFormat *format = (physDev->depth == 1) ? mono_format : screen_format; + XRenderPictFormat *format = pict_formats[depth_type]; wine_tsx11_lock(); physDev->xrender->tile_xpm = XCreatePixmap(gdi_display, root_window, @@ -1534,6 +1535,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, POINT pts[2]; BOOL top_down = FALSE; RGNDATA *rgndata; + enum drawable_depth_type dst_depth_type = (devDst->depth == 1) ? mono_drawable : color_drawable; if(!X11DRV_XRender_Installed) { FIXME("Unable to AlphaBlend without Xrender\n"); @@ -1616,8 +1618,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, /* FIXME use devDst->xrender->pict ? */ dst_pict = pXRenderCreatePicture(gdi_display, devDst->drawable, - (devDst->depth == 1) ? - mono_format : screen_format, + pict_formats[dst_depth_type], CPSubwindowMode, &pa); TRACE("dst_pict %08lx\n", dst_pict); TRACE("src_drawable = %08lx\n", devSrc->drawable);

1 0

Huw Davies : winex11.drv: Use global Pictures for the tiles.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: bd2fe1a2fa06212461e341e214f35c32fa31d200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2fe1a2fa06212461e341e21… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 3 15:21:32 2007 +0100 winex11.drv: Use global Pictures for the tiles. --- dlls/winex11.drv/xrender.c | 147 +++++++++++++++++++++++--------------------- 1 files changed, 76 insertions(+), 71 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 33da629..846e352 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -84,9 +84,6 @@ struct tagXRENDERINFO { int cache_index; Picture pict; - Picture tile_pict; - Pixmap tile_xpm; - COLORREF lastTextColor; }; @@ -602,17 +599,6 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) pXRenderFreePicture(gdi_display, physDev->xrender->pict); physDev->xrender->pict = 0; } - if(physDev->xrender->tile_pict) - { - pXRenderFreePicture(gdi_display, physDev->xrender->tile_pict); - physDev->xrender->tile_pict = 0; - } - if(physDev->xrender->tile_xpm) - { - XFreePixmap(gdi_display, physDev->xrender->tile_xpm); - physDev->xrender->tile_xpm = 0; - } - wine_tsx11_unlock(); return; @@ -1071,6 +1057,76 @@ static void SmoothGlyphGray(XImage *image, int x, int y, void *bitmap, XGlyphInf } } +/************************************************************* + * get_tile_pict + * + * Returns an appropiate Picture for tiling the text colour. + * Call and use result within the xrender_cs + */ +static Picture get_tile_pict(enum drawable_depth_type type, int text_pixel) +{ + static struct + { + Pixmap xpm; + Picture pict; + int current_color; + } tiles[2], *tile; + XRenderColor col; + + tile = &tiles[type]; + + if(!tile->xpm) + { + XRenderPictureAttributes pa; + + wine_tsx11_lock(); + tile->xpm = XCreatePixmap(gdi_display, root_window, 1, 1, pict_formats[type]->depth); + + pa.repeat = True; + tile->pict = pXRenderCreatePicture(gdi_display, tile->xpm, pict_formats[type], CPRepeat, &pa); + wine_tsx11_unlock(); + + /* init current_color to something different from text_pixel */ + tile->current_color = ~text_pixel; + + if(type == mono_drawable) + { + /* for a 1bpp bitmap we always need a 1 in the tile */ + col.red = col.green = col.blue = 0; + col.alpha = 0xffff; + wine_tsx11_lock(); + pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1); + wine_tsx11_unlock(); + } + } + + if(text_pixel != tile->current_color && type == color_drawable) + { + /* Map 0 -- 0xff onto 0 -- 0xffff */ + int r_shift, r_len; + int g_shift, g_len; + int b_shift, b_len; + + ExamineBitfield (visual->red_mask, &r_shift, &r_len ); + ExamineBitfield (visual->green_mask, &g_shift, &g_len); + ExamineBitfield (visual->blue_mask, &b_shift, &b_len); + + col.red = GetField(text_pixel, r_shift, r_len); + col.red |= col.red << 8; + col.green = GetField(text_pixel, g_shift, g_len); + col.green |= col.green << 8; + col.blue = GetField(text_pixel, b_shift, b_len); + col.blue |= col.blue << 8; + col.alpha = 0x0; + + wine_tsx11_lock(); + pXRenderFillRectangle(gdi_display, PictOpSrc, tile->pict, &col, 0, 0, 1, 1); + wine_tsx11_unlock(); + tile->current_color = text_pixel; + } + return tile->pict; +} + static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { return 1; @@ -1083,7 +1139,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) { - XRenderColor col; RGNDATA *data; XGCValues xgcval; int render_op = PictOpOver; @@ -1100,6 +1155,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag double cosEsc, sinEsc; LOGFONTW lf; enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable; + Picture tile_pict = 0; /* Do we need to disable antialiasing because of palette mode? */ if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) { @@ -1170,6 +1226,8 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag DeleteObject( clip_region ); } + EnterCriticalSection(&xrender_cs); + if(X11DRV_XRender_Installed) { if(!physDev->xrender->pict) { XRenderPictureAttributes pa; @@ -1198,68 +1256,15 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); } - } - - if(X11DRV_XRender_Installed) { - /* Create a 1x1 pixmap to tile over the font mask */ - if(!physDev->xrender->tile_xpm) { - XRenderPictureAttributes pa; - - XRenderPictFormat *format = pict_formats[depth_type]; - wine_tsx11_lock(); - physDev->xrender->tile_xpm = XCreatePixmap(gdi_display, - root_window, - 1, 1, - format->depth); - pa.repeat = True; - physDev->xrender->tile_pict = pXRenderCreatePicture(gdi_display, - physDev->xrender->tile_xpm, - format, - CPRepeat, &pa); - wine_tsx11_unlock(); - TRACE("Created pixmap of depth %d\n", format->depth); - /* init lastTextColor to something different from textPixel */ - physDev->xrender->lastTextColor = ~physDev->textPixel; - - } - if(physDev->textPixel != physDev->xrender->lastTextColor) { - if(physDev->depth != 1) { - /* Map 0 -- 0xff onto 0 -- 0xffff */ - int r_shift, r_len; - int g_shift, g_len; - int b_shift, b_len; - - ExamineBitfield (visual->red_mask, &r_shift, &r_len ); - ExamineBitfield (visual->green_mask, &g_shift, &g_len); - ExamineBitfield (visual->blue_mask, &b_shift, &b_len); - - col.red = GetField(physDev->textPixel, r_shift, r_len); - col.red |= col.red << 8; - col.green = GetField(physDev->textPixel, g_shift, g_len); - col.green |= col.green << 8; - col.blue = GetField(physDev->textPixel, b_shift, b_len); - col.blue |= col.blue << 8; - col.alpha = 0x0; - } else { /* for a 1bpp bitmap we always need a 1 in the tile */ - col.red = col.green = col.blue = 0; - col.alpha = 0xffff; - } - wine_tsx11_lock(); - pXRenderFillRectangle(gdi_display, PictOpSrc, - physDev->xrender->tile_pict, - &col, 0, 0, 1, 1); - wine_tsx11_unlock(); - physDev->xrender->lastTextColor = physDev->textPixel; - } + tile_pict = get_tile_pict(depth_type, physDev->textPixel); /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. */ - if((physDev->depth == 1) && (textPixel == 0)) + if((depth_type == mono_drawable) && (textPixel == 0)) render_op = PictOpOutReverse; /* This gives us 'black' text */ } - EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physDev->xrender->cache_index; if( disable_antialias == FALSE ) aa_type = entry->aa_default; @@ -1325,7 +1330,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag } wine_tsx11_lock(); pXRenderCompositeText16(gdi_display, render_op, - physDev->xrender->tile_pict, + tile_pict, physDev->xrender->pict, formatEntry->font_format, 0, 0, 0, 0, elts, count);

1 0

lostwages/templates/en download.template
by Jeremy Newman 03 Jul '07

03 Jul '07

ChangeSet ID: 31238 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/07/03 09:05:35 Modified files: templates/en : download.template Log message: Andreas Bierfert Fixed/Improved fedora packages download link Patch: http://cvs.winehq.org/patch.py?id=31238 Old revision New revision Changes Path 1.92 1.93 +3 -3 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.92 lostwages/templates/en/download.template:1.93 --- lostwages/templates/en/download.template:1.92 3 Jul 2007 14: 5:35 -0000 +++ lostwages/templates/en/download.template 3 Jul 2007 14: 5:35 -0000 @@ -24,11 +24,11 @@ for post-installation instructions.< <td align=center><a href="{$root}/site/download-rh"> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> - <td> <a href="http://download.fedora.redhat.com/pub/fedora/linux/extras/5/i386/repodata/r…">Red Hat / Fedora</a> - binary and source .rpms for RedHat 8, 9; Fedora Core 3, 4, 5; and + <td> <a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora</a> + binary and source .rpms for Red Hat Enterprise Linux 4, 5; CentOS 4, 5; Fedora Core 5, 6; Fedora Linux 7 and compatible distributions. The wine meta package is available via <tt>yum</tt> - through the Fedora Extras repository by running <tt>$ yum install + through the EPEL / Fedora Extras / Fedora repository by running <tt>$ yum install wine </tt>" </td> <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td>

1 0

James Hawkins : msi: Read the components state directly from the registry.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 39a5638268095be901f4a0103c2be51959cd86ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a5638268095be901f4a0103… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:24:40 2007 -0700 msi: Read the components state directly from the registry. --- dlls/msi/msi.c | 21 +++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/msi.c | 10 ++-------- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b352595..b669c37 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1229,7 +1229,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) { WCHAR squishProduct[33], comp[GUID_SIZE]; GUID guid; - LPWSTR components, p, parent_feature; + LPWSTR components, p, parent_feature, path; UINT rc; HKEY hkey; INSTALLSTATE r; @@ -1284,17 +1284,18 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) } StringFromGUID2(&guid, comp, GUID_SIZE); - r = MsiGetComponentPathW(szProduct, comp, NULL, 0); - TRACE("component %s state %d\n", debugstr_guid(&guid), r); - switch (r) + rc = MSIREG_OpenUserDataComponentKey(comp, &hkey, FALSE); + if (rc != ERROR_SUCCESS) { - case INSTALLSTATE_NOTUSED: - case INSTALLSTATE_LOCAL: - case INSTALLSTATE_SOURCE: - break; - default: - missing = TRUE; + msi_free(components); + return INSTALLSTATE_ADVERTISED; } + + path = msi_reg_get_val_str(hkey, squishProduct); + if (!path) + missing = TRUE; + + msi_free(path); } TRACE("%s %s -> %d\n", debugstr_w(szProduct), debugstr_w(szFeature), r); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 33ca027..bb85e9a 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -707,6 +707,7 @@ extern UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL cr extern UINT MSIREG_OpenComponents(HKEY* key); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); +extern UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 22a2498..b9c0af4 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -103,6 +103,15 @@ static const WCHAR szUser_Components_fmt[] = { 'C','o','m','p','o','n','e','n','t','s','\\', '%','s',0}; +static const WCHAR szUserDataComp_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'U','s','e','r','D','a','t','a','\\', +'%','s','\\','C','o','m','p','o','n','e','n','t','s','\\','%','s',0}; + static const WCHAR szUninstall_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -631,6 +640,35 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) return rc; } +UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create) +{ + UINT rc; + WCHAR comp[GUID_SIZE]; + WCHAR keypath[0x200]; + LPWSTR usersid; + + TRACE("%s\n", debugstr_w(szComponent)); + squash_guid(szComponent, comp); + TRACE("squished (%s)\n", debugstr_w(comp)); + + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } + + sprintfW(keypath, szUserDataComp_fmt, usersid, comp); + + if (create) + rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); + else + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + + msi_free(usersid); + return rc; +} + UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) { UINT rc; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 7814571..38126d4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -626,19 +626,13 @@ static void test_MsiQueryFeatureState(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryFeatureStateA(prodcode, "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); res = RegSetValueExA(compkey, prod_squashed, 0, REG_SZ, (const BYTE *)"apple", 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryFeatureStateA(prodcode, "feature"); - todo_wine - { - ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); - } + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); RegDeleteValueA(compkey, prod_squashed); RegDeleteValueA(compkey, "");

1 0

James Hawkins : msi: Return INSTALLSTATE_BADCONFIG if we can' t decode the first component.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 34f6af95b4cafc25f06a1ca85c6eb555c34966b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f6af95b4cafc25f06a1ca85… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:23:58 2007 -0700 msi: Return INSTALLSTATE_BADCONFIG if we can't decode the first component. --- dlls/msi/msi.c | 10 +++++++--- dlls/msi/tests/msi.c | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 6d69cf9..b352595 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1272,13 +1272,17 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) if (!components) return INSTALLSTATE_ADVERTISED; - for( p = components; *p != 2 ; p += 20) + for( p = components; *p && *p != 2 ; p += 20) { if (!decode_base85_guid( p, &guid )) { - ERR("%s\n", debugstr_w(p)); - break; + if (p != components) + break; + + msi_free(components); + return INSTALLSTATE_BADCONFIG; } + StringFromGUID2(&guid, comp, GUID_SIZE); r = MsiGetComponentPathW(szProduct, comp, NULL, 0); TRACE("component %s state %d\n", debugstr_guid(&guid), r); diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 589b161..7814571 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -591,10 +591,7 @@ static void test_MsiQueryFeatureState(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryFeatureStateA(prodcode, "feature"); - todo_wine - { - ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state); - } + ok(state == INSTALLSTATE_BADCONFIG, "Expected INSTALLSTATE_BADCONFIG, got %d\n", state); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaaa", 21); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

James Hawkins : msi: Return INSTALLSTATE_ADVERTISED if the component list is empty.
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 73e0a87477c4b0fe792988061397a5241b72a985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e0a87477c4b0fe792988061… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:23:28 2007 -0700 msi: Return INSTALLSTATE_ADVERTISED if the component list is empty. --- dlls/msi/msi.c | 6 +----- dlls/msi/tests/msi.c | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4511f34..6d69cf9 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1270,11 +1270,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature) TRACE("rc = %d buffer = %s\n", rc, debugstr_w(components)); if (!components) - { - ERR("components missing %s %s\n", - debugstr_w(szProduct), debugstr_w(szFeature)); - return INSTALLSTATE_UNKNOWN; - } + return INSTALLSTATE_ADVERTISED; for( p = components; *p != 2 ; p += 20) { diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 4e7b5e2..589b161 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -585,10 +585,7 @@ static void test_MsiQueryFeatureState(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); state = MsiQueryFeatureStateA(prodcode, "feature"); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

James Hawkins : msi: Set the WindowsInstaller value in RegisterProduct instead of PublishProduct .
by Alexandre Julliard 03 Jul '07

03 Jul '07

Module: wine Branch: master Commit: 0e44e090c591f485776c7e3898dec5a9e7296f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e44e090c591f485776c7e389… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 2 20:21:58 2007 -0700 msi: Set the WindowsInstaller value in RegisterProduct instead of PublishProduct. --- dlls/msi/action.c | 28 +++++++++++++++++++--------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 5 +---- 4 files changed, 60 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6c857f0..37ad1ab 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3279,10 +3279,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) {'A','R','P','P','R','O','D','U','C','T','I','C','O','N',0}; static const WCHAR szProductVersion[] = {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; - static const WCHAR szInstallProperties[] = - {'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; - static const WCHAR szWindowsInstaller[] = - {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; DWORD langid; LPWSTR buffer; DWORD size; @@ -3315,12 +3311,10 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - rc = RegCreateKeyW(hudkey, szInstallProperties, &props); + rc = MSIREG_OpenInstallPropertiesKey(package->ProductCode,&props,TRUE); if (rc != ERROR_SUCCESS) goto end; - msi_reg_set_val_dword( props, szWindowsInstaller, 1 ); - buffer = msi_dup_property( package, INSTALLPROPERTY_PRODUCTNAMEW ); msi_reg_set_val_str( hukey, INSTALLPROPERTY_PRODUCTNAMEW, buffer ); msi_free(buffer); @@ -3806,6 +3800,7 @@ static UINT msi_write_uninstall_property_vals( MSIPACKAGE *package, HKEY hkey ) static UINT ACTION_RegisterProduct(MSIPACKAGE *package) { HKEY hkey=0; + HKEY hudkey=0, props=0; LPWSTR buffer = NULL; UINT rc; DWORD size, langid; @@ -3830,7 +3825,11 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) SYSTEMTIME systime; static const WCHAR date_fmt[] = {'%','i','%','i','%','i',0}; LPWSTR upgrade_code; - WCHAR szDate[9]; + WCHAR szDate[9]; + + /* FIXME: also need to publish if the product is in advertise mode */ + if (!msi_check_publish(package)) + return ERROR_SUCCESS; rc = MSIREG_OpenUninstallKey(package->ProductCode,&hkey,TRUE); if (rc != ERROR_SUCCESS) @@ -3892,7 +3891,18 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) RegCloseKey(hkey); - /* FIXME: call ui_actiondata */ + rc = MSIREG_OpenUserDataProductKey(package->ProductCode, &hudkey, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + + RegCloseKey(hudkey); + + rc = MSIREG_OpenInstallPropertiesKey(package->ProductCode, &props, TRUE); + if (rc != ERROR_SUCCESS) + return rc; + + msi_reg_set_val_dword( props, szWindowsInstaller, 1 ); + RegCloseKey(props); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 14a365e..a62f8d9 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -709,6 +709,7 @@ extern UINT MSIREG_OpenComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create extern UINT MSIREG_OpenProductsKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenPatchesKey(LPCWSTR szPatch, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY* key, BOOL create); +extern UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserFeaturesKey(LPCWSTR szProduct, HKEY* key, BOOL create); extern UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create); extern UINT MSIREG_OpenUpgradeCodesKey(LPCWSTR szProduct, HKEY* key, BOOL create); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 238cdd1..5787bc7 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -166,6 +166,16 @@ static const WCHAR szUserDataProd_fmt[] = { 'U','s','e','r','D','a','t','a','\\', '%','s','\\','P','r','o','d','u','c','t','s','\\','%','s',0}; +static const WCHAR szInstallProperties_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'M','i','c','r','o','s','o','f','t','\\', +'W','i','n','d','o','w','s','\\', +'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', +'I','n','s','t','a','l','l','e','r','\\', +'U','s','e','r','D','a','t','a','\\', +'%','s','\\','P','r','o','d','u','c','t','s','\\','%','s','\\', +'I','n','s','t','a','l','l','P','r','o','p','e','r','t','i','e','s',0}; + #define SQUISH_GUID_SIZE 33 @@ -611,6 +621,35 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) return rc; } +UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) +{ + UINT rc; + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + LPWSTR usersid; + + TRACE("%s\n", debugstr_w(szProduct)); + squash_guid(szProduct, squished_pc); + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + rc = get_user_sid(&usersid); + if (rc != ERROR_SUCCESS || !usersid) + { + ERR("Failed to retrieve user SID: %d\n", rc); + return rc; + } + + sprintfW(keypath, szInstallProperties_fmt, usersid, squished_pc); + + if (create) + rc = RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); + else + rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + + msi_free(usersid); + return rc; +} + UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) { UINT rc; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f6d59c8..4cf3ca4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1683,10 +1683,7 @@ static void test_publish(void) ok(pf_exists("msitest"), "File not installed\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - todo_wine - { - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); - } + ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state);

1 0