wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Paul Vriens : user32/tests: Fix some test failures on Win98/WinME.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 66bd3d428fe128638fc7d50db75199d2a0af1544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bd3d428fe128638fc7d50db… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Mar 2 13:20:30 2009 +0100 user32/tests: Fix some test failures on Win98/WinME. --- dlls/user32/tests/menu.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 324f810..a79c540 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2447,13 +2447,17 @@ static void test_menu_getmenuinfo(void) ret = pGetMenuInfo( hmenu, NULL); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = 0; ret = pGetMenuInfo( hmenu, &mi); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = sizeof( MENUINFO); ret = pGetMenuInfo( hmenu, &mi); @@ -2465,8 +2469,10 @@ static void test_menu_getmenuinfo(void) ret = pGetMenuInfo( NULL, &mi); gle= GetLastError(); ok( !ret, "GetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); - /* clean up */ + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + /* clean up */ DestroyMenu( hmenu); return; } @@ -2492,13 +2498,17 @@ static void test_menu_setmenuinfo(void) ret = pSetMenuInfo( hmenu, NULL); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = 0; ret = pSetMenuInfo( hmenu, &mi); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); mi.cbSize = sizeof( MENUINFO); ret = pSetMenuInfo( hmenu, &mi); @@ -2510,7 +2520,9 @@ static void test_menu_setmenuinfo(void) ret = pSetMenuInfo( NULL, &mi); gle= GetLastError(); ok( !ret, "SetMenuInfo() should have failed\n"); - ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); + ok( gle == ERROR_INVALID_PARAMETER || + broken(gle == 0xdeadbeef), /* Win98, WinME */ + "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER); /* functional tests */ /* menu and submenu should have the CHECKORBMP style bit cleared */ SetLastError(0xdeadbeef);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationBlink.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 2619dda6b7f813b4c15eb89a7344537a4030535e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2619dda6b7f813b4c15eb89a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 20:06:29 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationBlink. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 14de764..a7eff56 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -160,6 +160,8 @@ static const WCHAR styleNone[] = {'n','o','n','e',0}; static const WCHAR valOverline[] = {'o','v','e','r','l','i','n','e',0}; +static const WCHAR valBlink[] = + {'b','l','i','n','k',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -1010,15 +1012,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationLineThrough(IHTMLStyle *iface, static HRESULT WINAPI HTMLStyle_put_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valBlink : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationBlink(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valBlink, p); } static HRESULT WINAPI HTMLStyle_put_verticalAlign(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf37cfc..c0fb009 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2782,6 +2782,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationBlink(style, &b); + ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_get_textDecorationBlink(style, &b); + ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationBlink = %x\n", b); + + hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_FALSE); + ok(hres == S_OK, "textDecorationBlink failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationOverline.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: cbbdc41bdfe9ce27ed82eb2d82394a9ced3443d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbbdc41bdfe9ce27ed82eb2d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 19:57:37 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationOverline. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 293ddf0..14de764 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -158,6 +158,8 @@ static const WCHAR szNormal[] = {'n','o','r','m','a','l',0}; static const WCHAR styleNone[] = {'n','o','n','e',0}; +static const WCHAR valOverline[] = + {'o','v','e','r','l','i','n','e',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -972,15 +974,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecorationUnderline(IHTMLStyle *iface, V static HRESULT WINAPI HTMLStyle_put_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? valOverline : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationOverline(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, valOverline, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationLineThrough(IHTMLStyle *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 86c25b0..bf37cfc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2766,6 +2766,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationOverline(style, &b); + ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_get_textDecorationOverline(style, &b); + ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationOverline = %x\n", b); + + hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_FALSE); + ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/ put textDecorationNone.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: c9f4c2298ab3535dae8f91f45d11c58a5c0eb3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f4c2298ab3535dae8f91f45… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 16:53:52 2009 +1100 mshtml: Implement IHTMLStyle get/put textDecorationNone. --- dlls/mshtml/htmlstyle.c | 15 ++++++++++----- dlls/mshtml/tests/dom.c | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ce5dba2..293ddf0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -156,6 +156,8 @@ static const WCHAR valUnderline[] = {'u','n','d','e','r','l','i','n','e',0}; static const WCHAR szNormal[] = {'n','o','r','m','a','l',0}; +static const WCHAR styleNone[] = + {'n','o','n','e',0}; static const WCHAR px_formatW[] = {'%','d','p','x',0}; static const WCHAR emptyW[] = {0}; @@ -436,7 +438,6 @@ static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) static BOOL is_valid_border_style(BSTR v) { - static const WCHAR styleNone[] = {'n','o','n','e',0}; static const WCHAR styleDotted[] = {'d','o','t','t','e','d',0}; static const WCHAR styleDashed[] = {'d','a','s','h','e','d',0}; static const WCHAR styleSolid[] = {'s','o','l','i','d',0}; @@ -935,15 +936,19 @@ static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + + TRACE("(%p)->(%x)\n", This, v); + + return set_style_attr(This, STYLEID_TEXT_DECORATION, v ? styleNone : emptyW, 0); } static HRESULT WINAPI HTMLStyle_get_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return check_style_attr_value(This, STYLEID_TEXT_DECORATION, styleNone, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationUnderline(IHTMLStyle *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 37cc549..86c25b0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2750,6 +2750,22 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_FALSE); ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); + b = 0xfefe; + hres = IHTMLStyle_get_textDecorationNone(style, &b); + ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE); + ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_get_textDecorationNone(style, &b); + ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "textDecorationNone = %x\n", b); + + hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_FALSE); + ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Detlef Riekenberg : spoolss: Implement AddPrinterDriverExW.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 5104db3d82c410cec725143ddb11c8aaa3051417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5104db3d82c410cec725143dd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 00:23:26 2009 +0100 spoolss: Implement AddPrinterDriverExW. --- dlls/spoolss/router.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 6fc7b59..479d23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -355,6 +355,46 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************** + * AddPrinterDriverExW (spoolss.@) + * + * Install a Printer Driver with the Option to upgrade / downgrade the Files + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * level [I] Level for the supplied DRIVER_INFO_*W struct + * pDriverInfo [I] PTR to DRIVER_INFO_*W struct with the Driver Parameter + * dwFileCopyFlags [I] How to Copy / Upgrade / Downgrade the needed Files + * + * RESULTS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + + if (!pDriverInfo) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + pb = backend_first(pName); + if (pb && pb->fpAddPrinterDriverEx) + res = pb->fpAddPrinterDriverEx(pName, level, pDriverInfo, dwFileCopyFlags); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * DeleteMonitorW (spoolss.@) * * Delete a specific Printmonitor from a Printing-Environment diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index ad1ea60..68188ba 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -8,7 +8,7 @@ @ stub AddPrintProcessorW @ stub AddPrintProvidorW @ stub AddPrinterConnectionW -@ stub AddPrinterDriverExW +@ stdcall AddPrinterDriverExW(wstr long ptr long) @ stub AddPrinterDriverW @ stub AddPrinterExW @ stub AddPrinterW

1 0

Detlef Riekenberg : spoolss: Implement DeleteMonitorW.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 393c3817b1d4e062ba22fed716c3eebd21f48d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c3817b1d4e062ba22fed71… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 00:15:50 2009 +0100 spoolss: Implement DeleteMonitorW. --- dlls/spoolss/router.c | 34 ++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index d5c4be3..6fc7b59 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -355,6 +355,40 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************** + * DeleteMonitorW (spoolss.@) + * + * Delete a specific Printmonitor from a Printing-Environment + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment of the Monitor or NULL (Default) + * pMonitorName [I] Name of the Monitor, that should be deleted + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorName) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %s, %s)\n", debugstr_w(pName), debugstr_w(pEnvironment), debugstr_w(pMonitorName)); + + pb = backend_first(pName); + if (pb && pb->fpDeleteMonitor) + res = pb->fpDeleteMonitor(pName, pEnvironment, pMonitorName); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * EnumMonitorsW (spoolss.@) * * Enumerate available Port-Monitors diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 8d9fae3..ad1ea60 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -25,7 +25,7 @@ @ stub CreatePrinterIC @ stub DbgGetPointers @ stub DeleteFormW -@ stub DeleteMonitorW +@ stdcall DeleteMonitorW(wstr wstr wstr) @ stub DeletePerMachineConnectionW @ stub DeletePortW @ stub DeletePrintProcessorW

1 0

Detlef Riekenberg : spoolss: Implement AddMonitorW.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: f45cb5ce7fe9345fd045e6dc68d8e09ca4b7ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45cb5ce7fe9345fd045e6dc6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 28 23:56:06 2009 +0100 spoolss: Implement AddMonitorW. --- dlls/spoolss/router.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 28871b1..d5c4be3 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -313,6 +313,48 @@ static backend_t * backend_first(LPWSTR name) } /****************************************************************** + * AddMonitorW (spoolss.@) + * + * Install a Printmonitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * Level [I] Structure-Level (Must be 2) + * pMonitors [I] PTR to MONITOR_INFO_2 + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * All Files for the Monitor must already be copied to %winsysdir% ("%SystemRoot%\system32") + * + */ +BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %d, %p)\n", debugstr_w(pName), Level, pMonitors); + + if (Level != 2) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + pb = backend_first(pName); + if (pb && pb->fpAddMonitor) + res = pb->fpAddMonitor(pName, Level, pMonitors); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u\n", res, GetLastError()); + return (res == ROUTER_SUCCESS); +} + +/****************************************************************** * EnumMonitorsW (spoolss.@) * * Enumerate available Port-Monitors diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 010b490..8d9fae3 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -1,7 +1,7 @@ @ stub AbortPrinter @ stub AddFormW @ stub AddJobW -@ stub AddMonitorW +@ stdcall AddMonitorW(wstr long ptr) @ stub AddPerMachineConnectionW @ stub AddPortExW @ stub AddPortW

1 0

Gerald Pfeifer : comctl32: Simplify three TAB_ functions.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 2a7d98a52cf8cdca96de6d7c6f44539cf5b98dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7d98a52cf8cdca96de6d7c6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 28 23:53:33 2009 +0100 comctl32: Simplify three TAB_ functions. --- dlls/comctl32/tab.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 0cc8cf9..3880ceb 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -916,7 +916,7 @@ static LRESULT TAB_AdjustRect(const TAB_INFO *infoPtr, WPARAM fLarger, LPRECT pr * This method will handle the notification from the scroll control and * perform the scrolling operation on the tab control. */ -static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos, HWND hwndScroll) +static LRESULT TAB_OnHScroll(TAB_INFO *infoPtr, int nScrollCode, int nPos) { if(nScrollCode == SB_THUMBPOSITION && nPos != infoPtr->leftmostVisible) { @@ -2936,7 +2936,7 @@ static inline LRESULT TAB_Size (TAB_INFO *infoPtr) } -static LRESULT TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TAB_Create (HWND hwnd, LPARAM lParam) { TAB_INFO *infoPtr; TEXTMETRICW fontMetrics; @@ -3076,7 +3076,7 @@ static LRESULT theme_changed(const TAB_INFO *infoPtr) return 0; } -static LRESULT TAB_NCCalcSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TAB_NCCalcSize(WPARAM wParam) { if (!wParam) return 0; @@ -3211,7 +3211,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetFont (infoPtr, (HFONT)wParam); case WM_CREATE: - return TAB_Create (hwnd, wParam, lParam); + return TAB_Create (hwnd, lParam); case WM_NCDESTROY: return TAB_Destroy (infoPtr); @@ -3245,7 +3245,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_SetRedraw (infoPtr, (BOOL)wParam); case WM_HSCROLL: - return TAB_OnHScroll(infoPtr, (int)LOWORD(wParam), (int)HIWORD(wParam), (HWND)lParam); + return TAB_OnHScroll(infoPtr, (int)LOWORD(wParam), (int)HIWORD(wParam)); case WM_STYLECHANGED: TAB_SetItemBounds (infoPtr); @@ -3270,7 +3270,7 @@ TAB_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TAB_NCHitTest(infoPtr, lParam); case WM_NCCALCSIZE: - return TAB_NCCalcSize(hwnd, wParam, lParam); + return TAB_NCCalcSize(wParam); default: if (uMsg >= WM_USER && uMsg < WM_APP && !COMCTL32_IsReflectedMessage(uMsg))

1 0

Steven Edwards : include: Add check to asm macro for Windows Services for Unix/ Subsystem for Unix applications.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 3d0c0429ad4bc17277a0061581df70475ff92bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0c0429ad4bc17277a006158… Author: Steven Edwards <winehacker(a)gmail.com> Date: Sat Feb 28 12:38:58 2009 -0500 include: Add check to asm macro for Windows Services for Unix/Subsystem for Unix applications. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 817f02b..6318374 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -203,7 +203,7 @@ struct statvfs /* Macros to define assembler functions somewhat portably */ -#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__APPLE__) +#if defined(__GNUC__) && !defined(__INTERIX) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__APPLE__) # define __ASM_GLOBAL_FUNC(name,code) \ __asm__( ".text\n\t" \ ".align 4\n\t" \

1 0

Detlef Riekenberg : shdocvw/tests: Detect more interfaces in the webbrowser test.
by Alexandre Julliard 02 Mar '09

02 Mar '09

Module: wine Branch: master Commit: 423ffdd10f949f6750526e56f8e4b0ab9d49e122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=423ffdd10f949f6750526e56f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 1 23:57:11 2009 +0100 shdocvw/tests: Detect more interfaces in the webbrowser test. --- dlls/shdocvw/tests/webbrowser.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 5aae312..17e7f81 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1355,14 +1355,22 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &Dispatch; else if(IsEqualGUID(&IID_IServiceProvider, riid)) *ppv = &ServiceProvider; + else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) + trace("interface IID_IDocHostShowUI\n"); + else if(IsEqualGUID(&IID_IOleControlSite, riid)) + trace("interface IID_IOleControlSite\n"); + else if(IsEqualGUID(&IID_IOleCommandTarget, riid)) + trace("interface IID_IOleCommandTarget\n"); - if(*ppv) - return S_OK; + /* B6EA2050-048A-11D1-82B9-00C04FB9942E IAxWinHostWindow */ - /* are there more interfaces, that a host can support? */ - trace("%s: interface not supported\n", debugstr_guid(riid)); + else + { + /* are there more interfaces, that a host can support? */ + trace("%s: interface not supported\n", debugstr_guid(riid)); + } - return E_NOINTERFACE; + return (*ppv) ? S_OK : E_NOINTERFACE; } static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2009