wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Alexandre Julliard : gdi32: Move DescribePixelFormat and SetPixelFormat to the WGL driver.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 96e80c26230dd3ce27ee3d58fdbc871fd555511d URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e80c26230dd3ce27ee3d58f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 21:53:37 2012 +0200 gdi32: Move DescribePixelFormat and SetPixelFormat to the WGL driver. --- dlls/gdi32/dibdrv/dc.c | 2 - dlls/gdi32/dibdrv/dibdrv.h | 2 - dlls/gdi32/dibdrv/opengl.c | 52 ++++++++++++++----------------------------- dlls/gdi32/driver.c | 12 ---------- dlls/gdi32/enhmfdrv/init.c | 2 - dlls/gdi32/freetype.c | 2 - dlls/gdi32/mfdrv/init.c | 2 - dlls/gdi32/painting.c | 40 ++++++++++---------------------- dlls/gdi32/path.c | 2 - dlls/opengl32/make_opengl | 9 +++++++ dlls/opengl32/opengl_ext.c | 1 + dlls/opengl32/opengl_norm.c | 5 ++++ dlls/opengl32/wgl.c | 40 ++++++++++++++++---------------- dlls/wineps.drv/init.c | 2 - dlls/winex11.drv/init.c | 27 ---------------------- dlls/winex11.drv/opengl.c | 31 ++++++++++++++----------- dlls/winex11.drv/xrender.c | 2 - include/wine/gdi_driver.h | 4 +-- include/wine/wgl_driver.h | 4 ++- 19 files changed, 86 insertions(+), 155 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96e80c26230dd3ce27ee3…

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICPalette_InitializeFromPalette.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 0316a1b4c1def76d6c9bfdd006891c4ac895925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0316a1b4c1def76d6c9bfdd00… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 30 13:12:28 2012 +0900 windowscodecs: Implement IWICPalette_InitializeFromPalette. --- dlls/windowscodecs/palette.c | 34 +++++++++++++++++-- dlls/windowscodecs/tests/palette.c | 63 +++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index f989c97..7d50d83 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -455,10 +455,38 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, } static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, - IWICPalette *pIPalette) + IWICPalette *source) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + PaletteImpl *This = impl_from_IWICPalette(iface); + UINT count; + WICColor *colors = NULL; + WICBitmapPaletteType type; + HRESULT hr; + + TRACE("(%p,%p)\n", iface, source); + + if (!source) return E_INVALIDARG; + + hr = IWICPalette_GetType(source, &type); + if (hr != S_OK) return hr; + hr = IWICPalette_GetColorCount(source, &count); + if (hr != S_OK) return hr; + if (count) + { + colors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); + if (!colors) return E_OUTOFMEMORY; + hr = IWICPalette_GetColors(source, count, colors, &count); + if (hr != S_OK) return hr; + } + + EnterCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, This->colors); + This->colors = colors; + This->count = count; + This->type = type; + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PaletteImpl_GetType(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 499d59d..e3b9a31 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -30,7 +30,7 @@ static void test_custom_palette(void) { IWICImagingFactory *factory; - IWICPalette *palette; + IWICPalette *palette, *palette2; HRESULT hr; WICBitmapPaletteType type=0xffffffff; UINT count=1; @@ -106,6 +106,29 @@ static void test_custom_palette(void) ok(SUCCEEDED(hr), "IsGrayscale failed, hr=%x\n", hr); ok(!boolresult, "expected FALSE, got TRUE\n"); + hr = IWICImagingFactory_CreatePalette(factory, &palette2); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + + hr = IWICPalette_InitializeFromPalette(palette2, palette); + ok(SUCCEEDED(hr), "InitializeFromPalette failed, hr=%x\n", hr); + + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette2, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette2, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + + memset(colors, 0, sizeof(colors)); + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette2, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 4, "expected 4, got %u\n", count); + ok(!memcmp(colors, initcolors, sizeof(colors)), "got unexpected palette data\n"); + /* try a palette with some alpha in it */ colors[2] = 0x80ffffff; hr = IWICPalette_InitializeCustom(palette, colors, 4); @@ -119,6 +142,40 @@ static void test_custom_palette(void) hr = IWICPalette_InitializeCustom(palette, NULL, 0); ok(SUCCEEDED(hr), "InitializeCustom failed, hr=%x\n", hr); + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + hr = IWICPalette_InitializeFromPalette(palette2, palette); + ok(SUCCEEDED(hr), "InitializeFromPalette failed, hr=%x\n", hr); + + type = 0xdeadbeef; + hr = IWICPalette_GetType(palette2, &type); + ok(SUCCEEDED(hr), "GetType failed, hr=%x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %x\n", type); + + count = 0xdeadbeef; + hr = IWICPalette_GetColorCount(palette2, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + + memset(colors, 0, sizeof(colors)); + count = 0xdeadbeef; + hr = IWICPalette_GetColors(palette2, 4, colors, &count); + ok(SUCCEEDED(hr), "GetColors failed, hr=%x\n", hr); + ok(count == 0, "expected 0, got %u\n", count); + /* IWICPalette is paranoid about NULL pointers */ hr = IWICPalette_GetType(palette, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); @@ -144,6 +201,10 @@ static void test_custom_palette(void) hr = IWICPalette_IsGrayscale(palette, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + hr = IWICPalette_InitializeFromPalette(palette, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %x\n", hr); + + IWICPalette_Release(palette2); IWICPalette_Release(palette); }

1 0

Alexandre Goujon : kernel32: Reimplement GetLogicalDrives using Nt{Open, Query}DirectoryObject.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 4d7f510bef0891004bf5f1570148eeaf9ef73ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7f510bef0891004bf5f1570… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Jul 28 16:14:15 2012 +0200 kernel32: Reimplement GetLogicalDrives using Nt{Open, Query}DirectoryObject. --- dlls/kernel32/volume.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8377e41..238dd9c 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1435,28 +1435,36 @@ DWORD WINAPI QueryDosDeviceA( LPCSTR devname, LPSTR target, DWORD bufsize ) */ DWORD WINAPI GetLogicalDrives(void) { - const char *config_dir = wine_get_config_dir(); - struct stat st; - char *buffer, *dev; - DWORD ret = 0; - int i; + static const WCHAR dosdevW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nt_name; + DWORD bitmask = 0; + NTSTATUS status; + HANDLE handle; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/dosdevices/a:") ))) + RtlInitUnicodeString( &nt_name, dosdevW ); + nt_name.Length -= sizeof(WCHAR); /* without trailing slash */ + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nt_name; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + status = NtOpenDirectoryObject( &handle, FILE_LIST_DIRECTORY, &attr ); + if (!status) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - strcpy( buffer, config_dir ); - strcat( buffer, "/dosdevices/a:" ); - dev = buffer + strlen(buffer) - 2; + char data[1024]; + DIRECTORY_BASIC_INFORMATION *info = (DIRECTORY_BASIC_INFORMATION *)data; + ULONG ctx = 0, len; - for (i = 0; i < 26; i++) - { - *dev = 'a' + i; - if (!stat( buffer, &st )) ret |= (1 << i); + while (!NtQueryDirectoryObject( handle, info, sizeof(data), 1, 0, &ctx, &len )) + if(info->ObjectName.Length == 2*sizeof(WCHAR) && info->ObjectName.Buffer[1] == ':') + bitmask |= 1 << (info->ObjectName.Buffer[0] - 'A'); + + NtClose( handle ); } - HeapFree( GetProcessHeap(), 0, buffer ); - return ret; + + return bitmask; }

1 0

Nikolay Sivov : include: Added dwrite.idl file.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 7ef5661d546df99a26b639daf42e81c20156cc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef5661d546df99a26b639daf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 29 12:50:34 2012 +0400 include: Added dwrite.idl file. --- .gitignore | 1 + dlls/dwrite/dwrite.spec | 2 +- dlls/dwrite/main.c | 12 + include/Makefile.in | 2 + include/dcommon.h | 29 + include/dwrite.idl | 1394 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1439 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef5661d546df99a26b63…

1 0

Nikolay Sivov : widl: Don' t output method macro if name duplicates another method name.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 65f418493683d96d4fd625ab019ea400eec4c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f418493683d96d4fd625ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 27 20:00:18 2012 +0400 widl: Don't output method macro if name duplicates another method name. --- tools/widl/header.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9ecbab5..02e3b60 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -856,7 +856,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na first_iface = 0; } - if (!is_callas(func->attrs)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -949,7 +949,7 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char first_iface = 0; } - if (!is_callas(func->attrs)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; fprintf(header, "static FORCEINLINE ");

1 0

Nikolay Sivov : widl: Protect from duplicated method names in C-style vtable struct.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 0bc5e7a62a23650f57b2eb2d601ae111cd6e454d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc5e7a62a23650f57b2eb2d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 27 19:18:04 2012 +0400 widl: Protect from duplicated method names in C-style vtable struct. --- tools/widl/header.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index f19929a..9ecbab5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -816,6 +816,28 @@ const var_t *is_callas(const attr_list_t *a) return get_attrp(a, ATTR_CALLAS); } +static int is_inherited_method(const type_t *iface, const var_t *func) +{ + while ((iface = type_iface_get_inherit(iface))) + { + const statement_t *stmt; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *funccmp = stmt->u.var; + + if (!is_callas(func->attrs)) + { + char inherit_name[256]; + /* compare full name including property prefix */ + strcpy(inherit_name, get_name(funccmp)); + if (!strcmp(inherit_name, get_name(func))) return 1; + } + } + } + + return 0; +} + static void write_method_macro(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -967,7 +989,10 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); - fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); + if (is_inherited_method(iface, func)) + fprintf(header, " (%s *%s_%s)(\n", callconv, iface->name, func->name); + else + fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, TRUE); fprintf(header, ");\n"); fprintf(header, "\n");

1 0

Jacek Caban : mshtml: Use inner window directly in handle_load.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 6530e8a9633ea47828f9f7c4d44f53594c5b1395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6530e8a9633ea47828f9f7c4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:45 2012 +0200 mshtml: Use inner window directly in handle_load. --- dlls/mshtml/nsevents.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 488bdd8..3fd1962 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -241,7 +241,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event if(doc->basedoc.doc_obj && doc->basedoc.doc_obj->basedoc.doc_node == doc) doc_obj = doc->basedoc.doc_obj; - connect_scripts(doc->basedoc.window->base.inner_window); + connect_scripts(doc->window); if(doc_obj) handle_docobj_load(doc_obj);

1 0

Jacek Caban : mshtml: Use inner window directly in run_insert_script.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: 8b69ff6b3bedcd8fb586ea548ba001ca1aec57ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b69ff6b3bedcd8fb586ea548… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:33 2012 +0200 mshtml: Use inner window directly in run_insert_script. --- dlls/mshtml/mutation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 12c5c98..129094e 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -316,7 +316,7 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa if(nsparser) nsIParser_BeginEvaluatingParserInsertedScript(nsparser); - doc_insert_script(doc->basedoc.window->base.inner_window, nsscript); + doc_insert_script(doc->window, nsscript); if(nsparser) { nsIParser_EndEvaluatingParserInsertedScript(nsparser);

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLOptionElementFactory implementation.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: e78537ffa236a05d07b9df5580ccf65b062da3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e78537ffa236a05d07b9df558… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:56:07 2012 +0200 mshtml: Use inner window directly in HTMLOptionElementFactory implementation. --- dlls/mshtml/htmloption.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index fac06ed..8722228 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -458,18 +458,18 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } *optelem = NULL; - hres = create_nselem(This->window->base.inner_window->doc, optionW, &nselem); + hres = create_nselem(This->window->doc, optionW, &nselem); if(FAILED(hres)) return hres; - hres = get_node(This->window->base.inner_window->doc, (nsIDOMNode*)nselem, TRUE, &node); + hres = get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE, &node); nsIDOMHTMLElement_Release(nselem); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Use inner window directly in HTMLImageElementFactory implementation.
by Alexandre Julliard 30 Jul '12

30 Jul '12

Module: wine Branch: master Commit: dce83a304d98199d00afe22791242920b3e83fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce83a304d98199d00afe2279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:57 2012 +0200 mshtml: Use inner window directly in HTMLImageElementFactory implementation. --- dlls/mshtml/htmlimg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index be33a71..06c8b3d 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -809,12 +809,12 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(&width), debugstr_variant(&height), img_elem); - if(!This->window || !This->window->base.inner_window->doc) { + if(!This->window || !This->window->doc) { WARN("NULL doc\n"); return E_UNEXPECTED; } - doc = This->window->base.inner_window->doc; + doc = This->window->doc; *img_elem = NULL;

1 0

← Newer
1
2
3
4
5
6
7
...
72
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 July 2012