May 2007 - Wine-Commits - list.winehq.org

Peter Oberndorfer : ntdll: Fix up instruction pointer in context inside raise_exception.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: eab168cf9eaa6ed9f8800b25155d329376f2343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab168cf9eaa6ed9f8800b251… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 18:28:53 2007 +0200 ntdll: Fix up instruction pointer in context inside raise_exception. --- dlls/ntdll/exception.c | 5 +++++ dlls/ntdll/tests/exception.c | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 7f0da0c..8974ced 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -336,6 +336,11 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return STATUS_SUCCESS; +#ifdef __i386__ + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; +#endif + if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9ebbda7..83613f7 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -215,10 +215,8 @@ LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionIn */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -247,10 +245,8 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine { ok(context->Eip == (DWORD)code_mem + 0xa, "Eip at %x instead of %x\n", context->Eip, (DWORD)code_mem + 0xa); - } } else { @@ -525,9 +521,7 @@ static DWORD int3_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD { ok( rec->ExceptionAddress == code_mem, "exception address not at: %p, but at %p\n", code_mem, rec->ExceptionAddress); - todo_wine { - ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); - } + ok( context->Eip == (DWORD)code_mem, "eip not at: %p, but at %#x\n", code_mem, context->Eip); if(context->Eip == (DWORD)code_mem) context->Eip++; /* skip breakpoint */ return ExceptionContinueExecution; @@ -692,10 +686,8 @@ static void test_debugger(void) /* ctx.Eip is the same value the exception handler got */ if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) { - todo_wine{ ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", ctx.Eip, (char *)code_mem_address + 0xa); - } /* need to fixup Eip for debuggee */ if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) ctx.Eip += 1;

1 0

Rob Shearman : ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table .
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 30cc21196e3b1397ba64e5fa2621bbde535c9bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cc21196e3b1397ba64e5fa2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:55 2007 +0100 ole32: Remove spurious AddRef of returned object on retrieval of an interface from the global interface table. --- dlls/ole32/git.c | 4 ---- dlls/ole32/tests/marshal.c | 1 - 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index c310249..e878f83 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -262,7 +262,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( { StdGITEntry* entry; HRESULT hres; - LPUNKNOWN lpUnk; IStream *stream; TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); @@ -296,9 +295,6 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return hres; } - /* addref it */ - lpUnk = *ppv; - IUnknown_AddRef(lpUnk); TRACE("ppv=%p\n", *ppv); return S_OK; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 0b3cfeb..b089913 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2651,7 +2651,6 @@ static void test_globalinterfacetable(void) hr = IGlobalInterfaceTable_RevokeInterfaceFromGlobal(git, cookie); ok_ole_success(hr, IGlobalInterfaceTable_RevokeInterfaceFromGlobal); - todo_wine ok_no_locks(); IGlobalInterfaceTable_Release(git);

1 0

Mounir IDRASSI : winscard: Small initial stub implementation.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 23df68d8f96d2c4f6f6a0bf522c5bce77fb51c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23df68d8f96d2c4f6f6a0bf52… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Wed May 23 00:51:46 2007 +0200 winscard: Small initial stub implementation. --- .gitignore | 2 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 5 +++ dlls/winscard/Makefile.in | 17 +++++++++++ dlls/winscard/rsrc.rc | 33 ++++++++++++++++++++++ dlls/winscard/winscard.c | 52 +++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 63 +++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 178 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index af69a26..be4fb6f 100644 --- a/.gitignore +++ b/.gitignore @@ -652,6 +652,8 @@ dlls/winmm/tests/winmm_crosstest.exe dlls/winmm/winmm_res.res dlls/winnls.dll16 dlls/winnls32/libwinnls32.def +dlls/winscard/libwinscard.def +dlls/winscard/rsrc.res dlls/winsock.dll16 dlls/winspool.drv/libwinspool.def dlls/winspool.drv/tests/*.ok diff --git a/Makefile.in b/Makefile.in index 3b16428..6c9bdef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -419,6 +419,7 @@ ALL_MAKEFILES = \ dlls/winmm/Makefile \ dlls/winmm/tests/Makefile \ dlls/winnls32/Makefile \ + dlls/winscard/Makefile \ dlls/winspool.drv/Makefile \ dlls/winspool.drv/tests/Makefile \ dlls/wintab32/Makefile \ @@ -768,6 +769,7 @@ dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules +dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index f6034fe..822c1bc 100755 --- a/configure +++ b/configure @@ -20907,6 +20907,8 @@ ac_config_files="$ac_config_files dlls/winmm/tests/Makefile" ac_config_files="$ac_config_files dlls/winnls32/Makefile" +ac_config_files="$ac_config_files dlls/winscard/Makefile" + ac_config_files="$ac_config_files dlls/winspool.drv/Makefile" ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile" @@ -21880,6 +21882,7 @@ do "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; "dlls/winmm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; "dlls/winnls32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls32/Makefile" ;; + "dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;; "dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;; "dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;; "dlls/wintab32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 22de21f..8c9b427 100644 --- a/configure.ac +++ b/configure.ac @@ -1749,6 +1749,7 @@ AC_CONFIG_FILES([dlls/wininet/tests/Makefile]) AC_CONFIG_FILES([dlls/winmm/Makefile]) AC_CONFIG_FILES([dlls/winmm/tests/Makefile]) AC_CONFIG_FILES([dlls/winnls32/Makefile]) +AC_CONFIG_FILES([dlls/winscard/Makefile]) AC_CONFIG_FILES([dlls/winspool.drv/Makefile]) AC_CONFIG_FILES([dlls/winspool.drv/tests/Makefile]) AC_CONFIG_FILES([dlls/wintab32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 159bb2d..5bb4e3a 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -207,6 +207,7 @@ BASEDIRS = \ wininet \ winmm \ winnls32 \ + winscard \ winspool.drv \ wintab32 \ wintrust \ @@ -574,6 +575,7 @@ IMPORT_LIBS = \ wininet/libwininet.$(IMPLIBEXT) \ winmm/libwinmm.$(IMPLIBEXT) \ winnls32/libwinnls32.$(IMPLIBEXT) \ + winscard/libwinscard.$(IMPLIBEXT) \ winspool.drv/libwinspool.$(IMPLIBEXT) \ wintab32/libwintab32.$(IMPLIBEXT) \ wintrust/libwintrust.$(IMPLIBEXT) \ @@ -927,6 +929,9 @@ winmm/libwinmm.$(IMPLIBEXT): winmm/winmm.spec $(WINEBUILD) winnls32/libwinnls32.$(IMPLIBEXT): winnls32/winnls32.spec $(WINEBUILD) @cd winnls32 && $(MAKE) libwinnls32.$(IMPLIBEXT) +winscard/libwinscard.$(IMPLIBEXT): winscard/winscard.spec $(WINEBUILD) + @cd winscard && $(MAKE) libwinscard.$(IMPLIBEXT) + winspool.drv/libwinspool.$(IMPLIBEXT): winspool.drv/winspool.drv.spec $(WINEBUILD) @cd winspool.drv && $(MAKE) libwinspool.$(IMPLIBEXT) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in new file mode 100644 index 0000000..de8a2b6 --- /dev/null +++ b/dlls/winscard/Makefile.in @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winscard.dll +IMPORTLIB = libwinscard.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = \ + winscard.c + +RC_SRCS = \ + rsrc.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc new file mode 100644 index 0000000..8226e9d --- /dev/null +++ b/dlls/winscard/rsrc.rc @@ -0,0 +1,33 @@ +/* + * Top level resource file for winscard.dll + * + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Smart Card API" +#define WINE_FILENAME_STR "winscard.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c new file mode 100644 index 0000000..d24e0f9 --- /dev/null +++ b/dlls/winscard/winscard.c @@ -0,0 +1,52 @@ +/* + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include <winscard.h> + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + +static HMODULE WINSCARD_hModule; + +const SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; +const SCARD_IO_REQUEST g_rgSCardT1Pci = { SCARD_PROTOCOL_T1, 8 }; +const SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; + + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + { + DisableThreadLibraryCalls(hinstDLL); + WINSCARD_hModule = hinstDLL; + break; + } + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec new file mode 100644 index 0000000..6dd83d8 --- /dev/null +++ b/dlls/winscard/winscard.spec @@ -0,0 +1,63 @@ +@ stub ClassInstall32 +@ stub SCardAccessNewReaderEvent +@ stub SCardReleaseAllEvents +@ stub SCardReleaseNewReaderEvent +@ stub SCardAccessStartedEvent +@ stub SCardAddReaderToGroupA +@ stub SCardAddReaderToGroupW +@ stub SCardBeginTransaction +@ stub SCardCancel +@ stub SCardConnectA +@ stub SCardConnectW +@ stub SCardControl +@ stub SCardDisconnect +@ stub SCardEndTransaction +@ stub SCardEstablishContext +@ stub SCardForgetCardTypeA +@ stub SCardForgetCardTypeW +@ stub SCardForgetReaderA +@ stub SCardForgetReaderGroupA +@ stub SCardForgetReaderGroupW +@ stub SCardForgetReaderW +@ stub SCardFreeMemory +@ stub SCardGetAttrib +@ stub SCardGetCardTypeProviderNameA +@ stub SCardGetCardTypeProviderNameW +@ stub SCardGetProviderIdA +@ stub SCardGetProviderIdW +@ stub SCardGetStatusChangeA +@ stub SCardGetStatusChangeW +@ stub SCardIntroduceCardTypeA +@ stub SCardIntroduceCardTypeW +@ stub SCardIntroduceReaderA +@ stub SCardIntroduceReaderGroupA +@ stub SCardIntroduceReaderGroupW +@ stub SCardIntroduceReaderW +@ stub SCardIsValidContext +@ stub SCardListCardsA +@ stub SCardListCardsW +@ stub SCardListInterfacesA +@ stub SCardListInterfacesW +@ stub SCardListReaderGroupsA +@ stub SCardListReaderGroupsW +@ stub SCardListReadersA +@ stub SCardListReadersW +@ stub SCardLocateCardsA +@ stub SCardLocateCardsByATRA +@ stub SCardLocateCardsByATRW +@ stub SCardLocateCardsW +@ stub SCardReconnect +@ stub SCardReleaseContext +@ stub SCardReleaseStartedEvent +@ stub SCardRemoveReaderFromGroupA +@ stub SCardRemoveReaderFromGroupW +@ stub SCardSetAttrib +@ stub SCardSetCardTypeProviderNameA +@ stub SCardSetCardTypeProviderNameW +@ stub SCardState +@ stub SCardStatusA +@ stub SCardStatusW +@ stub SCardTransmit +@ extern g_rgSCardRawPci +@ extern g_rgSCardT0Pci +@ extern g_rgSCardT1Pci

1 0

Rob Shearman : ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with .
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 7d90b6ce295fe876dc7b3474146e965cdc4a5cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d90b6ce295fe876dc7b34741… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:32:19 2007 +0100 ole32: Allow the getting of different interfaces from the global interface table than that with what the object was registered with. --- dlls/ole32/git.c | 6 +----- dlls/ole32/tests/marshal.c | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index b51990d..c310249 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -271,15 +271,11 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); if (entry == NULL) { + WARN("Entry for cookie 0x%x not found\n", dwCookie); LeaveCriticalSection(&git_section); return E_INVALIDARG; } - if (!IsEqualIID(&entry->iid, riid)) { - LeaveCriticalSection(&git_section); - WARN("entry->iid (%s) != riid\n", debugstr_guid(&entry->iid)); - return E_INVALIDARG; - } TRACE("entry=%p\n", entry); hres = IStream_Clone(entry->stream, &stream); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0735fc..0b3cfeb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2640,9 +2640,8 @@ static void test_globalinterfacetable(void) /* test getting interface from global with different iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IUnknown, (void **)&object); - todo_wine ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); - if (SUCCEEDED(hr)) IUnknown_Release(object); + IUnknown_Release(object); /* test getting interface from global with same iid */ hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IClassFactory, (void **)&object);

1 0

Peter Oberndorfer : winedbg: Show some info for msvcrt C++ exceptions.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 0bfb26aa996a618b3160d7944f561353e46a2638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfb26aa996a618b3160d7944… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue May 22 20:25:03 2007 +0200 winedbg: Show some info for msvcrt C++ exceptions. --- programs/winedbg/debugger.h | 9 +++++++++ programs/winedbg/tgt_active.c | 8 ++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3ad2bd3..e09d5f3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -141,6 +141,15 @@ struct dbg_breakpoint struct expr* condition; }; +/* used for C++ exceptions in msvcrt + * parameters: + * [0] CXX_FRAME_MAGIC + * [1] pointer to exception object + * [2] pointer to type + */ +#define CXX_EXCEPTION 0xe06d7363 +#define CXX_FRAME_MAGIC 0x19930520 + /* Wine extension; Windows doesn't have a name for this code. This is an undocumented exception understood by MS VC debugger, allowing the program to name a particular thread. Search google.com or deja.com for "0x406d1388" diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 21e8966..1698201 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -381,6 +381,14 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance case EXCEPTION_FLT_STACK_CHECK: dbg_printf("floating point stack check"); break; + case CXX_EXCEPTION: + if(rec->NumberParameters == 3 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC) + dbg_printf("C++ exception(object = 0x%08lx, type = 0x%08lx)", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + else + dbg_printf("C++ exception with strange parameter count %d or magic 0x%08lx", + rec->NumberParameters, rec->ExceptionInformation[0]); + break; default: dbg_printf("0x%08x", rec->ExceptionCode); break;

1 0

Rob Shearman : ole32: Add more tests for global interface table functions.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 05230781b006ed94cbf5e34bc6366595f55d0d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05230781b006ed94cbf5e34bc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:31:45 2007 +0100 ole32: Add more tests for global interface table functions. --- dlls/ole32/tests/marshal.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 1fd2fbb..d0735fc 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2588,10 +2588,11 @@ static DWORD CALLBACK get_global_interface_proc(LPVOID pv) hr); CoInitialize(NULL); + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); - IGlobalInterfaceTable_Release(params->git); + IClassFactory_Release(cf); CoUninitialize(); @@ -2607,6 +2608,10 @@ static void test_globalinterfacetable(void) DWORD tid; struct git_params params; DWORD ret; + IUnknown *object; + + trace("test_globalinterfacetable\n"); + cLocks = 0; hr = CoCreateInstance(&CLSID_StdGlobalInterfaceTable, NULL, CLSCTX_INPROC_SERVER, &IID_IGlobalInterfaceTable, (void **)&git); ok_ole_success(hr, CoCreateInstance); @@ -2614,6 +2619,8 @@ static void test_globalinterfacetable(void) hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&Test_ClassFactory, &IID_IClassFactory, &cookie); ok_ole_success(hr, IGlobalInterfaceTable_RegisterInterfaceInGlobal); + ok_more_than_one_lock(); + params.cookie = cookie; params.git = git; /* note: params is on stack so we MUST wait for get_global_interface_proc @@ -2630,6 +2637,25 @@ static void test_globalinterfacetable(void) } CloseHandle(thread); + + /* test getting interface from global with different iid */ + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IUnknown, (void **)&object); + todo_wine + ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + if (SUCCEEDED(hr)) IUnknown_Release(object); + + /* test getting interface from global with same iid */ + hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(git, cookie, &IID_IClassFactory, (void **)&object); + ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + IUnknown_Release(object); + + hr = IGlobalInterfaceTable_RevokeInterfaceFromGlobal(git, cookie); + ok_ole_success(hr, IGlobalInterfaceTable_RevokeInterfaceFromGlobal); + + todo_wine + ok_no_locks(); + + IGlobalInterfaceTable_Release(git); } static const char *debugstr_iid(REFIID riid)

1 0

Misha Koshelev : msi: automation: Append copyright notice.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 864a7df10ef610da71b93c786d7b73664d191753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864a7df10ef610da71b93c786… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Tue May 22 00:07:06 2007 -0500 msi: automation: Append copyright notice. --- dlls/msi/msiserver.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 360e4f1..3c0428b 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Mike McCormack + * Copyright (C) 2007 Misha Koshelev * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public

1 0

Rob Shearman : ole32: Add spec entry for CoRegisterSurrogateEx.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: 71a5b2d943d87786d72850196dacd3a84c6629fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a5b2d943d87786d72850196… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 16:27:25 2007 +0100 ole32: Add spec entry for CoRegisterSurrogateEx. --- dlls/ole32/ole32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 3ae0240..e018b0f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -58,6 +58,7 @@ @ stdcall CoRegisterMessageFilter(ptr ptr) @ stdcall CoRegisterPSClsid(ptr ptr) @ stub CoRegisterSurrogate +@ stub CoRegisterSurrogateEx @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects()

1 0

Rob Shearman : ole32: Fix some races in the global interface table implementation.
by Alexandre Julliard May 23, 2007

May 23, 2007

Module: wine Branch: master Commit: eebf8df6015472de393c049c4daea6f7be06b905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebf8df6015472de393c049c4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 22 10:31:11 2007 +0100 ole32: Fix some races in the global interface table implementation. Fix a race between RevokeInterfaceFromGlobal and GetInterfaceFromGlobal by only using the entry inside the critical section. Fix a race between two GetInterfaceFromGlobal by cloning the stream, instead of using it and setting the current position back to zero. --- dlls/ole32/git.c | 55 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 222eb6f..b51990d 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -96,7 +96,7 @@ static void StdGlobalInterfaceTable_Destroy(void* self) /*** * A helper function to traverse the list and find the entry that matches the cookie. - * Returns NULL if not found + * Returns NULL if not found. Must be called inside git_section critical section. */ static StdGITEntry* StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) @@ -106,14 +106,10 @@ StdGlobalInterfaceTable_FindEntry(IGlobalInterfaceTable* iface, DWORD cookie) TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); - EnterCriticalSection(&git_section); LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { - if (e->cookie == cookie) { - LeaveCriticalSection(&git_section); + if (e->cookie == cookie) return e; - } } - LeaveCriticalSection(&git_section); TRACE("Entry not found\n"); return NULL; @@ -232,12 +228,19 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( HRESULT hr; TRACE("iface=%p, dwCookie=0x%x\n", iface, (UINT)dwCookie); - + + EnterCriticalSection(&git_section); + entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); if (entry == NULL) { TRACE("Entry not found\n"); + LeaveCriticalSection(&git_section); return E_INVALIDARG; /* not found */ } + + list_remove(&entry->entry); + + LeaveCriticalSection(&git_section); /* Free the stream */ hr = CoReleaseMarshalData(entry->stream); @@ -248,11 +251,6 @@ StdGlobalInterfaceTable_RevokeInterfaceFromGlobal( } IStream_Release(entry->stream); - /* chop entry out of the list, and free the memory */ - EnterCriticalSection(&git_section); - list_remove(&entry->entry); - LeaveCriticalSection(&git_section); - HeapFree(GetProcessHeap(), 0, entry); return S_OK; } @@ -264,27 +262,38 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( { StdGITEntry* entry; HRESULT hres; - LARGE_INTEGER move; LPUNKNOWN lpUnk; - + IStream *stream; + TRACE("dwCookie=0x%x, riid=%s, ppv=%p\n", dwCookie, debugstr_guid(riid), ppv); - + + EnterCriticalSection(&git_section); + entry = StdGlobalInterfaceTable_FindEntry(iface, dwCookie); - if (entry == NULL) return E_INVALIDARG; + if (entry == NULL) { + LeaveCriticalSection(&git_section); + return E_INVALIDARG; + } if (!IsEqualIID(&entry->iid, riid)) { + LeaveCriticalSection(&git_section); WARN("entry->iid (%s) != riid\n", debugstr_guid(&entry->iid)); return E_INVALIDARG; } TRACE("entry=%p\n", entry); - + + hres = IStream_Clone(entry->stream, &stream); + + LeaveCriticalSection(&git_section); + + if (hres) { + WARN("Failed to clone stream with error 0x%08x\n", hres); + return hres; + } + /* unmarshal the interface */ - hres = CoUnmarshalInterface(entry->stream, riid, ppv); - - /* rewind stream, in case it's used again */ - move.u.LowPart = 0; - move.u.HighPart = 0; - IStream_Seek(entry->stream, move, STREAM_SEEK_SET, NULL); + hres = CoUnmarshalInterface(stream, riid, ppv); + IStream_Release(stream); if (hres) { WARN("Failed to unmarshal stream\n");

1 0

Michael Stefaniuc : winhelp: Fix some comparisons between signed and unsigned.
by Alexandre Julliard May 22, 2007

May 22, 2007

Module: wine Branch: master Commit: 306c1dc32726d32185187d6013f10519e9267e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306c1dc32726d32185187d601… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 21 23:19:04 2007 +0200 winhelp: Fix some comparisons between signed and unsigned. --- programs/winhelp/hlpfile.c | 15 ++++++++------- programs/winhelp/macro.c | 2 +- programs/winhelp/macro.lex.l | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e17a34e..417148e 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -157,7 +157,7 @@ HLPFILE_PAGE *HLPFILE_PageByOffset(HLPFILE* hlpfile, LONG offset) */ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) { - int i; + unsigned int i; if (!hlpfile) return 0; @@ -179,7 +179,7 @@ HLPFILE_PAGE *HLPFILE_PageByHash(HLPFILE* hlpfile, LONG lHash) */ HLPFILE_PAGE *HLPFILE_PageByMap(HLPFILE* hlpfile, LONG lMap) { - int i; + unsigned int i; if (!hlpfile) return 0; @@ -1578,12 +1578,13 @@ static BOOL HLPFILE_UncompressLZ77_Phrases(HLPFILE* hlpfile) */ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) { - UINT num, dec_size, cpr_size; + UINT num; + INT dec_size, cpr_size; BYTE *buf_idx, *end_idx; BYTE *buf_phs, *end_phs; - short i, n; long* ptr, mask = 0; - unsigned short bc; + unsigned int i; + unsigned short bc, n; if (!HLPFILE_FindSubFile("|PhrIndex", &buf_idx, &end_idx) || !HLPFILE_FindSubFile("|PhrImage", &buf_phs, &end_phs)) return FALSE; @@ -1649,7 +1650,7 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) static BOOL HLPFILE_Uncompress_Topic(HLPFILE* hlpfile) { BYTE *buf, *ptr, *end, *newptr; - int i, newsize = 0; + unsigned int i, newsize = 0; if (!HLPFILE_FindSubFile("|TOPIC", &buf, &end)) {WINE_WARN("topic0\n"); return FALSE;} @@ -1761,7 +1762,7 @@ static void HLPFILE_Uncompress2(const BYTE *ptr, const BYTE *end, BYTE *newptr, static BOOL HLPFILE_Uncompress3(char* dst, const char* dst_end, const BYTE* src, const BYTE* src_end) { - int idx, len; + unsigned int idx, len; for (; src < src_end; src++) { diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 803b5bb..c658bf6 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -233,7 +233,7 @@ void CALLBACK MACRO_BackFlush(void) if (win) { - int i; + unsigned int i; for (i = 0; i < win->backIndex; i++) { diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index 1480431..1ff76ce 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhelp); static LPCSTR macroptr; static LPSTR strptr; static int quote_stack[32]; -static int quote_stk_idx = 0; +static unsigned int quote_stk_idx = 0; struct lexret yylval; #define YY_INPUT(buf,result,max_size)\ @@ -143,8 +143,8 @@ static int MACRO_CallBoolFunc(FARPROC fn, const char* args, void** ret); */ static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args) { - int t; - int len = 0, idx = 0; + int t; + unsigned int len = 0, idx = 0; WINE_TRACE("Checking %s\n", args);

1 0