August 2009 - Wine-commits - list.winehq.org

Andrew Eikum : comctl32: Correctly assign focus and default button in property sheet wizards.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: ac34e22ef36e865a2a85153d6f469cf9027d3a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac34e22ef36e865a2a85153d6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 13 17:36:35 2009 -0500 comctl32: Correctly assign focus and default button in property sheet wizards. --- dlls/comctl32/propsheet.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0d76297..e767444 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1549,6 +1549,7 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) { HWND hwndTabCtrl; HWND hwndLineHeader; + HWND control; LPCPROPSHEETPAGEW ppshpage; TRACE("active_page %d, index %d\n", psInfo->active_page, index); @@ -1569,6 +1570,10 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo) { PROPSHEET_SetTitleW(hwndDlg, psInfo->ppshheader.dwFlags, psInfo->proppage[index].pszText); + + control = GetNextDlgTabItem(psInfo->proppage[index].hwndPage, NULL, FALSE); + if(control != NULL) + SetFocus(control); } if (psInfo->active_page != -1) @@ -1631,7 +1636,11 @@ static BOOL PROPSHEET_Back(HWND hwndDlg) if (idx >= 0 && idx < psInfo->nPages) { if (PROPSHEET_CanSetCurSel(hwndDlg)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_BACK_BUTTON)); + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); PROPSHEET_SetCurSel(hwndDlg, idx, -1, 0); + } } return TRUE; } @@ -1669,7 +1678,11 @@ static BOOL PROPSHEET_Next(HWND hwndDlg) if (idx < psInfo->nPages ) { if (PROPSHEET_CanSetCurSel(hwndDlg) != FALSE) + { + SetFocus(GetDlgItem(hwndDlg, IDC_NEXT_BUTTON)); + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); PROPSHEET_SetCurSel(hwndDlg, idx, 1, 0); + } } return TRUE; @@ -3408,6 +3421,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* set up the Next and Back buttons by default */ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT); + SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON)); /* Set up fonts */ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -3494,6 +3508,10 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PROPSHEET_UnChanged(hwnd, NULL); + /* wizards set their focus during init */ + if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD) + return FALSE; + return TRUE; }

1 0

Austin Lund : user32/tests: Remove superfluous code from WM_PAINT loop test .
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 3dcd46f597e3a3cad0c38252ac9c85fb6d7d3ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dcd46f597e3a3cad0c38252a… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Aug 14 09:33:18 2009 +1000 user32/tests: Remove superfluous code from WM_PAINT loop test. --- dlls/user32/tests/win.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6ec120a..cf1de25 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4863,8 +4863,6 @@ static LRESULT CALLBACK TestNCRedraw_WndProc(HWND hwnd, UINT msg, WPARAM wParam, { static UINT ncredrawflags; PAINTSTRUCT ps; - RECT rect; - BOOL updateRectValue; switch(msg) { @@ -4872,7 +4870,6 @@ static LRESULT CALLBACK TestNCRedraw_WndProc(HWND hwnd, UINT msg, WPARAM wParam, ncredrawflags = *(UINT *) (((CREATESTRUCT *)lParam)->lpCreateParams); return 0; case WM_NCPAINT: - updateRectValue = GetUpdateRect(hwnd, &rect, FALSE); RedrawWindow(hwnd, NULL, NULL, ncredrawflags); break; case WM_PAINT:

1 0

Jacek Caban : jscript: Added missing port.h includes.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: cde2f1a09ee68ecaa2f5ef5ba3985728cd38d58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde2f1a09ee68ecaa2f5ef5ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 22:32:52 2009 +0200 jscript: Added missing port.h includes. --- dlls/jscript/date.c | 3 +++ dlls/jscript/number.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5085f21..04ec0ee 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <limits.h> #include <math.h> diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index e6f6ef7..f144455 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <math.h> #include "jscript.h"

1 0

Michael Karcher : ntdll/tests: Implement tests for data execution prevention.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: c3c712c17f4bbf5282a76dd3170751b8e78b2aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c712c17f4bbf5282a76dd31… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Fri Aug 14 00:04:42 2009 +0200 ntdll/tests: Implement tests for data execution prevention. --- dlls/ntdll/tests/exception.c | 189 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 177 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3c712c17f4bbf5282a76…

1 0

Jacek Caban : mshtml: Parse post data in channelbsc_set_channel.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 7151a3965b6b5420cac3f61c15a174b477b72fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7151a3965b6b5420cac3f61c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 13 22:32:29 2009 +0200 mshtml: Parse post data in channelbsc_set_channel. --- dlls/mshtml/navigate.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ad3abc5..ac979cc 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1110,6 +1110,12 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis nsISupports_AddRef(context); This->nscontext = context; } + + if(channel->post_data_stream) { + parse_post_data(channel->post_data_stream, &This->bsc.headers, &This->bsc.post_data, &This->bsc.post_data_len); + TRACE("headers = %s post_data = %s\n", debugstr_w(This->bsc.headers), + debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); + } } void hlink_frame_navigate(HTMLDocument *doc, IHlinkFrame *hlink_frame,

1 0

Jörg Höhle : winecfg: Fix German typo.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 6d533e5d3f31e4c50d43c8df9f06cbc2be856f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d533e5d3f31e4c50d43c8df9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Aug 13 19:27:04 2009 +0200 winecfg: Fix German typo. --- programs/winecfg/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 9a2e5e6..dda4d98 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -284,7 +284,7 @@ BEGIN IDS_DEVICES_WAVEOUT "Wave-Ausgabe-Geräte" IDS_DEVICES_WAVEIN "Wave-Eingabe-Geräte" IDS_DEVICES_MIDIOUT "MIDI-Ausgabe-Geräte" - IDS_DEVICES_MIDIIN "MIDI-Ausgabe-Geräte" + IDS_DEVICES_MIDIIN "MIDI-Eingabe-Geräte" IDS_DEVICES_AUX "Aux-Geräte" IDS_DEVICES_MIXER "Mixer-Geräte" IDS_UNAVAILABLE_DRIVER "In der Registry wurde ein Treiber gefunden, der nicht verfügbar ist!\n\nSoll „%s“ aus der Registry entfernt werden?"

1 0

Jörg Höhle : cmd: Fix German typo.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 5866651c380173c90acc413612bac851149689cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5866651c380173c90acc41361… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Aug 13 19:27:04 2009 +0200 cmd: Fix German typo. --- programs/cmd/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 2ad3de1..0e4fc44 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -178,7 +178,7 @@ Um eine Umgebungsvariable zu erschaffen oder zu ändern, ist der Syntax nötig:\ \n\ SET <Variable>=<Wert>\n\ \n\ -Wobei <Variable> und <Wert> Zeichenkette sind. Es dürfen keine Leerzeichen vor\n\ +Wobei <Variable> und <Wert> Zeichenketten sind. Es dürfen keine Leerzeichen vor\n\ dem Gleichheitszeichen sein, noch darf der Variablenname Leerzeichen enthalten.\n\ \n\ In Wine werden die Umgebungsvariablen des darunterliegenden Betriebssystems\n\

1 0

Jörg Höhle : d3d9/tests: Detect empty graphics driver name.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: ba8729940223dda9c9e4942c761668aef149a8f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba8729940223dda9c9e4942c7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jul 11 16:05:41 2009 +0200 d3d9/tests: Detect empty graphics driver name. --- dlls/d3d9/tests/visual.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4fabf3..ce53ca9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -182,7 +182,9 @@ static IDirect3DDevice9 *init_d3d9(void) ok(hr == D3D_OK, "Failed to get adapter identifier description\n"); trace("Driver string: \"%s\"\n", identifier.Driver); trace("Description string: \"%s\"\n", identifier.Description); + ok(identifier.Description[0] != '\0', "Empty driver description\n"); trace("Device name string: \"%s\"\n", identifier.DeviceName); + ok(identifier.DeviceName[0] != '\0', "Empty device name\n"); trace("Driver version %d.%d.%d.%d\n", HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart));

1 0

Alexandre Julliard : configure: Rename the main binary to "wine32" for the Wow64 build.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 3e6eab3fd97e7c0ed2c8d233875aa4cfa8965985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6eab3fd97e7c0ed2c8d2338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 19:54:31 2009 +0200 configure: Rename the main binary to "wine32" for the Wow64 build. --- configure | 5 +++++ configure.ac | 3 +++ loader/Makefile.in | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 06d06ee..12469cb 100755 --- a/configure +++ b/configure @@ -609,6 +609,7 @@ LDAPLIBS LIBPOLL LIBDL EXTRA_BINARIES +MAIN_BINARY SOCKETLIBS CRTLIBS LDPATH @@ -11718,6 +11719,10 @@ case $host_os in ;; esac +MAIN_BINARY="wine" + +test -z "$with_wine64" || MAIN_BINARY="wine32" + case $host_cpu in *i[3456789]86*) case $host_os in diff --git a/configure.ac b/configure.ac index a38c525..e186872 100644 --- a/configure.ac +++ b/configure.ac @@ -1595,6 +1595,9 @@ case $host_os in ;; esac +AC_SUBST(MAIN_BINARY,"wine") +test -z "$with_wine64" || MAIN_BINARY="wine32" + case $host_cpu in *i[[3456789]]86*) case $host_os in diff --git a/loader/Makefile.in b/loader/Makefile.in index 9bef13f..8f4d2a2 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -2,12 +2,12 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = wine C_SRCS = \ main.c \ preloader.c +MAIN_BINARY = @MAIN_BINARY@ EXTRA_BINARIES = @EXTRA_BINARIES@ PROGRAMS = \ @@ -48,7 +48,7 @@ $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy .PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%) install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) - $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MODULE) + $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MAIN_BINARY) @WOW64_DISABLE@ install install-lib:: install-man-pages @@ -58,7 +58,7 @@ install-man-pages: $(MANPAGES) $(INSTALLDIRS) dummy $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) $(EXTRA_BINARIES) $(MODULE) + -cd $(DESTDIR)$(bindir) && $(RM) $(MAIN_BINARY) $(EXTRA_BINARIES) $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(RM) $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext)

1 0

Alexandre Julliard : configure: Disable installation of a number of extra files for the Wow64 build.
by Alexandre Julliard 14 Aug '09

14 Aug '09

Module: wine Branch: master Commit: 90647774575f2c67dd777f858f4e00f818249254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90647774575f2c67dd777f858… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 13 19:48:42 2009 +0200 configure: Disable installation of a number of extra files for the Wow64 build. --- Makefile.in | 7 +++++-- configure | 3 +++ configure.ac | 1 + dlls/wineps.drv/Makefile.in | 6 +++++- loader/Makefile.in | 8 ++++++-- programs/Makefile.in | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7c1eb50..690b003 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,8 +75,11 @@ wine: $(WINEWRAPPER) # Installation rules -install install-dev:: $(DESTDIR)$(datadir)/aclocal dummy - $(INSTALL_DATA) $(SRCDIR)/aclocal.m4 $(DESTDIR)$(datadir)/aclocal/wine.m4 +install-aclocal: $(DESTDIR)$(datadir)/aclocal dummy + +.PHONY: install-aclocal + +(a)WOW64_DISABLE@ install install-dev:: install-aclocal uninstall:: $(RM) $(DESTDIR)$(datadir)/aclocal/wine.m4 diff --git a/configure b/configure index 8d9f023..06d06ee 100755 --- a/configure +++ b/configure @@ -695,6 +695,7 @@ AR BISON FLEX TOOLSDIR +WOW64_DISABLE WIN16_INSTALL WIN16_FILES TARGETFLAGS @@ -4067,6 +4068,8 @@ then as_fn_error "--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5 fi + WOW64_DISABLE=\# + enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} enable_server=${enable_server:-no} diff --git a/configure.ac b/configure.ac index fb83660..a38c525 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,7 @@ then AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive. --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.]) fi + AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} enable_server=${enable_server:-no} diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 0adfc0c..7e8efdc 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -98,9 +98,13 @@ EXTRASUBDIRS = data @MAKE_DLL_RULES@ -install install-lib:: $(DESTDIR)$(datadir)/wine +install-ppd:: $(DESTDIR)$(datadir)/wine dummy $(INSTALL_DATA) $(SRCDIR)/generic.ppd $(DESTDIR)$(datadir)/wine/generic.ppd +.PHONY: install-ppd + +(a)WOW64_DISABLE@ install install-lib:: install-ppd + uninstall:: $(RM) $(DESTDIR)$(datadir)/wine/generic.ppd diff --git a/loader/Makefile.in b/loader/Makefile.in index 0ce816a..9bef13f 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -45,10 +45,14 @@ wine-installed: main.o Makefile.in $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f -.PHONY: $(EXTRA_BINARIES:%=__install__%) +.PHONY: install-man-pages $(EXTRA_BINARIES:%=__install__%) -install install-lib:: wine-installed $(EXTRA_BINARIES:%=__install__%) $(MANPAGES) $(INSTALLDIRS) +install install-lib:: wine-installed $(DESTDIR)$(bindir) $(EXTRA_BINARIES:%=__install__%) $(INSTALL_PROGRAM) wine-installed $(DESTDIR)$(bindir)/$(MODULE) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +install-man-pages: $(MANPAGES) $(INSTALLDIRS) dummy $(INSTALL_DATA) wine.man $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) $(INSTALL_DATA) wine.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/wine.$(prog_manext) $(INSTALL_DATA) wine.fr.man $(DESTDIR)$(mandir)/fr.UTF-8/man$(prog_manext)/wine.$(prog_manext) diff --git a/programs/Makefile.in b/programs/Makefile.in index 7bd60b2..fcfeb50 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -33,7 +33,7 @@ install-progs.so: $(INSTALLPROGS:%=%/__installprog__) install-progs: # nothing to do here -install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) +(a)WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS)

1 0