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

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

April 2, 2015

Module: wine Branch: master Commit: c4f791880145ba41d41690f887e7c700b23209af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f791880145ba41d41690f88… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:24:55 2015 +0200 winedbg: Remove unneeded NONAMELESSXXX directives. --- programs/winedbg/be_x86_64.c | 2 ++ programs/winedbg/debugger.h | 2 -- programs/winedbg/symbol.c | 3 --- programs/winedbg/tgt_module.c | 3 --- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 029f9f1..17feb88 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "debugger.h" #include "wine/debug.h" diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ba49f1e..e8a4d73 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -24,8 +24,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #define WIN32_LEAN_AND_MEAN diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 3069d66..c43cba9 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h> #include <stdio.h> diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 44e3c9f..58c4282 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdlib.h>

1 0

Andrew Eikum : wineoss.drv: Don' t skip over position updates of less than one fragment.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 932f392e08980cff3bf74dfdfd35fc10f10364fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=932f392e08980cff3bf74dfdf… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 1 12:20:41 2015 -0500 wineoss.drv: Don't skip over position updates of less than one fragment. --- dlls/wineoss.drv/mmdevdrv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index cbaf1b2..ccd5c86 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1393,7 +1393,7 @@ static void oss_write_data(ACImpl *This) { ssize_t written_bytes; UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; - size_t to_write_frames, to_write_bytes, advanced; + SIZE_T to_write_frames, to_write_bytes, advanced; audio_buf_info bi; BYTE *buf; @@ -1409,9 +1409,7 @@ static void oss_write_data(ACImpl *This) bi.bytes, This->oss_bufsize_bytes); This->oss_bufsize_bytes = bi.bytes; in_oss_frames = 0; - }else if(This->oss_bufsize_bytes - bi.bytes <= bi.fragsize) - in_oss_frames = 0; - else + }else in_oss_frames = (This->oss_bufsize_bytes - bi.bytes) / This->fmt->nBlockAlign; write_limit = 0; @@ -1433,6 +1431,8 @@ static void oss_write_data(ACImpl *This) This->lcl_offs_frames %= This->bufsize_frames; This->held_frames -= advanced; This->in_oss_frames = in_oss_frames; + TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", + advanced, This->lcl_offs_frames, This->held_frames, This->in_oss_frames); if(This->held_frames == This->in_oss_frames) @@ -1448,7 +1448,9 @@ static void oss_write_data(ACImpl *This) to_write_frames = min(to_write_frames, write_limit); to_write_bytes = to_write_frames * This->fmt->nBlockAlign; - + TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, + write_offs_frames, to_write_frames + write_offs_frames, + This->bufsize_frames); buf = This->local_buffer + write_offs_frames * This->fmt->nBlockAlign; @@ -1479,6 +1481,8 @@ static void oss_write_data(ACImpl *This) if(This->session->mute) silence_buffer(This, This->local_buffer, to_write_frames); + TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); + written_bytes = write(This->fd, This->local_buffer, to_write_bytes); if(written_bytes < 0){ WARN("write failed: %d (%s)\n", errno, strerror(errno));

1 0

Andrew Cook : server: Implement job limit flags.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: ecd41d1de7461b9601e61ee387b24a9610e22b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd41d1de7461b9601e61ee38… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 20:40:15 2015 +1100 server: Implement job limit flags. --- dlls/kernel32/tests/process.c | 1 + dlls/ntdll/sync.c | 42 ++++++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- include/winnt.h | 4 ++++ server/process.c | 13 +++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 9 +++++++++ 8 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fd47951..c991108 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2387,6 +2387,7 @@ static void test_CompletionPort(void) port_info.CompletionKey = job; port_info.CompletionPort = port; ret = pSetInformationJobObject(job, JobObjectAssociateCompletionPortInformation, &port_info, sizeof(port_info)); + todo_wine ok(ret, "SetInformationJobObject error %u\n", GetLastError()); create_process("wait", &pi); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ce1a635..fff38c9 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -634,8 +634,46 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c */ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, PVOID info, ULONG len ) { - FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); - return STATUS_SUCCESS; + NTSTATUS status = STATUS_SUCCESS; + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; + ULONG info_size = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); + DWORD limit_flags = JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS; + + TRACE( "(%p, %u, %p, %u)\n", handle, class, info, len ); + + if (class >= MaxJobObjectInfoClass) + return STATUS_INVALID_PARAMETER; + + switch (class) + { + + case JobObjectExtendedLimitInformation: + info_size = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); + limit_flags = JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS; + /* fallthrough */ + case JobObjectBasicLimitInformation: + if (len != info_size) + return STATUS_INVALID_PARAMETER; + + basic_limit = info; + if (basic_limit->LimitFlags & ~limit_flags) + return STATUS_INVALID_PARAMETER; + + SERVER_START_REQ( set_job_limits ) + { + req->handle = wine_server_obj_handle( handle ); + req->limit_flags = basic_limit->LimitFlags; + status = wine_server_call( req ); + } + SERVER_END_REQ; + break; + + default: + FIXME( "stub: %p %u %p %u\n", handle, class, info, len ); + return STATUS_NOT_IMPLEMENTED; + } + + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5a9f3ab..6e113e7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5127,6 +5127,20 @@ struct process_in_job_reply }; + +struct set_job_limits_request +{ + struct request_header __header; + obj_handle_t handle; + unsigned int limit_flags; + char __pad_20[4]; +}; +struct set_job_limits_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5388,6 +5402,7 @@ enum request REQ_create_job, REQ_assign_job, REQ_process_in_job, + REQ_set_job_limits, REQ_NB_REQUESTS }; @@ -5654,6 +5669,7 @@ union generic_request struct create_job_request create_job_request; struct assign_job_request assign_job_request; struct process_in_job_request process_in_job_request; + struct set_job_limits_request set_job_limits_request; }; union generic_reply { @@ -5918,8 +5934,9 @@ union generic_reply struct create_job_reply create_job_reply; struct assign_job_reply assign_job_reply; struct process_in_job_reply process_in_job_reply; + struct set_job_limits_reply set_job_limits_reply; }; -#define SERVER_PROTOCOL_VERSION 463 +#define SERVER_PROTOCOL_VERSION 464 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winnt.h b/include/winnt.h index 4b06b2c..c2aa50e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5610,6 +5610,10 @@ typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION { #define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x00002000 #define JOB_OBJECT_LIMIT_SUBSET_AFFINITY 0x00004000 +#define JOB_OBJECT_LIMIT_VALID_FLAGS 0x0007ffff +#define JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS 0x000000ff +#define JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS 0x00007fff + typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore = 0, diff --git a/server/process.c b/server/process.c index 9534f90..84c6c82 100644 --- a/server/process.c +++ b/server/process.c @@ -146,6 +146,7 @@ struct job struct object obj; /* object header */ struct list process_list; /* list of all processes */ int num_processes; /* count of running processes */ + unsigned int limit_flags; /* limit flags */ }; static const struct object_ops job_ops = @@ -184,6 +185,7 @@ static struct job *create_job_object( struct directory *root, const struct unico SACL_SECURITY_INFORMATION ); list_init( &job->process_list ); job->num_processes = 0; + job->limit_flags = 0; } } return job; @@ -1506,3 +1508,14 @@ DECL_HANDLER(process_in_job) } release_object( process ); } + +/* update limits of the job object */ +DECL_HANDLER(set_job_limits) +{ + struct job *job = get_job_obj( current->process, req->handle, JOB_OBJECT_SET_ATTRIBUTES ); + + if (!job) return; + + job->limit_flags = req->limit_flags; + release_object( job ); +} diff --git a/server/protocol.def b/server/protocol.def index b85adca..35de6ff 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3528,3 +3528,10 @@ enum coords_relative obj_handle_t job; /* handle to the job */ obj_handle_t process; /* handle to the process */ @END + + +/* Set limit flags on a job */ +(a)REQ(set_job_limits) + obj_handle_t handle; /* handle to the job */ + unsigned int limit_flags; /* new limit flags */ +(a)END diff --git a/server/request.h b/server/request.h index aef316a..d76ddea 100644 --- a/server/request.h +++ b/server/request.h @@ -365,6 +365,7 @@ DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(assign_job); DECL_HANDLER(process_in_job); +DECL_HANDLER(set_job_limits); #ifdef WANT_REQUEST_HANDLERS @@ -630,6 +631,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_job, (req_handler)req_assign_job, (req_handler)req_process_in_job, + (req_handler)req_set_job_limits, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2221,6 +2223,9 @@ C_ASSERT( sizeof(struct assign_job_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct process_in_job_request, process) == 16 ); C_ASSERT( sizeof(struct process_in_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_job_limits_request, limit_flags) == 16 ); +C_ASSERT( sizeof(struct set_job_limits_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index cba15a3..3d8e349 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4119,6 +4119,12 @@ static void dump_process_in_job_request( const struct process_in_job_request *re fprintf( stderr, ", process=%04x", req->process ); } +static void dump_set_job_limits_request( const struct set_job_limits_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", limit_flags=%08x", req->limit_flags ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4379,6 +4385,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_request, (dump_func)dump_assign_job_request, (dump_func)dump_process_in_job_request, + (dump_func)dump_set_job_limits_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4641,6 +4648,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_job_reply, NULL, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4903,6 +4911,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_job", "assign_job", "process_in_job", + "set_job_limits", }; static const struct

1 0

Alistair Leslie-Hughes : msctf: Always return FALSE in DllCanUnloadNow.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 46198a5fa669f617ec4b6acd85f77430584948b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46198a5fa669f617ec4b6acd8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 2 12:30:48 2015 +1100 msctf: Always return FALSE in DllCanUnloadNow. --- dlls/msctf/msctf.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 1ce3b8e..4ea6a0a 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); -static LONG MSCTF_refCount; - static HINSTANCE MSCTF_hinstance; typedef struct @@ -110,7 +108,6 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - InterlockedDecrement(&MSCTF_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -163,11 +160,6 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) TRACE("(%p)->(%x)\n", This, fLock); - if(fLock) - InterlockedIncrement(&MSCTF_refCount); - else - InterlockedDecrement(&MSCTF_refCount); - return S_OK; } @@ -190,7 +182,6 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - InterlockedIncrement(&MSCTF_refCount); return S_OK; } @@ -539,7 +530,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI DllCanUnloadNow(void) { - return MSCTF_refCount ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Stefan Dösinger : wined3d: Pass a struct arbfp_blit_type to the blit shader generation functions.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: ad50f872ae870b3c1ca8d31c90c307b4116aea84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad50f872ae870b3c1ca8d31c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:52 2015 +0200 wined3d: Pass a struct arbfp_blit_type to the blit shader generation functions. --- dlls/wined3d/arb_program_shader.c | 57 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67c4c04..523fc62 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6904,21 +6904,24 @@ static void arbfp_blit_free(struct wined3d_device *device) device->blit_priv = NULL; } -static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum complex_fixup fixup, - enum wined3d_gl_resource_type res_type, char *luminance) +static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, + char *luminance) { char chroma; const char *tex, *texinstr; - if (fixup == COMPLEX_FIXUP_UYVY) { + if (type->fixup == COMPLEX_FIXUP_UYVY) + { chroma = 'x'; *luminance = 'w'; - } else { + } + else + { chroma = 'w'; *luminance = 'x'; } - switch(res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -6950,7 +6953,7 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum compl * * So we have to get the sampling x position in non-normalized coordinates in integers */ - if (res_type != WINED3D_GL_RES_TYPE_TEX_RECT) + if (type->res_type != WINED3D_GL_RES_TYPE_TEX_RECT) { shader_addline(buffer, "MUL texcrd.xy, fragment.texcoord[0], size.x;\n"); shader_addline(buffer, "MOV texcrd.w, size.x;\n"); @@ -7005,14 +7008,14 @@ static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum compl return TRUE; } -static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, - enum wined3d_gl_resource_type res_type, char *luminance) +static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, + char *luminance) { const char *tex; static const float yv12_coef[] = {2.0f / 3.0f, 1.0f / 6.0f, (2.0f / 3.0f) + (1.0f / 6.0f), 1.0f / 3.0f}; - switch (res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -7079,7 +7082,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, * Don't forget to clamp the y values in into the range, otherwise we'll get filtering * bleeding */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { shader_addline(buffer, "RCP chroma.w, size.y;\n"); @@ -7132,7 +7135,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, /* The other chroma value is 1/6th of the texture lower, from 5/6th to 6/6th * No need to clamp because we're just reusing the already clamped value from above */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) shader_addline(buffer, "ADD texcrd.y, texcrd.y, yv12_coef.y;\n"); else shader_addline(buffer, "MAD texcrd.y, size.y, coef.w, texcrd.y;\n"); @@ -7144,7 +7147,7 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, * values due to filtering */ shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Multiply the y coordinate by 2/3 and clamp it */ shader_addline(buffer, "MUL texcrd.y, texcrd.y, yv12_coef.x;\n"); @@ -7167,14 +7170,14 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, return TRUE; } -static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_resource_type res_type, +static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, const struct arbfp_blit_type *type, char *luminance) { const char *tex; static const float nv12_coef[] = {2.0f / 3.0f, 1.0f / 3.0f, 1.0f, 1.0f}; - switch (res_type) + switch (type->res_type) { case WINED3D_GL_RES_TYPE_TEX_2D: tex = "2D"; @@ -7225,7 +7228,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ /* We only have half the number of chroma pixels. */ shader_addline(buffer, "MUL texcrd.x, texcrd.x, coef.y;\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { shader_addline(buffer, "RCP chroma.w, size.x;\n"); shader_addline(buffer, "RCP chroma.z, size.y;\n"); @@ -7274,7 +7277,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ shader_addline(buffer, "TEX temp, texcrd, texture[0], %s;\n", tex); shader_addline(buffer, "MOV chroma.y, temp.w;\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Add 1/size.x */ shader_addline(buffer, "ADD texcrd.x, texcrd.x, chroma.w;\n"); @@ -7291,7 +7294,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ * Clamp the y coordinate to prevent the chroma values from bleeding into the sampled luminance * values due to filtering. */ shader_addline(buffer, "MOV texcrd, fragment.texcoord[0];\n"); - if (res_type == WINED3D_GL_RES_TYPE_TEX_2D) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_2D) { /* Multiply the y coordinate by 2/3 and clamp it */ shader_addline(buffer, "MUL texcrd.y, texcrd.y, nv12_coef.x;\n"); @@ -7316,7 +7319,7 @@ static BOOL gen_nv12_read(struct wined3d_shader_buffer *buffer, enum wined3d_gl_ /* Context activation is done by the caller. */ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, - const struct wined3d_gl_info *gl_info, enum wined3d_gl_resource_type res_type) + const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { GLenum shader; struct wined3d_shader_buffer buffer; @@ -7344,7 +7347,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, shader_addline(&buffer, "PARAM constants = { 0.996, 0.00195, 0, 0 };\n"); /* The alpha-component contains the palette index */ - if (res_type == WINED3D_GL_RES_TYPE_TEX_RECT) + if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], RECT;\n"); else shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], 2D;\n"); @@ -7413,7 +7416,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d /* Context activation is done by the caller. */ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, - enum complex_fixup yuv_fixup, enum wined3d_gl_resource_type res_type) + const struct arbfp_blit_type *type) { GLenum shader; struct wined3d_shader_buffer buffer; @@ -7482,11 +7485,11 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ shader_addline(&buffer, "PARAM yuv_coef = {1.403, 0.344, 0.714, 1.770};\n"); shader_addline(&buffer, "PARAM size = program.local[0];\n"); - switch (yuv_fixup) + switch (type->fixup) { case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YUY2: - if (!gen_planar_yuv_read(&buffer, yuv_fixup, res_type, &luminance_component)) + if (!gen_planar_yuv_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7494,7 +7497,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; case COMPLEX_FIXUP_YV12: - if (!gen_yv12_read(&buffer, res_type, &luminance_component)) + if (!gen_yv12_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7502,7 +7505,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; case COMPLEX_FIXUP_NV12: - if (!gen_nv12_read(&buffer, res_type, &luminance_component)) + if (!gen_nv12_read(&buffer, type, &luminance_component)) { shader_buffer_free(&buffer); return 0; @@ -7510,7 +7513,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ break; default: - FIXME("Unsupported YUV fixup %#x\n", yuv_fixup); + FIXME("Unsupported YUV fixup %#x\n", type->fixup); shader_buffer_free(&buffer); return 0; } @@ -7624,11 +7627,11 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, switch (fixup) { case COMPLEX_FIXUP_P8: - shader = gen_p8_shader(priv, gl_info, type.res_type); + shader = gen_p8_shader(priv, gl_info, &type); break; default: - shader = gen_yuv_shader(priv, gl_info, fixup, type.res_type); + shader = gen_yuv_shader(priv, gl_info, &type); break; }

1 0

Aric Stewart : winmm: sndPlaySound can play resource sounds.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 74471e857c44449a0236702b7cf8c607cf153a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74471e857c44449a0236702b7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 1 10:11:24 2015 -0500 winmm: sndPlaySound can play resource sounds. --- dlls/winmm/playsound.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 88a4c48..5d9aed0 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -566,7 +566,7 @@ BOOL WINAPI PlaySoundW(LPCWSTR pszSoundW, HMODULE hmod, DWORD fdwSound) */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -575,7 +575,7 @@ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_RESOURCE|SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); }

1 0

Stefan Dösinger : wined3d: Use bitfields in struct arbfp_blit_type.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 6cf421399bbf9710ceb3aaf0bef7c1f2aa145689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf421399bbf9710ceb3aaf0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:51 2015 +0200 wined3d: Use bitfields in struct arbfp_blit_type. --- dlls/wined3d/arb_program_shader.c | 52 ++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eed6cb3..67c4c04 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6824,8 +6824,9 @@ const struct fragment_pipeline arbfp_fragment_pipeline = { struct arbfp_blit_type { - enum complex_fixup fixup; - GLenum textype; + enum complex_fixup fixup : 4; + enum wined3d_gl_resource_type res_type : 3; + DWORD padding : 25; }; struct arbfp_blit_desc @@ -6846,11 +6847,7 @@ static int arbfp_blit_type_compare(const void *key, const struct wine_rb_entry * const struct arbfp_blit_type *ka = key; const struct arbfp_blit_type *kb = &WINE_RB_ENTRY_VALUE(entry, const struct arbfp_blit_desc, entry)->type; - if (ka->fixup != kb->fixup) - return ka->fixup < kb->fixup ? -1 : 1; - if (ka->textype != kb->textype) - return ka->textype < kb->textype ? -1 : 1; - return 0; + return memcmp(ka, kb, sizeof(*ka)); } /* Context activation is done by the caller. */ @@ -7563,16 +7560,15 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum textype = surface->container->target; + GLenum gl_texture_type = surface->container->target; struct wine_rb_entry *entry; struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - enum wined3d_gl_resource_type res_type; if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) { - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return WINED3D_OK; } @@ -7581,41 +7577,42 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, TRACE("Fixup:\n"); dump_color_fixup_desc(surface->resource.format->color_fixup); /* Don't bother setting up a shader for unconverted formats */ - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return WINED3D_OK; } fixup = get_complex_fixup(surface->resource.format->color_fixup); - switch (textype) + switch (gl_texture_type) { case GL_TEXTURE_1D: - res_type = WINED3D_GL_RES_TYPE_TEX_1D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_1D; break; case GL_TEXTURE_2D: - res_type = WINED3D_GL_RES_TYPE_TEX_2D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case GL_TEXTURE_3D: - res_type = WINED3D_GL_RES_TYPE_TEX_3D; + type.res_type = WINED3D_GL_RES_TYPE_TEX_3D; break; case GL_TEXTURE_CUBE_MAP_ARB: - res_type = WINED3D_GL_RES_TYPE_TEX_CUBE; + type.res_type = WINED3D_GL_RES_TYPE_TEX_CUBE; break; case GL_TEXTURE_RECTANGLE_ARB: - res_type = WINED3D_GL_RES_TYPE_TEX_RECT; + type.res_type = WINED3D_GL_RES_TYPE_TEX_RECT; break; default: - ERR("Unexpected GL texture type %x.\n", textype); - res_type = WINED3D_GL_RES_TYPE_TEX_2D; + ERR("Unexpected GL texture type %x.\n", gl_texture_type); + type.res_type = WINED3D_GL_RES_TYPE_TEX_2D; } type.fixup = fixup; - type.textype = textype; + type.padding = 0; + entry = wine_rb_get(&priv->shaders, &type); if (entry) { @@ -7627,19 +7624,19 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, switch (fixup) { case COMPLEX_FIXUP_P8: - shader = gen_p8_shader(priv, gl_info, res_type); + shader = gen_p8_shader(priv, gl_info, type.res_type); break; default: - shader = gen_yuv_shader(priv, gl_info, fixup, res_type); + shader = gen_yuv_shader(priv, gl_info, fixup, type.res_type); break; } if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(textype); - checkGLcall("glEnable(textype)"); + gl_info->gl_ops.gl.p_glEnable(gl_texture_type); + checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7647,8 +7644,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!desc) goto err_out; - desc->type.textype = textype; - desc->type.fixup = fixup; + desc->type = type; desc->shader = shader; if (wine_rb_put(&priv->shaders, &desc->type, &desc->entry) == -1) {

1 0

Nikolay Sivov : comctl32/tests: Fix couple of metrics tests that fail on some systems.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: af30ffaa4351f115dc4b4fad0191901637a6f3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=af30ffaa4351f115dc4b4fad0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 2 01:20:52 2015 +0300 comctl32/tests: Fix couple of metrics tests that fail on some systems. --- dlls/comctl32/tests/listview.c | 44 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 94c19f4..a165100 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3915,7 +3915,6 @@ static void test_getitemrect(void) LVCOLUMNA col; INT order[2]; POINT pt; - HDC hdc; /* rectangle isn't empty for empty text items */ hwnd = create_listview_control(LVS_LIST); @@ -3929,9 +3928,9 @@ static void test_getitemrect(void) expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, rect.right); - ReleaseDC(hwnd, hdc); + /* estimate it as width / height ratio */ +todo_wine + ok((rect.right / rect.bottom) >= 5, "got right %d, bottom %d\n", rect.right, rect.bottom); DestroyWindow(hwnd); hwnd = create_listview_control(LVS_REPORT); @@ -4833,6 +4832,36 @@ static void test_getitemspacing(void) DestroyWindow(hwnd); } +static INT get_current_font_height(HWND listview) +{ + TEXTMETRICA tm; + HFONT hfont; + HWND hwnd; + HDC hdc; + + hwnd = (HWND)SendMessageA(listview, LVM_GETHEADER, 0, 0); + if (!hwnd) + hwnd = listview; + + hfont = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0); + if (!hfont) { + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + } + else { + HFONT oldfont; + + hdc = GetDC(0); + oldfont = SelectObject(hdc, hfont); + GetTextMetricsA(hdc, &tm); + SelectObject(hdc, oldfont); + ReleaseDC(0, hdc); + } + + return tm.tmHeight; +} + static void test_getcolumnwidth(void) { HWND hwnd; @@ -4840,7 +4869,7 @@ static void test_getcolumnwidth(void) DWORD_PTR style; LVCOLUMNA col; LVITEMA itema; - HDC hdc; + INT height; /* default column width */ hwnd = create_listview_control(LVS_ICON); @@ -4864,9 +4893,8 @@ static void test_getcolumnwidth(void) memset(&itema, 0, sizeof(itema)); SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); - hdc = GetDC(hwnd); - todo_wine expect(((GetDeviceCaps(hdc, LOGPIXELSX) + 15) / 16) * 16, ret); - ReleaseDC(hwnd, hdc); + height = get_current_font_height(hwnd); + ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); DestroyWindow(hwnd); }

1 0

Stefan Dösinger : wined3d: Pass a wined3d_ffp_texture_type enum to blit shader functions.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: da7abd29b429fbc5ed6cc59b58ccc24b06907624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7abd29b429fbc5ed6cc59b5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:50 2015 +0200 wined3d: Pass a wined3d_ffp_texture_type enum to blit shader functions. --- dlls/wined3d/arb_program_shader.c | 117 +++++++++++++++++++++++++++----------- 1 file changed, 85 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da7abd29b429fbc5ed6cc…

1 0

Stefan Dösinger : wined3d: Give tex_type and its values a better name.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 844c4efb4736dd3ee42369a2a6add2cc8162855a URL: http://source.winehq.org/git/wine.git/?a=commit;h=844c4efb4736dd3ee42369a2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 2 00:30:49 2015 +0200 wined3d: Give tex_type and its values a better name. --- dlls/wined3d/arb_program_shader.c | 65 +++++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 55 +++++++++++++++++---------------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/surface.c | 18 +++++------ dlls/wined3d/utils.c | 16 +++++----- dlls/wined3d/wined3d_private.h | 21 ++++++------- 6 files changed, 95 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=844c4efb4736dd3ee4236…

1 0

Bruno Jesus : ws2_32: Better trace setsockopt/getsockopt.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 846febbc3d47213fb31e47004dd47b6a133b4f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846febbc3d47213fb31e47004… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 2 00:17:39 2015 -0300 ws2_32: Better trace setsockopt/getsockopt. --- dlls/ws2_32/socket.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 52fd03b..09c8416 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -322,6 +322,130 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) } } +static inline const char *debugstr_sockopt(int level, int optname) +{ + const char *stropt = NULL, *strlevel = NULL; + +#define DEBUG_SOCKLEVEL(x) case (x): strlevel = #x +#define DEBUG_SOCKOPT(x) case (x): stropt = #x; break + + switch(level) + { + DEBUG_SOCKLEVEL(WS_SOL_SOCKET); + switch(optname) + { + DEBUG_SOCKOPT(WS_SO_ACCEPTCONN); + DEBUG_SOCKOPT(WS_SO_BROADCAST); + DEBUG_SOCKOPT(WS_SO_BSP_STATE); + DEBUG_SOCKOPT(WS_SO_CONDITIONAL_ACCEPT); + DEBUG_SOCKOPT(WS_SO_CONNECT_TIME); + DEBUG_SOCKOPT(WS_SO_DEBUG); + DEBUG_SOCKOPT(WS_SO_DONTLINGER); + DEBUG_SOCKOPT(WS_SO_DONTROUTE); + DEBUG_SOCKOPT(WS_SO_ERROR); + DEBUG_SOCKOPT(WS_SO_EXCLUSIVEADDRUSE); + DEBUG_SOCKOPT(WS_SO_GROUP_ID); + DEBUG_SOCKOPT(WS_SO_GROUP_PRIORITY); + DEBUG_SOCKOPT(WS_SO_KEEPALIVE); + DEBUG_SOCKOPT(WS_SO_LINGER); + DEBUG_SOCKOPT(WS_SO_MAX_MSG_SIZE); + DEBUG_SOCKOPT(WS_SO_OOBINLINE); + DEBUG_SOCKOPT(WS_SO_OPENTYPE); + DEBUG_SOCKOPT(WS_SO_PROTOCOL_INFOA); + DEBUG_SOCKOPT(WS_SO_PROTOCOL_INFOW); + DEBUG_SOCKOPT(WS_SO_RCVBUF); + DEBUG_SOCKOPT(WS_SO_RCVTIMEO); + DEBUG_SOCKOPT(WS_SO_REUSEADDR); + DEBUG_SOCKOPT(WS_SO_SNDBUF); + DEBUG_SOCKOPT(WS_SO_SNDTIMEO); + DEBUG_SOCKOPT(WS_SO_TYPE); + } + break; + + DEBUG_SOCKLEVEL(WS_NSPROTO_IPX); + switch(optname) + { + DEBUG_SOCKOPT(WS_IPX_PTYPE); + DEBUG_SOCKOPT(WS_IPX_FILTERPTYPE); + DEBUG_SOCKOPT(WS_IPX_DSTYPE); + DEBUG_SOCKOPT(WS_IPX_RECVHDR); + DEBUG_SOCKOPT(WS_IPX_MAXSIZE); + DEBUG_SOCKOPT(WS_IPX_ADDRESS); + DEBUG_SOCKOPT(WS_IPX_MAX_ADAPTER_NUM); + } + break; + + DEBUG_SOCKLEVEL(WS_SOL_IRLMP); + switch(optname) + { + DEBUG_SOCKOPT(WS_IRLMP_ENUMDEVICES); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_TCP); + switch(optname) + { + DEBUG_SOCKOPT(WS_TCP_BSDURGENT); + DEBUG_SOCKOPT(WS_TCP_EXPEDITED_1122); + DEBUG_SOCKOPT(WS_TCP_NODELAY); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_IP); + switch(optname) + { + DEBUG_SOCKOPT(WS_IP_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IP_HDRINCL); + DEBUG_SOCKOPT(WS_IP_MULTICAST_IF); + DEBUG_SOCKOPT(WS_IP_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IP_MULTICAST_TTL); + DEBUG_SOCKOPT(WS_IP_OPTIONS); + DEBUG_SOCKOPT(WS_IP_PKTINFO); + DEBUG_SOCKOPT(WS_IP_TOS); + DEBUG_SOCKOPT(WS_IP_TTL); + DEBUG_SOCKOPT(WS_IP_UNICAST_IF); + DEBUG_SOCKOPT(WS_IP_DONTFRAGMENT); + } + break; + + DEBUG_SOCKLEVEL(WS_IPPROTO_IPV6); + switch(optname) + { + DEBUG_SOCKOPT(WS_IPV6_ADD_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_DROP_MEMBERSHIP); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_IF); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_HOPS); + DEBUG_SOCKOPT(WS_IPV6_MULTICAST_LOOP); + DEBUG_SOCKOPT(WS_IPV6_UNICAST_HOPS); + DEBUG_SOCKOPT(WS_IPV6_V6ONLY); + DEBUG_SOCKOPT(WS_IPV6_UNICAST_IF); + DEBUG_SOCKOPT(WS_IPV6_DONTFRAG); + } + break; + } +#undef DEBUG_SOCKLEVEL +#undef DEBUG_SOCKOPT + + if (!strlevel) + strlevel = wine_dbg_sprintf("WS_0x%x", level); + if (!stropt) + stropt = wine_dbg_sprintf("WS_0x%x", optname); + + return wine_dbg_sprintf("level %s, name %s", strlevel + 3, stropt + 3); +} + +static inline const char *debugstr_optval(const char *optval, int optlenval) +{ + if (optval && !IS_INTRESOURCE(optval) && optlenval >= 1 && optlenval <= sizeof(DWORD)) + { + DWORD value = 0; + memcpy(&value, optval, optlenval); + return wine_dbg_sprintf("%p (%u)", optval, value); + } + return wine_dbg_sprintf("%p", optval); +} + /* HANDLE<->SOCKET conversion (SOCKET is UINT_PTR). */ #define SOCKET2HANDLE(s) ((HANDLE)(s)) #define HANDLE2SOCKET(h) ((SOCKET)(h)) @@ -3147,8 +3271,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, int fd; INT ret = 0; - TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", - s, level, optname, optval, optlen ? *optlen : 0); + TRACE("(socket %04lx, %s, optval %s, optlen %p (%d))\n", s, + debugstr_sockopt(level, optname), debugstr_optval(optval, 0), + optlen, optlen ? *optlen : 0); switch(level) { @@ -4955,8 +5080,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, struct linger linger; struct timeval tval; - TRACE("socket %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", - s, level, optname, optval, optlen); + TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, + debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), + optlen); /* some broken apps pass the value directly instead of a pointer to it */ if(optlen && IS_INTRESOURCE(optval))

1 0

Andrew Cook : server: Implement job inheritance.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 0dbe5adc2117e943c66009dd2b9a744c9a833e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbe5adc2117e943c66009dd2… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 08:56:40 2015 +1100 server: Implement job inheritance. --- dlls/kernel32/tests/process.c | 3 --- server/process.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c991108..a6f86e8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2485,7 +2485,6 @@ static void test_jobInheritance(HANDLE job) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); dwret = WaitForSingleObject(pi.hProcess, 1000); @@ -2513,9 +2512,7 @@ static void test_BreakawayOk(HANDLE job) snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); - todo_wine ok(!ret, "CreateProcessA expected failure\n"); - todo_wine expect_eq_d(ERROR_ACCESS_DENIED, GetLastError()); if (ret) diff --git a/server/process.c b/server/process.c index 84c6c82..c124705 100644 --- a/server/process.c +++ b/server/process.c @@ -1039,6 +1039,14 @@ DECL_HANDLER(new_process) return; } + if (parent->job && (req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && + !(parent->job->limit_flags & (JOB_OBJECT_LIMIT_BREAKAWAY_OK | JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK))) + { + set_error( STATUS_ACCESS_DENIED ); + close( socket_fd ); + return; + } + if (!req->info_size) /* create an orphaned process */ { create_process( socket_fd, NULL, 0 ); @@ -1109,6 +1117,13 @@ DECL_HANDLER(new_process) && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); + if (parent->job + && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) + && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) + { + add_job_process( parent->job, process ); + } + /* connect to the window station */ connect_process_winstation( process, current );

1 0

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

April 2, 2015

Module: wine Branch: master Commit: 546b1c4cea1ce96ecef948363970d4eccef2d6af URL: http://source.winehq.org/git/wine.git/?a=commit;h=546b1c4cea1ce96ecef948363… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:25:11 2015 +0200 rpcss: Remove unneeded NONAMELESSXXX directives. --- programs/rpcss/rpcss_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index 661da4a..1d246ea 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -48,8 +48,6 @@ #include <limits.h> #include <assert.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnt.h"

1 0

Shuai Meng : vbscript: Implemented Oct.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 56ab12ccef84b0e42cddd03a85815beb323ee393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ab12ccef84b0e42cddd03a8… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Mar 28 17:24:46 2015 +0800 vbscript: Implemented Oct. --- dlls/vbscript/global.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 74acff7..ee9168b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -584,8 +584,43 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + WCHAR buf[23], *ptr; + DWORD n; + int ret; + + TRACE("%s\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_I2: + n = (WORD)V_I2(arg); + break; + case VT_NULL: + if(res) + V_VT(res) = VT_NULL; + return S_OK; + default: + hres = to_int(arg, &ret); + if(FAILED(hres)) + return hres; + else + n = ret; + } + + buf[22] = 0; + ptr = buf + 21; + + if(n) { + do { + *ptr-- = '0' + (n & 0x7); + n >>= 3; + }while(n); + ptr++; + }else { + *ptr = '0'; + } + + return return_string(res, ptr); } static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8c92cf5..7b97df4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,36 @@ TestHex empty, "0" Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +Sub TestOct(x, ex, res_type) + Call ok(Oct(x) = ex, "Oct(" & x & ") = " & Oct(x) & " expected " & ex) + Call ok(getVT(Oct(x)) = res_type, "getVT(Oct(" &x & ")) = " & getVT(Oct(x)) & "expected " & res_type) +End Sub + +Sub TestOctError(num, err_num) + On error resume next + Call Oct(num) + Call ok(Err.number = err_num, "Oct(" & num & ") error number is " & Err.number & " expected " & err_num) +End Sub + +TestOct empty, "0", "VT_BSTR" +TestOct 0, "0", "VT_BSTR" +TestOct 9, "11", "VT_BSTR" +TestOct "9", "11", "VT_BSTR" +TestOct 8.5, "10", "VT_BSTR" +TestOct 9.5, "12", "VT_BSTR" +TestOct -1, "177777", "VT_BSTR" +TestOct -32767, "100001", "VT_BSTR" +TestOct -32768, "37777700000", "VT_BSTR" +TestOct 2147483647.49, "17777777777", "VT_BSTR" +TestOct -2147483648.5, "20000000000", "VT_BSTR" +Call ok(getVT(Oct(null)) = "VT_NULL", "getVT(Oct(null)) = " & getVT(Oct(null))) +newObject.myval = 5 +TestOct newObject, "5", "VT_BSTR" + +TestOctError 2147483647.5, 6 +TestOctError -2147483648.51, 6 +TestOctError "test", 13 + x = InStr(1, "abcd", "bc") Call ok(x = 2, "InStr returned " & x)

1 0

Sergey Isakov : windowscodecs: Fix wrong pointer to formal parameter.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 98186d42a57f47641413c19731e8a97587a66f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98186d42a57f47641413c1973… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Mar 27 21:35:23 2015 +0300 windowscodecs: Fix wrong pointer to formal parameter. --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index d5d123a..5ce44a2 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -397,7 +397,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; - hr = configure_write_source(iface, pIBitmapSource, &prc, + hr = configure_write_source(iface, pIBitmapSource, prc, &GUID_WICPixelFormat32bppBGRA, This->size, This->size, 1.0, 1.0);

1 0

Hans Leidekker : msi: Get rid of global variables the cabinet extraction callbacks.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: eb116d6640ba9860bc0ef5bcfdafb63c9d766b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb116d6640ba9860bc0ef5bcf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:33:36 2015 +0200 msi: Get rid of global variables the cabinet extraction callbacks. --- dlls/msi/files.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b6833e9..d1e3ecf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -278,12 +278,11 @@ static MSIFILE *find_file( MSIPACKAGE *package, UINT disk_id, const WCHAR *filen static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILE *file = NULL; - UINT_PTR disk_id = (UINT_PTR)user; + MSIFILE *file = *(MSIFILE **)user; if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (!(file = find_file( package, disk_id, filename ))) + if (!(file = find_file( package, file->disk_id, filename ))) { TRACE("unknown file in cabinet (%s)\n", debugstr_w(filename)); return FALSE; @@ -297,11 +296,11 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action, } *path = strdupW( file->TargetPath ); *attrs = file->Attributes; + *(MSIFILE **)user = file; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { if (!msi_is_global_assembly( file->Component )) file->state = msifs_installed; - file = NULL; } return TRUE; @@ -372,11 +371,12 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) (file->IsCompressed && !mi->is_extracted)) { MSICABDATA data; + MSIFILE *cursor = file; data.mi = mi; data.package = package; data.cb = installfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.user = &cursor; if (file->IsCompressed && !msi_cabextract(package, mi, &data)) { @@ -451,21 +451,20 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILEPATCH *patch; - UINT_PTR disk_id = (UINT_PTR)user; + MSIFILEPATCH *patch = *(MSIFILEPATCH **)user; if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (!(patch = find_filepatch( package, disk_id, file ))) return FALSE; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes; + *(MSIFILEPATCH **)user = patch; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { patch->extracted = TRUE; - patch = NULL; } return TRUE; @@ -501,6 +500,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) if (!patch->extracted) { MSICABDATA data; + MSIFILEPATCH *cursor = patch; rc = ready_media( package, TRUE, mi ); if (rc != ERROR_SUCCESS) @@ -511,7 +511,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) data.mi = mi; data.package = package; data.cb = patchfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.user = &cursor; if (!msi_cabextract( package, mi, &data )) {

1 0

Hans Leidekker : msi: Clean up handling of temporary files.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 17b05316a5a62d48cca50f416da5e7f2f14fef99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b05316a5a62d48cca50f416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:33:11 2015 +0200 msi: Clean up handling of temporary files. --- dlls/msi/action.c | 37 ++++++++++++++++++------ dlls/msi/custom.c | 81 +++++++++++++++++++++++++++++++---------------------- dlls/msi/database.c | 1 + dlls/msi/dialog.c | 29 ++----------------- dlls/msi/files.c | 49 +++++++++++++++----------------- dlls/msi/msipriv.h | 9 ++---- dlls/msi/package.c | 65 +++++++++++------------------------------- 7 files changed, 120 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17b05316a5a62d48cca50…

1 0

Hans Leidekker : msi: Don' t apply file patches in the cabinet extraction callback.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 006801366e1b9e9f647ae46ccf3e899e8872a796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006801366e1b9e9f647ae46cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:32:18 2015 +0200 msi: Don't apply file patches in the cabinet extraction callback. --- dlls/msi/action.c | 1 - dlls/msi/files.c | 92 +++++++++++++++++++++++++++++------------------------- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 9 ++++++ 4 files changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index edd08f7..a9a157b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1377,7 +1377,6 @@ static UINT load_patch(MSIRECORD *row, LPVOID param) patch->Sequence = MSI_RecordGetInteger( row, 2 ); patch->PatchSize = MSI_RecordGetInteger( row, 3 ); patch->Attributes = MSI_RecordGetInteger( row, 4 ); - patch->IsApplied = FALSE; /* FIXME: * Header field - for patch validation. diff --git a/dlls/msi/files.c b/dlls/msi/files.c index dff00df..96fb48a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -436,13 +436,14 @@ done: return rc; } -static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) +static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WCHAR *key ) { MSIFILEPATCH *patch; LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { - if (!patch->IsApplied && !strcmpW( key, patch->File->File )) return patch; + if (!patch->extracted && patch->disk_id == disk_id && !strcmpW( key, patch->File->File )) + return patch; } return NULL; } @@ -450,45 +451,25 @@ static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILEPATCH *p = NULL; - static WCHAR patch_path[MAX_PATH] = {0}; - static WCHAR temp_folder[MAX_PATH] = {0}; + static MSIFILEPATCH *patch; + static WCHAR tmpfile[MAX_PATH], tmpdir[MAX_PATH]; + UINT_PTR disk_id = (UINT_PTR)user; + + if (!tmpdir[0]) GetTempPathW( MAX_PATH, tmpdir ); if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (temp_folder[0] == '\0') - GetTempPathW(MAX_PATH, temp_folder); - - if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled) - return FALSE; + if (!(patch = find_filepatch( package, disk_id, file ))) return FALSE; - GetTempFileNameW(temp_folder, NULL, 0, patch_path); - - *path = strdupW(patch_path); - *attrs = p->File->Attributes; + GetTempFileNameW( tmpdir, NULL, 0, tmpfile ); + *path = strdupW( tmpfile ); + *attrs = patch->File->Attributes; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { - WCHAR patched_file[MAX_PATH]; - BOOL br; - - GetTempFileNameW(temp_folder, NULL, 0, patched_file); - - br = ApplyPatchToFileW(patch_path, p->File->TargetPath, patched_file, 0); - if (br) - { - /* FIXME: baseline cache */ - - DeleteFileW( p->File->TargetPath ); - MoveFileW( patched_file, p->File->TargetPath ); - - p->IsApplied = TRUE; - } - else - ERR("Failed patch %s: %d.\n", debugstr_w(p->File->TargetPath), GetLastError()); - - DeleteFileW(patch_path); - p = NULL; + patch->path = strdupW( tmpfile ); + patch->extracted = TRUE; + patch = NULL; } return TRUE; @@ -504,6 +485,8 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); + TRACE("extracting files\n"); + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { MSIFILE *file = patch->File; @@ -519,7 +502,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) comp->Action = msi_get_component_action( package, comp ); if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) continue; - if (!patch->IsApplied) + if (!patch->extracted) { MSICABDATA data; @@ -529,23 +512,48 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; } - - data.mi = mi; + data.mi = mi; data.package = package; - data.cb = patchfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.cb = patchfiles_cb; + data.user = (PVOID)(UINT_PTR)mi->disk_id; - if (!msi_cabextract(package, mi, &data)) + if (!msi_cabextract( package, mi, &data )) { ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); rc = ERROR_INSTALL_FAILURE; goto done; } } + } + + TRACE("applying patches\n"); + + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + WCHAR tmpdir[MAX_PATH], tmpfile[MAX_PATH]; + BOOL ret; + + if (!patch->path) continue; + + GetTempPathW( MAX_PATH, tmpdir ); + GetTempFileNameW( tmpdir, NULL, 0, tmpfile ); + + ret = ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 ); + if (ret) + { + DeleteFileW( patch->File->TargetPath ); + MoveFileW( tmpfile, patch->File->TargetPath ); + } + else + WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); + + DeleteFileW( patch->path ); + DeleteFileW( tmpfile ); + RemoveDirectoryW( tmpdir ); - if (!patch->IsApplied && !(patch->Attributes & msidbPatchAttributesNonVital)) + if (!ret && !(patch->Attributes & msidbPatchAttributesNonVital)) { - ERR("Failed to apply patch to file: %s\n", debugstr_w(file->File)); + ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); rc = ERROR_INSTALL_FAILURE; goto done; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b58dc32..fe4f6d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -593,8 +593,9 @@ typedef struct tagMSIFILEPATCH INT Sequence; INT PatchSize; INT Attributes; - BOOL IsApplied; + BOOL extracted; UINT disk_id; + WCHAR *path; } MSIFILEPATCH; typedef struct tagMSIAPPID diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fcbf663..1053053 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -200,6 +200,15 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( file ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->filepatches ) + { + MSIFILEPATCH *patch = LIST_ENTRY( item, MSIFILEPATCH, entry ); + + list_remove( &patch->entry ); + msi_free( patch->path ); + msi_free( patch ); + } + /* clean up extension, progid, class and verb structures */ LIST_FOR_EACH_SAFE( item, cursor, &package->classes ) {

1 0

Sebastian Lackner : advapi32/tests: Add tests for CreateFile with set security descriptor.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 9e0045e1674350af9ddaf8e21c0ca3eecd5bf1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0045e1674350af9ddaf8e21… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 1 09:06:10 2015 +0200 advapi32/tests: Add tests for CreateFile with set security descriptor. --- dlls/advapi32/tests/security.c | 55 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0ff773c..3789d72 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3267,7 +3267,7 @@ static void test_CreateDirectoryA(void) 0x1f01ff, FALSE, TRUE, FALSE, __LINE__); LocalFree(pSD); - /* Test inheritance of ACLs */ + /* Test inheritance of ACLs in CreateFile without security descriptor */ strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3284,7 +3284,55 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); - /* Repeat the same test with ntdll functions */ + /* Test inheritance of ACLs in CreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = pSD; + sa.bInheritHandle = TRUE; + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, &sa, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + todo_wine + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + if (error == ERROR_SUCCESS) + { + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + } + CloseHandle(hTemp); + + /* Test inheritance of ACLs in NtCreateFile without security descriptor */ strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); get_nt_pathW(tmpfile, &tmpfileW); @@ -3310,7 +3358,8 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); - /* When a security descriptor is set, then inheritance doesn't take effect */ + /* Test inheritance of ACLs in NtCreateFile with security descriptor - + * When a security descriptor is set, then inheritance doesn't take effect */ pSD = &sd; InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL));

1 0

Andrew Cook : server: Implement AssignProcessToJobObject.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 98132f03644669e4df5202592d4aaa87e5fae9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=98132f03644669e4df5202592… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 09:10:16 2015 +1100 server: Implement AssignProcessToJobObject. --- dlls/kernel32/tests/process.c | 2 -- dlls/ntdll/sync.c | 15 ++++++++-- include/wine/server_protocol.h | 19 +++++++++++- server/process.c | 68 +++++++++++++++++++++++++++++++++++++++++- server/process.h | 2 ++ server/protocol.def | 7 +++++ server/request.h | 5 ++++ server/trace.c | 9 ++++++ 8 files changed, 121 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98132f03644669e4df520…

1 0

Andrew Cook : kernel32/tests: Extend IsProcessInJob tests.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: e30a6bbcbd41d2eac9ad4529dda70c5e0c20060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30a6bbcbd41d2eac9ad4529d… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 12:48:34 2015 +1100 kernel32/tests: Extend IsProcessInJob tests. --- dlls/kernel32/tests/process.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fd3ce7f..9318b89 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2168,7 +2168,7 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION static void test_IsProcessInJob(void) { - HANDLE job; + HANDLE job, job2; PROCESS_INFORMATION pi; BOOL ret, out; DWORD dwret; @@ -2182,6 +2182,9 @@ static void test_IsProcessInJob(void) job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); + job2 = pCreateJobObjectW(NULL, NULL); + ok(job2 != NULL, "CreateJobObject error %u\n", GetLastError()); + create_process("wait", &pi); out = TRUE; @@ -2189,6 +2192,16 @@ static void test_IsProcessInJob(void) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job2, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); @@ -2198,6 +2211,17 @@ static void test_IsProcessInJob(void) todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); + out = TRUE; + ret = pIsProcessInJob(pi.hProcess, job2, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + ok(!out, "IsProcessInJob returned out=%u\n", out); + + out = FALSE; + ret = pIsProcessInJob(pi.hProcess, NULL, &out); + ok(ret, "IsProcessInJob error %u\n", GetLastError()); + todo_wine + ok(out, "IsProcessInJob returned out=%u\n", out); + TerminateProcess(pi.hProcess, 0); dwret = WaitForSingleObject(pi.hProcess, 1000); @@ -2212,6 +2236,7 @@ static void test_IsProcessInJob(void) CloseHandle(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(job); + CloseHandle(job2); } static void test_TerminateJobObject(void)

1 0

David Hedberg : comdlg32: Only attempt to update the layout if the dialog window exists.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 2afbf9dbbcc56f686c35be03557cabf9589b1a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afbf9dbbcc56f686c35be035… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Mar 29 22:56:29 2015 +0200 comdlg32: Only attempt to update the layout if the dialog window exists. --- dlls/comdlg32/itemdlg.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c37b66e..b5093b8 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1225,7 +1225,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) /************************************************************************** * Window related functions. */ -static SIZE update_layout(FileDialogImpl *This) +static void update_layout(FileDialogImpl *This) { HDWP hdwp; HWND hwnd; @@ -1233,21 +1233,19 @@ static SIZE update_layout(FileDialogImpl *This) RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; RECT toolbar_rc, ebrowser_rc, customctrls_rc; - int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; - SIZE ret; + static const UINT min_width = 320, min_height = 200; - GetClientRect(This->dlg_hwnd, &dialog_rc); - - missing_width = max(0, 320 - dialog_rc.right); - missing_height = max(0, 200 - dialog_rc.bottom); + if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) + { + TRACE("Invalid dialog window, not updating layout\n"); + return; + } - if(missing_width || missing_height) + if(dialog_rc.right < min_width || dialog_rc.bottom < min_height) { - TRACE("Missing (%d, %d)\n", missing_width, missing_height); - ret.cx = missing_width; - ret.cy = missing_height; - return ret; + TRACE("Dialog size (%d, %d) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom); + return; } /**** @@ -1399,8 +1397,7 @@ static SIZE update_layout(FileDialogImpl *This) else ERR("Failed to position dialog controls.\n"); - ret.cx = 0; ret.cy = 0; - return ret; + return; } static HRESULT init_explorerbrowser(FileDialogImpl *This)

1 0

Hans Leidekker : msi: Don' t mark global assembly files as installed when they are extracted.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 20ef12a762b73519147d4920a37697bc3c9e8921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef12a762b73519147d4920a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:32:44 2015 +0200 msi: Don't mark global assembly files as installed when they are extracted. --- dlls/msi/action.c | 11 ++++++++--- dlls/msi/files.c | 17 +++++++++-------- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 1 + 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a9a157b..4eec12a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2169,13 +2169,18 @@ WCHAR *msi_build_directory_name( DWORD count, ... ) return dir; } -static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) +BOOL msi_is_global_assembly( MSICOMPONENT *comp ) { - MSIASSEMBLY *assembly = file->Component->assembly; + return comp->assembly && !comp->assembly->application; +} +static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) +{ msi_free( file->TargetPath ); - if (assembly && !assembly->application) + if (msi_is_global_assembly( file->Component )) { + MSIASSEMBLY *assembly = file->Component->assembly; + if (!assembly->tempdir) assembly->tempdir = get_temp_dir(); file->TargetPath = msi_build_directory_name( 2, assembly->tempdir, file->FileName ); msi_track_tempfile( package, file->TargetPath ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 96fb48a..fb56a6d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -80,7 +80,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); return msifs_skipped; } - if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || + if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("installing %s (missing)\n", debugstr_w(file->File)); @@ -291,7 +291,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (f->disk_id != disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) return FALSE; - if (!f->Component->assembly || f->Component->assembly->application) + if (!msi_is_global_assembly( f->Component )) { msi_create_directory(package, f->Component->Directory); } @@ -300,7 +300,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, } else if (action == MSICABEXTRACT_FILEEXTRACTED) { - f->state = msifs_installed; + if (!msi_is_global_assembly( f->Component )) f->state = msifs_installed; f = NULL; } @@ -393,22 +393,22 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!file->Component->assembly || file->Component->assembly->application) + if (!msi_is_global_assembly( file->Component )) { msi_create_directory(package, file->Component->Directory); } rc = copy_install_file(package, file, source); if (rc != ERROR_SUCCESS) { - ERR("Failed to copy %s to %s (%d)\n", debugstr_w(source), - debugstr_w(file->TargetPath), rc); + ERR("Failed to copy %s to %s (%u)\n", debugstr_w(source), debugstr_w(file->TargetPath), rc); rc = ERROR_INSTALL_FAILURE; msi_free(source); goto done; } msi_free(source); } - else if (file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!msi_is_global_assembly( file->Component ) && + file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE; @@ -419,7 +419,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (!comp->assembly || (file->state != msifs_missing && file->state != msifs_overwrite)) + if (!msi_is_global_assembly( comp ) || (file->state != msifs_missing && file->state != msifs_overwrite)) continue; rc = msi_install_assembly( package, comp ); @@ -429,6 +429,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ERROR_INSTALL_FAILURE; break; } + file->state = msifs_installed; } done: diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 5810a1e..a0f69c9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -588,7 +588,7 @@ UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolder const WCHAR *dir; MSICOMPONENT *comp = file->Component; - if (!comp->Enabled || (comp->assembly && !comp->assembly->application)) continue; + if (!comp->Enabled || msi_is_global_assembly( comp )) continue; dir = msi_get_target_folder( package, comp->Directory ); msi_free( file->TargetPath ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index df71ed2..9dc30be 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2048,7 +2048,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - if (comp->assembly && !comp->assembly->application) *temp = comp->Cost; + if (msi_is_global_assembly( comp )) *temp = comp->Cost; if (!comp->Enabled || !comp->KeyPath) { *cost = 0; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fe4f6d6..9c016f3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1045,6 +1045,7 @@ extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; +extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Import mspatcha instead of loading it dynamically.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 2acc11c215c822fac348459aca74a0439ee8a60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2acc11c215c822fac348459ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:24:57 2015 +0200 msi: Import mspatcha instead of loading it dynamically. --- configure | 2 +- configure.ac | 2 +- dlls/msi/Makefile.in | 2 +- dlls/msi/files.c | 38 +------------------------------------- dlls/mspatcha/Makefile.in | 3 ++- 5 files changed, 6 insertions(+), 41 deletions(-) diff --git a/configure b/configure index 4596844..3b8dfb1 100755 --- a/configure +++ b/configure @@ -17372,7 +17372,7 @@ wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msls31 enable_msls31 wine_fn_config_dll msnet32 enable_msnet32 -wine_fn_config_dll mspatcha enable_mspatcha +wine_fn_config_dll mspatcha enable_mspatcha implib wine_fn_config_dll msrle32 enable_msrle32 po wine_fn_config_test dlls/msrle32/tests msrle32_test wine_fn_config_dll mssign32 enable_mssign32 diff --git a/configure.ac b/configure.ac index 1fc7873..688ab26 100644 --- a/configure.ac +++ b/configure.ac @@ -3074,7 +3074,7 @@ WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msls31) WINE_CONFIG_DLL(msnet32) -WINE_CONFIG_DLL(mspatcha) +WINE_CONFIG_DLL(mspatcha,,[implib]) WINE_CONFIG_DLL(msrle32,,[po]) WINE_CONFIG_TEST(dlls/msrle32/tests) WINE_CONFIG_DLL(mssign32) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index f355e33..79704ad 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -1,7 +1,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 -DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp +DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp mspatcha C_SRCS = \ action.c \ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 40cc3f6..dff00df 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -43,13 +43,11 @@ #include "winuser.h" #include "winreg.h" #include "shlwapi.h" +#include "patchapi.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); -static HMODULE hmspatcha; -static BOOL (WINAPI *ApplyPatchToFileW)(LPCWSTR, LPCWSTR, LPCWSTR, ULONG); - static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *action ) { MSIRECORD *uirow; @@ -438,30 +436,6 @@ done: return rc; } -static BOOL load_mspatcha(void) -{ - hmspatcha = LoadLibraryA("mspatcha.dll"); - if (!hmspatcha) - { - ERR("Failed to load mspatcha.dll: %d\n", GetLastError()); - return FALSE; - } - - ApplyPatchToFileW = (void*)GetProcAddress(hmspatcha, "ApplyPatchToFileW"); - if(!ApplyPatchToFileW) - { - ERR("GetProcAddress(ApplyPatchToFileW) failed: %d.\n", GetLastError()); - return FALSE; - } - - return TRUE; -} - -static void unload_mspatch(void) -{ - FreeLibrary(hmspatcha); -} - static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) { MSIFILEPATCH *patch; @@ -525,7 +499,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) MSIFILEPATCH *patch; MSIMEDIAINFO *mi; UINT rc = ERROR_SUCCESS; - BOOL mspatcha_loaded = FALSE; TRACE("%p\n", package); @@ -557,13 +530,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) goto done; } - if (!mspatcha_loaded && !load_mspatcha()) - { - rc = ERROR_FUNCTION_FAILED; - goto done; - } - mspatcha_loaded = TRUE; - data.mi = mi; data.package = package; data.cb = patchfiles_cb; @@ -587,8 +553,6 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) done: msi_free_media_info(mi); - if (mspatcha_loaded) - unload_mspatch(); return rc; } diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index b1ddb50..bd0da7d 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,4 +1,5 @@ -MODULE = mspatcha.dll +MODULE = mspatcha.dll +IMPORTLIB = mspatcha C_SRCS = \ mspatcha_main.c

1 0

Sebastian Lackner : advapi32/tests: Merge common code to test DACL descriptors in a helper function.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: bfcfceec3939340c5d2d676194c6e2d4efcf1208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcfceec3939340c5d2d67619… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 1 08:58:56 2015 +0200 advapi32/tests: Merge common code to test DACL descriptors in a helper function. --- dlls/advapi32/tests/security.c | 174 +++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 94 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4bee951..0ff773c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3110,6 +3110,80 @@ static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) RtlFreeUnicodeString(&strW); } +static void test_inherited_dacl(PACL dacl, PSID admin_sid, PSID user_sid, DWORD flags, DWORD mask, + BOOL todo_count, BOOL todo_sid, BOOL todo_flags, int line) +{ + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + BOOL bret; + + bret = pGetAclInformation(dacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok_(__FILE__, line)(bret, "GetAclInformation failed\n"); + + if (todo_count) + todo_wine + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + else + ok_(__FILE__, line)(acl_size.AceCount == 2, + "GetAclInformation returned unexpected entry count (%d != 2)\n", + acl_size.AceCount); + + if (acl_size.AceCount > 0) + { + bret = pGetAce(dacl, 0, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Current User ACE\n"); + + bret = EqualSid(&ace->SidStart, user_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + else + ok_(__FILE__, line)(bret, "Current User ACE != Current User SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Current User ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Current User ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(dacl, 1, (VOID **)&ace); + ok_(__FILE__, line)(bret, "Failed to get Administators Group ACE\n"); + + bret = EqualSid(&ace->SidStart, admin_sid); + if (todo_sid) + todo_wine + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + else + ok_(__FILE__, line)(bret, "Administators Group ACE != Administators Group SID\n"); + + if (todo_flags) + todo_wine + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + else + ok_(__FILE__, line)(((ACE_HEADER *)ace)->AceFlags == flags, + "Administators Group ACE has unexpected flags (0x%x != 0x%x)\n", + ((ACE_HEADER *)ace)->AceFlags, flags); + + ok_(__FILE__, line)(ace->Mask == mask, + "Administators Group ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, mask); + } +} + static void test_CreateDirectoryA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -3119,7 +3193,6 @@ static void test_CreateDirectoryA(void) PSECURITY_DESCRIPTOR pSD = &sd; ACL_SIZE_INFORMATION acl_size; UNICODE_STRING tmpfileW; - ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; OBJECT_ATTRIBUTES attr; char tmpfile[MAX_PATH]; @@ -3190,35 +3263,8 @@ static void test_CreateDirectoryA(void) goto done; } ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", - ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", - ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, + 0x1f01ff, FALSE, TRUE, FALSE, __LINE__); LocalFree(pSD); /* Test inheritance of ACLs */ @@ -3233,38 +3279,8 @@ static void test_CreateDirectoryA(void) OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, (PSID *)&owner, NULL, &pDacl, NULL, &pSD); ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - todo_wine - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Inherited Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine - ok(bret, "Inherited Current User ACE != Current User SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Inherited Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine - ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, TRUE, TRUE, TRUE, __LINE__); LocalFree(pSD); CloseHandle(hTemp); @@ -3289,38 +3305,8 @@ static void test_CreateDirectoryA(void) OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, (PSID *)&owner, NULL, &pDacl, NULL, &pSD); ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); - - bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); - ok(bret, "GetAclInformation failed\n"); - todo_wine - ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); - if (acl_size.AceCount > 0) - { - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Inherited Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); - todo_wine - ok(bret, "Inherited Current User ACE != Current User SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } - if (acl_size.AceCount > 1) - { - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Inherited Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); - todo_wine - ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); - todo_wine - ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, - "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, - "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); - } + test_inherited_dacl(pDacl, admin_sid, user_sid, INHERITED_ACE, + 0x1f01ff, TRUE, TRUE, TRUE, __LINE__); LocalFree(pSD); CloseHandle(hTemp);

1 0

Andrew Cook : server: Implement IsProcessInJob.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 3affd63b34b042ec8f3538a51b7cd1cb76db7fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3affd63b34b042ec8f3538a51… Author: Andrew Cook <ariscop(a)gmail.com> Date: Wed Apr 1 09:27:34 2015 +1100 server: Implement IsProcessInJob. --- dlls/kernel32/tests/process.c | 3 --- dlls/ntdll/sync.c | 15 +++++++++++++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 22 ++++++++++++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 7 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 55cd42f..fd47951 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2208,7 +2208,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); out = TRUE; @@ -2219,7 +2218,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, NULL, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); TerminateProcess(pi.hProcess, 0); @@ -2230,7 +2228,6 @@ static void test_IsProcessInJob(void) out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); ok(ret, "IsProcessInJob error %u\n", GetLastError()); - todo_wine ok(out, "IsProcessInJob returned out=%u\n", out); CloseHandle(pi.hProcess); diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index de5e36f..ce1a635 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -644,8 +644,19 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla */ NTSTATUS WINAPI NtIsProcessInJob( HANDLE process, HANDLE job ) { - FIXME( "stub: %p %p\n", process, job ); - return STATUS_PROCESS_NOT_IN_JOB; + NTSTATUS status; + + TRACE( "(%p %p)\n", job, process ); + + SERVER_START_REQ( process_in_job ) + { + req->job = wine_server_obj_handle( job ); + req->process = wine_server_obj_handle( process ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 300ad37..5a9f3ab 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5113,6 +5113,20 @@ struct assign_job_reply }; + +struct process_in_job_request +{ + struct request_header __header; + obj_handle_t job; + obj_handle_t process; + char __pad_20[4]; +}; +struct process_in_job_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -5373,6 +5387,7 @@ enum request REQ_set_suspend_context, REQ_create_job, REQ_assign_job, + REQ_process_in_job, REQ_NB_REQUESTS }; @@ -5638,6 +5653,7 @@ union generic_request struct set_suspend_context_request set_suspend_context_request; struct create_job_request create_job_request; struct assign_job_request assign_job_request; + struct process_in_job_request process_in_job_request; }; union generic_reply { @@ -5901,8 +5917,9 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; struct create_job_reply create_job_reply; struct assign_job_reply assign_job_reply; + struct process_in_job_reply process_in_job_reply; }; -#define SERVER_PROTOCOL_VERSION 462 +#define SERVER_PROTOCOL_VERSION 463 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index fd08178..9534f90 100644 --- a/server/process.c +++ b/server/process.c @@ -1484,3 +1484,25 @@ DECL_HANDLER(assign_job) } release_object( job ); } + + +/* check if a process is associated with a job */ +DECL_HANDLER(process_in_job) +{ + struct process *process; + struct job *job; + + if (!(process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION ))) + return; + + if (!req->job) + { + set_error( process->job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + } + else if ((job = get_job_obj( current->process, req->job, JOB_OBJECT_QUERY ))) + { + set_error( process->job == job ? STATUS_PROCESS_IN_JOB : STATUS_PROCESS_NOT_IN_JOB ); + release_object( job ); + } + release_object( process ); +} diff --git a/server/protocol.def b/server/protocol.def index fa5577f..b85adca 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3521,3 +3521,10 @@ enum coords_relative obj_handle_t job; /* handle to the job */ obj_handle_t process; /* handle to the process */ @END + + +/* Check if a process is associated with a job */ +(a)REQ(process_in_job) + obj_handle_t job; /* handle to the job */ + obj_handle_t process; /* handle to the process */ +(a)END diff --git a/server/request.h b/server/request.h index 87f55c6..aef316a 100644 --- a/server/request.h +++ b/server/request.h @@ -364,6 +364,7 @@ DECL_HANDLER(get_suspend_context); DECL_HANDLER(set_suspend_context); DECL_HANDLER(create_job); DECL_HANDLER(assign_job); +DECL_HANDLER(process_in_job); #ifdef WANT_REQUEST_HANDLERS @@ -628,6 +629,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_suspend_context, (req_handler)req_create_job, (req_handler)req_assign_job, + (req_handler)req_process_in_job, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2216,6 +2218,9 @@ C_ASSERT( sizeof(struct create_job_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct assign_job_request, job) == 12 ); C_ASSERT( FIELD_OFFSET(struct assign_job_request, process) == 16 ); C_ASSERT( sizeof(struct assign_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct process_in_job_request, job) == 12 ); +C_ASSERT( FIELD_OFFSET(struct process_in_job_request, process) == 16 ); +C_ASSERT( sizeof(struct process_in_job_request) == 24 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index aa5327c..cba15a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4113,6 +4113,12 @@ static void dump_assign_job_request( const struct assign_job_request *req ) fprintf( stderr, ", process=%04x", req->process ); } +static void dump_process_in_job_request( const struct process_in_job_request *req ) +{ + fprintf( stderr, " job=%04x", req->job ); + fprintf( stderr, ", process=%04x", req->process ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -4372,6 +4378,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_suspend_context_request, (dump_func)dump_create_job_request, (dump_func)dump_assign_job_request, + (dump_func)dump_process_in_job_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -4633,6 +4640,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_create_job_reply, NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4894,6 +4902,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_suspend_context", "create_job", "assign_job", + "process_in_job", }; static const struct @@ -4996,6 +5005,7 @@ static const struct { "PIPE_LISTENING", STATUS_PIPE_LISTENING }, { "PIPE_NOT_AVAILABLE", STATUS_PIPE_NOT_AVAILABLE }, { "PRIVILEGE_NOT_HELD", STATUS_PRIVILEGE_NOT_HELD }, + { "PROCESS_IN_JOB", STATUS_PROCESS_IN_JOB }, { "PROCESS_IS_TERMINATING", STATUS_PROCESS_IS_TERMINATING }, { "SECTION_TOO_BIG", STATUS_SECTION_TOO_BIG }, { "SEMAPHORE_LIMIT_EXCEEDED", STATUS_SEMAPHORE_LIMIT_EXCEEDED },

1 0

Andrew Cook : server: Implement CreateJobObject.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 0e78b0248d4812c2f4379f59bb4545453e85484f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e78b0248d4812c2f4379f59b… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Feb 26 12:25:23 2015 +1100 server: Implement CreateJobObject. --- dlls/ntdll/sync.c | 33 +++++++++++-- include/wine/server_protocol.h | 22 ++++++++- server/process.c | 110 +++++++++++++++++++++++++++++++++++++++++ server/protocol.def | 10 ++++ server/request.h | 7 +++ server/trace.c | 15 ++++++ 6 files changed, 193 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e78b0248d4812c2f4379…

1 0

Christoph von Wittich : riched20: Handle SCF_WORD.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: ca2b70b2855be5f0166a639a07e43c2b3e877ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2b70b2855be5f0166a639a0… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Sun Mar 29 22:07:50 2015 +0200 riched20: Handle SCF_WORD. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 8 ++++++-- dlls/riched20/editor.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 043a32a..e3e42cc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -710,7 +710,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) } -static BOOL +BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { ME_DisplayItem *pRun = cursor->pRun, *pOtherRun; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 171ec69..a4403ca 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3510,8 +3510,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (editor->mode & TM_PLAINTEXT) return 0; if (wParam & SCF_WORD) { - FIXME("EM_SETCHARFORMAT: word selection not supported\n"); - return 0; + ME_Cursor start; + ME_Cursor end = editor->pCursors[0]; + ME_MoveCursorWords(editor, &end, +1); + start = end; + ME_MoveCursorWords(editor, &start, -1); + ME_SetCharFormat(editor, &start, &end, p); } bRepaint = ME_IsSelection(editor); ME_SetSelectionCharFormat(editor, p); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e4c13a9..e2b837a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -166,6 +166,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; +BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; void ME_HideCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void ME_ShowCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void ME_MoveCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Store the disk id for file patches.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 0762dd68f8feeaa7698aa4d47cee02507a2c0190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0762dd68f8feeaa7698aa4d47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:25:27 2015 +0200 msi: Store the disk id for file patches. --- dlls/msi/action.c | 23 ++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d1c46b8..edd08f7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1278,7 +1278,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) load_file_hash(package, file); load_file_disk_id(package, file); - TRACE("File Loaded (%s)\n",debugstr_w(file->File)); + TRACE("File loaded (file %s sequence %u)\n", debugstr_w(file->File), file->Sequence); list_add_tail( &package->files, &file->entry ); @@ -1336,6 +1336,25 @@ static UINT load_all_media( MSIPACKAGE *package ) return r; } +static UINT load_patch_disk_id( MSIPACKAGE *package, MSIFILEPATCH *patch ) +{ + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','`','D','i','s','k','I','d','`',' ', 'F','R','O','M',' ', + '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', + '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','u',0}; + MSIRECORD *rec; + + if (!(rec = MSI_QueryGetRecord( package->db, query, patch->Sequence ))) + { + WARN("query failed\n"); + return ERROR_FUNCTION_FAILED; + } + + patch->disk_id = MSI_RecordGetInteger( rec, 1 ); + msiobj_release( &rec->hdr ); + return ERROR_SUCCESS; +} + static UINT load_patch(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; @@ -1365,6 +1384,8 @@ static UINT load_patch(MSIRECORD *row, LPVOID param) * _StreamRef - External key into MsiPatchHeaders (instead of the header field) */ + load_patch_disk_id( package, patch ); + TRACE("Patch loaded (file %s sequence %u)\n", debugstr_w(patch->File->File), patch->Sequence); list_add_tail( &package->filepatches, &patch->entry ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ac7ba32..b58dc32 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -594,6 +594,7 @@ typedef struct tagMSIFILEPATCH INT PatchSize; INT Attributes; BOOL IsApplied; + UINT disk_id; } MSIFILEPATCH; typedef struct tagMSIAPPID

1 0

Michael Stefaniuc : gdiplus: The result of a comparison is already a BOOL.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: e81ff99c72b88c32be7d9bdde6702c4ff517063c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81ff99c72b88c32be7d9bdde… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 1 09:48:48 2015 +0200 gdiplus: The result of a comparison is already a BOOL. --- dlls/gdiplus/image.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index de03096..cda6a51 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3918,8 +3918,7 @@ static GpStatus decode_image_gif(IStream* stream, GpImage **image) if(FAILED(hr)) return hresult_to_status(hr); - status = decode_frame_wic(decoder, frame_count>1 ? TRUE : FALSE, - 0, gif_metadata_reader, image); + status = decode_frame_wic(decoder, frame_count > 1, 0, gif_metadata_reader, image); IWICBitmapDecoder_Release(decoder); if(status != Ok) return status;

1 0

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

April 1, 2015

Module: wine Branch: master Commit: 325672f5e64ac05d97bc2181b22aad6ee02bdcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325672f5e64ac05d97bc2181b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:06:48 2015 +0200 wbemprox: Mark internal symbols with hidden visibility. --- dlls/wbemprox/wbemprox_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index daf8611..ba25a02 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -20,8 +20,8 @@ #include "wine/list.h" #include "wine/unicode.h" -IClientSecurity client_security; -struct list *table_list; +IClientSecurity client_security DECLSPEC_HIDDEN; +struct list *table_list DECLSPEC_HIDDEN; #define SIZEOF(array) (sizeof(array)/sizeof((array)[0]))

1 0

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

April 1, 2015

Module: wine Branch: master Commit: 06fd20a7222f23b0d4f006430e7abd41c6f7e70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06fd20a7222f23b0d4f006430… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:06:31 2015 +0200 sxs: Mark internal symbols with hidden visibility. --- dlls/sxs/sxs_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h index 8ff9920..590e4e4 100644 --- a/dlls/sxs/sxs_private.h +++ b/dlls/sxs/sxs_private.h @@ -25,7 +25,7 @@ enum name_attr_id NAME_ATTR_ID_VERSION }; -const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ); +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ) DECLSPEC_HIDDEN; static inline WCHAR *strdupW( const WCHAR *src ) {

1 0

Francois Gouget : wininet: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: a1e90facf810eb31a5588d5dcdc0db8c2f68788a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e90facf810eb31a5588d5dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:05:43 2015 +0200 wininet: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/wininet/urlcache.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c5755fe..276132b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,7 +23,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ws2tcpip.h"

1 0

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

April 1, 2015

Module: wine Branch: master Commit: 1d7f2c318aadfd4bbc40b0e0189e736729e3544c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7f2c318aadfd4bbc40b0e01… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:06:16 2015 +0200 secur32: Mark internal symbols with hidden visibility. --- dlls/secur32/secur32_priv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index ea1fcfb..9985cac 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -204,8 +204,8 @@ SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDE SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SecPkgInfoW *ntlm_package_infoW; -SecPkgInfoA *ntlm_package_infoA; +SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; +SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session;

1 0

Francois Gouget : explorer: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 801cf4c4af267884318eb0e881c8a2dbb36f538f URL: http://source.winehq.org/git/wine.git/?a=commit;h=801cf4c4af267884318eb0e88… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:06:04 2015 +0200 explorer: Remove an uneeded NONAMELESSUNION directive. --- programs/explorer/explorer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index a4f93bc..4f82ded 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -21,7 +21,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include "wine/unicode.h" #include "wine/debug.h"

1 0

Francois Gouget : winmm: Remove unneeded NONAMELESSSTRUCT directives.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: c1de3cc5d4ac6c5e00f303a7dc8472fc2774a373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1de3cc5d4ac6c5e00f303a7d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:05:54 2015 +0200 winmm: Remove unneeded NONAMELESSSTRUCT directives. --- dlls/winmm/lolvldrv.c | 2 +- dlls/winmm/winmm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index c3b3674..3f63e5f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -24,8 +24,8 @@ #include "wine/port.h" #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS + #include <string.h> #include <stdarg.h> #include <stdio.h> diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 13499ad..43f7268 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -44,7 +44,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "mmsystem.h"

1 0

Francois Gouget : winspool.drv: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: e54b62ae7c6640330b1c8a9a654ae927aff699dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54b62ae7c6640330b1c8a9a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:05:37 2015 +0200 winspool.drv: Remove unneeded NONAMELESSXXX directives. --- dlls/winspool.drv/info.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7653d2f..8cfedfb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -102,8 +102,6 @@ #undef DPRINTF #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/library.h" #include "windef.h" #include "winbase.h"

1 0

Michael Stefaniuc : winealsa.drv: The result of a comparison is already a BOOL.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 8fcfa67a56291691d4b5d7c65b0b98c17c1ff7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fcfa67a56291691d4b5d7c65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 1 09:52:54 2015 +0200 winealsa.drv: The result of a comparison is already a BOOL. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e32cb54..f0ce3a9 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1306,7 +1306,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, dump_fmt(fmt); - This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK ? TRUE : FALSE; + This->need_remapping = map_channels(This, fmt, &This->alsa_channels, This->alsa_channel_map) == S_OK; if((err = snd_pcm_hw_params_any(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to get hw_params: %d (%s)\n", err, snd_strerror(err));

1 0

Mark Harmstone : winecfg: Style updown control with UDS_ALIGNRIGHT.
by Alexandre Julliard April 1, 2015

April 1, 2015

Module: wine Branch: master Commit: 8fab1cdc74ad22600fb43d15afe3a174334d5e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fab1cdc74ad22600fb43d15a… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 31 22:34:29 2015 +0100 winecfg: Style updown control with UDS_ALIGNRIGHT. --- programs/winecfg/winecfg.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 6fc1c26..9b8791e 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -295,8 +295,8 @@ BEGIN LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,133,80,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,133,90,25,13,WS_DISABLED | BS_OWNERDRAW LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,164,80,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,164,90,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | WS_DISABLED,185,90,15,13 + EDITTEXT IDC_SYSPARAM_SIZE,164,90,33,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13 PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,200,90,45,13,WS_DISABLED GROUPBOX "Folders",IDC_STATIC,8,114,244,100 CONTROL "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT |

1 0

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

April 1, 2015

Module: wine Branch: master Commit: 30206d9f634025b444ee9ee2027e9ec0ec028ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30206d9f634025b444ee9ee20… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:06:43 2015 +0200 user32: Mark internal symbols with hidden visibility. --- dlls/user32/controls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a5a6adc..69bc94c 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -81,8 +81,8 @@ extern const struct builtin_class_descr SCROLL_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr STATIC_builtin_class DECLSPEC_HIDDEN; extern const struct builtin_class_descr IME_builtin_class DECLSPEC_HIDDEN; -extern LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM); -extern LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM); +extern LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; +extern LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI DesktopWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI IconTitleWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI PopupMenuWndProc(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN;

1 0