May 2009 - Wine-commits - list.winehq.org

Francois Gouget : winetest: Replace malloc() & co with HeapAlloc().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 4a558538c8a1862a018fb98cf4880439243c89bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a558538c8a1862a018fb98cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:28:46 2009 +0200 winetest: Replace malloc() & co with HeapAlloc(). --- programs/winetest/util.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/winetest/util.c b/programs/winetest/util.c index 66f79f5..d0776ea 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -29,7 +29,7 @@ HANDLE logfile = 0; void *heap_alloc (size_t len) { - void *p = malloc (len); + void *p = HeapAlloc(GetProcessHeap(), 0, len); if (!p) report (R_FATAL, "Out of memory."); return p; @@ -37,7 +37,7 @@ void *heap_alloc (size_t len) void *heap_realloc (void *op, size_t len) { - void *p = realloc (op, len); + void *p = HeapReAlloc(GetProcessHeap(), 0, op, len); if (len && !p) report (R_FATAL, "Out of memory."); return p; @@ -45,14 +45,16 @@ void *heap_realloc (void *op, size_t len) char *heap_strdup( const char *str ) { - char *res = strdup( str ); + int len = lstrlen(str) + 1; + char* res = HeapAlloc(GetProcessHeap(), 0, len); if (!res) report (R_FATAL, "Out of memory."); + memcpy(res, str, len); return res; } void heap_free (void *op) { - free (op); + HeapFree(GetProcessHeap(), 0, op); } static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) @@ -61,14 +63,14 @@ static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) char *p, *q; int n; - p = malloc (size); + p = HeapAlloc(GetProcessHeap(), 0, size); if (!p) return NULL; while (1) { n = vsnprintf (p, size, fmt, ap); if (n < 0) size *= 2; /* Windows */ else if ((unsigned)n >= size) size = n+1; /* glibc */ else break; - q = realloc (p, size); + q = HeapReAlloc(GetProcessHeap(), 0, p, size); if (!q) { heap_free (p); return NULL;

1 0

Francois Gouget : advapi32/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 3d5f1edff5330a028c9f63547090b2d72a567433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5f1edff5330a028c9f63547… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:31:24 2009 +0200 advapi32/tests: Replace realloc() with HeapReAlloc(). --- dlls/advapi32/tests/registry.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a3d9f30..47e76b2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -52,7 +52,11 @@ static char *get_temp_buffer( int size ) UINT idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Francois Gouget : gphoto2.ds: Use Win32 APIs instead of strdup().
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: d0ba18430d769ff4073e08156f4e0035f725f7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ba18430d769ff4073e08156… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 17 13:30:10 2009 +0200 gphoto2.ds: Use Win32 APIs instead of strdup(). --- dlls/gphoto2.ds/gphoto2_main.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index bb2c31c..ab4f392 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -37,6 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +static char* GPHOTO2_StrDup(const char* str) +{ + char* dst = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + strcpy(dst, str); + return dst; +} + static void load_filesystem(const char *folder) { #ifdef HAVE_GPHOTO2 @@ -63,12 +70,12 @@ load_filesystem(const char *folder) { ret = gp_list_get_name (list, i, &name); if (ret < GP_OK) continue; - gpfile = HeapAlloc(GetProcessHeap(), 0, sizeof(struct gphoto2_file)); + gpfile = HeapAlloc(GetProcessHeap(), 0, sizeof(struct gphoto2_file)); /* FIXME: Leaked */ if (!gpfile) continue; TRACE("adding %s/%s\n", folder, name); - gpfile->folder = strdup(folder); - gpfile->filename = strdup(name); + gpfile->folder = GPHOTO2_StrDup(folder); + gpfile->filename = GPHOTO2_StrDup(name); gpfile->download = FALSE; list_add_tail( &activeDS.files, &gpfile->entry ); }

1 0

Aurimas Fišeras : notepad: Update Lithuanian translation.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 9f1daabd63200119c52bee32ae5d4b9f2b4765c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1daabd63200119c52bee32a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun May 17 19:20:55 2009 +0300 notepad: Update Lithuanian translation. --- programs/notepad/Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Lt.rc b/programs/notepad/Lt.rc index 741c22a..ce289f2 100644 --- a/programs/notepad/Lt.rc +++ b/programs/notepad/Lt.rc @@ -54,6 +54,7 @@ POPUP "&Taisa" { POPUP "&Paieška" { MENUITEM "&Ieškoti...\tCtrl+F", CMD_SEARCH MENUITEM "Ieškoti k&ito\tF3", CMD_SEARCH_NEXT + MENUITEM "Pa&keisti...\tCtrl+H", CMD_REPLACE } POPUP "&Žinynas" { MENUITEM "&Turinys", CMD_HELP_CONTENTS

1 0

Vitaliy Margolen : dxdiagn: Rename szClsidCat and szClsidFilter to match native information.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: b3375a3fa299827f2c385340e33767ea209a169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3375a3fa299827f2c385340e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:18 2009 -0600 dxdiagn: Rename szClsidCat and szClsidFilter to match native information. --- dlls/dxdiagn/provider.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 398c9ad..86f9c6b 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -598,8 +598,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; - static const WCHAR szClsidCat[] = {'s','z','C','l','s','i','d','C','a','t',0}; - static const WCHAR szClsidFilter[] = {'s','z','C','l','s','i','d','F','i','l','t','e','r',0}; + static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; + static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; static const WCHAR dwMerit[] = {'d','w','M','e','r','i','t',0}; @@ -674,7 +674,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD dwNInputs = 0; add_prop_str(pSubCont, szCatName, wszCatName); - add_prop_str(pSubCont, szClsidCat, wszCatClsid); + add_prop_str(pSubCont, ClsidCatW, wszCatClsid); hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); @@ -683,7 +683,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidFilter, &v); + hr = IDxDiagContainerImpl_AddProp(pSubCont, ClsidFilterW, &v); VariantClear(&v); hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL);

1 0

Vitaliy Margolen : dxdiagn: Correct version format property.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 136dc1fcaa3d8af2d84331fa9f830bb909154e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=136dc1fcaa3d8af2d84331fa9… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:20 2009 -0600 dxdiagn: Correct version format property. --- dlls/dxdiagn/provider.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 86f9c6b..a6d1066 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -597,6 +597,7 @@ struct REG_TYPE { static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; + static const WCHAR szVersionW[] = {'s','z','V','e','r','s','i','o','n',0}; static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; @@ -614,6 +615,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; /*static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};*/ + static const WCHAR szVersionFormat[] = {'v','%','d',0}; + ICreateDevEnum* pCreateDevEnum = NULL; IEnumMoniker* pEmCat = NULL; IMoniker* pMCat = NULL; @@ -672,6 +675,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD it; DWORD dwNOutputs = 0; DWORD dwNInputs = 0; + WCHAR bufferW[10]; add_prop_str(pSubCont, szCatName, wszCatName); add_prop_str(pSubCont, ClsidCatW, wszCatClsid); @@ -691,7 +695,8 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu prrf = (struct REG_RF*) pData; pCurrent = pData; - add_prop_ui4(pSubCont, szName, prrf->dwVersion); + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); + add_prop_str(pSubCont, szVersionW, bufferW); add_prop_ui4(pSubCont, dwMerit, prrf->dwMerit); pCurrent += sizeof(struct REG_RF);

1 0

Vitaliy Margolen : dxdiagn: DirectShowFilters should go under numbered sub-containers.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 806ea86be2f2f1bbea09d39b242816624bef2b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806ea86be2f2f1bbea09d39b2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 17 16:02:22 2009 -0600 dxdiagn: DirectShowFilters should go under numbered sub-containers. --- dlls/dxdiagn/provider.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index a6d1066..d3f0a26 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -613,9 +613,11 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; - /*static const WCHAR wszMeritName[] = {'M','e','r','i','t',0};*/ static const WCHAR szVersionFormat[] = {'v','%','d',0}; + static const WCHAR szIdFormat[] = {'%','d',0}; + int i = 0; + ICreateDevEnum* pCreateDevEnum = NULL; IEnumMoniker* pEmCat = NULL; @@ -676,28 +678,37 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu DWORD dwNOutputs = 0; DWORD dwNInputs = 0; WCHAR bufferW[10]; + IDxDiagContainer *pDShowSubCont = NULL; - add_prop_str(pSubCont, szCatName, wszCatName); - add_prop_str(pSubCont, ClsidCatW, wszCatClsid); + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + if (FAILED(DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDShowSubCont)) || + FAILED(IDxDiagContainerImpl_AddChildContainer(pSubCont, bufferW, pDShowSubCont))) + { + IPropertyBag_Release(pPropFilterBag); + if (pDShowSubCont) IUnknown_Release(pDShowSubCont); + continue; + } hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); + hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, szName, &v); TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); VariantClear(&v); hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, ClsidFilterW, &v); + hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, ClsidFilterW, &v); VariantClear(&v); + add_prop_str(pDShowSubCont, szCatName, wszCatName); + add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); + hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); prrf = (struct REG_RF*) pData; pCurrent = pData; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); - add_prop_str(pSubCont, szVersionW, bufferW); - add_prop_ui4(pSubCont, dwMerit, prrf->dwMerit); + add_prop_str(pDShowSubCont, szVersionW, bufferW); pCurrent += sizeof(struct REG_RF); for (it = 0; it < prrf->dwPins; ++it) { @@ -721,11 +732,13 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu } } - add_prop_ui4(pSubCont, dwInputs, dwNInputs); - add_prop_ui4(pSubCont, dwOutputs, dwNOutputs); + add_prop_ui4(pDShowSubCont, dwInputs, dwNInputs); + add_prop_ui4(pDShowSubCont, dwOutputs, dwNOutputs); + add_prop_ui4(pDShowSubCont, dwMerit, prrf->dwMerit); SafeArrayUnaccessData(V_UNION(&v, parray)); VariantClear(&v); + i++; } IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL; }

1 0

Jacek Caban : urlmon: Added GetBindString(BINDSTRING_URL) implementation.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 5b72526052c333744c9d08a10b240117f6c88fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b72526052c333744c9d08a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 03:05:39 2009 +0200 urlmon: Added GetBindString(BINDSTRING_URL) implementation. --- dlls/urlmon/binding.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 3ff4683..2c6af73 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1172,6 +1172,17 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, return hres; } + case BINDSTRING_URL: { + DWORD size = (strlenW(This->url)+1) * sizeof(WCHAR); + + if(!ppwzStr || !pcElFetched) + return E_INVALIDARG; + + *ppwzStr = CoTaskMemAlloc(size); + memcpy(*ppwzStr, This->url, size); + *pcElFetched = 1; + return S_OK; + } } FIXME("not supported string type %d\n", ulStringType);

1 0

Alexandre Julliard : ntdll: Added a stub for RtlUnwindEx on x86_64.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: 47d77025227c3bd71d2f7896e0453d96081df018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d77025227c3bd71d2f7896e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 20:18:33 2009 +0200 ntdll: Added a stub for RtlUnwindEx on x86_64. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 82c3f02..4b5dfec 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -888,6 +888,7 @@ @ stdcall RtlUnlockHeap(long) # @ stub RtlUnlockMemoryStreamRegion @ stdcall -register RtlUnwind(ptr ptr ptr ptr) +@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 15785e5..dd8dad9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -897,30 +897,39 @@ PVOID WINAPI RtlVirtualUnwind ( ULONG type, ULONG64 base, ULONG64 pc, /******************************************************************* - * RtlUnwind (NTDLL.@) + * RtlUnwindEx (NTDLL.@) */ -void WINAPI __regs_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID targetIp, - PEXCEPTION_RECORD pRecord, PVOID retval, CONTEXT *context ) +void WINAPI RtlUnwindEx( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, + ULONG64 retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_RECORD record; /* build an exception record, if we do not have one */ - if (!pRecord) + if (!rec) { record.ExceptionCode = STATUS_UNWIND; record.ExceptionFlags = 0; record.ExceptionRecord = NULL; record.ExceptionAddress = (void *)context->Rip; record.NumberParameters = 0; - pRecord = &record; + rec = &record; } - pRecord->ExceptionFlags |= EH_UNWINDING | (pEndFrame ? 0 : EH_EXIT_UNWIND); + rec->ExceptionFlags |= EH_UNWINDING | (frame ? 0 : EH_EXIT_UNWIND); - FIXME( "code=%x flags=%x not implemented on x86_64\n", - pRecord->ExceptionCode, pRecord->ExceptionFlags ); + FIXME( "code=%x flags=%x not implemented on x86_64\n", rec->ExceptionCode, rec->ExceptionFlags ); NtTerminateProcess( GetCurrentProcess(), 1 ); } + + +/******************************************************************* + * RtlUnwind (NTDLL.@) + */ +void WINAPI __regs_RtlUnwind( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec, + ULONG64 retval, CONTEXT *context ) +{ + RtlUnwindEx( frame, target_ip, rec, retval, context, NULL ); +} DEFINE_REGS_ENTRYPOINT( RtlUnwind, 4 )

1 0

Alexandre Julliard : ntdll: Initial implementation of RtlVirtualUnwind on x86_64.
by Alexandre Julliard 18 May '09

18 May '09

Module: wine Branch: master Commit: f7b1e94f9896b7f8c61ad1165b8eae51711093f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b1e94f9896b7f8c61ad1165… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 15 20:18:59 2009 +0200 ntdll: Initial implementation of RtlVirtualUnwind on x86_64. --- dlls/ntdll/signal_x86_64.c | 281 +++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 5 + 2 files changed, 280 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7b1e94f9896b7f8c61ad…

1 0