March 2009 - Wine-commits - list.winehq.org

Hans Leidekker : msvcrt: Implement _vscprintf and _vscwprintf.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 0803575fd310cb16a146f8723aaad5f0131271a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0803575fd310cb16a146f8723… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 26 12:45:59 2009 +0100 msvcrt: Implement _vscprintf and _vscwprintf. --- dlls/msvcrt/msvcrt.spec | 2 ++ dlls/msvcrt/wcs.c | 32 ++++++++++++++++++++++++-------- include/msvcrt/stdio.h | 2 ++ include/msvcrt/wchar.h | 1 + 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1a9bc12..145b2b0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,6 +508,8 @@ @ cdecl _unloaddll(long) @ cdecl _unlock(long) @ cdecl _utime(str ptr) +@ cdecl _vscprintf(str ptr) +@ cdecl _vscwprintf(wstr ptr) @ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 37004cf..09c87dd 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -200,11 +200,11 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( space >= len ) { - memcpy( p, str, len*sizeof(WCHAR) ); + if (out->buf.W) memcpy( p, str, len*sizeof(WCHAR) ); out->used += len; return len; } - if( space > 0 ) + if( space > 0 && out->buf.W ) memcpy( p, str, space*sizeof(WCHAR) ); out->used += len; } @@ -215,11 +215,11 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( space >= n ) { - WideCharToMultiByte( CP_ACP, 0, str, len, p, n, NULL, NULL ); + if (out->buf.A) WideCharToMultiByte( CP_ACP, 0, str, len, p, n, NULL, NULL ); out->used += n; return len; } - if( space > 0 ) + if( space > 0 && out->buf.A ) WideCharToMultiByte( CP_ACP, 0, str, len, p, space, NULL, NULL ); out->used += n; } @@ -238,11 +238,11 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( space >= len ) { - memcpy( p, str, len ); + if (out->buf.A) memcpy( p, str, len ); out->used += len; return len; } - if( space > 0 ) + if( space > 0 && out->buf.A ) memcpy( p, str, space ); out->used += len; } @@ -253,11 +253,11 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( space >= n ) { - MultiByteToWideChar( CP_ACP, 0, str, len, p, n ); + if (out->buf.W) MultiByteToWideChar( CP_ACP, 0, str, len, p, n ); out->used += n; return len; } - if( space > 0 ) + if( space > 0 && out->buf.W ) MultiByteToWideChar( CP_ACP, 0, str, len, p, space ); out->used += n; } @@ -804,6 +804,14 @@ int CDECL MSVCRT_vsprintf( char *str, const char *format, __ms_va_list valist) } /********************************************************************* + * _vscprintf (MSVCRT.@) + */ +int CDECL _vscprintf( const char *format, __ms_va_list valist ) +{ + return MSVCRT_vsnprintf( NULL, INT_MAX, format, valist ); +} + +/********************************************************************* * _snprintf (MSVCRT.@) */ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) @@ -882,6 +890,14 @@ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, _ } /********************************************************************* + * _vscwprintf (MSVCRT.@) + */ +int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) +{ + return MSVCRT_vsnwprintf( NULL, INT_MAX, format, args ); +} + +/********************************************************************* * vswprintf_s (MSVCRT.@) */ int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, __ms_va_list args ) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b65a2b1..f2398b5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -115,6 +115,7 @@ int __cdecl _setmaxstdio(int); int __cdecl _snprintf(char*,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); +int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); void __cdecl clearerr(FILE*); @@ -166,6 +167,7 @@ wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); +int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 77bcc10..03d6107 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -275,6 +275,7 @@ wint_t __cdecl _fputwchar(wint_t); wchar_t* __cdecl _getws(wchar_t*); int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); +int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*);

1 0

Hans Leidekker : msvcrt: Add tests for _vscprintf and _vscwprintf.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: c3f6668f33b0e3437463b6d2a41c8ef1321e2540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f6668f33b0e3437463b6d2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 26 12:46:30 2009 +0100 msvcrt: Add tests for _vscprintf and _vscwprintf. --- dlls/msvcrt/tests/printf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d25734e..5f72b47 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -726,6 +726,48 @@ static void test_vsnwprintf(void) ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); } +static int (*p__vscprintf)(const char *format, __ms_va_list valist); +static int (*p__vscwprintf)(const wchar_t *format, __ms_va_list valist); + +static int __cdecl _vscprintf_wrapper(const char *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vscprintf(format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vscprintf(void) +{ + int ret; + + ret = _vscprintf_wrapper( "%s %d", "number", 1 ); + ok( ret == 8, "got %d expected 8\n", ret ); +} + +static int __cdecl _vscwprintf_wrapper(const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vscwprintf(format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vscwprintf(void) +{ + const wchar_t format[] = {'%','s',' ','%','d',0}; + const wchar_t number[] = {'n','u','m','b','e','r',0}; + + int ret; + + ret = _vscwprintf_wrapper( format, number, 1 ); + ok( ret == 8, "got %d expected 8\n", ret ); +} + START_TEST(printf) { test_sprintf(); @@ -733,4 +775,10 @@ START_TEST(printf) test_snprintf(); test_fcvt(); test_vsnwprintf(); + + p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf"); + p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf"); + + if (p__vscprintf) test_vscprintf(); + if (p__vscwprintf) test_vscwprintf(); }

1 0

Austin English : rpcrt4/test: Change a skip to win_skip.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: f8f4c4ef43e58e73b22924feaabe0150ab12964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f4c4ef43e58e73b22924fea… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 26 00:53:30 2009 -0500 rpcrt4/test: Change a skip to win_skip. --- dlls/rpcrt4/tests/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 725dbba..128391d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -335,7 +335,7 @@ static void test_towers(void) if (ret == RPC_S_INVALID_RPC_PROTSEQ) { /* Windows Vista fails with this error and crashes if we continue */ - skip("TowerConstruct failed, we are most likely on Windows Vista\n"); + win_skip("TowerConstruct failed, we are most likely on Windows Vista\n"); return; }

1 0

Paul Vriens : kernel32/tests: Fix crash on NT4 and higher.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 9e82e50eb3fc444062203ae4a167ffb574ba4239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e82e50eb3fc444062203ae4a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 25 17:14:25 2009 +0100 kernel32/tests: Fix crash on NT4 and higher. --- dlls/kernel32/tests/profile.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 7b57699..5651deb 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -860,13 +860,16 @@ static void test_WritePrivateProfileString(void) ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); - /* empty lpAppName */ + if (0) + { + /* empty lpAppName, crashes on NT4 and higher */ data = "[]\r\n" "key=string\r\n"; ret = WritePrivateProfileStringA("", "key", "string", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); + } /* NULL lpKeyName */ data = ""; @@ -878,7 +881,9 @@ static void test_WritePrivateProfileString(void) } DeleteFileA(path); - /* empty lpKeyName */ + if (0) + { + /* empty lpKeyName, crashes on NT4 and higher */ data = "[App]\r\n" "=string\r\n"; ret = WritePrivateProfileStringA("App", "", "string", path); @@ -888,6 +893,7 @@ static void test_WritePrivateProfileString(void) ok(check_file_data(path, data), "File doesn't match\n"); } DeleteFileA(path); + } /* NULL lpString */ data = ""; @@ -904,10 +910,7 @@ static void test_WritePrivateProfileString(void) "key=\r\n"; ret = WritePrivateProfileStringA("App", "key", "", path); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - todo_wine - { - ok(check_file_data(path, data), "File doesn't match\n"); - } + ok(check_file_data(path, data), "File doesn't match\n"); DeleteFileA(path); /* empty lpFileName */

1 0

Rob Shearman : rpcrt4: Allow listening on dynamically generated ncacn_ip_tcp endpoints.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: a42d4dbfb6dd6c6bb7c271692ad26a870df54be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42d4dbfb6dd6c6bb7c271692… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 26 13:35:43 2009 +0000 rpcrt4: Allow listening on dynamically generated ncacn_ip_tcp endpoints. --- dlls/rpcrt4/rpc_transport.c | 31 ++++++++++++++++++++++++++++--- dlls/rpcrt4/tests/rpc_protseq.c | 2 -- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e308564..b01228b 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -884,7 +884,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr hints.ai_canonname = NULL; hints.ai_next = NULL; - ret = getaddrinfo(NULL, endpoint, &hints, &ai); + ret = getaddrinfo(NULL, endpoint ? endpoint : "0", &hints, &ai); if (ret) { ERR("getaddrinfo for port %s failed: %s\n", endpoint, @@ -898,11 +898,13 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr { RpcConnection_tcp *tcpc; RPC_STATUS create_status; + struct sockaddr_storage sa; + socklen_t sa_len; + char service[NI_MAXSERV]; if (TRACE_ON(rpc)) { char host[256]; - char service[256]; getnameinfo(ai_cur->ai_addr, ai_cur->ai_addrlen, host, sizeof(host), service, sizeof(service), NI_NUMERICHOST | NI_NUMERICSERV); @@ -928,9 +930,28 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr status = RPC_S_CANT_CREATE_ENDPOINT; continue; } + + sa_len = sizeof(sa); + if (getsockname(sock, (struct sockaddr *)&sa, &sa_len)) + { + WARN("getsockname() failed: %s\n", strerror(errno)); + status = RPC_S_CANT_CREATE_ENDPOINT; + continue; + } + + ret = getnameinfo((struct sockaddr *)&sa, sa_len, + NULL, 0, service, sizeof(service), + NI_NUMERICSERV); + if (ret) + { + WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + status = RPC_S_CANT_CREATE_ENDPOINT; + continue; + } + create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL); + service, NULL, NULL, NULL); if (create_status != RPC_S_OK) { closesocket(sock); @@ -962,6 +983,10 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr tcpc->common.Next = first_connection; first_connection = &tcpc->common; + + /* since IPv4 and IPv6 share the same port space, we only need one + * successful bind to listen for both */ + break; } freeaddrinfo(ai); diff --git a/dlls/rpcrt4/tests/rpc_protseq.c b/dlls/rpcrt4/tests/rpc_protseq.c index a9b98a0..06a82ec 100644 --- a/dlls/rpcrt4/tests/rpc_protseq.c +++ b/dlls/rpcrt4/tests/rpc_protseq.c @@ -69,7 +69,6 @@ static void test_RpcServerUseProtseq(void) if (status == RPC_S_OK) endpoints_registered++; status = RpcServerUseProtseq(iptcp, 0, NULL); - todo_wine ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); if (status == RPC_S_OK) endpoints_registered++; @@ -101,7 +100,6 @@ static void test_RpcServerUseProtseq(void) ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); status = RpcServerUseProtseq(iptcp, 0, NULL); - todo_wine ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); status = RpcServerUseProtseq(ncalrpc, 0, NULL);

1 0

Rob Shearman : rpcrt4: Ensure that only the IP/ IPv6 address families are considered in rpcrt4_protseq_ncacn_ip_tcp_open_endpoint /rpcrt4_ncacn_ip_tcp_open.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 524a99a2da5f2d09689c7ddbacbb408a20d78cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=524a99a2da5f2d09689c7ddba… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 26 13:35:57 2009 +0000 rpcrt4: Ensure that only the IP/IPv6 address families are considered in rpcrt4_protseq_ncacn_ip_tcp_open_endpoint/rpcrt4_ncacn_ip_tcp_open. --- dlls/rpcrt4/rpc_transport.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index b01228b..39908bc 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -822,6 +822,12 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) { int val; + if (ai_cur->ai_family != AF_INET && ai_cur->ai_family != AF_INET6) + { + TRACE("skipping non-IP/IPv6 address family\n"); + continue; + } + if (TRACE_ON(rpc)) { char host[256]; @@ -902,6 +908,12 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr socklen_t sa_len; char service[NI_MAXSERV]; + if (ai_cur->ai_family != AF_INET && ai_cur->ai_family != AF_INET6) + { + TRACE("skipping non-IP/IPv6 address family\n"); + continue; + } + if (TRACE_ON(rpc)) { char host[256];

1 0

Huw Davies : ole32: OleFlushClipboard shouldn't call EmptyClipboard.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: b7a2e83ddb87fe71cb2691a4e8e2845e2de25bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a2e83ddb87fe71cb2691a4e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 13:38:18 2009 +0000 ole32: OleFlushClipboard shouldn't call EmptyClipboard. --- dlls/ole32/clipboard.c | 36 ++++-------------------------------- dlls/ole32/tests/clipboard.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 008e35b..34946ff 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1474,13 +1474,9 @@ HRESULT WINAPI OleFlushClipboard(void) FORMATETC rgelt; HRESULT hr = S_OK; BOOL bClipboardOpen = FALSE; - IDataObject* pIDataObjectSrc = NULL; TRACE("()\n"); - /* - * Make sure we have a clipboard object - */ OLEClipbrd_Initialize(); /* @@ -1489,30 +1485,14 @@ HRESULT WINAPI OleFlushClipboard(void) if (!theOleClipboard->pIDataObjectSrc) return S_OK; - /* - * Addref and save the source data object we are holding on to temporarily, - * since it will be released when we empty the clipboard. - */ - pIDataObjectSrc = theOleClipboard->pIDataObjectSrc; - IDataObject_AddRef(pIDataObjectSrc); - - /* - * Open the Windows clipboard - */ if ( !(bClipboardOpen = OpenClipboard(theOleClipboard->hWndClipboard)) ) HANDLE_ERROR( CLIPBRD_E_CANT_OPEN ); /* - * Empty the current clipboard - */ - if ( !EmptyClipboard() ) - HANDLE_ERROR( CLIPBRD_E_CANT_EMPTY ); - - /* * Render all HGLOBAL formats supported by the source into * the windows clipboard. */ - if ( FAILED( hr = IDataObject_EnumFormatEtc( pIDataObjectSrc, + if ( FAILED( hr = IDataObject_EnumFormatEtc( theOleClipboard->pIDataObjectSrc, DATADIR_GET, &penumFormatetc) )) { @@ -1528,10 +1508,7 @@ HRESULT WINAPI OleFlushClipboard(void) GetClipboardFormatNameA(rgelt.cfFormat, szFmtName, sizeof(szFmtName)-1) ? szFmtName : ""); - /* - * Render the clipboard data - */ - if ( FAILED(OLEClipbrd_RenderFormat( pIDataObjectSrc, &rgelt )) ) + if ( FAILED(OLEClipbrd_RenderFormat( theOleClipboard->pIDataObjectSrc, &rgelt )) ) continue; } } @@ -1540,16 +1517,11 @@ HRESULT WINAPI OleFlushClipboard(void) hr = set_dataobject_format(NULL); - /* - * Release the source data object we are holding on to - */ - IDataObject_Release(pIDataObjectSrc); + IDataObject_Release(theOleClipboard->pIDataObjectSrc); + theOleClipboard->pIDataObjectSrc = NULL; CLEANUP: - /* - * Close Windows clipboard (It remains associated with our window) - */ if ( bClipboardOpen && !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index bc7e727..121783d 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -625,6 +625,7 @@ static void test_set_clipboard(void) HRESULT hr; ULONG ref; LPDATAOBJECT data1, data2, data_cmpl; + HGLOBAL hblob, h; cf_stream = RegisterClipboardFormatA("stream format"); cf_storage = RegisterClipboardFormatA("storage format"); @@ -681,6 +682,16 @@ static void test_set_clipboard(void) hr = OleIsCurrentClipboard(NULL); ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); + /* put a format directly onto the clipboard to show + OleFlushClipboard doesn't empty the clipboard */ + hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); + OpenClipboard(NULL); + h = SetClipboardData(cf_onemore, hblob); + ok(h == hblob, "got %p\n", h); + h = GetClipboardData(cf_onemore); + ok(h == hblob, "got %p\n", h); + CloseClipboard(); + hr = OleFlushClipboard(); ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); hr = OleIsCurrentClipboard(data1); @@ -690,10 +701,21 @@ static void test_set_clipboard(void) hr = OleIsCurrentClipboard(NULL); ok(hr == S_FALSE, "expect S_FALSE, hr = 0x%08x\n", hr); + /* format should survive the flush */ + OpenClipboard(NULL); + h = GetClipboardData(cf_onemore); + ok(h == hblob, "got %p\n", h); + CloseClipboard(); + test_cf_dataobject(NULL); ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + OpenClipboard(NULL); + h = GetClipboardData(cf_onemore); + ok(h == NULL, "got %p\n", h); + CloseClipboard(); + hr = OleSetClipboard(data_cmpl); ok(hr == S_OK, "failed to set clipboard to complex data, hr = 0x%08x\n", hr); test_cf_dataobject(data_cmpl);

1 0

Huw Davies : ole32: Set the 'Ole Private Data' clipboard format.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 690202440ece0283b7ee8b2853a4c70a2a6e71a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690202440ece0283b7ee8b285… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 26 13:32:16 2009 +0000 ole32: Set the 'Ole Private Data' clipboard format. --- dlls/ole32/clipboard.c | 92 ++++++++++++++++++++++++++++++++++++++--- dlls/ole32/tests/clipboard.c | 1 - 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 34946ff..5dbcca8 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -151,15 +151,26 @@ static ole_clipbrd* theOleClipboard; static const CHAR OLEClipbrd_WNDCLASS[] = "CLIPBRDWNDCLASS"; static UINT dataobject_clipboard_format; +static UINT ole_priv_data_clipboard_format; -/* - * If we need to store state info we can store it here. - * For now we don't need this functionality. - * -typedef struct tagClipboardWindowInfo +/* Structure of 'Ole Private Data' clipboard format */ +typedef struct { -} ClipboardWindowInfo; - */ + FORMATETC fmtetc; + DWORD first_use; /* Has this cf been added to the list already */ + DWORD unk[2]; +} ole_priv_data_entry; + +typedef struct +{ + DWORD unk1; + DWORD size; /* in bytes of the entire structure */ + DWORD unk2; + DWORD count; /* no. of format entries */ + DWORD unk3[2]; + ole_priv_data_entry entries[1]; /* array of size count */ + /* then follows any DVTARGETDEVICE structures referenced in the FORMATETCs */ +} ole_priv_data; /*---------------------------------------------------------------------* * Implementation of the internal IEnumFORMATETC interface returned by @@ -1180,9 +1191,12 @@ static ole_clipbrd* OLEClipbrd_Construct(void) static void register_clipboard_formats(void) { static const WCHAR DataObjectW[] = { 'D','a','t','a','O','b','j','e','c','t',0 }; + static const WCHAR OlePrivateDataW[] = { 'O','l','e',' ','P','r','i','v','a','t','e',' ','D','a','t','a',0 }; if(!dataobject_clipboard_format) dataobject_clipboard_format = RegisterClipboardFormatW(DataObjectW); + if(!ole_priv_data_clipboard_format) + ole_priv_data_clipboard_format = RegisterClipboardFormatW(OlePrivateDataW); } /*********************************************************************** @@ -1271,6 +1285,16 @@ static HWND OLEClipbrd_CreateWindow(void) return hwnd; } +static inline BOOL is_format_in_list(ole_priv_data_entry *entries, DWORD num, UINT cf) +{ + DWORD i; + for(i = 0; i < num; i++) + if(entries[i].fmtetc.cfFormat == cf) + return TRUE; + + return FALSE; +} + /********************************************************************* * set_clipboard_formats * @@ -1285,12 +1309,47 @@ static HRESULT set_clipboard_formats(IDataObject *data) HRESULT hr; FORMATETC fmt; IEnumFORMATETC *enum_fmt; + HGLOBAL priv_data_handle; + DWORD target_offset; + ole_priv_data *priv_data; + DWORD count = 0, needed = sizeof(*priv_data), idx; hr = IDataObject_EnumFormatEtc(data, DATADIR_GET, &enum_fmt); if(FAILED(hr)) return hr; while(IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL) == S_OK) { + count++; + needed += sizeof(priv_data->entries[0]); + if(fmt.ptd) + { + needed += fmt.ptd->tdSize; + CoTaskMemFree(fmt.ptd); + } + } + + /* Windows pads the list with two empty ole_priv_data_entries, one + * after the entries array and one after the target device data. + * Allocating with zero init to zero these pads. */ + + needed += sizeof(priv_data->entries[0]); /* initialisation of needed includes one of these. */ + priv_data_handle = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE | GMEM_ZEROINIT, needed); + priv_data = GlobalLock(priv_data_handle); + + priv_data->unk1 = 0; + priv_data->size = needed; + priv_data->unk2 = 1; + priv_data->count = count; + priv_data->unk3[0] = 0; + priv_data->unk3[1] = 0; + + IEnumFORMATETC_Reset(enum_fmt); + + idx = 0; + target_offset = FIELD_OFFSET(ole_priv_data, entries[count + 1]); /* count entries + one pad. */ + + while(IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL) == S_OK) + { if (fmt.tymed == TYMED_HGLOBAL) { char fmt_name[80]; @@ -1299,9 +1358,28 @@ static HRESULT set_clipboard_formats(IDataObject *data) SetClipboardData(fmt.cfFormat, NULL); } + + priv_data->entries[idx].fmtetc = fmt; + if(fmt.ptd) + { + memcpy((char*)priv_data + target_offset, fmt.ptd, fmt.ptd->tdSize); + priv_data->entries[idx].fmtetc.ptd = (DVTARGETDEVICE*)target_offset; + target_offset += fmt.ptd->tdSize; + CoTaskMemFree(fmt.ptd); + } + + priv_data->entries[idx].first_use = !is_format_in_list(priv_data->entries, idx, fmt.cfFormat); + priv_data->entries[idx].unk[0] = 0; + priv_data->entries[idx].unk[1] = 0; + + idx++; } IEnumFORMATETC_Release(enum_fmt); + + GlobalUnlock(priv_data_handle); + SetClipboardData(ole_priv_data_clipboard_format, priv_data_handle); + return S_OK; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 121783d..47921af 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -616,7 +616,6 @@ static void test_cf_dataobject(IDataObject *data) } while(cf); CloseClipboard(); ok(found_dataobject, "didn't find cf_dataobject\n"); -todo_wine ok(found_priv_data, "didn't find cf_ole_priv_data\n"); }

1 0

Alexander Morozov : hal: Fix KfRaiseIrql declaration.
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: 5df31cc90333813f85eea569b6bbc73c79d896ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df31cc90333813f85eea569b… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Mar 26 16:52:29 2009 +0300 hal: Fix KfRaiseIrql declaration. --- dlls/hal/hal.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 83eedea..0824e49 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -15,7 +15,7 @@ @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch @ stdcall -norelay KfAcquireSpinLock(ptr) @ stdcall -norelay KfLowerIrql(long) -@ stdcall -norelay KfRaiseIrql() +@ stdcall -norelay KfRaiseIrql(long) @ stdcall -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList

1 0

Henri Verbeet : wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices().
by Alexandre Julliard 26 Mar '09

26 Mar '09

Module: wine Branch: master Commit: a7d612854750ec6a7e572d94851c0abc39a7d2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d612854750ec6a7e572d948… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 26 10:43:40 2009 +0100 wined3d: Simplify IWineD3DDeviceImpl_ProcessVertices(). --- dlls/wined3d/device.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 73d1ac8..c0f0d85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4680,30 +4680,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * * Also get the start index in, but only loop over all elements if there's something to add at all. */ -#define FIXSRC(type) \ - if(strided.u.s.type.VBO) { \ - struct wined3d_buffer *vb = (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.s.type.streamNo]; \ - strided.u.s.type.VBO = 0; \ - strided.u.s.type.lpData = (BYTE *) ((unsigned long) strided.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ - ENTER_GL(); \ - GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); \ - vb->buffer_object = 0; \ - LEAVE_GL(); \ - } \ - if(strided.u.s.type.lpData) { \ - strided.u.s.type.lpData += strided.u.s.type.dwStride * SrcStartIndex; \ - } - FIXSRC(position); - FIXSRC(blendWeights); - FIXSRC(blendMatrixIndices); - FIXSRC(normal); - FIXSRC(pSize); - FIXSRC(diffuse); - FIXSRC(specular); - for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { - FIXSRC(texCoords[i]); - } -#undef FIXSRC + for (i = 0; i < (sizeof(strided.u.input) / sizeof(*strided.u.input)); ++i) + { + if (strided.u.input[i].VBO) + { + struct wined3d_buffer *vb = + (struct wined3d_buffer *)This->stateBlock->streamSource[strided.u.input[i].streamNo]; + strided.u.input[i].VBO = 0; + strided.u.input[i].lpData = (BYTE *)((unsigned long)strided.u.input[i].lpData + (unsigned long)vb->resource.allocatedMemory); + ENTER_GL(); + GL_EXTCALL(glDeleteBuffersARB(1, &vb->buffer_object)); + vb->buffer_object = 0; + LEAVE_GL(); + } + if (strided.u.input[i].lpData) + { + strided.u.input[i].lpData += strided.u.input[i].dwStride * SrcStartIndex; + } + } } return process_vertices_strided(This, DestIndex, VertexCount, &strided,

1 0