June 2009 - Wine-commits - list.winehq.org

Andrew Eikum : gdiplus: Stub for GdipBitmapApplyEffect.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: ad2341253cf9c364a27c54fddb208a74a7eb6b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2341253cf9c364a27c54fdd… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Thu Jun 4 23:36:22 2009 -0500 gdiplus: Stub for GdipBitmapApplyEffect. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7d44c0b..e0251d5 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -35,7 +35,7 @@ @ stdcall GdipBeginContainer2(ptr ptr) @ stdcall GdipBeginContainer(ptr ptr ptr long ptr) @ stdcall GdipBeginContainerI(ptr ptr ptr long ptr) -@ stub GdipBitmapApplyEffect +@ stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) @ stub GdipBitmapConvertFormat @ stub GdipBitmapCreateApplyEffect @ stub GdipBitmapGetHistogram diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a18b2ad..5f7dfec 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -70,6 +70,17 @@ static INT ipicture_pixel_width(IPicture *pic) return x; } +GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, + RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %p %p %d %p %p): stub\n", bitmap, effect, roi, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8e9812f..803ea1a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -39,6 +39,7 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,R GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); /* Bitmap */ +GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*);

1 0

Andrew Eikum : gdiplus: Stub for GdipBitmapCreateApplyEffect.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: f01bfea62ec2e339a8ee1daa73a5d584a17934af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01bfea62ec2e339a8ee1daa7… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Thu Jun 4 23:36:33 2009 -0500 gdiplus: Stub for GdipBitmapCreateApplyEffect. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e0251d5..c658e00 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -37,7 +37,7 @@ @ stdcall GdipBeginContainerI(ptr ptr ptr long ptr) @ stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) @ stub GdipBitmapConvertFormat -@ stub GdipBitmapCreateApplyEffect +@ stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) @ stub GdipBitmapGetHistogram @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5f7dfec..6df104e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -81,6 +81,18 @@ GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, return NotImplemented; } +GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap** inputBitmaps, + INT numInputs, CGpEffect* effect, RECT* roi, RECT* outputRect, + GpBitmap** outputBitmap, BOOL useAuxData, VOID** auxData, INT* auxDataSize) +{ + FIXME("(%p %d %p %p %p %p %d %p %p): stub\n", inputBitmaps, numInputs, effect, roi, outputRect, outputBitmap, useAuxData, auxData, auxDataSize); + /* + * Note: According to Jose Roca's GDI+ docs, this function is not + * implemented in Windows's GDI+. + */ + return NotImplemented; +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 803ea1a..4e830b5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -40,6 +40,7 @@ GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); /* Bitmap */ GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap*,CGpEffect*,RECT*,BOOL,VOID**,INT*); +GpStatus WINGDIPAPI GdipBitmapCreateApplyEffect(GpBitmap**,INT,CGpEffect*,RECT*,RECT*,GpBitmap**,BOOL,VOID**,INT*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*);

1 0

Stephan Rose : gdiplus: Add support for vertical string alignment to GdipDrawString.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: eb3904d02b1d406e960854391e4a5a67d22f9ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3904d02b1d406e960854391… Author: Stephan Rose <kermos(a)somrek.net> Date: Thu Jun 4 18:51:07 2009 -0400 gdiplus: Add support for vertical string alignment to GdipDrawString. --- dlls/gdiplus/graphics.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3fedc97..2698159 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2089,7 +2089,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; - INT sum = 0, height = 0, fit, fitcpy, save_state, i, j, lret, nwidth, + INT sum = 0, height = 0, offsety = 0, fit, fitcpy, save_state, i, j, lret, nwidth, nheight; SIZE size; RECT drawcoord; @@ -2105,9 +2105,22 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string return NotImplemented; } - if(format) + if(format){ TRACE("may be ignoring some format flags: attr %x\n", format->attr); + /* Should be no need to explicitly test for StringAlignmentNear as + * that is default behavior if no alignment is passed. */ + if(format->vertalign != StringAlignmentNear){ + RectF bounds; + GdipMeasureString(graphics, string, length, font, rect, format, &bounds, 0, 0); + + if(format->vertalign == StringAlignmentCenter) + offsety = (rect->Height - bounds.Height) / 2; + else if(format->vertalign == StringAlignmentFar) + offsety = (rect->Height - bounds.Height); + } + } + if(length == -1) length = lstrlenW(string); stringdup = GdipAlloc(length * sizeof(WCHAR)); @@ -2118,9 +2131,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SetTextColor(graphics->hdc, brush->lb.lbColor); rectcpy[3].X = rectcpy[0].X = rect->X; - rectcpy[1].Y = rectcpy[0].Y = rect->Y; + rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; - rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; + rectcpy[3].Y = rectcpy[2].Y = rect->Y + offsety + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0)

1 0

Ben Klein : mountmgr.sys: Add tracking of fixed harddisk devices.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 49f1d5f7c892787d64fc84bab239ea52646ed10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1d5f7c892787d64fc84bab… Author: Ben Klein <shacklein(a)gmail.com> Date: Thu Jun 4 18:14:56 2009 +1000 mountmgr.sys: Add tracking of fixed harddisk devices. --- dlls/mountmgr.sys/mountmgr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 00112b9..d2b1515 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -264,6 +264,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) case DRIVE_REMOTE: type = DEVICE_NETWORK; break; case DRIVE_CDROM: type = DEVICE_CDROM; break; case DRIVE_RAMDISK: type = DEVICE_RAMDISK; break; + case DRIVE_FIXED: type = DEVICE_HARDDISK_VOL; break; } return add_dos_device( letter - 'a', NULL, device, mount_point, type ); }

1 0

Alexandre Julliard : winegcc: Link against winecrt0 for the Mingw build too .
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 284438dc712038b6f58d4f7854e5574832ab3543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284438dc712038b6f58d4f785… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 14:42:18 2009 +0200 winegcc: Link against winecrt0 for the Mingw build too. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index b0853c1..516d2bc 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -694,6 +694,7 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); + if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); for ( j = 0; j < files->size; j++ )

1 0

Henri Verbeet : wined3d: Use GL_DEPTH24_STENCIL8_EXT for depth stencil formats.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: f8c4832276fb740e527fed87aa27975f91546d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c4832276fb740e527fed87a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:48 2009 +0200 wined3d: Use GL_DEPTH24_STENCIL8_EXT for depth stencil formats. --- dlls/wined3d/utils.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e95bd4c..00f67d0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -412,20 +412,32 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ARB_DEPTH_TEXTURE}, {WINED3DFMT_D15S1, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, + {WINED3DFMT_D15S1, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, + WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + EXT_PACKED_DEPTH_STENCIL}, {WINED3DFMT_D24S8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, + {WINED3DFMT_D24S8, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + EXT_PACKED_DEPTH_STENCIL}, {WINED3DFMT_D24X8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, {WINED3DFMT_D24X4S4, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, + {WINED3DFMT_D24X4S4, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, + WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + EXT_PACKED_DEPTH_STENCIL}, {WINED3DFMT_D16_UNORM, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH, @@ -440,8 +452,12 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { ARB_DEPTH_TEXTURE}, {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, - WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + WINED3DFMT_FLAG_DEPTH, ARB_DEPTH_TEXTURE}, + {WINED3DFMT_D24FS8, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, + WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, + EXT_PACKED_DEPTH_STENCIL}, /* Vendor-specific formats */ {WINED3DFMT_ATI2N, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE,

1 0

Damjan Jovanovic : winemenubuilder: Track, update and clean up file open associations.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 4af750a57824f2c4b93c509883120e61d7adb5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4af750a57824f2c4b93c50988… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 4 21:57:45 2009 +0200 winemenubuilder: Track, update and clean up file open associations. --- programs/winemenubuilder/winemenubuilder.c | 170 ++++++++++++++++++++++++++++ 1 files changed, 170 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index bd9c30d..eeded0e 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1514,6 +1514,21 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, return ret; } +static CHAR* reg_get_valA(HKEY key, LPCSTR subkey, LPCSTR name) +{ + DWORD size; + if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + { + CHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + { + if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) + return ret; + } + } + return NULL; +} + static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; @@ -1529,6 +1544,158 @@ static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) return NULL; } +static HKEY open_associations_reg_key(void) +{ + static const WCHAR Software_Wine_FileOpenAssociationsW[] = { + 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','i','l','e','O','p','e','n','A','s','s','o','c','i','a','t','i','o','n','s',0}; + HKEY assocKey; + if (RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey) == ERROR_SUCCESS) + return assocKey; + return NULL; +} + +static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) +{ + static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; + static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; + HKEY assocKey; + BOOL ret; + + if ((assocKey = open_associations_reg_key())) + { + CHAR *valueA; + WCHAR *value; + + ret = FALSE; + + valueA = reg_get_valA(assocKey, extensionA, "MimeType"); + if (!valueA || lstrcmpA(valueA, mimeType)) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, valueA); + + value = reg_get_valW(assocKey, extensionW, ProgIDW); + if (!value || strcmpW(value, progId)) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + + valueA = reg_get_valA(assocKey, extensionA, "AppName"); + if (!valueA || lstrcmpA(valueA, appName)) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, valueA); + + value = reg_get_valW(assocKey, extensionW, DocNameW); + if (docName && (!value || strcmpW(value, docName))) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + + RegCloseKey(assocKey); + } + else + { + WINE_ERR("error opening associations registry key\n"); + ret = FALSE; + } + return ret; +} + +static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName, LPCSTR desktopFile) +{ + static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; + static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; + HKEY assocKey; + + if ((assocKey = open_associations_reg_key())) + { + HKEY subkey; + if (RegCreateKeyW(assocKey, extension, &subkey) == ERROR_SUCCESS) + { + RegSetValueExA(subkey, "MimeType", 0, REG_SZ, (BYTE*) mimeType, lstrlenA(mimeType) + 1); + RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); + RegSetValueExA(subkey, "AppName", 0, REG_SZ, (BYTE*) appName, lstrlenA(appName) + 1); + if (docName) + RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); + RegSetValueExA(subkey, "DesktopFile", 0, REG_SZ, (BYTE*) desktopFile, (lstrlenA(desktopFile) + 1)); + RegCloseKey(subkey); + } + else + WINE_ERR("could not create extension subkey\n"); + RegCloseKey(assocKey); + } + else + WINE_ERR("could not open file associations key\n"); +} + +static BOOL cleanup_associations(void) +{ + HKEY assocKey; + BOOL hasChanged = FALSE; + if ((assocKey = open_associations_reg_key())) + { + int i; + BOOL done = FALSE; + for (i = 0; !done; i++) + { + WCHAR *extensionW = NULL; + char *extensionA = NULL; + DWORD size = 1024; + LSTATUS ret; + + do + { + HeapFree(GetProcessHeap(), 0, extensionW); + extensionW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (extensionW == NULL) + { + WINE_ERR("out of memory\n"); + ret = ERROR_OUTOFMEMORY; + break; + } + ret = RegEnumKeyExW(assocKey, i, extensionW, &size, NULL, NULL, NULL, NULL); + size *= 2; + } while (ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + WCHAR *command; + extensionA = wchars_to_utf8_chars(extensionW); + if (extensionA == NULL) + { + WINE_ERR("out of memory\n"); + done = TRUE; + goto end; + } + command = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL); + if (command == NULL) + { + char *desktopFile = reg_get_valA(assocKey, extensionA, "DesktopFile"); + if (desktopFile) + { + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_a(extensionA)); + remove(desktopFile); + } + RegDeleteKeyW(assocKey, extensionW); + hasChanged = TRUE; + HeapFree(GetProcessHeap(), 0, desktopFile); + } + HeapFree(GetProcessHeap(), 0, command); + } + else + { + if (ret != ERROR_NO_MORE_ITEMS) + WINE_ERR("error %d while reading registry\n", ret); + done = TRUE; + } + end: + HeapFree(GetProcessHeap(), 0, extensionA); + HeapFree(GetProcessHeap(), 0, extensionW); + } + RegCloseKey(assocKey); + } + else + WINE_ERR("could not open file associations key\n"); + return hasChanged; +} + static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const char *dot_extension, const char *mime_type, const char *comment) { @@ -1732,6 +1899,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ + if (has_association_changed(extensionA, extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); if (desktopPath) @@ -1739,6 +1907,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (write_freedesktop_association_entry(desktopPath, extensionA, friendlyAppNameA, mimeTypeA, progIdA)) { hasChanged = TRUE; + update_association(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, desktopPath); } HeapFree(GetProcessHeap(), 0, desktopPath); } @@ -2232,6 +2401,7 @@ static void RefreshFileTypeAssociations(void) create_directories(applications_dir); hasChanged = generate_associations(xdg_data_dir, packages_dir, applications_dir); + hasChanged |= cleanup_associations(); if (hasChanged) { char *command = heap_printf("update-mime-database %s", mime_dir);

1 0

Tony Wasserka : d3dx9: Test return codes of the D3DXGetImageInfo functions.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: e6ece9ee4a911148553eb27f6731a6bb278ad2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ece9ee4a911148553eb27f6… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 4 20:06:19 2009 +0200 d3dx9: Test return codes of the D3DXGetImageInfo functions. --- dlls/d3dx9_36/tests/Makefile.in | 5 +- dlls/d3dx9_36/tests/bmp1x1.bmp | Bin 0 -> 58 bytes dlls/d3dx9_36/tests/resources.h | 26 ++++++ dlls/d3dx9_36/tests/rsrc.rc | 28 ++++++ dlls/d3dx9_36/tests/texture.c | 187 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6ece9ee4a911148553eb…

1 0

Henri Verbeet : wined3d: Use FBOs for offscreen rendering by default.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: a5876bb91e92645a400a248abb1ef283d1a822f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5876bb91e92645a400a248ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:48 2009 +0200 wined3d: Use FBOs for offscreen rendering by default. --- dlls/wined3d/wined3d_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2775dc9..f996aec 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -41,7 +41,7 @@ wined3d_settings_t wined3d_settings = PS_HW, /* Hardware by default */ VBO_HW, /* Hardware by default */ TRUE, /* Use of GLSL enabled by default */ - ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ + ORM_FBO, /* Use FBOs to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */

1 0

Henri Verbeet : wined3d: Add support for EXT_packed_depth_stencil.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: d08f4fb5f56323630a32c5c81a0eaec076307fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08f4fb5f56323630a32c5c81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:48 2009 +0200 wined3d: Add support for EXT_packed_depth_stencil. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 06d5476..4a2a270 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -104,6 +104,7 @@ static const struct { {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT, 0 }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE, 0 }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT, 0 }, + {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL, 0 }, {"GL_EXT_paletted_texture", EXT_PALETTED_TEXTURE, 0 }, {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS, 0 }, {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 49d29a7..521b3a9 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1897,6 +1897,15 @@ typedef void (WINE_GLAPI * PGLFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint sr #endif typedef void (WINE_GLAPI * PGLFNRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +/* GL_EXT_packed_depth_stencil */ +#ifndef GL_EXT_packed_depth_stencil +#define GL_EXT_packed_depth_stencil 1 +#define GL_DEPTH_STENCIL_EXT 0x84f9 +#define GL_UNSIGNED_INT_24_8_EXT 0x84fa +#define GL_DEPTH24_STENCIL8_EXT 0x88f0 +#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88f1 +#endif + /* GL_EXT_secondary_color */ #ifndef GL_EXT_secondary_color #define GL_EXT_secondary_color 1 @@ -3424,6 +3433,7 @@ typedef enum _GL_SupportedExt { EXT_FRAMEBUFFER_OBJECT, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, + EXT_PACKED_DEPTH_STENCIL, EXT_PALETTED_TEXTURE, EXT_PIXEL_BUFFER_OBJECT, EXT_POINT_PARAMETERS,

1 0