June 2007 - Wine-commits - list.winehq.org

Michael Stefaniuc : winmm: Replace malloc with HeapAlloc.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: d14da0763d1c4b6c7937c09a29e1ac2699361c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14da0763d1c4b6c7937c09a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 26 01:05:56 2007 +0200 winmm: Replace malloc with HeapAlloc. --- dlls/winmm/tests/capture.c | 12 ++++++------ dlls/winmm/tests/wave.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index f148df4..e0975df 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -191,7 +191,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); - frag.lpData=malloc(pwfx->nAvgBytesPerSec); + frag.lpData=HeapAlloc(GetProcessHeap(), 0, pwfx->nAvgBytesPerSec); frag.dwBufferLength=pwfx->nAvgBytesPerSec; frag.dwBytesRecorded=0; frag.dwUser=0; @@ -291,7 +291,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, trace("Unable to play back the recorded sound\n"); } - free(frag.lpData); + HeapFree(GetProcessHeap(), 0, frag.lpData); CloseHandle(hevent); } @@ -371,7 +371,7 @@ static void wave_in_test_device(int device) "waveInMessage(%s): failed to get interface size: rc=%s\n", dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { - nameW = (WCHAR *)malloc(size); + nameW = HeapAlloc(GetProcessHeap(), 0, size); rc=waveInMessage((HWAVEIN)device, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)nameW, size); ok(rc==MMSYSERR_NOERROR,"waveInMessage(%s): failed to get interface " @@ -379,11 +379,11 @@ static void wave_in_test_device(int device) ok(lstrlenW(nameW)+1==size/sizeof(WCHAR), "got an incorrect size %d\n", size); if (rc==MMSYSERR_NOERROR) { - nameA = malloc(size/sizeof(WCHAR)); + nameA = HeapAlloc(GetProcessHeap(), 0, size/sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), nameA, size/sizeof(WCHAR), NULL, NULL); } - free(nameW); + HeapFree(GetProcessHeap(), 0, nameW); } else if (rc==MMSYSERR_NOTSUPPORTED) { nameA=strdup("not supported"); } @@ -394,7 +394,7 @@ static void wave_in_test_device(int device) trace(" channels=%d formats=%05x\n", capsA.wChannels,capsA.dwFormats); - free(nameA); + HeapFree(GetProcessHeap(), 0, nameA); for (f=0;f<NB_WIN_FORMATS;f++) { format.wFormatTag=WAVE_FORMAT_PCM; diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 84a19fc..93e406e 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -58,7 +58,7 @@ static char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) nb_samples=(int)(duration*wfx->nSamplesPerSec); *size=nb_samples*wfx->nBlockAlign; - b=buf=malloc(*size); + b=buf=HeapAlloc(GetProcessHeap(), 0, *size); for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { @@ -117,7 +117,7 @@ static char* wave_generate_silence(WAVEFORMATEX* wfx, double duration, DWORD* si nb_samples=(int)(duration*wfx->nSamplesPerSec); *size=nb_samples*wfx->nBlockAlign; - b=buf=malloc(*size); + b=buf=HeapAlloc(GetProcessHeap(), 0, *size); for (i=0;i<nb_samples;i++) { if (wfx->wBitsPerSample==8) { for (j = 0; j < wfx->nChannels; j++) @@ -656,7 +656,7 @@ static void wave_out_test_deviceOut(int device, double duration, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); - frags = malloc(headers * sizeof(WAVEHDR)); + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); if (sine) buffer=wave_generate_la(pwfx,duration / (loops + 1),&length); @@ -779,7 +779,7 @@ static void wave_out_test_deviceOut(int device, double duration, "waveOutUnprepareHeader(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); } - free(buffer); + HeapFree(GetProcessHeap(), 0, buffer); rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), @@ -791,7 +791,7 @@ EXIT: WaitForSingleObject(hevent,INFINITE); } CloseHandle(hevent); - free(frags); + HeapFree(GetProcessHeap(), 0, frags); } static void wave_out_test_device(int device) @@ -870,18 +870,18 @@ static void wave_out_test_device(int device) "waveOutMessage(%s): failed to get interface size, rc=%s\n", dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { - nameW = (WCHAR *)malloc(size); + nameW = HeapAlloc(GetProcessHeap(), 0, size); rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACE, (DWORD_PTR)nameW, size); ok(rc==MMSYSERR_NOERROR,"waveOutMessage(%s): failed to get interface " "name, rc=%s\n",dev_name(device),wave_out_error(rc)); ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size %d\n",size); if (rc==MMSYSERR_NOERROR) { - nameA = malloc(size/sizeof(WCHAR)); + nameA = HeapAlloc(GetProcessHeap(), 0, size/sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), nameA, size/sizeof(WCHAR), NULL, NULL); } - free(nameW); + HeapFree(GetProcessHeap(), 0, nameW); } else if (rc==MMSYSERR_NOTSUPPORTED) { nameA=strdup("not supported"); @@ -893,7 +893,7 @@ static void wave_out_test_device(int device) trace(" channels=%d formats=%05x support=%04x\n", capsA.wChannels,capsA.dwFormats,capsA.dwSupport); trace(" %s\n",wave_out_caps(capsA.dwSupport)); - free(nameA); + HeapFree(GetProcessHeap(), 0, nameA); if (winetest_interactive && (device != WAVE_MAPPER)) {

1 0

Michael Stefaniuc : winejack.drv: Fix missing unlock. Found by Smatch.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 98e30069033e13b94311f9537fc52f1673284650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e30069033e13b94311f9537… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 25 23:58:12 2007 +0200 winejack.drv: Fix missing unlock. Found by Smatch. --- dlls/winejack.drv/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index 7cba9a5..ae5d09c 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -1805,7 +1805,8 @@ int JACK_callback_wwi (nframes_t nframes, void *arg) #if JACK_CLOSE_HACK if(wwi->in_use == FALSE) { - /* do nothing if nothing is being recorded */ + /* do nothing if nothing is being recorded */ + LeaveCriticalSection(&wwi->access_crst); return 0; } #endif

1 0

Michael Stefaniuc : gdi32: Multi-character character constants aren' t portable as their behaviour is compiler dependent according to the C standard . Found by sparse.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 3f5fc520b587ce4cb8f8f95a1c18c385bfe8f2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5fc520b587ce4cb8f8f95a1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 25 23:34:34 2007 +0200 gdi32: Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard. Found by sparse. --- dlls/gdi32/freetype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 424fb3d..9842de9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -590,8 +590,9 @@ static char **expand_mac_font(const char *path) unsigned short *num_faces_ptr, num_faces, face; AsscEntry *assoc; Handle fond; + ResType fond_res = 0x464f4e44; /* 'FOND' */ - fond = Get1IndResource('FOND', idx); + fond = Get1IndResource(fond_res, idx); if(!fond) break; TRACE("got fond resource %d\n", idx); HLock(fond); @@ -605,6 +606,7 @@ static char **expand_mac_font(const char *path) for(face = 0; face < num_faces; face++, assoc++) { Handle sfnt; + ResType sfnt_res = 0x73666e74; /* 'sfnt' */ unsigned short size, font_id; char *output; @@ -617,7 +619,7 @@ static char **expand_mac_font(const char *path) } TRACE("trying to load sfnt id %04x\n", font_id); - sfnt = GetResource('sfnt', font_id); + sfnt = GetResource(sfnt_res, font_id); if(!sfnt) { TRACE("can't get sfnt resource %04x\n", font_id);

1 0

Michael Stefaniuc : ddraw: Fix missing unlock on an error path. Found by Smatch.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: d6c2e6f067d137fe0f59bd55b647d9677c5cb8b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c2e6f067d137fe0f59bd55b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 25 23:58:03 2007 +0200 ddraw: Fix missing unlock on an error path. Found by Smatch. --- dlls/ddraw/vertexbuffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 10b5fa4..209411b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -250,6 +250,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, if(hr != D3D_OK) { ERR("(%p) IWineD3DVertexBuffer::GetDesc failed with hr=%08x\n", This, hr); + LeaveCriticalSection(&ddraw_cs); return hr; } *Size = Desc.Size;

1 0

H. Verbeet : wined3d: Increase the sizes of texturing related arrays, in order to support vertex textures.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 5b7758f80cb75879e5bf54324b274702aa7a46d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7758f80cb75879e5bf54324… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 25 22:45:40 2007 +0200 wined3d: Increase the sizes of texturing related arrays, in order to support vertex textures. --- dlls/wined3d/device.c | 13 ++++++++----- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/state.c | 6 +++++- dlls/wined3d/stateblock.c | 32 ++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 36 +++++++++++++++++++----------------- 6 files changed, 52 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b7758f80cb75879e5bf5…

1 0

H. Verbeet : wined3d: Map vertex sampler numbers to the correct internal array indices for GetSamplerState and SetSamplerState .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: f89c2d96dbeb5ea74532e8f5a17ac225023c1a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89c2d96dbeb5ea74532e8f5a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 25 22:45:57 2007 +0200 wined3d: Map vertex sampler numbers to the correct internal array indices for GetSamplerState and SetSamplerState. --- dlls/wined3d/device.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a9c537..2fafca3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2878,7 +2878,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderState(IWineD3DDevice *iface, W static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - DWORD oldValue = This->stateBlock->samplerState[Sampler][Type]; + DWORD oldValue; + + TRACE("(%p) : Sampler %#x, Type %s (%#x), Value %#x\n", + This, Sampler, debug_d3dsamplerstate(Type), Type, Value); + + if (Sampler >= WINED3DVERTEXTEXTURESAMPLER0 && Sampler <= WINED3DVERTEXTEXTURESAMPLER3) { + Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); + } /** * SetSampler is designed to allow for more than the standard up to 8 textures @@ -2895,8 +2902,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, * Ok GForce say it's ok to use glTexParameter/glGetTexParameter(...). ******************/ - TRACE("(%p) : Sampler=%d, Type=%s(%d), Value=%d\n", This, Sampler, - debug_d3dsamplerstate(Type), Type, Value); + oldValue = This->stateBlock->samplerState[Sampler][Type]; This->updateStateBlock->samplerState[Sampler][Type] = Value; This->updateStateBlock->set.samplerState[Sampler][Type] = Value; This->updateStateBlock->changed.samplerState[Sampler][Type] = Value; @@ -2919,8 +2925,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, DWORD Sampler, WINED3DSAMPLERSTATETYPE Type, DWORD* Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + TRACE("(%p) : Sampler %#x, Type %s (%#x)\n", + This, Sampler, debug_d3dsamplerstate(Type), Type); + + if (Sampler >= WINED3DVERTEXTEXTURESAMPLER0 && Sampler <= WINED3DVERTEXTEXTURESAMPLER3) { + Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); + } + *Value = This->stateBlock->samplerState[Sampler][Type]; - TRACE("(%p) : Sampler %d Type %u Returning %d\n", This, Sampler, Type, *Value); + TRACE("(%p) : Returning %#x\n", This, *Value); return WINED3D_OK; }

1 0

H. Verbeet : wined3d: Map vertex sampler numbers to the correct internal array indices for GetTexture and SetTexture .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 3220ba45e83d460337252079e3a77ecae0432ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3220ba45e83d460337252079e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 25 22:46:01 2007 +0200 wined3d: Map vertex sampler numbers to the correct internal array indices for GetTexture and SetTexture. --- dlls/wined3d/device.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2fafca3..8f2905f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4037,19 +4037,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTextureStageState(IWineD3DDevice *if * Get / Set Texture *****/ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage, IWineD3DBaseTexture* pTexture) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DBaseTexture *oldTexture; + IWineD3DBaseTexture *oldTexture; - oldTexture = This->updateStateBlock->textures[Stage]; - TRACE("(%p) : Stage(%d), Texture (%p)\n", This, Stage, pTexture); + TRACE("(%p) : Stage %#x, Texture %p\n", This, Stage, pTexture); -#if 0 /* TODO: check so vertex textures */ - if (Stage >= D3DVERTEXTEXTURESAMPLER && Stage <= D3DVERTEXTEXTURESAMPLER3){ - This->updateStateBlock->vertexTextures[Stage - D3DVERTEXTEXTURESAMPLER] = pTexture; - return WINED3D_OK; + if (Stage >= WINED3DVERTEXTEXTURESAMPLER0 && Stage <= WINED3DVERTEXTEXTURESAMPLER3) { + Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); } -#endif + + oldTexture = This->updateStateBlock->textures[Stage]; if(pTexture != NULL) { /* SetTexture isn't allowed on textures in WINED3DPOOL_SCRATCH; @@ -4119,7 +4116,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD * Shouldn't happen as long as apps bind a texture only to one stage */ TRACE("Searcing for other sampler / stage id where the texture is bound to\n"); - for(i = 0; i < GL_LIMITS(sampler_stages); i++) { + for(i = 0; i < MAX_COMBINED_SAMPLERS; i++) { if(This->updateStateBlock->textures[i] == oldTexture) { old->baseTexture.sampler = i; break; @@ -4135,12 +4132,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD Stage, IWineD3DBaseTexture** ppTexture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : (%d /* Stage */,%p /* ppTexture */)\n", This, Stage, ppTexture); + + TRACE("(%p) : Stage %#x, ppTexture %p\n", This, Stage, ppTexture); + + if (Stage >= WINED3DVERTEXTEXTURESAMPLER0 && Stage <= WINED3DVERTEXTEXTURESAMPLER3) { + Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); + } *ppTexture=This->stateBlock->textures[Stage]; if (*ppTexture) IWineD3DBaseTexture_AddRef(*ppTexture); + TRACE("(%p) : Returning %p\n", This, *ppTexture); + return WINED3D_OK; }

1 0

H. Verbeet : wined3d: Add max_vertex_samplers and max_combined_samplers to WineD3D_GL_Info.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 9c44b67d289dfdc379d540fdcb2fb9d92692b255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c44b67d289dfdc379d540fdc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 25 22:45:28 2007 +0200 wined3d: Add max_vertex_samplers and max_combined_samplers to WineD3D_GL_Info. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/state.c | 2 +- include/wine/wined3d_gl.h | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5558d7f..f74d2f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -495,6 +495,8 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { gl_info->max_textures = 1; gl_info->max_texture_stages = 1; gl_info->max_fragment_samplers = 1; + gl_info->max_vertex_samplers = 0; + gl_info->max_combined_samplers = 0; gl_info->max_sampler_stages = 1; gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED; gl_info->ps_arb_max_temps = 0; @@ -657,6 +659,12 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { gl_max /= 4; TRACE_(d3d_caps)(" FOUND: ARB_vertex_shader (GLSL) support - max float vs constants=%u\n", gl_max); gl_info->vs_glsl_constantsF = gl_max; + glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + TRACE_(d3d_caps)(" FOUND: ARB_vertex_shader (GLSL) support - GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); + gl_info->max_vertex_samplers = gl_max; + glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + TRACE_(d3d_caps)(" FOUND: ARB_vertex_shader (GLSL) support - GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); + gl_info->max_combined_samplers = gl_max; } else if (strcmp(ThisExtn, "GL_ARB_vertex_blend") == 0) { glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Vertex Blend support GL_MAX_VERTEX_UNITS_ARB %d\n", gl_max); @@ -840,6 +848,8 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { * shaders), but 8 texture stages (register combiners). */ gl_info->max_sampler_stages = max(gl_info->max_fragment_samplers, gl_info->max_texture_stages); + if (!gl_info->max_combined_samplers) gl_info->max_combined_samplers = gl_info->max_fragment_samplers; + /* We can only use ORM_FBO when the hardware supports it. */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) { WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to PBuffer offscreen rendering mode.\n"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 396f89c..48874ff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2138,7 +2138,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (mapped_stage >= GL_LIMITS(fragment_samplers)) { + if (mapped_stage >= GL_LIMITS(combined_samplers)) { return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 0dcd184..1d69e59 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1962,6 +1962,8 @@ typedef struct _WineD3D_GL_Info { UINT max_textures; UINT max_texture_stages; UINT max_fragment_samplers; + UINT max_vertex_samplers; + UINT max_combined_samplers; UINT max_sampler_stages; UINT max_clipplanes; UINT max_texture_size;

1 0

James Hawkins : msi: Fetch the volume name when getting disk info.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 71d7da11707b5ccdb7aec9664c01aaa56c9e349f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d7da11707b5ccdb7aec9664… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jun 25 13:05:03 2007 -0700 msi: Fetch the volume name when getting disk info. --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 98f20d6..14fb83b 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -282,6 +282,7 @@ static UINT msi_media_get_disk_info( MSIPACKAGE *package, struct media_info *mi mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3)); mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); + mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); ptr = strrchrW(mi->source, '\\') + 1; lstrcpyW(ptr, mi->cabinet); @@ -310,6 +311,8 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) UINT rc; msi_free(mi->disk_prompt); + msi_free(mi->cabinet); + msi_free(mi->volume_label); mi->disk_id++; mi->is_continuous = TRUE;

1 0

H. Verbeet : wined3d: Rename max_samplers to max_fragment_samplers.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 3ad03206ab8a1a0440ce6d6ab8527ef2630a551d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad03206ab8a1a0440ce6d6ab… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 25 22:45:21 2007 +0200 wined3d: Rename max_samplers to max_fragment_samplers. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 4 ++-- include/wine/wined3d_gl.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index db26348..7be8b4a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1811,7 +1811,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR /* Initialize the texture unit mapping to a 1:1 mapping */ for(state = 0; state < MAX_SAMPLERS; state++) { - if (state < GL_LIMITS(samplers)) { + if (state < GL_LIMITS(fragment_samplers)) { This->texUnitMap[state] = state; This->rev_tex_unit_map[state] = state; } else { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 742e16b..5558d7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -494,7 +494,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { gl_info->max_buffers = 1; gl_info->max_textures = 1; gl_info->max_texture_stages = 1; - gl_info->max_samplers = 1; + gl_info->max_fragment_samplers = 1; gl_info->max_sampler_stages = 1; gl_info->ps_arb_version = PS_VERSION_NOT_SUPPORTED; gl_info->ps_arb_max_temps = 0; @@ -568,7 +568,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { gl_info->supported[ARB_FRAGMENT_PROGRAM] = TRUE; glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - GL_MAX_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); - gl_info->max_samplers = min(MAX_SAMPLERS, gl_max); + gl_info->max_fragment_samplers = min(MAX_SAMPLERS, gl_max); GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - max float constants=%u\n", gl_max); gl_info->ps_arb_constantsF = gl_max; @@ -596,7 +596,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { gl_info->supported[ARB_MULTITEXTURE] = TRUE; gl_info->max_textures = min(MAX_TEXTURES, gl_max); gl_info->max_texture_stages = min(MAX_TEXTURES, gl_max); - gl_info->max_samplers = max(gl_info->max_samplers, gl_max); + gl_info->max_fragment_samplers = max(gl_info->max_fragment_samplers, gl_max); } else if (strcmp(ThisExtn, "GL_ARB_texture_cube_map") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Texture Cube Map support\n"); gl_info->supported[ARB_TEXTURE_CUBE_MAP] = TRUE; @@ -838,7 +838,7 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info, Display* display) { /* In some cases the number of texture stages can be larger than the number * of samplers. The GF4 for example can use only 2 samplers (no fragment * shaders), but 8 texture stages (register combiners). */ - gl_info->max_sampler_stages = max(gl_info->max_samplers, gl_info->max_texture_stages); + gl_info->max_sampler_stages = max(gl_info->max_fragment_samplers, gl_info->max_texture_stages); /* We can only use ORM_FBO when the hardware supports it. */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 244316a..4ab7702 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -85,7 +85,7 @@ static void shader_glsl_load_psamplers( int i; char sampler_name[20]; - for (i=0; i< GL_LIMITS(samplers); ++i) { + for (i=0; i< GL_LIMITS(fragment_samplers); ++i) { if (stateBlock->textures[i] != NULL) { snprintf(sampler_name, sizeof(sampler_name), "Psampler%d", i); name_loc = GL_EXTCALL(glGetUniformLocationARB(programId, sampler_name)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e91441a..396f89c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1910,7 +1910,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if(mapped_stage >= GL_LIMITS(samplers)) { + if(mapped_stage >= GL_LIMITS(fragment_samplers)) { return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); @@ -2138,7 +2138,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - if (mapped_stage >= GL_LIMITS(samplers)) { + if (mapped_stage >= GL_LIMITS(fragment_samplers)) { return; } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 24f5faf..0dcd184 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1961,7 +1961,7 @@ typedef struct _WineD3D_GL_Info { UINT max_lights; UINT max_textures; UINT max_texture_stages; - UINT max_samplers; + UINT max_fragment_samplers; UINT max_sampler_stages; UINT max_clipplanes; UINT max_texture_size;

1 0