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

Alexandre Julliard : server: Moved some common bits of get/ set_thread_context to thread.c.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 86d46881719d07fff9f3379709f331342a55978c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86d46881719d07fff9f3379… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 13:16:14 2006 +0200 server: Moved some common bits of get/set_thread_context to thread.c. --- server/context_alpha.c | 33 +++++----- server/context_i386.c | 152 ++++++++++++++++++++++++++-------------------- server/context_powerpc.c | 27 +++++--- server/context_sparc.c | 33 +++++----- server/context_x86_64.c | 37 +++++------ server/thread.c | 19 ++++-- server/thread.h | 7 ++ 7 files changed, 173 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=86d46881719d07fff9f…

1 0

Alexandre Julliard : libwine: Added entry for sigprocmask in the pthread functions table.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: e040e6c4f8dd20b7b52d843aefe1d6a6c5c0047d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e040e6c4f8dd20b7b52d843… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 12:27:45 2006 +0200 libwine: Added entry for sigprocmask in the pthread functions table. --- dlls/ntdll/server.c | 8 ++++---- include/wine/pthread.h | 3 +++ loader/kthread.c | 3 ++- loader/pthread.c | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index cffc407..b10a391 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -159,7 +159,7 @@ void server_exit_thread( int status ) NtFreeVirtualMemory( GetCurrentProcess(), &info.teb_base, &size, MEM_RELEASE | MEM_SYSTEM ); info.teb_size = size; - sigprocmask( SIG_BLOCK, &block_set, NULL ); + pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -173,7 +173,7 @@ void server_exit_thread( int status ) */ void server_abort_thread( int status ) { - sigprocmask( SIG_BLOCK, &block_set, NULL ); + pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); close( ntdll_get_thread_data()->wait_fd[0] ); close( ntdll_get_thread_data()->wait_fd[1] ); close( ntdll_get_thread_data()->reply_fd ); @@ -312,10 +312,10 @@ unsigned int wine_server_call( void *req struct __server_request_info * const req = req_ptr; sigset_t old_set; - sigprocmask( SIG_BLOCK, &block_set, &old_set ); + pthread_functions.sigprocmask( SIG_BLOCK, &block_set, &old_set ); send_request( req ); wait_reply( req ); - sigprocmask( SIG_SETMASK, &old_set, NULL ); + pthread_functions.sigprocmask( SIG_SETMASK, &old_set, NULL ); return req->u.reply.reply_header.error; } diff --git a/include/wine/pthread.h b/include/wine/pthread.h index 3d62d9d..69a1562 100644 --- a/include/wine/pthread.h +++ b/include/wine/pthread.h @@ -23,6 +23,8 @@ #define __WINE_WINE_PTHREAD_H struct wine_pthread_callbacks; +#include <signal.h> + #ifdef HAVE_PTHREAD_H #define _GNU_SOURCE @@ -99,6 +101,7 @@ #else void (*exit_thread)( struct wine_pthread_thread_info *info ); void (*abort_thread)( long status ); #endif + int (*sigprocmask)( int how, const sigset_t *newset, sigset_t *oldset ); }; extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size ); diff --git a/loader/kthread.c b/loader/kthread.c index 4320e80..a012aad 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -397,7 +397,8 @@ const struct wine_pthread_functions pthr init_current_teb, get_current_teb, exit_thread, - abort_thread + abort_thread, + sigprocmask }; diff --git a/loader/pthread.c b/loader/pthread.c index 5c6632d..b7487a0 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -184,7 +184,8 @@ const struct wine_pthread_functions pthr init_current_teb, get_current_teb, exit_thread, - abort_thread + abort_thread, + pthread_sigmask }; #endif /* HAVE_PTHREAD_H */

1 0

Alexandre Julliard : wine-pthread: Set thread scope to force using kernel threads on Solaris.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: c6ad0201f49e5d7b5efeddc2dacb148c2f0f0547 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6ad0201f49e5d7b5efeddc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 12:26:23 2006 +0200 wine-pthread: Set thread scope to force using kernel threads on Solaris. --- loader/pthread.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 451d112..5c6632d 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -100,6 +100,7 @@ static int create_thread( struct wine_pt pthread_attr_init( &attr ); pthread_attr_setstacksize( &attr, info->stack_size ); pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); + pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread on Solaris */ if (pthread_create( &id, &attr, (void * (*)(void *))info->entry, info )) ret = -1; pthread_attr_destroy( &attr ); return ret; @@ -129,7 +130,11 @@ #endif /* set pid and tid */ info->pid = getpid(); +#ifdef __sun + info->tid = pthread_self(); /* this should return the lwp id on solaris */ +#else info->tid = gettid(); +#endif }

1 0

Huw Davies : opengl32: If there's no glX context don't return a wgl context .
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 53348f896699978b983e5cd124b2385f00fccd74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53348f896699978b983e5cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 22 20:18:01 2006 +0100 opengl32: If there's no glX context don't return a wgl context. --- dlls/opengl32/wgl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1365d6c..2dd59a8 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -94,6 +94,7 @@ static Wine_GLContext *context_list; static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx) { Wine_GLContext *ret; + if (!ctx) return NULL; for (ret = context_list; ret; ret = ret->next) if (ctx == ret->ctx) break; return ret; }

1 0

Piotr Caban : oleview: Added system configuration dialog.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 0f0ee255f6e1a560ec6995a3cdb26e11b13b9aee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f0ee255f6e1a560ec6995a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 22 21:14:42 2006 +0200 oleview: Added system configuration dialog. --- programs/oleview/En.rc | 13 +++++++ programs/oleview/oleview.c | 77 ++++++++++++++++++++++++++++++++++++++++++- programs/oleview/resource.h | 4 ++ 3 files changed, 93 insertions(+), 1 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 0baf385..767fc2c 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -128,3 +128,16 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 PUSHBUTTON "&Cancel", IDCANCEL, 200, 22, 45, 14 } + +DLG_SYSCONF DIALOG DISCARDABLE 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "System Configuration" +FONT 8, "MS Shell Dlg" +{ + LTEXT "System Settings", IDIGNORE, 5, 6, 160, 8 + CHECKBOX "&Enable Distributed COM", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "Enable &Remote Connections (Win95 only)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "These settings changes only register values.\nIt has no effect on Wine performance.", IDIGNORE, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 120, 80, 45, 14 +} diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 3bd6dbf..fa6bdd9 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -24,7 +24,79 @@ GLOBALS globals; static WCHAR wszRegEdit[] = { 'r','e','g','e','d','i','t','.','e','x','e','\0' }; static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', - '>','\n','<','/','o','b','j','e','c','t','>' }; + '>','\n','<','/','o','b','j','e','c','t','>','\0' }; + +INT_PTR CALLBACK SysConfProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HKEY hKey; + WCHAR buffer[MAX_LOAD_STRING]; + DWORD bufSize; + + WCHAR wszReg[] = { 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','O','L','E','\\','\0' }; + WCHAR wszEnableDCOM[] = { 'E','n','a','b','l','e','D','C','O','M','\0' }; + WCHAR wszEnableRemote[] = { 'E','n','a','b','l','e', + 'R','e','m','o','t','e','C','o','n','n','e','c','t','\0' }; + WCHAR wszYes[] = { 'Y', '\0' }; + WCHAR wszNo[] = { 'N', '\0' }; + + switch(uMsg) + { + case WM_INITDIALOG: + if(RegOpenKey(HKEY_LOCAL_MACHINE, wszReg, &hKey) != ERROR_SUCCESS) + RegCreateKey(HKEY_LOCAL_MACHINE, wszReg, &hKey); + + bufSize = sizeof(buffer); + if(RegGetValue(hKey, NULL, wszEnableDCOM, RRF_RT_REG_SZ, + NULL, buffer, &bufSize) != ERROR_SUCCESS) + { + bufSize = sizeof(wszYes); + RegSetValueEx(hKey, wszEnableDCOM, 0, REG_SZ, (BYTE*)wszYes, bufSize); + } + + CheckDlgButton(hDlgWnd, IDC_ENABLEDCOM, + buffer[0]=='Y' ? BST_CHECKED : BST_UNCHECKED); + + bufSize = sizeof(buffer); + if(RegGetValue(hKey, NULL, wszEnableRemote, RRF_RT_REG_SZ, + NULL, buffer, &bufSize) != ERROR_SUCCESS) + { + bufSize = sizeof(wszYes); + RegSetValueEx(hKey, wszEnableRemote, 0, REG_SZ, (BYTE*)wszYes, bufSize); + } + + CheckDlgButton(hDlgWnd, IDC_ENABLEREMOTE, + buffer[0]=='Y' ? BST_CHECKED : BST_UNCHECKED); + + RegCloseKey(hKey); + return TRUE; + case WM_COMMAND: + switch(LOWORD(wParam)) { + case IDOK: + bufSize = sizeof(wszYes); + + RegOpenKey(HKEY_LOCAL_MACHINE, wszReg, &hKey); + + RegSetValueEx(hKey, wszEnableDCOM, 0, REG_SZ, + IsDlgButtonChecked(hDlgWnd, IDC_ENABLEDCOM) == BST_CHECKED ? + (BYTE*)wszYes : (BYTE*)wszNo, bufSize); + + RegSetValueEx(hKey, wszEnableRemote, 0, REG_SZ, + IsDlgButtonChecked(hDlgWnd, IDC_ENABLEREMOTE) == BST_CHECKED ? + (BYTE*)wszYes : (BYTE*)wszNo, bufSize); + + RegCloseKey(hKey); + + EndDialog(hDlgWnd, IDOK); + return TRUE; + case IDCANCEL: + EndDialog(hDlgWnd, IDCANCEL); + return TRUE; + } + } + + return FALSE; +} INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -295,6 +367,9 @@ int MenuCommand(WPARAM wParam, HWND hWnd vis ? MF_UNCHECKED : MF_CHECKED); ResizeChild(); break; + case IDM_SYSCONF: + DialogBox(0, MAKEINTRESOURCE(DLG_SYSCONF), hWnd, SysConfProc); + break; case IDM_TOOLBAR: vis = IsWindowVisible(globals.hToolBar); ShowWindow(globals.hToolBar, vis ? SW_HIDE : SW_SHOW); diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index 2a6dc65..3554108 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -70,3 +70,7 @@ #define IDS_ERROR_UNKN 301 #define DLG_CREATEINSTON 1000 #define IDC_MACHINE 1001 + +#define DLG_SYSCONF 1010 +#define IDC_ENABLEDCOM 1011 +#define IDC_ENABLEREMOTE 1012

1 0

Piotr Caban : oleview: Added copy CLSID functionality.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 749e65cb37ec138adda46e933bd357d8680636e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=749e65cb37ec138adda46e9… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 22 19:59:21 2006 +0200 oleview: Added copy CLSID functionality. --- programs/oleview/oleview.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 02b2b18..3bebfe2 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -49,6 +49,27 @@ INT_PTR CALLBACK CreateInstOnProc(HWND h return FALSE; } +void CopyClsid(HTREEITEM item) +{ + TVITEM tvi; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.hItem = item; + tvi.cchTextMax = MAX_LOAD_STRING; + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + + if(OpenClipboard(globals.hMainWnd) && EmptyClipboard() && tvi.lParam) + { + HANDLE hClipData = GlobalAlloc(GHND, sizeof(WCHAR[MAX_LOAD_STRING])); + LPVOID pLoc = GlobalLock(hClipData); + + lstrcpyW(pLoc, ((ITEM_INFO *)tvi.lParam)->clsid); + GlobalUnlock(hClipData); + hClipData = SetClipboardData(CF_UNICODETEXT, hClipData); + CloseClipboard(); + } +} + void ResizeChild(void) { RECT client, stat, tool; @@ -149,6 +170,10 @@ int MenuCommand(WPARAM wParam, HWND hWnd sizeof(WCHAR[MAX_LOAD_STRING])); ShellAbout(hWnd, wszAbout, wszAboutVer, NULL); break; + case IDM_COPYCLSID: + hSelect = TreeView_GetSelection(globals.hTree); + CopyClsid(hSelect); + break; case IDM_CREATEINST: hSelect = TreeView_GetSelection(globals.hTree); CreateInst(hSelect, NULL);

1 0

Piotr Caban : oleview: Added copy HTML tag functionality.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 0defa4e807f00b6285d0e3fcfede9327870e78a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0defa4e807f00b6285d0e3f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 22 20:00:11 2006 +0200 oleview: Added copy HTML tag functionality. --- programs/oleview/En.rc | 2 +- programs/oleview/oleview.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 94ba40b..0baf385 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -49,7 +49,7 @@ IDM_MENU MENU MENUITEM "Create Instance &On", IDM_CREATEINSTON, GRAYED MENUITEM "&Release Instance", IDM_RELEASEINST, GRAYED MENUITEM SEPARATOR - MENUITEM "Copy &CLSID to clipboard", IDM_COPYCLSID, GRAYED + MENUITEM "Copy C&LSID to clipboard", IDM_COPYCLSID, GRAYED MENUITEM "Copy &HTML object Tag to clipboard", IDM_HTMLTAG, GRAYED MENUITEM SEPARATOR MENUITEM "&View...", IDM_VIEW, GRAYED diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 3bebfe2..3bd6dbf 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -22,6 +22,9 @@ #include "main.h" GLOBALS globals; static WCHAR wszRegEdit[] = { 'r','e','g','e','d','i','t','.','e','x','e','\0' }; +static WCHAR wszFormat[] = { '<','o','b','j','e','c','t','\n',' ',' ',' ', + 'c','l','a','s','s','i','d','=','\"','c','l','s','i','d',':','%','s','\"','\n', + '>','\n','<','/','o','b','j','e','c','t','>' }; INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -70,6 +73,31 @@ void CopyClsid(HTREEITEM item) } } +void CopyHTMLTag(HTREEITEM item) +{ + TVITEM tvi; + + memset(&tvi, 0, sizeof(TVITEM)); + tvi.hItem = item; + tvi.cchTextMax = MAX_LOAD_STRING; + SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + + if(OpenClipboard(globals.hMainWnd) && EmptyClipboard() && tvi.lParam) + { + HANDLE hClipData = GlobalAlloc(GHND, sizeof(WCHAR[MAX_LOAD_STRING])); + LPVOID pLoc = GlobalLock(hClipData); + int clsidLen = lstrlenW(((ITEM_INFO *)tvi.lParam)->clsid)-1; + + ((ITEM_INFO *)tvi.lParam)->clsid[clsidLen] = '\0'; + wsprintfW(pLoc, wszFormat, ((ITEM_INFO *)tvi.lParam)->clsid+1); + ((ITEM_INFO *)tvi.lParam)->clsid[clsidLen] = '}'; + + GlobalUnlock(hClipData); + hClipData = SetClipboardData(CF_UNICODETEXT, hClipData); + CloseClipboard(); + } +} + void ResizeChild(void) { RECT client, stat, tool; @@ -150,7 +178,7 @@ void RefreshMenu(HTREEITEM item) EnableMenuItem(hMenu, IDM_VIEW, MF_GRAYED); } parent = TreeView_GetParent(globals.hTree, item); - if(parent==tree.hAID || parent==tree.hGBCC) + if(parent==tree.hAID || parent==tree.hGBCC || parent==tree.hTL) EnableMenuItem(hMenu, IDM_COPYCLSID, MF_ENABLED); } @@ -174,6 +202,10 @@ int MenuCommand(WPARAM wParam, HWND hWnd hSelect = TreeView_GetSelection(globals.hTree); CopyClsid(hSelect); break; + case IDM_HTMLTAG: + hSelect = TreeView_GetSelection(globals.hTree); + CopyHTMLTag(hSelect); + break; case IDM_CREATEINST: hSelect = TreeView_GetSelection(globals.hTree); CreateInst(hSelect, NULL);

1 0

Piotr Caban : oleview: Added CreateInstanceOn functionality.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: b2d91368e5e478554cc0288b9d8388f7076d0a66 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2d91368e5e478554cc0288… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 22 19:58:37 2006 +0200 oleview: Added CreateInstanceOn functionality. --- programs/oleview/En.rc | 11 +++++++++++ programs/oleview/main.h | 3 ++- programs/oleview/oleview.c | 35 ++++++++++++++++++++++++++++++++++- programs/oleview/resource.h | 3 +++ programs/oleview/tree.c | 22 +++++++++++++++++++--- 5 files changed, 69 insertions(+), 5 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index abc4bee..94ba40b 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -117,3 +117,14 @@ STRINGTABLE IDS_CGCOFAIL, "CoGetClassObject failed." IDS_ERROR_UNKN, "Unknown error" } + +DLG_CREATEINSTON DIALOG DISCARDABLE 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "Connect to another machine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Machine name:", IDIGNORE, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&OK", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&Cancel", IDCANCEL, 200, 22, 45, 14 +} diff --git a/programs/oleview/main.h b/programs/oleview/main.h index f715583..1bc8cf0 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -51,6 +51,7 @@ typedef struct HINSTANCE hMainInst; BOOL bExpert; DWORD dwClsCtx; + WCHAR wszMachineName[MAX_LOAD_STRING]; }GLOBALS; typedef struct @@ -115,5 +116,5 @@ void AddTreeEx(void); void AddTree(void); HWND CreateTreeWindow(HINSTANCE hInst); BOOL CreateRegPath(HTREEITEM item, WCHAR *buffer, int bufSize); -void CreateInst(HTREEITEM item); +void CreateInst(HTREEITEM item, WCHAR *wszMachineName); void ReleaseInst(HTREEITEM item); diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index c346bcf..02b2b18 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -23,6 +23,32 @@ #include "main.h" GLOBALS globals; static WCHAR wszRegEdit[] = { 'r','e','g','e','d','i','t','.','e','x','e','\0' }; +INT_PTR CALLBACK CreateInstOnProc(HWND hDlgWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hEdit; + + switch(uMsg) + { + case WM_COMMAND: + switch(LOWORD(wParam)) { + case IDOK: + memset(globals.wszMachineName, 0, sizeof(WCHAR[MAX_LOAD_STRING])); + hEdit = GetDlgItem(hDlgWnd, IDC_MACHINE); + + if (GetWindowTextLength(hEdit)>0) + GetWindowText(hEdit, globals.wszMachineName, MAX_LOAD_STRING); + + EndDialog(hDlgWnd, IDOK); + return TRUE; + case IDCANCEL: + EndDialog(hDlgWnd, IDCANCEL); + return TRUE; + } + } + + return FALSE; +} + void ResizeChild(void) { RECT client, stat, tool; @@ -125,7 +151,14 @@ int MenuCommand(WPARAM wParam, HWND hWnd break; case IDM_CREATEINST: hSelect = TreeView_GetSelection(globals.hTree); - CreateInst(hSelect); + CreateInst(hSelect, NULL); + SendMessage(globals.hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hSelect); + break; + case IDM_CREATEINSTON: + if(DialogBox(0, MAKEINTRESOURCE(DLG_CREATEINSTON), + hWnd, CreateInstOnProc) == IDCANCEL) break; + hSelect = TreeView_GetSelection(globals.hTree); + CreateInst(hSelect, globals.wszMachineName); SendMessage(globals.hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hSelect); break; case IDM_RELEASEINST: diff --git a/programs/oleview/resource.h b/programs/oleview/resource.h index 65fdb5e..2a6dc65 100644 --- a/programs/oleview/resource.h +++ b/programs/oleview/resource.h @@ -67,3 +67,6 @@ #define IDS_TAB_ACTIV 252 #define IDS_CGCOFAIL 300 #define IDS_ERROR_UNKN 301 + +#define DLG_CREATEINSTON 1000 +#define IDC_MACHINE 1001 diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index e59f110..9968542 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -50,7 +50,7 @@ LPARAM CreateITEM_INFO(INT flag, const W return (LPARAM)reg; } -void CreateInst(HTREEITEM item) +void CreateInst(HTREEITEM item, WCHAR *wszMachineName) { TVITEM tvi; HTREEITEM hCur; @@ -62,6 +62,8 @@ void CreateInst(HTREEITEM item) WCHAR wszRegPath[MAX_LOAD_STRING]; const WCHAR wszFormat[] = { '\n','%','s',' ','(','$','%','x',')','\n','\0' }; CLSID clsid; + COSERVERINFO remoteInfo; + MULTI_QI qi; IUnknown *obj, *unk; HRESULT hRes; @@ -86,7 +88,21 @@ void CreateInst(HTREEITEM item) if(FAILED(CLSIDFromString(((ITEM_INFO *)tvi.lParam)->clsid, &clsid))) return; - hRes = CoCreateInstance(&clsid, NULL, globals.dwClsCtx, + if(wszMachineName) + { + remoteInfo.dwReserved1 = 0; + remoteInfo.dwReserved2 = 0; + remoteInfo.pAuthInfo = NULL; + remoteInfo.pwszName = wszMachineName; + + qi.pIID = &IID_IUnknown; + + CoCreateInstanceEx(&clsid, NULL, globals.dwClsCtx|CLSCTX_REMOTE_SERVER, + &remoteInfo, 1, &qi); + hRes = qi.hr; + obj = qi.pItf; + } + else hRes = CoCreateInstance(&clsid, NULL, globals.dwClsCtx, &IID_IUnknown, (void **)&obj); if(FAILED(hRes)) @@ -637,7 +653,7 @@ LRESULT CALLBACK TreeProc(HWND hWnd, UIN switch(((LPNMHDR)lParam)->code) { case TVN_ITEMEXPANDING: - CreateInst(((NMTREEVIEW *)lParam)->itemNew.hItem); + CreateInst(((NMTREEVIEW *)lParam)->itemNew.hItem, NULL); break; case TVN_SELCHANGED: RefreshMenu(((NMTREEVIEW *)lParam)->itemNew.hItem);

1 0

James Hawkins : msi: Add tests for components that aren' t associated with a feature.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 566beb788b75c3c94aa7d9d6c8601b468a5116ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=566beb788b75c3c94aa7d9d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 22 13:11:10 2006 -0700 msi: Add tests for components that aren't associated with a feature. --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/install.c | 52 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index f9499de..b86fc99 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msi.dll -IMPORTS = cabinet msi advapi32 kernel32 +IMPORTS = cabinet msi ole32 advapi32 kernel32 CTESTS = \ db.c \ diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b74d9cf..dfd469b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -70,7 +70,8 @@ static const CHAR component_dat[] = "Com "Four\t{FD37B4EA-7209-45C0-8917-535F35A2F080}\tCABOUTDIR\t2\t\tfour.txt\n" "One\t{783B242E-E185-4A56-AF86-C09815EC053C}\tMSITESTDIR\t2\t\tone.txt\n" "Three\t{010B6ADD-B27D-4EDD-9B3D-34C4F7D61684}\tCHANGEDDIR\t2\t\tthree.txt\n" - "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt"; + "Two\t{BF03D1A6-20DA-4A65-82F3-6CAC995915CE}\tFIRSTDIR\t2\t\ttwo.txt\n" + "dangler\t{6091DF25-EF96-45F1-B8E9-A9B1420C7A3C}\tTARGETDIR\t4\t\tregdata"; static const CHAR directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" "s72\tS72\tl255\n" @@ -151,7 +152,8 @@ static const CHAR registry_dat[] = "Regi "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" "Apples\t2\tSOFTWARE\\Wine\\msitest\tName\timaname\tOne\n" - "Oranges\t2\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo"; + "Oranges\t2\tSOFTWARE\\Wine\\msitest\tnumber\t#314\tTwo\n" + "regdata\t2\tSOFTWARE\\Wine\\msitest\tblah\tbad\tdangler"; typedef struct _msi_table { @@ -623,6 +625,14 @@ static void test_MsiInstallProduct(void) ok(!lstrcmpA(path, "imaname"), "Expected imaname, got %s\n", path); } + size = MAX_PATH; + type = REG_SZ; + res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size); + todo_wine + { + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %ld\n", res); + } + size = sizeof(num); type = REG_DWORD; res = RegQueryValueExA(hkey, "number", NULL, &type, (LPBYTE)&num, &size); @@ -635,6 +645,43 @@ static void test_MsiInstallProduct(void) RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); } +static void test_MsiSetComponentState(void) +{ + MSIHANDLE package; + char path[MAX_PATH]; + UINT r; + + CoInitialize(NULL); + + lstrcpy(path, CURR_DIR); + lstrcat(path, "\\"); + lstrcat(path, msifile); + + r = MsiOpenPackage(path, &package); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiDoAction(package, "CostInitialize"); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + } + + r = MsiDoAction(package, "FileCost"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiDoAction(package, "CostFinalize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSetComponentState(package, "dangler", INSTALLSTATE_SOURCE); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + } + + MsiCloseHandle(package); + CoUninitialize(); +} + START_TEST(install) { if (!init_function_pointers()) @@ -644,6 +691,7 @@ START_TEST(install) create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); test_MsiInstallProduct(); + test_MsiSetComponentState(); delete_test_files(); }

1 0

Jacek Caban : mshtml: Added stub implementation of HTMLLoadOptions.
by Alexandre Julliard 23 Jun '06

23 Jun '06

Module: wine Branch: refs/heads/master Commit: 881653ccdc878a2ce1bb8d6436aec675e737aa9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=881653ccdc878a2ce1bb8d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 22 16:14:14 2006 +0200 mshtml: Added stub implementation of HTMLLoadOptions. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/loadopts.c | 140 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/main.c | 3 + dlls/mshtml/mshtml_private.h | 1 4 files changed, 145 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/loadopts.c diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index a51f25e..99767b8 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ htmltextcont.c \ htmltextarea.c \ install.c \ + loadopts.c \ main.c \ navigate.c \ nsembed.c \ diff --git a/dlls/mshtml/loadopts.c b/dlls/mshtml/loadopts.c new file mode 100644 index 0000000..fec2ffb --- /dev/null +++ b/dlls/mshtml/loadopts.c @@ -0,0 +1,140 @@ +/* + * Copyright 2006 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> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "optary.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + const IHtmlLoadOptionsVtbl *lpHtmlLoadOptionsVtbl; + + LONG ref; +} HTMLLoadOptions; + +#define LOADOPTS(x) ((IHtmlLoadOptions*) &(x)->lpHtmlLoadOptionsVtbl) + +#define LOADOPTS_THIS(iface) DEFINE_THIS(HTMLLoadOptions, HtmlLoadOptions, iface) + +static HRESULT WINAPI HtmlLoadOptions_QueryInterface(IHtmlLoadOptions *iface, + REFIID riid, void **ppv) +{ + HTMLLoadOptions *This = LOADOPTS_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = LOADOPTS(This); + }else if(IsEqualGUID(&IID_IOptionArray, riid)) { + TRACE("(%p)->(IID_IOptionArray %p)\n", This, ppv); + *ppv = LOADOPTS(This); + }else if(IsEqualGUID(&IID_IHtmlLoadOptions, riid)) { + TRACE("(%p)->(IID_IHtmlLoadOptions %p)\n", This, ppv); + *ppv = LOADOPTS(This); + } + + if(*ppv) { + IHtmlLoadOptions_AddRef(LOADOPTS(This)); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface) +{ + HTMLLoadOptions *This = LOADOPTS_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface) +{ + HTMLLoadOptions *This = LOADOPTS_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD dwOption, + LPVOID pBuffer, ULONG *pcbBuf) +{ + HTMLLoadOptions *This = LOADOPTS_THIS(iface); + FIXME("(%p)->(%ld %p %p)\n", This, dwOption, pBuffer, pcbBuf); + return E_NOTIMPL; +} + +static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD dwOption, + LPVOID pBuffer, ULONG cbBuf) +{ + HTMLLoadOptions *This = LOADOPTS_THIS(iface); + FIXME("(%p)->(%ld %p %ld)\n", This, dwOption, pBuffer, cbBuf); + return E_NOTIMPL; +} + +#undef LOADOPTS_THIS + +static const IHtmlLoadOptionsVtbl HtmlLoadOptionsVtbl = { + HtmlLoadOptions_QueryInterface, + HtmlLoadOptions_AddRef, + HtmlLoadOptions_Release, + HtmlLoadOptions_QueryOption, + HtmlLoadOptions_SetOption +}; + +HRESULT HTMLLoadOptions_Create(IUnknown *pUnkOuter, REFIID riid, void** ppv) +{ + HTMLLoadOptions *ret; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HTMLLoadOptions)); + + ret->lpHtmlLoadOptionsVtbl = &HtmlLoadOptionsVtbl; + ret->ref = 1; + + hres = IHtmlLoadOptions_QueryInterface(LOADOPTS(ret), riid, ppv); + IHtmlLoadOptions_Release(LOADOPTS(ret)); + + return hres; +} diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 94dfcc1..58098d0 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -176,6 +176,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSI }else if(IsEqualGUID(&CLSID_SysimageProtocol, rclsid)) { TRACE("(CLSID_SysimageProtocol %s %p)\n", debugstr_guid(riid), ppv); return ProtocolFactory_Create(rclsid, riid, ppv); + }else if(IsEqualGUID(&CLSID_HTMLLoadOptions, rclsid)) { + TRACE("(CLSID_HTMLLoadOptions %s %p)\n", debugstr_guid(riid), ppv); + return ClassFactory_Create(riid, ppv, HTMLLoadOptions_Create); } FIXME("Unknown class %s\n", debugstr_guid(rclsid)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3087c3a..4c7abe4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -248,6 +248,7 @@ #define HTMLTEXTCONT(x) ((IHTMLTextCont #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**); +HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**); void HTMLDocument_HTMLDocument3_Init(HTMLDocument*); void HTMLDocument_Persist_Init(HTMLDocument*);

1 0