wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Hans Leidekker : wbemprox: Implement IWbemServices::GetObject.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: dc0e478d5cfa1cdf9b2504110238c10012ab2d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0e478d5cfa1cdf9b2504110… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:21 2012 +0200 wbemprox: Implement IWbemServices::GetObject. --- dlls/wbemprox/services.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index aeca7c8..05a9811 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -239,8 +239,30 @@ static HRESULT WINAPI wbem_services_GetObject( IWbemClassObject **ppObject, IWbemCallResult **ppCallResult ) { - FIXME("\n"); - return WBEM_E_FAILED; + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + IEnumWbemClassObject *iter; + WCHAR *query; + HRESULT hr; + + TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strObjectPath), lFlags, + pCtx, ppObject, ppCallResult); + + if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); + + /* FIXME: parse path */ + + if (!(query = heap_alloc( strlenW( strObjectPath ) * sizeof(WCHAR) + sizeof(selectW) ))) + return E_OUTOFMEMORY; + strcpyW( query, selectW ); + strcatW( query, strObjectPath ); + + hr = exec_query( query, &iter ); + heap_free( query ); + if (hr != S_OK) return hr; + + hr = WbemClassObject_create( NULL, iter, 0, (void **)ppObject ); + IEnumWbemClassObject_Release( iter ); + return hr; } static HRESULT WINAPI wbem_services_GetObjectAsync(

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_VideoController.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 8f0da0eaad185534d1a6461b1f05031b49ac50e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0da0eaad185534d1a6461b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:24:05 2012 +0200 wbemprox: Implement more properties of Win32_VideoController. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 50 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 837a47e..2b6b34e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a40fff6..62d089a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -63,6 +63,12 @@ static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_cpustatusW[] = {'C','p','u','S','t','a','t','u','s',0}; +static const WCHAR prop_currentbitsperpixelW[] = + {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; +static const WCHAR prop_currenthorizontalresW[] = + {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_currentverticalresW[] = + {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = @@ -75,6 +81,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; +static const WCHAR prop_nameW[] = + {'N','a','m','e',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -152,8 +160,12 @@ static const struct column col_processor[] = }; static const struct column col_videocontroller[] = { - { prop_adapterramW, CIM_UINT32 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY } + { prop_adapterramW, CIM_UINT32 }, + { prop_currentbitsperpixelW, CIM_UINT32 }, + { prop_currenthorizontalresW, CIM_UINT32 }, + { prop_currentverticalresW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const WCHAR bios_descriptionW[] = @@ -235,7 +247,11 @@ struct record_processor struct record_videocontroller { UINT32 adapter_ram; + UINT32 current_bitsperpixel; + UINT32 current_horizontalres; + UINT32 current_verticalres; const WCHAR *device_id; + const WCHAR *name; }; #include "poppack.h" @@ -438,6 +454,19 @@ static void fill_os( struct table *table ) table->num_rows = 1; } +static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) +{ + HDC hdc = GetDC( NULL ); + UINT32 ret; + + if (!hdc) return 32; + ret = GetDeviceCaps( hdc, BITSPIXEL ); + *hres = GetDeviceCaps( hdc, HORZRES ); + *vres = GetDeviceCaps( hdc, VERTRES ); + ReleaseDC( NULL, hdc ); + return ret; +} + static void fill_videocontroller( struct table *table ) { @@ -446,7 +475,8 @@ static void fill_videocontroller( struct table *table ) IDXGIFactory *factory = NULL; IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; - UINT vidmem = 512 * 1024 * 1024; + UINT hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; + const WCHAR *name = videocontroller_deviceidW; if (!(table->data = heap_alloc( sizeof(*rec) ))) return; @@ -457,12 +487,20 @@ static void fill_videocontroller( struct table *table ) if (FAILED(hr)) goto done; hr = IDXGIAdapter_GetDesc( adapter, &desc ); - if (SUCCEEDED(hr)) vidmem = desc.DedicatedVideoMemory; + if (SUCCEEDED(hr)) + { + vidmem = desc.DedicatedVideoMemory; + name = desc.Description; + } done: rec = (struct record_videocontroller *)table->data; - rec->device_id = videocontroller_deviceidW; - rec->adapter_ram = vidmem; + rec->adapter_ram = vidmem; + rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); + rec->current_horizontalres = hres; + rec->current_verticalres = vres; + rec->device_id = videocontroller_deviceidW; + rec->name = heap_strdupW( name ); TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Julian Rüger : opengl32: Remove spaces preceding punctuation, streamline some debug messages.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 581c705ccc3eb953615fb2f9b0aedb9e4826f4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581c705ccc3eb953615fb2f9b… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 27 15:39:17 2012 +0200 opengl32: Remove spaces preceding punctuation, streamline some debug messages. --- dlls/opengl32/wgl.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 64add99..5a14125 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -361,7 +361,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, if (iLayerPlane == 0) { return wglCreateContext(hdc); } - FIXME(" no handler for layer %d\n", iLayerPlane); + FIXME("no handler for layer %d\n", iLayerPlane); return NULL; } @@ -387,7 +387,7 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, int iStart, int cEntries, const COLORREF *pcr) { - FIXME("(): stub !\n"); + FIXME("(): stub!\n"); return 0; } @@ -443,7 +443,7 @@ static BOOL is_extension_supported(const char* extension) const char *version = extension + 11; /* Move past 'GL_VERSION_' */ if(!gl_version) { - ERR("Error no OpenGL version found,\n"); + ERR("No OpenGL version found!\n"); return FALSE; } @@ -517,18 +517,18 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { */ memcpy(buf, ext_ret->name, strlen(ext_ret->name) - 3); buf[strlen(ext_ret->name) - 3] = '\0'; - TRACE(" extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); + TRACE("Extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); ret = GetProcAddress(opengl32_handle, buf); if (ret != NULL) { - TRACE(" found function in main OpenGL library (%p) !\n", ret); + TRACE("Found function in main OpenGL library (%p)!\n", ret); } else { - WARN("Did not find function %s (%s) in your OpenGL library !\n", lpszProc, ext_ret->name); + WARN("Did not find function %s (%s) in your OpenGL library!\n", lpszProc, ext_ret->name); } return ret; } else { - TRACE(" returning function (%p)\n", ext_ret->func); + TRACE("returning function (%p)\n", ext_ret->func); extension_funcs[ext_ret - extension_registry] = local_func; return ext_ret->func; @@ -555,7 +555,7 @@ int WINAPI wglSetLayerPaletteEntries(HDC hdc, int iStart, int cEntries, const COLORREF *pcr) { - FIXME("(): stub !\n"); + FIXME("(): stub!\n"); return 0; } @@ -573,7 +573,7 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, } if (fuPlanes) { - WARN("Following layers unhandled : %08x\n", fuPlanes); + WARN("Following layers unhandled: %08x\n", fuPlanes); } return TRUE; @@ -602,7 +602,7 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l else needed_size = GetGlyphOutlineA(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, &identity); - TRACE("Glyph : %3d / List : %d size %d\n", glyph, listBase, needed_size); + TRACE("Glyph: %3d / List: %d size %d\n", glyph, listBase, needed_size); if (needed_size == GDI_ERROR) { ret = FALSE; break; @@ -625,11 +625,11 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l unsigned int bitmask; unsigned char *bitmap_ = bitmap; - TRACE(" - bbox : %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY); - TRACE(" - origin : (%d , %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); - TRACE(" - increment : %d - %d\n", gm.gmCellIncX, gm.gmCellIncY); + TRACE(" - bbox: %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY); + TRACE(" - origin: (%d, %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); + TRACE(" - increment: %d - %d\n", gm.gmCellIncX, gm.gmCellIncY); if (needed_size != 0) { - TRACE(" - bitmap :\n"); + TRACE(" - bitmap:\n"); for (height = 0; height < gm.gmBlackBoxY; height++) { TRACE(" "); for (width = 0, bitmask = 0x80; width < gm.gmBlackBoxX; width++, bitmask >>= 1) {

1 0

Julian Rüger : opengl32: Fix typos in comments.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 2f3810755648814dad0ab355937326f82ac6bc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3810755648814dad0ab3559… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 27 14:54:23 2012 +0200 opengl32: Fix typos in comments. --- dlls/opengl32/wgl.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index e400f2e..64add99 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -224,11 +224,11 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) * without. In case PFD_STEREO_DONTCARE is set, stereo is ignored. * * To summarize the following is most likely the correct behavior: - * stereo not set -> prefer no-stereo formats, else also accept stereo formats - * stereo set -> prefer stereo formats, else also accept no-stereo formats + * stereo not set -> prefer non-stereo formats, but also accept stereo formats + * stereo set -> prefer stereo formats, but also accept non-stereo formats * stereo don't care -> it doesn't matter whether we get stereo or not * - * In Wine we will treat no-stereo the same way as don't care because it makes + * In Wine we will treat non-stereo the same way as don't care because it makes * format selection even more complicated and second drivers with Stereo advertise * each format twice anyway. */ @@ -426,7 +426,7 @@ static BOOL is_extension_supported(const char* extension) /* We use the GetProcAddress function from the display driver to retrieve function pointers * for OpenGL and WGL extensions. In case of winex11.drv the OpenGL extension lookup is done * using glXGetProcAddress. This function is quite unreliable in the sense that its specs don't - * require the function to return NULL when a extension isn't found. For this reason we check + * require the function to return NULL when an extension isn't found. For this reason we check * if the OpenGL extension required for the function we are looking up is supported. */ /* Check if the extension is part of the GL extension string to see if it is supported. */ @@ -487,11 +487,11 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { /* If nothing was found, we are looking for a WGL extension or an unknown GL extension. */ if (ext_ret == NULL) { - /* If the function name starts with a w it is a WGL extension */ + /* If the function name starts with a 'w', it is a WGL extension */ if(lpszProc[0] == 'w') return wine_wgl.p_wglGetProcAddress(lpszProc); - /* We are dealing with an unknown GL extension. */ + /* We are dealing with an unknown GL extension */ WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); return NULL; } else { /* We are looking for an OpenGL extension */ @@ -508,7 +508,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { char buf[256]; void *ret = NULL; - /* Remove the 3 last letters (EXT, ARB, ...). + /* Remove the last 3 letters (EXT, ARB, ...). I know that some extensions have more than 3 letters (MESA, NV, INTEL, ...), but this is only a stop-gap measure to fix buggy @@ -879,7 +879,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, case TT_PRIM_QSPLINE: for(i = 0; i < ppc->cpfx/2; i++) { - /* FIXME just connecting the control points for now */ + /* FIXME: just connecting the control points for now */ TRACE("\t\tcurve %d,%d %d,%d\n", ppc->apfx[i * 2].x.value, ppc->apfx[i * 3].y.value, ppc->apfx[i * 2 + 1].x.value, ppc->apfx[i * 3 + 1].y.value);

1 0

Stefan Leichter : gdi32: Spelling fix.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: db21158faa1a3138aef43c3aeb9c2461c1e13e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db21158faa1a3138aef43c3ae… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jun 27 22:47:54 2012 +0200 gdi32: Spelling fix. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 0c20ea5..bb97902 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3538,7 +3538,7 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) int num_resources = 0; LPWSTR rt_font = (LPWSTR)((ULONG_PTR)8); /* we don't want to include winuser.h */ - TRACE("WineEndAddFontResourceEx failed on PE file %s - trying to load resources manually\n", + TRACE("WineEngAddFontResourceEx failed on PE file %s - trying to load resources manually\n", wine_dbgstr_w(str)); if (EnumResourceNamesW(hModule, rt_font, load_enumed_resource, (LONG_PTR)&num_resources)) ret = num_resources;

1 0

Dmitry Timoshkov : gdiplus: Increase refcount of the source stream when loading a bitmap instead of cloning it .
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 174b74bab29e5c83ab8a8d50d0b43b6fd1a13b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b74bab29e5c83ab8a8d50d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 14:29:08 2012 +0900 gdiplus: Increase refcount of the source stream when loading a bitmap instead of cloning it. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/image.c | 32 ++++++-------------------------- dlls/gdiplus/tests/image.c | 2 +- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1f50c91..498465d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -262,7 +262,7 @@ struct GpAdustableArrowCap{ struct GpImage{ IPicture *picture; - IStream *stream; /* a copy of the source stream */ + IStream *stream; /* source stream */ ImageType type; GUID format; UINT flags; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d6e2a8c..e676a4e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2775,6 +2775,8 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; + /* Pin the source stream */ + IStream_AddRef(stream); } return status; @@ -2842,7 +2844,7 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid *image = GdipAlloc(sizeof(GpMetafile)); if(!*image) return OutOfMemory; (*image)->type = ImageTypeMetafile; - (*image)->stream = stream; + (*image)->stream = NULL; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; (*image)->frame_count = 1; @@ -3011,42 +3013,21 @@ GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *d return stat; } -GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) +GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) { GpStatus stat; LARGE_INTEGER seek; HRESULT hr; const struct image_codec *codec=NULL; - IStream *stream; - - hr = IStream_Clone(source, &stream); - if (FAILED(hr)) - { - STATSTG statstg; - - hr = IStream_Stat(source, &statstg, STATFLAG_NOOPEN); - if (FAILED(hr)) return hresult_to_status(hr); - - stat = GdipCreateStreamOnFile(statstg.pwcsName, GENERIC_READ, &stream); - if(stat != Ok) return stat; - } /* choose an appropriate image decoder */ stat = get_decoder_info(stream, &codec); - if (stat != Ok) - { - IStream_Release(stream); - return stat; - } + if (stat != Ok) return stat; /* seek to the start of the stream */ seek.QuadPart = 0; hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - { - IStream_Release(stream); - return hresult_to_status(hr); - } + if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ stat = codec->decode_func(stream, &codec->info.Clsid, 0, image); @@ -3058,7 +3039,6 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) return Ok; } - IStream_Release(stream); return stat; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0285879..67d0a8b 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2693,7 +2693,7 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) refcount = IStream_Release(stream); if (image_type == ImageTypeBitmap) - todo_wine ok(refcount >= 1, "expected stream refcount != 0\n"); + ok(refcount >= 1, "expected stream refcount != 0\n"); else ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount);

1 0

Dmitry Timoshkov : gdiplus: Add a test for image stream refcount.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 55f160db347759b0c23a5d307e5e6b824f6f4345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f160db347759b0c23a5d307… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 14:27:04 2012 +0900 gdiplus: Add a test for image stream refcount. --- dlls/gdiplus/tests/image.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b930b99..0285879 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2656,6 +2656,12 @@ static void test_dispose(void) expect(ObjectBusy, stat); } +static LONG obj_refcount(void *obj) +{ + IUnknown_AddRef((IUnknown *)obj); + return IUnknown_Release((IUnknown *)obj); +} + static GpImage *load_image(const BYTE *image_data, UINT image_size) { IStream *stream; @@ -2664,6 +2670,8 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) HRESULT hr; GpStatus status; GpImage *image = NULL; + ImageType image_type; + LONG refcount; hmem = GlobalAlloc(0, image_size); data = GlobalLock(hmem); @@ -2674,10 +2682,20 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); if (hr != S_OK) return NULL; + refcount = obj_refcount(stream); + ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); + status = GdipLoadImageFromStream(stream, &image); ok(status == Ok, "GdipLoadImageFromStream error %d\n", status); - IStream_Release(stream); + status = GdipGetImageType(image, &image_type); + ok(status == Ok, "GdipGetImageType error %d\n", status); + + refcount = IStream_Release(stream); + if (image_type == ImageTypeBitmap) + todo_wine ok(refcount >= 1, "expected stream refcount != 0\n"); + else + ok(refcount == 0, "expected stream refcount 0, got %d\n", refcount); return image; }

1 0

André Hentschel : kernel32: Change LCMapStringW to LCMapStringEx and call it from LCMapStringW.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 3cd0834a24f9e7e06f53f18af9dcafd753579929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0834a24f9e7e06f53f18af… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 26 21:13:06 2012 +0200 kernel32: Change LCMapStringW to LCMapStringEx and call it from LCMapStringW. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 56 ++++++++++++++++++++++++++++++++--------- dlls/kernel32/tests/locale.c | 22 +++++++++++++++- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bad71a9..76eb207 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -805,6 +805,7 @@ @ stdcall -i386 -private -register K32Thk1632Prolog() krnl386.exe16.K32Thk1632Prolog @ stdcall LCIDToLocaleName(long ptr long long) @ stdcall LCMapStringA(long long str long ptr long) +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LZClose(long) # @ stub LZCloseFile diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2970856..e467735 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2493,17 +2493,35 @@ BOOL WINAPI GetStringTypeExA( LCID locale, DWORD type, LPCSTR src, INT count, LP return GetStringTypeA(locale, type, src, count, chartype); } - /************************************************************************* - * LCMapStringW (KERNEL32.@) + * LCMapStringEx (KERNEL32.@) * - * See LCMapStringA. + * Map characters in a locale sensitive string. + * + * PARAMS + * name [I] Locale name for the conversion. + * flags [I] Flags controlling the mapping (LCMAP_ constants from "winnls.h") + * src [I] String to map + * srclen [I] Length of src in chars, or -1 if src is NUL terminated + * dst [O] Destination for mapped string + * dstlen [I] Length of dst in characters + * version [I] reserved, must be NULL + * reserved [I] reserved, must be NULL + * lparam [I] reserved, must be 0 + * + * RETURNS + * Success: The length of the mapped string in dst, including the NUL terminator. + * Failure: 0. Use GetLastError() to determine the cause. */ -INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, - LPWSTR dst, INT dstlen) +INT WINAPI LCMapStringEx(LPCWSTR name, DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen, + LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lparam) { LPWSTR dst_ptr; + if (version) FIXME("unsupported version structure %p\n", version); + if (reserved) FIXME("unsupported reserved pointer %p\n", reserved); + if (lparam) FIXME("unsupported lparam %lx\n", lparam); + if (!src || !srclen || dstlen < 0) { SetLastError(ERROR_INVALID_PARAMETER); @@ -2522,8 +2540,6 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (!dstlen) dst = NULL; - lcid = ConvertDefaultLocale(lcid); - if (flags & LCMAP_SORTKEY) { INT ret; @@ -2535,8 +2551,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (srclen < 0) srclen = strlenW(src); - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); ret = wine_get_sortkey(flags, src, srclen, (char *)dst, dstlen); if (ret == 0) @@ -2555,8 +2571,8 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, if (srclen < 0) srclen = strlenW(src) + 1; - TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", - lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + TRACE("(%s,0x%08x,%s,%d,%p,%d)\n", + debugstr_w(name), flags, debugstr_wn(src, srclen), srclen, dst, dstlen); if (!dst) /* return required string length */ { @@ -2625,6 +2641,20 @@ INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, } /************************************************************************* + * LCMapStringW (KERNEL32.@) + * + * See LCMapStringA. + */ +INT WINAPI LCMapStringW(LCID lcid, DWORD flags, LPCWSTR src, INT srclen, + LPWSTR dst, INT dstlen) +{ + TRACE("(0x%04x,0x%08x,%s,%d,%p,%d)\n", + lcid, flags, debugstr_wn(src, srclen), srclen, dst, dstlen); + + return LCMapStringEx(NULL, flags, src, srclen, dst, dstlen, NULL, NULL, 0); +} + +/************************************************************************* * LCMapStringA (KERNEL32.@) * * Map characters in a locale sensitive string. @@ -2693,7 +2723,7 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, goto map_string_exit; } - dstlenW = LCMapStringW(lcid, flags, srcW, srclenW, NULL, 0); + dstlenW = LCMapStringEx(NULL, flags, srcW, srclenW, NULL, 0, NULL, NULL, 0); if (!dstlenW) goto map_string_exit; @@ -2704,7 +2734,7 @@ INT WINAPI LCMapStringA(LCID lcid, DWORD flags, LPCSTR src, INT srclen, goto map_string_exit; } - LCMapStringW(lcid, flags, srcW, srclenW, dstW, dstlenW); + LCMapStringEx(NULL, flags, srcW, srclenW, dstW, dstlenW, NULL, NULL, 0); ret = WideCharToMultiByte(locale_cp, 0, dstW, dstlenW, dst, dstlen, NULL, NULL); HeapFree(GetProcessHeap(), 0, dstW); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0114dc5..8079679 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1652,8 +1652,18 @@ static INT LCMapStringW_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst static void test_LCMapStringW(void) { + int ret; + WCHAR buf[256]; + trace("testing LCMapStringW\n"); + SetLastError(0xdeadbeef); + ret = LCMapStringW((LCID)-1, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR)); + todo_wine { + ok(!ret, "LCMapStringW should fail with bad lcid\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %d\n", GetLastError()); + } + test_lcmapstring_unicode(LCMapStringW_wrapper, "LCMapStringW:"); } @@ -1665,16 +1675,24 @@ static INT LCMapStringEx_wrapper(DWORD flags, LPCWSTR src, INT srclen, LPWSTR ds static void test_LCMapStringEx(void) { int ret; - WCHAR buf[256]; + WCHAR buf[256], badname[] = {'w', 'i', 'n', 'e', 't', 'e', 's', 't', 0}; if (!pLCMapStringEx) { - skip( "LCMapStringEx not available\n" ); + win_skip( "LCMapStringEx not available\n" ); return; } trace("testing LCMapStringEx\n"); + SetLastError(0xdeadbeef); + ret = pLCMapStringEx(badname, LCMAP_LOWERCASE, + upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 0); + todo_wine { + ok(!ret, "LCMapStringEx should fail with bad locale name\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %d\n", GetLastError()); + } + /* test reserved parameters */ ret = pLCMapStringEx(LOCALE_NAME_USER_DEFAULT, LCMAP_LOWERCASE, upper_case, -1, buf, sizeof(buf)/sizeof(WCHAR), NULL, NULL, 1);

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: 823e214ee832ecd4c3d69764ba3c865714c3d6b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823e214ee832ecd4c3d69764b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 27 22:33:11 2012 +0900 po: Update Korean translation. --- po/ko.po | 45 +++++++++++++-------------------------------- 1 files changed, 13 insertions(+), 32 deletions(-) diff --git a/po/ko.po b/po/ko.po index e76d77f..44cb03f 100644 --- a/po/ko.po +++ b/po/ko.po @@ -30,18 +30,13 @@ msgid "&Install..." msgstr "설치(&I)..." #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"이 소프트웨어는 자동으로 삭제되었을 수도 있습니다.설치된 구성요소를 고치거나 " -"프로그램을 지우려면 , 추가/삭제 목록에서 선택하십시오." +"다음 소프트웨어는 자동으로 제거될 것입니다.프로그램을 제거하거나 설치된 구성" +"요소를 변경하려면,목록에서 선택하고 고치기/제거를 클릭하십시오." #: appwiz.rc:64 msgid "&Support Information" @@ -3419,51 +3414,43 @@ msgstr "높음" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "조이스틱" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "사용하지 않음(&D)" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" msgstr "가능(&E)" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "연결이 끊어짐" +msgstr "연결됨" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "사용하지 않음(&D)" +msgstr "불가능" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "조이스틱 시험" #: joy.rc:50 msgid "Buttons" -msgstr "" +msgstr "버튼" #: joy.rc:59 msgid "Test Force Feedback" -msgstr "" +msgstr "강제 피드백 시험" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "컨트롤 만들기" +msgstr "게임 컨트롤러" #: jscript.rc:25 msgid "Error converting object to primitive type" -msgstr "객페를 기본 형식으로 변환하는 중에 오류 발생" +msgstr "객체를 기본 형식으로 변환하는 중에 오류 발생" #: jscript.rc:26 msgid "Invalid procedure call or argument" @@ -13588,22 +13575,16 @@ msgid "Help topics: " msgstr "도움말 목차: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "오류:올바르지 않은 명령라인 매개변수\n" +msgstr "오류: 명령 라인은 지원하지 않음\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "속성 세트를 찾을 수 없습니다.\n" +msgstr "오류: Alias를 찾을 수 없음\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "오류: 올바르지 않은 키 이름\n" +msgstr "오류: 올바르지 않은 질의\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHDot.
by Alexandre Julliard 28 Jun '12

28 Jun '12

Module: wine Branch: master Commit: b56227cbf1e1686a8d3b7d57ca0d28b7a24fe699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56227cbf1e1686a8d3b7d57c… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Wed Jun 27 14:50:07 2012 +0800 d3dx9_36: Implementation of D3DXSHDot. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 14 ++++++++++++++ dlls/d3dx9_36/tests/math.c | 24 ++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 338585a..2ed971c5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -273,7 +273,7 @@ @ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) @ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) -@ stub D3DXSHDot(long ptr ptr) +@ stdcall D3DXSHDot(long ptr ptr) @ stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHEvalDirection(ptr long ptr) @ stub D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 529665b..28958ae 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1981,6 +1981,20 @@ FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, const FLOAT *a, const FLOAT *b) return out; } +FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b) +{ + FLOAT s; + UINT i; + + TRACE("order %u, a %p, b %p\n", order, a, b); + + s = a[0] * b[0]; + for (i = 1; i < order * order; i++) + s += a[i] * b[i]; + + return s; +} + FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) { FLOAT t, ta, tb; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 70290bf..cc6170f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2399,6 +2399,29 @@ static void test_D3DXSHAdd(void) } } +static void test_D3DXSHDot(void) +{ + unsigned int i; + FLOAT a[64], b[64], got; + CONST FLOAT expected[] = + { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, 88400.0f, }; + + for (i = 0; i < 64; i++) + { + a[i] = (FLOAT)i + 1.0f; + b[i] = (FLOAT)i + 0.5f; + } + + /* D3DXSHDot computes by using order * order elements */ + for (i = 0; i < 9; i++) + { + got = D3DXSHDot(i, a, b); + ok(relative_error(got, expected[i]) < admitted_error, "order %d: expected %f, received %f\n", i, expected[i], got); + } + + return; +} + static void test_D3DXSHMultiply3(void) { unsigned int i; @@ -2438,5 +2461,6 @@ START_TEST(math) test_D3DXVec_Array(); test_D3DXFloat_Array(); test_D3DXSHAdd(); + test_D3DXSHDot(); test_D3DXSHMultiply3(); } diff --git a/include/d3dx9math.h b/include/d3dx9math.h index b650b48..0cffad4 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -378,6 +378,7 @@ D3DXFLOAT16 *WINAPI D3DXFloat32To16Array(D3DXFLOAT16 *pout, CONST FLOAT *pin, UI FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); #ifdef __cplusplus

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012