July 2012 - Wine-Commits - list.winehq.org

André Hentschel : winspool.drv: Update allowed driver version.
by Alexandre Julliard July 31, 2012

July 31, 2012

Module: wine Branch: master Commit: 882977eed95b4204927a555ab81263a4de2d6762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882977eed95b4204927a555ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 29 16:34:46 2012 +0200 winspool.drv: Update allowed driver version. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index a86f6ef..6d051d6 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2581,8 +2581,8 @@ static void test_GetPrinterDriver(void) HANDLE hf; /* MSDN is wrong: The Drivers on the win9x-CD's have cVersion=0x0400 - NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k and above(Usermode): 3 */ - ok( (di_2->cVersion <= 3) || + NT351: 1, NT4.0+w2k(Kernelmode): 2, w2k-win7(Usermode): 3, win8 and above(Usermode): 4 */ + ok( (di_2->cVersion <= 4) || (di_2->cVersion == 0x0400), "di_2->cVersion = %d\n", di_2->cVersion); ok(di_2->pName != NULL, "not expected NULL ptr\n"); ok(di_2->pEnvironment != NULL, "not expected NULL ptr\n");

1 0

Hans Leidekker : wbemprox: Store the class name in the class object.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 12caddb4be1265811ecaff928eb35d1c6368a782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caddb4be1265811ecaff928… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:30 2012 +0200 wbemprox: Store the class name in the class object. --- dlls/wbemprox/class.c | 26 ++++++++++++++++---------- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/wbemprox_private.h | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 801a553..74e1c71 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -125,7 +125,7 @@ static HRESULT WINAPI enum_class_object_Next( *puReturned = 0; if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); + hr = create_class_object( view->table->name, iface, ec->index, apObjects ); if (hr != S_OK) return hr; ec->index++; @@ -216,6 +216,7 @@ struct class_object { IWbemClassObject IWbemClassObject_iface; LONG refs; + WCHAR *name; IEnumWbemClassObject *iter; UINT index; }; @@ -242,6 +243,7 @@ static ULONG WINAPI class_object_Release( { TRACE("destroying %p\n", co); if (co->iter) IEnumWbemClassObject_Release( co->iter ); + heap_free( co->name ); heap_free( co ); } return refs; @@ -606,16 +608,14 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppOutSignature ) { struct class_object *co = impl_from_IWbemClassObject( iface ); - struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - hr = create_signature( view->table->name, wszName, PARAM_IN, ppInSignature ); + hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); if (hr != S_OK) return hr; - hr = create_signature( view->table->name, wszName, PARAM_OUT, ppOutSignature ); + hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); return hr; } @@ -714,24 +714,30 @@ static const IWbemClassObjectVtbl class_object_vtbl = class_object_GetMethodOrigin }; -HRESULT WbemClassObject_create( - IUnknown *pUnkOuter, IEnumWbemClassObject *iter, UINT index, LPVOID *ppObj ) +HRESULT create_class_object( + const WCHAR *name, IEnumWbemClassObject *iter, UINT index, IWbemClassObject **obj ) { struct class_object *co; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%s, %p\n", debugstr_w(name), obj); co = heap_alloc( sizeof(*co) ); if (!co) return E_OUTOFMEMORY; co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; + co->name = heap_strdupW( name ); + if (!co->name) + { + heap_free( co ); + return E_OUTOFMEMORY; + } co->iter = iter; co->index = index; if (iter) IEnumWbemClassObject_AddRef( iter ); - *ppObj = &co->IWbemClassObject_iface; + *obj = &co->IWbemClassObject_iface; - TRACE("returning iface %p\n", *ppObj); + TRACE("returning iface %p\n", *obj); return S_OK; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 8c9c2f4..abd31c5 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -334,7 +334,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = WbemClassObject_create( NULL, iter, 0, (void **)obj ); + hr = create_class_object( path->class, iter, 0, obj ); IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index a5f0a42..34a3384 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -154,7 +154,8 @@ HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN; +HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, + IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1);

1 0

Nikolay Sivov : widl: Don' t output method macro if name duplicates another method name.
by Alexandre Julliard July 30, 2012

July 30, 2012

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

Hans Leidekker : wbemprox: Implement Win32_Service. AcceptPause and Win32_Service.AcceptStop.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 54d21602267f790368a02c21faf52396f6385c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d21602267f790368a02c21f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 30 15:04:15 2012 +0200 wbemprox: Implement Win32_Service.AcceptPause and Win32_Service.AcceptStop. --- dlls/wbemprox/builtin.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b2c657f..ce18b92 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -65,6 +65,10 @@ static const WCHAR class_stdregprovW[] = static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_acceptpauseW[] = + {'A','c','c','e','p','t','P','a','u','s','e',0}; +static const WCHAR prop_acceptstopW[] = + {'A','c','c','e','p','t','S','t','o','p',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = @@ -249,6 +253,8 @@ static const struct column col_processor[] = }; static const struct column col_service[] = { + { prop_acceptpauseW, CIM_BOOLEAN }, + { prop_acceptstopW, CIM_BOOLEAN }, { prop_displaynameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_processidW, CIM_UINT32 }, @@ -383,6 +389,8 @@ struct record_processor }; struct record_service { + int accept_pause; + int accept_stop; const WCHAR *displayname; const WCHAR *name; UINT32 process_id; @@ -860,11 +868,13 @@ static void fill_service( struct table *table ) { status = &services[i].ServiceStatusProcess; rec = (struct record_service *)(table->data + offset); - rec->displayname = heap_strdupW( services[i].lpDisplayName ); - rec->name = heap_strdupW( services[i].lpServiceName ); - rec->process_id = status->dwProcessId; - rec->servicetype = get_service_type( status->dwServiceType ); - rec->state = get_service_state( status->dwCurrentState ); + rec->accept_pause = (status->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) ? -1 : 0; + rec->accept_stop = (status->dwControlsAccepted & SERVICE_ACCEPT_STOP) ? -1 : 0; + rec->displayname = heap_strdupW( services[i].lpDisplayName ); + rec->name = heap_strdupW( services[i].lpServiceName ); + rec->process_id = status->dwProcessId; + rec->servicetype = get_service_type( status->dwServiceType ); + rec->state = get_service_state( status->dwCurrentState ); offset += sizeof(*rec); num_rows++; }

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICPalette_InitializeFromPalette.
by Alexandre Julliard July 30, 2012

July 30, 2012

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

Jacek Caban : mshtml: Use inner window directly in handle_load.
by Alexandre Julliard July 30, 2012

July 30, 2012

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 from document node in htmlevent.c.
by Alexandre Julliard July 30, 2012

July 30, 2012

Module: wine Branch: master Commit: 7ff231d7fbbb81e11259ca41049cae9f03ac2e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff231d7fbbb81e11259ca410… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 30 15:55:42 2012 +0200 mshtml: Use inner window directly from document node in htmlevent.c. --- dlls/mshtml/htmlevent.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ca966ba..1836664 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -997,7 +997,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - window = doc->basedoc.window->base.inner_window; + window = doc->window; prev_event = window->event; if(set_event) { hres = get_node(doc, target, TRUE, &node); @@ -1388,7 +1388,7 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) TRACE("%p.%s = %s\n", nselem, debugstr_w(event_info[i].attr_name), debugstr_w(attr_value)); - disp = script_parse_event(doc->basedoc.window->base.inner_window, attr_value); + disp = script_parse_event(doc->window, attr_value); if(disp) { hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); if(SUCCEEDED(hres)) {

1 0

Alexandre Goujon : kernel32: Reimplement GetLogicalDrives using Nt{Open, Query}DirectoryObject.
by Alexandre Julliard July 30, 2012

July 30, 2012

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 July 30, 2012

July 30, 2012

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: Protect from duplicated method names in C-style vtable struct.
by Alexandre Julliard July 30, 2012

July 30, 2012

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