January 2013 - Wine-Commits

Hans Leidekker : wbemprox: Return an empty object if the path is NULL or empty.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 07197a19f2843b41b32be2c1d07ba4cc54260a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07197a19f2843b41b32be2c1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 28 15:56:40 2013 +0100 wbemprox: Return an empty object if the path is NULL or empty. --- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/services.c | 8 +++----- dlls/wbemprox/tests/query.c | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f47987d..5205515 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -1015,8 +1015,8 @@ HRESULT create_class_object( const WCHAR *name, IEnumWbemClassObject *iter, UINT co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; - co->name = heap_strdupW( name ); - if (!co->name) + if (!name) co->name = NULL; + else if (!(co->name = heap_strdupW( name ))) { heap_free( co ); return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 4bcd824..bf202be 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -352,11 +352,9 @@ static HRESULT WINAPI wbem_services_GetObject( if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); - if (!strObjectPath) - { - FIXME("no support for creating new classes\n"); - return WBEM_E_FAILED; - } + if (!strObjectPath || !strObjectPath[0]) + return create_class_object( NULL, NULL, 0, NULL, ppObject ); + return get_object( strObjectPath, ppObject ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 014bac4..dd3424f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -146,7 +146,8 @@ static void test_Win32_Service( IWbemServices *services ) static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; - BSTR class = SysAllocString( serviceW ), method; + static const WCHAR emptyW[] = {0}; + BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; IWbemClassObject *service, *out; VARIANT state, retval; CIMTYPE type; @@ -219,6 +220,18 @@ static void test_Win32_Service( IWbemServices *services ) } VariantClear( &state ); IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + SysFreeString( empty ); SysFreeString( class ); }

1 0

Alexandre Julliard : kernel32: Use the monotonic counter in GetTickCount64.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: fa9a883dbbd49117c2e53f5b3ea8cd49397bf520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9a883dbbd49117c2e53f5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 25 17:28:48 2013 +0100 kernel32: Use the monotonic counter in GetTickCount64. --- dlls/kernel32/kernel_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index cf06765..2edfcbc 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -179,10 +179,10 @@ INT WINAPI MulDiv( INT nMultiplicand, INT nMultiplier, INT nDivisor) */ ULONGLONG WINAPI GetTickCount64(void) { - LARGE_INTEGER now; + LARGE_INTEGER counter, frequency; - NtQuerySystemTime( &now ); - return (now.QuadPart - server_start_time) / 10000; + NtQueryPerformanceCounter( &counter, &frequency ); + return counter.QuadPart * 1000 / frequency.QuadPart; } @@ -199,8 +199,6 @@ ULONGLONG WINAPI GetTickCount64(void) * * NOTES * The value returned will wrap around every 2^32 milliseconds. - * Under Windows, tick 0 is the moment at which the system is rebooted. - * Under Wine, tick 0 begins at the moment the wineserver process is started. */ DWORD WINAPI GetTickCount(void) {

1 0

André Hentschel : include: Add remaining checks for ARM64.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 5c8da8080141977405153a08a864dacd674d37af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8da8080141977405153a08a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jan 26 12:10:23 2013 +0100 include: Add remaining checks for ARM64. --- include/msvcrt/crtdefs.h | 2 +- include/windef.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 06ce9c3..da278be 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -29,7 +29,7 @@ # error You cannot use both wine/port.h and msvcrt headers #endif -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif diff --git a/include/windef.h b/include/windef.h index eb59353..17c0fba 100644 --- a/include/windef.h +++ b/include/windef.h @@ -37,7 +37,7 @@ extern "C" { /* Calling conventions definitions */ -#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__)) && !defined(_WIN64) +#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64) #define _WIN64 #endif

1 0

Jacek Caban : textstor.idl: Added TS_ATTR_FIND_* constants.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 462d2129bd91b1bdecf8f5fc56196c442c9c016d URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d2129bd91b1bdecf8f5fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 28 13:13:16 2013 +0100 textstor.idl: Added TS_ATTR_FIND_* constants. --- include/textstor.idl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 5928569..7bd5289 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -109,6 +109,13 @@ typedef [uuid(2cc2b33f-1174-4507-b8d9-5bc0eb37c197)] struct TS_ATTRVAL VARIANT varValue; } TS_ATTRVAL; +const DWORD TS_ATTR_FIND_BACKWARDS = 0x0001; +const DWORD TS_ATTR_FIND_WANT_OFFSET = 0x0002; +const DWORD TS_ATTR_FIND_UPDATESTART = 0x0004; +const DWORD TS_ATTR_FIND_WANT_VALUE = 0x0008; +const DWORD TS_ATTR_FIND_WANT_END = 0x0010; +const DWORD TS_ATTR_FIND_HIDDEN = 0x0020; + typedef [uuid(7899d7c4-5f07-493c-a89a-fac8e777f476)] enum { TS_LC_CREATE, TS_LC_CHANGE, TS_LC_DESTROY } TsLayoutCode; typedef [uuid(1faf509e-44c1-458e-950a-38a96705a62b)] DWORD TsViewCookie;

1 0

Henri Verbeet : wined3d: Introduce a format flag for texturing.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 7c8dab24e6a2326b9572f3a014cc1766aa6ed5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8dab24e6a2326b9572f3a01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 28 11:15:38 2013 +0100 wined3d: Introduce a format flag for texturing. --- dlls/wined3d/directx.c | 266 +--------------------------------------- dlls/wined3d/utils.c | 257 +++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 184 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c8dab24e6a2326b9572f…

1 0

Ken Thomases : winemac: Maintain a list of which windows have been "key" ( focused) recently.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: beccf0f8c0598191afc334f0a5d9d84686d67df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beccf0f8c0598191afc334f0a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:45 2013 -0600 winemac: Maintain a list of which windows have been "key" (focused) recently. --- dlls/winemac.drv/cocoa_app.h | 2 ++ dlls/winemac.drv/cocoa_app.m | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0955dea..40f9e9d 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -35,6 +35,8 @@ NSLock* eventQueuesLock; NSTimeInterval eventTimeAdjustment; + + NSMutableArray* keyWindows; } - (void) transformProcessToForeground; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 638e642..c69f09e 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -34,7 +34,9 @@ int macdrv_err_on; eventQueues = [[NSMutableArray alloc] init]; eventQueuesLock = [[NSLock alloc] init]; - if (!eventQueues || !eventQueuesLock) + keyWindows = [[NSMutableArray alloc] init]; + + if (!eventQueues || !eventQueuesLock || !keyWindows) { [self release]; return nil; @@ -45,6 +47,7 @@ int macdrv_err_on; - (void) dealloc { + [keyWindows release]; [eventQueues release]; [eventQueuesLock release]; [super dealloc]; @@ -118,6 +121,32 @@ int macdrv_err_on; return (eventTime + eventTimeAdjustment) * 1000; } + + /* + * ---------- NSApplicationDelegate methods ---------- + */ + - (void)applicationWillFinishLaunching:(NSNotification *)notification + { + NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + + [nc addObserverForName:NSWindowDidBecomeKeyNotification + object:nil + queue:nil + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + [keyWindows removeObjectIdenticalTo:window]; + [keyWindows insertObject:window atIndex:0]; + }]; + + [nc addObserverForName:NSWindowWillCloseNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification *note){ + NSWindow* window = [note object]; + [keyWindows removeObjectIdenticalTo:window]; + }]; + } + @end /***********************************************************************

1 0

Dmitry Timoshkov : dwrite: Avoid triggering an exception on DLL_PROCESS_DETACH.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 1ea524a861f94e09a609507d6b6d0079ff87dae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea524a861f94e09a609507d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 28 14:37:36 2013 +0800 dwrite: Avoid triggering an exception on DLL_PROCESS_DETACH. --- dlls/dwrite/font.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0ec581b..191397e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -793,7 +793,8 @@ static void release_font_collection(IDWriteFontCollection *iface) void release_system_fontcollection(void) { - release_font_collection(system_collection); + if (system_collection) + release_font_collection(system_collection); } HRESULT get_system_fontcollection(IDWriteFontCollection **collection)

1 0

Nikolay Sivov : xmllite: Fail to set input for external IXmlReaderInput.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 8954671cdc64a63d5e10864fd9218d907a72b4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8954671cdc64a63d5e10864fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 11:54:58 2013 +0400 xmllite: Fail to set input for external IXmlReaderInput. --- dlls/xmllite/reader.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 785d9bf..b3f7194 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -114,6 +114,8 @@ typedef struct unsigned int pending : 1; } xmlreaderinput; +static const struct IUnknownVtbl xmlreaderinputvtbl; + typedef struct { WCHAR *str; @@ -1764,7 +1766,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlReader)) @@ -1774,6 +1776,7 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -1814,6 +1817,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { xmlreader *This = impl_from_IXmlReader(iface); + IXmlReaderInput *readerinput; HRESULT hr; TRACE("(%p)->(%p)\n", This, input); @@ -1838,11 +1842,23 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) } /* now try IXmlReaderInput, ISequentialStream, IStream */ - hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); - if (hr != S_OK) + hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&readerinput); + if (hr == S_OK) { - IXmlReaderInput *readerinput; + if (readerinput->lpVtbl == &xmlreaderinputvtbl) + This->input = impl_from_IXmlReaderInput(readerinput); + else + { + ERR("got external IXmlReaderInput implementation: %p, vtbl=%p\n", + readerinput, readerinput->lpVtbl); + IUnknown_Release(readerinput); + return E_FAIL; + } + } + + if (hr != S_OK || !readerinput) + { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, NULL, NULL, FALSE, NULL, &readerinput); @@ -2160,7 +2176,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IXmlReaderInput) || IsEqualGUID(riid, &IID_IUnknown)) @@ -2170,6 +2186,7 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI else { WARN("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; return E_NOINTERFACE; } @@ -2207,7 +2224,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) return ref; } -static const struct IUnknownVtbl xmlreaderinput_vtbl = +static const struct IUnknownVtbl xmlreaderinputvtbl = { xmlreaderinput_QueryInterface, xmlreaderinput_AddRef, @@ -2281,7 +2298,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinputvtbl; readerinput->ref = 1; readerinput->imalloc = imalloc; readerinput->stream = NULL;

1 0

Nikolay Sivov : xmllite: Handle E_PENDING from stream for comment nodes.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: 9d664b2217c6b2b508f15fdd1cc152912fdbc832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d664b2217c6b2b508f15fdd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 27 11:17:27 2013 +0400 xmllite: Handle E_PENDING from stream for comment nodes. --- dlls/xmllite/reader.c | 89 +++++++++++++++++++++++++++++++++++------- dlls/xmllite/tests/reader.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d664b2217c6b2b508f15…

1 0

Michael Stefaniuc : wined3d: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard Jan. 28, 2013

Jan. 28, 2013

Module: wine Branch: master Commit: b28aff0dd72686774dfe159daf92b29cbb86ec21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28aff0dd72686774dfe159da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 27 22:57:20 2013 +0100 wined3d: Use assignment instead of memcpy to copy structs. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 31ee94a..2fd5108 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6448,7 +6448,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi return; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 75d1dfe..5657732 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -861,7 +861,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined new_desc->num_textures_used = i + 1; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_ati_shader(settings.op, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 10104e1..6f55dc3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1168,11 +1168,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); /* Set some of the defaults for lights, transforms etc */ - memcpy(&state->transforms[WINED3D_TS_PROJECTION], &identity, sizeof(identity)); - memcpy(&state->transforms[WINED3D_TS_VIEW], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; for (i = 0; i < 256; ++i) { - memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } state->fb = &device->fb; @@ -1313,7 +1313,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0; i < MAX_TEXTURES; ++i) { TRACE("Setting up default texture states for texture Stage %u.\n", i); - memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;

1 0