December 2007 - Wine-Commits

Rob Shearman : rpcrt4: Fix NdrConformantStringUnmarshall to use buffer memory if possible.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 259879d1f518056d1eb7fb8f2fde7990ba5ac72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=259879d1f518056d1eb7fb8f2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 15 13:57:21 2007 +0000 rpcrt4: Fix NdrConformantStringUnmarshall to use buffer memory if possible. --- dlls/rpcrt4/ndr_marshall.c | 25 ++++++++++++++++++++++++- dlls/rpcrt4/tests/ndr_marshall.c | 5 +---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index bd184e2..2de650d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -826,6 +826,20 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg ReadConformance(pStubMsg, NULL); ReadVariance(pStubMsg, NULL, pStubMsg->MaxCount); + if (pFormat[1] != RPC_FC_STRING_SIZED && (pStubMsg->MaxCount != pStubMsg->ActualCount)) + { + ERR("buffer size %d must equal memory size %ld for non-sized conformant strings\n", + pStubMsg->ActualCount, pStubMsg->MaxCount); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + if (pStubMsg->Offset) + { + ERR("conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + if (*pFormat == RPC_FC_C_CSTRING) esize = 1; else if (*pFormat == RPC_FC_C_WSTRING) esize = 2; else { @@ -864,8 +878,17 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg return NULL; } - if (fMustAlloc || !*ppMemory) + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, memsize); + else + { + if (!pStubMsg->IsClient && !*ppMemory && (pStubMsg->MaxCount == pStubMsg->ActualCount)) + /* if the data in the RPC buffer is big enough, we just point straight + * into it */ + *ppMemory = pStubMsg->Buffer; + else if (!*ppMemory) + *ppMemory = NdrAllocate(pStubMsg, memsize); + } safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ba5243b..d930701 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1207,10 +1207,9 @@ todo_wine { mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); -todo_wine { ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); -} + my_alloc_called = 0; mem = NULL; StubMsg.Buffer = StubMsg.BufferStart; @@ -1224,10 +1223,8 @@ todo_wine { mem = mem_orig; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); -todo_wine { ok(mem == StubMsg.BufferStart + 12, "mem not pointing at buffer\n"); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); -} my_alloc_called = 0; mem = mem_orig;

1 0

Rob Shearman : rpcrt4: Clear padding inserted into the buffer during marshalling because of alignment .
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 68432dd3398e8a6aa83793beaae5456b9a5bf011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68432dd3398e8a6aa83793bea… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 14 19:55:04 2007 +0000 rpcrt4: Clear padding inserted into the buffer during marshalling because of alignment. --- dlls/rpcrt4/ndr_marshall.c | 58 ++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68432dd3398e8a6aa8379…

1 0

Rob Shearman : rpcrt4: Add a FIXME for RPC_FC_P_ALLOCALLNODES in PointerUnmarshall.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: b300189c434ada46dae90f09520b77d262be3480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b300189c434ada46dae90f095… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 15 13:57:06 2007 +0000 rpcrt4: Add a FIXME for RPC_FC_P_ALLOCALLNODES in PointerUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 7b50b47..bd184e2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1096,6 +1096,9 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } } + if (attr & RPC_FC_P_ALLOCALLNODES) + FIXME("RPC_FC_P_ALLOCALLNODES not implemented\n"); + if (attr & RPC_FC_P_DEREF) { if (fMustAlloc) { base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *));

1 0

Rob Shearman : include: Add definitions for RPC_FC_SSTRING and RPC_FC_C_SSTRING.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: f8582a5310e906d156928147ed37f1b6473c2d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8582a5310e906d156928147e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 15 13:57:46 2007 +0000 include: Add definitions for RPC_FC_SSTRING and RPC_FC_C_SSTRING. --- include/wine/rpcfc.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index fb479dd..4242c94 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -60,8 +60,10 @@ #define RPC_FC_BOGUS_ARRAY 0x21 /* complex array */ #define RPC_FC_C_CSTRING 0x22 +#define RPC_FC_C_SSTRING 0x24 #define RPC_FC_C_WSTRING 0x25 #define RPC_FC_CSTRING 0x26 +#define RPC_FC_SSTRING 0x28 #define RPC_FC_WSTRING 0x29 #define RPC_FC_ENCAPSULATED_UNION 0x2a

1 0

Rob Shearman : widl: Only base types or reference pointers to base types don't need to be freed .
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: b81f4c24db5b49ee775c9585db370168b8d2506f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81f4c24db5b49ee775c9585d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 15 13:58:17 2007 +0000 widl: Only base types or reference pointers to base types don't need to be freed. There are other cases where calls to Free functions can be omitted (such as types always unmarshalled using buffer memory with no embedded pointers), but these are easier dealt with inside the relevent case in write_remoting_arg. --- tools/widl/typegen.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3aea62e..d542163 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2595,17 +2595,9 @@ static inline int is_size_needed_for_phase(enum remoting_phase phase) return (phase != PHASE_UNMARSHAL); } -static int needs_freeing(const attr_list_t *attrs, const type_t *t, int out) +static int needs_freeing(const type_t *t) { - return - (is_user_type(t) - || (is_ptr(t) - && (t->ref->type == RPC_FC_IP - || (is_struct(t->ref->type) && t->ref->type != RPC_FC_STRUCT) - || is_ptr(t->ref) - || is_user_type(t->ref)))) - || (out && is_string_type(attrs, t)) - || is_array(t); + return !is_base_type(t->type) && (t->type != RPC_FC_RP || !is_base_type(t->ref->type)); } expr_t *get_size_is_expr(const type_t *t, const char *name) @@ -2646,7 +2638,7 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (phase == PHASE_FREE) { - if (!needs_freeing(var->attrs, type, out_attr)) + if (!needs_freeing(type)) return; } else

1 0

Rob Shearman : widl: Return types shouldn't be freed.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 45d6a959fbc449443d734ff2cf4acbebfd3e05d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d6a959fbc449443d734ff2c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 15 13:57:33 2007 +0000 widl: Return types shouldn't be freed. --- tools/widl/server.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index e2c3ac9..3bcd231 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -236,9 +236,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) write_remoting_arguments(server, indent, func, PASS_OUT, PHASE_FREE); - if (!is_void(def->type)) - write_remoting_arguments(server, indent, func, PASS_RETURN, PHASE_FREE); - indent--; print_server("}\n"); print_server("RpcEndFinally\n");

1 0

Rob Shearman : widl: Clear padding in the buffer due to alignment.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 32cf944e9cf136254b0ac19914e3bf52ad13f193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32cf944e9cf136254b0ac1991… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 14 19:54:25 2007 +0000 widl: Clear padding in the buffer due to alignment. --- tools/widl/typegen.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6dbbf7f..3aea62e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2553,6 +2553,7 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, size = 0; } + print_file(file, indent, "memset(_StubMsg.Buffer, 0, ((long)_StubMsg.Buffer) & 0x%x);\n", alignment - 1); print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1);

1 0

Alexandre Julliard : oleaut32/tests: Avoid relying on system-dependent rounding.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 56d8f51688f68114f2686122fe2ea818ced5e7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d8f51688f68114f2686122f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 11:56:41 2007 +0100 oleaut32/tests: Avoid relying on system-dependent rounding. --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index fd95361..d942f7d 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3104,8 +3104,8 @@ static void test_Round( int line, VARIANT *arg, int deci, VARIANT *expected ) static void test_VarRound(void) { - static WCHAR szNumMin[] = {'-','1','.','4','5','\0' }; - static WCHAR szNum[] = {'1','.','4','5','\0' }; + static WCHAR szNumMin[] = {'-','1','.','4','4','9','\0' }; + static WCHAR szNum[] = {'1','.','4','5','1','\0' }; HRESULT hres; VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); @@ -3140,7 +3140,7 @@ static void test_VarRound(void) /* floating point numbers aren't exactly equal and we can't just * compare the first few digits. */ VARROUND(DATE,1.451,1,DATE,1.5); - VARROUND(DATE,-1.45,1,DATE,-1.4); + VARROUND(DATE,-1.449,1,DATE,-1.4); /* replace the decimal separator */ GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, sizeof(buff)/sizeof(char)); @@ -3148,7 +3148,7 @@ static void test_VarRound(void) szNumMin[2] = buff[0]; szNum[1] = buff[0]; VARROUND(BSTR,(BSTR)szNumMin,1,R8,-1.40); - if (0) { VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } + VARROUND(BSTR,(BSTR)szNum,1,R8,1.50); } else { skip("Skipping VarRound(BSTR) as decimal separator is '%s'\n", buff); }

1 0

Alexandre Julliard : Revert "user32: Moved some 16-bit functions."
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 61bace5ba98cdb1178e713a8a3e9a2c169089c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61bace5ba98cdb1178e713a8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 17 11:56:05 2007 +0100 Revert "user32: Moved some 16-bit functions." This partially reverts commit 6e9fea22f82fe60624e1081d74ad990a5c428eed. 16-bit and 32-bit clipboard handles aren't interchangeable. --- dlls/user32/clipboard.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user16.c | 18 ---------------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 59d93ab..137ace9 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -486,6 +486,35 @@ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext) /************************************************************************** + * SetClipboardData (USER.141) + */ +HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData) +{ + CLIPBOARDINFO cbinfo; + HANDLE16 hResult = 0; + + TRACE("(%04X, %04x) !\n", wFormat, hData); + + /* If it's not owned, data can only be set if the format doesn't exists + and its rendering is not delayed */ + if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || + (!(cbinfo.flags & CB_OWNER) && !hData)) + { + WARN("Clipboard not owned by calling task. Operation failed.\n"); + return 0; + } + + if (USER_Driver->pSetClipboardData(wFormat, hData, 0, cbinfo.flags & CB_OWNER)) + { + hResult = hData; + bCBHasChanged = TRUE; + } + + return hResult; +} + + +/************************************************************************** * SetClipboardData (USER32.@) */ HANDLE WINAPI SetClipboardData(UINT wFormat, HANDLE hData) @@ -557,6 +586,28 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat) /************************************************************************** + * GetClipboardData (USER.142) + */ +HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat) +{ + HANDLE16 hData = 0; + CLIPBOARDINFO cbinfo; + + if (!CLIPBOARD_GetClipboardInfo(&cbinfo) || + (~cbinfo.flags & CB_OPEN)) + { + WARN("Clipboard not opened by calling task.\n"); + SetLastError(ERROR_CLIPBOARD_NOT_OPEN); + return 0; + } + + if (!USER_Driver->pGetClipboardData(wFormat, &hData, NULL)) hData = 0; + + return hData; +} + + +/************************************************************************** * GetClipboardData (USER32.@) */ HANDLE WINAPI GetClipboardData(UINT wFormat) diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index b8951f2..b55c8ed 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -447,24 +447,6 @@ BOOL16 WINAPI EmptyClipboard16(void) /************************************************************************** - * SetClipboardData (USER.141) - */ -HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData) -{ - return HANDLE_16(SetClipboardData(wFormat, HANDLE_32(hData))); -} - - -/************************************************************************** - * GetClipboardData (USER.142) - */ -HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat) -{ - return HANDLE_16(GetClipboardData(wFormat)); -} - - -/************************************************************************** * CountClipboardFormats (USER.143) */ INT16 WINAPI CountClipboardFormats16(void)

1 0

Andrey Turkin : server: I/ O completion ports can only be used with overlapped I/O.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: f1dcf4bf3aef126e0fadb192c091fd390dc6c4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dcf4bf3aef126e0fadb192c… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Dec 17 02:02:12 2007 +0300 server: I/O completion ports can only be used with overlapped I/O. --- dlls/ntdll/tests/file.c | 34 ++++++++++++++++++++++++++++------ server/fd.c | 2 +- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 846448e..4e1833c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -498,17 +498,39 @@ static void test_iocp_fileio(HANDLE h) { static const char pipe_name[] = "\\\\.\\pipe\\iocompletiontestnamedpipe"; - HANDLE hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); - HANDLE hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); - ok( hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE, "Cannot create or connect to pipe\n" ); - if (hPipeSrv != INVALID_HANDLE_VALUE && hPipeClt != INVALID_HANDLE_VALUE) + IO_STATUS_BLOCK iosb; + FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND}; + HANDLE hPipeSrv, hPipeClt; + NTSTATUS res; + + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv != INVALID_HANDLE_VALUE ) + { + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_INVALID_PARAMETER, "Unexpected NtSetInformationFile on non-overlapped handle: %x\n", res ); + CloseHandle(hPipeClt); + } + CloseHandle( hPipeSrv ); + } + + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) { OVERLAPPED o = {0,}; BYTE buf[3]; DWORD read; long count; - FILE_COMPLETION_INFORMATION fci = {h, CKEY_SECOND}; - IO_STATUS_BLOCK iosb; NTSTATUS res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); diff --git a/server/fd.c b/server/fd.c index efa575d..95a0520 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2050,7 +2050,7 @@ DECL_HANDLER(set_completion_info) if (fd) { - if (!fd->completion) + if (!(fd->options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !fd->completion) { fd->completion = get_completion_obj( current->process, req->chandle, IO_COMPLETION_MODIFY_STATE ); fd->comp_key = req->ckey;

1 0