October 2011 - Wine-commits

Bernhard Loos : server: Correctly implement permission checking for named pipes.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 9034e694a36df25fadd654c29a13bdd1444bbd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9034e694a36df25fadd654c29… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Sep 29 11:20:50 2011 +0200 server: Correctly implement permission checking for named pipes. --- dlls/ntdll/tests/pipe.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 10 +++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 26c38b0..e7c49b8 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -172,6 +172,55 @@ static void test_create_invalid(void) CloseHandle(handle); } +static void test_create(void) +{ + HANDLE hserver; + NTSTATUS res; + int j, k; + FILE_PIPE_LOCAL_INFORMATION info; + IO_STATUS_BLOCK iosb; + + static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; + static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + + for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { + for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { + HANDLE hclient; + BOOL should_succeed = TRUE; + + res = create_pipe(&hserver, sharing[j], FILE_SYNCHRONOUS_IO_NONALERT); + if (res) { + ok(0, "NtCreateNamedPipeFile returned %x, sharing: %x\n", res, sharing[j]); + continue; + } + + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); + + hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); + if (hclient != INVALID_HANDLE_VALUE) { + res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", + res, access[k], sharing[j]); + CloseHandle(hclient); + } + + if (access[k] & GENERIC_WRITE) + should_succeed &= !!(sharing[j] & FILE_SHARE_WRITE); + if (access[k] & GENERIC_READ) + should_succeed &= !!(sharing[j] & FILE_SHARE_READ); + + if (should_succeed) + ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %x, access: %x, GetLastError: %d\n", + sharing[j], access[k], GetLastError()); + else + ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeded for sharing %x, access: %x\n", sharing[j], access[k]); + + CloseHandle(hserver); + } + } +} + static BOOL ioapc_called; static void CALLBACK ioapc(void *arg, PIO_STATUS_BLOCK io, ULONG reserved) { @@ -419,6 +468,9 @@ START_TEST(pipe) trace("starting invalid create tests\n"); test_create_invalid(); + trace("starting create tests\n"); + test_create(); + trace("starting overlapped tests\n"); test_overlapped(); diff --git a/server/named_pipe.c b/server/named_pipe.c index 750f3bc..d6c1383 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -804,6 +804,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc struct named_pipe *pipe = (struct named_pipe *)obj; struct pipe_server *server; struct pipe_client *client; + unsigned int pipe_sharing; int fds[2]; if (!(server = find_available_server( pipe ))) @@ -812,6 +813,15 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } + pipe_sharing = server->pipe->sharing; + if (((access & GENERIC_READ) && !(pipe_sharing & FILE_SHARE_READ)) || + ((access & GENERIC_WRITE) && !(pipe_sharing & FILE_SHARE_WRITE))) + { + set_error( STATUS_ACCESS_DENIED ); + release_object( server ); + return NULL; + } + if ((client = create_pipe_client( options ))) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds ))

1 0

Bernhard Loos : ntdll: Implement the NamedPipeConfiguration value for the FilePipeLocalInformation class of NtQueryInformationFile .
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 07b681e04a19d9e95c1039c0a791608ef5897617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b681e04a19d9e95c1039c0a… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Sep 29 11:21:14 2011 +0200 ntdll: Implement the NamedPipeConfiguration value for the FilePipeLocalInformation class of NtQueryInformationFile. --- dlls/ntdll/file.c | 13 ++++++++++++- dlls/ntdll/tests/pipe.c | 7 ++++++- include/wine/server_protocol.h | 4 ++-- server/named_pipe.c | 1 + server/protocol.def | 1 + server/request.h | 9 +++++---- server/trace.c | 1 + 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 278da5d..53984f9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1960,7 +1960,18 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, { pli->NamedPipeType = (reply->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) ? FILE_PIPE_TYPE_MESSAGE : FILE_PIPE_TYPE_BYTE; - pli->NamedPipeConfiguration = 0; /* FIXME */ + switch (reply->sharing) + { + case FILE_SHARE_READ: + pli->NamedPipeConfiguration = FILE_PIPE_OUTBOUND; + break; + case FILE_SHARE_WRITE: + pli->NamedPipeConfiguration = FILE_PIPE_INBOUND; + break; + case FILE_SHARE_READ | FILE_SHARE_WRITE: + pli->NamedPipeConfiguration = FILE_PIPE_FULL_DUPLEX; + break; + } pli->MaximumInstances = reply->maxinstances; pli->CurrentInstances = reply->instances; pli->InboundQuota = reply->insize; diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index e7c49b8..29bb6da 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -181,7 +181,8 @@ static void test_create(void) IO_STATUS_BLOCK iosb; static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; - static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + static const DWORD pipe_config[]= { 1, 0, 2 }; for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { @@ -196,12 +197,16 @@ static void test_create(void) res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); if (hclient != INVALID_HANDLE_VALUE) { res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", res, access[k], sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); CloseHandle(hclient); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9db7f78..e0b0ac8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3063,11 +3063,11 @@ struct get_named_pipe_info_reply { struct reply_header __header; unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int instances; unsigned int outsize; unsigned int insize; - char __pad_28[4]; }; @@ -5637,6 +5637,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 426 +#define SERVER_PROTOCOL_VERSION 427 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index d6c1383..d720b17 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1026,6 +1026,7 @@ DECL_HANDLER(get_named_pipe_info) } reply->flags = server->pipe->flags; + reply->sharing = server->pipe->sharing; reply->maxinstances = server->pipe->maxinstances; reply->instances = server->pipe->instances; reply->insize = server->pipe->insize; diff --git a/server/protocol.def b/server/protocol.def index 71524a4..bec2e3c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2208,6 +2208,7 @@ enum message_type obj_handle_t handle; @REPLY unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int instances; unsigned int outsize; diff --git a/server/request.h b/server/request.h index 2d4528a..b875e30 100644 --- a/server/request.h +++ b/server/request.h @@ -1489,10 +1489,11 @@ C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_named_pipe_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, flags) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, maxinstances) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, instances) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, outsize) == 20 ); -C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, insize) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, sharing) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, maxinstances) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, instances) == 20 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, outsize) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_reply, insize) == 28 ); C_ASSERT( sizeof(struct get_named_pipe_info_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_window_request, owner) == 16 ); diff --git a/server/trace.c b/server/trace.c index 670958a..188eee4 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2629,6 +2629,7 @@ static void dump_get_named_pipe_info_request( const struct get_named_pipe_info_r static void dump_get_named_pipe_info_reply( const struct get_named_pipe_info_reply *req ) { fprintf( stderr, " flags=%08x", req->flags ); + fprintf( stderr, ", sharing=%08x", req->sharing ); fprintf( stderr, ", maxinstances=%08x", req->maxinstances ); fprintf( stderr, ", instances=%08x", req->instances ); fprintf( stderr, ", outsize=%08x", req->outsize );

1 0

Louis Lenders : wine.inf: Add key for InstallDate under CurrentVersionNT.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 6b164a52e23d0ec91ff6fb741cb0b97fc06c20df URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b164a52e23d0ec91ff6fb741… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 6 21:46:35 2011 +0200 wine.inf: Add key for InstallDate under CurrentVersionNT. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e317a0d..a84b73e 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -468,6 +468,7 @@ HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Run,,16 +HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%"

1 0

Michael Stefaniuc : oleaut32: Fix some VarCyFrom* tests.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 38794b4ba0c73cbedbc5bba2d7ace58afdab835a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38794b4ba0c73cbedbc5bba2d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:36:57 2011 +0200 oleaut32: Fix some VarCyFrom* tests. Due to a broken EXPECTRES macro the EXPECT_OVERFLOW accepts S_OK return values. --- dlls/oleaut32/tests/vartype.c | 8 ++++++-- dlls/oleaut32/vartype.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b4f0731..e46a9b6 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3720,7 +3720,9 @@ static void test_VarCyFromUI8(void) CONVERT(VarCyFromUI8, 0); EXPECTCY(0); CONVERT(VarCyFromUI8, 1); EXPECTCY(1); CONVERT_I8(VarCyFromUI8, 214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_I8(VarCyFromUI8, 214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_I8(VarCyFromUI8, 214749, 1566804068); EXPECT_OVERFLOW; } static void test_VarCyFromDec(void) @@ -3736,7 +3738,9 @@ static void test_VarCyFromDec(void) CONVERT_DEC(VarCyFromDec,0,0,0,1); EXPECTCY(1); CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804068); EXPECTCY64(2147483647ul, 4294951488ul); - CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804069); EXPECTCY64(2147483647ul, 4294961488ul); + CONVERT_DEC64(VarCyFromDec,0,0,0,214748, 1566804070); EXPECT_OVERFLOW; + CONVERT_DEC64(VarCyFromDec,0,0,0,214749, 1566804068); EXPECT_OVERFLOW; CONVERT_DEC(VarCyFromDec,2,0,0,100); EXPECTCY(1); CONVERT_DEC(VarCyFromDec,2,0x80,0,100); EXPECTCY(-1); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 3dd65d8..2ab5438 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3764,7 +3764,7 @@ HRESULT WINAPI VarCyFromI8(LONG64 llIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) { - if (ullIn >= (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; + if (ullIn > (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; pCyOut->int64 = ullIn * CY_MULTIPLIER; return S_OK; }

1 0

Michael Stefaniuc : oleaut32/tests: Make the EXPECT_* macros that take no args more robust.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: ef0a5a30c5d826af7698ad569c88be586bff7335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0a5a30c5d826af7698ad569… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:38:20 2011 +0200 oleaut32/tests: Make the EXPECT_* macros that take no args more robust. --- dlls/oleaut32/tests/vartype.c | 68 ++++++++++++++++++++++++++--------------- 1 files changed, 43 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index e46a9b6..354e159 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -72,17 +72,19 @@ static HMODULE hOleaut32; /* Macros for converting and testing results */ #define CONVVARS(typ) HRESULT hres; CONV_TYPE out; typ in +#define _EXPECT_NO_OUT(res) ok(hres == res, "expected " #res ", got hres=0x%08x\n", hres) +#define EXPECT_OVERFLOW _EXPECT_NO_OUT(DISP_E_OVERFLOW) +#define EXPECT_MISMATCH _EXPECT_NO_OUT(DISP_E_TYPEMISMATCH) +#define EXPECT_BADVAR _EXPECT_NO_OUT(DISP_E_BADVARTYPE) +#define EXPECT_INVALID _EXPECT_NO_OUT(E_INVALIDARG) +#define EXPECT_LT _EXPECT_NO_OUT(VARCMP_LT) +#define EXPECT_GT _EXPECT_NO_OUT(VARCMP_GT) +#define EXPECT_EQ _EXPECT_NO_OUT(VARCMP_EQ) + #define _EXPECTRES(res, x, fs) \ ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) -#define EXPECT_OVERFLOW EXPECTRES(DISP_E_OVERFLOW, DISP_E_OVERFLOW) -#define EXPECT_MISMATCH EXPECTRES(DISP_E_TYPEMISMATCH,DISP_E_TYPEMISMATCH) -#define EXPECT_BADVAR EXPECTRES(DISP_E_BADVARTYPE, DISP_E_BADVARTYPE) -#define EXPECT_INVALID EXPECTRES(E_INVALIDARG, E_INVALIDARG) -#define EXPECT_LT EXPECTRES(VARCMP_LT, VARCMP_LT) -#define EXPECT_GT EXPECTRES(VARCMP_GT, VARCMP_GT) -#define EXPECT_EQ EXPECTRES(VARCMP_EQ, VARCMP_EQ) #define EXPECT_DBL(x) \ ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) @@ -151,8 +153,8 @@ static HMODULE hOleaut32; ok(hres == S_OK && V_VT(&vDst) == typ && (CONV_TYPE)res == in, \ "hres=0x%X, type=%d (should be %d(" #typ ")), value=%d (should be 1)\n", \ hres, V_VT(&vDst), typ, (int)res); -#define BADVAR(typ) CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_BADVAR -#define MISMATCH(typ) CHANGETYPEEX(typ); out = (CONV_TYPE)hres; EXPECT_MISMATCH +#define BADVAR(typ) CHANGETYPEEX(typ); EXPECT_BADVAR +#define MISMATCH(typ) CHANGETYPEEX(typ); EXPECT_MISMATCH #define INITIAL_TYPETEST(vt, val, fs) \ VariantInit(&vSrc); \ @@ -847,7 +849,8 @@ static void test_VarI1Copy(void) static void test_VarI1ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + signed char in; VARIANTARG vSrc, vDst; in = 1; @@ -1131,7 +1134,8 @@ static void test_VarUI1Copy(void) static void test_VarUI1ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + BYTE in; VARIANTARG vSrc, vDst; in = 1; @@ -1380,7 +1384,8 @@ static void test_VarI2Copy(void) static void test_VarI2ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + SHORT in; VARIANTARG vSrc, vDst; in = 1; @@ -1619,7 +1624,8 @@ static void test_VarUI2Copy(void) static void test_VarUI2ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + USHORT in; VARIANTARG vSrc, vDst; in = 1; @@ -1874,7 +1880,8 @@ static void test_VarI4Copy(void) static void test_VarI4ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + LONG in; VARIANTARG vSrc, vDst; in = 1; @@ -2108,7 +2115,8 @@ static void test_VarUI4Copy(void) static void test_VarUI4ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + ULONG in; VARIANTARG vSrc, vDst; in = 1; @@ -2385,7 +2393,8 @@ static void test_VarI8Copy(void) static void test_VarI8ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + LONG64 in; VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) @@ -2650,7 +2659,8 @@ static void test_VarUI8Copy(void) static void test_VarUI8ChangeTypeEx(void) { - CONVVARS(CONV_TYPE); + HRESULT hres; + ULONG64 in; VARIANTARG vSrc, vDst; if (!HAVE_OLEAUT32_I8) @@ -2858,7 +2868,8 @@ static void test_VarR4Copy(void) static void test_VarR4ChangeTypeEx(void) { #ifdef HAS_UINT64_TO_FLOAT - CONVVARS(CONV_TYPE); + HRESULT hres; + float in; VARIANTARG vSrc, vDst; in = 1.0f; @@ -3069,7 +3080,8 @@ static void test_VarR8Copy(void) static void test_VarR8ChangeTypeEx(void) { #ifdef HAS_UINT64_TO_FLOAT - CONVVARS(CONV_TYPE); + HRESULT hres; + double in; VARIANTARG vSrc, vDst; in = 1.0; @@ -3488,7 +3500,8 @@ static void test_VarDateChangeTypeEx(void) '1','/','2','/','7','0','\0' }; static const WCHAR sz25570Nls[] = { '1','/','2','/','1','9','7','0',' ','1','2',':','0','0',':','0','0',' ','A','M','\0' }; - CONVVARS(CONV_TYPE); + HRESULT hres; + DATE in; VARIANTARG vSrc, vDst; LCID lcid; @@ -3897,11 +3910,13 @@ static void test_VarCyMulI8(void) } #define MATHCMP(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); pVarCyFromR8(right, &cyRight); \ - hres = pVarCyCmp(cyLeft, cyRight); out.int64 = hres + hres = pVarCyCmp(cyLeft, cyRight) static void test_VarCyCmp(void) { - MATHVARS2; + HRESULT hres; + double left = 0.0, right = 0.0; + CY cyLeft, cyRight; CHECKPTR(VarCyCmp); MATHCMP(-1.0, -1.0); EXPECT_EQ; @@ -3918,11 +3933,13 @@ static void test_VarCyCmp(void) } #define MATHCMPR8(l, r) left = l; right = r; pVarCyFromR8(left, &cyLeft); \ - hres = pVarCyCmpR8(cyLeft, right); out.int64 = hres + hres = pVarCyCmpR8(cyLeft, right); static void test_VarCyCmpR8(void) { - MATHVARS1; + HRESULT hres; + double left = 0.0; + CY cyLeft; double right; CHECKPTR(VarCyCmpR8); @@ -4819,7 +4836,8 @@ static void test_VarBoolChangeTypeEx(void) static const WCHAR szTrue[] = { 'T','r','u','e','\0' }; static const WCHAR szFalse[] = { 'F','a','l','s','e','\0' }; static const WCHAR szFaux[] = { 'F','a','u','x','\0' }; - CONVVARS(CONV_TYPE); + HRESULT hres; + VARIANT_BOOL in; VARIANTARG vSrc, vDst; LCID lcid;

1 0

Michael Stefaniuc : oleaut32/tests: Cleanup the EXPECTRES macros.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 42ac8afe9a75432d9cfb56ee69cbd7a4cc854010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ac8afe9a75432d9cfb56ee6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:39:36 2011 +0200 oleaut32/tests: Cleanup the EXPECTRES macros. --- dlls/oleaut32/tests/vartype.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 354e159..1ceb436 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -82,8 +82,7 @@ static HMODULE hOleaut32; #define EXPECT_EQ _EXPECT_NO_OUT(VARCMP_EQ) #define _EXPECTRES(res, x, fs) \ - ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) + ok(hres == S_OK && out == (CONV_TYPE)(x), "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #define EXPECT(x) EXPECTRES(S_OK, (x)) #define EXPECT_DBL(x) \ ok(hres == S_OK && fabs(out-(x))<=1e-14*(x), "expected %16.16g, got %16.16g; hres=0x%08x\n", (x), out, hres) @@ -1151,8 +1150,6 @@ static void test_VarUI1ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE SHORT -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") static void test_VarI2FromI1(void) { @@ -1644,9 +1641,6 @@ static void test_VarUI2ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") - static void test_VarI4FromI1(void) { @@ -2135,10 +2129,6 @@ static void test_VarUI4ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE LONG64 -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTI8(x) \ ok((hres == S_OK && out == (CONV_TYPE)(x)), \ @@ -2544,7 +2534,10 @@ static void test_VarUI8FromBool(void) int i; CHECKPTR(VarUI8FromBool); - CONVERTRANGE(VarUI8FromBool, -32768, 32768); + for (i = -32768; i < 32768; i++) + { + CONVERT(VarUI8FromBool, i); EXPECTI8(i); + } } static void test_VarUI8FromI8(void) @@ -2885,8 +2878,6 @@ static void test_VarR4ChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE double -#undef EXPECTRES -#define EXPECTRES(res, x) _EXPECTRES(res, x, "%15.15f") static void test_VarR8FromI1(void) { @@ -3541,10 +3532,6 @@ static void test_VarDateChangeTypeEx(void) #undef CONV_TYPE #define CONV_TYPE CY -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTCY(x) \ ok((hres == S_OK && out.int64 == (LONGLONG)(x*CY_MULTIPLIER)), \ @@ -4048,10 +4035,6 @@ static void test_VarCyInt(void) #undef CONV_TYPE #define CONV_TYPE DECIMAL -#undef EXPECTRES -#define EXPECTRES(res, x) \ - ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected hres " #x ", got hres=0x%08x\n", hres) #define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \ S(U(out)).scale == (BYTE)(scl) && S(U(out)).sign == (BYTE)(sgn) && \ @@ -4576,10 +4559,6 @@ static void test_VarDecCmp(void) #undef CONV_TYPE #define CONV_TYPE VARIANT_BOOL -#undef _EXPECTRES -#define _EXPECTRES(res, x, fs) \ - ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \ - "expected " #x ", got " fs "; hres=0x%08x\n", out, hres) #undef EXPECTRES #define EXPECTRES(res, x) _EXPECTRES(res, x, "%d") #undef CONVERTRANGE

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in winerror.h.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: 0324fc57469f402102b677c4e3c2a06701965235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0324fc57469f402102b677c4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 01:44:03 2011 +0200 include: Remove 'l' modifier from numeric constants in winerror.h. --- include/winerror.h | 1766 ++++++++++++++++++++++++++-------------------------- 1 files changed, 883 insertions(+), 883 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0324fc57469f402102b67…

1 0

Michael Stefaniuc : quartz: Free two assert calls from having side effects.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: a948e5e4749b1ab12df5ff99a59d0d9d8d6a7c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a948e5e4749b1ab12df5ff99a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 13:26:51 2011 +0200 quartz: Free two assert calls from having side effects. --- dlls/quartz/mpegsplit.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 059a854..68348a3 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -182,7 +182,8 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) IMediaSample_GetPointer(pCurrentSample, &fbuf); /* Find the next valid header.. it <SHOULD> be right here */ - assert(parse_header(fbuf, &length, &This->position) == S_OK); + hr = parse_header(fbuf, &length, &This->position); + assert(hr == S_OK); IMediaSample_SetActualDataLength(pCurrentSample, length); /* Queue the next sample */ @@ -739,7 +740,9 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) IMediaSample *sample; TRACE("Seeking? %d\n", This->seek); - assert(parse_header(This->header, &length, NULL) == S_OK); + + hr = parse_header(This->header, &length, NULL); + assert(hr == S_OK); if (pin->rtCurrent >= pin->rtStop) {

1 0

Michael Stefaniuc : dsound: COM cleanup for the IDirectSoundCapture iface.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: f0a3a09d0e4d67818290c17f23d48529b2784c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a3a09d0e4d67818290c17f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 7 13:28:54 2011 +0200 dsound: COM cleanup for the IDirectSoundCapture iface. --- dlls/dsound/capture.c | 90 ++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 50 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 61a8228..77dffe6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1065,24 +1065,23 @@ static HRESULT DirectSoundCaptureDevice_Initialize( */ struct IDirectSoundCaptureImpl { - /* IUnknown fields */ - const IDirectSoundCaptureVtbl *lpVtbl; - LONG ref; - - DirectSoundCaptureDevice *device; + IDirectSoundCapture IDirectSoundCapture_iface; + LONG ref; + DirectSoundCaptureDevice *device; }; +static inline struct IDirectSoundCaptureImpl *impl_from_IDirectSoundCapture(IDirectSoundCapture *iface) +{ + return CONTAINING_RECORD(iface, struct IDirectSoundCaptureImpl, IDirectSoundCapture_iface); +} + /*************************************************************************** * IDirectSoundCaptureImpl */ -static HRESULT WINAPI -IDirectSoundCaptureImpl_QueryInterface( - LPDIRECTSOUNDCAPTURE iface, - REFIID riid, - LPVOID* ppobj ) +static HRESULT WINAPI IDirectSoundCaptureImpl_QueryInterface(IDirectSoundCapture *iface, + REFIID riid, void **ppobj) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; - TRACE( "(%p,%s,%p)\n", This, debugstr_guid(riid), ppobj ); + TRACE( "(%p,%s,%p)\n", iface, debugstr_guid(riid), ppobj ); if (ppobj == NULL) { WARN("invalid parameter\n"); @@ -1091,34 +1090,30 @@ IDirectSoundCaptureImpl_QueryInterface( *ppobj = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) { - IDirectSoundCapture_AddRef((LPDIRECTSOUNDCAPTURE)This); - *ppobj = This; - return DS_OK; - } else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { - IDirectSoundCapture_AddRef((LPDIRECTSOUNDCAPTURE)This); - *ppobj = This; - return DS_OK; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectSoundCapture)) { + IDirectSoundCapture_AddRef(iface); + *ppobj = iface; + return S_OK; } WARN("unsupported riid: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } -static ULONG WINAPI -IDirectSoundCaptureImpl_AddRef( LPDIRECTSOUNDCAPTURE iface ) +static ULONG WINAPI IDirectSoundCaptureImpl_AddRef(IDirectSoundCapture *iface) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedIncrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref - 1); return ref; } -static ULONG WINAPI -IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) +static ULONG WINAPI IDirectSoundCaptureImpl_Release(IDirectSoundCapture *iface) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { @@ -1131,14 +1126,12 @@ IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) return ref; } -static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk ) +static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCapture *iface, + LPCDSCBUFFERDESC lpcDSCBufferDesc, IDirectSoundCaptureBuffer **lplpDSCaptureBuffer, + IUnknown *pUnk) { + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); HRESULT hr; - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); @@ -1172,11 +1165,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( return hr; } -static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps ) +static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps(IDirectSoundCapture *iface, + LPDSCCAPS lpDSCCaps) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%p)\n",This,lpDSCCaps); if (This->device == NULL) { @@ -1204,11 +1197,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( return DS_OK; } -static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID ) +static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize(IDirectSoundCapture *iface, + LPCGUID lpcGUID) { - IDirectSoundCaptureImpl *This = (IDirectSoundCaptureImpl *)iface; + IDirectSoundCaptureImpl *This = impl_from_IDirectSoundCapture(iface); + TRACE("(%p,%s)\n", This, debugstr_guid(lpcGUID)); if (This->device != NULL) { @@ -1245,7 +1238,7 @@ static HRESULT IDirectSoundCaptureImpl_Create( return DSERR_OUTOFMEMORY; } - pDSC->lpVtbl = &dscvt; + pDSC->IDirectSoundCapture_iface.lpVtbl = &dscvt; pDSC->ref = 0; pDSC->device = NULL; @@ -1254,11 +1247,9 @@ static HRESULT IDirectSoundCaptureImpl_Create( return DS_OK; } -HRESULT DSOUND_CaptureCreate( - REFIID riid, - LPDIRECTSOUNDCAPTURE *ppDSC) +HRESULT DSOUND_CaptureCreate(REFIID riid, IDirectSoundCapture **ppDSC) { - LPDIRECTSOUNDCAPTURE pDSC; + IDirectSoundCapture *pDSC; HRESULT hr; TRACE("(%s, %p)\n", debugstr_guid(riid), ppDSC); @@ -1334,13 +1325,12 @@ HRESULT DSOUND_CaptureCreate8( * * DSERR_ALLOCATED is returned for sound devices that do not support full duplex. */ -HRESULT WINAPI DirectSoundCaptureCreate( - LPCGUID lpcGUID, - LPDIRECTSOUNDCAPTURE *ppDSC, - LPUNKNOWN pUnkOuter) +HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **ppDSC, + IUnknown *pUnkOuter) { HRESULT hr; - LPDIRECTSOUNDCAPTURE pDSC; + IDirectSoundCapture *pDSC; + TRACE("(%s,%p,%p)\n", debugstr_guid(lpcGUID), ppDSC, pUnkOuter); if (ppDSC == NULL) {

1 0

Hans Leidekker : mspatcha: Add a stub implementation of GetFilePatchSignatureA/W.
by Alexandre Julliard 08 Oct '11

08 Oct '11

Module: wine Branch: master Commit: bf4456df60cc417e8902a110aedb07027eb2b9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4456df60cc417e8902a110a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 7 11:07:11 2011 +0200 mspatcha: Add a stub implementation of GetFilePatchSignatureA/W. --- dlls/mspatcha/mspatcha.spec | 4 ++-- dlls/mspatcha/mspatcha_main.c | 28 +++++++++++++++++++++++++++- include/patchapi.h | 13 +++++++++++++ 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec index 40feedf..cc8ca94 100644 --- a/dlls/mspatcha/mspatcha.spec +++ b/dlls/mspatcha/mspatcha.spec @@ -4,9 +4,9 @@ 4 stub ApplyPatchToFileExA 5 stub ApplyPatchToFileExW 6 stdcall ApplyPatchToFileW(wstr wstr wstr long) -7 stub GetFilePatchSignatureA +7 stdcall GetFilePatchSignatureA(str long ptr long ptr long ptr long ptr) 8 stub GetFilePatchSignatureByHandle -9 stub GetFilePatchSignatureW +9 stdcall GetFilePatchSignatureW(wstr long ptr long ptr long ptr long ptr) 10 stub TestApplyPatchToFileA 11 stub TestApplyPatchToFileByHandles 12 stub TestApplyPatchToFileW diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index ed763c9..fcce619 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -64,7 +64,7 @@ static inline WCHAR *strdupAW( const char *src ) } /***************************************************** - * ApplyPatchToFileA (MSPATCHA.6) + * ApplyPatchToFileA (MSPATCHA.1) */ BOOL WINAPI ApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_file, ULONG apply_flags) { @@ -101,3 +101,29 @@ BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************** + * GetFilePatchSignatureA (MSPATCHA.7) + */ +BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureW (MSPATCHA.9) + */ +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/include/patchapi.h b/include/patchapi.h index 44a4a15..9a62a0f 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -28,6 +28,19 @@ extern "C" { #define APPLY_OPTION_TEST_ONLY 0x00000004 #define APPLY_OPTION_VALID_FLAGS 0x00000007 +typedef struct _PATCH_IGNORE_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; +} PATCH_IGNORE_RANGE, *PPATCH_IGNORE_RANGE; + +typedef struct _PATCH_RETAIN_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; + ULONG OffsetInNewFile; +} PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; + BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile)

1 0