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

Stefan Dösinger : wined3d: Introduce wined3d_event_query_issue.
by Alexandre Julliard 05 Mar '10

05 Mar '10

Module: wine Branch: master Commit: 6863af3ebbbf748ca288898bf0468e483ab54b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6863af3ebbbf748ca288898bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 3 23:18:37 2010 +0100 wined3d: Introduce wined3d_event_query_issue. --- dlls/wined3d/query.c | 100 ++++++++++++++++++++++++++------------------------ 1 files changed, 52 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 97ad5bd..09a60bd 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -100,6 +100,57 @@ static enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_e return ret; } +static void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + if (query->context) + { + if (!query->context->gl_info->supported[ARB_SYNC] && query->context->tid != GetCurrentThreadId()) + { + context_free_event_query(query); + context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + context_alloc_event_query(context, query); + } + else + { + context = context_acquire(device, query->context->current_rt, CTXUSAGE_RESOURCELOAD); + } + } + else + { + context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); + context_alloc_event_query(context, query); + } + + gl_info = context->gl_info; + + ENTER_GL(); + + if (gl_info->supported[ARB_SYNC]) + { + if (query->object.sync) GL_EXTCALL(glDeleteSync(query->object.sync)); + checkGLcall("glDeleteSync"); + query->object.sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); + checkGLcall("glFenceSync"); + } + else if (gl_info->supported[APPLE_FENCE]) + { + GL_EXTCALL(glSetFenceAPPLE(query->object.id)); + checkGLcall("glSetFenceAPPLE"); + } + else if (gl_info->supported[NV_FENCE]) + { + GL_EXTCALL(glSetFenceNV(query->object.id, GL_ALL_COMPLETED_NV)); + checkGLcall("glSetFenceNV"); + } + + LEAVE_GL(); + + context_release(context); +} + /* * Occlusion Queries: * http://www.gris.uni-tuebingen.de/~bartz/Publications/paper/hww98.pdf @@ -306,7 +357,6 @@ static WINED3DQUERYTYPE WINAPI IWineD3DQueryImpl_GetType(IWineD3DQuery* iface){ return This->type; } - static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIssueFlags) { IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; @@ -314,53 +364,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD if (dwIssueFlags & WINED3DISSUE_END) { struct wined3d_event_query *query = This->extendedData; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - if (query->context) - { - if (!query->context->gl_info->supported[ARB_SYNC] && query->context->tid != GetCurrentThreadId()) - { - context_free_event_query(query); - context = context_acquire(This->device, NULL, CTXUSAGE_RESOURCELOAD); - context_alloc_event_query(context, query); - } - else - { - context = context_acquire(This->device, query->context->current_rt, CTXUSAGE_RESOURCELOAD); - } - } - else - { - context = context_acquire(This->device, NULL, CTXUSAGE_RESOURCELOAD); - context_alloc_event_query(context, query); - } - - gl_info = context->gl_info; - - ENTER_GL(); - - if (gl_info->supported[ARB_SYNC]) - { - if (query->object.sync) GL_EXTCALL(glDeleteSync(query->object.sync)); - checkGLcall("glDeleteSync"); - query->object.sync = GL_EXTCALL(glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0)); - checkGLcall("glFenceSync"); - } - else if (gl_info->supported[APPLE_FENCE]) - { - GL_EXTCALL(glSetFenceAPPLE(query->object.id)); - checkGLcall("glSetFenceAPPLE"); - } - else if (gl_info->supported[NV_FENCE]) - { - GL_EXTCALL(glSetFenceNV(query->object.id, GL_ALL_COMPLETED_NV)); - checkGLcall("glSetFenceNV"); - } - - LEAVE_GL(); - - context_release(context); + wined3d_event_query_issue(query, This->device); } else if(dwIssueFlags & WINED3DISSUE_BEGIN) {

1 0

Alexandre Julliard : advapi32/tests: Add a number of tests for Wow64 registry redirection.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: e7ff9925fbae520993112210d253253ec00016be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ff9925fbae520993112210d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 15:02:00 2010 +0100 advapi32/tests: Add a number of tests for Wow64 registry redirection. --- dlls/advapi32/tests/registry.c | 271 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7ff9925fbae520993112…

1 0

Henri Verbeet : wined3d: Split TEXT shader comments into separate lines.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: ba519be60f06ac0ed937b84dc058a74de9d23611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba519be60f06ac0ed937b84dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 4 12:19:56 2010 +0100 wined3d: Split TEXT shader comments into separate lines. Based on a patch by Christian Costa. --- dlls/wined3d/shader.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2dc9522..307cadf 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1231,7 +1231,27 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe fe->shader_read_comment(&ptr, &comment, &comment_size); if (comment) { - TRACE("// %s\n", debugstr_an(comment, comment_size)); + if (comment_size > 4 && *(const DWORD *)comment == WINEMAKEFOURCC('T', 'E', 'X', 'T')) + { + const char *end = comment + comment_size; + const char *ptr = comment + 4; + const char *line = ptr; + + TRACE("// TEXT\n"); + while (ptr != end) + { + if (*ptr == '\n') + { + UINT len = ptr - line; + if (len && *(ptr - 1) == '\r') --len; + TRACE("// %s\n", debugstr_an(line, len)); + line = ++ptr; + } + else ++ptr; + } + if (line != ptr) TRACE("// %s\n", debugstr_an(line, ptr - line)); + } + else TRACE("// %s\n", debugstr_an(comment, comment_size)); continue; }

1 0

Nikolay Sivov : shell32: Use return value on failure updated in Vista+.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: fb45de3f66f0dafd64a101f3f4091f6b94998274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb45de3f66f0dafd64a101f3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 14:22:49 2010 +0300 shell32: Use return value on failure updated in Vista+. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/tests/shlfolder.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index ecda891..99bbed8 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1333,7 +1333,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST *pidlist = NULL; - if (!name) return E_OUTOFMEMORY; + if (!name) return E_INVALIDARG; hr = SHGetDesktopFolder(&desktop); if (hr != S_OK) return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 85f04a9..bce7c3e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2007,7 +2007,8 @@ if (0) pidl1 = (LPITEMIDLIST)0xdeadbeef; hr = pSHParseDisplayName(NULL, NULL, &pidl1, 0, NULL); - ok(hr == E_OUTOFMEMORY, "failed %08x\n", hr); + ok(broken(hr == E_OUTOFMEMORY) /* < Vista */ || + hr == E_INVALIDARG, "failed %08x\n", hr); ok(pidl1 == 0, "expected null ptr, got %p\n", pidl1); /* dummy name */

1 0

Arjun Comar : cmd: Fix cmd to take /? as a help parameter.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: a607f53779e9cde1d706e9c2976889f13f292ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a607f53779e9cde1d706e9c29… Author: Arjun Comar <mandaya(a)rose-hulman.edu> Date: Tue Mar 2 16:26:09 2010 -0500 cmd: Fix cmd to take /? as a help parameter. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmdmain.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index fdb4404..15d320c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1134,12 +1134,12 @@ void WCMD_give_help (WCHAR *command) { else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - param1, -1, inbuilt[i], -1) == 2) { + command, -1, inbuilt[i], -1) == 2) { WCMD_output_asis (WCMD_LoadMessage(i)); return; } } - WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), param1); + WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), command); } return; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index f97a1fd..b2243e3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1411,6 +1411,15 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, WCMD_parse (p, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); + if((p[0] == '/') && (p[1] == '?')) { + + /*this is a help request for a program*/ + i = WCMD_HELP; + memcpy(p, whichcmd, count * sizeof(WCHAR)); + p[count] = '\0'; + + } + switch (i) { case WCMD_ATTRIB:

1 0

Jeff Latimer : usp10: Remove duplicate code.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 3b6498a520575fbcf7cad302935a974ca408f878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6498a520575fbcf7cad3029… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Mar 4 23:47:20 2010 +1100 usp10: Remove duplicate code. --- dlls/usp10/usp10.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a8ae4ce..28984e0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -592,8 +592,6 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.s.uBidiLevel = 1; pItems[index].a.eScript = New_Script; - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); }

1 0

Joris Huizer : mshtml: create_channelbsc: Handle OOM case correctly.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: b6f2919b9094c1291e046c270a885c0afb8d13ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f2919b9094c1291e046c270… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Thu Mar 4 12:39:18 2010 +0100 mshtml: create_channelbsc: Handle OOM case correctly. --- dlls/mshtml/navigate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 16d38a1..a09ea7f 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1136,7 +1136,8 @@ HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD if(post_data) { ret->bsc.post_data = GlobalAlloc(0, post_data_size); - if(!ret->bsc.headers) { + if(!ret->bsc.post_data) { + heap_free(ret->bsc.headers); IBindStatusCallback_Release(STATUSCLB(&ret->bsc)); return E_OUTOFMEMORY; }

1 0

André Hentschel : oleaut32: Fix FormatString (valgrind ).
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: f73c8c4d42c03a886675c8824f16678522ed17a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73c8c4d42c03a886675c8824… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 20:39:45 2010 +0100 oleaut32: Fix FormatString (valgrind). --- dlls/oleaut32/varformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 52ea37a..10f5038 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1963,7 +1963,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, if (FAILED(hRes)) return hRes; - if (V_BSTR(pVarIn)[0] == '\0') + if (V_BSTR(&vStr)[0] == '\0') strHeader = (FMT_STRING_HEADER*)(rgbTok + FmtGetNegative(header)); else strHeader = (FMT_STRING_HEADER*)(rgbTok + FmtGetPositive(header));

1 0

Vincent Povirk : ole32: Add tests for CopyTo in recursive situations.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 3733789aa9b819102b90c88934c0d6ce2c8e2240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3733789aa9b819102b90c8893… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 3 16:04:55 2010 -0600 ole32: Add tests for CopyTo in recursive situations. --- dlls/ole32/tests/storage32.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 7cbfd49..7568a0c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2771,6 +2771,57 @@ static void test_copyto_locking(void) ok( r == TRUE, "deleted file\n"); } +static void test_copyto_recursive(void) +{ + IStorage *stg, *stg2, *stg3, *stg4; + HRESULT r; + static const WCHAR stgname[] = { 'S','T','G','1',0 }; + static const WCHAR stgname2[] = { 'S','T','G','2',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* copy the parent to the child */ + r = IStorage_CopyTo(stg, 0, NULL, NULL, stg2); + ok(r==STG_E_ACCESSDENIED, "IStorage->CopyTo failed, hr=%08x\n", r); + + /* create a transacted substorage */ + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* copy the parent to the transacted child */ + r = IStorage_CopyTo(stg, 0, NULL, NULL, stg2); + ok(r==STG_E_ACCESSDENIED, "IStorage->CopyTo failed, hr=%08x\n", r); + + /* create a transacted subsubstorage */ + r = IStorage_CreateStorage(stg3, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg4); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* copy the parent to the transacted child of the transacted child */ + r = IStorage_CopyTo(stg, 0, NULL, NULL, stg4); + ok(r==STG_E_ACCESSDENIED, "IStorage->CopyTo failed, hr=%08x\n", r); + + /* copy the parent but exclude storage objects */ + r = IStorage_CopyTo(stg, 1, &IID_IStorage, NULL, stg4); + ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + + IStorage_Release(stg4); + IStorage_Release(stg3); + IStorage_Release(stg2); + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2811,4 +2862,5 @@ START_TEST(storage32) test_toplevel_stat(); test_substorage_enum(); test_copyto_locking(); + test_copyto_recursive(); }

1 0

Juan Lang : rpcrt4: Add tests for UuidCreateSequential.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: b61c8f8b53ed9b138f86605225da51a5d7a2ad57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b61c8f8b53ed9b138f8660522… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 3 14:36:32 2010 -0800 rpcrt4: Add tests for UuidCreateSequential. --- dlls/rpcrt4/tests/rpc.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 3acb46e..7bd78ba 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -804,6 +804,58 @@ static void test_UuidCreate(void) } } +static void test_UuidCreateSequential(void) +{ + UUID guid1; + BYTE version; + RPC_STATUS (WINAPI *pUuidCreateSequential)(UUID *) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "UuidCreateSequential"); + RPC_STATUS ret; + + if (!pUuidCreateSequential) + { + skip("UuidCreateSequential not exported\n"); + return; + } + ret = pUuidCreateSequential(&guid1); + ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, + "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); + version = (guid1.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 1, "unexpected version %d\n", version); + if (version == 1) + { + UUID guid2; + + if (!ret) + { + /* If the call succeeded, there's a valid (non-multicast) MAC + * address in the uuid: + */ + ok(!(guid1.Data4[2] & 0x01), + "GUID does not appear to contain a MAC address\n"); + } + else + { + /* Otherwise, there's a randomly generated multicast MAC address + * address in the uuid: + */ + ok((guid1.Data4[2] & 0x01), + "GUID does not appear to contain a multicast MAC address\n"); + } + /* Generate another GUID, and make sure its MAC address matches the + * first. + */ + ret = pUuidCreateSequential(&guid2); + ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, + "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); + version = (guid2.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 1, "unexpected version %d\n", version); + ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), + "unexpected value in MAC address\n"); + } +} + static void test_RpcBindingFree(void) { RPC_BINDING_HANDLE binding = NULL; @@ -826,5 +878,6 @@ START_TEST( rpc ) test_I_RpcExceptionFilter(); test_RpcStringBindingFromBinding(); test_UuidCreate(); + test_UuidCreateSequential(); test_RpcBindingFree(); }

1 0