January 2008 - Wine-commits

Jonathan Ernst : loader: New French man page for wine.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 1c0f2fe16a454ef711df66fe1d7b2f43f8ab70e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0f2fe16a454ef711df66fe1… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Jan 10 16:00:41 2008 +0100 loader: New French man page for wine. --- .gitignore | 1 + loader/Makefile.in | 10 ++- loader/wine.fr.man.in | 316 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 325 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c0f2fe16a454ef711df6…

1 0

Jacek Caban : mshtml: Move nsChannel' s content type initialization to async_open_doc_uri.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: cbe9f974d6b86245155603aa1c7e9e529e7fa2c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe9f974d6b86245155603aa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 22:13:07 2008 +0100 mshtml: Move nsChannel's content type initialization to async_open_doc_uri. --- dlls/mshtml/navigate.c | 10 ---------- dlls/mshtml/nsio.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3dd8e53..cc48b93 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -887,16 +887,6 @@ void set_document_bscallback(HTMLDocument *doc, BSCallback *callback) if(callback) { IBindStatusCallback_AddRef(STATUSCLB(callback)); callback->doc = doc; - - if(doc->mime) { - DWORD len; - - heap_free(callback->nschannel->content); - - len = WideCharToMultiByte(CP_ACP, 0, doc->mime, -1, NULL, 0, NULL, NULL); - callback->nschannel->content = heap_alloc(len); - WideCharToMultiByte(CP_ACP, 0, doc->mime, -1, callback->nschannel->content, -1, NULL, NULL); - } } } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index cc4ea2f..0385f4a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -652,6 +652,16 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, container->bscallback->nscontext = context; } + if(container->doc && container->doc->mime) { + DWORD len; + + heap_free(This->content); + + len = WideCharToMultiByte(CP_ACP, 0, container->doc->mime, -1, NULL, 0, NULL, NULL); + This->content = heap_alloc(len); + WideCharToMultiByte(CP_ACP, 0, container->doc->mime, -1, This->content, -1, NULL, NULL); + } + if(do_load_from_moniker_hack(This)) return WINE_NS_LOAD_FROM_MONIKER; }else {

1 0

Jacek Caban : mshtml: Update focus information in WM_RESETFOCUS_HACK.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 8c686f9d000d3172e7a65490c342a6ddfb33f74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c686f9d000d3172e7a65490c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 22:13:35 2008 +0100 mshtml: Update focus information in WM_RESETFOCUS_HACK. --- dlls/mshtml/nsembed.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4513d51..360e826 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -113,9 +113,14 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP * Gecko grabs focus in edit mode and some apps don't like it. * We should somehow prevent grabbing focus. */ + + TRACE("WM_RESETFOCUS_HACK\n"); + if(This->reset_focus) { SetFocus(This->reset_focus); This->reset_focus = NULL; + if(This->doc) + This->doc->focus = FALSE; } }

1 0

Jacek Caban : mshtml: Fixed hr element handling in range object.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 0bc9f9a7d542e87199a462e3f9a834bd14ef17ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc9f9a7d542e87199a462e3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 23:51:25 2008 +0100 mshtml: Fixed hr element handling in range object. --- dlls/mshtml/txtrange.c | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 31e0791..bd398b9 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR brW[] = {'b','r',0}; +static const WCHAR hrW[] = {'h','r',0}; typedef struct { const IHTMLTxtRangeVtbl *lpHTMLTxtRangeVtbl; @@ -132,7 +133,7 @@ static PRUint16 get_node_type(nsIDOMNode *node) return type; } -static BOOL is_br_node(nsIDOMNode *node) +static BOOL is_elem_tag(nsIDOMNode *node, LPCWSTR istag) { nsIDOMElement *elem; nsAString tag_str; @@ -149,8 +150,31 @@ static BOOL is_br_node(nsIDOMNode *node) nsIDOMElement_Release(elem); nsAString_GetData(&tag_str, &tag); - if(!strcmpiW(tag, brW)) - ret = TRUE; + ret = !strcmpiW(tag, istag); + + nsAString_Finish(&tag_str); + + return ret; +} + +static BOOL is_space_elem(nsIDOMNode *node) +{ + nsIDOMElement *elem; + nsAString tag_str; + const PRUnichar *tag; + BOOL ret = FALSE; + nsresult nsres; + + nsres = nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + if(NS_FAILED(nsres)) + return FALSE; + + nsAString_Init(&tag_str, NULL); + nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMElement_Release(elem); + nsAString_GetData(&tag_str, &tag); + + ret = !strcmpiW(tag, brW) || !strcmpiW(tag, hrW); nsAString_Finish(&tag_str); @@ -242,9 +266,12 @@ static void wstrbuf_append_node(wstrbuf_t *buf, nsIDOMNode *node) break; } case ELEMENT_NODE: - if(is_br_node(node)) { + if(is_elem_tag(node, brW)) { static const WCHAR endlW[] = {'\r','\n'}; wstrbuf_append_len(buf, endlW, 2); + }else if(is_elem_tag(node, hrW)) { + static const WCHAR endl2W[] = {'\r','\n','\r','\n'}; + wstrbuf_append_len(buf, endl2W, 4); } } } @@ -524,7 +551,7 @@ static WCHAR get_pos_char(const dompos_t *pos) case TEXT_NODE: return pos->p[pos->off]; case ELEMENT_NODE: - if(is_br_node(pos->node)) + if(is_space_elem(pos->node)) return '\n'; } @@ -634,7 +661,7 @@ static WCHAR next_char(const dompos_t *pos, dompos_t *new_pos) return *p; case ELEMENT_NODE: - if(!is_br_node(iter)) + if(!is_space_elem(iter)) break; if(cspace) @@ -718,7 +745,7 @@ static WCHAR prev_char(HTMLTxtRange *This, const dompos_t *pos, dompos_t *new_po } case ELEMENT_NODE: - if(!is_br_node(iter)) + if(!is_space_elem(iter)) break; if(skip_space) {

1 0

Francois Gouget : winemenubuilder: EnumResourceNamesW() returns false when we find the icon. So fix the corresponding misfiring trace.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 4dc91b7ba1de61c37bfeb46f755f5548de7d5dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc91b7ba1de61c37bfeb46f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:57:15 2008 +0100 winemenubuilder: EnumResourceNamesW() returns false when we find the icon. So fix the corresponding misfiring trace. --- programs/winemenubuilder/winemenubuilder.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4feafbe..92660bb 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -296,7 +296,8 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, const char *szXPMFile sEnumRes.pResInfo = &hResInfo; sEnumRes.nIndex = nIndex; if (!EnumResourceNamesW(hModule, (LPCWSTR)RT_GROUP_ICON, - EnumResNameProc, (LONG_PTR)&sEnumRes)) + EnumResNameProc, (LONG_PTR)&sEnumRes) && + sEnumRes.nIndex != 0) { WINE_TRACE("EnumResourceNamesW failed, error %d\n", GetLastError()); }

1 0

Rob Shearman : rpcrt4: Split RPCRT4_process_packet out into separate functions.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: a04641c15b1775220dea4ce4a873607e59ed0efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04641c15b1775220dea4ce4a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 11 10:00:25 2008 +0000 rpcrt4: Split RPCRT4_process_packet out into separate functions. --- dlls/rpcrt4/rpc_server.c | 316 ++++++++++++++++++++++++---------------------- 1 files changed, 168 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04641c15b1775220dea4…

1 0

Francois Gouget : shell32: A lot of lnk files have extra data blocks at the end, although they don' t seem to matter much. So drop the corresponding ERR() to a WARN().
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 67c6c24b043017162f3f7f4fe2039a9c82ed7751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c6c24b043017162f3f7f4fe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:55:32 2008 +0100 shell32: A lot of lnk files have extra data blocks at the end, although they don't seem to matter much. So drop the corresponding ERR() to a WARN(). --- dlls/shell32/shelllink.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index d19d726..c42242c 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -924,7 +924,14 @@ static HRESULT WINAPI IPersistStream_fnLoad( r = IStream_Read(stm, &zero, sizeof zero, &dwBytesRead); if( FAILED( r ) || zero || dwBytesRead != sizeof zero ) - ERR("Last word was not zero\n"); + { + /* Some lnk files have extra data blocks starting with a + * DATABLOCK_HEADER. For instance EXP_SPECIAL_FOLDER and an unknown + * one with a 0xa0000003 signature. However these don't seem to matter + * too much. + */ + WARN("Last word was not zero\n"); + } TRACE("OK\n");

1 0

Francois Gouget : msi/tests: Tweaked so it does not look like things are misspelled.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 62c59deaa1e9a48657f5b67df050a5728f5404bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c59deaa1e9a48657f5b67df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 11 09:54:31 2008 +0100 msi/tests: Tweaked so it does not look like things are misspelled. --- dlls/msi/tests/install.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4637fcb..d394908 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -564,8 +564,8 @@ static const CHAR df_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\ "s72\tS72\tl255\n" "Directory\tDirectory\n" "THIS\tMSITESTDIR\tthis\n" - "DOESNT\tTHIS\tdoesnt\n" - "NONEXISTENT\tDOESNT\texist\n" + "DOESNOT\tTHIS\tdoesnot\n" + "NONEXISTENT\tDOESNOT\texist\n" "MSITESTDIR\tProgramFilesFolder\tmsitest\n" "ProgramFilesFolder\tTARGETDIR\t.\n" "TARGETDIR\t\tSourceDir"; @@ -3614,9 +3614,9 @@ static void test_duplicatefiles(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest\\augustus", TRUE), "File not duplicated\n"); - ok(delete_pf("msitest\\this\\doesnt\\exist\\maximus", TRUE), "File not duplicated\n"); - ok(delete_pf("msitest\\this\\doesnt\\exist", FALSE), "File not duplicated\n"); - ok(delete_pf("msitest\\this\\doesnt", FALSE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnot\\exist\\maximus", TRUE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnot\\exist", FALSE), "File not duplicated\n"); + ok(delete_pf("msitest\\this\\doesnot", FALSE), "File not duplicated\n"); ok(delete_pf("msitest\\this", FALSE), "File not duplicated\n"); ok(delete_pf("msitest", FALSE), "File not installed\n");

1 0

Francois Gouget : kernel32/tests: Add more ExpandEnvironmentStringsA() tests.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: e3e2a5c0acaa7d6fe26b57393037cfa2ba839f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e2a5c0acaa7d6fe26b57393… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:52:16 2008 +0100 kernel32/tests: Add more ExpandEnvironmentStringsA() tests. Document the observed ExpandEnvironmentStrings() behavior. --- dlls/kernel32/environ.c | 19 +++++++++++++++- dlls/kernel32/tests/environ.c | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 414ccbf..7089c20 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -305,6 +305,8 @@ BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value ) /*********************************************************************** * ExpandEnvironmentStringsA (KERNEL32.@) * + * See ExpandEnvironmentStringsW. + * * Note: overlapping buffers are not supported; this is how it should be. * FIXME: return value is wrong for MBCS */ @@ -334,6 +336,21 @@ DWORD WINAPI ExpandEnvironmentStringsA( LPCSTR src, LPSTR dst, DWORD count ) /*********************************************************************** * ExpandEnvironmentStringsW (KERNEL32.@) + * + * Replaces references to environment variables of the form '%EnvVar%' + * by their value. If the environment variable does not exist, then the + * reference is left as is. + * + * PARAMS + * src [I] The string to be expanded. + * dst [O] The buffer in which to put the expanded string. + * len [I] The buffer size, in characters. + * + * RETURNS + * The number of characters copied into the buffer. If the buffer is + * too small, then the required buffer size, in characters including the + * trailing '\0', is returned. + * If the function fails for some other reason, then it returns 0. */ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len ) { @@ -346,7 +363,7 @@ DWORD WINAPI ExpandEnvironmentStringsW( LPCWSTR src, LPWSTR dst, DWORD len ) RtlInitUnicodeString(&us_src, src); - /* make sure we don't overflow maximum UNICODE_STRING size */ + /* make sure we don't overflow the maximum UNICODE_STRING size */ if (len > 0x7fff) len = 0x7fff; diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 3e65e92..a0e425c 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -217,9 +217,55 @@ static void test_GetSetEnvironmentVariableW(void) static void test_ExpandEnvironmentStringsA(void) { + const char* value="Long long value"; + const char* not_an_env_var="%NotAnEnvVar%"; char buf[256], buf1[256], buf2[0x8000]; DWORD ret_size, ret_size1; + SetEnvironmentVariableA("EnvVar", value); + + ret_size = ExpandEnvironmentStringsA(NULL, buf1, sizeof(buf1)); + ok(ret_size == 1 || ret_size == 0 /* Win9x */, + "ExpandEnvironmentStrings returned %d\n", ret_size); + + /* Try to get the required buffer size 'the natural way' */ + strcpy(buf, "%EnvVar%"); + ret_size = ExpandEnvironmentStringsA(buf, NULL, 0); + /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2 || ret_size == 0 /* Win95 */, + "ExpandEnvironmentStrings returned %d instead of %d\n", + ret_size, strlen(value)+1); + if (ret_size == strlen(value)+2) + trace("ExpandEnvironmentStrings is buggy: it returned len + 2\n"); + + /* Again, side-stepping the Win95 bug */ + ret_size = ExpandEnvironmentStringsA(buf, buf1, 0); + /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + "ExpandEnvironmentStrings returned %d instead of %d\n", + ret_size, strlen(value)+1); + + /* Try with a buffer that's too small */ + ret_size = ExpandEnvironmentStringsA(buf, buf1, 12); + /* v5.1.2600.2945 (XP SP2) returns len + 2 here! */ + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + "ExpandEnvironmentStrings returned %d instead of %d\n", + ret_size, strlen(value)+1); + + /* Try with a buffer of just the right size */ + /* v5.1.2600.2945 (XP SP2) needs and returns len + 2 here! */ + ret_size = ExpandEnvironmentStringsA(buf, buf1, ret_size); + ok(ret_size == strlen(value)+1 || ret_size == strlen(value)+2, + "ExpandEnvironmentStrings returned %d instead of %d\n", + ret_size, strlen(value)+1); + ok(!strcmp(buf1, value), "ExpandEnvironmentStrings returned [%s]\n", buf1); + + /* Try with an unset environment variable */ + strcpy(buf, not_an_env_var); + ret_size = ExpandEnvironmentStringsA(buf, buf1, sizeof(buf1)); + ok(ret_size == strlen(not_an_env_var)+1, "ExpandEnvironmentStrings returned %d instead of %d\n", ret_size, strlen(value)+1); + ok(!strcmp(buf1, not_an_env_var), "ExpandEnvironmentStrings returned [%s]\n", buf1); + /* test a large destination size */ strcpy(buf, "12345"); ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2)); @@ -231,6 +277,8 @@ static void test_ExpandEnvironmentStringsA(void) if (ERROR_ENVVAR_NOT_FOUND == GetLastError()) return; ok(!strcmp(buf, buf1), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %d\n", buf, buf1, ret_size); + + SetEnvironmentVariableA("EnvVar", NULL); } static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD);

1 0

Francois Gouget : kernel32/tests: Despite the MSDN claims, GetComputerName( ) does not return the required buffer size... except on Vista. So update the tests accordingly.
by Alexandre Julliard 11 Jan '08

11 Jan '08

Module: wine Branch: master Commit: 0069651056940c13ec8956f05805734a113d17c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0069651056940c13ec8956f05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 11 09:52:31 2008 +0100 kernel32/tests: Despite the MSDN claims, GetComputerName() does not return the required buffer size... except on Vista. So update the tests accordingly. --- dlls/kernel32/tests/environ.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index a0e425c..06943de 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -298,12 +298,17 @@ static void test_GetComputerName(void) error = GetLastError(); todo_wine ok(!ret && error == ERROR_BUFFER_OVERFLOW, "GetComputerNameA should have failed with ERROR_BUFFER_OVERFLOW instead of %d\n", error); - size++; /* nul terminating character */ - name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); - ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); - ret = GetComputerNameA(name, &size); - ok(ret, "GetComputerNameA failed with error %d\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, name); + + /* Only Vista returns the computer name length as documented in the MSDN */ + if (size != 0) + { + size++; /* nul terminating character */ + name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); + ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); + ret = GetComputerNameA(name, &size); + ok(ret, "GetComputerNameA failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, name); + } size = MAX_COMPUTERNAME_LENGTH + 1; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0]));

1 0