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

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