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

Matteo Bruni : d3dcompiler: Make set_parse_status() more general.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 555f6349129cf187f5dd2511e98e3bd202122154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=555f6349129cf187f5dd2511e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 8 16:17:30 2012 +0200 d3dcompiler: Make set_parse_status() more general. --- dlls/d3dcompiler_43/asmparser.c | 138 ++++++++++++++-------------- dlls/d3dcompiler_43/asmshader.l | 2 +- dlls/d3dcompiler_43/asmshader.y | 86 ++++++++---------- dlls/d3dcompiler_43/d3dcompiler_private.h | 21 +++-- 4 files changed, 125 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=555f6349129cf187f5dd2…

1 0

Dmitry Timoshkov : winex11.drv: Use XK_KP_Decimal as a fallback if XK_KP_Separator doesn't work.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 8ed11d8bb11e60c4dcb113564b4457da809db5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed11d8bb11e60c4dcb113564… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 8 13:12:17 2012 +0900 winex11.drv: Use XK_KP_Decimal as a fallback if XK_KP_Separator doesn't work. --- dlls/winex11.drv/keyboard.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 090eae4..7e49ffb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2220,7 +2220,11 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) * in order to produce a locale dependent numeric separator. */ if (wCode == VK_DECIMAL || wCode == VK_SEPARATOR) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + { + e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + if (!e.keycode) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + } if (!e.keycode) { @@ -2558,7 +2562,11 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState * in order to produce a locale dependent numeric separator. */ if (virtKey == VK_DECIMAL || virtKey == VK_SEPARATOR) + { e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); + if (!e.keycode) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + } if (!e.keycode && virtKey != VK_NONAME) {

1 0

Christian Costa : dmusic: COM cleanup of IDirectMusicInstrument and get rid of separated IUnknown interface .
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 03c75b9cf652146a44c35d0c4de79bc76629ee80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c75b9cf652146a44c35d0c4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 4 20:51:30 2012 +0200 dmusic: COM cleanup of IDirectMusicInstrument and get rid of separated IUnknown interface. --- dlls/dmusic/collection.c | 4 +- dlls/dmusic/dmusic_private.h | 8 ++- dlls/dmusic/instrument.c | 136 +++++++++++++++++++---------------------- 3 files changed, 71 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03c75b9cf652146a44c35…

1 0

Alexandre Julliard : winex11: Add an OpenGL GDI driver.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 5f99b59e77c94ac861a6f5e5bd56f975c30fe2db URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f99b59e77c94ac861a6f5e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 12:18:54 2012 +0200 winex11: Add an OpenGL GDI driver. --- dlls/winex11.drv/init.c | 109 ++++++++- dlls/winex11.drv/opengl.c | 473 +++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 24 +-- dlls/winex11.drv/x11drv_main.c | 1 - 4 files changed, 350 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f99b59e77c94ac861a6f…

1 0

Hans Leidekker : msi: Resolve the target path for the ODBC driver file if necessary.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 32c7a52f5ce2ea45e90d989cbbe34ad938c8bd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c7a52f5ce2ea45e90d989cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:02 2012 +0200 msi: Resolve the target path for the ODBC driver file if necessary. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index aa2cfca..c1d3b49 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6082,6 +6082,11 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) ptr += lstrlenW(ptr) + 1; *ptr = '\0'; + if (!driver_file->TargetPath) + { + const WCHAR *dir = msi_get_target_folder( package, driver_file->Component->Directory ); + driver_file->TargetPath = msi_build_directory_name( 2, dir, driver_file->FileName ); + } driver_path = strdupW(driver_file->TargetPath); ptr = strrchrW(driver_path, '\\'); if (ptr) *ptr = '\0';

1 0

Hans Leidekker : advapi32: Return a fake handle from EventRegister.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: cb436f712235288487ba9a8e6137bd0b35b07666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb436f712235288487ba9a8e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:19 2012 +0200 advapi32: Return a fake handle from EventRegister. --- dlls/advapi32/eventlog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 8ec5cd2..f631228 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -834,7 +834,9 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) { FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); - return ERROR_CALL_NOT_IMPLEMENTED; + + *handle = 0xdeadbeef; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Hans Leidekker : advapi32: Add stub implementations of EventUnregister and EventWrite.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 593bd1a5d912eec8bcd63c7100227c36ab29dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=593bd1a5d912eec8bcd63c710… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 8 09:30:40 2012 +0200 advapi32: Add stub implementations of EventUnregister and EventWrite. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 19 +++++++++++++++++++ include/evntprov.h | 8 ++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 87a92dc..638cba1 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,8 +273,8 @@ @ stdcall EventEnabled(int64 ptr) # @ stub EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) -# @ stub EventUnregister -# @ stub EventWrite +@ stdcall EventUnregister(int64) +@ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario # @ stub EventWriteEx # @ stub EventWriteStartScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index f631228..8f40c29 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -840,6 +840,15 @@ ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID co } /****************************************************************************** + * EventUnregister [ADVAPI32.@] + */ +ULONG WINAPI EventUnregister( REGHANDLE handle ) +{ + FIXME("%s: stub\n", wine_dbgstr_longlong(handle)); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventEnabled [ADVAPI32.@] * */ @@ -850,6 +859,16 @@ BOOLEAN WINAPI EventEnabled( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor ) } /****************************************************************************** + * EventWrite [ADVAPI32.@] + */ +ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, + PEVENT_DATA_DESCRIPTOR data ) +{ + FIXME("%s, %p, %u, %p: stub\n", wine_dbgstr_longlong(handle), descriptor, count, data); + return ERROR_SUCCESS; +} + +/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/include/evntprov.h b/include/evntprov.h index 34262fe..f242394 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -28,6 +28,13 @@ extern "C" { typedef ULONGLONG REGHANDLE, *PREGHANDLE; +typedef struct _EVENT_DATA_DESCRIPTOR +{ + ULONGLONG Ptr; + ULONG Size; + ULONG Reserved; +} EVENT_DATA_DESCRIPTOR, *PEVENT_DATA_DESCRIPTOR; + typedef struct _EVENT_DESCRIPTOR { USHORT Id; @@ -55,6 +62,7 @@ typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PE BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventUnregister(REGHANDLE); +ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR); #ifdef __cplusplus }

1 0

Nikolay Sivov : msxml3: Protect content callbacks from being called on reset content handler pointer .
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 2dc6711f6d25fc33c088802cbec94e58419a1c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc6711f6d25fc33c088802cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 15:50:19 2012 +0400 msxml3: Protect content callbacks from being called on reset content handler pointer. --- dlls/msxml3/saxreader.c | 98 ++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 090f70c..0d46c4f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -313,7 +313,7 @@ static BOOL is_namespaces_enabled(const saxreader *reader) return (reader->version < MSXML4) || (reader->features & Namespaces); } -static inline BOOL has_content_handler(const saxlocator *locator) +static inline int has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || (!locator->vbInterface && locator->saxreader->contentHandler); @@ -1288,6 +1288,7 @@ static void libxmlStartElementNS( saxlocator *This = ctx; element_entry *element; HRESULT hr = S_OK; + BSTR uri; update_position(This, TRUE); if(*(This->pParserCtxt->input->cur) == '/') @@ -1298,63 +1299,57 @@ static void libxmlStartElementNS( element = alloc_element_entry(localname, prefix, nb_namespaces, namespaces); push_element_ns(This, element); - if (has_content_handler(This)) + if (is_namespaces_enabled(This->saxreader)) { - BSTR uri; + int i; - if (is_namespaces_enabled(This->saxreader)) + for (i = 0; i < nb_namespaces && has_content_handler(This); i++) { - int i; + if (This->vbInterface) + hr = IVBSAXContentHandler_startPrefixMapping( + This->saxreader->vbcontentHandler, + &element->ns[i].prefix, + &element->ns[i].uri); + else + hr = ISAXContentHandler_startPrefixMapping( + This->saxreader->contentHandler, + element->ns[i].prefix, + SysStringLen(element->ns[i].prefix), + element->ns[i].uri, + SysStringLen(element->ns[i].uri)); - for (i = 0; i < nb_namespaces; i++) + if (sax_callback_failed(This, hr)) { - if (This->vbInterface) - hr = IVBSAXContentHandler_startPrefixMapping( - This->saxreader->vbcontentHandler, - &element->ns[i].prefix, - &element->ns[i].uri); - else - hr = ISAXContentHandler_startPrefixMapping( - This->saxreader->contentHandler, - element->ns[i].prefix, - SysStringLen(element->ns[i].prefix), - element->ns[i].uri, - SysStringLen(element->ns[i].uri)); - - if (sax_callback_failed(This, hr)) - { - format_error_message_from_id(This, hr); - return; - } + format_error_message_from_id(This, hr); + return; } } + } - uri = find_element_uri(This, URI); + uri = find_element_uri(This, URI); + hr = SAXAttributes_populate(This, nb_namespaces, namespaces, nb_attributes, attributes); + if (hr == S_OK && has_content_handler(This)) + { + BSTR local; - hr = SAXAttributes_populate(This, nb_namespaces, namespaces, nb_attributes, attributes); - if (hr == S_OK) - { - BSTR local; + if (is_namespaces_enabled(This->saxreader)) + local = element->local; + else + uri = local = NULL; - if (is_namespaces_enabled(This->saxreader)) - local = element->local; - else - uri = local = NULL; + if (This->vbInterface) + hr = IVBSAXContentHandler_startElement(This->saxreader->vbcontentHandler, + &uri, &local, &element->qname, &This->IVBSAXAttributes_iface); + else + hr = ISAXContentHandler_startElement(This->saxreader->contentHandler, + uri, SysStringLen(uri), + local, SysStringLen(local), + element->qname, SysStringLen(element->qname), + &This->ISAXAttributes_iface); - if (This->vbInterface) - hr = IVBSAXContentHandler_startElement(This->saxreader->vbcontentHandler, - &uri, &local, &element->qname, &This->IVBSAXAttributes_iface); - else - hr = ISAXContentHandler_startElement(This->saxreader->contentHandler, - uri, SysStringLen(uri), - local, SysStringLen(local), - element->qname, SysStringLen(element->qname), - &This->ISAXAttributes_iface); - } + if (sax_callback_failed(This, hr)) + format_error_message_from_id(This, hr); } - - if (sax_callback_failed(This, hr)) - format_error_message_from_id(This, hr); } static void libxmlEndElementNS( @@ -1435,7 +1430,7 @@ static void libxmlEndElementNS( if (is_namespaces_enabled(This->saxreader)) { int i = -1; - while (iterate_endprefix_index(This, element, &i)) + while (iterate_endprefix_index(This, element, &i) && has_content_handler(This)) { if (This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( @@ -1447,10 +1442,10 @@ static void libxmlEndElementNS( if (sax_callback_failed(This, hr)) break; } - } - if (sax_callback_failed(This, hr)) - format_error_message_from_id(This, hr); + if (sax_callback_failed(This, hr)) + format_error_message_from_id(This, hr); + } free_element_entry(element); } @@ -1587,6 +1582,7 @@ static void libxmlComment(void *ctx, const xmlChar *value) This->line--; p--; } + This->column = 0; for(; p>=This->pParserCtxt->input->base && *p!='\n' && *p!='\r'; p--) This->column++;

1 0

Vincent Povirk : msvcm90: Add new dll based on msvcm80.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 94f0da9c9b38ef95f6e7475d98bc065d633966c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f0da9c9b38ef95f6e7475d9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 7 10:31:31 2012 -0500 msvcm90: Add new dll based on msvcm80. --- configure | 1 + configure.ac | 1 + dlls/msvcm90/Makefile.in | 6 ++ dlls/msvcm90/msvcm90.spec | 181 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcm90/msvcm90_main.c | 45 +++++++++++ 5 files changed, 234 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94f0da9c9b38ef95f6e74…

1 0

Alexandre Julliard : winex11: Store the GL-specific information in the GL driver physdev.
by Alexandre Julliard May 8, 2012

May 8, 2012

Module: wine Branch: master Commit: 791a46658a3e31aa6408faaeb6f797d6b2fe53de URL: http://source.winehq.org/git/wine.git/?a=commit;h=791a46658a3e31aa6408faaeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 14:03:56 2012 +0200 winex11: Store the GL-specific information in the GL driver physdev. --- dlls/winex11.drv/bitmap.c | 1 - dlls/winex11.drv/init.c | 14 +-- dlls/winex11.drv/opengl.c | 243 +++++++++++++++++++++++++++------------------ dlls/winex11.drv/x11drv.h | 6 - 4 files changed, 148 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=791a46658a3e31aa6408f…

1 0