wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Jacek Caban : urlmon: Use CoInternetParseIUri instead of IUri:: GetPath in file protocol handler implementation.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 7ccbbd86ba5bf46615bf75a6149279e682f124d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccbbd86ba5bf46615bf75a61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:04:16 2011 +0200 urlmon: Use CoInternetParseIUri instead of IUri::GetPath in file protocol handler implementation. --- dlls/urlmon/file.c | 11 ++++++----- dlls/urlmon/tests/protocol.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 418b708..8dce0bf 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -245,12 +245,13 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr DWORD grfPI, HANDLE *dwReserved) { FileProtocol *This = impl_from_IInternetProtocolEx(iface); + WCHAR path[MAX_PATH]; BINDINFO bindinfo; DWORD grfBINDF = 0; - DWORD scheme; + DWORD scheme, size; LPWSTR mime = NULL; WCHAR null_char = 0; - BSTR path, url; + BSTR url; HRESULT hres; TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, @@ -288,14 +289,14 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - hres = IUri_GetPath(pUri, &path); + size = 0; + hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); if(FAILED(hres)) { - ERR("GetPath failed: %08x\n", hres); + WARN("CoInternetParseIUri failed: %08x\n", hres); return report_result(pOIProtSink, hres, 0); } hres = open_file(This, path, pOIProtSink); - SysFreeString(path); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b547ad8..0cc14f5 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2447,6 +2447,24 @@ static void test_file_protocol_url(LPCWSTR url) IUri_Release(uri); IInternetProtocolEx_Release(protocolex); + + hres = pCreateUri(url, 0, 0, &uri); + ok(hres == S_OK, "CreateUri failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(factory, NULL, &IID_IInternetProtocolEx, (void**)&protocolex); + ok(hres == S_OK, "Could not get IInternetProtocolEx: %08x\n", hres); + + if(file_protocol_start(NULL, NULL, protocolex, uri, TRUE)) { + hres = IInternetProtocolEx_Read(protocolex, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + hres = IInternetProtocolEx_LockRequest(protocolex, 0); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + hres = IInternetProtocolEx_UnlockRequest(protocolex); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + } + + IUri_Release(uri); + IInternetProtocolEx_Release(protocolex); }else { win_skip("Skipping file protocol StartEx tests\n"); }

1 0

Jacek Caban : mshtml: Get rid of wine_url in nsWineURI object.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 25a40601faec93e314ff4c12ce9002d21a635d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a40601faec93e314ff4c12c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:38 2011 +0200 mshtml: Get rid of wine_url in nsWineURI object. --- dlls/mshtml/nsio.c | 85 ++++++++-------------------------------------------- 1 files changed, 13 insertions(+), 72 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3222522..c87f8e2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -63,7 +64,6 @@ struct nsWineURI { NSContainer *container; windowref_t *window_ref; nsChannelBSC *channel_bsc; - BSTR wine_url; IUri *uri; IUriBuilder *uri_builder; BOOL is_doc_uri; @@ -73,23 +73,14 @@ static BOOL ensure_uri(nsWineURI *This) { HRESULT hres; - if(This->uri) - return TRUE; + assert(This->uri || This->uri_builder); - if(This->uri_builder) { + if(!This->uri) { hres = IUriBuilder_CreateUriSimple(This->uri_builder, 0, 0, &This->uri); if(FAILED(hres)) { WARN("CreateUriSimple failed: %08x\n", hres); return FALSE; } - - return TRUE; - } - - hres = CreateUri(This->wine_url, 0, 0, &This->uri); - if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); - return FALSE; } return TRUE; @@ -155,6 +146,7 @@ static BOOL exec_shldocvw_67(HTMLDocumentObj *doc, BSTR url) static nsresult before_async_open(nsChannel *channel, NSContainer *container, BOOL *cancel) { HTMLDocumentObj *doc = container->doc; + BSTR display_uri; DWORD hlnf = 0; HRESULT hres; @@ -172,23 +164,23 @@ static nsresult before_async_open(nsChannel *channel, NSContainer *container, BO return NS_OK; } + hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + if(!hlnf) { - BSTR display_uri; BOOL b; - hres = IUri_GetDisplayUri(channel->uri->uri, &display_uri); - if(FAILED(hres)) - return NS_ERROR_FAILURE; - b = !exec_shldocvw_67(doc, display_uri); - SysFreeString(display_uri); if(b) { + SysFreeString(display_uri); *cancel = FALSE; return NS_OK; } } - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, cancel); + hres = hlink_frame_navigate(&doc->basedoc, display_uri, channel, hlnf, cancel); + SysFreeString(display_uri); if(FAILED(hres)) *cancel = TRUE; return NS_OK; @@ -230,26 +222,6 @@ HRESULT load_nsuri(HTMLWindow *window, nsWineURI *uri, nsChannelBSC *channelbsc, return S_OK; } -static HRESULT set_wine_url(nsWineURI *This, LPCWSTR url) -{ - TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - - if(url) { - BSTR new_url; - - new_url = SysAllocString(url); - if(!new_url) - return E_OUTOFMEMORY; - SysFreeString(This->wine_url); - This->wine_url = new_url; - }else { - heap_free(This->wine_url); - This->wine_url = NULL; - } - - return S_OK; -} - static void set_uri_nscontainer(nsWineURI *This, NSContainer *nscontainer) { if(This->container) { @@ -966,7 +938,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen BOOL cancel = FALSE; nsresult nsres = NS_OK; - TRACE("(%p)->(%p %p) opening %s\n", This, aListener, aContext, debugstr_w(This->uri->wine_url)); + TRACE("(%p)->(%p %p)\n", This, aListener, aContext); if(!ensure_uri(This->uri)) return NS_ERROR_FAILURE; @@ -1574,23 +1546,6 @@ static BOOL ensure_uri_builder(nsWineURI *This) return TRUE; } -/* Temporary helper */ -static void sync_wine_url(nsWineURI *This) -{ - BSTR new_url; - HRESULT hres; - - if(!ensure_uri(This)) - return; - - hres = IUri_GetDisplayUri(This->uri, &new_url); - if(FAILED(hres)) - return; - - SysFreeString(This->wine_url); - This->wine_url = new_url; -} - static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *ret) { char *vala; @@ -1679,7 +1634,6 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) nsIURI_Release(This->nsuri); if(This->uri) IUri_Release(This->uri); - SysFreeString(This->wine_url); heap_free(This); } @@ -1724,7 +1678,6 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) } This->uri = uri; - sync_wine_url(This); return NS_OK; } @@ -1788,7 +1741,6 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1850,7 +1802,6 @@ static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUserna if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1885,7 +1836,6 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -1964,7 +1914,6 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2038,7 +1987,6 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2117,8 +2065,6 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) return nsres; } - sync_wine_url(wine_uri); - *_retval = (nsIURI*)&wine_uri->nsIURL_iface; return NS_OK; } @@ -2274,7 +2220,6 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2326,7 +2271,6 @@ static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - sync_wine_url(This); return NS_OK; } @@ -2551,7 +2495,6 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) if(NS_FAILED(nsres)) return E_FAIL; - set_wine_url(uri, url); uri->is_doc_uri = TRUE; *ret = uri; @@ -2609,7 +2552,6 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(NS_FAILED(nsres)) return E_FAIL; - sync_wine_url(uri); nsres = create_nschannel(uri, &channel); nsIURL_Release(&uri->nsIURL_iface); if(NS_FAILED(nsres)) @@ -2935,8 +2877,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(NS_FAILED(nsres)) return nsres; - sync_wine_url(wine_uri); - *_retval = (nsIURI*)wine_uri; + *_retval = (nsIURI*)&wine_uri->nsIURL_iface; return nsres; }

1 0

Jacek Caban : mshtml: Added IUri-based nsIURI::SetPort implementation.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 8f3c3ca35c795c3ed708cac87c936f14840e6bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3c3ca35c795c3ed708cac87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:51 2011 +0200 mshtml: Added IUri-based nsIURI::SetPort implementation. --- dlls/mshtml/nsio.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c87f8e2..875abe9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1925,9 +1925,6 @@ static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) TRACE("(%p)->(%p)\n", This, aPort); - if(This->nsuri) - return nsIURI_GetPort(This->nsuri, aPort); - if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; @@ -1944,16 +1941,15 @@ static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort) { nsWineURI *This = impl_from_nsIURL(iface); + HRESULT hres; TRACE("(%p)->(%d)\n", This, aPort); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetPort(This->nsuri, aPort); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUriBuilder_SetPort(This->uri_builder, aPort != -1, aPort); + return SUCCEEDED(hres) ? NS_OK : NS_ERROR_FAILURE; } static nsresult NSAPI nsURI_GetPath(nsIURL *iface, nsACString *aPath)

1 0

Jacek Caban : mshtml: Make sure we always create nsWineURI with valid IUri.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 69f4a1bf7653f0f604ef23faba088850ea36cfdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f4a1bf7653f0f604ef23fab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 25 19:03:19 2011 +0200 mshtml: Make sure we always create nsWineURI with valid IUri. --- dlls/mshtml/nsio.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b47a643..3222522 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -95,7 +95,7 @@ static BOOL ensure_uri(nsWineURI *This) return TRUE; } -static nsresult create_uri(nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,nsIURI*,HTMLWindow*,NSContainer*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -2111,14 +2111,12 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) } } - nsres = create_uri(nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, nsuri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); if(NS_FAILED(nsres)) { - WARN("create_uri failed: %08x\n", nsres); + WARN("create_nsuri failed: %08x\n", nsres); return nsres; } - wine_uri->uri = This->uri; - IUri_AddRef(wine_uri->uri); sync_wine_url(wine_uri); *_retval = (nsIURI*)&wine_uri->nsIURL_iface; @@ -2515,7 +2513,7 @@ static const nsIURLVtbl nsURLVtbl = { nsURL_GetRelativeSpec }; -static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSContainer *container, nsWineURI **_retval) { nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); @@ -2526,6 +2524,9 @@ static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *conta set_uri_nscontainer(ret, container); set_uri_window(ret, window); + IUri_AddRef(iuri); + ret->uri = iuri; + if(nsuri) nsIURI_QueryInterface(nsuri, &IID_nsIURL, (void**)&ret->nsurl); @@ -2537,9 +2538,16 @@ static nsresult create_uri(nsIURI *nsuri, HTMLWindow *window, NSContainer *conta HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) { nsWineURI *uri; + IUri *iuri; nsresult nsres; + HRESULT hres; + + hres = CreateUri(url, 0, 0, &iuri); + if(FAILED(hres)) + return hres; - nsres = create_uri(NULL, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, NULL, window, window->doc_obj->nscontainer, &uri); + IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2586,22 +2594,24 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC HTMLWindow *window = NULL; nsChannel *channel; nsWineURI *uri; + IUri *iuri; nsresult nsres; HRESULT hres; + hres = CreateUri(url, 0, 0, &iuri); + if(FAILED(hres)) + return hres; + if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_uri(NULL, window, NULL, &uri); + nsres = create_nsuri(iuri, NULL, window, NULL, &uri); + IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; - hres = CreateUri(url, 0, 0, &uri->uri); - if(SUCCEEDED(hres)) - nsres = create_nschannel(uri, &channel); sync_wine_url(uri); + nsres = create_nschannel(uri, &channel); nsIURL_Release(&uri->nsIURL_iface); - if(FAILED(hres)) - return hres; if(NS_FAILED(nsres)) return E_FAIL; @@ -2918,14 +2928,13 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * return nsres; } - nsres = create_uri(uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, uri, window, NULL, &wine_uri); + IUri_Release(urlmon_uri); if(base_wine_uri) nsIURI_Release(&base_wine_uri->nsIURL_iface); if(NS_FAILED(nsres)) return nsres; - wine_uri->uri = urlmon_uri; - sync_wine_url(wine_uri); *_retval = (nsIURI*)wine_uri; return nsres;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 95d769a0470d8be60063316c4000cd49d3e5aeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d769a0470d8be60063316c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:49:27 2011 +0200 Assorted spelling fixes. --- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/shell32/tests/shellpath.c | 6 +++--- programs/wscript/tests/run.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 0455ea7..2807150 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -630,7 +630,7 @@ static HRESULT WINAPI ID3DXMeshImpl_UpdateSemantics(ID3DXMesh *iface, D3DVERTEXE vertex_declaration_size = D3DXGetDeclVertexSize(declaration, declaration[0].Stream); if (vertex_declaration_size != This->vertex_declaration_size) { - WARN("Invalid declaration. New vertex size does not match the orginal vertex size.\n"); + WARN("Invalid declaration. New vertex size does not match the original vertex size.\n"); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 6925f2d..c96b94e 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -99,7 +99,7 @@ struct test_context /* Initializes a test context struct. Use it to initialize DirectX. * - * Returns NULL if an error occured. + * Returns NULL if an error occurred. */ static struct test_context *new_test_context(void) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 11626f5..1d6f0da 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -691,7 +691,7 @@ static void test_get_sampler_index(void) ok(index == 3, "ID3DXConstantTable_GetSamplerIndex returned wrong index: Got %d, expected 3\n", index); index = ID3DXConstantTable_GetSamplerIndex(ctable, "nonexistent"); - ok(index == -1, "ID3DXConstantTable_GetSamplerIndex found non-existent sampler: Got %d\n", + ok(index == -1, "ID3DXConstantTable_GetSamplerIndex found nonexistent sampler: Got %d\n", index); index = ID3DXConstantTable_GetSamplerIndex(ctable, "notsampler"); diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8f4378f..aed7ceb 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3228,7 +3228,7 @@ static HRESULT WINAPI knownfolder_GetCategory( TRACE("%p, %p\n", knownfolder, pCategory); - /* we can not get category for folder which is not registered */ + /* we cannot get a category for a folder which is not registered */ if(!knownfolder->registryPath) hr = E_FAIL; diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 825cca3..2b13cc4 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1185,7 +1185,7 @@ static void test_knownFolders(void) hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); - ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* try to set new path for folder */ @@ -1195,7 +1195,7 @@ static void test_knownFolders(void) /* verify modified path */ hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); - ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + ok(lstrcmpiW(folderPath, sExample2Path)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* set again to first path, but use another way */ @@ -1207,7 +1207,7 @@ static void test_knownFolders(void) hr = IKnownFolder_GetPath(folder, 0, &folderPath); ok(hr == S_OK, "failed to get path from known folder: 0x%08x\n", hr); todo_wine - ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retreived: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); + ok(lstrcmpiW(folderPath, sExamplePath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sExamplePath)); CoTaskMemFree(folderPath); /* check shell utility functions */ diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 405aae4..2c2a15a 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -334,7 +334,7 @@ static BOOL register_activex(void) hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf, CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid); - ok(hres == S_OK, "Could not register screipt engine: %08x\n", hres); + ok(hres == S_OK, "Could not register script engine: %08x\n", hres); return TRUE; }

1 0

Francois Gouget : vbscript: Make VBScriptFactory_CreateInstance() static.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: b47e6f1bef59a5d5ef5ef1897976cbeb665850c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47e6f1bef59a5d5ef5ef1897… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:50:06 2011 +0200 vbscript: Make VBScriptFactory_CreateInstance() static. --- dlls/vbscript/vbscript_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index ab2d3ef..50e4eb7 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HINSTANCE vbscript_hinstance; -HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +static HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); return E_NOINTERFACE;

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 49484479bd951ea3a81067945e786d843d207f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49484479bd951ea3a81067945… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:50:01 2011 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 6bcfac8..11626f5 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -567,7 +567,7 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) "The in-bounds elements of the array were not set, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", out[0], out[4], out[8], out[12], farray[0], farray[1], farray[2], farray[3]); ok(out[16] == 0.0f && out[20] == 0.0f && out[24] == 0.0f && out[28] == 0.0f, - "The excess elements of the array were set, out={%f, %f, %f, %f}, should be all 0.0f", + "The excess elements of the array were set, out={%f, %f, %f, %f}, should be all 0.0f\n", out[16], out[20], out[24], out[28]); /* ivecarray takes up only 1 register, but a matrix takes up 4, so no elements should be set */

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to some TRACE() calls.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: bdadc5d056814274039b1a3ffca777c3f4fda7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdadc5d056814274039b1a3ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:49:53 2011 +0200 d3dx9_36: Add a trailing '\n' to some TRACE() calls. --- dlls/d3dx9_36/shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e1240ce..c3ae172 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -833,7 +833,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); if (FAILED(hr)) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); return D3DERR_INVALIDCALL; } @@ -971,7 +971,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable * hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); if (FAILED(hr)) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); return D3DERR_INVALIDCALL; } @@ -1018,7 +1018,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); if (FAILED(hr)) { - TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x\n", hr); return D3DERR_INVALIDCALL; }

1 0

Francois Gouget : shell32: Update a comment.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: dddac58a9868d9d79c4c5097011e562bf8168ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddac58a9868d9d79c4c50970… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:49:40 2011 +0200 shell32: Update a comment. --- dlls/shell32/shlview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 93077d5..1367afb 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1289,7 +1289,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw CheckToolbar(This); break; - /* the menu-ID's for sorting are 0x30... see shrec.rc */ + /* the menu-ID's for sorting are 0x30... see shell32.rc */ case 0x30: case 0x31: case 0x32:

1 0

Francois Gouget : d3dx9_36: Fix compilation on systems that don' t support nameless structs/unions.
by Alexandre Julliard 27 Jun '11

27 Jun '11

Module: wine Branch: master Commit: 71e41b81dd9224e4fdd9b5a7e6a4cbd025d9402a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e41b81dd9224e4fdd9b5a7e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 25 13:26:25 2011 +0200 d3dx9_36: Fix compilation on systems that don't support nameless structs/unions. --- dlls/d3dx9_36/shader.c | 7 +++++-- dlls/d3dx9_36/tests/shader.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index bddef33..e1240ce 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -20,6 +20,9 @@ #include "config.h" #include "wine/port.h" + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "wine/debug.h" #include "wine/unicode.h" #include "windef.h" @@ -1032,9 +1035,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * D3DXMatrixTranspose(&temp, &matrix[i]); if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); } break; default: diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 5bcd216..6bcfac8 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -487,18 +487,18 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) /* Get constants back and validate */ IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 4); - ok(out[0] == mvp._11 && out[4] == mvp._12 && out[8] == mvp._13 && out[12] == mvp._14, + ok(out[0] == S(U(mvp))._11 && out[4] == S(U(mvp))._12 && out[8] == S(U(mvp))._13 && out[12] == S(U(mvp))._14, "The first row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[0], out[4], out[8], out[12], mvp._11, mvp._12, mvp._13, mvp._14); - ok(out[1] == mvp._21 && out[5] == mvp._22 && out[9] == mvp._23 && out[13] == mvp._24, + out[0], out[4], out[8], out[12], S(U(mvp))._11, S(U(mvp))._12, S(U(mvp))._13, S(U(mvp))._14); + ok(out[1] == S(U(mvp))._21 && out[5] == S(U(mvp))._22 && out[9] == S(U(mvp))._23 && out[13] == S(U(mvp))._24, "The second row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[1], out[5], out[9], out[13], mvp._21, mvp._22, mvp._23, mvp._24); - ok(out[2] == mvp._31 && out[6] == mvp._32 && out[10] == mvp._33 && out[14] == mvp._34, + out[1], out[5], out[9], out[13], S(U(mvp))._21, S(U(mvp))._22, S(U(mvp))._23, S(U(mvp))._24); + ok(out[2] == S(U(mvp))._31 && out[6] == S(U(mvp))._32 && out[10] == S(U(mvp))._33 && out[14] == S(U(mvp))._34, "The third row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[2], out[6], out[10], out[14], mvp._31, mvp._32, mvp._33, mvp._34); - ok(out[3] == mvp._41 && out[7] == mvp._42 && out[11] == mvp._43 && out[15] == mvp._44, + out[2], out[6], out[10], out[14], S(U(mvp))._31, S(U(mvp))._32, S(U(mvp))._33, S(U(mvp))._34); + ok(out[3] == S(U(mvp))._41 && out[7] == S(U(mvp))._42 && out[11] == S(U(mvp))._43 && out[15] == S(U(mvp))._44, "The fourth row of mvp was not set correctly, got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[3], out[7], out[11], out[15], mvp._41, mvp._42, mvp._43, mvp._44); + out[3], out[7], out[11], out[15], S(U(mvp))._41, S(U(mvp))._42, S(U(mvp))._43, S(U(mvp))._44); IDirect3DDevice9_GetVertexShaderConstantF(device, 4, out, 1); ok(out[0] == (float)i && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f, @@ -612,12 +612,12 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device) IDirect3DDevice9_GetVertexShaderConstantF(device, 0, out, 8); /* Just check a few elements in each matrix to make sure fmtxarray was set row-major */ - ok(out[0] == fmtxarray[0]._11 && out[1] == fmtxarray[0]._12 && out[2] == fmtxarray[0]._13 && out[3] == fmtxarray[0]._14, + ok(out[0] == S(U(fmtxarray[0]))._11 && out[1] == S(U(fmtxarray[0]))._12 && out[2] == S(U(fmtxarray[0]))._13 && out[3] == S(U(fmtxarray[0]))._14, "The variable fmtxarray was not set row-major, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[0], out[1], out[2], out[3], fmtxarray[0]._11, fmtxarray[0]._12, fmtxarray[0]._13, fmtxarray[0]._14); - ok(out[16] == fmtxarray[1]._11 && out[17] == fmtxarray[1]._12 && out[18] == fmtxarray[1]._13 && out[19] == fmtxarray[1]._14, + out[0], out[1], out[2], out[3], S(U(fmtxarray[0]))._11, S(U(fmtxarray[0]))._12, S(U(fmtxarray[0]))._13, S(U(fmtxarray[0]))._14); + ok(out[16] == S(U(fmtxarray[1]))._11 && out[17] == S(U(fmtxarray[1]))._12 && out[18] == S(U(fmtxarray[1]))._13 && out[19] == S(U(fmtxarray[1]))._14, "The variable fmtxarray was not set row-major, out={%f, %f, %f, %f}, should be {%f, %f, %f, %f}\n", - out[16], out[17], out[18], out[19], fmtxarray[1]._11, fmtxarray[1]._12, fmtxarray[1]._13, fmtxarray[1]._14); + out[16], out[17], out[18], out[19], S(U(fmtxarray[1]))._11, S(U(fmtxarray[1]))._12, S(U(fmtxarray[1]))._13, S(U(fmtxarray[1]))._14); refcnt = ID3DXConstantTable_Release(ctable); ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011