February 2009 - Wine-commits

Ricardo Filipe : setupapi: Implement SetupPromptForDiskW with only Cancel button active.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: ecc8e526bf1302cc80127c1f658f42af0850a66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc8e526bf1302cc80127c1f6… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Feb 18 08:44:15 2009 +0000 setupapi: Implement SetupPromptForDiskW with only Cancel button active. --- dlls/setupapi/En.rc | 23 ++++++++ dlls/setupapi/Makefile.in | 3 +- dlls/setupapi/dialog.c | 103 ++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi_private.h | 11 ++++ dlls/setupapi/stubs.c | 14 ----- 5 files changed, 139 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/En.rc b/dlls/setupapi/En.rc index 5d45feb..84619f6 100644 --- a/dlls/setupapi/En.rc +++ b/dlls/setupapi/En.rc @@ -2,6 +2,7 @@ * English resources for SETUPAPI * * Copyright 2001 Andreas Mohr + * Copyright 2009 Ricardo Filipe * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +21,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "The file '%s' on %s is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Copying Files..." @@ -32,3 +41,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index e6d3e80..700fce3 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -6,10 +6,11 @@ VPATH = @srcdir@ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 wintrust ole32 winspool +DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 C_SRCS = \ devinst.c \ + dialog.c \ dirid.c \ diskspace.c \ fakedll.c \ diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c new file mode 100644 index 0000000..b2bca9f --- /dev/null +++ b/dlls/setupapi/dialog.c @@ -0,0 +1,103 @@ +/* + * SetupAPI dialog functions + * + * Copyright 2009 Ricardo Filipe + * + * 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 <stdarg.h> + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "commdlg.h" +#include "setupapi.h" +#include "winnls.h" +#include "setupapi_private.h" + +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + +struct promptdisk_params { + PCWSTR DialogTitle; + PCWSTR DiskName; + PCWSTR PathToSource; + PCWSTR FileSought; + PCWSTR TagFile; + DWORD DiskPromptStyle; + PWSTR PathBuffer; + DWORD PathBufferSize; + PDWORD PathRequiredSize; +}; + +/* Handles the messages sent to the SetupPromptForDisk dialog +*/ +static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_COMMAND: + switch(wParam) + { + case IDCANCEL: + EndDialog(hwnd, DPROMPT_CANCEL); + return TRUE; + } + } + return FALSE; +} + +/*********************************************************************** + * SetupPromptForDiskW (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, + PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, + PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + struct promptdisk_params params; + UINT ret; + + TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle), + debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), + debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + + if(!FileSought) + { + SetLastError(ERROR_INVALID_PARAMETER); + return DPROMPT_CANCEL; + } + params.DialogTitle = DialogTitle; + params.DiskName = DiskName; + params.PathToSource = PathToSource; + params.FileSought = FileSought; + params.TagFile = TagFile; + params.DiskPromptStyle = DiskPromptStyle; + params.PathBuffer = PathBuffer; + params.PathBufferSize = PathBufferSize; + params.PathRequiredSize = PathRequiredSize; + + ret = DialogBoxParamW(SETUPAPI_hInstance, MAKEINTRESOURCEW(IDPROMPTFORDISK), + hwndParent, promptdisk_proc, (LPARAM)&params); + + if(ret == DPROMPT_CANCEL) + SetLastError(ERROR_CANCELLED); + return ret; +} diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index 428cba4..9aba8cf 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -24,6 +24,17 @@ #define DESTSTRORD 501 #define PROGRESSORD 502 +#define IDPROMPTFORDISK 1001 +#define IDC_FILENEEDED 503 +#define IDC_INFO 504 +#define IDC_COPYFROM 505 +#define IDC_PATH 506 +#define IDC_RUNDLG_BROWSE 507 + +#define IDS_PROMPTDISK 508 +#define IDS_UNKNOWN 509 +#define IDS_COPYFROM 510 +#define IDS_INFO 511 #define REG_INSTALLEDFILES "System\\CurrentControlSet\\Control\\InstalledFiles" #define REGPART_RENAME "\\Rename" diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db264b..287cb7e 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -261,20 +261,6 @@ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskNa } /*********************************************************************** - * SetupPromptForDiskW (SETUPAPI.@) - */ -UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, - PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, - PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) -{ - FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_w(DialogTitle), - debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), - debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, - PathRequiredSize); - return 0; -} - -/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: EnumLanguageProfiles.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 7d1952b68908515fde391894f30b6d78a1660302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1952b68908515fde391894f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 13:53:06 2009 -0600 msctf: Implement ITfInputProcessorProfiles::EnumLanguageProfiles. --- dlls/msctf/inputprocessor.c | 242 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 22 ++++ include/msctf.idl | 21 +++ 3 files changed, 283 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d1952b68908515fde391…

1 0

Alexandre Julliard : ntdll: Don' t free the thread stack and TEB while exiting, do it from the next thread.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 67e45d66d32a52bd4df8df24a75330bc59d4ec37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e45d66d32a52bd4df8df24a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 14:02:16 2009 +0100 ntdll: Don't free the thread stack and TEB while exiting, do it from the next thread. --- dlls/ntdll/ntdll_misc.h | 3 +-- dlls/ntdll/thread.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 3dd20d6..55eadd0 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -195,8 +195,7 @@ struct ntdll_thread_data int wait_fd[2]; /* 1e8 fd for sleeping server requests */ void *vm86_ptr; /* 1f0 data for vm86 mode */ void *pthread_data; /* 1f4 private data for pthread emulation */ - - void *pad[1]; /* 1f8 change this if you add fields! */ + pthread_t pthread_id; /* 1f8 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e11976c..40bf507 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -353,9 +353,9 @@ HANDLE thread_init(void) */ void abort_thread( int status ) { + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); - pthread_sigmask( SIG_BLOCK, &server_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 ); @@ -369,11 +369,8 @@ void abort_thread( int status ) */ static void DECLSPEC_NORETURN exit_thread( int status ) { - int fds[4]; - void *teb_addr; - SIZE_T teb_size; - - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( status ); + static void *prev_teb; + TEB *teb; RtlAcquirePebLock(); RemoveEntryList( &NtCurrentTeb()->TlsLinks ); @@ -381,23 +378,26 @@ static void DECLSPEC_NORETURN exit_thread( int status ) RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->FlsSlots ); RtlFreeHeap( GetProcessHeap(), 0, NtCurrentTeb()->TlsExpansionSlots ); - fds[0] = ntdll_get_thread_data()->wait_fd[0]; - fds[1] = ntdll_get_thread_data()->wait_fd[1]; - fds[2] = ntdll_get_thread_data()->reply_fd; - fds[3] = ntdll_get_thread_data()->request_fd; pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( status ); - virtual_free_system_view( &NtCurrentTeb()->DeallocationStack ); - teb_addr = NtCurrentTeb(); - teb_size = virtual_free_system_view( &teb_addr ); - - close( fds[0] ); - close( fds[1] ); - close( fds[2] ); - close( fds[3] ); + if ((teb = interlocked_xchg_ptr( &prev_teb, NtCurrentTeb() ))) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; + SIZE_T size; + + pthread_join( thread_data->pthread_id, NULL ); + wine_ldt_free_fs( thread_data->fs ); + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), &teb->DeallocationStack, &size, MEM_RELEASE ); + size = 0; + NtFreeVirtualMemory( GetCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); + } - wine_ldt_free_fs( wine_get_fs() ); - if (teb_size) munmap( teb_addr, teb_size ); + close( ntdll_get_thread_data()->wait_fd[0] ); + close( ntdll_get_thread_data()->wait_fd[1] ); + close( ntdll_get_thread_data()->reply_fd ); + close( ntdll_get_thread_data()->request_fd ); pthread_exit( UIntToPtr(status) ); } @@ -479,6 +479,7 @@ static void start_thread( struct wine_pthread_thread_info *info ) debug_info.str_pos = debug_info.strings; debug_info.out_pos = debug_info.output; thread_data->debug_info = &debug_info; + thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); server_init_thread( func ); @@ -632,7 +633,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_attr_init( &attr ); pthread_attr_setstacksize( &attr, stack_reserve ); - pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0

Alexandre Julliard : ntdll: Allocate the stack for all threads, don' t rely on pthread to do it for us.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 1056771b9100a9bf6bb9abf79c8379753129ace4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1056771b9100a9bf6bb9abf79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 14:24:59 2009 +0100 ntdll: Allocate the stack for all threads, don't rely on pthread to do it for us. --- dlls/ntdll/loader.c | 6 +---- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 55 +++++++++++++--------------------------------- dlls/ntdll/virtual.c | 43 ++++++++++++++++++------------------ 4 files changed, 39 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1056771b9100a9bf6bb9a…

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: EnumInputProcessorInfo.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 4d38c952d14957a0a09b76f47ec80972aa5e2e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d38c952d14957a0a09b76f47… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 13:52:55 2009 -0600 msctf: Implement ITfInputProcessorProfiles::EnumInputProcessorInfo. --- dlls/msctf/inputprocessor.c | 164 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 19 ++++ 2 files changed, 181 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 3950a94..b098169 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -52,6 +52,16 @@ typedef struct tagInputProcessorProfiles { LANGID currentLanguage; } InputProcessorProfiles; +typedef struct tagProfilesEnumGuid { + const IEnumGUIDVtbl *Vtbl; + LONG refCount; + + HKEY key; + DWORD next_index; +} ProfilesEnumGuid; + +static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); + static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) { TRACE("destroying %p\n", This); @@ -236,8 +246,8 @@ static HRESULT WINAPI InputProcessorProfiles_EnumInputProcessorInfo( ITfInputProcessorProfiles *iface, IEnumGUID **ppEnum) { InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppEnum); + return ProfilesEnumGuid_Constructor(ppEnum); } static HRESULT WINAPI InputProcessorProfiles_GetDefaultLanguageProfile( @@ -485,3 +495,153 @@ HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut *ppOut = (IUnknown *)This; return S_OK; } + +/************************************************** + * IEnumGUID implementaion for ITfInputProcessorProfiles::EnumInputProcessorInfo + **************************************************/ +static void ProfilesEnumGuid_Destructor(ProfilesEnumGuid *This) +{ + TRACE("destroying %p\n", This); + RegCloseKey(This->key); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI ProfilesEnumGuid_QueryInterface(IEnumGUID *iface, REFIID iid, LPVOID *ppvOut) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumGUID)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProfilesEnumGuid_AddRef(IEnumGUID *iface) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ProfilesEnumGuid_Release(IEnumGUID *iface) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ProfilesEnumGuid_Destructor(This); + return ret; +} + +/***************************************************** + * IEnumGuid functions + *****************************************************/ +static HRESULT WINAPI ProfilesEnumGuid_Next( LPENUMGUID iface, + ULONG celt, GUID *rgelt, ULONG *pceltFetched) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + ULONG fetched = 0; + + TRACE("(%p)\n",This); + + if (rgelt == NULL) return E_POINTER; + + if (This->key) while (fetched < celt) + { + LSTATUS res; + HRESULT hr; + WCHAR catid[39]; + DWORD cName = 39; + + res = RegEnumKeyExW(This->key, This->next_index, catid, &cName, + NULL, NULL, NULL, NULL); + if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; + ++(This->next_index); + + hr = CLSIDFromString(catid, rgelt); + if (FAILED(hr)) continue; + + ++fetched; + ++rgelt; + } + + if (pceltFetched) *pceltFetched = fetched; + return fetched == celt ? S_OK : S_FALSE; +} + +static HRESULT WINAPI ProfilesEnumGuid_Skip( LPENUMGUID iface, ULONG celt) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + TRACE("(%p)\n",This); + + This->next_index += celt; + return S_OK; +} + +static HRESULT WINAPI ProfilesEnumGuid_Reset( LPENUMGUID iface) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + TRACE("(%p)\n",This); + This->next_index = 0; + return S_OK; +} + +static HRESULT WINAPI ProfilesEnumGuid_Clone( LPENUMGUID iface, + IEnumGUID **ppenum) +{ + ProfilesEnumGuid *This = (ProfilesEnumGuid *)iface; + HRESULT res; + + TRACE("(%p)\n",This); + + if (ppenum == NULL) return E_POINTER; + + res = ProfilesEnumGuid_Constructor(ppenum); + if (SUCCEEDED(res)) + { + ProfilesEnumGuid *new_This = (ProfilesEnumGuid *)*ppenum; + new_This->next_index = This->next_index; + } + return res; +} + +static const IEnumGUIDVtbl IEnumGUID_Vtbl ={ + ProfilesEnumGuid_QueryInterface, + ProfilesEnumGuid_AddRef, + ProfilesEnumGuid_Release, + + ProfilesEnumGuid_Next, + ProfilesEnumGuid_Skip, + ProfilesEnumGuid_Reset, + ProfilesEnumGuid_Clone +}; + +static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut) +{ + ProfilesEnumGuid *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ProfilesEnumGuid)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &IEnumGUID_Vtbl; + This->refCount = 1; + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &This->key, NULL) != ERROR_SUCCESS) + return E_FAIL; + + TRACE("returning %p\n", This); + *ppOut = (IEnumGUID*)This; + return S_OK; +} diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 34e47e5..0520e49 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -84,6 +84,24 @@ static void test_Unregister(void) ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); } +static void test_EnumInputProcessorInfo(void) +{ + IEnumGUID *ppEnum; + BOOL found = FALSE; + + if (SUCCEEDED(ITfInputProcessorProfiles_EnumInputProcessorInfo(g_ipp, &ppEnum))) + { + ULONG fetched; + GUID g; + while (IEnumGUID_Next(ppEnum, 1, &g, &fetched) == S_OK) + { + if(IsEqualGUID(&g,&CLSID_FakeService)) + found = TRUE; + } + } + ok(found,"Did not find registered text service\n"); +} + static void test_RegisterCategory(void) { HRESULT hr; @@ -105,6 +123,7 @@ START_TEST(inputprocessor) gLangid = GetUserDefaultLCID(); test_Register(); test_RegisterCategory(); + test_EnumInputProcessorInfo(); test_UnregisterCategory(); test_Unregister(); }

1 0

Aric Stewart : msctf: Define TF_LANGUAGEPROFILE.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 606d087199f91d851a4e57ec450b7d0da896e931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=606d087199f91d851a4e57ec4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 13:52:37 2009 -0600 msctf: Define TF_LANGUAGEPROFILE. --- include/msctf.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 1c3e652..7ffb46c 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -57,6 +57,15 @@ interface IEnumTfLanguageProfiles; interface ITfEditRecord; interface ITfCompositionView; +typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE +{ + CLSID clsid; + LANGID langid; + GUID catid; + BOOL fActive; + GUID guidProfile; +} TF_LANGUAGEPROFILE; + [ object, uuid(aa80e801-2021-11d2-93e0-0060b067b86e),

1 0

Austin English : dbghelp: Change pointer cast to DWORD_PTR.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 28fe3f76c03553140c57e795ed3cd707ca9561fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fe3f76c03553140c57e795e… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Feb 22 15:28:19 2009 -0600 dbghelp: Change pointer cast to DWORD_PTR. --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f293140..99de037 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2524,7 +2524,7 @@ static BOOL pdb_process_internal(const struct process* pcs, } file_name = (const char*)file + size; file_name += strlen(file_name) + 1; - file = (BYTE*)((DWORD)(file_name + strlen(file_name) + 1 + 3) & ~3); + file = (BYTE*)((DWORD_PTR)(file_name + strlen(file_name) + 1 + 3) & ~3); } /* finish the remaining public and global information */ if (globalimage)

1 0

Alexandre Julliard : winetest: Process messages while waiting for a process to terminate.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: d9d2f37162179be7dc8c073094d6522149504e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d2f37162179be7dc8c07309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 12:22:24 2009 +0100 winetest: Process messages while waiting for a process to terminate. --- programs/winetest/main.c | 93 +++++++++++++++++++++++++-------------------- 1 files changed, 52 insertions(+), 41 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e53502d..0ab512a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -339,6 +339,21 @@ extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) CloseHandle(hfile); } +static DWORD wait_process( HANDLE process, DWORD timeout ) +{ + DWORD wait, diff = 0, start = GetTickCount(); + MSG msg; + + while (diff < timeout) + { + wait = MsgWaitForMultipleObjects( 1, &process, FALSE, timeout - diff, QS_ALLINPUT ); + if (wait != WAIT_OBJECT_0 + 1) return wait; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = GetTickCount() - start; + } + return WAIT_TIMEOUT; +} + /* Run a command for MS milliseconds. If OUT != NULL, also redirect stdout to there. @@ -359,49 +374,45 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) si.hStdError = out_file ? out_file : GetStdHandle( STD_ERROR_HANDLE ); if (!CreateProcessA (NULL, cmd, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, - NULL, tempdir, &si, &pi)) { - status = -2; - } else { - CloseHandle (pi.hThread); - wait = WaitForSingleObject (pi.hProcess, ms); - if (wait == WAIT_OBJECT_0) { - GetExitCodeProcess (pi.hProcess, &status); - } else { - switch (wait) { - case WAIT_FAILED: - report (R_ERROR, "Wait for '%s' failed: %d", cmd, - GetLastError ()); - break; - case WAIT_TIMEOUT: - report (R_ERROR, "Process '%s' timed out.", cmd); - break; - default: - report (R_ERROR, "Wait returned %d", wait); - } - status = wait; - if (!TerminateProcess (pi.hProcess, 257)) - report (R_ERROR, "TerminateProcess failed: %d", - GetLastError ()); - wait = WaitForSingleObject (pi.hProcess, 5000); - switch (wait) { - case WAIT_FAILED: - report (R_ERROR, - "Wait for termination of '%s' failed: %d", - cmd, GetLastError ()); - break; - case WAIT_OBJECT_0: - break; - case WAIT_TIMEOUT: - report (R_ERROR, "Can't kill process '%s'", cmd); - break; - default: - report (R_ERROR, "Waiting for termination: %d", - wait); - } - } + NULL, tempdir, &si, &pi)) + return -2; + + CloseHandle (pi.hThread); + status = wait_process( pi.hProcess, ms ); + switch (status) + { + case WAIT_OBJECT_0: + GetExitCodeProcess (pi.hProcess, &status); CloseHandle (pi.hProcess); + return status; + case WAIT_FAILED: + report (R_ERROR, "Wait for '%s' failed: %d", cmd, GetLastError ()); + break; + case WAIT_TIMEOUT: + report (R_ERROR, "Process '%s' timed out.", cmd); + break; + default: + report (R_ERROR, "Wait returned %d", status); + break; } - + if (!TerminateProcess (pi.hProcess, 257)) + report (R_ERROR, "TerminateProcess failed: %d", GetLastError ()); + wait = wait_process( pi.hProcess, 5000 ); + switch (wait) + { + case WAIT_OBJECT_0: + break; + case WAIT_FAILED: + report (R_ERROR, "Wait for termination of '%s' failed: %d", cmd, GetLastError ()); + break; + case WAIT_TIMEOUT: + report (R_ERROR, "Can't kill process '%s'", cmd); + break; + default: + report (R_ERROR, "Waiting for termination: %d", wait); + break; + } + CloseHandle (pi.hProcess); return status; }

1 0

Alexandre Julliard : winetest: Don't try to unload mshtml, it's broken.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 6b6ca1a801e9e348a1467c7cf6b2036b0e9cef9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ca1a801e9e348a1467c7cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 23 12:34:57 2009 +0100 winetest: Don't try to unload mshtml, it's broken. --- programs/winetest/Makefile.in | 1 + programs/winetest/main.c | 25 ++++++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 140adb5..20fd2ba 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = winetest.exe APPMODE = -mconsole IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32 +DELAYIMPORTS = ole32 EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0ab512a..5423ddb 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -154,28 +154,15 @@ static int running_on_visible_desktop (void) /* check if Gecko is present, trying to trigger the install if not */ static BOOL gecko_check(void) { - HMODULE mshtml; - HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); - IClassFactory *factory = NULL; - IHTMLDocument2 *doc = NULL; + IHTMLDocument2 *doc; IHTMLElement *body; BOOL ret = FALSE; - if (!(mshtml = LoadLibraryA( "mshtml.dll" ))) return FALSE; - if (!(pDllGetClassObject = (void *)GetProcAddress( mshtml, "DllGetClassObject" ))) - goto done; - if (FAILED(pDllGetClassObject( &CLSID_HTMLDocument, &IID_IClassFactory, (void **)&factory ))) - goto done; - if (FAILED(IClassFactory_CreateInstance( factory, NULL, &IID_IHTMLDocument2, (void **)&doc ))) - goto done; - if (FAILED(IHTMLDocument2_get_body( doc, &body ))) - goto done; - IHTMLElement_Release( body ); - ret = TRUE; -done: - if (doc) IHTMLDocument_Release( doc ); - if (factory) IClassFactory_Release( factory ); - FreeLibrary( mshtml ); + CoInitialize( NULL ); + if (FAILED( CoCreateInstance( &CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IHTMLDocument2, (void **)&doc ))) return FALSE; + if ((ret = SUCCEEDED( IHTMLDocument2_get_body( doc, &body )))) IHTMLElement_Release( body ); + IHTMLDocument_Release( doc ); return ret; }

1 0

Francois Gouget : netapi32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 23 Feb '09

23 Feb '09

Module: wine Branch: master Commit: 49de63595abf3e0c906cefbf16780115f25ad79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49de63595abf3e0c906cefbf1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 23 10:42:43 2009 +0100 netapi32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/netapi32/tests/access.c | 4 ++-- dlls/netapi32/tests/apibuf.c | 2 +- dlls/netapi32/tests/ds.c | 2 +- dlls/netapi32/tests/wksta.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 301cd19..8c39a18 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -74,7 +74,7 @@ static int init_access_tests(void) rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { - skip("GetUserNameW is not available.\n"); + win_skip("GetUserNameW is not available.\n"); return 0; } ok(rc, "User Name Retrieved\n"); @@ -333,7 +333,7 @@ START_TEST(access) * if one is not available, none are. */ if (!pNetApiBufferFree) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); FreeLibrary(hnetapi32); return; } diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index fa29fc4..2438ecd 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -98,7 +98,7 @@ START_TEST(apibuf) if (pNetApiBufferAllocate && pNetApiBufferFree && pNetApiBufferReallocate && pNetApiBufferSize) run_apibuf_tests(); else - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); FreeLibrary(hnetapi32); } diff --git a/dlls/netapi32/tests/ds.c b/dlls/netapi32/tests/ds.c index 277a589..be9597d 100644 --- a/dlls/netapi32/tests/ds.c +++ b/dlls/netapi32/tests/ds.c @@ -87,7 +87,7 @@ START_TEST(ds) test_get(); } else - skip("DsRoleGetPrimaryDomainInformation is not available\n"); + win_skip("DsRoleGetPrimaryDomainInformation is not available\n"); FreeLibrary(hnetapi32); } diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index b4994f8..e0c16d3 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -51,7 +51,7 @@ static int init_wksta_tests(void) dwSize = sizeof(user_name)/sizeof(user_name[0]); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { - skip("GetUserNameW is not implemented\n"); + win_skip("GetUserNameW is not implemented\n"); return 0; } ok(rc, "User Name Retrieved\n"); @@ -192,7 +192,7 @@ START_TEST(wksta) * if one is not available, none are. */ if (!pNetApiBufferFree) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); FreeLibrary(hnetapi32); return; }

1 0