wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Dan Hipschman : widl: Fix incomplete struct/union typedef bug.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: 4e22899e1316e86e2fc812d2540c7aff04925044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e22899e1316e86e2fc812d25… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 7 17:43:58 2007 -0700 widl: Fix incomplete struct/union typedef bug. --- tools/widl/parser.y | 51 +++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.c | 4 +- tools/widl/widltypes.h | 2 + 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 00d3b4d..b5c1865 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -65,6 +65,17 @@ # endif #endif +typedef struct list typelist_t; +struct typenode { + type_t *type; + struct list entry; +}; + +typelist_t incomplete_types = LIST_INIT(incomplete_types); + +static void add_incomplete(type_t *t); +static void fix_incomplete(void); + static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_t *make_attr(enum attr_type type); @@ -263,7 +274,11 @@ static void check_arg(var_t *arg); %% -input: gbl_statements { write_proxies($1); write_client($1); write_server($1); } +input: gbl_statements { fix_incomplete(); + write_proxies($1); + write_client($1); + write_server($1); + } ; gbl_statements: { $$ = NULL; } @@ -1475,6 +1490,38 @@ static type_t *reg_type(type_t *type, const char *name, int t) return type; } +static int is_incomplete(const type_t *t) +{ + return !t->defined && (is_struct(t->type) || is_union(t->type)); +} + +static void add_incomplete(type_t *t) +{ + struct typenode *tn = xmalloc(sizeof *tn); + tn->type = t; + list_add_tail(&incomplete_types, &tn->entry); +} + +static void fix_type(type_t *t) +{ + if (t->kind == TKIND_ALIAS && is_incomplete(t)) { + type_t *ot = t->orig; + fix_type(ot); + t->fields = ot->fields; + t->defined = ot->defined; + } +} + +static void fix_incomplete(void) +{ + struct typenode *tn, *next; + + LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { + fix_type(tn->type); + free(tn); + } +} + static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *attrs) { type_t *ptr = type; @@ -1544,6 +1591,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a yyerror("'%s': [string] attribute applied to non-pointer type", cur->name); + if (is_incomplete(cur)) + add_incomplete(cur); reg_type(cur, cur->name, 0); } } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7c0921e..8f4c926 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -109,7 +109,7 @@ const char *string_of_type(unsigned char type) } } -static int is_struct(unsigned char type) +int is_struct(unsigned char type) { switch (type) { @@ -125,7 +125,7 @@ static int is_struct(unsigned char type) } } -static int is_union(unsigned char type) +int is_union(unsigned char type) { switch (type) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index fb8e5fb..0c8acad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -305,5 +305,7 @@ int is_ptr(const type_t *t); int is_array(const type_t *t); int is_var_ptr(const var_t *v); int cant_be_null(const var_t *v); +int is_struct(unsigned char tc); +int is_union(unsigned char tc); #endif

1 0

Dan Hipschman : widl: Check for NULL in set_tfswrite.
by Alexandre Julliard 08 Jun '07

08 Jun '07

Module: wine Branch: master Commit: b186c4dd0e7bcb92f147fc00e473e495deaef62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b186c4dd0e7bcb92f147fc00e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 7 17:43:06 2007 -0700 widl: Check for NULL in set_tfswrite. --- tools/widl/typegen.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2327e21..7c0921e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1457,7 +1457,7 @@ static void set_tfswrite(type_t *type, int val) if (type->kind == TKIND_ALIAS) type = type->orig; - else if (is_ptr(type)) + else if (is_ptr(type) || is_array(type)) type = type->ref; else { @@ -1465,7 +1465,8 @@ static void set_tfswrite(type_t *type, int val) { var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields, var_t, entry ) - set_tfswrite(v->type, val); + if (v->type) + set_tfswrite(v->type, val); } return;

1 0

appdb/cron cleanup.php
by WineHQ 08 Jun '07

08 Jun '07

ChangeSet ID: 31163 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/07 19:42:06 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Activte the deletion portion of the 'screenshots with missing files' cleanup Patch: http://cvs.winehq.org/patch.py?id=31163 Old revision New revision Changes Path 1.34 1.35 +6 -8 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.34 appdb/cron/cleanup.php:1.35 --- appdb/cron/cleanup.php:1.34 8 Jun 2007 0:42: 6 -0000 +++ appdb/cron/cleanup.php 8 Jun 2007 0:42: 6 -0000 @@ -283,8 +283,7 @@ function removeScreenshotsWithMissingFil // build the email to admins about what we are doing $sMsg = "Found ".count($aMissingScreenshotIds)." screenshots with missing files.\r\n"; - //FIXME: uncomment the below line when we uncomment the below lines in the script - // $sMsg.= "Deleting these screenshots.\r\n"; + $sMsg.= "Deleting these screenshots.\r\n"; $sSubject = "Screenshots deleted\r\n"; @@ -292,12 +291,11 @@ function removeScreenshotsWithMissingFil if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); - //FIXME: activate this after we see the results from the nightly cron script email // remove the screenshots with missing files - // foreach($aMissingScreenshotIds as $iScreenshotId) - // { - // $oScreenshot = new Screenshot($iScreenshotId); - // $oScreenshot->delete(true); // delete the screenshot silently - // } + foreach($aMissingScreenshotIds as $iScreenshotId) + { + $oScreenshot = new Screenshot($iScreenshotId); + $oScreenshot->delete(true); // delete the screenshot silently + } } ?>

1 0

Christian Costa : winealsa.drv: Use correct tests for synthesizer/ port enumeration order.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 11b53529ee23b8b0606ef0fe1390b4dff8cfd3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b53529ee23b8b0606ef0fe1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jun 7 21:53:08 2007 +0200 winealsa.drv: Use correct tests for synthesizer/port enumeration order. --- dlls/winealsa.drv/midi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index eecb406..4f6d77b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1256,7 +1256,7 @@ LONG ALSA_MidiInit(void) while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { int cap = snd_seq_port_info_get_capability(pinfo); int type = snd_seq_port_info_get_type(pinfo); - if (type != SND_SEQ_PORT_TYPE_MIDI_GENERIC) + if (!(type & SND_SEQ_PORT_TYPE_PORT)) ALSA_AddMidiPort(cinfo, pinfo, cap, type); } } @@ -1269,7 +1269,7 @@ LONG ALSA_MidiInit(void) while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { int cap = snd_seq_port_info_get_capability(pinfo); int type = snd_seq_port_info_get_type(pinfo); - if (type == SND_SEQ_PORT_TYPE_MIDI_GENERIC) + if (type & SND_SEQ_PORT_TYPE_PORT) ALSA_AddMidiPort(cinfo, pinfo, cap, type); } }

1 0

Juan Lang : comdlg32: Check file dialog's FOIShellView before accessing it.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: e14b6dcf7c02b79344476023daa4555e497cfc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e14b6dcf7c02b79344476023d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 7 12:28:32 2007 -0700 comdlg32: Check file dialog's FOIShellView before accessing it. --- dlls/comdlg32/filedlg.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5409b91..11c4502 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2021,7 +2021,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else if( nOpenAction == ONOPEN_SEARCH ) { - IShellView_Refresh(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + IShellView_Refresh(fodInfos->Shell.FOIShellView); } COMDLG32_SHFree(pidlCurrent); SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1); @@ -2322,8 +2323,11 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent); /* clean Shell interfaces */ - IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); - IShellView_Release(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + { + IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); + IShellView_Release(fodInfos->Shell.FOIShellView); + } IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) @@ -2483,7 +2487,8 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) } /* Refresh the actual view to display the included items*/ - IShellView_Refresh(fodInfos->Shell.FOIShellView); + if (fodInfos->Shell.FOIShellView) + IShellView_Refresh(fodInfos->Shell.FOIShellView); } } return FALSE;

1 0

Juan Lang : comdlg32: Initialize file dialog controls before creating dialog.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 13f18ee7593364a2a685fed2bdfa814431906f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f18ee7593364a2a685fed2b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Jun 7 12:27:11 2007 -0700 comdlg32: Initialize file dialog controls before creating dialog. --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f63e64f..5409b91 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1037,11 +1037,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l so it will be easily accessible through a GetPropA(...) */ SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos); + FILEDLG95_InitControls(hwnd); + fodInfos->DlgInfos.hwndCustomDlg = CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd); - FILEDLG95_InitControls(hwnd); - if (fodInfos->DlgInfos.hwndCustomDlg) { RECT rc;

1 0

Aric Stewart : ole32: Implementation of state bits for IStorage.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: f8c8355d8552634419e8301ac32411281bfc3bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c8355d8552634419e8301ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 7 13:17:56 2007 -0500 ole32: Implementation of state bits for IStorage. --- dlls/ole32/storage32.c | 6 ++++-- dlls/ole32/storage32.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 623516e..bda5bdc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -753,6 +753,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( grfStatFlag); pstatstg->grfMode = This->openFlags; + pstatstg->grfStateBits = This->stateBits; res = S_OK; goto end; @@ -2352,8 +2353,9 @@ static HRESULT WINAPI StorageImpl_SetStateBits( DWORD grfStateBits,/* [in] */ DWORD grfMask) /* [in] */ { - FIXME("not implemented!\n"); - return E_NOTIMPL; + StorageImpl* const This = (StorageImpl*)iface; + This->base.stateBits = (This->base.stateBits & ~grfMask) | (grfStateBits & grfMask); + return S_OK; } /* diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index ffad550..6892996 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -245,6 +245,11 @@ struct StorageBaseImpl * flags that this storage was opened or created with */ DWORD openFlags; + + /* + * State bits appear to only be preserved while running. No in the stream + */ + DWORD stateBits; }; /****************************************************************************

1 0

Ulrich Czekalla : ole32: Remove stack-based string buffer inFileMonikerImpl_DecomposePath.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: c2fdea600ab19822ecd23441838900fc6699c2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2fdea600ab19822ecd234418… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Thu Jun 7 13:43:41 2007 -0400 ole32: Remove stack-based string buffer inFileMonikerImpl_DecomposePath. --- dlls/ole32/filemoniker.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 7578836..4ef7d59 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1011,19 +1011,27 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) { static const WCHAR bSlash[] = {'\\',0}; - WCHAR word[MAX_PATH]; - int i=0,j,tabIndex=0; + LPOLESTR word; + int i=0,j,tabIndex=0, ret=0; LPOLESTR *strgtable ; int len=lstrlenW(str); TRACE("%s, %p\n", debugstr_w(str), *stringTable); - strgtable =CoTaskMemAlloc(len*sizeof(LPOLESTR)); + strgtable = CoTaskMemAlloc(len*sizeof(WCHAR)); if (strgtable==NULL) return E_OUTOFMEMORY; + word = CoTaskMemAlloc((len + 1)*sizeof(WCHAR)); + + if (word==NULL) + { + ret = E_OUTOFMEMORY; + goto lend; + } + while(str[i]!=0){ if(str[i]==bSlash[0]){ @@ -1031,7 +1039,10 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) strgtable[tabIndex]=CoTaskMemAlloc(2*sizeof(WCHAR)); if (strgtable[tabIndex]==NULL) - return E_OUTOFMEMORY; + { + ret = E_OUTOFMEMORY; + goto lend; + } strcpyW(strgtable[tabIndex++],bSlash); @@ -1048,7 +1059,10 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) strgtable[tabIndex]=CoTaskMemAlloc(sizeof(WCHAR)*(j+1)); if (strgtable[tabIndex]==NULL) - return E_OUTOFMEMORY; + { + ret = E_OUTOFMEMORY; + goto lend; + } strcpyW(strgtable[tabIndex++],word); } @@ -1057,7 +1071,21 @@ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) *stringTable=strgtable; - return tabIndex; + ret = tabIndex; + +lend: + if (ret < 0) + { + for (i = 0; i < tabIndex; i++) + CoTaskMemFree(strgtable[i]); + + CoTaskMemFree(strgtable); + } + + if (word) + CoTaskMemFree(word); + + return ret; } /******************************************************************************

1 0

H. Verbeet : wined3d: Fix GLSL definitions.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 1d6d831099148f0d42cb876ab5f7c1ce83de91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6d831099148f0d42cb876ab… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 7 18:57:19 2007 +0200 wined3d: Fix GLSL definitions. --- include/wine/wined3d_gl.h | 58 +++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 25 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index bcaf666..1fbbfe8 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -784,6 +784,9 @@ typedef void (APIENTRY * PGLFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei st #define GL_ARB_shader_objects 1 typedef char GLcharARB; typedef unsigned int GLhandleARB; +#define GL_PROGRAM_OBJECT_ARB 0x8B40 +#define GL_OBJECT_TYPE_ARB 0x8B4E +#define GL_OBJECT_SUBTYPE_ARB 0x8B4F #define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 #define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 #define GL_OBJECT_LINK_STATUS_ARB 0x8B82 @@ -793,6 +796,28 @@ typedef unsigned int GLhandleARB; #define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 #define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 #define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 +#define GL_SHADER_OBJECT_ARB 0x8B48 +#define GL_FLOAT_VEC2_ARB 0x8B50 +#define GL_FLOAT_VEC3_ARB 0x8B51 +#define GL_FLOAT_VEC4_ARB 0x8B52 +#define GL_INT_VEC2_ARB 0x8B53 +#define GL_INT_VEC3_ARB 0x8B54 +#define GL_INT_VEC4_ARB 0x8B55 +#define GL_BOOL_ARB 0x8B56 +#define GL_BOOL_VEC2_ARB 0x8B57 +#define GL_BOOL_VEC3_ARB 0x8B58 +#define GL_BOOL_VEC4_ARB 0x8B59 +#define GL_FLOAT_MAT2_ARB 0x8B5A +#define GL_FLOAT_MAT3_ARB 0x8B5B +#define GL_FLOAT_MAT4_ARB 0x8B5C +#define GL_SAMPLER_1D_ARB 0x8B5D +#define GL_SAMPLER_2D_ARB 0x8B5E +#define GL_SAMPLER_3D_ARB 0x8B5F +#define GL_SAMPLER_CUBE_ARB 0x8B60 +#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 +#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 +#define GL_SAMPLER_2D_RECT_ARB 0x8B63 +#define GL_SAMPELR_2D_RECT_SHADOW_ARB 0x8B64 #endif #ifndef GL_ARB_shading_language_100 #define GL_ARB_shading_language_100 1 @@ -802,34 +827,17 @@ typedef unsigned int GLhandleARB; #define GL_ARB_fragment_shader 1 #define GL_FRAGMENT_SHADER_ARB 0x8B30 #define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B #endif #ifndef GL_ARB_vertex_shader #define GL_ARB_vertex_shader 1 -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 +#define GL_VERTEX_SHADER_ARB 0x8B31 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A +#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D +#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 +#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A #endif typedef void (APIENTRY * WINED3D_PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); typedef void (APIENTRY * WINED3D_PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);

1 0

H. Verbeet : wined3d: Turn off filtering for FBO attachments, update the texture's states array.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 473e914c29ee1196f4f7ab024acb3f61d2f843c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=473e914c29ee1196f4f7ab024… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 7 18:57:15 2007 +0200 wined3d: Turn off filtering for FBO attachments, update the texture's states array. --- dlls/wined3d/device.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 769e188..3ede720 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5169,6 +5169,7 @@ static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + IWineD3DBaseTextureImpl *texture_impl; GLenum texttarget, target; GLint old_binding; @@ -5178,10 +5179,21 @@ static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWOR IWineD3DSurface_PreLoad(surface); - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glBindTexture(target, old_binding); + /* Update base texture states array */ + if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + if (texture_impl->baseTexture.bindCount) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); + } + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, surface_impl->glDescription.textureName, 0)); checkGLcall("attach_surface_fbo"); @@ -5393,6 +5405,7 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_stencil_impl->current_renderbuffer->id)); checkGLcall("glFramebufferRenderbufferEXT()"); } else { + IWineD3DBaseTextureImpl *texture_impl; GLenum texttarget, target; GLint old_binding = 0; @@ -5407,6 +5420,17 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); glBindTexture(target, old_binding); + /* Update base texture states array */ + if (SUCCEEDED(IWineD3DSurface_GetContainer(depth_stencil, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + texture_impl->baseTexture.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture_impl->baseTexture.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + if (texture_impl->baseTexture.bindCount) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(texture_impl->baseTexture.sampler)); + } + + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); + } + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, texttarget, depth_stencil_impl->glDescription.textureName, 0)); checkGLcall("glFramebufferTexture2DEXT()"); }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
86
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 June 2007