November 2012 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Reimplement GetFrameCount of the GIF decoder.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 892c16e6611fa70c28558c93ac3228617fb1fa15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892c16e6611fa70c28558c93a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 22 18:26:28 2012 +0800 windowscodecs: Reimplement GetFrameCount of the GIF decoder. --- dlls/windowscodecs/gifformat.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 4fa10e0..eb8a37b 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1241,13 +1241,14 @@ static HRESULT WINAPI GifDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { GifDecoder *This = impl_from_IWICBitmapDecoder(iface); - TRACE("(%p,%p)\n", iface, pCount); - if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + if (!pCount) return E_INVALIDARG; - *pCount = This->gif->ImageCount; + EnterCriticalSection(&This->lock); + *pCount = This->gif ? This->gif->ImageCount : 0; + LeaveCriticalSection(&This->lock); - TRACE("<- %u\n", *pCount); + TRACE("(%p) <-- %d\n", iface, *pCount); return S_OK; }

1 0

Andrew Talbot : kernel32: Remove unused variables.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 1973a808c26f294bd0fad0023c1115c2c231353c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1973a808c26f294bd0fad0023… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:44 2012 +0000 kernel32: Remove unused variables. --- dlls/kernel32/profile.c | 7 +++---- dlls/kernel32/resource.c | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 3d00c29..87c3cd7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1236,12 +1236,11 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, { WCHAR buffer[30]; UNICODE_STRING bufferW; - INT len; ULONG result; - if (!(len = GetPrivateProfileStringW( section, entry, emptystringW, - buffer, sizeof(buffer)/sizeof(WCHAR), - filename ))) + if (GetPrivateProfileStringW( section, entry, emptystringW, + buffer, sizeof(buffer)/sizeof(WCHAR), + filename ) == 0) return def_val; /* FIXME: if entry can be found but it's empty, then Win16 is diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index b9a93c4..0235b3c 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -830,7 +830,6 @@ static IMAGE_NT_HEADERS *get_nt_header( void *base, DWORD mapping_size ) static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, DWORD *num_sections ) { IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec; DWORD section_ofs; nt = get_nt_header( base, mapping_size ); @@ -839,7 +838,7 @@ static IMAGE_SECTION_HEADER *get_section_header( void *base, DWORD mapping_size, /* check that we don't go over the end of the file accessing the sections */ section_ofs = FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + nt->FileHeader.SizeOfOptionalHeader; - if ((nt->FileHeader.NumberOfSections * sizeof (*sec) + section_ofs) > mapping_size) + if ((nt->FileHeader.NumberOfSections * sizeof (IMAGE_SECTION_HEADER) + section_ofs) > mapping_size) return NULL; if (num_sections)

1 0

Andrew Talbot : msi: Remove unused variables.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: b1d4793344c08ca3722e15dc17c4c8d9b40bf0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d4793344c08ca3722e15dc1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:50 2012 +0000 msi: Remove unused variables. --- dlls/msi/files.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d831313..7202fb6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -69,7 +69,6 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil VS_FIXEDFILEINFO *file_version; WCHAR *font_version; msi_file_state state; - DWORD file_size; comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) @@ -118,7 +117,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil return state; } } - if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + if (msi_get_disk_file_size( file->TargetPath ) != file->FileSize) { return msifs_overwrite; } @@ -781,7 +780,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) LPWSTR sourcedir, destname = NULL, destdir = NULL, source = NULL, dest = NULL; int options; DWORD size; - BOOL ret, wildcards; + BOOL wildcards; component = MSI_RecordGetString(rec, 2); comp = msi_get_loaded_component(package, component); @@ -863,7 +862,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (GetFileAttributesW(destdir) == INVALID_FILE_ATTRIBUTES) { - if (!(ret = msi_create_full_path(destdir))) + if (!msi_create_full_path(destdir)) { WARN("failed to create directory %u\n", GetLastError()); goto done;

1 0

Andrew Talbot : shell32: Remove unused variable.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: cade59aab7b80ede7e8ff1e4310dd4d886c31573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cade59aab7b80ede7e8ff1e43… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:17:03 2012 +0000 shell32: Remove unused variable. --- dlls/shell32/brsfolder.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 0e7b9d3..d48666f 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -410,7 +410,6 @@ static HTREEITEM InsertTreeViewItem( browse_info *info, IShellFolder * lpsf, static void FillTreeView( browse_info *info, IShellFolder * lpsf, LPITEMIDLIST pidl, HTREEITEM hParent, IEnumIDList* lpe) { - HTREEITEM hPrev = 0; LPITEMIDLIST pidlTemp = 0; ULONG ulFetched; HRESULT hr; @@ -450,7 +449,7 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, } } - if (!(hPrev = InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent))) + if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) goto done; SHFree(pidlTemp); /* Finally, free the pidl that the shell gave us... */ pidlTemp=NULL;

1 0

Jacek Caban : atl: Don't forward AtlModule* calls to atl100.dll.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: fed2d49fd9d69bf597f117f6e36bef9adca78ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed2d49fd9d69bf597f117f6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:33:25 2012 +0100 atl: Don't forward AtlModule* calls to atl100.dll. --- dlls/atl/atl.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index c043d3e..1de6f0c 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -34,10 +34,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl100.AtlModuleAddCreateWndData -44 stdcall AtlModuleExtractCreateWndData(ptr) atl100.AtlModuleExtractCreateWndData -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoW -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoA +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlModuleExtractCreateWndData(ptr) +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper

1 0

Andrew Talbot : msxml3: Remove unused variable.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 6256379a967ee862bfb342bf12c945934eb95c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6256379a967ee862bfb342bf1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:55 2012 +0000 msxml3: Remove unused variable. --- dlls/msxml3/element.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index eee737e..4892920 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -736,7 +736,7 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) { static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const BYTE *d = buf; - int bytes, pad_bytes, div, i; + int bytes, pad_bytes, div; DWORD needed; WCHAR *ptr; @@ -753,7 +753,6 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) div = len / 3; ptr = *ret; - i = 0; while (div > 0) { /* first char is the first 6 bits of the first byte*/ @@ -766,7 +765,6 @@ static HRESULT encode_base64(const BYTE *buf, int len, BSTR *ret) *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; /* fourth char is the remaining 6 bits of the third byte */ *ptr++ = b64[ d[2] & 0x3f]; - i += 4; d += 3; div--; }

1 0

Andrew Talbot : quartz: Remove unused variables.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 17cc65a0df2f277cb1573cacc337e6c8a0054b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cc65a0df2f277cb1573cacc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 21 21:16:59 2012 +0000 quartz: Remove unused variables. --- dlls/quartz/filesource.c | 3 +-- dlls/quartz/videorenderer.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e5a5d3c..f518ec7 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -306,9 +306,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ static const WCHAR wszSourceFilter[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; - LONG temp; - if ((temp = RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen)) != ERROR_SUCCESS) + if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, wszPatternString); break; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index d6b87fa..a7f0a59 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -207,12 +207,10 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, { AM_MEDIA_TYPE amt; HRESULT hr = S_OK; - DDSURFACEDESC sdesc; BITMAPINFOHEADER *bmiHeader; TRACE("(%p)->(%p, %d)\n", This, data, size); - sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType(&This->renderer.pInputPin->pin.IPin_iface, &amt); if (FAILED(hr)) { ERR("Unable to retrieve media type\n");

1 0

Michael Stefaniuc : qedit: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 47513d955184d0c5fe263671f410cfb766a019f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47513d955184d0c5fe263671f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:35:30 2012 +0100 qedit: "Fix" DllCanUnloadNow() implementation. --- dlls/qedit/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 40514d5..d8d02a3 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -139,7 +139,7 @@ static const IClassFactoryVtbl DSCF_Vtbl = */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; } /*******************************************************************************

1 0

Michael Stefaniuc : dpnhpast: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: 9bf8bd52cf33d1114d8f3df7ffdeb70b8f63e01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf8bd52cf33d1114d8f3df7f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:25:12 2012 +0100 dpnhpast: "Fix" DllCanUnloadNow() implementation. --- dlls/dpnhpast/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 9a94a33..5ff5f72 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -81,7 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - return S_OK; + return S_FALSE; }

1 0

Michael Stefaniuc : hlink: "Fix" DllCanUnloadNow() implementation.
by Alexandre Julliard Nov. 22, 2012

Nov. 22, 2012

Module: wine Branch: master Commit: a0e266972cb3d1c47d0614bd9c419076152c3419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e266972cb3d1c47d0614bd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 21 22:26:08 2012 +0100 hlink: "Fix" DllCanUnloadNow() implementation. --- dlls/hlink/hlink_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 9823a5d..3bf9d27 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ HRESULT WINAPI DllCanUnloadNow( void ) { - return S_OK; + return S_FALSE; } /***********************************************************************

1 0