wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Henri Verbeet : avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_ReadBlock().
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: c274d6f06e28784857903f2c4599db928f50c42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c274d6f06e28784857903f2c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:14 2010 +0100 avifil32: Don't leak the buffer on HeapReAlloc() failure in AVIFILE_ReadBlock(). --- dlls/avifil32/avifile.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2d39659..c4f191a 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2030,12 +2030,14 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, if (This->lpBuffer == NULL || This->cbBuffer < size) { DWORD maxSize = max(size, This->sInfo.dwSuggestedBufferSize); - if (This->lpBuffer == NULL) + if (This->lpBuffer == NULL) { This->lpBuffer = HeapAlloc(GetProcessHeap(), 0, maxSize); - else - This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); - if (This->lpBuffer == NULL) - return AVIERR_MEMORY; + if (!This->lpBuffer) return AVIERR_MEMORY; + } else { + void *new_buffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); + if (!new_buffer) return AVIERR_MEMORY; + This->lpBuffer = new_buffer; + } This->cbBuffer = maxSize; }

1 0

Henri Verbeet : avifil32: Just assign maxSize to This-> cbBuffer in AVIFILE_ReadBlock().
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 1fb72a37eb350993a4335cfc790be75f5bce1b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb72a37eb350993a4335cfc7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:13 2010 +0100 avifil32: Just assign maxSize to This->cbBuffer in AVIFILE_ReadBlock(). --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 2486611..2d39659 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2036,7 +2036,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); if (This->lpBuffer == NULL) return AVIERR_MEMORY; - This->cbBuffer = max(size, This->sInfo.dwSuggestedBufferSize); + This->cbBuffer = maxSize; } /* now read the complete chunk into our buffer */

1 0

Henri Verbeet : avifil32: Properly check the required buffer size in AVIFILE_ReadBlock().
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 4c36e12be6fdc1afc6431df3f930715f587ef757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c36e12be6fdc1afc6431df3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:12 2010 +0100 avifil32: Properly check the required buffer size in AVIFILE_ReadBlock(). --- dlls/avifil32/avifile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 49e141f..2486611 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -2027,7 +2027,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, size += 2 * sizeof(DWORD); /* check that buffer is big enough -- don't trust dwSuggestedBufferSize */ - if (This->lpBuffer == NULL || size < This->cbBuffer) { + if (This->lpBuffer == NULL || This->cbBuffer < size) { DWORD maxSize = max(size, This->sInfo.dwSuggestedBufferSize); if (This->lpBuffer == NULL)

1 0

Henri Verbeet : wined3d: Handle stateblock capture for default lights created while recording.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: f5c8153eddecd709bbcb15fd1bae110a16bf0029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c8153eddecd709bbcb15fd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:11 2010 +0100 wined3d: Handle stateblock capture for default lights created while recording. For non-recorded stateblocks a light always exists in the device stateblock as well, since that's where it's copied from. However, when SetLightEnable() is called for a light that didn't a exist yet while recording a stateblock, the light is only created on the recorded stateblock. --- dlls/wined3d/stateblock.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 03c3e73..48f9eac 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -573,8 +573,17 @@ static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlock if (!updated) { - ERR("Light %u in stateblock %p does not exist in device stateblock %p.\n", + /* This can happen if the light was originally created as a + * default light for SetLightEnable() while recording. */ + WARN("Light %u in stateblock %p does not exist in device stateblock %p.\n", src->OriginalIndex, This, targetStateBlock); + + src->OriginalParms = WINED3D_default_light; + if (src->glIndex != -1) + { + This->activeLights[src->glIndex] = NULL; + src->glIndex = -1; + } } } }

1 0

Henri Verbeet : wined3d: Remove a few redundant context dereferences.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 5bac33d3586685ca9d51150e1dd027f859957444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bac33d3586685ca9d51150e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 4 21:33:10 2010 +0100 wined3d: Remove a few redundant context dereferences. --- dlls/wined3d/state.c | 112 +++++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bac33d3586685ca9d511…

1 0

Jacek Caban : urlmon: Fixed accept_mimes freeing.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 367cca6a9f6a34c78c8a3bd1401c64bc6a5fa862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=367cca6a9f6a34c78c8a3bd14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 4 19:16:20 2010 +0100 urlmon: Fixed accept_mimes freeing. --- dlls/urlmon/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 15344e2..fc0b8c4 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,7 +79,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ URL_COMPONENTSW url_comp; BYTE security_id[512]; DWORD len = 0; - ULONG num = 0; + ULONG num; BOOL res, b; HRESULT hres; @@ -132,8 +132,8 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ ? wszBindVerb[This->base.bind_info.dwBindVerb] : This->base.bind_info.szCustomVerb, path, NULL, NULL, (LPCWSTR *)accept_mimes, request_flags, (DWORD_PTR)&This->base); heap_free(path); - while (num<sizeof(accept_mimes)/sizeof(accept_mimes[0]) && accept_mimes[num]) - CoTaskMemFree(accept_mimes[num++]); + while(num--) + CoTaskMemFree(accept_mimes[num]); if (!This->base.request) { WARN("HttpOpenRequest failed: %d\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND;

1 0

Alexandre Julliard : ole2: Convert the icon for OleMetafilePictFromIconAndLabel to 32-bit explicitly instead of casting the handle .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 25c2236a91e889e3f50513048e51bb94894c6d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c2236a91e889e3f50513048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 20:26:54 2010 +0100 ole2: Convert the icon for OleMetafilePictFromIconAndLabel to 32-bit explicitly instead of casting the handle. --- dlls/ole2.dll16/ole2.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index d3880c6..c158949 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -48,8 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -#define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) + +static HICON convert_icon_to_32( HICON16 icon16 ) +{ + CURSORICONINFO *info = GlobalLock16( icon16 ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * 2 * ((info->nWidth + 15) / 16); + HICON ret = CreateIcon( 0, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, + and_bits, xor_bits ); + GlobalUnlock16( icon16 ); + return ret; +} /****************************************************************************** * OleBuildVersion (OLE2.1) @@ -124,7 +133,7 @@ HRESULT WINAPI RevokeDragDrop16( * This code might be wrong at some places. */ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( - HICON16 hIcon, + HICON16 icon16, LPCOLESTR16 lpszLabel, LPCOLESTR16 lpszSourceFile, UINT16 iIconIndex @@ -134,6 +143,7 @@ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( HGLOBAL16 hmf16; LPWSTR label = NULL, source = NULL; DWORD len; + HICON icon = convert_icon_to_32( icon16 ); if (lpszLabel) { @@ -147,9 +157,10 @@ HGLOBAL16 WINAPI OleMetafilePictFromIconAndLabel16( source = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, lpszSourceFile, -1, source, len ); } - hmf = OleMetafilePictFromIconAndLabel( HICON_32(hIcon), label, source, iIconIndex ); + hmf = OleMetafilePictFromIconAndLabel( icon, label, source, iIconIndex ); HeapFree( GetProcessHeap(), 0, label ); HeapFree( GetProcessHeap(), 0, source ); + DestroyIcon( icon ); if (!hmf) return 0; pict = GlobalLock( hmf );

1 0

Alexandre Julliard : shell: Convert the about icon to 32-bit explicitly instead of casting the handle.
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 67e1ac9a936a96647b0b9e1c53a59abd144c0397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e1ac9a936a96647b0b9e1c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 20:20:15 2010 +0100 shell: Convert the about icon to 32-bit explicitly instead of casting the handle. --- dlls/shell.dll16/shell.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index b33d3cc..b8d99fd 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -42,6 +42,7 @@ #include "shlwapi.h" #include "wine/winbase16.h" +#include "wine/winuser16.h" #include "wine/debug.h" @@ -52,7 +53,6 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF INT iShowCmd, void *callback); #define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) @@ -73,6 +73,17 @@ static UINT uMsgWndCreated = 0; static UINT uMsgWndDestroyed = 0; static UINT uMsgShellActivate = 0; +static HICON convert_icon_to_32( HICON16 icon16 ) +{ + CURSORICONINFO *info = GlobalLock16( icon16 ); + void *and_bits = info + 1; + void *xor_bits = (BYTE *)and_bits + info->nHeight * 2 * ((info->nWidth + 15) / 16); + HICON ret = CreateIcon( 0, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, + and_bits, xor_bits ); + GlobalUnlock16( icon16 ); + return ret; +} + /*********************************************************************** * DllEntryPoint [SHELL.101] * @@ -183,9 +194,12 @@ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam, /************************************************************************* * ShellAbout (SHELL.22) */ -BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff, - HICON16 hIcon ) -{ return ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, HICON_32(hIcon) ); +BOOL16 WINAPI ShellAbout16( HWND16 hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON16 icon16 ) +{ + HICON icon = convert_icon_to_32( icon16 ); + BOOL ret = ShellAboutA( HWND_32(hWnd), szApp, szOtherStuff, icon ); + DestroyIcon( icon ); + return ret; } /*************************************************************************

1 0

Alexandre Julliard : winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 81085498048d9bcdc4eb82de95d97f53a7da32d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81085498048d9bcdc4eb82de9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:58:25 2010 +0100 winedos: Link to DirectSoundCreate through delayed imports instead of doing it by hand. --- dlls/winedos/Makefile.in | 2 +- dlls/winedos/soundblaster.c | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 632815c..3c16053 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll IMPORTS = user32 kernel32 kernel ntdll -DELAYIMPORTS = ddraw +DELAYIMPORTS = ddraw dsound C_SRCS = \ devices.c \ diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index e48095f..52eb7ba 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -61,9 +61,6 @@ static BYTE dma_buffer[DMATRFSIZE*2]; #define DSBUFLEN 4096 /* FIXME: Only this value seems to work */ /* Direct Sound playback stuff */ -static HMODULE hmodule; -typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN); -static fnDirectSoundCreate lpDirectSoundCreate; static LPDIRECTSOUND lpdsound; static LPDIRECTSOUNDBUFFER lpdsbuf; static DSBUFFERDESC buf_desc; @@ -126,18 +123,7 @@ static BOOL SB_Init(void) HRESULT result; if (!lpdsound) { - hmodule = LoadLibraryA("dsound.dll"); - if (!hmodule) { - ERR("Can't load dsound.dll !\n"); - return 0; - } - lpDirectSoundCreate = (fnDirectSoundCreate)GetProcAddress(hmodule,"DirectSoundCreate"); - if (!lpDirectSoundCreate) { - /* CloseHandle(hmodule); */ - ERR("Can't find DirectSoundCreate function !\n"); - return 0; - } - result = (*lpDirectSoundCreate)(NULL,&lpdsound,NULL); + result = DirectSoundCreate(NULL,&lpdsound,NULL); if (result != DS_OK) { ERR("Unable to initialize Sound Subsystem err = %x !\n",result); return 0;

1 0

Alexandre Julliard : winedos: Link to DirectDrawCreate through delayed imports instead of doing it by hand .
by Alexandre Julliard 05 Jan '10

05 Jan '10

Module: wine Branch: master Commit: 0a8573a226e644cc292e75fc91217c83dbc79f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8573a226e644cc292e75fc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 17:57:55 2010 +0100 winedos: Link to DirectDrawCreate through delayed imports instead of doing it by hand. --- dlls/winedos/Makefile.in | 1 + dlls/winedos/vga.c | 14 +------------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index 8cf3db8..632815c 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winedos.dll IMPORTS = user32 kernel32 kernel ntdll +DELAYIMPORTS = ddraw C_SRCS = \ devices.c \ diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index 86737bc..3c904be 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -231,9 +231,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION vga_lock = { &critsect_debug, -1, 0, 0, 0, 0 }; -typedef HRESULT (WINAPI *DirectDrawCreateProc)(LPGUID,LPDIRECTDRAW *,LPUNKNOWN); -static DirectDrawCreateProc pDirectDrawCreate; - static void CALLBACK VGA_Poll( LPVOID arg, DWORD low, DWORD high ); static HWND vga_hwnd = NULL; @@ -787,16 +784,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) if (lpddraw) VGA_DoExit(0); if (!lpddraw) { - if (!pDirectDrawCreate) - { - HMODULE hmod = LoadLibraryA( "ddraw.dll" ); - if (hmod) pDirectDrawCreate = (DirectDrawCreateProc)GetProcAddress( hmod, "DirectDrawCreate" ); - if (!pDirectDrawCreate) { - ERR("Can't lookup DirectDrawCreate from ddraw.dll.\n"); - return; - } - } - res = pDirectDrawCreate(NULL,&lpddraw,NULL); + res = DirectDrawCreate(NULL,&lpddraw,NULL); if (!lpddraw) { ERR("DirectDraw is not available (res = 0x%x)\n",res); return;

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010