September 2009 - Wine-commits

Rico Schüller : d3d10: Reorder some functions.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 7c156c5753f57535b9c12ea3cb8ac17562b4f214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c156c5753f57535b9c12ea3c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 9 19:16:40 2009 +0200 d3d10: Reorder some functions. --- dlls/d3d10/effect.c | 306 +++++++++++++++++++++++++------------------------- 1 files changed, 153 insertions(+), 153 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9d7b270..a6d6be5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -268,6 +268,159 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } +static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) +{ + switch (c) + { + case 1: return D3D10_SVC_SCALAR; + case 2: return D3D10_SVC_VECTOR; + case 3: return D3D10_SVC_MATRIX_ROWS; + default: + FIXME("Unknown variable class %#x.\n", c); + return 0; + } +} + +static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t) +{ + switch (t) + { + case 1: return D3D10_SVT_FLOAT; + case 2: return D3D10_SVT_INT; + case 3: return D3D10_SVT_UINT; + case 4: return D3D10_SVT_BOOL; + default: + FIXME("Unknown variable type %#x.\n", t); + return 0; + } +} + +static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, const char *data) +{ + DWORD unknown0; + DWORD offset; + + read_dword(&ptr, &offset); + TRACE("Type name at offset %#x.\n", offset); + + t->name = copy_name(data + offset); + if (!t->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Type name: %s.\n", debugstr_a(t->name)); + + read_dword(&ptr, &unknown0); + TRACE("Unknown 0: %u.\n", unknown0); + + read_dword(&ptr, &t->element_count); + TRACE("Element count: %u.\n", t->element_count); + + read_dword(&ptr, &t->size_unpacked); + TRACE("Unpacked size: %#x.\n", t->size_unpacked); + + read_dword(&ptr, &t->stride); + TRACE("Stride: %#x.\n", t->stride); + + read_dword(&ptr, &t->size_packed); + TRACE("Packed size %#x.\n", t->size_packed); + + if (unknown0 == 1) + { + DWORD tmp; + + t->member_count = 0; + + read_dword(&ptr, &tmp); + t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; + t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; + t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT); + t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); + + TRACE("Type description: %#x.\n", tmp); + TRACE("\tcolumns: %u.\n", t->column_count); + TRACE("\trows: %u.\n", t->row_count); + TRACE("\tbasetype: %#x.\n", t->basetype); + TRACE("\tclass: %#x.\n", t->type_class); + TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK + | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); + } + else if (unknown0 == 3) + { + unsigned int i; + DWORD tmp; + + TRACE("Type is a structure.\n"); + + read_dword(&ptr, &t->member_count); + TRACE("Member count: %u.\n", t->member_count); + + t->column_count = 0; + t->row_count = 0; + t->basetype = 0; + t->type_class = D3D10_SVC_STRUCT; + + for (i = 0; i < t->member_count; ++i) + { + read_dword(&ptr, &tmp); + TRACE("Member %u name at offset %#x.\n", i, tmp); + TRACE("Member %u name: %s.\n", i, debugstr_a(data + tmp)); + + /* Member semantic? */ + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &tmp); + TRACE("Member %u offset in struct: %#x.\n", i, tmp); + + read_dword(&ptr, &tmp); + TRACE("Member %u type info at offset %#x.\n", i, tmp); + } + } + + return S_OK; +} + +static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset) +{ + struct d3d10_effect_type *type; + struct wine_rb_entry *entry; + HRESULT hr; + + entry = wine_rb_get(&effect->types, &offset); + if (entry) + { + TRACE("Returning existing type.\n"); + return WINE_RB_ENTRY_VALUE(entry, struct d3d10_effect_type, entry); + } + + type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); + if (!type) + { + ERR("Failed to allocate type memory.\n"); + return NULL; + } + + type->vtbl = &d3d10_effect_type_vtbl; + type->id = offset; + hr = parse_fx10_type(type, data + offset, data); + if (FAILED(hr)) + { + ERR("Failed to parse type info, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, type); + return NULL; + } + + if (wine_rb_put(&effect->types, &offset, &type->entry) == -1) + { + ERR("Failed to insert type entry.\n"); + HeapFree(GetProcessHeap(), 0, type); + return NULL; + } + + return type; +} + static void parse_fx10_annotation(const char **ptr) { skip_dword_unknown(ptr, 3); @@ -422,159 +575,6 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return S_OK; } -static D3D10_SHADER_VARIABLE_CLASS d3d10_variable_class(DWORD c) -{ - switch (c) - { - case 1: return D3D10_SVC_SCALAR; - case 2: return D3D10_SVC_VECTOR; - case 3: return D3D10_SVC_MATRIX_ROWS; - default: - FIXME("Unknown variable class %#x.\n", c); - return 0; - } -} - -static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t) -{ - switch (t) - { - case 1: return D3D10_SVT_FLOAT; - case 2: return D3D10_SVT_INT; - case 3: return D3D10_SVT_UINT; - case 4: return D3D10_SVT_BOOL; - default: - FIXME("Unknown variable type %#x.\n", t); - return 0; - } -} - -static HRESULT parse_fx10_type(struct d3d10_effect_type *t, const char *ptr, const char *data) -{ - DWORD unknown0; - DWORD offset; - - read_dword(&ptr, &offset); - TRACE("Type name at offset %#x.\n", offset); - - t->name = copy_name(data + offset); - if (!t->name) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - TRACE("Type name: %s.\n", debugstr_a(t->name)); - - read_dword(&ptr, &unknown0); - TRACE("Unknown 0: %u.\n", unknown0); - - read_dword(&ptr, &t->element_count); - TRACE("Element count: %u.\n", t->element_count); - - read_dword(&ptr, &t->size_unpacked); - TRACE("Unpacked size: %#x.\n", t->size_unpacked); - - read_dword(&ptr, &t->stride); - TRACE("Stride: %#x.\n", t->stride); - - read_dword(&ptr, &t->size_packed); - TRACE("Packed size %#x.\n", t->size_packed); - - if (unknown0 == 1) - { - DWORD tmp; - - t->member_count = 0; - - read_dword(&ptr, &tmp); - t->column_count = (tmp & D3D10_FX10_TYPE_COLUMN_MASK) >> D3D10_FX10_TYPE_COLUMN_SHIFT; - t->row_count = (tmp & D3D10_FX10_TYPE_ROW_MASK) >> D3D10_FX10_TYPE_ROW_SHIFT; - t->basetype = d3d10_variable_type((tmp & D3D10_FX10_TYPE_BASETYPE_MASK) >> D3D10_FX10_TYPE_BASETYPE_SHIFT); - t->type_class = d3d10_variable_class((tmp & D3D10_FX10_TYPE_CLASS_MASK) >> D3D10_FX10_TYPE_CLASS_SHIFT); - - TRACE("Type description: %#x.\n", tmp); - TRACE("\tcolumns: %u.\n", t->column_count); - TRACE("\trows: %u.\n", t->row_count); - TRACE("\tbasetype: %s.\n", debug_d3d10_shader_variable_type(t->basetype)); - TRACE("\tclass: %s.\n", debug_d3d10_shader_variable_class(t->type_class)); - TRACE("\tunknown bits: %#x.\n", tmp & ~(D3D10_FX10_TYPE_COLUMN_MASK | D3D10_FX10_TYPE_ROW_MASK - | D3D10_FX10_TYPE_BASETYPE_MASK | D3D10_FX10_TYPE_CLASS_MASK)); - } - else if (unknown0 == 3) - { - unsigned int i; - DWORD tmp; - - TRACE("Type is a structure.\n"); - - read_dword(&ptr, &t->member_count); - TRACE("Member count: %u.\n", t->member_count); - - t->column_count = 0; - t->row_count = 0; - t->basetype = 0; - t->type_class = D3D10_SVC_STRUCT; - - for (i = 0; i < t->member_count; ++i) - { - read_dword(&ptr, &tmp); - TRACE("Member %u name at offset %#x.\n", i, tmp); - TRACE("Member %u name: %s.\n", i, debugstr_a(data + tmp)); - - /* Member semantic? */ - skip_dword_unknown(&ptr, 1); - - read_dword(&ptr, &tmp); - TRACE("Member %u offset in struct: %#x.\n", i, tmp); - - read_dword(&ptr, &tmp); - TRACE("Member %u type info at offset %#x.\n", i, tmp); - } - } - - return S_OK; -} - -static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset) -{ - struct d3d10_effect_type *type; - struct wine_rb_entry *entry; - HRESULT hr; - - entry = wine_rb_get(&effect->types, &offset); - if (entry) - { - TRACE("Returning existing type.\n"); - return WINE_RB_ENTRY_VALUE(entry, struct d3d10_effect_type, entry); - } - - type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); - if (!type) - { - ERR("Failed to allocate type memory.\n"); - return NULL; - } - - type->vtbl = &d3d10_effect_type_vtbl; - type->id = offset; - hr = parse_fx10_type(type, data + offset, data); - if (FAILED(hr)) - { - ERR("Failed to parse type info, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, type); - return NULL; - } - - if (wine_rb_put(&effect->types, &offset, &type->entry) == -1) - { - ERR("Failed to insert type entry.\n"); - HeapFree(GetProcessHeap(), 0, type); - return NULL; - } - - return type; -} - static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) { DWORD offset;

1 0

Vladimir Pankratov : readme: Keep README.ru in sync.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: f1f85815999831a198bb50ad0ada2a2bfef750c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f85815999831a198bb50ad0… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Sep 9 23:16:25 2009 +0500 readme: Keep README.ru in sync. --- documentation/README.ru | 222 +++++++++++++++++++++++----------------------- 1 files changed, 111 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1f85815999831a198bb5…

1 0

Roderick Colenbrander : winex11: Add helper function for copying brushes.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: efa37f56ec51e76c1127c3f1b0cb8ef9d75d3112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa37f56ec51e76c1127c3f1b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 10 10:41:51 2009 +0200 winex11: Add helper function for copying brushes. --- dlls/winex11.drv/brush.c | 11 ++++------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index c94e04e..372cb13 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -215,25 +215,22 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; - wine_tsx11_lock(); if ((physDev->depth == 1) && (physBitmap->pixmap_depth != 1)) { + wine_tsx11_lock(); /* Special case: a color pattern on a monochrome DC */ physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, bitmap.bmWidth, bitmap.bmHeight, 1); /* FIXME: should probably convert to monochrome instead */ XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, get_bitmap_gc(1), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); + wine_tsx11_unlock(); } else { - physDev->brush.pixmap = XCreatePixmap( gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, - physBitmap->pixmap_depth ); - XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + /* XRender is needed because of possible depth conversion */ + X11DRV_XRender_CopyBrush(physDev, physBitmap, bitmap.bmWidth, bitmap.bmHeight); } - wine_tsx11_unlock(); if (physBitmap->pixmap_depth > 1) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 078b1fd..62b0d63 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -286,6 +286,7 @@ extern void X11DRV_XRender_Init(void); extern void X11DRV_XRender_Finalize(void); extern BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE*, HFONT); extern void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE*); +extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height); extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index bc759a8..efa8d02 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1984,6 +1984,40 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid return TRUE; } +void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) +{ + /* At depths >1, the depth of physBitmap and physDev might not be the same e.g. the physbitmap might be a 16-bit DIB while the physdev uses 24-bit */ + int depth = physBitmap->pixmap_depth == 1 ? 1 : physDev->depth; + + wine_tsx11_lock(); + physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, depth); + + /* Use XCopyArea when the physBitmap and brush.pixmap have the same depth. */ + if(physBitmap->pixmap_depth == 1 || physDev->depth == physBitmap->pixmap_depth) + { + XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, + get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); + } + else /* We meed depth conversion */ + { + WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physBitmap->pixmap_depth, &physBitmap->pixmap_color_shifts); + WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); + + Picture src_pict, dst_pict; + XRenderPictureAttributes pa; + pa.subwindow_mode = IncludeInferiors; + pa.repeat = RepeatNone; + + src_pict = pXRenderCreatePicture(gdi_display, physBitmap->pixmap, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); + dst_pict = pXRenderCreatePicture(gdi_display, physDev->brush.pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); + + xrender_blit(src_pict, 0, dst_pict, 0, 0, 1.0, 1.0, width, height); + pXRenderFreePicture(gdi_display, src_pict); + pXRenderFreePicture(gdi_display, dst_pict); + } + wine_tsx11_unlock(); +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, @@ -2125,6 +2159,16 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, return FALSE; } +void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, int width, int height) +{ + wine_tsx11_lock(); + physDev->brush.pixmap = XCreatePixmap(gdi_display, root_window, width, height, physBitmap->pixmap_depth); + + XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, + get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, width, height, 0, 0 ); + wine_tsx11_unlock(); +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc,

1 0

Roderick Colenbrander : winex11: Add helper function get_xrender_format_from_color_shifts.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 88b990b2c1852eb8adec18b0cfa486706ec56d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b990b2c1852eb8adec18b0c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Sep 10 10:37:50 2009 +0200 winex11: Add helper function get_xrender_format_from_color_shifts. --- dlls/winex11.drv/xrender.c | 57 ++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a0f9b7b..bc759a8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -427,39 +427,40 @@ static WineXRenderFormat *get_xrender_format(WXRFormat format) return NULL; } -static WineXRenderFormat *get_xrender_format_from_pdevice(X11DRV_PDEVICE *physDev) +static WineXRenderFormat *get_xrender_format_from_color_shifts(int depth, ColorShifts *shifts) { - if(physDev->depth == 1) + int redMask, greenMask, blueMask; + unsigned int i; + + if(depth == 1) return get_xrender_format(WXR_FORMAT_MONO); + /* physDevs of a depth <=8, don't have color_shifts set and XRender can't handle those except for 1-bit */ - else if(!physDev->color_shifts) + if(!shifts) return default_format; - else - { - int redMask=0, greenMask=0, blueMask=0; - int i; - ColorShifts *shifts = physDev->color_shifts; - redMask = shifts->physicalRed.max << shifts->physicalRed.shift; - greenMask = shifts->physicalGreen.max << shifts->physicalGreen.shift; - blueMask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + redMask = shifts->physicalRed.max << shifts->physicalRed.shift; + greenMask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + blueMask = shifts->physicalBlue.max << shifts->physicalBlue.shift; - /* Try to locate a format which matches the specification of the dibsection. */ - for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) - { - if( physDev->depth == wxr_formats_template[i].depth && - redMask == (wxr_formats_template[i].redMask << wxr_formats_template[i].red) && - greenMask == (wxr_formats_template[i].greenMask << wxr_formats_template[i].green) && - blueMask == (wxr_formats_template[i].blueMask << wxr_formats_template[i].blue) ) + /* Try to locate a format which matches the specification of the dibsection. */ + for(i = 0; i < (sizeof(wxr_formats_template) / sizeof(wxr_formats_template[0])); i++) + { + if( depth == wxr_formats_template[i].depth && + redMask == (wxr_formats_template[i].redMask << wxr_formats_template[i].red) && + greenMask == (wxr_formats_template[i].greenMask << wxr_formats_template[i].green) && + blueMask == (wxr_formats_template[i].blueMask << wxr_formats_template[i].blue) ) - { - /* When we reach this stage the format was found in our template table but this doesn't mean that - * the Xserver also supports this format (e.g. its depth might be too low). The call below verifies that. - */ - return get_xrender_format(wxr_formats_template[i].wxr_format); - } + { + /* When we reach this stage the format was found in our template table but this doesn't mean that + * the Xserver also supports this format (e.g. its depth might be too low). The call below verifies that. + */ + return get_xrender_format(wxr_formats_template[i].wxr_format); } } + + /* This should not happen because when we reach 'shifts' must have been set and we only allows shifts which are backed by X */ + ERR("No XRender format found!\n"); return NULL; } @@ -1398,7 +1399,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag unsigned int idx; double cosEsc, sinEsc; LOGFONTW lf; - WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(physDev); + WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; /* Do we need to disable antialiasing because of palette mode? */ @@ -1804,7 +1805,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid POINT pts[2]; BOOL top_down = FALSE; RGNDATA *rgndata; - WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(devDst); + WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(devDst->depth, devDst->color_shifts); WineXRenderFormat *src_format; int repeat_src; @@ -1994,8 +1995,8 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; - WineXRenderFormat *src_format = get_xrender_format_from_pdevice(physDevSrc); - WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(physDevDst); + WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); + WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; double xscale = widthSrc/(double)widthDst;

1 0

Paul Vriens : shell32/tests: Fix a test failure on Win95/NT4.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: e5e065ebbb77c28314eaa938a0641258b8397070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e065ebbb77c28314eaa938a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 10 10:12:35 2009 +0200 shell32/tests: Fix a test failure on Win95/NT4. --- dlls/shell32/tests/shelllink.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index ba2bb33..2f20200 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -165,7 +165,9 @@ static void test_get_set(void) { IShellLinkW_Release(slW); r = IShellLinkA_SetPath(sl, NULL); - ok(r==E_INVALIDARG, "SetPath failed (0x%08x)\n", r); + ok(r==E_INVALIDARG || + broken(r==S_OK), /* Some Win95 and NT4 */ + "SetPath failed (0x%08x)\n", r); } r = IShellLinkA_SetPath(sl, "");

1 0

Huw Davies : include: Add DBTYPEENUM.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 15a5e46a754964f0c40860a27d57e44c56595ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a5e46a754964f0c40860a27… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 19:14:38 2009 +0100 include: Add DBTYPEENUM. --- include/dbs.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index 57ccf27..2383d0c 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -112,4 +112,43 @@ typedef struct tagDBIMPLICITSESSION typedef WORD DBTYPE; +enum DBTYPEENUM +{ + DBTYPE_EMPTY = 0, + DBTYPE_NULL = 1, + DBTYPE_I2 = 2, + DBTYPE_I4 = 3, + DBTYPE_R4 = 4, + DBTYPE_R8 = 5, + DBTYPE_CY = 6, + DBTYPE_DATE = 7, + DBTYPE_BSTR = 8, + DBTYPE_IDISPATCH = 9, + DBTYPE_ERROR = 10, + DBTYPE_BOOL = 11, + DBTYPE_VARIANT = 12, + DBTYPE_IUNKNOWN = 13, + DBTYPE_DECIMAL = 14, + DBTYPE_I1 = 16, + DBTYPE_UI1 = 17, + DBTYPE_UI2 = 18, + DBTYPE_UI4 = 19, + DBTYPE_I8 = 20, + DBTYPE_UI8 = 21, + DBTYPE_GUID = 72, + DBTYPE_BYTES = 128, + DBTYPE_STR = 129, + DBTYPE_WSTR = 130, + DBTYPE_NUMERIC = 131, + DBTYPE_UDT = 132, + DBTYPE_DBDATE = 133, + DBTYPE_DBTIME = 134, + DBTYPE_DBTIMESTAMP = 135, + + DBTYPE_VECTOR = 0x1000, + DBTYPE_ARRAY = 0x2000, + DBTYPE_BYREF = 0x4000, + DBTYPE_RESERVED = 0x8000 +}; + typedef DWORD DBSTATUS;

1 0

Huw Davies : oledb32/tests: Add some tests for IDCInfo.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 678f98ea88c07a9950bda20647588a0c7923abf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678f98ea88c07a9950bda2064… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 17:18:37 2009 +0100 oledb32/tests: Add some tests for IDCInfo. --- .gitignore | 2 + configure | 9 +++ configure.ac | 1 + dlls/oledb32/tests/Makefile.in | 15 ++++ dlls/oledb32/tests/convert.c | 152 ++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.idl | 1 + 6 files changed, 180 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 799496f..359f44e 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ dlls/oleaut32/tests/tmarshal.tlb dlls/oleaut32/tests/tmarshal_i.c dlls/oledb32/convert.h dlls/oledb32/convert_i.c +dlls/oledb32/tests/convert.h +dlls/oledb32/tests/convert_i.c dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h diff --git a/configure b/configure index 59f988e..e32773b 100755 --- a/configure +++ b/configure @@ -15993,6 +15993,14 @@ dlls/oledb32/Makefile: dlls/oledb32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/oledb32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/oledb32/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + oledb32/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/oledb32/tests/Makefile: dlls/oledb32/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/oledb32/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/oledlg/Makefile" test "x$enable_oledlg" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ oledlg" @@ -18929,6 +18937,7 @@ do "dlls/olecli.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli.dll16/Makefile" ;; "dlls/olecli32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olecli32/Makefile" ;; "dlls/oledb32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledb32/Makefile" ;; + "dlls/oledb32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledb32/tests/Makefile" ;; "dlls/oledlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/oledlg/Makefile" ;; "dlls/olepro32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olepro32/Makefile" ;; "dlls/olesvr.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/olesvr.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index ba9a454..ac5a861 100644 --- a/configure.ac +++ b/configure.ac @@ -2359,6 +2359,7 @@ WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls] WINE_CONFIG_MAKEFILE([dlls/olecli.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/oledb32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/oledb32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/olesvr.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in new file mode 100644 index 0000000..f19a670 --- /dev/null +++ b/dlls/oledb32/tests/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = oledb32.dll +IMPORTS = ole32 gdi32 advapi32 kernel32 + +CTESTS = \ + convert.c + +IDL_I_SRCS = convert.idl + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c new file mode 100644 index 0000000..8d7dd49 --- /dev/null +++ b/dlls/oledb32/tests/convert.c @@ -0,0 +1,152 @@ +/* OLE DB Conversion library tests + * + * Copyright 2009 Huw Davies + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "msdadc.h" + +#include "oledberr.h" + +#include "initguid.h" +#include "msdaguid.h" + +#include "wine/test.h" + +static void test_dcinfo(void) +{ + IDCInfo *info; + HRESULT hr; + DCINFOTYPE types[2]; + DCINFO *inf; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDCInfo, (void**)&info); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + types[0] = DCINFOTYPE_VERSION; + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x110, "got %08x\n", V_UI4(&inf->vData)); + + V_UI4(&inf->vData) = 0x200; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x200, "got %08x\n", V_UI4(&inf->vData)); + + V_UI4(&inf->vData) = 0x100; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x100, "got %08x\n", V_UI4(&inf->vData)); + + V_UI4(&inf->vData) = 0x500; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x500, "got %08x\n", V_UI4(&inf->vData)); + + V_UI4(&inf->vData) = 0xffff; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0xffff, "got %08x\n", V_UI4(&inf->vData)); + + V_UI4(&inf->vData) = 0x12345678; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x12345678, "got %08x\n", V_UI4(&inf->vData)); + + /* Try setting a version variant of something other than VT_UI4 */ + V_VT(&inf->vData) = VT_I4; + V_I4(&inf->vData) = 0x200; + hr = IDCInfo_SetInfo(info, 1, inf); + ok(hr == DB_S_ERRORSOCCURRED, "got %08x\n", hr); + CoTaskMemFree(inf); + + hr = IDCInfo_GetInfo(info, 1, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf->eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf->eInfoType); + ok(V_VT(&inf->vData) == VT_UI4, "got %08x\n", V_VT(&inf->vData)); + ok(V_UI4(&inf->vData) == 0x12345678, "got %08x\n", V_UI4(&inf->vData)); + CoTaskMemFree(inf); + + /* More than one type */ + types[1] = 2; + hr = IDCInfo_GetInfo(info, 2, types, &inf); + ok(hr == S_OK, "got %08x\n", hr); + ok(inf[0].eInfoType == DCINFOTYPE_VERSION, "got %08x\n", inf[0].eInfoType); + ok(V_VT(&inf[0].vData) == VT_UI4, "got %08x\n", V_VT(&inf[0].vData)); + ok(V_UI4(&inf[0].vData) == 0x12345678, "got %08x\n", V_UI4(&inf[0].vData)); + ok(inf[1].eInfoType == 2, "got %08x\n", inf[1].eInfoType); + ok(V_VT(&inf[1].vData) == VT_EMPTY, "got %08x\n", V_VT(&inf[1].vData)); + + hr = IDCInfo_SetInfo(info, 2, inf); + ok(hr == S_OK, "got %08x\n", hr); + CoTaskMemFree(inf); + + + IDCInfo_Release(info); +} + +START_TEST(convert) +{ + OleInitialize(NULL); + test_dcinfo(); + OleUninitialize(); +} diff --git a/dlls/oledb32/tests/convert.idl b/dlls/oledb32/tests/convert.idl new file mode 100644 index 0000000..081be3d --- /dev/null +++ b/dlls/oledb32/tests/convert.idl @@ -0,0 +1 @@ +#include "msdadc.idl"

1 0

Huw Davies : oledb32: Implement the IDCInfo interface.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 93fa219bbf9fd7cd632bf493167b90073bedb18a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fa219bbf9fd7cd632bf4931… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 17:16:54 2009 +0100 oledb32: Implement the IDCInfo interface. --- dlls/oledb32/convert.c | 53 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 06d49b0..458abb5 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "msdadc.h" +#include "oledberr.h" #include "oledb_private.h" @@ -40,6 +41,8 @@ typedef struct const struct IDCInfoVtbl *lpDCInfoVtbl; LONG ref; + + UINT version; /* Set by IDCInfo_SetInfo */ } convert; static inline convert *impl_from_IDataConvert(IDataConvert *iface) @@ -174,24 +177,61 @@ static ULONG WINAPI dcinfo_Release(IDCInfo* iface) return IDataConvert_Release((IDataConvert *)This); } -static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info) +static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info_ptr) { convert *This = impl_from_IDCInfo(iface); + ULONG i; + DCINFO *infos; - FIXME("(%p)->(%d, %p, %p): stub\n", This, num, types, info); + TRACE("(%p)->(%d, %p, %p)\n", This, num, types, info_ptr); - *info = NULL; + *info_ptr = infos = CoTaskMemAlloc(num * sizeof(*infos)); + if(!infos) return E_OUTOFMEMORY; - return E_NOTIMPL; + for(i = 0; i < num; i++) + { + infos[i].eInfoType = types[i]; + VariantInit(&infos[i].vData); + + switch(types[i]) + { + case DCINFOTYPE_VERSION: + V_VT(&infos[i].vData) = VT_UI4; + V_UI4(&infos[i].vData) = This->version; + break; + } + } + + return S_OK; } static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[]) { convert *This = impl_from_IDCInfo(iface); + ULONG i; + HRESULT hr = S_OK; - FIXME("(%p)->(%d, %p): stub\n", This, num, info); + TRACE("(%p)->(%d, %p)\n", This, num, info); - return E_NOTIMPL; + for(i = 0; i < num; i++) + { + switch(info[i].eInfoType) + { + case DCINFOTYPE_VERSION: + if(V_VT(&info[i].vData) != VT_UI4) + { + FIXME("VERSION with vt %x\n", V_VT(&info[i].vData)); + hr = DB_S_ERRORSOCCURRED; + break; + } + This->version = V_UI4(&info[i].vData); + break; + + default: + FIXME("Unhandled info type %d (vt %x)\n", info[i].eInfoType, V_VT(&info[i].vData)); + } + } + return hr; } static const struct IDCInfoVtbl dcinfo_vtbl = @@ -219,6 +259,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) This->lpVtbl = &convert_vtbl; This->lpDCInfoVtbl = &dcinfo_vtbl; This->ref = 1; + This->version = 0x110; *obj = &This->lpVtbl;

1 0

Huw Davies : include: Add oledberr.h.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 034bff29ec77f4e13c581433be6e659f85eb51dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=034bff29ec77f4e13c581433b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 17:14:18 2009 +0100 include: Add oledberr.h. --- include/Makefile.in | 1 + include/oledberr.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 24c392f..6ea2210 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -370,6 +370,7 @@ SRCDIR_INCLUDES = \ ole2ver.h \ oleauto.h \ olectl.h \ + oledberr.h \ oledlg.h \ opnrst.idl \ pdh.h \ diff --git a/include/oledberr.h b/include/oledberr.h new file mode 100644 index 0000000..6a169ef --- /dev/null +++ b/include/oledberr.h @@ -0,0 +1,30 @@ +/* OLE DB error codes. + * + * Copyright 2009 Huw Davies + * + * 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_OLEDBERR_H +#define __WINE_OLEDBERR_H + +#define DB_E_NOTFOUND 0x80040e19 + +#define DB_E_ERRORSOCCURRED 0x80040e21 + +#define DB_S_ERRORSOCCURRED 0x00040eda + +#endif /* __WINE_OLEDBERR_H */

1 0

Ken Thomases : openal32: Add support for Mac OS X's OpenAL.framework.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 0b08f19e032fdc4ac55174aac60f7f168c04daa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b08f19e032fdc4ac55174aac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 9 22:23:35 2009 -0500 openal32: Add support for Mac OS X's OpenAL.framework. --- configure | 11 +++++++++-- configure.ac | 8 +++++++- dlls/openal32/openal.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 329b243..59f988e 100755 --- a/configure +++ b/configure @@ -617,7 +617,6 @@ LDPATH BUILTINFLAG EXTRACFLAGS LIBKSTAT -LIBOPENAL LIBMPG123 PNGINCL FONTCONFIGINCL @@ -655,6 +654,7 @@ CROSSTARGETFLAGS CROSSTEST CROSSCC CARBONLIB +LIBOPENAL COREAUDIO DISKARBITRATIONLIB LDEXECFLAGS @@ -2622,7 +2622,7 @@ fi # Check whether --with-openal was given. if test "${with_openal+set}" = set; then : - withval=$with_openal; if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; fi + withval=$with_openal; if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi fi @@ -5666,6 +5666,7 @@ for ac_header in \ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ + OpenAL/al.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -6496,6 +6497,12 @@ fi COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + if test "$ac_cv_header_OpenAL_al_h" = "yes" + then + LIBOPENAL="-framework OpenAL" + + ac_cv_lib_openal_alGetSource3i=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" diff --git a/configure.ac b/configure.ac index adec95f..ba9a454 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_ARG_WITH(mpg123, AS_HELP_STRING([--without-mpg123],[do not use the mpg123 AC_ARG_WITH(nas, AS_HELP_STRING([--without-nas],[do not use the NAS sound support]), [if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi]) AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), - [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; fi]) + [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) @@ -303,6 +303,7 @@ AC_CHECK_HEADERS(\ DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ + OpenAL/al.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ @@ -628,6 +629,11 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + if test "$ac_cv_header_OpenAL_al_h" = "yes" + then + AC_SUBST(LIBOPENAL,"-framework OpenAL") + ac_cv_lib_openal_alGetSource3i=yes + fi if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" then ac_save_LIBS="$LIBS" diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index fb5a47c..75654fc 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -32,6 +32,9 @@ #ifdef HAVE_AL_AL_H #include <AL/al.h> #include <AL/alc.h> +#elif defined(HAVE_OPENAL_AL_H) +#include <OpenAL/al.h> +#include <OpenAL/alc.h> #endif WINE_DEFAULT_DEBUG_CHANNEL(openal32); diff --git a/include/config.h.in b/include/config.h.in index 161a41c..d072380 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -555,6 +555,9 @@ /* Define if mkdir takes only one argument */ #undef HAVE_ONE_ARG_MKDIR +/* Define to 1 if you have the <OpenAL/al.h> header file. */ +#undef HAVE_OPENAL_AL_H + /* Define if OpenGL is present on the system */ #undef HAVE_OPENGL

1 0