wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

Henri Verbeet : ddraw: Initialize the AutoRestoreDisplayMode field of WINED3DPRESENT_PARAMETERS ( Valgrind).
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 93f1c49ea40e75fd079b05a949c60f9ba85fee94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f1c49ea40e75fd079b05a94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 19 19:20:09 2011 +0100 ddraw: Initialize the AutoRestoreDisplayMode field of WINED3DPRESENT_PARAMETERS (Valgrind). --- dlls/ddraw/ddraw.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 06705fb..6aa3af6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2905,6 +2905,7 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.Flags = 0; localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; + localParameters.AutoRestoreDisplayMode = FALSE; /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ @@ -2959,6 +2960,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.Flags = 0; presentation_parameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; presentation_parameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; + presentation_parameters.AutoRestoreDisplayMode = FALSE; ddraw->d3d_target = primary; hr = IWineD3DDevice_InitGDI(ddraw->wineD3DDevice, &presentation_parameters);

1 0

Alexandre Julliard : hhctrl: Don't use an extended menu.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: d38571a67a7ba200f84ef79be48f8ebcd772e6ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38571a67a7ba200f84ef79be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 23:45:34 2011 +0100 hhctrl: Don't use an extended menu. --- dlls/hhctrl.ocx/help.c | 4 +++- dlls/hhctrl.ocx/hhctrl.rc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d8725b1..4a0f78b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -685,7 +685,9 @@ static void DisplayPopupMenu(HHInfo *info) /* Update the Show/Hide menu item */ item.cbSize = sizeof(MENUITEMINFOW); - item.fMask = MIIM_STRING; + item.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_STRING; + item.fType = MFT_STRING; + item.fState = MF_ENABLED; if (info->WinType.fNotExpanded) item.dwTypeData = HH_LoadString(IDS_SHOWTABS); diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 562a96b..89ba97f 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -62,7 +62,7 @@ BEGIN IDTB_TOC_PREV "IDTB_TOC_PREV" END -MENU_POPUP MENUEX +MENU_POPUP MENU { POPUP "Options" {

1 0

Alexandre Julliard : shdocvw: Convert coclass registration to the IRegistrar mechanism.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 8bb4bde1e5cae22cd92296b91a69e98ade2ed831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4bde1e5cae22cd92296b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 21:30:14 2011 +0100 shdocvw: Convert coclass registration to the IRegistrar mechanism. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/factory.c | 39 +++--------------- dlls/shdocvw/shdocvw.inf | 95 ------------------------------------------- dlls/shdocvw/shdocvw_v1.idl | 41 ++++++++++++++++++ include/exdisp.idl | 53 ++++++++++++++++++++---- 5 files changed, 93 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bb4bde1e5cae22cd9229…

1 0

Alexandre Julliard : shell32: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 2afe205ebd759f598a3de5d3bd224036b2aae0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afe205ebd759f598a3de5d3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 20:27:50 2011 +0100 shell32: Convert dll registration to the IRegistrar mechanism. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/regsvr.c | 881 -------------------------------------- dlls/shell32/shell32.rc | 3 + dlls/shell32/shell32.rgs | 51 +++ dlls/shell32/shell32_classes.idl | 137 ++++++ dlls/shell32/shell32_main.c | 21 + dlls/shell32/shellpath.c | 73 ++++ 7 files changed, 287 insertions(+), 882 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2afe205ebd759f598a3de…

1 0

Alexandre Julliard : include: Add an assert.h msvcrt header.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 6dcf94b21c878de94a3a8673e86cda103d5e357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcf94b21c878de94a3a8673e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 19:49:08 2011 +0100 include: Add an assert.h msvcrt header. --- include/Makefile.in | 1 + include/msvcrt/assert.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0257b9b..e5c2b53 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -343,6 +343,7 @@ SRCDIR_INCLUDES = \ msiquery.h \ mssip.h \ mstcpip.h \ + msvcrt/assert.h \ msvcrt/conio.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ diff --git a/include/msvcrt/assert.h b/include/msvcrt/assert.h new file mode 100644 index 0000000..c9cb164 --- /dev/null +++ b/include/msvcrt/assert.h @@ -0,0 +1,37 @@ +/* + * Assert support + * + * Copyright 2011 Alexandre Julliard + * + * 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 + */ + +#include <crtdefs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#undef assert +#ifdef NDEBUG +#define assert(_expr) ((void)0) +#else +extern void __cdecl _assert(const char *, const char *, unsigned int); +#define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0)) +#endif + +#ifdef __cplusplus +} +#endif

1 0

André Hentschel : German typo fixes
by Jeremy Newman 19 Jan '11

19 Jan '11

Module: website Branch: master Commit: a425621344690533a5eaa1384a64e13e39fa74b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a425621344690533a5eaa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 19 19:08:39 2011 +0100 German typo fixes --- templates/de/download/deb.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index a437baf..35aaf3a 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -9,13 +9,13 @@ Wine für Ubuntu und Ubuntu Derivate als Pakete die in Repositories untergebracht sind. Ubuntu's Standard Repository enthält Wine, wenn du allerdings mit dem neuesten Wine auf dem Laufenden bleiben willst nutze das von -WineHQ mit folgenden Anleitung. +WineHQ mit folgender Anleitung. <h2>Hinzufügen des WineHQ Repository:</h2> Öffne das Software-Paketquellenmenü durch -Anwendungen->Software-Center, dannBearbeiten->Software-Paketquellen.... +Anwendungen->Software-Center, dann Bearbeiten->Software-Paketquellen... Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinzufügen. <img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> @@ -28,7 +28,7 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen -<a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch +<a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.

1 0

Juan Lang : crypt32: Ensure that chain validity time is initialized ( valgrind).
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 98834637eb25caf986c9feae3eaa0b855cc19a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98834637eb25caf986c9feae3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 19 09:15:29 2011 -0800 crypt32: Ensure that chain validity time is initialized (valgrind). --- dlls/crypt32/tests/chain.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 71be975..d11dece 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2664,7 +2664,9 @@ static PCCERT_CHAIN_CONTEXT getChain(HCERTCHAINENGINE engine, CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; FILETIME fileTime; - SystemTimeToFileTime(checkTime, &fileTime); + ok(SystemTimeToFileTime(checkTime, &fileTime), + "SystemTimeToFileTime failed for day %d, month %d, year %d\n", + checkTime->wDay, checkTime->wMonth, checkTime->wYear); ret = pCertGetCertificateChain(engine, endCert, &fileTime, includeStore ? store : NULL, &chainPara, flags, NULL, &chain); if (todo & TODO_CHAIN) @@ -4340,6 +4342,8 @@ static void check_authenticode_policy(void) policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + epochStart.wDay = epochStart.wMonth = 1; + epochStart.wYear = 1601; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &epochStart, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG;

1 0

Alexandre Julliard : actxprxy: Add proxies for shldisp.idl.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 4a5c687069cd53a11b1537b5951f16121dc08d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5c687069cd53a11b1537b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 17:43:45 2011 +0100 actxprxy: Add proxies for shldisp.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 2 ++ dlls/actxprxy/actxprxy_shldisp.idl | 21 +++++++++++++++++++++ include/shldisp.idl | 3 +++ 4 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 3817eea..d91e568 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,8 @@ dlls/actxprxy/actxprxy_ocmm.h dlls/actxprxy/actxprxy_ocmm_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c +dlls/actxprxy/actxprxy_shldisp.h +dlls/actxprxy/actxprxy_shldisp_p.c dlls/actxprxy/actxprxy_shobjidl.h dlls/actxprxy/actxprxy_shobjidl_p.c dlls/actxprxy/actxprxy_urlhist.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 15f8e3d..b879903 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -16,6 +16,7 @@ IDL_P_SRCS = \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ actxprxy_servprov.idl \ + actxprxy_shldisp.idl \ actxprxy_shobjidl.idl \ actxprxy_urlhist.idl @@ -28,6 +29,7 @@ IDL_R_SRCS = \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ actxprxy_servprov.idl \ + actxprxy_shldisp.idl \ actxprxy_shobjidl.idl \ actxprxy_urlhist.idl diff --git a/dlls/actxprxy/actxprxy_shldisp.idl b/dlls/actxprxy/actxprxy_shldisp.idl new file mode 100644 index 0000000..81222a5 --- /dev/null +++ b/dlls/actxprxy/actxprxy_shldisp.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for shldisp.idl */ + +#include "shldisp.idl" diff --git a/include/shldisp.idl b/include/shldisp.idl index ce6d555..8df56cd 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -31,6 +31,7 @@ import "comcat.idl"; * IAutoComplete interface */ [ + local, object, uuid(00bb2762-6a77-11d0-a535-00c04fd7d062), pointer_default(unique) @@ -51,6 +52,7 @@ interface IAutoComplete : IUnknown * IAutoComplete2 interface */ [ + local, object, uuid(eac04bc0-3791-11d2-bb95-0060977b464c), pointer_default(unique) @@ -87,6 +89,7 @@ importlib("stdole2.tlb"); [ object, + oleautomation, uuid(9ba05970-f6a8-11cf-a442-00a0c90a8f39), pointer_default(unique) ]

1 0

Alexandre Julliard : widl: Don' t generate proxies for oleautomation interfaces.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 56425e3767689dad544e0f3a7c8e6f39bc13ff7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56425e3767689dad544e0f3a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 17:43:01 2011 +0100 widl: Don't generate proxies for oleautomation interfaces. --- tools/widl/proxy.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 9952179..c945ac0 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -576,8 +576,6 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) const statement_t *stmt; int first_func = 1; - /* FIXME: check for [oleautomation], shouldn't generate proxies/stubs if specified */ - STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { var_t *func = stmt->u.var; if (first_func) { @@ -701,7 +699,11 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred) int need_proxy(const type_t *iface) { - return is_object(iface) && !is_local(iface->attrs); + if (!is_object( iface )) return 0; + if (is_local( iface->attrs )) return 0; + if (is_attr( iface->attrs, ATTR_OLEAUTOMATION )) return 0; + if (is_attr( iface->attrs, ATTR_DISPINTERFACE )) return 0; + return 1; } int need_stub(const type_t *iface)

1 0

Huw Davies : wininet: Add tests for querying INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER and fix typo in the implementation .
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 354f97dff82618c996074ad217088b5ac26b7fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354f97dff82618c996074ad21… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 19 15:11:11 2011 +0000 wininet: Add tests for querying INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER and fix typo in the implementation. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/internet.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 002f4e4..df8901a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2305,7 +2305,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; - *(ULONG*)size = 4; + *(ULONG*)buffer = 4; *size = sizeof(ULONG); return ERROR_SUCCESS; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d066830..e179dca 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -164,7 +164,7 @@ static void test_InternetCanonicalizeUrlA(void) static void test_InternetQueryOptionA(void) { HINTERNET hinet,hurl; - DWORD len; + DWORD len, val; DWORD err; static const char useragent[] = {"Wininet Test"}; char *buffer; @@ -248,6 +248,19 @@ static void test_InternetQueryOptionA(void) ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); InternetCloseHandle(hinet); + + len = sizeof(val); + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(retval == TRUE,"Got wrong return value %d\n", retval); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 2, "got %d\n", val); + + len = sizeof(val); + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); + ok(retval == TRUE,"Got wrong return value %d\n", retval); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 4, "got %d\n", val); + } static void test_get_cookie(void)

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
88
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 January 2011