July 2006 - Wine-commits - list.winehq.org

Andrew Talbot : taskmgr: Write-strings warnings fix.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 663187a3a7a22ff283064f7e1a0e564802d019bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=663187a3a7a22ff283064f7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 1 22:57:26 2006 +0100 taskmgr: Write-strings warnings fix. --- programs/taskmgr/dbgchnl.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 0d7b0ac..46741eb 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -223,34 +223,39 @@ static void DebugChannels_OnCreate(HWND { HWND hLV = GetDlgItem(hwndDlg, IDC_DEBUG_CHANNELS_LIST); LVCOLUMN lvc; + static TCHAR debug_channelT[] = {'D','e','b','u','g',' ','C','h','a','n','n','e','l',0}, + fixmeT[] = {'F','i','x','m','e',0}, + errT[] = {'E','r','r',0}, + warnT[] = {'W','a','r','n',0}, + traceT[] = {'T','r','a','c','e',0}; lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_LEFT; - lvc.pszText = _T("Debug Channel"); + lvc.pszText = debug_channelT; lvc.cx = 100; SendMessage(hLV, LVM_INSERTCOLUMN, 0, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Fixme"); + lvc.pszText = fixmeT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 1, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Err"); + lvc.pszText = errT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 2, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Warn"); + lvc.pszText = warnT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 3, (LPARAM) &lvc); lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH; lvc.fmt = LVCFMT_CENTER; - lvc.pszText = _T("Trace"); + lvc.pszText = traceT; lvc.cx = 55; SendMessage(hLV, LVM_INSERTCOLUMN, 4, (LPARAM) &lvc);

1 0

Jacek Caban : shdocvw: Get rid of Mozilla ActiveX control dependency.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 7027ed458b56fce57e9d3424fe2c7005be1110eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7027ed458b56fce57e9d342… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 23:40:54 2006 +0200 shdocvw: Get rid of Mozilla ActiveX control dependency. --- dlls/shdocvw/factory.c | 8 - dlls/shdocvw/shdocvw.h | 2 dlls/shdocvw/shdocvw_main.c | 401 ------------------------------------------- tools/wine.inf | 1 4 files changed, 2 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7027ed458b56fce57e9…

1 0

Hervé Poussineau : mapi32: Use kernel32 functions instead of the ntdll ones.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 4f492014131b1bea887c961d99be011ea08085d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f492014131b1bea887c961… Author: Hervé Poussineau <hpoussin(a)reactos.org> Date: Fri Jun 30 21:34:09 2006 +0200 mapi32: Use kernel32 functions instead of the ntdll ones. --- dlls/mapi32/prop.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 54b18e1..1d6c2e8 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1461,13 +1461,13 @@ static IPropDataItem *IMAPIPROP_AddValue /* Internal - Lock an IPropData object */ static inline void IMAPIPROP_Lock(IPropDataImpl *This) { - RtlEnterCriticalSection(&This->cs); + EnterCriticalSection(&This->cs); } /* Internal - Unlock an IPropData object */ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) { - RtlLeaveCriticalSection(&This->cs); + LeaveCriticalSection(&This->cs); } /* This one seems to be missing from mapidefs.h */ @@ -1553,7 +1553,7 @@ static inline ULONG WINAPI IMAPIProp_fnR This->lpFree(current->value); This->lpFree(current); } - RtlDeleteCriticalSection(&This->cs); + DeleteCriticalSection(&This->cs); This->lpFree(This); } return (ULONG)lRef; @@ -2542,7 +2542,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALL lpPropData->ulObjAccess = IPROP_READWRITE; lpPropData->ulNumValues = 0; list_init(&lpPropData->values); - RtlInitializeCriticalSection(&lpPropData->cs); + InitializeCriticalSection(&lpPropData->cs); *lppPropData = (LPPROPDATA)lpPropData; } return scode;

1 0

Andrew Talbot : regedit: Write-strings warnings fix.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: feb11af7af639e9961afbb8d54eba348abe95a73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=feb11af7af639e9961afbb8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 29 23:18:08 2006 +0100 regedit: Write-strings warnings fix. --- programs/regedit/listview.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 8b96068..6f9937b 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -252,6 +252,19 @@ static BOOL CreateListColumns(HWND hWndL static void OnGetDispInfo(NMLVDISPINFO* plvdi) { static TCHAR buffer[200]; + static TCHAR reg_szT[] = {'R','E','G','_','S','Z',0}, + reg_expand_szT[] = {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}, + reg_binaryT[] = {'R','E','G','_','B','I','N','A','R','Y',0}, + reg_dwordT[] = {'R','E','G','_','D','W','O','R','D',0}, + reg_dword_big_endianT[] = {'R','E','G','_','D','W','O','R','D','_', + 'B','I','G','_','E','N','D','I','A','N',0}, + reg_multi_szT[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}, + reg_linkT[] = {'R','E','G','_','L','I','N','K',0}, + reg_resource_listT[] = {'R','E','G','_','R','E','S','O','U','R','C','E','_','L','I','S','T',0}, + reg_noneT[] = {'R','E','G','_','N','O','N','E',0}, + not_setT[] = {'(','v','a','l','u','e',' ','n','o','t',' ','s','e','t',')',0}, + emptyT[] = {0}; + static const TCHAR unknownT[] = {'u','n','k','n','o','w','n','(','%','d',')',0}; plvdi->item.pszText = NULL; plvdi->item.cchTextMax = 0; @@ -263,43 +276,43 @@ static void OnGetDispInfo(NMLVDISPINFO* case 1: switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { case REG_SZ: - plvdi->item.pszText = _T("REG_SZ"); + plvdi->item.pszText = reg_szT; break; case REG_EXPAND_SZ: - plvdi->item.pszText = _T("REG_EXPAND_SZ"); + plvdi->item.pszText = reg_expand_szT; break; case REG_BINARY: - plvdi->item.pszText = _T("REG_BINARY"); + plvdi->item.pszText = reg_binaryT; break; case REG_DWORD: - plvdi->item.pszText = _T("REG_DWORD"); + plvdi->item.pszText = reg_dwordT; break; case REG_DWORD_BIG_ENDIAN: - plvdi->item.pszText = _T("REG_DWORD_BIG_ENDIAN"); + plvdi->item.pszText = reg_dword_big_endianT; break; case REG_MULTI_SZ: - plvdi->item.pszText = _T("REG_MULTI_SZ"); + plvdi->item.pszText = reg_multi_szT; break; case REG_LINK: - plvdi->item.pszText = _T("REG_LINK"); + plvdi->item.pszText = reg_linkT; break; case REG_RESOURCE_LIST: - plvdi->item.pszText = _T("REG_RESOURCE_LIST"); + plvdi->item.pszText = reg_resource_listT; break; case REG_NONE: - plvdi->item.pszText = _T("REG_NONE"); + plvdi->item.pszText = reg_noneT; break; default: - wsprintf(buffer, _T("unknown(%d)"), plvdi->item.lParam); + wsprintf(buffer, unknownT, plvdi->item.lParam); plvdi->item.pszText = buffer; break; } break; case 2: - plvdi->item.pszText = _T("(value not set)"); + plvdi->item.pszText = not_setT; break; case 3: - plvdi->item.pszText = _T(""); + plvdi->item.pszText = emptyT; break; } }

1 0

Ge van Geldorp : include/msvcrt: Make sure size_t is properly defined for 64-bit.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 6a65bf6a2bcc6360a79a01b63c13dc5f9a7523da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a65bf6a2bcc6360a79a01b… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jun 30 21:37:39 2006 +0200 include/msvcrt: Make sure size_t is properly defined for 64-bit. --- include/msvcrt/string.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index a821aa2..cc0b25e 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -18,8 +18,18 @@ typedef unsigned short wchar_t; #endif #endif +#ifndef _MSC_VER +# ifndef __int64 +# define __int64 long long +# endif +#endif + #ifndef _SIZE_T_DEFINED +#ifdef _WIN64 +typedef unsigned __int64 size_t; +#else typedef unsigned int size_t; +#endif #define _SIZE_T_DEFINED #endif

1 0

Ge van Geldorp : winedbg: Implement be_x86_64_init_registers.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: a2e94444ad29576870d1cfbff7233e476724d2ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2e94444ad29576870d1cfb… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jun 30 21:37:41 2006 +0200 winedbg: Implement be_x86_64_init_registers. --- include/cvconst.h | 108 ++++++++++++++++++++++++++++++++++++++++++ programs/winedbg/be_x86_64.c | 54 +++++++++++++++++++++ 2 files changed, 161 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2e94444ad29576870d…

1 0

Jacek Caban : mshtml: Add trailing '\' to gecko_path if needed.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 39d0dfa90970f0de0a574b8cbf882e5d6ca8ac70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39d0dfa90970f0de0a574b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 23:38:43 2006 +0200 mshtml: Add trailing '\' to gecko_path if needed. --- dlls/mshtml/install.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index cd2a124..bf4463e 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -94,8 +94,12 @@ static void set_registry(LPCSTR install_ } len = MultiByteToWideChar(CP_ACP, 0, install_dir, -1, NULL, 0)-1; - gecko_path = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)+sizeof(wszWineGecko)); - MultiByteToWideChar(CP_ACP, 0, install_dir, -1, gecko_path, -1); + gecko_path = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)+sizeof(wszWineGecko)); + MultiByteToWideChar(CP_ACP, 0, install_dir, -1, gecko_path, (len+1)*sizeof(WCHAR)); + + if (len && gecko_path[len-1] != '\\') + gecko_path[len++] = '\\'; + memcpy(gecko_path+len, wszWineGecko, sizeof(wszWineGecko)); size = len*sizeof(WCHAR)+sizeof(wszWineGecko);

1 0

Jacek Caban : wine.inf: Set gecko url to activate Wine Gecko installer.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: a9cdb5b8321103131fa8b660785c95a8b1c49b87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9cdb5b8321103131fa8b66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 23:39:38 2006 +0200 wine.inf: Set gecko url to activate Wine Gecko installer. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 4f922df..0307d50 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -289,6 +289,7 @@ HKLM,System\CurrentControlSet\Control\Se HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,"" HKCU,Software\Wine\shdocvw,"MozillaUrl",,"http://source.winehq.org/mozactivex" +HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,""

1 0

Jacek Caban : mshtml: Added beginning IDM_BROWSEMODE implementation.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 346d5bc7d03d1a1f5ebfb377a4dfc10c73fb3b26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=346d5bc7d03d1a1f5ebfb37… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 30 23:44:04 2006 +0200 mshtml: Added beginning IDM_BROWSEMODE implementation. --- dlls/mshtml/mshtml_private.h | 7 +++++++ dlls/mshtml/olecmd.c | 19 +++++++++++++++++-- dlls/mshtml/oleobj.c | 13 ++++++++++--- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ee608de..aece659 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -47,6 +47,12 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; +typedef enum { + UNKNOWN_USERMODE, + BROWSEMODE, + EDITMODE +} USERMODE; + typedef struct { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; @@ -78,6 +84,7 @@ typedef struct { HWND hwnd; HWND tooltips_hwnd; + USERMODE usermode; BOOL in_place_active; BOOL ui_active; BOOL window_active; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 1881062..95d8646 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "shlguid.h" #include "mshtmdid.h" #include "idispids.h" +#include "mshtmcid.h" #include "wine/debug.h" @@ -237,6 +238,15 @@ static HRESULT exec_get_print_template(H return E_NOTIMPL; } +static HRESULT exec_browsemode(HTMLDocument *This) +{ + WARN("(%p)\n", This); + + This->usermode = BROWSEMODE; + + return S_OK; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -374,8 +384,13 @@ static HRESULT WINAPI OleCommandTarget_E FIXME("unsupported nCmdID %ld of CGID_ShellDocView group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { - FIXME("unsupported nCmdID %ld of CGID_MSHTML group\n", nCmdID); - return OLECMDERR_E_NOTSUPPORTED; + switch(nCmdID) { + case IDM_BROWSEMODE: + return exec_browsemode(This); + default: + FIXME("unsupported nCmdID %ld of CGID_MSHTML group\n", nCmdID); + return OLECMDERR_E_NOTSUPPORTED; + } } FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index c9d8ead..981f65b 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -76,6 +76,7 @@ static HRESULT WINAPI OleObject_SetClien if(This->client) { IOleClientSite_Release(This->client); This->client = NULL; + This->usermode = UNKNOWN_USERMODE; } if(This->hostui) { @@ -161,7 +162,9 @@ static HRESULT WINAPI OleObject_SetClien This->client = pClientSite; This->hostui = pDocHostUIHandler; - IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); + if(This->usermode == UNKNOWN_USERMODE) + IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERMODE); + IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_OFFLINEIFNOTCONNECTED); IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_SILENT); IOleControl_OnAmbientPropertyChange(CONTROL(This), DISPID_AMBIENT_USERAGENT); @@ -571,9 +574,11 @@ static HRESULT WINAPI OleControl_OnAmbie return S_OK; if(V_VT(&res) == VT_BOOL) { - if(!V_BOOL(&res)) { + if(V_BOOL(&res)) { + This->usermode = BROWSEMODE; + }else { FIXME("edit mode is not supported\n"); - hres = E_FAIL; + This->usermode = EDITMODE; } }else { FIXME("V_VT(res)=%d\n", V_VT(&res)); @@ -679,6 +684,8 @@ void HTMLDocument_OleObj_Init(HTMLDocume This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; + This->usermode = UNKNOWN_USERMODE; + This->client = NULL; This->hostui = NULL;

1 0

Ge van Geldorp : server: The "select" call passes handles, not ints.
by Alexandre Julliard 03 Jul '06

03 Jul '06

Module: wine Branch: refs/heads/master Commit: 5d88b27d0d0978541b8012d92affe7b56265876c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d88b27d0d0978541b8012d… Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Jun 30 21:37:36 2006 +0200 server: The "select" call passes handles, not ints. --- server/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index 7e4ba3b..36b7309 100644 --- a/server/thread.c +++ b/server/thread.c @@ -994,7 +994,7 @@ DECL_HANDLER(resume_thread) /* select on a handle list */ DECL_HANDLER(select) { - int count = get_req_data_size() / sizeof(int); + int count = get_req_data_size() / sizeof(obj_handle_t); select_on( count, req->cookie, get_req_data(), req->flags, &req->timeout, req->signal ); }

1 0