February 2008 - Wine-Commits

Jacek Caban : mshtml: Fixed bound_pos handling in move_prev_chars.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: d992735dcc4a9dd04c30be50185fbb388101582b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d992735dcc4a9dd04c30be501… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Feb 10 19:47:21 2008 +0100 mshtml: Fixed bound_pos handling in move_prev_chars. --- dlls/mshtml/txtrange.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 7e505df..df8ee55 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -826,6 +826,7 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B { dompos_t iter, tmp; long ret = 0; + BOOL prev_eq = FALSE; WCHAR c; if(bounded) @@ -847,14 +848,16 @@ static long move_prev_chars(HTMLTxtRange *This, long cnt, const dompos_t *pos, B ret++; - if(bound_pos && dompos_cmp(&iter, bound_pos)) { + if(prev_eq) { *bounded = TRUE; - cnt--; + ret++; } + + prev_eq = bound_pos && dompos_cmp(&iter, bound_pos); } *new_pos = iter; - return bounded && *bounded ? ret+1 : ret; + return ret; } static long find_prev_space(HTMLTxtRange *This, const dompos_t *pos, BOOL first_space, dompos_t *ret)

1 0

Francois Gouget : user32/tests: Add the trailing '\n' to ok() calls.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 6922075e582f8d0e0420f79165687f26ec633981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6922075e582f8d0e0420f7916… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 10 00:30:21 2008 +0100 user32/tests: Add the trailing '\n' to ok() calls. --- dlls/user32/tests/listbox.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 18b7951..6d0d2c8 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -562,7 +562,7 @@ static void test_listbox_LB_DIR() HANDLE file; file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); CloseHandle( file ); /* NOTE: for this test to succeed, there must be no subdirectories @@ -1055,7 +1055,7 @@ static void test_listbox_dlgdir(void) HANDLE file; file = CreateFileA( "wtest1.tmp.c", FILE_ALL_ACCESS, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); - ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); CloseHandle( file ); /* NOTE: for this test to succeed, there must be no subdirectories

1 0

Francois Gouget : tests: Avoid InterlockedExchangeAdd() as it is not supported on Windows 95.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 2c6cba8eefe4505eecbab37e72b09c7ad5af5773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cba8eefe4505eecbab37e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Feb 10 00:30:28 2008 +0100 tests: Avoid InterlockedExchangeAdd() as it is not supported on Windows 95. --- include/wine/test.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 32850ce..72cd84c 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -354,7 +354,8 @@ void winetest_wait_child_process( HANDLE process ) { fprintf( stdout, "%s: %u failures in child process\n", current_test->name, exit_code ); - InterlockedExchangeAdd( &failures, exit_code ); + while (exit_code-- > 0) + InterlockedIncrement(&failures); } }

1 0

Andrew Talbot : atl: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: f83cd9d08fa01409d3594acaf9468d857e3da28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83cd9d08fa01409d3594acaf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 9 17:13:34 2008 +0000 atl: Assign to structs instead of using memcpy. --- dlls/atl/atl_ax.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 6ffccde..1d8a67c 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -343,9 +343,9 @@ static HRESULT WINAPI OleInPlaceSiteWindowless_GetWindowContext(IOleInPlaceSiteW TRACE("(%p,%p,%p,%p,%p,%p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); if ( lprcClipRect ) - memcpy(lprcClipRect, &This->size, sizeof(RECT)); + *lprcClipRect = This->size; if ( lprcPosRect ) - memcpy(lprcPosRect, &This->size, sizeof(RECT)); + *lprcPosRect = This->size; if ( ppFrame ) { @@ -958,7 +958,7 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, else { /* FIXME - check for MSHTML: prefix! */ content = IsURL; - memcpy( &controlId, &CLSID_WebBrowser, sizeof(controlId) ); + controlId = CLSID_WebBrowser; } hRes = CoCreateInstance( &controlId, 0, CLSCTX_ALL, &IID_IOleObject,

1 0

Paul Vriens : crypt32/tests: Skip test if we don't have enough rights.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 24e4267bf9b7d2e2f6961838621f7cdf27a599b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e4267bf9b7d2e2f69618386… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Feb 9 17:20:58 2008 +0100 crypt32/tests: Skip test if we don't have enough rights. --- dlls/crypt32/tests/oid.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index b4950fc..2477bf5 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -449,9 +449,13 @@ static void test_getDefaultOIDFunctionAddress(void) "Expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* Even with a registered dll, this fails (since the dll doesn't exist) */ + SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); - ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + skip("Need admin rights\n"); + else + ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); ret = CryptGetDefaultOIDFunctionAddress(set, 0, NULL, 0, &funcAddr, &hFuncAddr); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND,

1 0

Paul Vriens : advpack/tests: Show errors in hex.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 795087bcc16fc7ffa2d4f716b5b46f97159a6313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=795087bcc16fc7ffa2d4f716b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat Feb 9 17:18:44 2008 +0100 advpack/tests: Show errors in hex. --- dlls/advpack/tests/advpack.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index b09a9c6..4232f76 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -521,7 +521,7 @@ static void setperusersecvalues_test(void) /* set initial values */ lstrcpy(peruser.szGUID, "guid"); hr = pSetPerUserSecValues(&peruser); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(OPEN_GUID_KEY(), "Expected guid key to exist\n"); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); @@ -538,7 +538,7 @@ static void setperusersecvalues_test(void) /* raise the version, but bRollback is FALSE, so vals not saved */ lstrcpy(peruser.szVersion, "2,1,1,1"); hr = pSetPerUserSecValues(&peruser); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n"); @@ -555,7 +555,7 @@ static void setperusersecvalues_test(void) peruser.bRollback = TRUE; lstrcpy(peruser.szVersion, "3,1,1,1"); hr = pSetPerUserSecValues(&peruser); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(check_reg_str(guid, NULL, "displayname"), "Expected displayname\n"); ok(check_reg_str(guid, "ComponentID", "compid"), "Expected compid\n"); ok(check_reg_str(guid, "Locale", "locale"), "Expected locale\n");

1 0

Andrew Talbot : wineoss.drv: Remove unneeded casts.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 806867feec38211242cc9b5abc2208b49c96a1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806867feec38211242cc9b5ab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 8 21:58:48 2008 +0000 wineoss.drv: Remove unneeded casts. --- dlls/wineoss.drv/audio.c | 4 ++-- dlls/wineoss.drv/midi.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 7ea80a6..ebd785e 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1881,7 +1881,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo) static DWORD CALLBACK wodPlayer(LPVOID pmt) { WORD uDevID = (DWORD)pmt; - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)&WOutDev[uDevID]; + WINE_WAVEOUT* wwo = &WOutDev[uDevID]; DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ DWORD dwSleepTime; @@ -2529,7 +2529,7 @@ static void widRecorder_ReadHeaders(WINE_WAVEIN * wwi) static DWORD CALLBACK widRecorder(LPVOID pmt) { WORD uDevID = (DWORD)pmt; - WINE_WAVEIN* wwi = (WINE_WAVEIN*)&WInDev[uDevID]; + WINE_WAVEIN* wwi = &WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 4245ad0..aa9088a 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -568,7 +568,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) { WARN("Couldn't notify client\n"); } @@ -856,8 +856,8 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; - ptr = (LPMIDIHDR)ptr->lpNext); - ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + ptr = ptr->lpNext); + ptr->lpNext = lpMidiHdr; } LeaveCriticalSection(&crit_sect); @@ -926,7 +926,7 @@ static DWORD midReset(WORD wDevID) (DWORD)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { WARN("Couldn't notify client\n"); } - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)MidiInDev[wDevID].lpQueueHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect);

1 0

Rob Shearman : mshtml: Fix inserting a hyperlink when text is already selected.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 5209ed0c5e1f3b605b5d716896a09ebc094b8985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5209ed0c5e1f3b605b5d71689… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 8 12:17:10 2008 +0000 mshtml: Fix inserting a hyperlink when text is already selected. There is no need to use cmd_insertLinkNoUI when we have the code to do most of the action anyway. Make use of the handy InsertLinkAroundSelection to insert the "a" element when not inserting at the caret and don't create a text node in this case because it is redundant. --- dlls/mshtml/editor.c | 64 ++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 00a3ba1..542bf55 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1160,11 +1160,11 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, { BSTR url = NULL; INT ret; - nsAString ns_url; - PRBool insert_link_at_caret; nsISelection *nsselection; + nsIDOMDocument *nsdoc; + nsresult nsres; - FIXME("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); + TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); if (cmdexecopt == OLECMDEXECOPT_DONTPROMPTUSER) { @@ -1186,29 +1186,23 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (!nsselection) return E_FAIL; - nsAString_Init(&ns_url, url); - - nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); - - if (insert_link_at_caret) + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); + if(NS_SUCCEEDED(nsres)) { static const WCHAR wszA[] = {'a',0}; static const WCHAR wszHref[] = {'h','r','e','f',0}; nsIHTMLEditor *html_editor; - nsIDOMDocument *nsdoc; nsIDOMNode *text_node; nsIDOMElement *anchor_elem; nsIDOMNode *unused_node; nsAString a_str; nsAString href_str; - nsresult nsres; - - nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) - return E_FAIL; + nsAString ns_url; + PRBool insert_link_at_caret; nsAString_Init(&a_str, wszA); nsAString_Init(&href_str, wszHref); + nsAString_Init(&ns_url, url); /* create an element for the link */ nsIDOMDocument_CreateElement(nsdoc, &a_str, &anchor_elem); @@ -1217,44 +1211,48 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsAString_Finish(&href_str); nsAString_Finish(&a_str); + nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); + /* create an element with text of URL */ - nsIDOMDocument_CreateTextNode(nsdoc, &ns_url, (nsIDOMText **)&text_node); + if (insert_link_at_caret) + { + nsIDOMDocument_CreateTextNode(nsdoc, &ns_url, (nsIDOMText **)&text_node); + + /* wrap the <a> tags around the text element */ + nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); + nsIDOMNode_Release(text_node); + nsIDOMNode_Release(unused_node); + } - /* wrap the <a> tags around the text element */ - nsIDOMElement_AppendChild(anchor_elem, text_node, &unused_node); - nsIDOMNode_Release(text_node); - nsIDOMNode_Release(unused_node); + nsAString_Finish(&ns_url); nsIEditor_QueryInterface(This->nscontainer->editor, &IID_nsIHTMLEditor, (void **)&html_editor); if (html_editor) { - /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); + if (insert_link_at_caret) + { + /* add them to the document at the caret position */ + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); + nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); + } + else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); nsIHTMLEditor_Release(html_editor); } - nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); - nsIDOMElement_Release(anchor_elem); nsIDOMDocument_Release(nsdoc); } else - { - nsICommandParams *nsparam = create_nscommand_params(); - - nsICommandParams_SetStringValue(nsparam, NSSTATE_ATTRIBUTE, &ns_url); - do_ns_command(This->nscontainer, NSCMD_INSERTLINKNOUI, nsparam); - nsICommandParams_Release(nsparam); - } - - nsAString_Finish(&ns_url); + nsres = E_FAIL; nsISelection_Release(nsselection); if (cmdexecopt != OLECMDEXECOPT_DONTPROMPTUSER) SysFreeString(url); - return S_OK; + TRACE("-- 0x%08x\n", nsres); + return nsres; } static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd)

1 0

Andrew Talbot : winejoystick.drv: Remove unneeded casts.
by Alexandre Julliard Feb. 11, 2008

Feb. 11, 2008

Module: wine Branch: master Commit: 2d90d0d400bc02c0cc242b88650e68a10d9918e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d90d0d400bc02c0cc242b886… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Feb 8 21:58:40 2008 +0000 winejoystick.drv: Remove unneeded casts. --- dlls/winejoystick.drv/joystick.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index f8d0511..ac088da 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -403,9 +403,7 @@ static LRESULT JSTCK_GetPosEx(DWORD_PTR dwDevID, LPJOYINFOEX lpInfo) TRACE("x: %d, y: %d, z: %d, r: %d, u: %d, v: %d, buttons: 0x%04x, flags: 0x%04x (fd %d)\n", lpInfo->dwXpos, lpInfo->dwYpos, lpInfo->dwZpos, lpInfo->dwRpos, lpInfo->dwUpos, lpInfo->dwVpos, - (unsigned int)lpInfo->dwButtons, - (unsigned int)lpInfo->dwFlags, - dev + lpInfo->dwButtons, lpInfo->dwFlags, dev ); return JOYERR_NOERROR;

1 0

Jeremy Newman : fix when session messages are empty
by Jeremy Newman Feb. 8, 2008

Feb. 8, 2008

Module: appdb Branch: master Commit: e3ea460e9c5c7637992e3dbf0d94f3f3faabeb9f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e3ea460e9c5c7637992e3dbf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 8 13:18:29 2008 -0600 fix when session messages are empty --- include/incl.php | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/incl.php b/include/incl.php index b66f103..4bef0e0 100644 --- a/include/incl.php +++ b/include/incl.php @@ -268,16 +268,18 @@ function purgeSessionMessages() function dumpmsgbuffer() { $GLOBALS['session']->dumpmsgbuffer(); - - echo html_frame_start("","300","",5); - foreach ($GLOBALS['session']->msg as $msg) + if (is_array($GLOBALS['session']->msg) and count($GLOBALS['session']->msg) > 0) { - if ($msg['color'] == "red") - $msg['color'] = "{$msg['color']};text-decoration:blink"; - echo "<div align=\"center\" style=\"font-color:{$msg['color']};\"> {$msg['msg']} </div>"; + echo html_frame_start("","300","",5); + foreach ($GLOBALS['session']->msg as $msg) + { + if ($msg['color'] == "red") + $msg['color'] = "{$msg['color']};text-decoration:blink"; + echo "<div align=\"center\" style=\"font-color:{$msg['color']};\"> {$msg['msg']} </div>"; + } + echo html_frame_end(" "); + echo "<br>\n"; } - echo html_frame_end(" "); - echo "<br>\n"; } /**

1 0