November 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Don' t pass uninitialized data to MCM_SETTODAY, test isn't about this.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: c044fa8a59bdb89e0fe164e0f43b41379a2fd09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c044fa8a59bdb89e0fe164e0f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 19 16:20:20 2009 +0300 comctl32/monthcal: Don't pass uninitialized data to MCM_SETTODAY, test isn't about this. --- dlls/comctl32/tests/monthcal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index de6df2d..a7aeddd 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1243,6 +1243,7 @@ static void test_monthcal_today(void) /* Setter and Getters for "today" information */ /* check for overflow, should be ok */ + memset(&st_test, 0, sizeof(st_test)); st_test.wDay = 38; st_test.wMonth = 38;

1 0

Alexandre Julliard : kernel32/tests: Add some tests for file sharing against a memory mapping.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: c073ee54c9628361e7262e4b572ed2a07f26c70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c073ee54c9628361e7262e4b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 16:02:52 2009 +0100 kernel32/tests: Add some tests for file sharing against a memory mapping. --- dlls/kernel32/tests/file.c | 77 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 69 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ec61659..99ba379 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1616,7 +1616,7 @@ static void test_LockFile(void) DeleteFileA( filename ); } -static inline int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2, BOOL is_win9x ) +static int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD access2, DWORD sharing2, BOOL is_win9x ) { if (!is_win9x) { @@ -1641,6 +1641,13 @@ static inline int is_sharing_compatible( DWORD access1, DWORD sharing1, DWORD ac return 1; } +static int is_sharing_map_compatible( DWORD map_access, DWORD access2, DWORD sharing2 ) +{ + if ((map_access == PAGE_READWRITE || map_access == PAGE_EXECUTE_READWRITE) && + !(sharing2 & FILE_SHARE_WRITE)) return 0; + return 1; +} + static void test_file_sharing(void) { static const DWORD access_modes[] = @@ -1651,10 +1658,14 @@ static void test_file_sharing(void) FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE }; + static const DWORD mapping_modes[] = + { PAGE_READONLY, PAGE_WRITECOPY, PAGE_READWRITE }; + static const char dummy[] = "dummy"; int a1, s1, a2, s2; int ret; HANDLE h, h2; BOOL is_win9x = FALSE; + DWORD written; /* make sure the file exists */ h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); @@ -1664,6 +1675,7 @@ static void test_file_sharing(void) return; } is_win9x = GetFileAttributesW(filenameW) == INVALID_FILE_ATTRIBUTES; + WriteFile( h, dummy, strlen(dummy), &written, NULL ); CloseHandle( h ); for (a1 = 0; a1 < sizeof(access_modes)/sizeof(access_modes[0]); a1++) @@ -1693,12 +1705,10 @@ static void test_file_sharing(void) SetLastError(0xdeadbeef); h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], NULL, OPEN_EXISTING, 0, 0 ); - + ret = GetLastError(); if (is_sharing_compatible( access_modes[a1], sharing_modes[s1], access_modes[a2], sharing_modes[s2], is_win9x )) { - ret = GetLastError(); - ok( h2 != INVALID_HANDLE_VALUE, "open failed for modes %x/%x/%x/%x\n", access_modes[a1], sharing_modes[s1], @@ -1706,13 +1716,9 @@ static void test_file_sharing(void) ok( ret == 0xdeadbeef /* Win9x */ || ret == 0, /* XP */ "wrong error code %d\n", ret ); - - CloseHandle( h2 ); } else { - ret = GetLastError(); - ok( h2 == INVALID_HANDLE_VALUE, "open succeeded for modes %x/%x/%x/%x\n", access_modes[a1], sharing_modes[s1], @@ -1720,12 +1726,67 @@ static void test_file_sharing(void) ok( ret == ERROR_SHARING_VIOLATION, "wrong error code %d\n", ret ); } + if (h2 != INVALID_HANDLE_VALUE) CloseHandle( h2 ); } } CloseHandle( h ); } } + for (a1 = 0; a1 < sizeof(mapping_modes)/sizeof(mapping_modes[0]); a1++) + { + HANDLE m; + + SetLastError(0xdeadbeef); + h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); + if (h == INVALID_HANDLE_VALUE) + { + ok(0,"couldn't create file \"%s\" (err=%d)\n",filename,GetLastError()); + return; + } + m = CreateFileMappingA( h, NULL, mapping_modes[a1], 0, 0, NULL ); + ok( m != 0, "failed to create mapping %x err %u\n", mapping_modes[a1], GetLastError() ); + CloseHandle( h ); + if (!m) continue; + + for (a2 = 0; a2 < sizeof(access_modes)/sizeof(access_modes[0]); a2++) + { + for (s2 = 0; s2 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s2++) + { + /* Win9x doesn't support FILE_SHARE_DELETE */ + if (is_win9x && (sharing_modes[s2] & FILE_SHARE_DELETE)) + continue; + + SetLastError(0xdeadbeef); + h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], + NULL, OPEN_EXISTING, 0, 0 ); + + ret = GetLastError(); + if (h2 == INVALID_HANDLE_VALUE) + { + if (is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2])) + todo_wine ok( is_win9x, /* there's no sharing at all with a mapping on win9x */ + "open failed for modes map %x/%x/%x\n", + mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); + ok( ret == ERROR_SHARING_VIOLATION, + "wrong error code %d\n", ret ); + } + else + { + if (!is_sharing_map_compatible(mapping_modes[a1], access_modes[a2], sharing_modes[s2])) + todo_wine ok( broken(1), /* no checking on nt4 */ + "open succeeded for modes map %x/%x/%x\n", + mapping_modes[a1], access_modes[a2], sharing_modes[s2] ); + ok( ret == 0xdeadbeef /* Win9x */ || + ret == 0, /* XP */ + "wrong error code %d\n", ret ); + CloseHandle( h2 ); + } + } + } + CloseHandle( m ); + } + SetLastError(0xdeadbeef); h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, 0 ); ok( h != INVALID_HANDLE_VALUE, "CreateFileA error %d\n", GetLastError() );

1 0

Alexandre Julliard : winebuild: Fix the definition of the CPU mask flag to take ARM into account.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 7782ebea0102171be203a341a4e9154a17c0ad18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7782ebea0102171be203a341a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 16:44:08 2009 +0100 winebuild: Fix the definition of the CPU mask flag to take ARM into account. --- tools/winebuild/build.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 65163f3..e47278a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -119,7 +119,7 @@ typedef struct enum target_cpu { - CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM + CPU_x86, CPU_x86_64, CPU_SPARC, CPU_ALPHA, CPU_POWERPC, CPU_ARM, CPU_LAST = CPU_ARM }; enum target_platform @@ -148,7 +148,7 @@ extern enum target_platform target_platform; #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ #define FLAG_CPU(cpu) (0x01000 << (cpu)) -#define FLAG_CPU_MASK 0x1f000 +#define FLAG_CPU_MASK (FLAG_CPU(CPU_LAST + 1) - FLAG_CPU(0)) #define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64)) #define FLAG_CPU_WIN32 (FLAG_CPU_MASK & ~FLAG_CPU_WIN64)

1 0

Paul Vriens : comctl32/tests: Fix some test failures on comctl32 4.70.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9e737691125bc82ce6ca60bcb8d3409dffe4fffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e737691125bc82ce6ca60bcb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 19 11:53:28 2009 +0100 comctl32/tests: Fix some test failures on comctl32 4.70. --- dlls/comctl32/tests/propsheet.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 111482e..bf40db4 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -110,6 +110,12 @@ static void test_title(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); + if (hdlg == INVALID_HANDLE_VALUE) + { + win_skip("comctl32 4.70 needs dwSize adjustment\n"); + psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); + hdlg = (HWND)PropertySheetA(&psh); + } DestroyWindow(hdlg); } @@ -141,6 +147,12 @@ static void test_nopage(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); + if (hdlg == INVALID_HANDLE_VALUE) + { + win_skip("comctl32 4.70 needs dwSize adjustment\n"); + psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); + hdlg = (HWND)PropertySheetA(&psh); + } ShowWindow(hdlg,SW_NORMAL); SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0); RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW); @@ -183,6 +195,7 @@ static void test_disableowner(void) HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEA psp; PROPSHEETHEADERA psh; + INT_PTR p; register_parent_wnd_class(); parent = CreateWindowA("parent class", "", WS_CAPTION | WS_SYSMENU | WS_VISIBLE, 100, 100, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), 0); @@ -207,7 +220,9 @@ static void test_disableowner(void) U3(psh).phpage = hpsp; psh.pfnCallback = disableowner_callback; - PropertySheetA(&psh); + p = PropertySheetA(&psh); + todo_wine + ok(p == 0, "Expected 0, got %ld\n", p); ok(IsWindowEnabled(parent) != 0, "parent window should be enabled\n"); DestroyWindow(parent); } @@ -283,6 +298,12 @@ static void test_wiznavigation(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; hdlg = (HWND)PropertySheetA(&psh); + if (hdlg == INVALID_HANDLE_VALUE) + { + win_skip("comctl32 4.70 needs dwSize adjustment\n"); + psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); + hdlg = (HWND)PropertySheetA(&psh); + } ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); @@ -381,6 +402,12 @@ static void test_buttons(void) psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh); + if (hdlg == INVALID_HANDLE_VALUE) + { + win_skip("comctl32 4.70 needs dwSize adjustment\n"); + psh.dwSize = sizeof(psh) - sizeof(HBITMAP) - sizeof(HPALETTE) - sizeof(HBITMAP); + hdlg = (HWND)PropertySheetA(&psh); + } /* OK button */ button = GetDlgItem(hdlg, IDOK);

1 0

Maarten Lankhorst : avrt: Fix HeapAlloc call in AvSetMmThreadCharacteristicsA.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 456ad1b1cf88641fe4ac7face4d48b226533dbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456ad1b1cf88641fe4ac7face… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 19 11:49:09 2009 +0100 avrt: Fix HeapAlloc call in AvSetMmThreadCharacteristicsA. --- dlls/avrt/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index c4e53dd..4552c6f 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -55,7 +55,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) if (TaskName) { DWORD len = (lstrlenA(TaskName)+1); - str = HeapAlloc(GetProcessHeap, 0, len*sizeof(WCHAR)); + str = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); if (!str) { SetLastError(ERROR_OUTOFMEMORY);

1 0

Rob Shearman : oleaut32: Fix circular reference counting in typelibs/ typeinfos.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 8a5886efadae4b9d76c45b5923c5114c9f2b042e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5886efadae4b9d76c45b592… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 19 11:54:22 2009 +0000 oleaut32: Fix circular reference counting in typelibs/typeinfos. Do not rely on the reference count of ITypeInfo's to go to zero to delete them. Instead only rely on the parent typelib's reference count, but update the parent typelib's reference count based on whether each typeinfo has a valid reference. --- dlls/oleaut32/typelib.c | 173 ++++++++++++++++++++++++----------------------- 1 files changed, 88 insertions(+), 85 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bc92f5d..ee715b6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1048,7 +1048,7 @@ typedef struct tagITypeInfoImpl const ITypeInfo2Vtbl *lpVtbl; const ITypeCompVtbl *lpVtblTypeComp; LONG ref; - BOOL no_free_data; /* don't free data structures */ + BOOL not_attached_to_typelib; TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ @@ -1085,6 +1085,7 @@ static const ITypeInfo2Vtbl tinfvt; static const ITypeCompVtbl tcompvt; static ITypeInfo2 * ITypeInfo_Constructor(void); +static void ITypeInfo_fnDestroy(ITypeInfoImpl *This); typedef struct tagTLBContext { @@ -4089,6 +4090,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) TLBRefType *ref_type; void *cursor2; int i; + ITypeInfoImpl *pTI, *pTINext; /* remove cache entry */ if(This->path) @@ -4145,8 +4147,11 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) TLB_Free(ref_type); } - if (This->pTypeInfo) /* can be NULL */ - ITypeInfo_Release((ITypeInfo*) This->pTypeInfo); + for (pTI = This->pTypeInfo; pTI; pTI = pTINext) + { + pTINext = pTI->next; + ITypeInfo_fnDestroy(pTI); + } HeapFree(GetProcessHeap(),0,This); return 0; } @@ -4887,7 +4892,7 @@ static ITypeInfo2 * ITypeInfo_Constructor(void) { pTypeInfoImpl->lpVtbl = &tinfvt; pTypeInfoImpl->lpVtblTypeComp = &tcompvt; - pTypeInfoImpl->ref=1; + pTypeInfoImpl->ref = 0; pTypeInfoImpl->hreftype = -1; pTypeInfoImpl->TypeAttr.memidConstructor = MEMBERID_NIL; pTypeInfoImpl->TypeAttr.memidDestructor = MEMBERID_NIL; @@ -4929,97 +4934,96 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) ITypeInfoImpl *This = (ITypeInfoImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - ITypeLib2_AddRef((ITypeLib2*)This->pTypeLib); - TRACE("(%p)->ref is %u\n",This, ref); + + if (ref == 1 /* incremented from 0 */) + ITypeLib2_AddRef((ITypeLib2*)This->pTypeLib); + return ref; } -/* ITypeInfo::Release - */ -static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) +static void ITypeInfo_fnDestroy(ITypeInfoImpl *This) { - ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - ULONG ref = InterlockedDecrement(&This->ref); + TLBFuncDesc *pFInfo, *pFInfoNext; + TLBVarDesc *pVInfo, *pVInfoNext; + TLBImplType *pImpl, *pImplNext; - TRACE("(%p)->(%u)\n",This, ref); + TRACE("destroying ITypeInfo(%p)\n",This); - if (ref) { - /* We don't release ITypeLib when ref=0 because - it means that function is called by ITypeLib2_Release */ - ITypeLib2_Release((ITypeLib2*)This->pTypeLib); - } else { - TLBFuncDesc *pFInfo, *pFInfoNext; - TLBVarDesc *pVInfo, *pVInfoNext; - TLBImplType *pImpl, *pImplNext; + SysFreeString(This->Name); + This->Name = NULL; - TRACE("destroying ITypeInfo(%p)\n",This); + SysFreeString(This->DocString); + This->DocString = NULL; - if (This->no_free_data) - goto finish_free; - - SysFreeString(This->Name); - This->Name = NULL; + SysFreeString(This->DllName); + This->DllName = NULL; - SysFreeString(This->DocString); - This->DocString = NULL; + for (pFInfo = This->funclist; pFInfo; pFInfo = pFInfoNext) + { + INT i; + for(i = 0;i < pFInfo->funcdesc.cParams; i++) + { + ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + { + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_Free(elemdesc->u.paramdesc.pparamdescex); + } + SysFreeString(pFInfo->pParamDesc[i].Name); + } + TLB_Free(pFInfo->funcdesc.lprgelemdescParam); + TLB_Free(pFInfo->pParamDesc); + TLB_FreeCustData(pFInfo->pCustData); + if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) + SysFreeString(pFInfo->Entry); + SysFreeString(pFInfo->HelpString); + SysFreeString(pFInfo->Name); + + pFInfoNext = pFInfo->next; + TLB_Free(pFInfo); + } + for (pVInfo = This->varlist; pVInfo; pVInfo = pVInfoNext) + { + if (pVInfo->vardesc.varkind == VAR_CONST) + { + VariantClear(pVInfo->vardesc.u.lpvarValue); + TLB_Free(pVInfo->vardesc.u.lpvarValue); + } + TLB_FreeCustData(pVInfo->pCustData); + SysFreeString(pVInfo->Name); + pVInfoNext = pVInfo->next; + TLB_Free(pVInfo); + } + for (pImpl = This->impltypelist; pImpl; pImpl = pImplNext) + { + TLB_FreeCustData(pImpl->pCustData); + pImplNext = pImpl->next; + TLB_Free(pImpl); + } + TLB_FreeCustData(This->pCustData); - SysFreeString(This->DllName); - This->DllName = NULL; + HeapFree(GetProcessHeap(), 0, This); +} - for (pFInfo = This->funclist; pFInfo; pFInfo = pFInfoNext) - { - INT i; - for(i = 0;i < pFInfo->funcdesc.cParams; i++) - { - ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[i]; - if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) - { - VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); - TLB_Free(elemdesc->u.paramdesc.pparamdescex); - } - SysFreeString(pFInfo->pParamDesc[i].Name); - } - TLB_Free(pFInfo->funcdesc.lprgelemdescParam); - TLB_Free(pFInfo->pParamDesc); - TLB_FreeCustData(pFInfo->pCustData); - if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) - SysFreeString(pFInfo->Entry); - SysFreeString(pFInfo->HelpString); - SysFreeString(pFInfo->Name); - - pFInfoNext = pFInfo->next; - TLB_Free(pFInfo); - } - for (pVInfo = This->varlist; pVInfo; pVInfo = pVInfoNext) - { - if (pVInfo->vardesc.varkind == VAR_CONST) - { - VariantClear(pVInfo->vardesc.u.lpvarValue); - TLB_Free(pVInfo->vardesc.u.lpvarValue); - } - TLB_FreeCustData(pVInfo->pCustData); - SysFreeString(pVInfo->Name); - pVInfoNext = pVInfo->next; - TLB_Free(pVInfo); - } - for(pImpl = This->impltypelist; pImpl; pImpl = pImplNext) - { - TLB_FreeCustData(pImpl->pCustData); - pImplNext = pImpl->next; - TLB_Free(pImpl); - } - TLB_FreeCustData(This->pCustData); +/* ITypeInfo::Release + */ +static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); -finish_free: - if (This->next) - { - ITypeInfo_Release((ITypeInfo*)This->next); - } + TRACE("(%p)->(%u)\n",This, ref); - HeapFree(GetProcessHeap(),0,This); - return 0; + if (!ref) + { + BOOL not_attached_to_typelib = This->not_attached_to_typelib; + ITypeLib2_Release((ITypeLib2*)This->pTypeLib); + if (not_attached_to_typelib) + HeapFree(GetProcessHeap(), 0, This); + /* otherwise This will be freed when typelib is freed */ } + return ref; } @@ -6654,12 +6658,11 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( *ppTInfo = (ITypeInfo*) pTypeInfoImpl; - /* we use data structures from This, so we need to keep a reference - * to it to stop it being destroyed and signal to the new instance to + /* the AddRef implicitly adds a reference to the parent typelib, which + * stops the copied data from being destroyed until the new typeinfo's + * refcount goes to zero, but we need to signal to the new instance to * not free its data structures when it is destroyed */ - pTypeInfoImpl->no_free_data = TRUE; - pTypeInfoImpl->next = This; - ITypeInfo_AddRef((ITypeInfo*) This); + pTypeInfoImpl->not_attached_to_typelib = TRUE; ITypeInfo_AddRef(*ppTInfo);

1 0

Henri Verbeet : kernel32: Also accept STATUS_BUFFER_OVERFLOW as a valid return code in GetFileInformationByHandle ().
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: d4fc2fd746e9bf6e0f6cfecef22ffac1181208b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fc2fd746e9bf6e0f6cfecef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 19 11:41:26 2009 +0100 kernel32: Also accept STATUS_BUFFER_OVERFLOW as a valid return code in GetFileInformationByHandle(). FileAllInformation is supposed to also return the file name. If it did, "all_info" would be too small for the returned data, but since it would still return as much information as fits in the buffer, we don't need a larger buffer either. --- dlls/kernel32/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index e6d83bc..8932dea 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -821,6 +821,7 @@ BOOL WINAPI GetFileInformationByHandle( HANDLE hFile, BY_HANDLE_FILE_INFORMATION NTSTATUS status; status = NtQueryInformationFile( hFile, &io, &all_info, sizeof(all_info), FileAllInformation ); + if (status == STATUS_BUFFER_OVERFLOW) status = STATUS_SUCCESS; if (status == STATUS_SUCCESS) { info->dwFileAttributes = all_info.BasicInformation.FileAttributes;

1 0

Alexandre Julliard : ntdll: Moved the TEB allocation routines to the platform-specific files.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: d4f1fffaccfbb53bb4eb5df43846d93bedeb764b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f1fffaccfbb53bb4eb5df43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 12:25:52 2009 +0100 ntdll: Moved the TEB allocation routines to the platform-specific files. --- dlls/ntdll/ntdll_misc.h | 3 +- dlls/ntdll/signal_i386.c | 75 ++++++++++++++++++++++++++++--------- dlls/ntdll/signal_powerpc.c | 59 ++++++++++++++++++++++------ dlls/ntdll/signal_sparc.c | 59 ++++++++++++++++++++++------ dlls/ntdll/signal_x86_64.c | 64 ++++++++++++++++++++++--------- dlls/ntdll/thread.c | 88 +++++++++++------------------------------- 6 files changed, 220 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f1fffaccfbb53bb4eb5…

1 0

Alexandre Julliard : ntdll: Move initialization of the debug registers to signal_i386.c.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: aced1b82ba06d53db45782b505af352562cfee58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aced1b82ba06d53db45782b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 12:26:21 2009 +0100 ntdll: Move initialization of the debug registers to signal_i386.c. --- dlls/ntdll/signal_i386.c | 15 +++++++++++++++ dlls/ntdll/thread.c | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9ec739c..48e3ef1 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2014,6 +2014,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) { static size_t sigstack_zero_bits; struct ntdll_thread_data *thread_data; + TEB *parent = NULL; SIZE_T size; void *addr = NULL; NTSTATUS status; @@ -2027,6 +2028,7 @@ NTSTATUS signal_alloc_thread( TEB **teb ) signal_stack_mask = (1 << sigstack_zero_bits) - 1; signal_stack_size = (1 << sigstack_zero_bits) - teb_size; } + else parent = NtCurrentTeb(); size = signal_stack_mask + 1; if (!(status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, sigstack_zero_bits, @@ -2042,6 +2044,19 @@ NTSTATUS signal_alloc_thread( TEB **teb ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); status = STATUS_TOO_MANY_THREADS; } + if (parent) + { + /* inherit debug registers from parent thread */ + struct ntdll_thread_regs *parent_regs = (struct ntdll_thread_regs *)parent->SpareBytes1; + struct ntdll_thread_regs *thread_regs = (struct ntdll_thread_regs *)(*teb)->SpareBytes1; + thread_regs->dr0 = parent_regs->dr0; + thread_regs->dr1 = parent_regs->dr1; + thread_regs->dr2 = parent_regs->dr2; + thread_regs->dr3 = parent_regs->dr3; + thread_regs->dr6 = parent_regs->dr6; + thread_regs->dr7 = parent_regs->dr7; + } + } return status; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1c8a617..c38298a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -451,7 +451,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_t pthread_id; pthread_attr_t attr; struct ntdll_thread_data *thread_data; - struct ntdll_thread_regs *thread_regs; struct startup_info *info = NULL; HANDLE handle = 0; TEB *teb = NULL; @@ -524,20 +523,11 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * info->entry_arg = param; thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; - thread_regs = (struct ntdll_thread_regs *)teb->SpareBytes1; thread_data->request_fd = request_pipe[1]; thread_data->reply_fd = -1; thread_data->wait_fd[0] = -1; thread_data->wait_fd[1] = -1; - /* inherit debug registers from parent thread */ - thread_regs->dr0 = ntdll_get_thread_regs()->dr0; - thread_regs->dr1 = ntdll_get_thread_regs()->dr1; - thread_regs->dr2 = ntdll_get_thread_regs()->dr2; - thread_regs->dr3 = ntdll_get_thread_regs()->dr3; - thread_regs->dr6 = ntdll_get_thread_regs()->dr6; - thread_regs->dr7 = ntdll_get_thread_regs()->dr7; - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error; pthread_attr_init( &attr );

1 0

Alexandre Julliard : ntdll: Merge the thread data and thread regs structure , and make sure i386 regs are not available on other platforms.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 16ddc624050a9780c16abb0421e093925bc351cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ddc624050a9780c16abb042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 12:27:09 2009 +0100 ntdll: Merge the thread data and thread regs structure, and make sure i386 regs are not available on other platforms. --- dlls/ntdll/ntdll_misc.h | 44 +++++++++++++++------------------------ dlls/ntdll/signal_i386.c | 51 ++++++++++++++++++++------------------------- dlls/ntdll/thread.c | 31 ++++++++++++++------------- 3 files changed, 56 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ddc624050a9780c16ab…

1 0