January 2008 - Wine-commits

Austin English : More spelling fixes.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 79c0bc28ff2434f69ee5547b20a4ac26b13602a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c0bc28ff2434f69ee5547b2… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 3 11:04:28 2008 -0600 More spelling fixes. --- dlls/winmm/mci.c | 2 +- dlls/winmm/winmm.c | 6 +++--- dlls/wldap32/ber.c | 6 +++--- dlls/wldap32/control.c | 2 +- dlls/ws2_32/async.c | 2 +- dlls/ws2_32/socket.c | 10 +++++----- dlls/ws2_32/socket16.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 52d5402..b7b5ac2 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -873,7 +873,7 @@ static DWORD MCI_LoadMciDriver(LPCWSTR _strDevTyp, LPWINE_MCIDRIVER* lpwmd) wmd->CreatorThread = GetCurrentThreadId(); EnterCriticalSection(&WINMM_cs); - /* wmd must be inserted in list before sending opening the driver, coz' it + /* wmd must be inserted in list before sending opening the driver, because it * may want to lookup at wDevID */ wmd->lpNext = MciDrivers; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 1f3602c..4ecf34b 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -453,7 +453,7 @@ UINT WINAPI mixerGetControlDetailsA(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdA switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK) { case MIXER_GETCONTROLDETAILSF_VALUE: - /* can savely use A structure as it is, no string inside */ + /* can safely use A structure as it is, no string inside */ ret = mixerGetControlDetailsW(hmix, lpmcdA, fdwDetails); break; case MIXER_GETCONTROLDETAILSF_LISTTEXT: @@ -887,7 +887,7 @@ UINT WINAPI midiOutGetErrorTextW(UINT uError, LPWSTR lpText, UINT uSize) if (lpText == NULL) ret = MMSYSERR_INVALPARAM; else if (uSize == 0) ret = MMSYSERR_NOERROR; else if ( - /* test has been removed 'coz MMSYSERR_BASE is 0, and gcc did emit + /* test has been removed because MMSYSERR_BASE is 0, and gcc did emit * a warning for the test was always true */ (/*uError >= MMSYSERR_BASE && */ uError <= MMSYSERR_LASTERROR) || (uError >= MIDIERR_BASE && uError <= MIDIERR_LASTERROR)) { @@ -1795,7 +1795,7 @@ MMRESULT MIDI_StreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, DWORD cMidi return MMSYSERR_NOMEM; lpMidiStrm->dwTempo = 500000; - lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quater notes per minute *//* FIXME ??*/ + lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/ lpMidiStrm->dwPositionMS = 0; mosm.dwStreamID = (DWORD)lpMidiStrm; diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 159c128..5615135 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -161,7 +161,7 @@ ULONG CDECL WLDAP32_ber_first_element( BerElement *berelement, ULONG *len, CHAR * Flatten a berelement structure into a berval structure. * * PARAMS - * berlement [I] Pointer to a berelement structure. + * berelement [I] Pointer to a berelement structure. * berval [O] Pointer to a berval structure. * * RETURNS @@ -187,7 +187,7 @@ INT CDECL WLDAP32_ber_flatten( BerElement *berelement, PBERVAL *berval ) * Free a berelement structure. * * PARAMS - * berlement [I] Pointer to the berelement structure to be freed. + * berelement [I] Pointer to the berelement structure to be freed. * buf [I] Flag. * * RETURNS @@ -245,7 +245,7 @@ BerElement * CDECL WLDAP32_ber_init( BERVAL *berval ) * Failure: LBER_DEFAULT (no more data). * * NOTES - * len and cookie are intitialised by ber_first_element and should + * len and cookie are initialized by ber_first_element and should * be passed on in subsequent calls to ber_next_element. */ ULONG CDECL WLDAP32_ber_next_element( BerElement *berelement, ULONG *len, CHAR *opaque ) diff --git a/dlls/wldap32/control.c b/dlls/wldap32/control.c index bc606c9..b9caf7c 100644 --- a/dlls/wldap32/control.c +++ b/dlls/wldap32/control.c @@ -247,7 +247,7 @@ INT CDECL ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, * Failure: An LDAP error code. * * NOTES - * Pass the created control in conjuction with a sort control as + * Pass the created control in conjunction with a sort control as * server controls in subsequent calls to ldap_search_ext(_s). The * server will then return a sorted, contiguous subset of results * that meets the criteria specified in the LDAPVLVInfo structure. diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index ef7be5f..b9c7457 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -114,7 +114,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); -/* critical section to protect some non-rentrant net function */ +/* critical section to protect some non-reentrant net function */ CRITICAL_SECTION csWSgetXXXbyYYY; static CRITICAL_SECTION_DEBUG critsect_debug = { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98eb2f9..f82ecc5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -155,7 +155,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); -/* critical section to protect some non-rentrant net function */ +/* critical section to protect some non-reentrant net function */ extern CRITICAL_SECTION csWSgetXXXbyYYY; union generic_unix_sockaddr @@ -1958,7 +1958,7 @@ WS_u_short WINAPI WS_htons(WS_u_short hostshort) /*********************************************************************** * WSAHtonl (WS2_32.46) - * From MSDN decription of error codes, this function should also + * From MSDN description of error codes, this function should also * check if WinSock has been initialized and the socket is a valid * socket. But why? This function only translates a host byte order * u_long into a network byte order u_long... @@ -2940,10 +2940,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, #endif #if defined(SO_RCVTIMEO) || defined(SO_SNDTIMEO) if (optval && optlen == sizeof(UINT32)) { - /* WinSock passes miliseconds instead of struct timeval */ + /* WinSock passes milliseconds instead of struct timeval */ tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; tval.tv_sec = *(const UINT32*)optval / 1000; - /* min of 500 milisec */ + /* min of 500 milliseconds */ if (tval.tv_sec == 0 && tval.tv_usec < 500000) tval.tv_usec = 500000; optlen = sizeof(struct timeval); @@ -3968,7 +3968,7 @@ static int list_dup(char** l_src, char** l_to, int item_size) /* duplicate hostent entry * and handle all Win16/Win32 dependent things (struct size, ...) *correctly*. - * Dito for protoent and servent. + * Ditto for protoent and servent. */ static struct WS_hostent *WS_dup_he(const struct hostent* p_he) { diff --git a/dlls/ws2_32/socket16.c b/dlls/ws2_32/socket16.c index 6b33263..b4b3fe8 100644 --- a/dlls/ws2_32/socket16.c +++ b/dlls/ws2_32/socket16.c @@ -132,7 +132,7 @@ static SEGPTR get_buffer_pe(int size) /* duplicate hostent entry * and handle all Win16/Win32 dependent things (struct size, ...) *correctly*. - * Dito for protoent and servent. + * Ditto for protoent and servent. */ static SEGPTR ws_hostent_32_to_16( const struct WS_hostent* he ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4446e7f..8dc1f12 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -238,7 +238,7 @@ static char* test_buffer ( char *buf, int chunk_size, int n_chunks ) /* * This routine is called when a client / server does not expect any more data, - * but needs to acknowedge the closing of the connection (by reasing 0 bytes). + * but needs to acknowledge the closing of the connection (by reading 0 bytes). */ static void read_zero_bytes ( SOCKET s ) {

1 0

Lance Jackson : cmd: Fix some unclosed file and registry handles.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: d56217e98e49dd7ca89a4560a23d45b1d2bb7e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56217e98e49dd7ca89a4560a… Author: Lance Jackson <lancej(a)lancej.net> Date: Thu Jan 3 18:03:44 2008 -0600 cmd: Fix some unclosed file and registry handles. --- programs/cmd/batch.c | 4 +--- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1d12706..15057b3 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -70,9 +70,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN strcpyW (string, file); CharLower (string); if (strstrW (string, extension_exe) == NULL) strcatW (string, extension_exe); - h = CreateFile (string, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h != INVALID_HANDLE_VALUE) { + if (GetFileAttributes (string) != INVALID_FILE_ATTRIBUTES) { WCMD_run_program (command, 0); } else { SetLastError (ERROR_FILE_NOT_FOUND); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 43f63f6..549795c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2598,11 +2598,11 @@ void WCMD_assoc (WCHAR *command, BOOL assoc) { WCMD_output_asis(keyValue); } WCMD_output_asis(newline); + RegCloseKey(readKey); } } } } - RegCloseKey(readKey); } else { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 52a3108..16a0991 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -377,6 +377,7 @@ int wmain (int argc, WCHAR *argvW[]) value = strtoulW(strvalue, NULL, 10); } } + RegCloseKey(key); } if (value == 0 && RegOpenKeyEx(HKEY_LOCAL_MACHINE, regKeyW, @@ -397,6 +398,7 @@ int wmain (int argc, WCHAR *argvW[]) value = strtoulW(strvalue, NULL, 10); } } + RegCloseKey(key); } /* If one found, set the screen to that colour */

1 0

Gerald Pfeifer : d3d9: Fix type of loop variable.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 0060027e4b86989a3fd4bec35afaabb9b55c6a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0060027e4b86989a3fd4bec35… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 3 22:30:11 2008 +0100 d3d9: Fix type of loop variable. --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9c50769..c20d98e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -61,7 +61,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - int i; + unsigned i; This->inDestruction = TRUE; EnterCriticalSection(&d3d9_cs);

1 0

Gerald Pfeifer : msi: Adjust the types of loop variables.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 2b1e487d3651af83ca15253c5c065ea5208ffaa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1e487d3651af83ca15253c5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 3 22:56:39 2008 +0100 msi: Adjust the types of loop variables. --- dlls/msi/table.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 42845d9..2da9d2c 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -481,7 +481,7 @@ end: static void free_table( MSITABLE *table ) { - int i; + UINT i; for( i=0; i<table->row_count; i++ ) msi_free( table->data[i] ); msi_free( table->data ); @@ -1050,7 +1050,7 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; UINT size, offset, old_count; - int n; + UINT n; table = find_cached_table( db, name ); old_count = table->col_count; @@ -1778,7 +1778,7 @@ static UINT TABLE_find_matching_rows( struct tagMSIVIEW *view, UINT col, static UINT TABLE_add_ref(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - int i; + UINT i; TRACE("%p %d\n", view, tv->table->ref_count); @@ -1829,8 +1829,7 @@ static UINT TABLE_release(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; INT ref = tv->table->ref_count; - int i; - UINT r; + UINT i, r; TRACE("%p %d\n", view, ref);

1 0

Alistair Leslie-Hughes : msxml3: Tests for get_xml, createAttribute, CreateComment, setNamedItem.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 667df8e47f0821e887bf3083adadfa5a0cb00828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667df8e47f0821e887bf3083a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 4 09:17:51 2008 +1100 msxml3: Tests for get_xml, createAttribute, CreateComment, setNamedItem. --- dlls/msxml3/tests/domdoc.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3084e33..c4f8882 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -136,8 +136,15 @@ static const WCHAR szstar[] = { '*',0 }; static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; static WCHAR szComment[] = {'A',' ','C','o','m','m','e','n','t',0 }; +static WCHAR szCommentXML[] = {'<','!','-','-','A',' ','C','o','m','m','e','n','t','-','-','>',0 }; +static WCHAR szCommentNodeText[] = {'#','c','o','m','m','e','n','t',0 }; + +static WCHAR szElement[] = {'E','l','e','T','e','s','t', 0 }; +static WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; +static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; static WCHAR szAttribute[] = {'A','t','t','r',0 }; +static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -1750,6 +1757,117 @@ static void test_cloneNode(void ) IXMLDOMDocument_Release(doc); } +static void test_xmlTypes(void) +{ + IXMLDOMDocument *doc = NULL; + IXMLDOMElement *pRoot; + HRESULT hr; + IXMLDOMComment *pComment; + IXMLDOMElement *pElement; + IXMLDOMAttribute *pAttrubute; + IXMLDOMNamedNodeMap *pAttribs; + BSTR str; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode*)pRoot, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + /* Comment */ + hr = IXMLDOMDocument_createComment(doc, szComment, &pComment); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pComment, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMComment_get_nodeName(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szCommentNodeText ), "incorrect comment node Name\n"); + SysFreeString(str); + + hr = IXMLDOMComment_get_xml(pComment, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szCommentXML ), "incorrect comment xml\n"); + SysFreeString(str); + + IXMLDOMComment_Release(pComment); + } + + /* Element */ + hr = IXMLDOMDocument_createElement(doc, szElement, &pElement); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pElement, NULL); + ok(hr == S_OK, "ret %08x\n", hr ); + + hr = IXMLDOMElement_get_nodeName(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElement ), "incorrect element node Name\n"); + SysFreeString(str); + + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElementXML ), "incorrect element xml\n"); + SysFreeString(str); + + /* Attribute */ + hr = IXMLDOMDocument_createAttribute(doc, szAttribute, &pAttrubute); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + IXMLDOMNode *pNewChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); + ok(hr == E_FAIL, "ret %08x\n", hr ); + ok(pNewChild == NULL, "pNewChild not NULL"); + + hr = IXMLDOMElement_get_attributes(pElement, &pAttribs); + ok(hr == S_OK, "ret %08x\n", hr ); + if ( hr == S_OK ) + { + hr = IXMLDOMNamedNodeMap_setNamedItem(pAttribs, (IXMLDOMNode*)pAttrubute, NULL ); + ok(hr == S_OK, "ret %08x\n", hr ); + + IXMLDOMNamedNodeMap_Release(pAttribs); + } + + hr = IXMLDOMAttribute_get_nodeName(pAttrubute, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szAttribute ), "incorrect attribute node Name\n"); + SysFreeString(str); + + hr = IXMLDOMAttribute_get_xml(pAttrubute, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szAttributeXML ), "incorrect attribute xml\n"); + SysFreeString(str); + + IXMLDOMAttribute_Release(pAttrubute); + + /* Check Element again with the Add Attribute*/ + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElementXML2 ), "incorrect element xml\n"); + SysFreeString(str); + } + + IXMLDOMElement_Release(pElement); + } + + IXMLDOMElement_Release( pRoot ); + } + } + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT r; @@ -1769,6 +1887,7 @@ START_TEST(domdoc) test_IXMLDOMDocument2(); test_XPath(); test_cloneNode(); + test_xmlTypes(); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added Invoke(DISPID_READYSTATE) implementation.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: c6ac960f4a044983ab3658aebf48b51213b8ba59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ac960f4a044983ab3658aeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 01:49:05 2008 +0100 mshtml: Added Invoke(DISPID_READYSTATE) implementation. --- dlls/mshtml/htmldoc.c | 20 ++++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 20 +++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4ce0381..2a04ef3 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -229,8 +229,24 @@ static HRESULT WINAPI HTMLDocument_Invoke(IHTMLDocument2 *iface, DISPID dispIdMe REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + HTMLDocument *This = HTMLDOC_THIS(iface); + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + switch(dispIdMember) { + case DISPID_READYSTATE: + if(!(wFlags & DISPATCH_PROPERTYGET)) + return E_INVALIDARG; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = This->readystate; + return S_OK; + + default: + FIXME("Unsupported dispid %d\n", dispIdMember); + } + return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6c662c0..d21b0c5 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -146,6 +146,7 @@ static int stream_read, protocol_read; static enum load_state_t { LD_DOLOAD, LD_LOADING, + LD_LOADED, LD_INTERACTIVE, LD_COMPLETE, LD_NO @@ -2392,7 +2393,9 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static void _test_readyState(unsigned line, IUnknown *unk) { IHTMLDocument2 *htmldoc; + DISPPARAMS dispparams; BSTR state; + VARIANT out; HRESULT hres; static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; @@ -2403,6 +2406,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) static const LPCWSTR expected_state[] = { wszUninitialized, wszLoading, + NULL, wszInteractive, wszComplete, wszUninitialized @@ -2426,7 +2430,21 @@ static void _test_readyState(unsigned line, IUnknown *unk) debugstr_w(state), load_state); SysFreeString(state); - IHTMLDocument_Release(htmldoc); + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = NULL; + + VariantInit(&out); + + hres = IHTMLDocument2_Invoke(htmldoc, DISPID_READYSTATE, &IID_NULL, 0, DISPATCH_PROPERTYGET, + &dispparams, &out, NULL, NULL); + ok(hres == S_OK, "Invoke(DISPID_READYSTATE) failed: %08x\n", hres); + + ok_(__FILE__,line) (V_VT(&out) == VT_I4, "V_VT(out)=%d\n", V_VT(&out)); + ok_(__FILE__,line) (V_I4(&out) == load_state%5, "VT_I4(out)=%d, expected %d\n", V_I4(&out), load_state%5); + + IHTMLDocument2_Release(htmldoc); } static void test_ConnectionPoint(IConnectionPointContainer *container, REFIID riid)

1 0

Jacek Caban : mshtml: Fixed Read implementations.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 0cf629b81a35d6e608edc98094088164a6bcf20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf629b81a35d6e608edc9809… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 01:49:36 2008 +0100 mshtml: Fixed Read implementations. --- dlls/mshtml/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index f702870..5f91087 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -331,7 +331,7 @@ static HRESULT WINAPI AboutProtocol_Read(IInternetProtocol *iface, void* pv, ULO if(!*pcbRead) return S_FALSE; - memcpy(pv, This->data, *pcbRead); + memcpy(pv, This->data+This->cur, *pcbRead); This->cur += *pcbRead; return S_OK; @@ -739,7 +739,7 @@ static HRESULT WINAPI ResProtocol_Read(IInternetProtocol *iface, void* pv, ULONG if(!*pcbRead) return S_FALSE; - memcpy(pv, This->data, *pcbRead); + memcpy(pv, This->data+This->cur, *pcbRead); This->cur += *pcbRead; return S_OK;

1 0

Jacek Caban : mshtml: Don't assume that end_pos. node is text node in range_to_string.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 62b8439484e74a351baa48de371dec328c309674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b8439484e74a351baa48de3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 4 01:49:49 2008 +0100 mshtml: Don't assume that end_pos.node is text node in range_to_string. --- dlls/mshtml/txtrange.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 862fa8c..31e0791 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -496,8 +496,12 @@ static void range_to_string(HTMLTxtRange *This, wstrbuf_t *buf) nsIDOMNode_AddRef(end_pos.node); - if(start_pos.node != end_pos.node && !is_br_node(end_pos.node)) - wstrbuf_append_nodetxt(buf, end_pos.p, end_pos.off+1); + if(start_pos.node != end_pos.node) { + if(end_pos.type == TEXT_NODE) + wstrbuf_append_nodetxt(buf, end_pos.p, end_pos.off+1); + else + wstrbuf_append_node(buf, end_pos.node); + } nsIDOMNode_Release(iter); dompos_release(&start_pos);

1 0

Dmitry Timoshkov : gdi32: Remove redundant indentation levels in CreateFontIndirectA and CreateFontIndirectW .
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 4bb1c18835e8472aa6b3120fc8edf94db913e42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb1c18835e8472aa6b3120fc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 4 15:47:03 2008 +0800 gdi32: Remove redundant indentation levels in CreateFontIndirectA and CreateFontIndirectW. --- dlls/gdi32/font.c | 105 +++++++++++++++++++++++++---------------------------- 1 files changed, 49 insertions(+), 56 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 152f150..1c8f7da 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -432,12 +432,10 @@ HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) { LOGFONTW lfW; - if (plfA) { - FONT_LogFontAToW( plfA, &lfW ); - return CreateFontIndirectW( &lfW ); - } else - return CreateFontIndirectW( NULL ); + if (!plfA) return 0; + FONT_LogFontAToW( plfA, &lfW ); + return CreateFontIndirectW( &lfW ); } /*********************************************************************** @@ -445,64 +443,59 @@ HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) */ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) { - HFONT hFont = 0; + static const WCHAR ItalicW[] = {' ','I','t','a','l','i','c','\0'}; + static const WCHAR BoldW[] = {' ','B','o','l','d','\0'}; + WCHAR *pFaceNameItalicSuffix, *pFaceNameBoldSuffix; + WCHAR *pFaceNameSuffix = NULL; + HFONT hFont; + FONTOBJ *fontPtr; - if (plf) - { - FONTOBJ* fontPtr; - if ((fontPtr = GDI_AllocObject( sizeof(FONTOBJ), FONT_MAGIC, - (HGDIOBJ *)&hFont, &font_funcs ))) - { - static const WCHAR ItalicW[] = {' ','I','t','a','l','i','c','\0'}; - static const WCHAR BoldW[] = {' ','B','o','l','d','\0'}; - WCHAR *pFaceNameItalicSuffix, *pFaceNameBoldSuffix; - WCHAR* pFaceNameSuffix = NULL; - - memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) ); - - TRACE("(%d %d %d %d %x %d %x %d %d) %s %s %s %s => %p\n", - plf->lfHeight, plf->lfWidth, - plf->lfEscapement, plf->lfOrientation, - plf->lfPitchAndFamily, - plf->lfOutPrecision, plf->lfClipPrecision, - plf->lfQuality, plf->lfCharSet, - debugstr_w(plf->lfFaceName), - plf->lfWeight > 400 ? "Bold" : "", - plf->lfItalic ? "Italic" : "", - plf->lfUnderline ? "Underline" : "", hFont); - - if (plf->lfEscapement != plf->lfOrientation) { - /* this should really depend on whether GM_ADVANCED is set */ - fontPtr->logfont.lfOrientation = fontPtr->logfont.lfEscapement; - WARN("orientation angle %f set to " - "escapement angle %f for new font %p\n", - plf->lfOrientation/10., plf->lfEscapement/10., hFont); - } + if (!plf) return 0; - pFaceNameItalicSuffix = strstrW(fontPtr->logfont.lfFaceName, ItalicW); - if (pFaceNameItalicSuffix) { - fontPtr->logfont.lfItalic = TRUE; - pFaceNameSuffix = pFaceNameItalicSuffix; - } + if (!(fontPtr = GDI_AllocObject( sizeof(FONTOBJ), FONT_MAGIC, (HGDIOBJ *)&hFont, + &font_funcs ))) return 0; - pFaceNameBoldSuffix = strstrW(fontPtr->logfont.lfFaceName, BoldW); - if (pFaceNameBoldSuffix) { - if (fontPtr->logfont.lfWeight < FW_BOLD) { - fontPtr->logfont.lfWeight = FW_BOLD; - } - if (!pFaceNameSuffix || - (pFaceNameBoldSuffix < pFaceNameSuffix)) { - pFaceNameSuffix = pFaceNameBoldSuffix; - } - } + memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) ); - if (pFaceNameSuffix) *pFaceNameSuffix = 0; + TRACE("(%d %d %d %d %x %d %x %d %d) %s %s %s %s => %p\n", + plf->lfHeight, plf->lfWidth, + plf->lfEscapement, plf->lfOrientation, + plf->lfPitchAndFamily, + plf->lfOutPrecision, plf->lfClipPrecision, + plf->lfQuality, plf->lfCharSet, + debugstr_w(plf->lfFaceName), + plf->lfWeight > 400 ? "Bold" : "", + plf->lfItalic ? "Italic" : "", + plf->lfUnderline ? "Underline" : "", hFont); - GDI_ReleaseObj( hFont ); - } + if (plf->lfEscapement != plf->lfOrientation) + { + /* this should really depend on whether GM_ADVANCED is set */ + fontPtr->logfont.lfOrientation = fontPtr->logfont.lfEscapement; + WARN("orientation angle %f set to " + "escapement angle %f for new font %p\n", + plf->lfOrientation/10., plf->lfEscapement/10., hFont); + } + + pFaceNameItalicSuffix = strstrW(fontPtr->logfont.lfFaceName, ItalicW); + if (pFaceNameItalicSuffix) + { + fontPtr->logfont.lfItalic = TRUE; + pFaceNameSuffix = pFaceNameItalicSuffix; } - else WARN("(NULL) => NULL\n"); + pFaceNameBoldSuffix = strstrW(fontPtr->logfont.lfFaceName, BoldW); + if (pFaceNameBoldSuffix) + { + if (fontPtr->logfont.lfWeight < FW_BOLD) + fontPtr->logfont.lfWeight = FW_BOLD; + if (!pFaceNameSuffix || (pFaceNameBoldSuffix < pFaceNameSuffix)) + pFaceNameSuffix = pFaceNameBoldSuffix; + } + + if (pFaceNameSuffix) *pFaceNameSuffix = 0; + + GDI_ReleaseObj( hFont ); return hFont; }

1 0

Gerald Pfeifer : d3d8: Fix type of loop variable.
by Alexandre Julliard 04 Jan '08

04 Jan '08

Module: wine Branch: master Commit: 55e92b9410cc0543cfc5414ff0fd4931f09c4eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e92b9410cc0543cfc5414ff… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 3 22:30:11 2008 +0100 d3d8: Fix type of loop variable. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d1bef7..66b2a62 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -97,7 +97,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - int i; + unsigned i; TRACE("Releasing wined3d device %p\n", This->WineD3DDevice); EnterCriticalSection(&d3d8_cs);

1 0