August 2011 - Wine-Commits - list.winehq.org

Francois Gouget : shell32: Make SHELL_CreateContextMenu() static.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: a61145f2849857571367dab0359449fe80c09e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61145f2849857571367dab03… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 5 09:56:41 2011 +0200 shell32: Make SHELL_CreateContextMenu() static. --- dlls/shell32/shlmenu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index b37d526..4006807 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1246,7 +1246,7 @@ static const IContextMenu3Vtbl CompositeCMenuVtbl= CompositeCMenu_HandleMenuMsg2 }; -HRESULT SHELL_CreateContextMenu(HWND hwnd, IContextMenu* system_menu, +static HRESULT SHELL_CreateContextMenu(HWND hwnd, IContextMenu* system_menu, IShellFolder *folder, LPCITEMIDLIST folder_pidl, LPCITEMIDLIST *apidl, UINT cidl, const HKEY *aKeys, UINT cKeys,REFIID riid, void** ppv)

1 0

Jörg Höhle : winmm: Assign to structs instead of using memcpy.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 7fed738353c201c59e4befa0b891e72c6340956f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fed738353c201c59e4befa0b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Assign to structs instead of using memcpy. --- dlls/winmm/waveform.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index d1c685e..72eec27 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1445,7 +1445,7 @@ static void WOD_PushData(WINMM_Device *device) device->played_frames += avail_frames; exit: - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -1625,7 +1625,7 @@ static void WID_PullData(WINMM_Device *device) } exit: - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -1718,7 +1718,7 @@ static LRESULT WINMM_Reset(HWAVE hwave) device->loop_counter = 0; device->last_clock_pos = 0; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -2367,7 +2367,7 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -3015,7 +3015,7 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock); @@ -3169,7 +3169,7 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) }else buf = NULL; - memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + cb_info = device->cb_info; LeaveCriticalSection(&device->lock);

1 0

Jörg Höhle : winmm: Fix logic conditions.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: b9de906ac10176f956333dadb3a18d03690085df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9de906ac10176f956333dadb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Fix logic conditions. --- dlls/winmm/waveform.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 160395c..a571fb8 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -706,9 +706,9 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) } /* no direct match, so set up the ACM stream */ - if(info->format->wFormatTag != WAVE_FORMAT_PCM || - (info->format->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - !IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + if(info->format->wFormatTag != WAVE_FORMAT_PCM && + !(info->format->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ /* convert to PCM format if it's not already */ mr = WINMM_TryDeviceMapping(info, info->format->nChannels, info->format->nSamplesPerSec, 16, is_out); @@ -889,6 +889,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, goto error; } + /* As the devices thread is waiting on g_device_handles, it can + * only be modified from within this same thread. */ if(g_device_handles){ g_device_handles = HeapReAlloc(GetProcessHeap(), 0, g_device_handles, sizeof(HANDLE) * (g_devhandle_count + 1)); @@ -2087,11 +2089,11 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) DWORD wait; wait = MsgWaitForMultipleObjects(g_devhandle_count, g_device_handles, FALSE, INFINITE, QS_ALLINPUT); - if(wait == g_devhandle_count - WAIT_OBJECT_0){ + if(wait == g_devhandle_count + WAIT_OBJECT_0){ MSG msg; if(PeekMessageW(&msg, g_devices_hwnd, 0, 0, PM_REMOVE)) ERR("Unexpected message: 0x%x\n", msg.message); - }else if(wait < g_devhandle_count){ + }else if(wait < g_devhandle_count + WAIT_OBJECT_0){ WINMM_Device *device = g_handle_devices[wait - WAIT_OBJECT_0]; if(device->render) WOD_PushData(device); @@ -2149,7 +2151,7 @@ static BOOL WINMM_StartDevicesThread(void) wait = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); if(wait != WAIT_OBJECT_0){ - if(wait == 1 - WAIT_OBJECT_0){ + if(wait == 1 + WAIT_OBJECT_0){ CloseHandle(g_devices_thread); g_devices_thread = NULL; g_devices_hwnd = NULL;

1 0

Jörg Höhle : winmm: Replace one HeapAlloc with stack allocation.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 710d2004274deecba33b85c6bb4651006f1c54c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710d2004274deecba33b85c6b… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Replace one HeapAlloc with stack allocation. --- dlls/winmm/waveform.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 918364b..d1c685e 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -820,7 +820,7 @@ static MMRESULT WINMM_MapDevice(WINMM_OpenInfo *info, BOOL is_out) static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, WINMM_OpenInfo *info) { - WAVEFORMATEX *closer_fmt = NULL, *passed_fmt; + WAVEFORMATEX *closer_fmt = NULL, fmt, *passed_fmt; LRESULT ret = MMSYSERR_ERROR; HRESULT hr; @@ -843,7 +843,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, if(info->format->wFormatTag == WAVE_FORMAT_PCM){ /* we aren't guaranteed that the struct in lpFormat is a full * WAVEFORMATEX struct, which IAC::IsFormatSupported requires */ - passed_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); + passed_fmt = &fmt; memcpy(passed_fmt, info->format, sizeof(PCMWAVEFORMAT)); passed_fmt->cbSize = 0; }else @@ -854,20 +854,14 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, if(closer_fmt) CoTaskMemFree(closer_fmt); if(FAILED(hr) && hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ - if(info->format->wFormatTag == WAVE_FORMAT_PCM) - HeapFree(GetProcessHeap(), 0, passed_fmt); ERR("IsFormatSupported failed: %08x\n", hr); goto error; } if(hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ - if(info->format->wFormatTag == WAVE_FORMAT_PCM) - HeapFree(GetProcessHeap(), 0, passed_fmt); ret = WAVERR_BADFORMAT; goto error; } if(info->flags & WAVE_FORMAT_QUERY){ - if(info->format->wFormatTag == WAVE_FORMAT_PCM) - HeapFree(GetProcessHeap(), 0, passed_fmt); ret = MMSYSERR_NOERROR; goto error; } @@ -876,8 +870,6 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice, hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, 10 * 100000, 50000, passed_fmt, &device->parent->session); - if(info->format->wFormatTag == WAVE_FORMAT_PCM) - HeapFree(GetProcessHeap(), 0, passed_fmt); if(FAILED(hr)){ ERR("Initialize failed: %08x\n", hr); goto error;

1 0

Jörg Höhle : winmm: Fix memory leak in msacm error path.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 961683704bd13194b22e34147fcdad885bdf241f URL: http://source.winehq.org/git/wine.git/?a=commit;h=961683704bd13194b22e34147… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 23:44:09 2011 +0200 winmm: Fix memory leak in msacm error path. --- dlls/winmm/waveform.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 72eec27..160395c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1195,6 +1195,7 @@ static LRESULT WINMM_PrepareHeader(HWAVE hwave, WAVEHDR *header) mr = acmStreamPrepareHeader(device->acm_handle, ash, 0); if(mr != MMSYSERR_NOERROR){ + HeapFree(GetProcessHeap(), 0, ash); LeaveCriticalSection(&device->lock); return mr; }

1 0

Francois Gouget : shell32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 319f3b7d6d74fb3c1922ab7efb3614b0edf53956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=319f3b7d6d74fb3c1922ab7ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 5 09:56:34 2011 +0200 shell32: Remove WINAPI on static functions where not needed. --- dlls/shell32/shlmenu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index eb68939..b37d526 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1088,7 +1088,7 @@ static ULONG WINAPI CompositeCMenu_Release(IContextMenu3 *iface) return 0; } -static UINT WINAPI CompositeCMenu_GetIndexForCommandId(CompositeCMenu *This,UINT id) +static UINT CompositeCMenu_GetIndexForCommandId(CompositeCMenu *This,UINT id) { UINT low=0; UINT high=This->menu_count;

1 0

Alexandre Julliard : gdi32: Validate the DIB parameters in functions that take a BITMAPINFO.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: cf4c565fd28361475f532a169fe8b0a3c31d7e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4c565fd28361475f532a169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 12:12:42 2011 +0200 gdi32: Validate the DIB parameters in functions that take a BITMAPINFO. --- dlls/gdi32/dib.c | 88 +++++++++++------ dlls/gdi32/tests/bitmap.c | 236 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 281 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf4c565fd28361475f532…

1 0

Henri Verbeet : wined3d: Get rid of the fglrx point sprite hack.
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: 812a31482149116e4d3332791d4bd42ba641791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=812a31482149116e4d3332791… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:31 2011 +0200 wined3d: Get rid of the fglrx point sprite hack. Fglrx 9.3 is well over 2 years old at this point. I'd strongly encourage anyone still affected by this to upgrade to the r300g driver. --- dlls/wined3d/context.c | 11 ++++++--- dlls/wined3d/directx.c | 41 ---------------------------------------- dlls/wined3d/state.c | 13 ------------ dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 7 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 620a89b..ac252d8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1522,11 +1522,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); } - for (s = 0; s < gl_info->limits.point_sprite_units; ++s) + if (gl_info->supported[ARB_POINT_SPRITE]) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + for (s = 0; s < gl_info->limits.textures; ++s) + { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); + } } if (gl_info->supported[ARB_PROVOKING_VERTEX]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a93895e..cdf3c11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -596,13 +596,6 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const return TRUE; } -static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return gl_vendor == GL_VENDOR_FGLRX; - -} - static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { @@ -801,27 +794,6 @@ static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } -/* fglrx crashes with a very bad kernel panic if GL_POINT_SPRITE_ARB is set to GL_COORD_REPLACE_ARB - * on more than one texture unit. This means that the d3d9 visual point size test will cause a - * kernel panic on any machine running fglrx 9.3(latest that supports r300 to r500 cards). This - * quirk only enables point sprites on the first texture unit. This keeps point sprites working in - * most games, but avoids the crash - * - * A more sophisticated way would be to find all units that need texture coordinates and enable - * point sprites for one if only one is found, and software emulate point sprites in drawStridedSlow - * if more than one unit needs texture coordinates(This requires software ffp and vertex shaders though) - * - * Note that disabling the extension entirely does not gain predictability because there is no point - * sprite capability flag in d3d, so the potential rendering bugs are the same if we disable the extension. */ -static void quirk_one_point_sprite(struct wined3d_gl_info *gl_info) -{ - if (gl_info->supported[ARB_POINT_SPRITE]) - { - TRACE("Limiting point sprites to one texture unit.\n"); - gl_info->limits.point_sprite_units = 1; - } -} - static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { quirk_arb_constants(gl_info); @@ -963,11 +935,6 @@ static const struct driver_quirk quirk_table[] = "Init texcoord .w for Apple ATI >= r600 GPU driver" }, { - match_fglrx, - quirk_one_point_sprite, - "Fglrx point sprite crash workaround" - }, - { match_dx10_capable, quirk_clip_varying, "Reserved varying for gl_ClipPos" @@ -2625,14 +2592,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; } - if (gl_info->supported[ARB_POINT_SPRITE]) - { - gl_info->limits.point_sprite_units = gl_info->limits.textures; - } - else - { - gl_info->limits.point_sprite_units = 0; - } checkGLcall("extension detection"); LEAVE_GL(); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c3dd7ff..b3c1270 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1594,21 +1594,8 @@ static void state_pointsprite_w(struct wined3d_context *context, const struct wi static void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; - if (state->render_states[WINED3DRS_POINTSPRITEENABLE]) { - static BOOL warned; - - if (gl_info->limits.point_sprite_units < gl_info->limits.textures && !warned) - { - if (use_ps(state) || state->lowest_disabled_stage > gl_info->limits.point_sprite_units) - { - FIXME("The app uses point sprite texture coordinates on more units than supported by the driver\n"); - warned = TRUE; - } - } - glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d340049..129c156 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1445,7 +1445,6 @@ struct wined3d_gl_limits UINT texture3d_size; float pointsize_max; float pointsize_min; - UINT point_sprite_units; UINT blends; UINT anisotropy; float shininess;

1 0

Henri Verbeet : wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt().
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: a84275075d4a20a9a7f42eda01585d34f31b56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84275075d4a20a9a7f42eda0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 4 19:53:27 2011 +0200 wined3d: Implement wined3d_surface_bltfast() on top of wined3d_surface_blt(). --- dlls/wined3d/surface.c | 358 ++-------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 18 insertions(+), 342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a84275075d4a20a9a7f42…

1 0

Frédéric Delanoy : winedbg: Remove dead assignment (Clang).
by Alexandre Julliard Aug. 5, 2011

Aug. 5, 2011

Module: wine Branch: master Commit: a2e8d6145344d5a1e4b65b3f5fa3d6ba56a5e36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e8d6145344d5a1e4b65b3f5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 19:26:00 2011 +0200 winedbg: Remove dead assignment (Clang). --- programs/winedbg/symbol.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 6b689c2..8d7af5d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -293,7 +293,6 @@ enum sym_get_lval symbol_picker_interactive(const char* name, const struct sgv_d } do { - i = 0; if (input_read_line("=> ", buffer, sizeof(buffer))) { if (buffer[0] == '\0') return sglv_aborted;

1 0