February 2009 - Wine-Commits

Alexandre Julliard : winepath: Fixed the wmain() definition.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 82ea2994e8f20f0b565a7ef2dca86342a0a5e912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ea2994e8f20f0b565a7ef2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 23:20:27 2009 +0100 winepath: Fixed the wmain() definition. --- programs/winepath/winepath.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 2471803..1645ee9 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -90,7 +90,7 @@ static int option(int shortopt, const WCHAR *longopt) /* * Parse command line options */ -static int parse_options(const WCHAR *argv[]) +static int parse_options(WCHAR *argv[]) { static const WCHAR longW[] = { 'l','o','n','g',0 }; static const WCHAR shortW[] = { 's','h','o','r','t',0 }; @@ -140,7 +140,7 @@ static int parse_options(const WCHAR *argv[]) /* * Main function */ -int wmain(int argc, const WCHAR *argv[]) +int wmain(int argc, WCHAR *argv[]) { LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR) = NULL; LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR) = NULL;

1 0

Alexandre Julliard : winmm: Disable system thread if poll() support is missing.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 7ca85aa9eab5f028c5050adec7145492a208c214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca85aa9eab5f028c5050adec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 22:31:56 2009 +0100 winmm: Disable system thread if poll() support is missing. --- dlls/winmm/time.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 48ca3e8..23d0cdc 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -116,6 +116,7 @@ static inline void link_timer( WINE_TIMERENTRY *timer ) #define MMSYSTIME_MININTERVAL (1) #define MMSYSTIME_MAXINTERVAL (65535) +#ifdef HAVE_POLL /************************************************************************** * TIME_MMSysTimeCallback @@ -254,6 +255,15 @@ static void TIME_MMTimeStart(void) } } +#else /* HAVE_POLL */ + +static void TIME_MMTimeStart(void) +{ + FIXME( "not starting system thread\n" ); +} + +#endif /* HAVE_POLL */ + /************************************************************************** * TIME_MMTimeStop */

1 0

Alexandre Julliard : makefiles: Pass the target flags to winegcc.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 88fd1ba7b53532161301e9c7cffee96b4a1b84ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fd1ba7b53532161301e9c7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 20:31:59 2009 +0100 makefiles: Pass the target flags to winegcc. --- Make.rules.in | 2 +- dlls/Makedll.rules.in | 2 +- dlls/Maketest.rules.in | 2 +- programs/Makeprog.rules.in | 2 +- programs/winetest/Makefile.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b4020aa..7066c98 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -74,7 +74,7 @@ MAKECTESTS = $(TOOLSDIR)/tools/make_ctests WRC = $(TOOLSDIR)/tools/wrc/wrc WMC = $(TOOLSDIR)/tools/wmc/wmc WIDL = $(TOOLSDIR)/tools/widl/widl -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild RELPATH = $(TOOLSDIR)/tools/relpath SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt FNT2FON = $(TOOLSDIR)/tools/fnt2fon diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 12be790..c318bf2 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -32,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 4bc23e2..05a9774 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -33,7 +33,7 @@ all: $(TESTPROGRAM) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -mconsole $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LIBPORT) $(ALL_LIBS) # Rules for .exe main module diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 9a6fad6..ea39636 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -23,7 +23,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT) # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) $(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 1139ee3..d50284a 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -46,7 +46,7 @@ depend: tests.rc dist: winetest-dist.exe$(DLLEXT) winetest-dist$(EXEEXT) winetest-dist.exe.so: $(OBJS) dist.res Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) $(APPMODE) $(OBJS) dist.res -o $@ -L$(DLLDIR) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) winetest-dist: $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@

1 0

Detlef Riekenberg : website: Fix typos in WWN356
by Jeremy Newman Feb. 6, 2009

Feb. 6, 2009

Module: website Branch: master Commit: 2df393d17aa08be0a27734d870279f9e989ae92b URL: http://source.winehq.org/git/website.git/?a=commit;h=2df393d17aa08be0a27734… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 6 15:38:11 2009 +0100 website: Fix typos in WWN356 -- By by ... Detlef >From 870b9cf6518db779909340e5917afa0ac8c6f293 Mon Sep 17 00:00:00 2001 From: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri, 6 Feb 2009 15:36:27 +0100 Subject: [PATCH] website: Fix typos in WWN356 --- wwn/en/wn20090204_356.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/en/wn20090204_356.xml b/wwn/en/wn20090204_356.xml index 6ad3e58..dacb767 100644 --- a/wwn/en/wn20090204_356.xml +++ b/wwn/en/wn20090204_356.xml @@ -206,7 +206,7 @@ Ge van Geldorp writes in with links to the tests Paul mentions: Actually, that was not the first time. On 20 Jan an XP machine passed: <a href="http://test.winehq.org/data/e9d8c9f572998054b1f9c386ea81a3570c65f2d2/#group_">http://test.winehq.org/data/e9d8c9f572998054b1f9c386ea81a3570c65f2d2/#group_</a> XP -And on 27 Jan a 2009 machine: +And on 27 Jan a 2003 machine: <a href="http://test.winehq.org/data/8f829034f3fe4da3e7adce2f4685e10ba2e2fe82/#group…">http://test.winehq.org/data/8f829034f3fe4da3e7adce2f4685e10ba2e2fe82/#group…</a> </quote> @@ -247,7 +247,7 @@ Francois Gouget has been doing some work with some static analysis of the code b I have attached a script that identifies functions that should be made static (among other things). There are approximately 450 of them, there -should be pretty efw false positives, and I will look into them +should be pretty few false positives, and I will look into them eventually. But if someone beats me to it I sure won't complain *g*.

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_get_backgroundColor.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 6421c47986d05b03e4ddf97eaa9b8b70e917e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6421c47986d05b03e4ddf97ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 4 16:01:05 2009 +1100 mshtml: Implement IHTMLStyle_get_backgroundColor. --- dlls/mshtml/htmlstyle.c | 6 ++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2d6703a..2e9be16 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -770,8 +770,10 @@ static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + V_VT(p) = VT_BSTR; + return get_style_attr(This, STYLEID_BACKGROUND_COLOR, &V_BSTR(p)); } static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5118d63..ae24bcf 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2982,6 +2982,12 @@ static void test_default_style(IHTMLStyle *style) test_border_styles(style, str); SysFreeString(str); + hres = IHTMLStyle_get_backgroundColor(style, &v); + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "str=%s\n", dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Aurimas Fischer : notepad: Add Lithuanian translation.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: cb57ebcaf2a0a95bf82b06c6001f356792e0aefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb57ebcaf2a0a95bf82b06c60… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Thu Feb 5 23:16:53 2009 +0200 notepad: Add Lithuanian translation. --- programs/notepad/Lt.rc | 122 ++++++++++++++++++++++++++++++++++++++++++++++ programs/notepad/rsrc.rc | 1 + 2 files changed, 123 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc new file mode 100644 index 0000000..3b321d2 --- /dev/null +++ b/programs/notepad/Lt.rc @@ -0,0 +1,122 @@ +/* + * Notepad (Lithuanian resources) + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&Failas" { + MENUITEM "&Naujas\tCtrl+N", CMD_NEW + MENUITEM "&Atverti...\tCtrl+O", CMD_OPEN + MENUITEM "&Išsaugoti\tCtrl+S", CMD_SAVE + MENUITEM "Išsaugoti k&aip...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "S&pausdinti...\tCtrl+P", CMD_PRINT + MENUITEM "Puslapio &nuostatos...", CMD_PAGE_SETUP + MENUITEM "Spaus&dintuvo nuostatos...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Uždaryti", CMD_EXIT + } +POPUP "&Keisti" { + MENUITEM "&Atšaukti\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Iškirpti\tCtrl+X", CMD_CUT + MENUITEM "&Kopijuoti\tCtrl+C", CMD_COPY + MENUITEM "Į&dėti\tCtrl+V", CMD_PASTE + MENUITEM "Iš&valyti\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Pažymėti viską\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Laikas/Data\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "Laužyti ilgas &eilutes", CMD_WRAP + MENUITEM "Š&riftas...", CMD_FONT + } +POPUP "&Paieška" { + MENUITEM "&Rasti...\tCtrl+F", CMD_SEARCH + MENUITEM "Rasti k&itą\tF3", CMD_SEARCH_NEXT + } +POPUP "&Žinynas" { + MENUITEM "&Turinys", CMD_HELP_CONTENTS + MENUITEM "&Paieška...", CMD_HELP_SEARCH + MENUITEM "Pa&galba apie žinyną", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Apie Notepad", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Puslapio nuostatos" +{ +LTEXT "A&ntraštė:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Poraštė:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "Paraštės (milimetrais):", 0x144, 10, 43,160, 45 +LTEXT "&Kairėje:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Viršutinė:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Dešinėje:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Apatinė:", 0x14E, 100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "Gerai", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Atsisakyti", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Žinynas", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "Puslapis &p" + +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "KLAIDA" +STRING_WARNING, "ĮSPĖJIMAS" +STRING_INFO, "Informacija" + +STRING_UNTITLED, "Be pavadinimo" + +STRING_ALL_FILES, "Visi failai (*.*)" +STRING_TEXT_FILES_TXT, "Tekstiniai failai (*.txt)" + +STRING_TOOLARGE, "Failas '%s' yra per didelis notepad programai.\n \ +Prašome naudoti kitą tekstų redaktorių." +STRING_NOTEXT, "Jūs neįvedėte jokio teksto. \ +\nPrašome ką nors įvesti ir mėginti dar kartą" +STRING_DOESNOTEXIST, "Failas '%s'\nneegzistuoja\n\n \ +Ar norite sukurti naują failą?" +STRING_NOTSAVED, "Failas '%s'\nbuvo pakeistas\n\n \ +Ar norite išsaugoti pakeitimus?" +STRING_NOTFOUND, "Frazė '%s' nerasta." +STRING_OUT_OF_MEMORY, "Neužtenka atminties operacijai užbaigti.\ +\nNorėdami atlaisvinti atminties uždarykite vieną ar daugiau programų." + +} +#pragma code_page(default) diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index 911ad3c..8018a58 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -60,6 +60,7 @@ IDI_NOTEPAD ICON "notepad.ico" #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_put_fontWeight.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 20bd88895c5038fcae8afdc6b01ed4de7c9896a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bd88895c5038fcae8afdc6b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 4 16:32:31 2009 +1100 mshtml: Implement IHTMLStyle_put_fontWeight. --- dlls/mshtml/htmlstyle.c | 31 ++++++++++++++++++- dlls/mshtml/tests/dom.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ad9d095..2d6703a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -618,8 +618,35 @@ static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + static const WCHAR styleBold[] = {'b','o','l','d',0}; + static const WCHAR styleBolder[] = {'b','o','l','d','e','r',0}; + static const WCHAR styleLighter[] = {'l','i','g','h','t','e','r',0}; + static const WCHAR style100[] = {'1','0','0',0}; + static const WCHAR style200[] = {'2','0','0',0}; + static const WCHAR style300[] = {'3','0','0',0}; + static const WCHAR style400[] = {'4','0','0',0}; + static const WCHAR style500[] = {'5','0','0',0}; + static const WCHAR style600[] = {'6','0','0',0}; + static const WCHAR style700[] = {'7','0','0',0}; + static const WCHAR style800[] = {'8','0','0',0}; + static const WCHAR style900[] = {'9','0','0',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* fontWeight can only be one of the following */ + if(!v || strcmpiW(szNormal, v) == 0 || strcmpiW(styleBold, v) == 0 || + strcmpiW(styleBolder, v) == 0 || strcmpiW(styleLighter, v) == 0 || + strcmpiW(style100, v) == 0 || strcmpiW(style200, v) == 0 || + strcmpiW(style300, v) == 0 || strcmpiW(style400, v) == 0 || + strcmpiW(style500, v) == 0 || strcmpiW(style600, v) == 0 || + strcmpiW(style700, v) == 0 || strcmpiW(style800, v) == 0 || + strcmpiW(style900, v) == 0 + ) + { + return set_nsstyle_attr(This->nsstyle, STYLEID_FONT_WEIGHT, v, 0); + } + + return E_INVALIDARG; } static HRESULT WINAPI HTMLStyle_get_fontWeight(IHTMLStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 62a07bc..5118d63 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2431,6 +2431,82 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(!str, "fontWeight = %s\n", dbgstr_w(str)); + hres = IHTMLStyle_get_fontWeight(style, &sDefault); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + + str = a2bstr("test"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == E_INVALIDARG, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bold"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("bolder"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("lighter"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("100"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("200"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("300"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("400"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("500"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("600"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("700"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("800"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("900"); + hres = IHTMLStyle_put_fontWeight(style, str); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_fontWeight(style, &str); + ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); + ok(!strcmp_wa(str, "900"), "str != style900\n"); + SysFreeString(str); + + hres = IHTMLStyle_put_fontWeight(style, sDefault); + ok(hres == S_OK, "put_fontWeight failed: %08x\n", hres); + /* font Variant */ hres = IHTMLStyle_get_fontVariant(style, NULL); ok(hres == E_INVALIDARG, "get_fontVariant failed: %08x\n", hres);

1 0

Detlef Riekenberg : spoolss: Move routing functions to a seperate file.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 9056d4d2d4b3b423dc3b53931f1bcf704bd55f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9056d4d2d4b3b423dc3b53931… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 6 09:35:13 2009 +0100 spoolss: Move routing functions to a seperate file. --- dlls/spoolss/Makefile.in | 3 +- dlls/spoolss/router.c | 270 +++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.h | 42 +++++++ dlls/spoolss/spoolss_main.c | 86 +------------- 4 files changed, 317 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9056d4d2d4b3b423dc3b5…

1 0

Alexandre Julliard : widl: Print all NdrFcShort parameters as shorts to avoid warnings for negative values .
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 25624b677d2f0d79a9661622f1f1304ead3dadb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25624b677d2f0d79a9661622f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 6 14:38:45 2009 +0100 widl: Print all NdrFcShort parameters as shorts to avoid warnings for negative values. --- tools/widl/typegen.c | 64 +++++++++++++++++++++++++------------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25624b677d2f0d79a9661…

1 0

Jeremy White : sane.ds: More completely implement ICAP_XFERMECH, with helper functions.
by Alexandre Julliard Feb. 6, 2009

Feb. 6, 2009

Module: wine Branch: master Commit: 0639904cc2edac05c9619ce2fd1b2769a850fe00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0639904cc2edac05c9619ce2f… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu Feb 5 16:23:29 2009 -0600 sane.ds: More completely implement ICAP_XFERMECH, with helper functions. --- dlls/sane.ds/capability.c | 168 +++++++++++++++++++++++++++++++-------------- 1 files changed, 117 insertions(+), 51 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 1c71b7d..6ecabb3 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -183,6 +183,98 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } + +static TW_UINT16 get_onevalue(pTW_CAPABILITY pCapability, TW_UINT16 *type, TW_UINT32 *value) +{ + if (pCapability->hContainer) + { + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); + if (pVal) + { + *value = pVal->Item; + if (type) + *type = pVal->ItemType; + GlobalUnlock (pCapability->hContainer); + return TWCC_SUCCESS; + } + } + return TWCC_BUMMER; +} + + +static TW_UINT16 set_onevalue(pTW_CAPABILITY pCapability, TW_UINT16 type, TW_UINT32 value) +{ + pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); + + if (pCapability->hContainer) + { + pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); + if (pVal) + { + pCapability->ConType = TWON_ONEVALUE; + pVal->ItemType = type; + pVal->Item = value; + GlobalUnlock (pCapability->hContainer); + return TWCC_SUCCESS; + } + } + return TWCC_LOWMEMORY; +} + +static TW_UINT16 msg_set(pTW_CAPABILITY pCapability, TW_UINT32 *val) +{ + if (pCapability->ConType == TWON_ONEVALUE) + return get_onevalue(pCapability, NULL, val); + + FIXME("Partial Stub: MSG_SET only supports TW_ONEVALUE\n"); + return TWCC_BADCAP; +} + + +static TW_UINT16 msg_get_enum(pTW_CAPABILITY pCapability, const TW_UINT32 *values, int value_count, + TW_UINT16 type, TW_UINT32 current, TW_UINT32 default_value) +{ + TW_ENUMERATION *enumv = NULL; + TW_UINT32 *p32; + TW_UINT16 *p16; + int i; + + pCapability->ConType = TWON_ENUMERATION; + pCapability->hContainer = 0; + + if (type == TWTY_INT16 || type == TWTY_UINT16) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ENUMERATION, ItemList[value_count * sizeof(TW_UINT16)])); + + if (type == TWTY_INT32 || type == TWTY_UINT32) + pCapability->hContainer = GlobalAlloc (0, FIELD_OFFSET( TW_ENUMERATION, ItemList[value_count * sizeof(TW_UINT32)])); + + if (pCapability->hContainer) + enumv = GlobalLock(pCapability->hContainer); + + if (! enumv) + return TWCC_LOWMEMORY; + + enumv->ItemType = type; + enumv->NumItems = value_count; + + p16 = (TW_UINT16 *) enumv->ItemList; + p32 = (TW_UINT32 *) enumv->ItemList; + for (i = 0; i < value_count; i++) + { + if (values[i] == current) + enumv->CurrentIndex = i; + if (values[i] == default_value) + enumv->DefaultIndex = i; + if (type == TWTY_INT16 || type == TWTY_UINT16) + p16[i] = values[i]; + if (type == TWTY_INT32 || type == TWTY_UINT32) + p32[i] = values[i]; + } + + GlobalUnlock(pCapability->hContainer); + return TWCC_SUCCESS; +} + static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) { TW_ARRAY *a; @@ -209,74 +301,48 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) } -static TW_BOOL TWAIN_OneValueSet (pTW_CAPABILITY pCapability, TW_UINT32 value) -{ - pCapability->hContainer = GlobalAlloc (0, sizeof(TW_ONEVALUE)); - - if (pCapability->hContainer) - { - pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); - pVal->ItemType = TWTY_UINT32; - pVal->Item = value; - GlobalUnlock (pCapability->hContainer); - return TRUE; - } - else - return FALSE; -} - -static TW_BOOL TWAIN_OneValueGet (pTW_CAPABILITY pCapability, TW_UINT32 *pValue) -{ - pTW_ONEVALUE pVal = GlobalLock (pCapability->hContainer); - - if (pVal) - { - *pValue = pVal->Item; - GlobalUnlock (pCapability->hContainer); - return TRUE; - } - else - return FALSE; -} - /* ICAP_XFERMECH */ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action) { + static const TW_UINT32 possible_values[] = { TWSX_NATIVE, TWSX_MEMORY }; + TW_UINT32 val; + TW_UINT16 twCC = TWCC_BADCAP; + TRACE("ICAP_XFERMECH\n"); switch (action) { + case MSG_QUERYSUPPORT: + twCC = set_onevalue(pCapability, TWTY_INT32, + TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET ); + break; + case MSG_GET: - if (pCapability->ConType == TWON_ONEVALUE) - { - if (!TWAIN_OneValueSet (pCapability, activeDS.capXferMech)) - return TWCC_LOWMEMORY; - } + twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + TWTY_UINT16, activeDS.capXferMech, TWSX_NATIVE); break; + case MSG_SET: - if (pCapability->ConType == TWON_ONEVALUE) - { - TW_UINT32 xfermechtemp = 0; - if (!TWAIN_OneValueGet (pCapability, &xfermechtemp)) - return TWCC_LOWMEMORY; - activeDS.capXferMech = xfermechtemp; - } - else if (pCapability->ConType == TWON_ENUMERATION) + twCC = msg_set(pCapability, &val); + if (twCC == TWCC_SUCCESS) { - + activeDS.capXferMech = (TW_UINT16) val; + FIXME("Partial Stub: XFERMECH set to %d, but ignored\n", val); } break; - case MSG_GETCURRENT: - if (!TWAIN_OneValueSet (pCapability, activeDS.capXferMech)) - return TWCC_LOWMEMORY; - break; + case MSG_GETDEFAULT: - if (!TWAIN_OneValueSet (pCapability, TWSX_NATIVE)) - return TWCC_LOWMEMORY; + twCC = set_onevalue(pCapability, TWTY_UINT16, TWSX_NATIVE); break; + case MSG_RESET: activeDS.capXferMech = TWSX_NATIVE; + /* .. fall through intentional .. */ + + case MSG_GETCURRENT: + twCC = set_onevalue(pCapability, TWTY_UINT16, activeDS.capXferMech); + FIXME("Partial Stub: XFERMECH of %d not actually used\n", activeDS.capXferMech); break; } - return TWCC_SUCCESS; + return twCC; }

1 0