October 2005 - Wine-commits

wine/dlls/shdocvw shdocvw_main.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20998 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:44:06 Modified files: dlls/shdocvw : shdocvw_main.c Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Only return SHDOCVW_ClassFactory if asked for CLSID_WebBrowser. Patch: http://cvs.winehq.org/patch.py?id=20998 Old revision New revision Changes Path 1.36 1.37 +2 -1 wine/dlls/shdocvw/shdocvw_main.c Index: wine/dlls/shdocvw/shdocvw_main.c diff -u -p wine/dlls/shdocvw/shdocvw_main.c:1.36 wine/dlls/shdocvw/shdocvw_main.c:1.37 --- wine/dlls/shdocvw/shdocvw_main.c 31 Oct 2005 15:44: 6 -0000 +++ /dev/null 31 Oct 2005 15:44: 6 -0000 @@ -480,7 +480,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSI return r; } - if (IsEqualGUID(&IID_IClassFactory, riid)) + if (IsEqualCLSID(&CLSID_WebBrowser, rclsid) && + IsEqualIID(&IID_IClassFactory, riid)) { /* Pass back our shdocvw class factory */ *ppv = (LPVOID)&SHDOCVW_ClassFactory;

1 0

wine/dlls/oleaut32 usrmarshal.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20997 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:43:53 Modified files: dlls/oleaut32 : usrmarshal.c Log message: Huw Davies <huw(a)codeweavers.com> Deal with pExcepInfo == NULL. Patch: http://cvs.winehq.org/patch.py?id=20997 Old revision New revision Changes Path 1.11 1.12 +9 -0 wine/dlls/oleaut32/usrmarshal.c Index: wine/dlls/oleaut32/usrmarshal.c diff -u -p wine/dlls/oleaut32/usrmarshal.c:1.11 wine/dlls/oleaut32/usrmarshal.c:1.12 --- wine/dlls/oleaut32/usrmarshal.c 31 Oct 2005 15:43:53 -0000 +++ /dev/null 31 Oct 2005 15:43:53 -0000 @@ -537,6 +537,7 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( VARIANTARG* rgVarRef = NULL; UINT u, cVarRef; UINT uArgErr; + EXCEPINFO ExcepInfo; TRACE("(%p)->(%ld,%s,%lx,%x,%p,%p,%p,%p)\n", This, dispIdMember, debugstr_guid(riid), @@ -546,6 +547,7 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( /* [out] args can't be null, use dummy vars if needed */ if (!pVarResult) pVarResult = &VarResult; if (!puArgErr) puArgErr = &uArgErr; + if (!pExcepInfo) pExcepInfo = &ExcepInfo; /* count by-ref args */ for (cVarRef=0,u=0; u<pDispParams->cArgs; u++) { @@ -596,6 +598,13 @@ HRESULT CALLBACK IDispatch_Invoke_Proxy( CoTaskMemFree(rgVarRef); CoTaskMemFree(rgVarRefIdx); } + + if(pExcepInfo == &ExcepInfo) + { + SysFreeString(pExcepInfo->bstrSource); + SysFreeString(pExcepInfo->bstrDescription); + SysFreeString(pExcepInfo->bstrHelpFile); + } return hr; }

1 0

wine/dlls/msi dialog.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20996 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:43:39 Modified files: dlls/msi : dialog.c Log message: Mike McCormack <mike(a)codeweavers.com> Make sure to unregister all the classes that were registered when msi is unloaded, so we can register again cleanly. Patch: http://cvs.winehq.org/patch.py?id=20996 Old revision New revision Changes Path 1.58 1.59 +2 -0 wine/dlls/msi/dialog.c Index: wine/dlls/msi/dialog.c diff -u -p wine/dlls/msi/dialog.c:1.58 wine/dlls/msi/dialog.c:1.59 --- wine/dlls/msi/dialog.c 31 Oct 2005 15:43:39 -0000 +++ /dev/null 31 Oct 2005 15:43:39 -0000 @@ -2183,6 +2183,8 @@ BOOL msi_dialog_register_class( void ) void msi_dialog_unregister_class( void ) { DestroyWindow( hMsiHiddenWindow ); + hMsiHiddenWindow = NULL; UnregisterClassW( szMsiDialogClass, NULL ); + UnregisterClassW( szMsiHiddenWindow, NULL ); uiThreadId = 0; }

1 0

wine/dlls/shell32/tests shlexec.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20995 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:43:28 Modified files: dlls/shell32/tests: shlexec.c Log message: Mike McCormack <mike(a)codeweavers.com> Add void to empty declaration list. Patch: http://cvs.winehq.org/patch.py?id=20995 Old revision New revision Changes Path 1.6 1.7 +7 -7 wine/dlls/shell32/tests/shlexec.c Index: wine/dlls/shell32/tests/shlexec.c diff -u -p wine/dlls/shell32/tests/shlexec.c:1.6 wine/dlls/shell32/tests/shlexec.c:1.7 --- wine/dlls/shell32/tests/shlexec.c 31 Oct 2005 15:43:28 -0000 +++ /dev/null 31 Oct 2005 15:43:28 -0000 @@ -58,7 +58,7 @@ static DLLVERSIONINFO dllver; * ShellExecute wrappers * ***/ -static void dump_child(); +static void dump_child(void); static HANDLE hEvent; static void init_event(const char* child_file) @@ -369,7 +369,7 @@ static char* getChildString(const char* return ret; } -static void dump_child() +static void dump_child(void) { if (winetest_debug > 1) { @@ -520,7 +520,7 @@ static filename_tests_t noquotes_tests[] {NULL, NULL, 0, 0} }; -static void test_filename() +static void test_filename(void) { char filename[MAX_PATH]; const filename_tests_t* test; @@ -690,7 +690,7 @@ static filename_tests_t lnk_tests[]= {NULL, NULL, 0, 0} }; -static void test_lnks() +static void test_lnks(void) { char filename[MAX_PATH]; char params[MAX_PATH]; @@ -788,7 +788,7 @@ static void test_lnks() } -static void test_exes() +static void test_exes(void) { char filename[MAX_PATH]; char params[1024]; @@ -814,7 +814,7 @@ static void test_exes() } -static void init_test() +static void init_test(void) { HMODULE hdll; HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*); @@ -916,7 +916,7 @@ static void init_test() create_test_verb(".shlexec", "QuotedUpperL", "QuotedUpperL \"%L\""); } -static void cleanup_test() +static void cleanup_test(void) { char filename[MAX_PATH]; const char* const * testfile;

1 0

wine/dlls/gdi driver.c dc.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20994 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:43:10 Modified files: dlls/gdi : driver.c dc.c Log message: Default to an empty driver instead of dying if the specified display driver couldn't be loaded. Patch: http://cvs.winehq.org/patch.py?id=20994 Old revision New revision Changes Path 1.41 1.42 +123 -128 wine/dlls/gdi/driver.c 1.14 1.15 +14 -0 wine/dlls/gdi/dc.c

1 0

wine/ dlls/shdocvw/Makefile.in ./configure.ac ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20993 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 08:13:14 Modified files: dlls/shdocvw : Makefile.in . : configure.ac configure Added files: dlls/shdocvw/tests: shortcut.c Makefile.in .cvsignore Log message: Michael Jung <mjung(a)iss.tu-darmstadt.de> Added initial tests for shdocvw's FolderShortcut related functionality. Patch: http://cvs.winehq.org/patch.py?id=20993 Old revision New revision Changes Path Added 1.1 +0 -0 wine/dlls/shdocvw/tests/shortcut.c Added 1.1 +0 -0 wine/dlls/shdocvw/tests/Makefile.in Added 1.1 +0 -0 wine/dlls/shdocvw/tests/.cvsignore 1.15 1.16 +2 -0 wine/dlls/shdocvw/Makefile.in 1.409 1.410 +1 -0 wine/configure.ac 1.711 1.712 +2 -1 wine/configure

1 0

wine/dlls/ntdll signal_i386.c exception.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20992 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 08:08:05 Modified files: dlls/ntdll : signal_i386.c exception.c Log message: Marcus Meissner <meissner(a)suse.de> Added assembly implementation of EXC_CallHandler. Patch: http://cvs.winehq.org/patch.py?id=20992 Old revision New revision Changes Path 1.100 1.101 +32 -0 wine/dlls/ntdll/signal_i386.c 1.85 1.86 +9 -1 wine/dlls/ntdll/exception.c Index: wine/dlls/ntdll/signal_i386.c diff -u -p wine/dlls/ntdll/signal_i386.c:1.100 wine/dlls/ntdll/signal_i386.c:1.101 --- wine/dlls/ntdll/signal_i386.c 31 Oct 2005 14: 8: 5 -0000 +++ /dev/null 31 Oct 2005 14: 8: 5 -0000 @@ -1384,4 +1384,36 @@ __ASM_GLOBAL_FUNC( DbgBreakPoint, "int $ */ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret"); + +/********************************************************************** + * EXC_CallHandler (internal) + */ +__ASM_GLOBAL_FUNC( EXC_CallHandler, +" pushl %ebp\n" +" movl %esp, %ebp\n" +" subl $12, %esp\n" +" movl 28(%ebp), %eax\n" +" movl 12(%ebp), %edx\n" +" movl %eax, -8(%ebp)\n" +" movl %edx, -4(%ebp)\n" +" leal -12(%ebp), %eax\n" +" .byte 0x64\n" +" movl (0),%ecx\n" +" movl %ecx,(%eax)\n" +" .byte 0x64\n" +" movl %eax,(0)\n" +" movl 20(%ebp), %eax\n" +" pushl %eax\n" +" movl 16(%ebp), %eax\n" +" pushl %eax\n" +" movl 8(%ebp), %eax\n" +" pushl %edx\n" +" pushl %eax\n" +" call *24(%ebp)\n" +" movl -12(%ebp), %edx\n" +" .byte 0x64\n" +" movl %edx,(0)\n" +" leave\n" +" ret\n" +); #endif /* __i386__ */ Index: wine/dlls/ntdll/exception.c diff -u -p wine/dlls/ntdll/exception.c:1.85 wine/dlls/ntdll/exception.c:1.86 --- wine/dlls/ntdll/exception.c 31 Oct 2005 14: 8: 5 -0000 +++ /dev/null 31 Oct 2005 14: 8: 5 -0000 @@ -116,7 +116,10 @@ static DWORD EXC_UnwindHandler( EXCEPTIO * happening during the handler execution. * Please do not change the first 4 parameters order in any way - some exceptions handlers * rely on Base Pointer (EBP) to have a fixed position related to the exception frame + * + * For i386 this function is implemented in assembler in signal_i386.c. */ +#ifndef __i386__ static DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher, PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler) @@ -134,7 +137,12 @@ static DWORD EXC_CallHandler( EXCEPTION_ __wine_pop_frame( &newframe.frame ); return ret; } - +#else +/* in signal_i386.c */ +extern DWORD EXC_CallHandler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher, + PEXCEPTION_HANDLER handler, PEXCEPTION_HANDLER nested_handler); +#endif /********************************************************************** * send_debug_event

1 0

wine/dlls/msi tests/package.c package.c msipri ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20991 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 08:07:37 Modified files: dlls/msi/tests : package.c dlls/msi : package.c msipriv.h install.c Log message: Mike McCormack <mike(a)codeweavers.com> Fix and test MsiGetProperty and MsiSetProperty. Patch: http://cvs.winehq.org/patch.py?id=20991 Old revision New revision Changes Path 1.6 1.7 +123 -0 wine/dlls/msi/tests/package.c 1.63 1.64 +75 -137 wine/dlls/msi/package.c 1.102 1.103 +3 -0 wine/dlls/msi/msipriv.h 1.17 1.18 +7 -4 wine/dlls/msi/install.c

1 0

wine/dlls/msi tests/Makefile.in tests/.cvsigno ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20990 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 08:07:20 Modified files: dlls/msi/tests : Makefile.in .cvsignore dlls/msi : msi.c Added files: dlls/msi/tests : msi.c Log message: Mike McCormack <mike(a)codeweavers.com> Improve MsiUseFeatureEx and MsiGetFeatureState a little, add some simple test cases. Patch: http://cvs.winehq.org/patch.py?id=20990 Old revision New revision Changes Path 1.5 1.6 +1 -0 wine/dlls/msi/tests/Makefile.in 1.5 1.6 +1 -0 wine/dlls/msi/tests/.cvsignore Added 1.1 +0 -0 wine/dlls/msi/tests/msi.c 1.110 1.111 +32 -29 wine/dlls/msi/msi.c

1 0

wine/dlls/wininet tests/http.c internet.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20989 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 08:06:36 Modified files: dlls/wininet/tests: http.c dlls/wininet : internet.c Log message: James Hawkins <truiken(a)gmail.com> Implement InternetCreateUrlW and test cases. Patch: http://cvs.winehq.org/patch.py?id=20989 Old revision New revision Changes Path 1.28 1.29 +245 -0 wine/dlls/wininet/tests/http.c 1.135 1.136 +260 -18 wine/dlls/wininet/internet.c

1 0