October 2010 - Wine-commits

Jacek Caban : urlmon: Replace also bind_info in set_binding_sink.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 39f2c63055ca386fce0cb4cc6dbeda7536960ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2c63055ca386fce0cb4cc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 13:56:56 2010 +0200 urlmon: Replace also bind_info in set_binding_sink. --- dlls/urlmon/binding.c | 7 +++++-- dlls/urlmon/bindprot.c | 17 ++++++++++------- dlls/urlmon/tests/url.c | 8 +++----- dlls/urlmon/urlmon_main.h | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index e0f3624..02053b0 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1077,8 +1077,11 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } if(This->to_object) { - if(!(This->state & BINDING_OBJAVAIL)) + if(!(This->state & BINDING_OBJAVAIL)) { + IBinding_AddRef(BINDING(This)); create_object(This); + IBinding_Release(BINDING(This)); + } }else { STGMEDIUM stgmed; HRESULT hres; @@ -1519,7 +1522,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I } if(binding_ctx) { - set_binding_sink(binding->protocol, PROTSINK(binding)); + set_binding_sink(binding->protocol, PROTSINK(binding), BINDINF(binding)); if(binding_ctx->redirect_url) IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); report_data(binding, 0, 0, 0); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 29b8532..01443e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -382,7 +382,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) if(This->filter_proxy) IInternetProtocol_Release(PROTOCOL(This->filter_proxy)); - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->notif_hwnd) release_notif_hwnd(This->notif_hwnd); @@ -488,7 +488,7 @@ static HRESULT WINAPI BindProtocol_UnlockRequest(IInternetProtocol *iface) return IInternetProtocol_UnlockRequest(This->protocol_handler); } -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink) +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info) { BindProtocol *This = PROTOCOL_THIS(bind_protocol); IInternetProtocolSink *prev_sink; @@ -505,6 +505,12 @@ void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *s service_provider = InterlockedExchangePointer((void**)&This->service_provider, service_provider); if(service_provider) IServiceProvider_Release(service_provider); + + if(bind_info) + IInternetBindInfo_AddRef(bind_info); + bind_info = InterlockedExchangePointer((void**)&This->bind_info, bind_info); + if(bind_info) + IInternetBindInfo_Release(bind_info); } IWinInetInfo *get_wininet_info(IInternetProtocol *bind_protocol) @@ -619,10 +625,7 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz if(urlmon_protocol) IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); - IInternetBindInfo_AddRef(pOIBindInfo); - This->bind_info = pOIBindInfo; - - set_binding_sink(PROTOCOL(This), pOIProtSink); + set_binding_sink(PROTOCOL(This), pOIProtSink, pOIBindInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IInternetPriority, (void**)&priority); if(SUCCEEDED(hres)) { @@ -670,7 +673,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->filter_proxy = NULL; } - set_binding_sink(PROTOCOL(This), NULL); + set_binding_sink(PROTOCOL(This), NULL, NULL); if(This->bind_info) { IInternetBindInfo_Release(This->bind_info); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e25db0b..a010d23 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2674,13 +2674,11 @@ static void test_BindToObject(int protocol, DWORD flags) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) { - ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + if(test_protocol != HTTP_TEST || emulate_protocol || !(bindf & BINDF_ASYNCHRONOUS)) ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); - }else { - todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); + else IBindCtx_Release(bctx); - } if(emulate_protocol) CoRevokeClassObject(regid); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index e6bc594..3aada09 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -78,7 +78,7 @@ HRESULT bind_to_storage(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv); HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); -void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); +void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info); IWinInetInfo *get_wininet_info(IInternetProtocol*); typedef struct ProtocolVtbl ProtocolVtbl;

1 0

Hans Leidekker : advapi32: Add a stub implementation of EventRegister.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: aba86be1016ef04698f04e6c0142e8f3c618b869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba86be1016ef04698f04e6c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 1 15:38:42 2010 +0200 advapi32: Add a stub implementation of EventRegister. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 +++++++++ include/Makefile.in | 1 + include/evntprov.h | 45 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 11a335b..7521294 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -217,6 +217,7 @@ # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) +@ stdcall EventRegister(ptr ptr ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index df44cd2..d048eed 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -807,3 +808,12 @@ ULONG WINAPI UnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_CALL_NOT_IMPLEMENTED; } + +/****************************************************************************** + * EventRegister [ADVAPI32.@] + */ +ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) +{ + FIXME("%s, %p, %p, %p\n", debugstr_guid(provider), callback, context, handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/Makefile.in b/include/Makefile.in index c4bb8db..fc6df0f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -248,6 +248,7 @@ SRCDIR_INCLUDES = \ errorrep.h \ errors.h \ evcode.h \ + evntprov.h \ evntrace.h \ excpt.h \ exdispid.h \ diff --git a/include/evntprov.h b/include/evntprov.h new file mode 100644 index 0000000..4bb3d14 --- /dev/null +++ b/include/evntprov.h @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#ifndef _EVNTPROV_H_ +#define _EVNTPROV_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef ULONGLONG REGHANDLE, *PREGHANDLE; + +typedef struct _EVENT_FILTER_DESCRIPTOR +{ + ULONGLONG Ptr; + ULONG Size; + ULONG Type; + +} EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; + +typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); + +ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG WINAPI EventUnregister(REGHANDLE); + +#ifdef __cplusplus +} +#endif + +#endif /* _EVNTPROV_H_ */

1 0

Juan Lang : wininet: Secure flag is set in the request, not in the session.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 80545ef966a39b4164d61d72ced4b962dd797d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80545ef966a39b4164d61d72c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 17:11:56 2010 -0700 wininet: Secure flag is set in the request, not in the session. --- dlls/wininet/http.c | 3 +-- dlls/wininet/tests/http.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 98765d9..76cf41c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1690,7 +1690,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_FLAGS: { - http_session_t *lpwhs = req->lpHttpSession; DWORD flags; int bits; @@ -1699,7 +1698,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); flags = 0; - if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE) + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; flags |= req->netConnection.security_flags; bits = NETCON_GetCipherStrength(&req->netConnection); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1236d30..d942ca4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2598,7 +2598,6 @@ static void test_secure_connection(void) size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - todo_wine ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, @@ -2679,7 +2678,6 @@ static void test_secure_connection(void) size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - todo_wine ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,

1 0

Detlef Riekenberg : inetcpl: Add general propsheet and allow to set the homepage.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: e859230ee40c60b45cade3934757cbc0363a3416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e859230ee40c60b45cade3934… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:19:03 2010 +0200 inetcpl: Add general propsheet and allow to set the homepage. --- dlls/inetcpl.cpl/Makefile.in | 3 +- dlls/inetcpl.cpl/cpl_En.rc | 17 ++++ dlls/inetcpl.cpl/general.c | 212 ++++++++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.c | 7 +- dlls/inetcpl.cpl/inetcpl.h | 12 +++ 5 files changed, 249 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 12eb694..565e54e 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,9 +1,10 @@ MODULE = inetcpl.cpl -IMPORTS = comctl32 user32 +IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui C_SRCS = \ content.c \ + general.c \ inetcpl.c RC_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc index f463df7..769ec60 100644 --- a/dlls/inetcpl.cpl/cpl_En.rc +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -29,6 +29,23 @@ BEGIN IDS_CPL_INFO "Configure Wine Internet Browser and related settings" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "General" +BEGIN + + GROUPBOX " Home page ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "You can choose the address that will be used as your home page.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Current page", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Default page", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Blank page", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c new file mode 100644 index 0000000..0825897 --- /dev/null +++ b/dlls/inetcpl.cpl/general.c @@ -0,0 +1,212 @@ +/* + * Internet control panel applet: general propsheet + * + * Copyright 2010 Detlef Riekenberg + * + * 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 + * + */ + +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wininet.h> +#include <winreg.h> +#include <shlwapi.h> +#include <prsht.h> + +#include "inetcpl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; +static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', + 'M','a','i','n',0}; + +/* list of unimplemented buttons */ +static DWORD disable_me[] = {IDC_HOME_CURRENT, + IDC_HOME_DEFAULT, 0}; + +/********************************************************************* + * parse_url_from_outside [internal] + * + * Filter an URL, add a usable scheme, when needed + * + */ +static DWORD parse_url_from_outside(LPCWSTR url, LPWSTR out, DWORD maxlen) +{ + HMODULE hdll; + DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); + DWORD res; + + hdll = LoadLibraryA("shdocvw.dll"); + pParseURLFromOutsideSourceW = (void *) GetProcAddress(hdll, (LPSTR) 170); + + if (pParseURLFromOutsideSourceW) + { + res = pParseURLFromOutsideSourceW(url, out, &maxlen, NULL); + FreeLibrary(hdll); + return res; + } + + ERR("failed to get ordinal 170: %d\n", GetLastError()); + FreeLibrary(hdll); + return 0; +} + +/********************************************************************* + * general_on_command [internal] + * + * handle WM_COMMAND + * + */ +static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) +{ + + switch (wparam) + { + case MAKEWPARAM(IDC_HOME_EDIT, EN_CHANGE): + /* enable apply button */ + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + break; + + case MAKEWPARAM(IDC_HOME_BLANK, BN_CLICKED): + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); + break; + + default: + TRACE("not implemented for command: %d/%d\n", HIWORD(wparam), LOWORD(wparam)); + return FALSE; + } + return TRUE; +} + +/********************************************************************* + * general_on_initdialog [internal] + * + * handle WM_INITDIALOG + * + */ +static VOID general_on_initdialog(HWND hwnd) +{ + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + DWORD type; + LONG res; + DWORD *ptr = disable_me; + + /* disable unimplemented buttons */ + while (*ptr) + { + EnableWindow(GetDlgItem(hwnd, *ptr), FALSE); + ptr++; + } + + /* read current homepage from the registry. Try HCU first, then HKLM */ + *buffer = 0; + len = sizeof(buffer); + type = REG_SZ; + res = SHRegGetUSValueW(reg_ie_main, start_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + + if (!res && (type == REG_SZ)) + { + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); + } +} + +/********************************************************************* + * general_on_notify [internal] + * + * handle WM_NOTIFY + * + */ +static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + PSHNOTIFY *psn; + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + WCHAR parsed[INTERNET_MAX_URL_LENGTH]; + LONG res; + + psn = (PSHNOTIFY *) lparam; + TRACE("WM_NOTIFY (%p, 0x%lx, 0x%lx) from %p with code: %d\n", hwnd, wparam, lparam, + psn->hdr.hwndFrom, psn->hdr.code); + + if (psn->hdr.code == PSN_APPLY) + { + *buffer = 0; + GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR)); + TRACE("EDITTEXT has %s\n", debugstr_w(buffer)); + + res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR)); + TRACE("got %d with %s\n", res, debugstr_w(parsed)); + + if (res) + { + HKEY hkey; + + /* update the dialog, when needed */ + if (lstrcmpW(buffer, parsed)) + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, parsed); + + /* update the registry */ + res = RegOpenKeyW(HKEY_CURRENT_USER, reg_ie_main, &hkey); + if (!res) + { + res = RegSetValueExW(hkey, start_page, 0, REG_SZ, (const BYTE *)parsed, + (lstrlenW(parsed) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + return !res; + } + } + } + return FALSE; +} + +/********************************************************************* + * general_dlgproc [internal] + * + */ +INT_PTR CALLBACK general_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + + switch (msg) + { + case WM_INITDIALOG: + general_on_initdialog(hwnd); + return TRUE; + + case WM_COMMAND: + return general_on_command(hwnd, wparam); + + case WM_NOTIFY: + return general_on_notify(hwnd, wparam, lparam); + + default: + /* do not flood the log */ + if ((msg == WM_SETCURSOR) || (msg == WM_NCHITTEST) || (msg == WM_MOUSEMOVE)) + return FALSE; + + TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); + + } + return FALSE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 80decfb..03b6282 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -27,7 +27,6 @@ #include <wingdi.h> #include <winuser.h> #include <commctrl.h> -#include <commdlg.h> #include <cpl.h> #include "wine/debug.h" @@ -93,6 +92,12 @@ static void display_cpl_sheets(HWND parent) /* Fill out all PROPSHEETPAGE */ psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; + psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL); + psp[id].pfnDlgProc = general_dlgproc; + id++; + + psp[id].dwSize = sizeof (PROPSHEETPAGEW); + psp[id].hInstance = hcpl; psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); psp[id].pfnDlgProc = content_dlgproc; id++; diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index e1477ff..cee9d4f 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -19,12 +19,16 @@ * */ +#ifndef __WINE_INETCPL__ +#define __WINE_INETCPL__ + #include <windef.h> #include <winuser.h> extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; +INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; #define NUM_PROPERTY_PAGES 8 @@ -38,6 +42,14 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; /* dialogs */ #define IDC_STATIC -1 +#define IDD_GENERAL 1000 +#define IDC_HOME_EDIT 1000 +#define IDC_HOME_CURRENT 1001 +#define IDC_HOME_DEFAULT 1002 +#define IDC_HOME_BLANK 1003 + #define IDD_CONTENT 4000 #define IDC_CERT 4100 #define IDC_CERT_PUBLISHER 4101 + +#endif

1 0

Detlef Riekenberg : inetcpl: Update German translation.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 6d9e5162d6f1ddf8e6d22fbb02afa6a330649064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9e5162d6f1ddf8e6d22fbb0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:16:39 2010 +0200 inetcpl: Update German translation. --- dlls/inetcpl.cpl/cpl_De.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index ecc2761..549776f 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -31,6 +31,24 @@ BEGIN IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Allgemein" +BEGIN + + GROUPBOX " Startseite ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Sie können eine Addresse wählen, die als Startseite verwendet wird.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "A&ktuelle Seite", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Standardseite", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Leere Seite", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Detlef Riekenberg : inetcpl: Implement LaunchInternetControlPanel.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: ca042b2922e4c7dcfcb0235e5b4aea9fe745718c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca042b2922e4c7dcfcb0235e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:16:56 2010 +0200 inetcpl: Implement LaunchInternetControlPanel. --- dlls/inetcpl.cpl/inetcpl.c | 21 +++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 03b6282..49cd892 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -162,3 +162,24 @@ LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2) return FALSE; } + +/********************************************************************* + * LaunchInternetControlPanel (inetcpl.@) + * + * Launch the Internet Control Panel dialog + * + * PARAMS + * parent [I] Handle for the parent window + * + * RETURNS + * Success: TRUE + * + * NOTES + * rundll32 callable function: rundll32 inetcpl.cpl,LaunchInternetControlPanel + * + */ +BOOL WINAPI LaunchInternetControlPanel(HWND parent) +{ + display_cpl_sheets(parent); + return TRUE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 21cb34b..eaf5e4d 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -8,7 +8,7 @@ @ stub ImportExportPFX @ stub LaunchAddSitesDialog @ stub LaunchConnectionDialog -@ stub LaunchInternetControlPanel +@ stdcall LaunchInternetControlPanel(long) @ stub LaunchPerSitePrivacyActionDialog @ stub LaunchPopupWindowManagementDialog @ stub LaunchPrivacyDialog

1 0

Juan Lang : wininet: Set cipher strength bits when querying INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 948173b7f4604a831a44fe2e8c760e98c4b1595c URL: http://source.winehq.org/git/wine.git/?a=commit;h=948173b7f4604a831a44fe2e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 13:33:47 2010 -0700 wininet: Set cipher strength bits when querying INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/http.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a15977a..98765d9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1690,19 +1690,26 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_FLAGS: { - http_session_t *lpwhs; - lpwhs = req->lpHttpSession; + http_session_t *lpwhs = req->lpHttpSession; + DWORD flags; + int bits; if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); + flags = 0; if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE) - *(DWORD*)buffer = SECURITY_FLAG_SECURE; + flags |= SECURITY_FLAG_SECURE; + flags |= req->netConnection.security_flags; + bits = NETCON_GetCipherStrength(&req->netConnection); + if (bits >= 128) + flags |= SECURITY_FLAG_STRENGTH_STRONG; + else if (bits >= 56) + flags |= SECURITY_FLAG_STRENGTH_MEDIUM; else - *(DWORD*)buffer = 0; - *(DWORD *)buffer |= req->netConnection.security_flags; - /* FIXME: set connection cipher strength (SECURITY_FLAG_STRENGTH_*) */ + flags |= SECURITY_FLAG_STRENGTH_WEAK; + *(DWORD *)buffer = flags; return ERROR_SUCCESS; }

1 0

Henri Verbeet : wined3d: Also pass the destination state directly to wined3d_state_record_lights().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 5fd1b5c023b10a6766a2ff9c840f043870db12b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd1b5c023b10a6766a2ff9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:49 2010 +0200 wined3d: Also pass the destination state directly to wined3d_state_record_lights(). --- dlls/wined3d/stateblock.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5b58de9..de8ee8e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -537,26 +537,23 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { return refCount; } -/********************************************************** - * IWineD3DStateBlockImpl parts follows - **********************************************************/ -static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_state *state) +static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { UINT i; - /* Lights... For a recorded state block, we just had a chain of actions to perform, - * so we need to walk that chain and update any actions which differ - */ + /* Lights... For a recorded state block, we just had a chain of actions + * to perform, so we need to walk that chain and update any actions which + * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { struct list *e, *f; - LIST_FOR_EACH(e, &This->state.light_map[i]) + LIST_FOR_EACH(e, &dst_state->light_map[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; /* Look up the light in the destination */ - LIST_FOR_EACH(f, &state->light_map[i]) + LIST_FOR_EACH(f, &src_state->light_map[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); if (realLight->OriginalIndex == src->OriginalIndex) @@ -566,12 +563,12 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta if (realLight->glIndex == -1 && src->glIndex != -1) { /* Light disabled */ - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; } else if (realLight->glIndex != -1 && src->glIndex == -1) { /* Light enabled */ - This->state.lights[realLight->glIndex] = src; + dst_state->lights[realLight->glIndex] = src; } src->glIndex = realLight->glIndex; updated = TRUE; @@ -583,13 +580,13 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ - WARN("Light %u in stateblock %p does not exist in device state %p.\n", - src->OriginalIndex, This, state); + WARN("Light %u in dst_state %p does not exist in src_state %p.\n", + src->OriginalIndex, dst_state, src_state); src->OriginalParms = WINED3D_default_light; if (src->glIndex != -1) { - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; src->glIndex = -1; } } @@ -879,7 +876,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->state.pixel_shader = src_state->pixel_shader; } - record_lights(This, src_state); + wined3d_state_record_lights(&This->state, src_state); TRACE("Captue done.\n");

1 0

Adam Martinson : msxml3: Implement preserveWhiteSpace property.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 49fa9de580814028e3224e9d9eb6472bf11092be URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fa9de580814028e3224e9d9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Sep 30 09:49:10 2010 -0500 msxml3: Implement preserveWhiteSpace property. --- dlls/msxml3/domdoc.c | 36 ++++++++++++- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ad1a858..1eed582 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -288,6 +288,38 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } +static inline BOOL strn_isspace(xmlChar const* str, int len) +{ + for (; str && len > 0 && *str; ++str, --len) + if (!isspace(*str)) + break; + + return len == 0; +} + +static void sax_characters(void *ctx, const xmlChar *ch, int len) +{ + xmlParserCtxtPtr pctx; + domdoc const* This; + + pctx = (xmlParserCtxtPtr) ctx; + This = (domdoc const*) pctx->_private; + + if (!This->preserving) + { + xmlChar* ws = xmlGetNsProp(pctx->node, BAD_CAST "space", XML_XML_NAMESPACE); + if ((!ws || xmlStrcmp(ws, BAD_CAST "preserve") != 0) && + strn_isspace(ch, len)) + { + xmlFree(ws); + return; + } + xmlFree(ws); + } + + xmlSAX2Characters(ctx, ch, len); +} + static xmlDocPtr doparse(domdoc* This, char *ptr, int len) { xmlDocPtr doc; @@ -309,8 +341,8 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) xmlSAX2StartElement, /* startElement */ xmlSAX2EndElement, /* endElement */ xmlSAX2Reference, /* reference */ - xmlSAX2Characters, /* characters */ - NULL, /* TODO: ignorableWhitespace */ + sax_characters, /* characters */ + sax_characters, /* ignorableWhitespace */ xmlSAX2ProcessingInstruction, /* processingInstruction */ xmlSAX2Comment, /* comment */ NULL, /* TODO: warning */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 012b6aa..8d7399e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -112,6 +112,9 @@ static const CHAR szExampleXML[] = " <html xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description. <bar:x/>\n" " </html>\n" +" <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" +" This is a description with preserved whitespace. <bar:x/>\n" +" </html>\n" " </description>\n" " </elem>\n" "\n" @@ -377,6 +380,9 @@ static void get_str_for_type(DOMNodeType type, char *buf) case NODE_DOCUMENT: strcpy(buf, "D"); break; + case NODE_TEXT: + strcpy(buf, "T"); + break; default: wsprintfA(buf, "[%d]", type); } @@ -3064,6 +3070,120 @@ static void test_IXMLDOMDocument2(void) free_bstrs(); } +static inline void check_ws_ignored(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E1.E4.E1.E2.D1 E2.E4.E1.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E1.E4.E1.E2.D1 E2.E1.E4.E1.E2.D1 E3.E1.E4.E1.E2.D1 T4.E1.E4.E1.E2.D1 E5.E1.E4.E1.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E2.E4.E1.E2.D1 E2.E2.E4.E1.E2.D1 T3.E2.E4.E1.E2.D1 E4.E2.E4.E1.E2.D1 T5.E2.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1 T7.E2.E4.E1.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static inline void check_ws_preserved(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E2.E8.E2.E2.D1 E4.E8.E2.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E2.E8.E2.E2.D1 E2.E2.E8.E2.E2.D1 T3.E2.E8.E2.E2.D1 E4.E2.E8.E2.E2.D1 T5.E2.E8.E2.E2.D1 E6.E2.E8.E2.E2.D1 T7.E2.E8.E2.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E4.E8.E2.E2.D1 E2.E4.E8.E2.E2.D1 T3.E4.E8.E2.E2.D1 E4.E4.E8.E2.E2.D1 T5.E4.E8.E2.E2.D1 E6.E4.E8.E2.E2.D1 T7.E4.E8.E2.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static void test_whitespace(void) +{ + VARIANT_BOOL b; + IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + + doc1 = create_document(&IID_IXMLDOMDocument2); + doc2 = create_document(&IID_IXMLDOMDocument2); + if (!doc1 || !doc2) return; + + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* switch to XPath */ + ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* new instances copy the property */ + ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3)); + ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4)); + + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + check_ws_ignored(doc3); + check_ws_preserved(doc4); + + /* setting after loading xml does nothing */ + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* it takes effect on reload */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + check_ws_preserved(doc1); + check_ws_ignored(doc2); + + /* other instances follow suit */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + check_ws_preserved(doc3); + check_ws_ignored(doc4); + + IXMLDOMDocument_Release(doc1); + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc3); + IXMLDOMDocument_Release(doc4); + free_bstrs(); +} + static void test_XPath(void) { VARIANT var; @@ -3159,13 +3279,7 @@ static void test_XPath(void) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - { - char *str = list_to_string(list); - /* it's the correct node, just the wrong index due to whitespace-only nodes */ - todo_wine ok(strcmp(str, "E5.E1.E4.E1.E2.D1")==0, "Invalid node list: %s, expected %s\n", str, "E5.E1.E4.E1.E2.D1"); - if (list) - IXMLDOMNodeList_Release(list); - } + expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6178,6 +6292,7 @@ START_TEST(domdoc) test_replaceChild(); test_removeNamedItem(); test_IXMLDOMDocument2(); + test_whitespace(); test_XPath(); test_XSLPattern(); test_cloneNode();

1 0

Louis Lenders : tapi32: Quiet a few noisy fixme's.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 141067fcc46d6241782dcc2f1c46826880b451f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141067fcc46d6241782dcc2f1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 1 08:02:35 2010 +0200 tapi32: Quiet a few noisy fixme's. --- dlls/tapi32/line.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 6ccdf13..38d4510 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -471,7 +471,10 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -482,7 +485,10 @@ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -1079,8 +1085,11 @@ DWORD WINAPI lineNegotiateAPIVersion( LPLINEEXTENSIONID lpExtensionID ) { - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, - dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; }

1 0