October 2006 - Wine-commits

Frank Richter : mshtml: Update German translation.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: d6068d99e0b0c46429dd2f5ae052b752bd4cf136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6068d99e0b0c46429dd2f5ae… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun Oct 22 16:47:38 2006 +0200 mshtml: Update German translation. --- dlls/mshtml/De.rc | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 6cfe2f3..0aa2d96 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -23,8 +23,24 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Die HTML Darstellung ist zur Zeit ausgeschalten." - IDS_HTMLDOCUMENT "HTML Dokument" + IDS_HTMLDISABLED "Die HTML-Darstellung ist zur Zeit ausgeschaltet." + IDS_HTMLDOCUMENT "HTML-Dokument" + IDS_DOWNLOADING "Lade herunter..." + IDS_INSTALLING "Installiere..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine-Gecko-Installation" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Diese Anwendung versucht, eine HTML-Seite anzuzeigen. Wine muss " \ + "Gecko (Mozilla HTML-Bibliothek) installieren um die Seite " \ + "anzuzeigen. Klicken Sie auf �Installieren�, um Gecko automatisch " \ + "herunterzuladen und zu installieren.", ID_DWL_STATUS, 10, 10, 240, 40, SS_CENTER + CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 + PUSHBUTTON "Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP } /* FIXME: This should be in shdoclc.dll */

1 0

Huw Davies : oledlg: Only send the end dialog msg if the button is actually clicked.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 9c8dd8fb867ecfd47e99c1c06b9677fec1ca1cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8dd8fb867ecfd47e99c1c06… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 20 16:54:53 2006 +0100 oledlg: Only send the end dialog msg if the button is actually clicked. --- dlls/oledlg/pastespl.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index ccfceca..8e01f4b 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -605,8 +605,14 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND } case IDOK: case IDCANCEL: - send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); - return FALSE; + switch(HIWORD(wp)) + { + case BN_CLICKED: + send_end_dialog_msg(hdlg, ps_struct, LOWORD(wp)); + return FALSE; + default: + return FALSE; + } } return FALSE; default:

1 0

Jacek Caban : shdocvw: Fix windows style of windows without parents.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 6e63a9e5f58db1eb4b7915c1969c1b7d839a091d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e63a9e5f58db1eb4b7915c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 21 22:54:38 2006 +0200 shdocvw: Fix windows style of windows without parents. --- dlls/shdocvw/oleobject.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 0131d9a..aef1dd1 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -95,9 +95,12 @@ static void create_shell_embedding_hwnd( This->doc_host.frame_hwnd = This->shell_embedding_hwnd = CreateWindowExW( WS_EX_WINDOWEDGE, wszShellEmbedding, wszShellEmbedding, - WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, + WS_CLIPSIBLINGS | WS_CLIPCHILDREN + | (parent ? WS_CHILD | WS_TABSTOP : WS_POPUP | WS_MAXIMIZEBOX), 0, 0, 0, 0, parent, NULL, shdocvw_hinstance, This); + + TRACE("parent=%p hwnd=%p\n", parent, This->shell_embedding_hwnd); } static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site, HWND parent_hwnd)

1 0

Jacek Caban : urlmon: Added image/tiff mime filter.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: b9b812da703934400b19806c2ea110e7ec1aca36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b812da703934400b19806c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 21 22:56:23 2006 +0200 urlmon: Added image/tiff mime filter. --- dlls/urlmon/tests/misc.c | 13 ++++++++++++- dlls/urlmon/urlmon_main.c | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c7d8280..17657e7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -335,6 +335,7 @@ static const WCHAR mimeImagePjpeg[] = {' static const WCHAR mimeImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR mimeImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR mimeImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; +static const WCHAR mimeImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const struct { LPCWSTR url; @@ -387,6 +388,11 @@ static BYTE data35[] = {0x89,'P','N','G' static BYTE data36[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,'x','x'}; static BYTE data37[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'<','h','t','m','l','>'}; static BYTE data38[] = {0x00,0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a,'x'}; +static BYTE data39[] = {0x4d,0x4d,0x00,0x2a}; +static BYTE data40[] = {0x4d,0x4d,0x00,0x2a,'<','h','t','m','l','>',0}; +static BYTE data41[] = {0x4d,0x4d,0xff}; +static BYTE data42[] = {0x4d,0x4d}; +static BYTE data43[] = {0x00,0x4d,0x4d,0x00}; static const struct { BYTE *data; @@ -430,7 +436,12 @@ static const struct { {data35, sizeof(data35), mimeImageXPng}, {data36, sizeof(data36), mimeAppOctetStream}, {data37, sizeof(data37), mimeTextHtml}, - {data38, sizeof(data38), mimeAppOctetStream} + {data38, sizeof(data38), mimeAppOctetStream}, + {data39, sizeof(data39), mimeImageTiff}, + {data40, sizeof(data40), mimeTextHtml}, + {data41, sizeof(data41), mimeImageTiff}, + {data42, sizeof(data42), mimeTextPlain}, + {data43, sizeof(data43), mimeAppOctetStream} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index b083871..044c2f8 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -440,6 +440,11 @@ static BOOL image_pjpeg_filter(LPVOID bu return size > 2 && *(BYTE*)buf == 0xff && *((BYTE*)buf+1) == 0xd8; } +static BOOL image_tiff_filter(LPVOID buf, DWORD size) +{ + return size > 2 && *(WORD*)buf == 0x4d4d; +} + static BOOL image_xpng_filter(LPVOID buf, DWORD size) { static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; @@ -508,6 +513,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; + static const WCHAR wszImageTiff[] = {'i','m','a','g','e','/','t','i','f','f',0}; static const WCHAR wszImageXPng[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; static const WCHAR wszImageBmp[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszTextPlain[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; @@ -521,6 +527,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter}, + {wszImageTiff, image_tiff_filter}, {wszImageXPng, image_xpng_filter}, {wszImageBmp, image_bmp_filter}, {wszTextPlain, text_plain_filter},

1 0

Jeff Latimer : tools: Add addtional help to runtest.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 6d1b4af58b8a3e5b85d7ad8956a82b3cebc1eee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1b4af58b8a3e5b85d7ad895… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sat Oct 21 19:35:57 2006 +1000 tools: Add addtional help to runtest. --- tools/runtest | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/runtest b/tools/runtest index b440aab..43f513f 100755 --- a/tools/runtest +++ b/tools/runtest @@ -28,6 +28,8 @@ usage() Usage: $0 [options] input_file +input_file: the source code for the test program + Options: -q quiet mode -v verbose mode (can be specified multiple times)

1 0

Jacek Caban : mshtml: Don't return empty string in IHTMLSelectElement:: get_name.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 637310be274e5c7ec124ee6686b915ae2af1714a URL: http://source.winehq.org/git/wine.git/?a=commit;h=637310be274e5c7ec124ee668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:38:13 2006 +0200 mshtml: Don't return empty string in IHTMLSelectElement::get_name. --- dlls/mshtml/htmlselect.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ce1b40b..4a01ef1 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -178,8 +178,15 @@ static HRESULT WINAPI HTMLSelectElement_ nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); if(NS_SUCCEEDED(nsres)) { + static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; + nsAString_GetData(&name_str, &name, NULL); - *p = SysAllocString(name); + + /* + * Native never returns empty string here. If an element has no name, + * name of previous element or ramdom data is returned. + */ + *p = SysAllocString(*name ? name : wszGarbage); }else { ERR("GetName failed: %08x\n", nsres); }

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_className implementation.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 9d058e9143cec4e48d65a12fbda9d23fc42da939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d058e9143cec4e48d65a12fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:38:39 2006 +0200 mshtml: Added IHTMLElement::get_className implementation. --- dlls/mshtml/htmlelem.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index db968e8..4fad4ec 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -188,8 +188,28 @@ static HRESULT WINAPI HTMLElement_put_cl static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString class_str; + nsresult nsres; + HRESULT hres = S_OK; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&class_str, NULL); + nsres = nsIDOMHTMLElement_GetClassName(This->nselem, &class_str); + + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *class; + nsAString_GetData(&class_str, &class, NULL); + *p = SysAllocString(class); + }else { + ERR("GetClassName failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&class_str); + + TRACE("className=%s\n", debugstr_w(*p)); + return hres; } static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v)

1 0

Jacek Caban : wininet: Use HTTP_ADDHDR_FLAG_REPLACE flag in HTTP_HttpSendRequest to add Content-Length header .
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: cc7a86ec7e7a264ec19872ecbbf26bf33ac76d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7a86ec7e7a264ec19872ecb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:39:00 2006 +0200 wininet: Use HTTP_ADDHDR_FLAG_REPLACE flag in HTTP_HttpSendRequest to add Content-Length header. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c33e8bf..0d564be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2240,7 +2240,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0}; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \n\r */ + 20 /* int */ ]; sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, + HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } Host = HTTP_GetHeader(lpwhr,szHost);

1 0

Eric Pouech : winsock: Clear the held mask with the requested events so that they can be signaled .
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: e0477ce92a89ea92d184a606f74b5d2ba3043ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0477ce92a89ea92d184a606f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 08:49:40 2006 +0200 winsock: Clear the held mask with the requested events so that they can be signaled. --- server/sock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/sock.c b/server/sock.c index ce63932..c1a7a8d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -814,6 +814,7 @@ DECL_HANDLER(set_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; old_event = sock->event; sock->mask = req->mask; + sock->hmask &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Eric Pouech : configure: Now that we have dwarf support for debug info, don 't force stabs as debug info format.
by Alexandre Julliard 23 Oct '06

23 Oct '06

Module: wine Branch: master Commit: 8f56deec198c081660341e6751913c88c9176d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f56deec198c081660341e675… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Oct 21 09:03:26 2006 +0200 configure: Now that we have dwarf support for debug info, don't force stabs as debug info format. --- configure | 74 ---------------------------------------------------------- configure.ac | 1 - 2 files changed, 0 insertions(+), 75 deletions(-) diff --git a/configure b/configure index 39250db..d74403e 100755 --- a/configure +++ b/configure @@ -14457,80 +14457,6 @@ if test $ac_cv_cflags__fno_strict_aliasi EXTRACFLAGS="$EXTRACFLAGS -fno-strict-aliasing" fi - { echo "$as_me:$LINENO: checking whether the compiler supports -gstabs+" >&5 -echo $ECHO_N "checking whether the compiler supports -gstabs+... $ECHO_C" >&6; } -if test "${ac_cv_cflags__gstabsp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -gstabs+" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_cflags__gstabsp=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cflags__gstabsp=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ echo "$as_me:$LINENO: result: $ac_cv_cflags__gstabsp" >&5 -echo "${ECHO_T}$ac_cv_cflags__gstabsp" >&6; } -if test $ac_cv_cflags__gstabsp = yes; then - EXTRACFLAGS="$EXTRACFLAGS -gstabs+" -fi - { echo "$as_me:$LINENO: checking whether the compiler supports -Wdeclaration-after-statement" >&5 echo $ECHO_N "checking whether the compiler supports -Wdeclaration-after-statement... $ECHO_C" >&6; } if test "${ac_cv_cflags__Wdeclaration_after_statement+set}" = set; then diff --git a/configure.ac b/configure.ac index ae7b762..541275a 100644 --- a/configure.ac +++ b/configure.ac @@ -899,7 +899,6 @@ int main(void) { [AC_DEFINE(CC_FLAG_SHORT_WCHAR, "-fshort-wchar", [Specifies the compiler flag that forces a short wchar_t])]) WINE_TRY_CFLAGS([-fno-strict-aliasing]) - WINE_TRY_CFLAGS([-gstabs+]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wwrite-strings])

1 0