wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Thomas Mullaly : urlmon/tests: IUriBuilder's can create IUri' s even if they don't have a base IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d56e62a1cf56c3df7afc17a8ca3d6a454d78c482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56e62a1cf56c3df7afc17a8c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 8 17:24:19 2010 -0400 urlmon/tests: IUriBuilder's can create IUri's even if they don't have a base IUri. --- dlls/urlmon/tests/uri.c | 51 +++++++++++++++++++++++++++++++--------------- dlls/urlmon/uri.c | 23 ++------------------ 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6723a47..2c18c87 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4888,6 +4888,40 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* IUriBuilder doesn't need a base IUri to build a IUri. */ + { NULL,0,S_OK,FALSE, + { + {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE}, + {TRUE,"google.com",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -6500,10 +6534,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { IUri *test = NULL, *uri = (void*) 0xdeadbeef; /* Test what happens if the IUriBuilder doesn't have a IUri set. */ - hr = IUriBuilder_CreateUri(builder, 0, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, INET_E_INVALID_URL); - ok(uri == NULL, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUri(builder, 0, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); @@ -6512,12 +6542,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_NOTIMPL); ok(uri == NULL, "Error: expected uri to be NULL, but was %p instead.\n", uri); - uri = (void*) 0xdeadbeef; - hr = IUriBuilder_CreateUriSimple(builder, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", - hr, INET_E_INVALID_URL); - ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUriSimple(builder, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); @@ -6528,13 +6552,6 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { hr, E_NOTIMPL); ok(!uri, "Error: Expected uri to NULL, but was %p instead.\n", uri); - uri = (void*) 0xdeadbeef; - hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, &uri); - ok(hr == INET_E_INVALID_URL, - "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", - hr, INET_E_INVALID_URL); - ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); - hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, NULL); ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 50944bd..2d8a22f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4404,16 +4404,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, return E_POINTER; /* Acts the same way as CreateUri. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL; } @@ -4433,19 +4428,12 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, /* The only time it doesn't return E_NOTIMPL when the dwAllow parameter * has flags set, is when the IUriBuilder has a IUri set and it hasn't * been modified (a call to a "Set*" hasn't been performed). - * - * TODO: Check if the IUriBuilder's properties have been modified. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL; } @@ -4465,16 +4453,11 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, return E_POINTER; /* Same as CreateUri. */ - if(dwAllowEncodingPropertyMask && !This->uri) { + if(dwAllowEncodingPropertyMask && (!This->uri || This->modified_props)) { *ppIUri = NULL; return E_NOTIMPL; } - if(!This->uri) { - *ppIUri = NULL; - return INET_E_INVALID_URL; - } - FIXME("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL;

1 0

Thomas Mullaly : urlmon/tests: Restructured IUriBuilder tests so they can accept IUriBuilders which don' t have a base IUri.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: dd0ea1cc294ecb5977a888e72dabff664c02ba08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0ea1cc294ecb5977a888e72… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 21:22:24 2010 -0400 urlmon/tests: Restructured IUriBuilder tests so they can accept IUriBuilders which don't have a base IUri. Turns out an IUriBuilder doesn't need a valid IUri set as its IUri property for the CreateUri* functions to succeed. --- dlls/urlmon/tests/uri.c | 634 ++++++++++++++++++++++++++++------------------- 1 files changed, 381 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd0ea1cc294ecb5977a88…

1 0

Thomas Mullaly : urlmon/tests: Removed no longer needed todo_wine's.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 84987e05b5936ce00805ad9d155412fd0af6a4c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84987e05b5936ce00805ad9d1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 20:46:34 2010 -0400 urlmon/tests: Removed no longer needed todo_wine's. --- dlls/urlmon/tests/uri.c | 318 +++++++++++++++++------------------------------ 1 files changed, 114 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84987e05b5936ce00805a…

1 0

Thomas Mullaly : urlmon: Fixed bug in IUriBuilder_GetUserName.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: dfa7c7e8e65a28067b6699b895f70969b050373b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa7c7e8e65a28067b6699b89… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 7 20:38:38 2010 -0400 urlmon: Fixed bug in IUriBuilder_GetUserName. --- dlls/urlmon/uri.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index dbe6d72..50944bd 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4605,8 +4605,7 @@ static HRESULT WINAPI UriBuilder_GetUserName(IUriBuilder *iface, DWORD *pcchUser UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchUserName, ppwzUserName); - if(!This->uri || This->uri->userinfo_start == -1 || - This->uri->userinfo_start == This->uri->userinfo_split || + if(!This->uri || This->uri->userinfo_start == -1 || This->uri->userinfo_split == 0 || This->modified_props & Uri_HAS_USER_NAME) return get_builder_component(&This->username, &This->username_len, NULL, 0, ppwzUserName, pcchUserName); else {

1 0

Anders Jonsson : ipconfig: Update Swedish translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: d94d32dd3ce03444c4cdca9552b966fd6d48e104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94d32dd3ce03444c4cdca955… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Sep 8 23:23:36 2010 +0200 ipconfig: Update Swedish translation. --- programs/ipconfig/Sv.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Sv.rc b/programs/ipconfig/Sv.rc index 1268d25..7f36db2 100644 --- a/programs/ipconfig/Sv.rc +++ b/programs/ipconfig/Sv.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beskrivning" STRING_PHYS_ADDR, "Fysisk adress" STRING_DHCP_ENABLED, "DHCP aktiverat" + STRING_YES, "Ja" + STRING_NO, "Nej" }

1 0

Austin English : mmdevapi: Remove an unused variable.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: f74944d21054c9e5026cd5944e72abc22a65bb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74944d21054c9e5026cd5944… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 8 16:48:22 2010 -0500 mmdevapi: Remove an unused variable. --- dlls/mmdevapi/audio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/audio.c b/dlls/mmdevapi/audio.c index ea9305a..0433b84 100644 --- a/dlls/mmdevapi/audio.c +++ b/dlls/mmdevapi/audio.c @@ -1370,7 +1370,7 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN ACCapture *This = (ACCapture*)iface; HRESULT hr; DWORD block = This->parent->pwfx->nBlockAlign; - DWORD ofs, bufsize; + DWORD ofs; TRACE("(%p)->(%p,%p,%p,%p,%p)\n", This, data, frames, flags, devpos, qpcpos); if (!data) @@ -1387,7 +1387,6 @@ static HRESULT WINAPI ACC_GetBuffer(IAudioCaptureClient *iface, BYTE **data, UIN goto out; IAudioCaptureClient_GetNextPacketSize(iface, frames); ofs = This->parent->ofs; - bufsize = This->parent->bufsize; if ( (ofs*block) % This->parent->psize) ERR("Unaligned offset %u with %u\n", ofs*block, This->parent->psize); *data = This->parent->buffer + ofs * block;

1 0

André Hentschel : winedbg: Fix typo in German translation.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 7bf924f67218cdf18a73ca9bc3113ddd38dc7190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf924f67218cdf18a73ca9bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 8 21:55:26 2010 +0200 winedbg: Fix typo in German translation. --- programs/winedbg/rsrc_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index 360f156..a02ea68 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.rc @@ -51,7 +51,7 @@ END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine Programm absturz" + IDS_AUTO_CAPTION "Wine Programm Absturz" IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" IDS_UNIDENTIFIED "(unbekannt)" END

1 0

Joris Huizer : msxml3: Fix copy/paste error in get_lastChild functions.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 37f61acb7703c67d2ad96a4a01f01f11869560df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f61acb7703c67d2ad96a4a0… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Sep 8 21:55:37 2010 +0200 msxml3: Fix copy/paste error in get_lastChild functions. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/node.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index e96cb6e..f1b7643 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -263,7 +263,7 @@ static HRESULT WINAPI domattr_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domattr_get_previousSibling( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 801d2a9..7b97050 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -269,7 +269,7 @@ static HRESULT WINAPI domfrag_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domfrag_get_previousSibling( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 35a8f7c..c66ea74 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -779,7 +779,7 @@ static HRESULT WINAPI domdoc_get_lastChild( TRACE("(%p)->(%p)\n", This, lastChild); - return node_get_first_child(&This->node, lastChild); + return node_get_last_child(&This->node, lastChild); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index fa9b18d..1cce5e1 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -278,7 +278,7 @@ static HRESULT WINAPI domelem_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI domelem_get_previousSibling( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index b1217b2..57e6683 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -265,7 +265,7 @@ static HRESULT WINAPI entityref_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI entityref_get_previousSibling( diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index f37b081..921ef15 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1844,7 +1844,7 @@ static HRESULT WINAPI unknode_get_lastChild( TRACE("(%p)->(%p)\n", This, domNode); - return node_get_first_child(&This->node, domNode); + return node_get_last_child(&This->node, domNode); } static HRESULT WINAPI unknode_get_previousSibling(

1 0

Joris Huizer : wined3d: Fix typo in checkGLcall.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 2fd50cb4b8ccc033c714676cd9421da7170d25da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd50cb4b8ccc033c714676cd… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Sep 8 21:50:02 2010 +0200 wined3d: Fix typo in checkGLcall. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c04b317..f6249ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3915,7 +3915,7 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock /* Window Coord 0 is the middle of the first pixel, so translate by 1/2 pixels */ glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f); - checkGLcall("glTranslatef(63.0f / 128.0f, -63.0f / 128.0f, 0.0f)"); + checkGLcall("glTranslatef(63.0f / 128.0f, 63.0f / 128.0f, 0.0f)"); } else {

1 0

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 9e1d9ef972f65e292e7b00e1da9293271bc60486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d9ef972f65e292e7b00e1d… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
86
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 September 2010