wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Michael Stefaniuc : dmscript: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 6c1e349b6ea4d4171bec182842fb0f07e1336ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1e349b6ea4d4171bec18284… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:59:11 2011 +0200 dmscript: Merge the IClassFactory implementations. --- dlls/dmscript/dmscript_main.c | 557 +++++------------------------------------ 1 files changed, 69 insertions(+), 488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c1e349b6ea4d4171bec1…

1 0

Michael Stefaniuc : dmsynth: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 4afd3e46fcbbccb8ee575f41fe4772b38d0270ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afd3e46fcbbccb8ee575f41f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:57:55 2011 +0200 dmsynth: Merge the IClassFactory implementations. --- dlls/dmsynth/dmsynth_main.c | 133 ++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 77 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 0915d50..87cc3c7 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -31,107 +31,86 @@ static HINSTANCE instance; LONG DMSYNTH_refCount = 0; typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); } IClassFactoryImpl; /****************************************************************** - * DirectMusicSynth ClassFactory + * IClassFactory implementation */ -static HRESULT WINAPI SynthCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); - - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; -} - -static ULONG WINAPI SynthCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} - -static ULONG WINAPI SynthCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); - - return 1; /* non-heap based object */ +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); } -static HRESULT WINAPI SynthCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthImpl (riid, ppobj, pOuter); +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid)) + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + else if (IsEqualGUID(&IID_IClassFactory, riid)) + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + else { + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + *ppv = iface; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); - - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + DMSYNTH_LockModule(); - return S_OK; + return 2; /* non-heap based object */ } -static const IClassFactoryVtbl SynthCF_Vtbl = { - SynthCF_QueryInterface, - SynthCF_AddRef, - SynthCF_Release, - SynthCF_CreateInstance, - SynthCF_LockServer -}; - -static IClassFactoryImpl Synth_CF = {&SynthCF_Vtbl}; - -/****************************************************************** - * DirectMusicSynthSink ClassFactory - */ -static HRESULT WINAPI SynthSinkCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - FIXME("- no interface IID: %s\n", debugstr_guid(riid)); +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + DMSYNTH_UnlockModule(); - if (ppobj == NULL) return E_POINTER; - - return E_NOINTERFACE; + return 1; /* non-heap based object */ } -static ULONG WINAPI SynthSinkCF_AddRef(LPCLASSFACTORY iface) { - DMSYNTH_LockModule(); - - return 2; /* non-heap based object */ -} +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); -static ULONG WINAPI SynthSinkCF_Release(LPCLASSFACTORY iface) { - DMSYNTH_UnlockModule(); + TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return 1; /* non-heap based object */ + return This->fnCreateInstance(riid, ppv, pUnkOuter); } -static HRESULT WINAPI SynthSinkCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicSynthSinkImpl (riid, ppobj, pOuter); -} +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("(%d)\n", dolock); -static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - TRACE("(%d)\n", dolock); + if (dolock) + DMSYNTH_LockModule(); + else + DMSYNTH_UnlockModule(); - if (dolock) - DMSYNTH_LockModule(); - else - DMSYNTH_UnlockModule(); - - return S_OK; + return S_OK; } -static const IClassFactoryVtbl SynthSinkCF_Vtbl = { - SynthSinkCF_QueryInterface, - SynthSinkCF_AddRef, - SynthSinkCF_Release, - SynthSinkCF_CreateInstance, - SynthSinkCF_LockServer +static const IClassFactoryVtbl classfactory_vtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer }; -static IClassFactoryImpl SynthSink_CF = {&SynthSinkCF_Vtbl}; - +static IClassFactoryImpl Synth_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicSynthImpl}; +static IClassFactoryImpl SynthSink_CF = {{&classfactory_vtbl}, + DMUSIC_CreateDirectMusicSynthSinkImpl}; + /****************************************************************** * DllMain *

1 0

Michael Stefaniuc : dmcompos: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a0e46698adf8263c771b646924622f555dcb5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e46698adf8263c771b64692… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:55:51 2011 +0200 dmcompos: Merge the IClassFactory implementations. --- dlls/dmcompos/dmcompos_main.c | 286 +++++++++-------------------------------- 1 files changed, 61 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0e46698adf8263c771b6…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 35979eb2314a2454fcc4f245f2fe72f7cde1d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35979eb2314a2454fcc4f245f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 28 19:22:14 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index ba5a4f8..41479f1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-13 22:17+0300\n" +"PO-Revision-Date: 2011-07-28 19:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -171,7 +171,6 @@ msgid "System Path" msgstr "Sistemos kelias" #: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103 -#, fuzzy msgctxt "display name" msgid "Desktop" msgstr "Darbalaukis" @@ -6374,7 +6373,6 @@ msgid "Properties" msgstr "Savybės" #: shell32.rc:82 -#, fuzzy msgctxt "recycle bin" msgid "&Restore" msgstr "&Atkurti" @@ -6509,7 +6507,6 @@ msgid "My Videos" msgstr "Vaizdai" #: shell32.rc:207 -#, fuzzy msgctxt "directory" msgid "Desktop" msgstr "Darbalaukis" @@ -6861,7 +6858,6 @@ msgid " sec" msgstr " sek" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 -#, fuzzy msgctxt "window" msgid "&Restore" msgstr "&Atkurti" @@ -8209,6 +8205,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL komandų faile baigia aplinkos pakeitimų lokalizavimą,\n" +"kuris buvo padarytas ankstesnio SETLOCAL.\n" #: cmd.rc:218 msgid "" @@ -8219,6 +8217,11 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL pradeda aplinkos pakeitimų lokalizavimą komandų faile.\n" +"\n" +"Aplinkos pakeitimai padaryti po SETLOCAL yra lokalūs komandų faile ir yra\n" +"išlaikomi iki kol sutinkamas kitas ENDLOCAL (arba failo pabaiga, kas\n" +"pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" #: cmd.rc:221 msgid "" @@ -8257,7 +8260,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8305,6 +8307,7 @@ msgstr "" "DEL (ERASE)\tŠalinti failą ar failų aibę\n" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" +"ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" @@ -8316,6 +8319,7 @@ msgstr "" "REN (RENAME)\tPervadinti failą\n" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" +"SETLOCAL\tPradeda aplinkos pakeitimų lokalizavimą komandų faile\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n"

1 0

Henri Verbeet : wined3d: Complain about users disabling GLSL.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 64f71fda6d3f3ec1dddf4cbeecaeaad63b3c893e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f71fda6d3f3ec1dddf4cbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:55 2011 +0200 wined3d: Complain about users disabling GLSL. --- dlls/wined3d/wined3d_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5976c83..7a0d4b6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -28,6 +28,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc { @@ -238,6 +239,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { if (!strcmp(buffer,"disabled")) { + ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled\n"); wined3d_settings.glslRequested = FALSE; }

1 0

Henri Verbeet : wined3d: wined3d_device_evict_managed_resources() doesn' t need a return value.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 2256a7e804b1767ea827f6c908c404c95e1810e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2256a7e804b1767ea827f6c90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:54 2011 +0200 wined3d: wined3d_device_evict_managed_resources() doesn't need a return value. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5c4568d..e93976e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -361,16 +361,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D DWORD Bytes) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, byte_count %u.\n", iface, Bytes); if (Bytes) FIXME("Byte count ignored.\n"); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 74d8383..2456e16 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -304,15 +304,14 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(IDirect3DDevice9E static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(IDirect3DDevice9Ex *iface) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_evict_managed_resources(This->wined3d_device); + wined3d_device_evict_managed_resources(This->wined3d_device); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 40d27ed..70e8895 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5158,15 +5158,15 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) { IDirectDrawImpl *This = impl_from_IDirect3D7(iface); - HRESULT hr; + TRACE("iface %p!\n", iface); EnterCriticalSection(&ddraw_cs); - if (!This->d3d_initialized) hr = D3D_OK; - else hr = wined3d_device_evict_managed_resources(This->wined3d_device); + if (This->d3d_initialized) + wined3d_device_evict_managed_resources(This->wined3d_device); LeaveCriticalSection(&ddraw_cs); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16327e4..84c7789 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5386,7 +5386,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) return oldVisible; } -HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) +void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; @@ -5405,8 +5405,6 @@ HRESULT CDECL wined3d_device_evict_managed_resources(struct wined3d_device *devi /* Invalidate stream sources, the buffer(s) may have been evicted. */ device_invalidate_state(device, STATE_STREAMSRC); - - return WINED3D_OK; } static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0a09ec6..bfc1b39 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2204,7 +2204,7 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN const float *num_segs, const WINED3DTRIPATCH_INFO *tri_patch_info); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); -HRESULT __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); +void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer);

1 0

Henri Verbeet : wined3d: Don' t hide GL function pointer typedefs behind extension defines.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 3d7c596cdc90fd01976844e38aa1de94ce6c9716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7c596cdc90fd01976844e38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:53 2011 +0200 wined3d: Don't hide GL function pointer typedefs behind extension defines. These are specific to wined3d. --- dlls/wined3d/wined3d_gl.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 24c366e..5088782 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1892,9 +1892,9 @@ typedef void (WINE_GLAPI *PGLFNFINISHOBJECTAPPLEPROC)(GLenum, GLuint); #define GL_APPLE_flush_buffer_range 1 #define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8a12 #define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8a13 +#endif typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE)(GLenum target, GLenum pname, GLint param); typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_APPLE_flush_render */ typedef void (WINE_GLAPI *PGLFNFLUSHRENDERAPPLEPROC)(void); @@ -1969,15 +1969,15 @@ typedef void (WINE_GLAPI *PGLFNDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs /* GL_ARB_draw_elements_base_vertex */ #ifndef GL_ARB_draw_elements_base_vertex #define GL_ARB_draw_elements_base_vertex 1 +#endif typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, - GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); + GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, - GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); + GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); typedef void (WINE_GLAPI *PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, GLint *basevertex); -#endif + const GLvoid **indices, GLsizei primcount, GLint *basevertex); /* GL_ARB_fragment_program */ #ifndef GL_ARB_fragment_program @@ -3083,11 +3083,11 @@ typedef void (WINE_GLAPI *PGLFNGLGENERATEMIPMAPEXTPROC)(GLenum target); /* GL_EXT_gpu_program_parameters */ #ifndef GL_EXT_gpu_program_parameters #define GL_EXT_gpu_program_parameters 1 +#endif typedef void (WINE_GLAPI *PGLFNPROGRAMENVPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); typedef void (WINE_GLAPI *PGLFNPROGRAMLOCALPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const float *params); -#endif /* GL_EXT_gpu_shader4 */ #ifndef GL_EXT_gpu_shader4

1 0

Henri Verbeet : wined3d: Recognize some more AMD cards.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 7bc003287806ad9509162c444493e2728432fb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc003287806ad9509162c444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:52 2011 +0200 wined3d: Recognize some more AMD cards. --- dlls/wined3d/directx.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1430444..87f2606 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1175,7 +1175,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, /* Intel cards */ @@ -1845,7 +1847,9 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info /* Northern Islands */ {"CAYMAN", CARD_AMD_RADEON_HD6900}, {"BARTS", CARD_AMD_RADEON_HD6800}, - {"PALM", CARD_AMD_RADEON_HD6310}, + {"TURKS", CARD_AMD_RADEON_HD6600}, + {"CAICOS", CARD_AMD_RADEON_HD6400}, + {"PALM", CARD_AMD_RADEON_HD6300}, /* Evergreen */ {"HEMLOCK", CARD_AMD_RADEON_HD5900}, {"CYPRESS", CARD_AMD_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0bbe9d1..f4e3f3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1338,7 +1338,9 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD5850 = 0x6898, CARD_AMD_RADEON_HD5870 = 0x6899, CARD_AMD_RADEON_HD5900 = 0x689c, - CARD_AMD_RADEON_HD6310 = 0x9803, + CARD_AMD_RADEON_HD6300 = 0x9803, + CARD_AMD_RADEON_HD6400 = 0x6770, + CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6800 = 0x6739, CARD_AMD_RADEON_HD6900 = 0x6719,

1 0

Henri Verbeet : wined3d: Only invalidate state for the current context in wined3d_buffer_unmap().
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: b06e32184bbe7c9a3f8500eb9a17199a933457ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e32184bbe7c9a3f8500eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:51 2011 +0200 wined3d: Only invalidate state for the current context in wined3d_buffer_unmap(). --- dlls/wined3d/buffer.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b20d87..ae04138 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1136,12 +1136,13 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - context = context_acquire(device, NULL); gl_info = context->gl_info; + ENTER_GL(); + + if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(buffer->buffer_type_hint, buffer->buffer_object)); if (gl_info->supported[ARB_MAP_BUFFER_RANGE])

1 0

Frédéric Delanoy : tools: Assorted spelling fixes .
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 701aabb14148d703bd7345c5f8027e04626d0402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701aabb14148d703bd7345c5f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 28 21:51:20 2011 +0200 tools: Assorted spelling fixes. --- tools/sfnt2fnt.c | 2 +- tools/winegcc/winegcc.c | 2 +- tools/wmc/utils.c | 2 +- tools/wmc/write.c | 2 +- tools/wrc/translation.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index f58c40b..d83d2be 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -579,7 +579,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, else left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; - /* On the last non-trival output byte (x == x_end) have we got one or two input bytes */ + /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) right_byte = 0; else diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9e75509..284223e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1252,7 +1252,7 @@ int main(int argc, char **argv) { if (argv[i][0] == '-') /* option */ { - /* determine if tihs switch is followed by a separate argument */ + /* determine if this switch is followed by a separate argument */ next_is_arg = 0; option_arg = 0; switch(argv[i][1]) diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 6f26da3..276eeb4 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -219,7 +219,7 @@ int unistricmp(const WCHAR *s1, const WCHAR *s2) { int i; int once = 0; - static const char warn[] = "Don't know the uppercase equivalent of non acsii characters;" + static const char warn[] = "Don't know the uppercase equivalent of non ascii characters;" "comparison might yield wrong results"; while(*s1 && *s2) { diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 0fc38ad..cf170d4 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -231,7 +231,7 @@ void write_h_file(const char *fname) if(!once) { /* - * Search for an english text. + * Search for an English text. * If not found, then use the first in the list */ once++; diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 20e8346..6cfe07a 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -983,7 +983,7 @@ static resource_t *find_main(int type, name_id_t *id, resource_lang_node_t *lang if (neutral != NULL && (en != NULL || en_US != NULL)) { - fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translarion\n", + fprintf(stderr, "INFO: Resource %04x/%s has both NEUTRAL and MASTER language translation\n", type, get_nameid_str(id)); }

1 0

← Newer
1
2
3
4
5
6
7
...
84
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 July 2011