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

Francois Gouget : net: Remove a debug trace.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 89dcf229d05d20ee17aff5712d59ba30efe0d1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dcf229d05d20ee17aff5712… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 17:37:12 2011 +0200 net: Remove a debug trace. --- programs/net/net.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 815eadf..92f6ea7 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -68,7 +68,6 @@ static BOOL net_use(int argc, char *argv[]) { status[i] = HeapAlloc(GetProcessHeap(), 0, 1024); LoadStringA(hmod, STRING_OK+i, status[i], 1024); - printf("i=%d desc=%s\n", i, status[i]); } do {

1 0

Jacek Caban : ieframe: Moved intshcut.c tests to ieframe.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: ecc270869c13d581e5b4a9637a74599b28d082cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc270869c13d581e5b4a9637… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:45:42 2011 +0200 ieframe: Moved intshcut.c tests to ieframe. --- dlls/ieframe/tests/Makefile.in | 1 + dlls/{shdocvw => ieframe}/tests/intshcut.c | 31 ++++----------------------- dlls/shdocvw/tests/Makefile.in | 1 - dlls/shdocvw/tests/shortcut.c | 1 + 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in index fe4b1dd..f2c0716 100644 --- a/dlls/ieframe/tests/Makefile.in +++ b/dlls/ieframe/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = ole32 oleaut32 user32 gdi32 C_SRCS = \ ie.c \ + intshcut.c \ webbrowser.c @MAKE_TEST_RULES@ diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c similarity index 94% rename from dlls/shdocvw/tests/intshcut.c rename to dlls/ieframe/tests/intshcut.c index 205419b..63c595f 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -29,7 +29,6 @@ #include "winreg.h" #include "winerror.h" -#include "initguid.h" #include "shlobj.h" #include "shobjidl.h" #include "shlguid.h" @@ -180,20 +179,6 @@ static void _check_string_transform(unsigned line, IUniformResourceLocatorA *url } } -static BOOL check_ie(void) -{ - IHTMLDocument5 *doc; - HRESULT hres; - - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IHTMLDocument5, (void**)&doc); - if(FAILED(hres)) - return FALSE; - - IHTMLDocument5_Release(doc); - return TRUE; -} - static void test_ReadAndWriteProperties(void) { int iconIndex = 7; @@ -217,6 +202,7 @@ static void test_ReadAndWriteProperties(void) lstrcatW(fileNameW, shortcutW); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); + ok(hr == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hr); if (hr == S_OK) { IPersistFile *pf; @@ -257,10 +243,9 @@ static void test_ReadAndWriteProperties(void) urlA->lpVtbl->Release(urlA); IPropertySetStorage_Release(pPropSetStg); } - else - skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr); hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlAFromFile); + ok(hr == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hr); if (hr == S_OK) { IPropertySetStorage *pPropSetStg; @@ -306,8 +291,6 @@ static void test_ReadAndWriteProperties(void) urlAFromFile->lpVtbl->Release(urlAFromFile); DeleteFileW(fileNameW); } - else - skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr); } static void test_NullURLs(void) @@ -409,10 +392,9 @@ static void test_InternetShortcut(void) HRESULT hres; hres = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&url); - if(FAILED(hres)) { - win_skip("Could not create CLSID_InternetShortcut instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_InternetShortcut instance: %08x\n", hres); + if(FAILED(hres)) return; - } test_Aggregability(); test_QueryInterface(); @@ -426,10 +408,7 @@ START_TEST(intshcut) { OleInitialize(NULL); - if(check_ie()) - test_InternetShortcut(); - else - win_skip("Too old IE\n"); + test_InternetShortcut(); OleUninitialize(); } diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index e4cf689..d01c005 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -2,7 +2,6 @@ TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 advapi32 C_SRCS = \ - intshcut.c \ shdocvw.c \ shortcut.c diff --git a/dlls/shdocvw/tests/shortcut.c b/dlls/shdocvw/tests/shortcut.c index f38ae2b..4ed5f24 100644 --- a/dlls/shdocvw/tests/shortcut.c +++ b/dlls/shdocvw/tests/shortcut.c @@ -40,6 +40,7 @@ #include "winbase.h" #include "winreg.h" +#include "initguid.h" #include "shlobj.h" #include "shobjidl.h" #include "shlguid.h"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: ea1eb88d377e83068e3abc93e683a013f152de72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1eb88d377e83068e3abc93e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 2 22:16:25 2011 +0200 po: Update French translation. --- po/fr.po | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/po/fr.po b/po/fr.po index 464f7d6..ec0be22 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8753,29 +8753,24 @@ msgid "OK" msgstr "" #: net.rc:46 -#, fuzzy msgid "Paused" -msgstr "En pau&se" +msgstr "En pause" #: net.rc:47 -#, fuzzy msgid "Disconnected" -msgstr "Canal de communication connecté\n" +msgstr "Déconnecté\n" #: net.rc:48 -#, fuzzy msgid "A network error occurred" -msgstr "Une erreur d'impression s'est produite." +msgstr "Une erreur réseau s'est produite." #: net.rc:49 -#, fuzzy msgid "Connection is being made" -msgstr "Connexion active\n" +msgstr "Connexion en cours\n" #: net.rc:50 -#, fuzzy msgid "Reconnecting" -msgstr "Connexion à %s" +msgstr "Reconnexion" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Frédéric Delanoy : dlls: Assorted spelling fixes.
by Alexandre Julliard 03 Aug '11

03 Aug '11

1 0

Richard Bradbrook : comctl32: Fix to ComboBoxEx processing of WM_ENABLE message.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: f9d9720d251567e2e9142c078f65095f8e980609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d9720d251567e2e9142c078… Author: Richard Bradbrook <richard(a)bradders2000.co.uk> Date: Sun Jul 31 18:06:25 2011 +0100 comctl32: Fix to ComboBoxEx processing of WM_ENABLE message. --- dlls/comctl32/comboex.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index b8cb359..efdea6a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1598,6 +1598,22 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) } +static LRESULT COMBOEX_Enable (COMBOEX_INFO *infoPtr, BOOL enable) +{ + TRACE("hwnd=%p, enable=%s\n", infoPtr->hwndSelf, enable ? "TRUE":"FALSE"); + + if (infoPtr->hwndEdit) + EnableWindow(infoPtr->hwndEdit, enable); + + EnableWindow(infoPtr->hwndCombo, enable); + + /* Force the control to repaint when the enabled state changes. */ + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + + return 1; +} + + static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO const *infoPtr, MEASUREITEMSTRUCT *mis) { static const WCHAR strW[] = { 'W', 0 }; @@ -2278,6 +2294,9 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: return COMBOEX_Destroy (infoPtr); + case WM_ENABLE: + return COMBOEX_Enable (infoPtr, (BOOL)wParam); + case WM_MEASUREITEM: return COMBOEX_MeasureItem (infoPtr, (MEASUREITEMSTRUCT *)lParam);

1 0

Richard Bradbrook : comctl32: Make ComboBoxEx draw its contents even when disabled.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 5495b53eb12936077050b64c8e481978cc0d8e4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5495b53eb12936077050b64c8… Author: Richard Bradbrook <richard(a)bradders2000.co.uk> Date: Sun Jul 31 18:17:39 2011 +0100 comctl32: Make ComboBoxEx draw its contents even when disabled. --- dlls/comctl32/comboex.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index efdea6a..a1b6cff 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1328,8 +1328,6 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con COLORREF nbkc, ntxc, bkc, txc; int drawimage, drawstate, xioff; - if (!IsWindowEnabled(infoPtr->hwndCombo)) return 0; - TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", dis->CtlType, dis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",

1 0

Alistair Leslie-Hughes : advapi32: Add stub TraceMessage, TraceMessageVa.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 3fc5110e2cce29cb156542aae580803fb020f3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc5110e2cce29cb156542aae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 3 12:57:57 2011 +1000 advapi32: Add stub TraceMessage, TraceMessageVa. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d27db95..29e8a20 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -642,8 +642,8 @@ @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall TraceEvent(int64 ptr) @ stub TraceEventInstance -@ stub TraceMessage -@ stub TraceMessageVa +@ varargs TraceMessage(int64 long ptr long) +@ stdcall TraceMessageVa(int64 long ptr long ptr) # @ stub TreeResetNamedSecurityInfoA @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) # @ stub TrusteeAccessToObjectA diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 2de75da..cfad001 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -884,3 +884,19 @@ ULONG WINAPI ProcessTrace( PTRACEHANDLE HandleArray, ULONG HandleCount, LPFILETI FIXME("%p %u %p %p: stub\n", HandleArray, HandleCount, StartTime, EndTime); return ERROR_CALL_NOT_IMPLEMENTED; } + +ULONG TraceMessage( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, + USHORT MessageNumber, ...) +{ + FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, + debugstr_guid(MessageGuid), MessageNumber); + return ERROR_SUCCESS; +} + +ULONG TraceMessageVa( TRACEHANDLE SessionHandle, ULONG MessageFlags, LPGUID MessageGuid, + USHORT MessageNumber, __ms_va_list args) +{ + FIXME("(%s %d %s %d) : stub\n", wine_dbgstr_longlong(SessionHandle), MessageFlags, + debugstr_guid(MessageGuid), MessageNumber); + return ERROR_SUCCESS; +}

1 0

Jacek Caban : wshom.ocx: Added new DLL.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 1c2f066f8633053a8a00288c6ca32c05dfd6c579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2f066f8633053a8a00288c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 13:22:54 2011 +0200 wshom.ocx: Added new DLL. --- configure | 1 + configure.ac | 1 + dlls/wshom.ocx/Makefile.in | 6 +++ dlls/wshom.ocx/wshom.ocx.spec | 4 ++ dlls/wshom.ocx/wshom_main.c | 85 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7a27706..e2837a8 100755 --- a/configure +++ b/configure @@ -15262,6 +15262,7 @@ wine_fn_config_dll wnaspi32 enable_wnaspi32 implib wine_fn_config_dll wow32 enable_win16 implib wine_fn_config_dll ws2_32 enable_ws2_32 implib wine_fn_config_test dlls/ws2_32/tests ws2_32_test +wine_fn_config_dll wshom.ocx enable_wshom_ocx wine_fn_config_dll wsock32 enable_wsock32 implib wine_fn_config_dll wtsapi32 enable_wtsapi32 implib wine_fn_config_dll wuapi enable_wuapi diff --git a/configure.ac b/configure.ac index df7a355..e6bbb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -2876,6 +2876,7 @@ WINE_CONFIG_DLL(wnaspi32,,[implib]) WINE_CONFIG_DLL(wow32,enable_win16,[implib]) WINE_CONFIG_DLL(ws2_32,,[implib]) WINE_CONFIG_TEST(dlls/ws2_32/tests) +WINE_CONFIG_DLL(wshom.ocx) WINE_CONFIG_DLL(wsock32,,[implib]) WINE_CONFIG_DLL(wtsapi32,,[implib]) WINE_CONFIG_DLL(wuapi) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in new file mode 100644 index 0000000..3692cd9 --- /dev/null +++ b/dlls/wshom.ocx/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wshom.ocx + +C_SRCS = \ + wshom_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wshom.ocx/wshom.ocx.spec b/dlls/wshom.ocx/wshom.ocx.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/wshom.ocx/wshom.ocx.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c new file mode 100644 index 0000000..e9951ec --- /dev/null +++ b/dlls/wshom.ocx/wshom_main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2011 Jacek Caban 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wshom); + +/****************************************************************** + * DllMain (wshom.ocx.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (wshom.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (wshom.ocx.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (wshom.ocx.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("()\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (wshom.ocx.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("()\n"); + return S_OK; +}

1 0

Vincent Povirk : winex11.drv: Don' t set gamma when UseXVidMode is turned off.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 62802b8bdf8409ed0be2657c4d22320809297884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62802b8bdf8409ed0be2657c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 2 15:28:36 2011 -0500 winex11.drv: Don't set gamma when UseXVidMode is turned off. --- dlls/winex11.drv/xvidmode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index c432c01..c09fe39 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -389,7 +389,7 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; - if (xf86vm_major < 2) return FALSE; /* no gamma control */ + if (xf86vm_major < 2 || !usexvidmode) return FALSE; /* no gamma control */ #ifdef X_XF86VidModeSetGammaRamp else if (xf86vm_use_gammaramp) {

1 0

Jacek Caban : mshtml: Use task destructor for navigate task.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 832d4eb2e2117220231a6983a42bc8264200015e URL: http://source.winehq.org/git/wine.git/?a=commit;h=832d4eb2e2117220231a6983a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:04 2011 +0200 mshtml: Use task destructor for navigate task. --- dlls/mshtml/htmlwindow.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 61d0837..6e04612 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1741,9 +1741,15 @@ static void navigate_proc(task_t *_task) if(SUCCEEDED(hres)) hres = start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); +} + +static void navigate_task_destr(task_t *_task) +{ + navigate_task_t *task = (navigate_task_t*)_task; + IUnknown_Release((IUnknown*)task->bscallback); - IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); IMoniker_Release(task->mon); + heap_free(task); } static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR url, BSTR arg2, BSTR arg3, @@ -1843,11 +1849,10 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return E_OUTOFMEMORY; } - IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->bscallback = bsc; task->mon = mon; - push_task(&task->header, navigate_proc, NULL, This->task_magic); + push_task(&task->header, navigate_proc, navigate_task_destr, This->task_magic); /* Silently and repeated when real loading starts? */ This->readystate = READYSTATE_LOADING;

1 0