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

Maik Schulz : website: typo correction
by Maik Schulz 08 May '09

08 May '09

Module: website Branch: master Commit: a8b82e9fcb7661de4a989453a616a7d33747034e URL: http://source.winehq.org/git/website.git/?a=commit;h=a8b82e9fcb7661de4a9894… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat May 9 00:21:10 2009 +0200 website: typo correction --- news/de/2009050801.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2009050801.xml b/news/de/2009050801.xml index c6e4846..46684eb 100644 --- a/news/de/2009050801.xml +++ b/news/de/2009050801.xml @@ -1,5 +1,5 @@ <news> -<date>8. May 2009</date> +<date>8. Mai 2009</date> <title>Wine 1.1.21 Freigegeben</title> <body> Die Entwicklungsversion 1.1.21 von Wine ist jetzt verfügbar.

1 0

Maik Schulz : website: translation of release 1.1.21 news item
by Maik Schulz 08 May '09

08 May '09

Module: website Branch: master Commit: 6c7a4491bde50963416163ebb3a9a86bdc30b028 URL: http://source.winehq.org/git/website.git/?a=commit;h=6c7a4491bde50963416163… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat May 9 00:10:06 2009 +0200 website: translation of release 1.1.21 news item --- news/de/2009050801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2009050801.xml b/news/de/2009050801.xml new file mode 100644 index 0000000..c6e4846 --- /dev/null +++ b/news/de/2009050801.xml @@ -0,0 +1,18 @@ +<news> +<date>8. May 2009</date> +<title>Wine 1.1.21 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Erste Unterstützung für Shader Model 4.</li> + <li>Unterstützung für Kopieren/Einfügen von Bildern aus X11 Anwendungen.</li> + <li>Einige Verbesserungen an GDIPlus.</li> + <li>Diverse Fehlerbehebungen an listview.</li> + <li>64-bit Unterstützung in winemaker.</li> + <li>Kompilieren unter Mac OS X Snow Leopard wird unterstützt.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.21.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.21
by Alexandre Julliard 08 May '09

08 May '09

Module: website Branch: master Commit: b70ca7b1a9a8525f089f9ea168d14e2146053239 URL: http://source.winehq.org/git/website.git/?a=commit;h=b70ca7b1a9a8525f089f9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 19:39:38 2009 +0200 Wine release 1.1.21 --- news/en/2009050801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2009050801.xml b/news/en/2009050801.xml new file mode 100644 index 0000000..0557ccf --- /dev/null +++ b/news/en/2009050801.xml @@ -0,0 +1,18 @@ +<news> +<date>May 8, 2009</date> +<title>Wine 1.1.21 Released</title> +<body> + The Wine development release 1.1.21 is now available. + <a href="{$root}/announce/1.1.21">What's new</a> in this release: +<ul> + <li>Beginnings of shader model 4 support.</li> + <li>Support for copying/pasting images from X11 applications.</li> + <li>A number of GDIPlus improvements.</li> + <li>Various listview fixes.</li> + <li>64-bit support in winemaker.</li> + <li>Support for building on Mac OS X Snow Leopard.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.21.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Henri Verbeet : wined3d: Record register usage only once.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: d2409581e0f0ce314f1b746d7486a34df30083e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2409581e0f0ce314f1b746d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 8 18:10:00 2009 +0200 wined3d: Record register usage only once. --- dlls/wined3d/baseshader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 303460f..8b8aef4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -619,8 +619,6 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 struct wined3d_shader_src_param src_param, src_rel_addr; fe->shader_read_src_param(fe_data, &pToken, &src_param, &src_rel_addr); - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx, !!src_param.reg.rel_addr, pshader); switch(get_instr_regcount(ins.handler_idx, i)) { case 4:

1 0

Alexandre Julliard : Release 1.1.21.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 00160719d31aa59b37c358af16c3dabaa04bfd5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00160719d31aa59b37c358af1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 19:33:02 2009 +0200 Release 1.1.21. --- ANNOUNCE | 882 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 441 insertions(+), 461 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00160719d31aa59b37c35…

1 0

Tag wine-1.1.21 : Alexandre Julliard : Release 1.1.21
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: refs/tags/wine-1.1.21 Tag: d91dd4f0fc63c33009abd272ec448f7b9530c22f URL: http://source.winehq.org/git/wine.git/?a=tag;h=d91dd4f0fc63c33009abd272ec44… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 19:33:02 2009 +0200 Release 1.1.21

1 0

Łukasz Wojniłowicz : Added Polish translation
by Jeremy Newman 08 May '09

08 May '09

Module: website Branch: master Commit: cafccf5ae3e3258339ef11b82b4f00c89dc97ec8 URL: http://source.winehq.org/git/website.git/?a=commit;h=cafccf5ae3e3258339ef11… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri May 8 08:54:48 2009 +0200 Added Polish translation --- include/data.php | 4 + templates/pl/announce.template | 7 ++ templates/pl/download.template | 187 ++++++++++++++++++++++++++++++++++++ templates/pl/download/deb.template | 102 ++++++++++++++++++++ templates/pl/home.template | 90 +++++++++++++++++ templates/pl/interview.template | 8 ++ templates/pl/irc.template | 18 ++++ templates/pl/lang.template | 37 +++++++ templates/pl/news.template | 11 ++ templates/pl/search.template | 26 +++++ 10 files changed, 490 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=cafccf5ae3e3258339…

1 0

Jeremy Newman : adding Polish
by Jeremy Newman 08 May '09

08 May '09

Module: website Branch: master Commit: 8e7b99d5726d3ca6fd5b5769e71722c7cba31052 URL: http://source.winehq.org/git/website.git/?a=commit;h=8e7b99d5726d3ca6fd5b57… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 8 10:50:10 2009 -0500 adding Polish --- templates/en/lang.template | 4 ++++ templates/pl/lang.template | 37 ------------------------------------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/templates/en/lang.template b/templates/en/lang.template index a634696..086a020 100644 --- a/templates/en/lang.template +++ b/templates/en/lang.template @@ -25,6 +25,10 @@ <a href="{$root}/lang/fr" title="Français">Français</a> (French) </li> + <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/pl" title="Português">Polski</a> (Polish) + </li> + <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> <a href="{$root}/lang/pt" title="Português">Português</a> (Portuguese) </li> diff --git a/templates/pl/lang.template b/templates/pl/lang.template deleted file mode 100644 index cefa84c..0000000 --- a/templates/pl/lang.template +++ /dev/null @@ -1,37 +0,0 @@ - - - -<h1 class="title">{$langChange}</h1> - - - -Aktualny język: {$langCur} - -<ul style="list-style: none; margin-left: 20px; padding: 0;"> - - <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/en" title="English">English</a> (Angielski) - </li></a> - - <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> (Niemiecki) - </li></a> - - <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/es" title="Español">Español</a> (Hiszpański) - </li> - - <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Français">Français</a> (Francuski) - </li> - - <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/fr" title="Français">Polski</a> - </li> - - <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> - <a href="{$root}/lang/pt" title="Português">Português</a> (Portugalski) - </li> - -</ul> -

1 0

Aric Stewart : msctf: Implement ITfThreadMgr::Activate and ITfThreadMgr:: Deactivate.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 43f5b64f06fcd2a835bea41f27cd49074478d7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5b64f06fcd2a835bea41f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 14:28:00 2009 -0500 msctf: Implement ITfThreadMgr::Activate and ITfThreadMgr::Deactivate. --- dlls/msctf/msctf.c | 17 +++++++++++++- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/tests/inputprocessor.c | 35 ++++++++++++++++++++++-------- dlls/msctf/threadmgr.c | 42 +++++++++++++++++++++++++++++------- 4 files changed, 75 insertions(+), 20 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 57cd477..c8dd486 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -69,8 +69,10 @@ static UINT id_last; static UINT array_size; static struct list AtsList = LIST_INIT(AtsList); +static UINT activated = 0; DWORD tlsIndex = 0; +TfClientId processId = 0; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; @@ -397,6 +399,9 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) if (!IsEqualGUID(&actsvr->LanguageProfile.catid,&GUID_NULL)) deactivate_remove_conflicting_ts(&actsvr->LanguageProfile.catid); + if (activated > 0) + activate_given_ts(actsvr, tm); + entry->ats = actsvr; list_add_head(&AtsList, &entry->entry); @@ -424,6 +429,10 @@ HRESULT activate_textservices(ITfThreadMgr *tm) HRESULT hr = S_OK; AtsEntry *ats; + activated ++; + if (activated > 1) + return S_OK; + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) { hr = activate_given_ts(ats->ats, tm); @@ -437,8 +446,12 @@ HRESULT deactivate_textservices(void) { AtsEntry *ats; - LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) - deactivate_given_ts(ats->ats); + if (activated > 0) + activated --; + + if (activated == 0) + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + deactivate_given_ts(ats->ats); return S_OK; } diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 7bfc221..433b79e 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -26,6 +26,7 @@ #define COOKIE_MAGIC_GUIDATOM 0x0030 extern DWORD tlsIndex; +extern TfClientId processId; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 39f58e6..7ba9140 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -412,18 +412,18 @@ static void test_KeystrokeMgr(void) ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); - todo_wine ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); - todo_wine ok(hr == S_OK, "ITfKeystrokeMgr_IsPreservedKey failed\n"); + ok(hr == S_OK, "ITfKeystrokeMgr_IsPreservedKey failed\n"); if (hr == S_OK) ok(preserved == TRUE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); - todo_wine ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); + ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnpreserveKey failed\n"); hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); ok(hr == S_FALSE, "ITfKeystrokeMgr_IsPreservedKey failed\n"); @@ -461,10 +461,23 @@ static void test_startSession(void) ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; ITextStoreACP *ts; + TfClientId cid2 = 0; + + hr = ITfThreadMgr_Deactivate(g_tm); + ok(hr == E_UNEXPECTED,"Deactivate should have failed with E_UNEXPECTED\n"); test_ShouldActivate = TRUE; - ITfThreadMgr_Activate(g_tm,&cid); - todo_wine ok(cid != tid,"TextService id mistakenly matches Client id\n"); + hr = ITfThreadMgr_Activate(g_tm,&cid); + ok(SUCCEEDED(hr),"Failed to Activate\n"); + ok(cid != tid,"TextService id mistakenly matches Client id\n"); + + test_ShouldActivate = FALSE; + hr = ITfThreadMgr_Activate(g_tm,&cid2); + ok(SUCCEEDED(hr),"Failed to Activate\n"); + ok (cid == cid2, "Second activate client ID does not match\n"); + + hr = ITfThreadMgr_Deactivate(g_tm); + ok(SUCCEEDED(hr),"Failed to Deactivate\n"); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); @@ -600,11 +613,13 @@ static void test_startSession(void) static void test_endSession(void) { + HRESULT hr; test_ShouldDeactivate = TRUE; test_CurrentFocus = NULL; test_PrevFocus = g_dm; test_OnSetFocus = SINK_EXPECTED; - ITfThreadMgr_Deactivate(g_tm); + hr = ITfThreadMgr_Deactivate(g_tm); + ok(SUCCEEDED(hr),"Failed to Deactivate\n"); ok(test_OnSetFocus == SINK_FIRED, "OnSetFocus sink not called\n"); test_OnSetFocus = SINK_UNEXPECTED; } @@ -642,10 +657,10 @@ static void test_TfGuidAtom(void) /* show that cid and tid TfClientIds are also TfGuidAtoms */ hr = ITfCategoryMgr_IsEqualTfGuidAtom(g_cm,tid,&CLSID_FakeService,&equal); ok(SUCCEEDED(hr),"ITfCategoryMgr_IsEqualTfGuidAtom failed\n"); - todo_wine ok(equal == TRUE,"Equal value invalid\n"); + ok(equal == TRUE,"Equal value invalid\n"); hr = ITfCategoryMgr_GetGUID(g_cm,cid,&g1); ok(SUCCEEDED(hr),"ITfCategoryMgr_GetGUID failed\n"); - todo_wine ok(!IsEqualGUID(&g1,&GUID_NULL),"guid should not be NULL\n"); + ok(!IsEqualGUID(&g1,&GUID_NULL),"guid should not be NULL\n"); } static void test_ClientId(void) @@ -668,7 +683,7 @@ static void test_ClientId(void) hr = ITfClientId_GetClientId(pcid,&CLSID_FakeService,&id2); ok(SUCCEEDED(hr),"GetClientId failed\n"); ok(id2!=id1,"Id matches GUID_NULL\n"); - todo_wine ok(id2==tid,"Id for CLSID_FakeService not matching tid\n"); + ok(id2==tid,"Id for CLSID_FakeService not matching tid\n"); ok(id2!=cid,"Id for CLSID_FakeService matching cid\n"); hr = ITfClientId_GetClientId(pcid,&g2,&id2); ok(SUCCEEDED(hr),"GetClientId failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index f0c76b1..2afee39 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -76,6 +76,7 @@ typedef struct tagACLMulti { const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ ITfDocumentMgr *focus; + LONG activationCount; struct list CurrentPreservedKeys; @@ -237,23 +238,48 @@ static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface) static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %p\n",This, ptid); + + if (!ptid) + return E_INVALIDARG; + + if (!processId) + { + GUID guid; + CoCreateGuid(&guid); + ITfClientId_GetClientId((ITfClientId*)&This->ClientIdVtbl,&guid,&processId); + } + + activate_textservices(iface); + This->activationCount++; + *ptid = processId; + return S_OK; } static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); + TRACE("(%p)\n",This); - if (This->focus) + if (This->activationCount == 0) + return E_UNEXPECTED; + + This->activationCount --; + + if (This->activationCount == 0) { - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); - ITfDocumentMgr_Release(This->focus); - This->focus = 0; + if (This->focus) + { + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); + ITfDocumentMgr_Release(This->focus); + This->focus = 0; + } } - return E_NOTIMPL; + deactivate_textservices(); + + return S_OK; } static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr

1 0

Alexandre Julliard : ole32/tests: Fix the clipboard format test on Win64.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 18419dab31d3c3d2f02226354ce78cd73d56f6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=18419dab31d3c3d2f02226354… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 13:52:05 2009 +0200 ole32/tests: Fix the clipboard format test on Win64. --- dlls/ole32/tests/usrmarshal.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 9dde4d9..3411cc2 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -94,22 +94,27 @@ static void test_marshal_CLIPFORMAT(void) MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; unsigned char *buffer; - ULONG size; + ULONG i, size; CLIPFORMAT cf = RegisterClipboardFormatA("MyFormat"); CLIPFORMAT cf2; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = CLIPFORMAT_UserSize(&umcb.Flags, 0, &cf); ok(size == 8 + sizeof(cf_marshaled) || + broken(size == 12 + sizeof(cf_marshaled)) || /* win64 adds 4 extra (unused) bytes */ broken(size == 8 + sizeof(cf_marshaled) - 2), /* win9x and winnt don't include the '\0' */ "CLIPFORMAT: Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset( buffer, 0xcc, size ); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserMarshal(&umcb.Flags, buffer, &cf); ok(*(LONG *)(buffer + 0) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0)); ok(*(DWORD *)(buffer + 4) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4)); - ok(!memcmp(buffer + 8, cf_marshaled, size - 8), "Marshaled data differs\n"); + ok(!memcmp(buffer + 8, cf_marshaled, min( sizeof(cf_marshaled), size-8 )), "Marshaled data differs\n"); + if (size > sizeof(cf_marshaled) + 8) /* make sure the extra bytes are not used */ + for (i = sizeof(cf_marshaled) + 8; i < size; i++) + ok( buffer[i] == 0xcc, "buffer offset %u has been set to %x\n", i, buffer[i] ); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer, &cf2);

1 0