November 2010 - Wine-Commits

Adam Martinson : msxml3: Add a function to validate a tree against a schema cache.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: bf11a93b05142e005f3e9e0909823c0d80cdcea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf11a93b05142e005f3e9e090… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Nov 1 14:11:46 2010 -0500 msxml3: Add a function to validate a tree against a schema cache. --- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/schema.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3d7903c..9dd02cb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -197,6 +197,7 @@ extern HRESULT node_get_prefix(xmlnode*,BSTR*); extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); +extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); static inline BSTR bstr_from_xmlChar(const xmlChar *str) { diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 0120333..1ff4566 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -611,6 +611,85 @@ static const struct IXMLDOMSchemaCollection2Vtbl schema_cache_vtbl = schema_cache_getDeclaration }; +static void LIBXML2_LOG_CALLBACK validate_error(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_ERR(SchemaCache_validate_tree, msg, ap); + va_end(ap); +} + +static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ...) +{ + va_list ap; + va_start(ap, msg); + LIBXML2_CALLBACK_WARN(SchemaCache_validate_tree, msg, ap); + va_end(ap); +} + +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS +static void validate_serror(void* ctx, xmlErrorPtr err) +{ + LIBXML2_CALLBACK_SERROR(SchemaCache_validate_tree, err); +} +#endif + +HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree) +{ + schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); + cache_entry* entry; + xmlChar const* ns = NULL; + TRACE("(%p, %p)\n", This, tree); + + if (!tree) + return E_POINTER; + + if ((xmlNodePtr)tree->doc == tree) + { + xmlNodePtr root = xmlDocGetRootElement(tree->doc); + if (root && root->ns) + ns = root->ns->href; + } + else if (tree->ns) + { + ns = tree->ns->href; + } + + entry = xmlHashLookup(This->cache, ns); + /* TODO: if the ns is not in the cache, and it's a URL, + * do we try to load from that? */ + if (entry) + { + if (entry->type == SCHEMA_TYPE_XDR) + { + FIXME("partial stub: XDR schema support not implemented\n"); + return S_OK; + } + else if (entry->type == SCHEMA_TYPE_XSD) + { + xmlSchemaValidCtxtPtr svctx; + int err; + /* TODO: if validateOnLoad property is false, + * we probably need to validate the schema here. */ + svctx = xmlSchemaNewValidCtxt(entry->schema); + xmlSchemaSetValidErrors(svctx, validate_error, validate_warning, NULL); +#ifdef HAVE_XMLSCHEMASSETVALIDSTRUCTUREDERRORS + xmlSchemaSetValidStructuredErrors(svctx, validate_serror, NULL); +#endif + + if ((xmlNodePtr)tree->doc == tree) + err = xmlSchemaValidateDoc(svctx, (xmlDocPtr)tree); + else + err = xmlSchemaValidateOneElement(svctx, tree); + + xmlSchemaFreeValidCtxt(svctx); + return err? S_FALSE : S_OK; + } + } + + return E_FAIL; +} + HRESULT SchemaCache_create(IUnknown* pUnkOuter, void** ppObj) { schema_cache* This = heap_alloc(sizeof(schema_cache));

1 0

Francois Gouget : ddraw/tests: Remove a space before a '\n'.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 6fb3a0a032090b6b7e17d4d5bab91c83e2cf774f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb3a0a032090b6b7e17d4d5b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:42:26 2010 +0100 ddraw/tests: Remove a space before a '\n'. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 3aecb63..b0b84d8 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -578,7 +578,7 @@ static void testcooperativelevels_normal(void) else { todo_wine ok(rc == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", rc); - todo_wine ok(surface!=NULL, "Returned NULL surface pointer \n"); + todo_wine ok(surface!=NULL, "Returned NULL surface pointer\n"); } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface);

1 0

Jörg Höhle : winmm: mciSendString always returns a response string (albeit empty).
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 88a8d211fb6ad131b4eb6ee35701b573116327cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a8d211fb6ad131b4eb6ee35… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 21 19:28:20 2010 +0200 winmm: mciSendString always returns a response string (albeit empty). --- dlls/winmm/mci.c | 8 +++++--- dlls/winmm/tests/mci.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index cb76a1e..455a733 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1535,8 +1535,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_SendCommand(wmd ? wmd->wDeviceID : uDevID, wMsg, dwFlags, (DWORD_PTR)&data); } TRACE("=> 1/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); - dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); - TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + if (!LOWORD(dwRet)) { + dwRet = MCI_HandleReturnValues(dwRet, wmd, retType, &data.generic, lpstrRet, uRetLen); + TRACE("=> 2/ %x (%s)\n", dwRet, debugstr_w(lpstrRet)); + } errCleanUp: if (auto_open) { @@ -1569,9 +1571,9 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, MultiByteToWideChar( CP_ACP, 0, lpstrCommand, -1, lpwstrCommand, len ); if (lpstrRet) { + if (uRetLen) *lpstrRet = '\0'; /* NT-w2k3 use memset(lpstrRet, 0, uRetLen); */ lpwstrRet = HeapAlloc(GetProcessHeap(), 0, uRetLen * sizeof(WCHAR)); if (!lpwstrRet) { - WARN("no memory\n"); HeapFree( GetProcessHeap(), 0, lpwstrCommand ); return MCIERR_OUT_OF_MEMORY; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index ce91458..ebd393f 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -189,11 +189,15 @@ static void test_mciParser(HWND hwnd) err = mciSendString("open avivideo alias a", buf, sizeof(buf), hwnd); ok(!err,"open another: %s\n", dbg_mcierr(err)); + buf[0]='z'; err = mciSendString("", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_MISSING_COMMAND_STRING,"empty string: %s\n", dbg_mcierr(err)); + ok(!buf[0], "error buffer %s\n", buf); + buf[0]='d'; err = mciSendString("open", buf, sizeof(buf), NULL); ok(err==MCIERR_MISSING_DEVICE_NAME,"open void: %s\n", dbg_mcierr(err)); + ok(!buf[0], "open error buffer %s\n", buf); err = mciSendString("open notify", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_INVALID_DEVICE_NAME,"open notify: %s\n", dbg_mcierr(err)); @@ -214,15 +218,19 @@ static void test_mciParser(HWND hwnd) err = mciSendString("status x length position", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + buf[0]='I'; err = mciSendString("set x time format milliseconds time format ms", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_FLAGS_NOT_COMPATIBLE,"status length+position: %s\n", dbg_mcierr(err)); + ok(!buf[0], "set error buffer %s\n", buf); /* device's response, not a parser test */ err = mciSendString("status x", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_MISSING_PARAMETER,"status waveaudio nokeyword: %s\n", dbg_mcierr(err)); + buf[0]='G'; err = mciSendString("status a", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_UNSUPPORTED_FUNCTION,"status avivideo nokeyword: %s\n", dbg_mcierr(err)); + ok(!buf[0], "status error buffer %s\n", buf); err = mciSendString("status x track", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_BAD_INTEGER,"status waveaudio no track: %s\n", dbg_mcierr(err)); @@ -283,6 +291,7 @@ static void test_mciParser(HWND hwnd) * and return the one error code or MCIERR_MULTIPLE if they differ. */ err = mciSendString("pause all", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_MULTIPLE || broken(err==MCIERR_NONAPPLICABLE_FUNCTION),"pause all: %s\n", dbg_mcierr(err)); + ok(!buf[0], "pause error buffer %s\n", buf); /* MCI_STATUS' dwReturn is a DWORD_PTR, others' a plain DWORD. */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; @@ -448,6 +457,7 @@ static void test_openCloseWAVE(HWND hwnd) err = mciSendString("sysinfo nodev installname", buf, sizeof(buf), hwnd); ok(err==MCIERR_INVALID_DEVICE_NAME,"sysinfo nodev installname: %s\n", dbg_mcierr(err)); + ok(!buf[0], "sysinfo error buffer %s\n", buf); err = mciGetDeviceID("all"); ok(MCI_ALL_DEVICE_ID==err || /* Win9x */(UINT16)MCI_ALL_DEVICE_ID==err,"mciGetDeviceID all returned %u, expected %d\n", err, MCI_ALL_DEVICE_ID); @@ -584,6 +594,7 @@ static void test_recordWAVE(HWND hwnd) /* Info file fails until named in Open or Save. */ err = mciSendString("info x file", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_NONAPPLICABLE_FUNCTION,"mci info new file returned %s\n", dbg_mcierr(err)); + ok(!buf[0], "info error buffer %s\n", buf); /* Check the default recording: 8-bits per sample, mono, 11kHz */ err = mciSendString("status x samplespersec", buf, sizeof(buf), NULL);

1 0

David Adam : ddraw: Add tests for SetCooperativeLevel with a NULL window.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: e5e150a4d60dbb150cc032d70cadb0f8ff04637d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e150a4d60dbb150cc032d70… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Mon Nov 1 22:32:52 2010 +0100 ddraw: Add tests for SetCooperativeLevel with a NULL window. --- dlls/ddraw/tests/ddrawmodes.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e83541a..3aecb63 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -554,6 +554,10 @@ static void testcooperativelevels_normal(void) /* Do some tests with DDSCL_NORMAL mode */ /* Fullscreen mode + normal mode + exclusive mode */ + + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); + ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received: %x\n", rc); + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -583,6 +587,7 @@ static void testcooperativelevels_normal(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); /* Fullscreen mode + normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -592,6 +597,9 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_NORMAL); + todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Try creating a double buffered primary in fullscreen + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -605,6 +613,7 @@ static void testcooperativelevels_normal(void) if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* switching from Fullscreen mode to Normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -615,6 +624,9 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Try creating a double buffered primary in normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -627,6 +639,7 @@ static void testcooperativelevels_normal(void) if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* switching from Normal mode to Fullscreen + Normal mode */ + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2); @@ -637,11 +650,24 @@ static void testcooperativelevels_normal(void) if(sfw) ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL | DDSCL_FULLSCREEN); + todo_wine ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_SETFOCUSWINDOW); + + if (rc == DDERR_INVALIDPARAMS) + { + win_skip("NT4/Win95 do not support cooperative levels DDSCL_SETDEVICEWINDOW and DDSCL_SETFOCUSWINDOW\n"); + return; + } + + ok(rc==DD_OK, "Expected DD_OK, received %x\n", rc); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW); @@ -733,6 +759,10 @@ static void testcooperativelevels_exclusive(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_FULLSCREEN) returned: %x\n",rc); /* Full screen mode + exclusive mode */ + + rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); + todo_wine ok(rc==DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, received %x\n", rc); + sfw=FALSE; if(hwnd2) sfw=SetForegroundWindow(hwnd2);

1 0

Thomas Mullaly : urlmon/tests: Added actual CoInternetCombineIUri tests.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 2d61633e4d36c6934a6a586d95b441524be40ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d61633e4d36c6934a6a586d9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:41:46 2010 -0400 urlmon/tests: Added actual CoInternetCombineIUri tests. --- dlls/urlmon/tests/uri.c | 456 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 456 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d61633e4d36c6934a6a5…

1 0

Thomas Mullaly : urlmon: Implemented base case for CoInternetCombineIUri.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: bced2e21dbc548ef9d41e3ff11384d7ad964c929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bced2e21dbc548ef9d41e3ff1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Oct 9 11:02:17 2010 -0400 urlmon: Implemented base case for CoInternetCombineIUri. --- dlls/urlmon/tests/uri.c | 97 +++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 66 +++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7958fed..eb5a3f7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5578,7 +5578,7 @@ static const uri_combine_test uri_combine_tests[] = { }, { "http://google.com/test",0, "zip://test.com/cool",0, - 0,S_OK,TRUE, + 0,S_OK,FALSE, { {"zip://test.com/cool",S_OK}, {"test.com",S_OK}, @@ -5899,6 +5899,95 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_FILE,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* URL_DONT_SIMPLIFY has no effect. */ + { "http://google.com/test",0, + "zip://test.com/cool/../cool/test",0, + URL_DONT_SIMPLIFY,S_OK,FALSE, + { + {"zip://test.com/cool/test",S_OK}, + {"test.com",S_OK}, + {"zip://test.com/cool/test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"/cool/test",S_OK}, + {"/cool/test",S_OK}, + {"",S_FALSE}, + /* The resulting IUri has the same Raw URI as the relative URI (only IE 8). + * On IE 7 it reduces the path in the Raw URI. + */ + {"zip://test.com/cool/../cool/test",S_OK,FALSE,"zip://test.com/cool/test"}, + {"zip",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* FILE_USE_PATHURL has no effect in IE 8, in IE 7 the + * resulting URI is converted into a dos path. + */ + { "http://google.com/test",0, + "file:///c:/test/",0, + URL_FILE_USE_PATHURL,S_OK,FALSE, + { + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK,FALSE,"c:\\test\\"}, + {"/c:/test/",S_OK,FALSE,"c:\\test\\"}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK,FALSE,"file://c:\\test\\"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "http://test.com/test#%30test",0, + URL_DONT_UNESCAPE_EXTRA_INFO,S_OK,FALSE, + { + {"http://test.com/test#0test",S_OK}, + {"test.com",S_OK}, + {"http://test.com/test#0test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"#0test",S_OK}, + {"test.com",S_OK}, + {"",S_FALSE}, + {"/test",S_OK}, + {"/test",S_OK}, + {"",S_FALSE}, + /* IE 7 decodes the %30 to a 0 in the Raw URI. */ + {"http://test.com/test#%30test",S_OK,FALSE,"http://test.com/test#0test"}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -9072,7 +9161,8 @@ static void test_CoInternetCombineIUri(void) { hr, prop.expected, i, j); } todo_wine { - ok(!strcmp_aw(prop.value, received), + ok(!strcmp_aw(prop.value, received) || + broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } @@ -9080,7 +9170,8 @@ static void test_CoInternetCombineIUri(void) { ok(hr == prop.expected, "Error: IUri_GetPropertyBSTR returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].str_props[%d].\n", hr, prop.expected, i, j); - ok(!strcmp_aw(prop.value, received), + ok(!strcmp_aw(prop.value, received) || + broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), "Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", prop.value, wine_dbgstr_w(received), i, j); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e6304e8..3e29575 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5589,12 +5589,63 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve return S_OK; } +static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result) { + Uri *ret; + HRESULT hr; + parse_data data; + + /* Base case is when the relative Uri has a scheme name, + * if it does, then 'result' will contain the same data + * as the relative Uri. + */ + if(relative->scheme_start > -1) { + DWORD create_flags = 0; + + memset(&data, 0, sizeof(parse_data)); + + data.uri = SysAllocString(relative->raw_uri); + if(!data.uri) { + IUri_Release(URI(ret)); + *result = NULL; + return E_OUTOFMEMORY; + } + + parse_uri(&data, 0); + + ret = create_uri_obj(); + if(!ret) { + *result = NULL; + return E_OUTOFMEMORY; + } + + ret->raw_uri = data.uri; + hr = canonicalize_uri(&data, ret, 0); + if(FAILED(hr)) { + IUri_Release(URI(ret)); + *result = NULL; + return hr; + } + + apply_default_flags(&create_flags); + ret->create_flags = create_flags; + + *result = URI(ret); + } else { + *result = NULL; + return E_NOTIMPL; + } + + return S_OK; +} + /*********************************************************************** * CoInternetCombineIUri (urlmon.@) */ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, IUri **ppCombinedUri, DWORD_PTR dwReserved) { + HRESULT hr; + Uri *relative, *base; TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri) @@ -5605,6 +5656,17 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d return E_INVALIDARG; } - FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); - return E_NOTIMPL; + relative = get_uri_obj(pRelativeUri); + base = get_uri_obj(pBaseUri); + if(!relative || !base) { + *ppCombinedUri = NULL; + FIXME("(%p %p %x %p %x) Unknown IUri types not supported yet.\n", + pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return E_NOTIMPL; + } + + hr = combine_uri(base, relative, dwCombineFlags, ppCombinedUri); + if(hr == E_NOTIMPL) + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return hr; }

1 0

Thomas Mullaly : urlmon/tests: Added basic tests for CoInternetCombineIUri.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 18c7070b7f47a908567c737808c1cfeeead7e11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c7070b7f47a908567c73780… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:22:44 2010 -0400 urlmon/tests: Added basic tests for CoInternetCombineIUri. --- dlls/urlmon/tests/uri.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 10 ++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 93493a8..39cfaaa 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -36,6 +36,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateIUriBuilder)(IUri*, DWORD, DWORD_PTR, IUriBuilder**); +static HRESULT (WINAPI *pCoInternetCombineIUri)(IUri*,IUri*,DWORD,IUri**,DWORD_PTR); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -8633,6 +8634,37 @@ static void test_IUriBuilder_Misc(void) { if(uri) IUri_Release(uri); } +static void test_CoInternetCombineIUri(void) { + HRESULT hr; + IUri *base, *relative, *result; + + base = NULL; + hr = pCreateUri(http_urlW, 0, 0, &base); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineIUri(base, NULL, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be NULL, was %p.\n", result); + } + + relative = NULL; + hr = pCreateUri(http_urlW, 0, 0, &relative); + ok(SUCCEEDED(hr), "Error: Expected CreateUri to succeed, got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) { + result = (void*) 0xdeadbeef; + hr = pCoInternetCombineIUri(NULL, relative, 0, &result, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + ok(!result, "Error: Expected 'result' to be NULL, was %p.\n", result); + } + + hr = pCoInternetCombineIUri(base, relative, 0, NULL, 0); + ok(hr == E_INVALIDARG, "Error: CoInternetCombineIUri returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + if(base) IUri_Release(base); + if(relative) IUri_Release(relative); +} + START_TEST(uri) { HMODULE hurlmon; @@ -8640,6 +8672,7 @@ START_TEST(uri) { pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); + pCoInternetCombineIUri = (void*) GetProcAddress(hurlmon, "CoInternetCombineIUri"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -8711,4 +8744,7 @@ START_TEST(uri) { trace("test IUriBuilder miscellaneous...\n"); test_IUriBuilder_Misc(); + + trace("test CoInternetCombineIUri...\n"); + test_CoInternetCombineIUri(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 99906d2..e6304e8 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5595,6 +5595,16 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, IUri **ppCombinedUri, DWORD_PTR dwReserved) { + TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + + if(!ppCombinedUri) + return E_INVALIDARG; + + if(!pBaseUri || !pRelativeUri) { + *ppCombinedUri = NULL; + return E_INVALIDARG; + } + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); return E_NOTIMPL; }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: aa93d7b80d342f1773d00811bdb3166a1cfe4be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa93d7b80d342f1773d00811b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 2 11:02:17 2010 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 14fb87c..ee221ce 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2900,10 +2900,10 @@ static void SurfaceCapsTest(void) if (create.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) { create.dwFlags |= DDSD_PIXELFORMAT; - U4(create).ddpfPixelFormat.dwSize = sizeof(U4(create).ddpfPixelFormat); - U4(create).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(create).ddpfPixelFormat).dwZBufferBitDepth = 16; - U3(U4(create).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + create.ddpfPixelFormat.dwSize = sizeof(create.ddpfPixelFormat); + create.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(create.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(create.ddpfPixelFormat).dwZBitMask = 0x0000FFFF; } hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL);

1 0

Thomas Mullaly : urlmon: Added stub for CoInternetCombineIUri.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 2aed8ce2fd095468492640af98a0be8692536b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aed8ce2fd095468492640af9… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Oct 7 19:04:21 2010 -0400 urlmon: Added stub for CoInternetCombineIUri. --- dlls/urlmon/uri.c | 10 ++++++++++ dlls/urlmon/urlmon.spec | 1 + include/urlmon.idl | 1 + 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 49368b1..99906d2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5588,3 +5588,13 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve *ppIUriBuilder = URIBUILDER(ret); return S_OK; } + +/*********************************************************************** + * CoInternetCombineIUri (urlmon.@) + */ +HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD dwCombineFlags, + IUri **ppCombinedUri, DWORD_PTR dwReserved) +{ + FIXME("(%p %p %x %p %x): stub\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 6109385..ff1adea 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -12,6 +12,7 @@ @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) +@ stdcall CoInternetCombineIUri(ptr ptr long ptr long) @ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags diff --git a/include/urlmon.idl b/include/urlmon.idl index b09eba3..e50975d 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1931,6 +1931,7 @@ cpp_quote("HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx*,DWORD,IBindStatusCallba cpp_quote("HRESULT WINAPI CoInternetCreateSecurityManager(IServiceProvider*,IInternetSecurityManager**,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCombineUrl(LPCWSTR,LPCWSTR,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetCompareUrl(LPCWSTR,LPCWSTR,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetCombineIUri(IUri*,IUri*,DWORD,IUri**,DWORD_PTR);") cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);")

1 0

Paul Vriens : setupapi: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 45e6101c0c0bb2f0969b8bc891eb917bbc4e1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e6101c0c0bb2f0969b8bc89… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 21:31:03 2010 +0100 setupapi: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/setupapi/Makefile.in | 1 + dlls/setupapi/Sr.rc | 99 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 7454e11..6d74cb5 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -43,6 +43,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sk.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/setupapi/Sr.rc b/dlls/setupapi/Sr.rc new file mode 100644 index 0000000..7c157c3 --- /dev/null +++ b/dlls/setupapi/Sr.rc @@ -0,0 +1,99 @@ +/* + * Serbian resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2009 Ricardo Filipe + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "setupapi_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_PROMPTDISK "„%s“ датотека на %s је неопходна" + IDS_UNKNOWN "Непознато" + IDS_COPYFROM "Умножи датотеке из:" + IDS_INFO "Унесите путању где су датотеке смештене, па кликните на дугме „У реду“." +} + +COPYFILEDLGORD DIALOG 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Умножавање датотека..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Откажи", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Извор:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Одредиште:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Потребне датотеке" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Убаците инсталациони диск произвођача и проверите\nда ли је испод изабрана исправна јединица", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Умножи датотеке произвођача из:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "У реду", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Откажи", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Потражи...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_PROMPTDISK "„%s“ datoteka na %s je neophodna" + IDS_UNKNOWN "Nepoznato" + IDS_COPYFROM "Umnoži datoteke iz:" + IDS_INFO "Unesite putanju gde su datoteke smeštene, pa kliknite na dugme „U redu“." +} + +COPYFILEDLGORD DIALOG 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Umnožavanje datoteka..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Otkaži", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Izvor:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Odredište:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Potrebne datoteke" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ubacite instalacioni disk proizvođača i proverite\nda li je ispod izabrana ispravna jedinica", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Umnoži datoteke proizvođača iz:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "U redu", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Otkaži", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Potraži...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0