April 2015 - Wine-Commits - list.winehq.org

Francois Gouget : wineconsole: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 2271d82cdaffd964b41fd573da3e9f8f78227afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271d82cdaffd964b41fd573d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:37 2015 +0200 wineconsole: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/wineconsole/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c index 8ca6563..8573d07 100644 --- a/programs/wineconsole/dialog.c +++ b/programs/wineconsole/dialog.c @@ -22,7 +22,7 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Francois Gouget : wmp: Mark internal symbols with hidden visibility.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: d46e6fe6b6d700e872d21a5cc49e1e33048fbf8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46e6fe6b6d700e872d21a5cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:32 2015 +0200 wmp: Mark internal symbols with hidden visibility. --- dlls/wmp/wmp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index f022ea4..91e8465 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,7 +44,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; -extern HINSTANCE wmp_instance; +extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; static inline void *heap_alloc(size_t len) {

1 0

Francois Gouget : winecfg: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 6f64673fb56882e69b6baec78586ea1ff88c1474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f64673fb56882e69b6baec78… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:23 2015 +0200 winecfg: Remove unneeded NONAMELESSXXX directives. --- programs/winecfg/appdefaults.c | 1 - programs/winecfg/audio.c | 1 - programs/winecfg/libraries.c | 1 - programs/winecfg/main.c | 2 -- 4 files changed, 5 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 66085f4..49531fa 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -22,7 +22,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSUNION #include <windows.h> #include <commdlg.h> #include <wine/debug.h> diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 6446a67..5b03f45 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -20,7 +20,6 @@ */ #define WIN32_LEAN_AND_MEAN -#define NONAMELESSSTRUCT #define NONAMELESSUNION #include "config.h" diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index a9889e5..f00449d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -23,7 +23,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 6ac5f89..b8a85fe 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -22,9 +22,7 @@ */ #define WIN32_LEAN_AND_MEAN - #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <windows.h> #include <commctrl.h>

1 0

Francois Gouget : wininet; Mark internal symbols with hidden visibility.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: ef0b22aabb9f33fd90b914c4ddac16d0447adc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0b22aabb9f33fd90b914c4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:27 2015 +0200 wininet; Mark internal symbols with hidden visibility. --- dlls/wininet/internet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3f1da71..925bfd0 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -437,7 +437,7 @@ DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; -server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); +server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL) DECLSPEC_HIDDEN; DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; void req_file_release(req_file_t*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : regedit: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 1402201cd61b4412331c5c1f469a5940991b6a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1402201cd61b4412331c5c1f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:02 2015 +0200 regedit: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/regedit/treeview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 97a0bf2..0ac5252 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -22,7 +22,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include <windows.h> #include <commctrl.h> #include <stdlib.h>

1 0

Andrew Cook : server: Implement io completion messages for job objects.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 47ffeaee7406e41708d9d5523308e3b2f4850f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ffeaee7406e41708d9d5523… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:55 2015 +1100 server: Implement io completion messages for job objects. --- dlls/kernel32/tests/process.c | 4 ---- dlls/ntdll/sync.c | 15 +++++++++++++++ include/wine/server_protocol.h | 20 +++++++++++++++++++- server/process.c | 37 +++++++++++++++++++++++++++++++++++++ server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 7 files changed, 95 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47ffeaee7406e41708d9d…

1 0

Nikolay Sivov : msxml3: Explicitly list acceptable libxml2-> msxml node types for unknode.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: e1b160b00511ff37bdd625b91e73e9335158190f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b160b00511ff37bdd625b91… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 23:39:59 2015 +0300 msxml3: Explicitly list acceptable libxml2->msxml node types for unknode. --- dlls/msxml3/node.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1178e60..0f591b4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1617,7 +1617,29 @@ static HRESULT WINAPI unknode_get_nodeType( FIXME("(%p)->(%p)\n", This, domNodeType); - *domNodeType = This->node.node->type; + switch (This->node.node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_ENTITY_REF_NODE: + case XML_ENTITY_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_TYPE_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_NOTATION_NODE: + /* we only care about this set of types, libxml2 type values are + exactly what we need */ + *domNodeType = (DOMNodeType)This->node.node->type; + break; + default: + *domNodeType = NODE_INVALID; + break; + } + return S_OK; }

1 0

Nikolay Sivov : wincodecs: Use valid bitmap cache option.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: de6649ede03eed385207564e8f9ac907852c4fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6649ede03eed385207564e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 22:54:25 2015 +0300 wincodecs: Use valid bitmap cache option. --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 42b4e59..f2455fc 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -712,7 +712,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFact return E_INVALIDARG; } - hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, option, bitmap); + hr = BitmapImpl_Create(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, 0, NULL, &format, WICBitmapCacheOnLoad, bitmap); if (hr != S_OK) return hr; hr = IWICBitmap_Lock(*bitmap, NULL, WICBitmapLockWrite, &lock);

1 0

Aric Stewart : wineqtdecoder: Unload the AsyncReader on movie processing failure.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: d0d7c47b65a874553ab1c88e6a5644592df78391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d7c47b65a874553ab1c88e6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 1 09:47:47 2015 -0500 wineqtdecoder: Unload the AsyncReader on movie processing failure. --- dlls/wineqtdecoder/qtsplitter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8bb51a4..2aafdb4 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1138,6 +1138,8 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, hr = QT_Process_Movie(impl_from_IBaseFilter(This->pin.pinInfo.pFilter)); if (FAILED(hr)) { + IAsyncReader_Release(This->pReader); + This->pReader = NULL; LeaveCriticalSection(&impl_from_IBaseFilter(This->pin.pinInfo.pFilter)->filter.csFilter); TRACE("Unable to process movie\n"); return hr;

1 0

Stefan Dösinger : wined3d: Define a constant for the blit texture size parameter.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: e8b9f8134d7a1cb294b30e5ef6fe58bb64e0dd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b9f8134d7a1cb294b30e5ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:53 2015 +0200 wined3d: Define a constant for the blit texture size parameter. --- dlls/wined3d/arb_program_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 523fc62..719e8e5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6836,6 +6836,8 @@ struct arbfp_blit_desc struct wine_rb_entry entry; }; +#define ARBFP_BLIT_PARAM_SIZE 0 + struct arbfp_blit_priv { struct wine_rb_tree shaders; @@ -7483,7 +7485,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ shader_addline(&buffer, "TEMP texcrd2;\n"); shader_addline(&buffer, "PARAM coef = {1.0, 0.5, 2.0, 0.25};\n"); shader_addline(&buffer, "PARAM yuv_coef = {1.403, 0.344, 0.714, 1.770};\n"); - shader_addline(&buffer, "PARAM size = program.local[0];\n"); + shader_addline(&buffer, "PARAM size = program.local[%u];\n", ARBFP_BLIT_PARAM_SIZE); switch (type->fixup) { @@ -7669,7 +7671,7 @@ err_out: checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, size)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, size)); checkGLcall("glProgramLocalParameter4fvARB"); return WINED3D_OK;

1 0