July 2008 - Wine-commits - list.winehq.org

Nikolay Sivov : gdiplus: Semi-stub for GdipCreateLineBrushFromRectWithAngle .
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 3e59f9e28377537bac1e8efb6392b941e67f9471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e59f9e28377537bac1e8efb6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 9 01:45:07 2008 +0400 gdiplus: Semi-stub for GdipCreateLineBrushFromRectWithAngle. --- dlls/gdiplus/brush.c | 19 +++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 4 ++-- include/gdiplusflat.h | 5 +++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d128f20..ba7663e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -180,6 +180,25 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, return GdipCreateLineBrushFromRect(&rectF, startcolor, endcolor, mode, wrap, line); } +/* FIXME: angle value completely ignored. Don't know how to use it since native + always set Brush rectangle to rect (independetly of this angle). + Maybe it's used only on drawing. */ +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect, + ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, + GpLineGradient **line) +{ + return GdipCreateLineBrushFromRect(rect, startcolor, endcolor, LinearGradientModeForwardDiagonal, + wrap, line); +} + +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect, + ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, + GpLineGradient **line) +{ + return GdipCreateLineBrushFromRectI(rect, startcolor, endcolor, LinearGradientModeForwardDiagonal, + wrap, line); +} + GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, INT count, GpWrapMode wrap, GpPathGradient **grad) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f62ccaa..a1c4849 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -101,8 +101,8 @@ @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) @ stdcall GdipCreateLineBrushFromRect(ptr long long long long ptr) @ stdcall GdipCreateLineBrushFromRectI(ptr long long long long ptr) -@ stub GdipCreateLineBrushFromRectWithAngle -@ stub GdipCreateLineBrushFromRectWithAngleI +@ stdcall GdipCreateLineBrushFromRectWithAngle(ptr long long long long long ptr) +@ stdcall GdipCreateLineBrushFromRectWithAngleI(ptr long long long long long ptr) @ stdcall GdipCreateLineBrushI(ptr ptr long long long ptr) @ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stdcall GdipCreateMatrix3(ptr ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1cc90c5..3deca53 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -69,6 +69,11 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRect(GDIPCONST GpRectF*,ARGB,ARGB, LinearGradientMode,GpWrapMode,GpLineGradient**); GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect*,ARGB,ARGB, LinearGradientMode,GpWrapMode,GpLineGradient**); +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF*, + ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**); +GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect*, + ARGB,ARGB,REAL,BOOL,GpWrapMode,GpLineGradient**); + GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE,BOOL,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE,BOOL, GDIPCONST WmfPlaceableFileHeader*,GpMetafile**);

1 0

Alexander Dorofeyev : quartz/tests: Add test for filter priority in IFilterGraph2_Render.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 236451443146ebfb131a16dc8e0e5d3239a2681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=236451443146ebfb131a16dc8… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jul 8 23:52:37 2008 +0300 quartz/tests: Add test for filter priority in IFilterGraph2_Render. --- dlls/quartz/tests/filtergraph.c | 1520 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 1519 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=236451443146ebfb131a1…

1 0

John Klehm : dsound: Accept DSERR_INVALIDCALL for CreateSoundBuffer failure .
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 7f8dfe98263e9cdaf1dffc50dd3f7a03dd4b98b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8dfe98263e9cdaf1dffc50d… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Tue Jul 8 13:48:44 2008 -0500 dsound: Accept DSERR_INVALIDCALL for CreateSoundBuffer failure. --- dlls/dsound/tests/dsound.c | 9 +++++---- dlls/dsound/tests/dsound8.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 394b798..14a6a77 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -716,9 +716,10 @@ static HRESULT test_secondary(LPGUID lpGuid) if (gotdx8 || wfx.wBitsPerSample <= 16) { if (wfx.wBitsPerSample > 16) - ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %08x %p\n", - rc, secondary); + ok((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL) && + !secondary, "IDirectSound_CreateSoundBuffer() " + "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " + "and NULL, returned: %08x %p\n", rc, secondary); else ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); @@ -767,7 +768,7 @@ static HRESULT test_secondary(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DSERR_INVALIDPARAM && !secondary, + ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 51a4ca6..e45f289 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -723,9 +723,10 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); if (wfx.wBitsPerSample != 8 && wfx.wBitsPerSample != 16) - ok(rc == DSERR_CONTROLUNAVAIL && !secondary, "IDirectSound_CreateSoundBuffer() " - "should have returned DSERR_CONTROLUNAVAIL and NULL, returned: %08x %p\n", - rc, secondary); + ok((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL) && + !secondary, "IDirectSound_CreateSoundBuffer() " + "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " + "and NULL, returned: %08x %p\n", rc, secondary); else ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary " @@ -761,7 +762,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); wfxe.SubFormat = GUID_NULL; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - ok(rc==DSERR_INVALIDPARAM && !secondary, + ok((rc==DSERR_INVALIDPARAM || rc==DSERR_INVALIDCALL) && !secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", rc, secondary); if (secondary)

1 0

Alexander Dorofeyev : quartz: Do not try renderers first. Use a single enumeration pass.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 27c0cddbab96a7260c2cda67f507d7b9c7555851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c0cddbab96a7260c2cda67f… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jul 8 23:52:34 2008 +0300 quartz: Do not try renderers first. Use a single enumeration pass. --- dlls/quartz/filtergraph.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8a5ece7..d2f10b6 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1146,8 +1146,6 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) IMoniker* pMoniker; INT x; - BOOL final = FALSE; - TRACE("(%p/%p)->(%p)\n", This, iface, ppinOut); if (TRACE_ON(quartz)) @@ -1239,14 +1237,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) WARN("IEnumMediaTypes_Next (%x)\n", hr); break; } - if (!nbmt && !final) - { - final = TRUE; - tab[0] = tab[1] = GUID_NULL; - IEnumMediaTypes_Reset(penummt); - continue; - } - else if (!nbmt) + if (!nbmt) { hr = VFW_E_CANNOT_RENDER; break; @@ -1266,7 +1257,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, !final, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { WARN("Unable to enum filters (%x)\n", hr);

1 0

H. Verbeet : wined3d: Store the glsl program lookup table in the backend' s private data.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: a85a5ffb1b52d24238c0416a96c7a255b21e219f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85a5ffb1b52d24238c0416a9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 8 21:44:20 2008 +0200 wined3d: Store the glsl program lookup table in the backend's private data. --- dlls/wined3d/device.c | 2 -- dlls/wined3d/glsl_shader.c | 31 ++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74bb676..3f94a3f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -173,8 +173,6 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo)); } - if (This->glsl_program_lookup) hash_table_destroy(This->glsl_program_lookup); - /* TODO: Clean up all the surfaces and textures! */ /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6e21f17..070aecb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2782,35 +2782,33 @@ void pshader_glsl_input_pack( * Vertex Shader Specific Code begins here ********************************************/ -static void add_glsl_program_entry(IWineD3DDeviceImpl *device, struct glsl_shader_prog_link *entry) { +static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_shader_prog_link *entry) { glsl_program_key_t *key; key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; - hash_table_put(device->glsl_program_lookup, key, entry); + hash_table_put(priv->glsl_program_lookup, key, entry); } -static struct glsl_shader_prog_link *get_glsl_program_entry(IWineD3DDeviceImpl *device, +static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, GLhandleARB vshader, GLhandleARB pshader) { glsl_program_key_t key; key.vshader = vshader; key.pshader = pshader; - return (struct glsl_shader_prog_link *)hash_table_get(device->glsl_program_lookup, &key); + return (struct glsl_shader_prog_link *)hash_table_get(priv->glsl_program_lookup, &key); } -void delete_glsl_program_entry(IWineD3DDevice *iface, struct glsl_shader_prog_link *entry) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - WineD3D_GL_Info *gl_info = &This->adapter->gl_info; +void delete_glsl_program_entry(struct shader_glsl_priv *priv, WineD3D_GL_Info *gl_info, struct glsl_shader_prog_link *entry) { glsl_program_key_t *key; key = HeapAlloc(GetProcessHeap(), 0, sizeof(glsl_program_key_t)); key->vshader = entry->vshader; key->pshader = entry->pshader; - hash_table_remove(This->glsl_program_lookup, key); + hash_table_remove(priv->glsl_program_lookup, key); GL_EXTCALL(glDeleteObjectARB(entry->programId)); if (entry->vshader) list_remove(&entry->vshader_entry); @@ -3158,7 +3156,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use GLhandleARB vshader_id = use_vs ? ((IWineD3DBaseShaderImpl*)vshader)->baseShader.prgId : 0; GLhandleARB pshader_id = use_ps ? ((IWineD3DBaseShaderImpl*)pshader)->baseShader.prgId : 0; - entry = get_glsl_program_entry(This, vshader_id, pshader_id); + entry = get_glsl_program_entry(priv, vshader_id, pshader_id); if (entry) { priv->glsl_program = entry; return; @@ -3174,7 +3172,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use entry->vshader = vshader_id; entry->pshader = pshader_id; /* Add the hash table entry */ - add_glsl_program_entry(This, entry); + add_glsl_program_entry(priv, entry); /* Set the current program */ priv->glsl_program = entry; @@ -3420,7 +3418,9 @@ static void shader_glsl_cleanup(IWineD3DDevice *iface) { static void shader_glsl_destroy(IWineD3DBaseShader *iface) { struct list *linked_programs; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) iface; - WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info; + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; + struct shader_glsl_priv *priv = (struct shader_glsl_priv *)device->shader_priv; + WineD3D_GL_Info *gl_info = &device->adapter->gl_info; /* Note: Do not use QueryInterface here to find out which shader type this is because this code * can be called from IWineD3DBaseShader::Release @@ -3436,11 +3436,11 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { if(pshader) { LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, pshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); + delete_glsl_program_entry(priv, gl_info, entry); } } else { LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, linked_programs, struct glsl_shader_prog_link, vshader_entry) { - delete_glsl_program_entry(This->baseShader.device, entry); + delete_glsl_program_entry(priv, gl_info, entry); } } } @@ -3475,8 +3475,9 @@ static BOOL glsl_program_key_compare(void *keya, void *keyb) { static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - This->shader_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); - This->glsl_program_lookup = hash_table_create(glsl_program_key_hash, glsl_program_key_compare); + struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); + priv->glsl_program_lookup = hash_table_create(glsl_program_key_hash, glsl_program_key_compare); + This->shader_priv = priv; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6377d3..cb019c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -310,6 +310,7 @@ extern const shader_backend_t none_shader_backend; /* GLSL shader private data */ struct shader_glsl_priv { + hash_table_t *glsl_program_lookup; struct glsl_shader_prog_link *glsl_program; GLhandleARB depth_blt_glsl_program_id; }; @@ -824,7 +825,6 @@ struct IWineD3DDeviceImpl int vs_selected_mode; int ps_selected_mode; const shader_backend_t *shader_backend; - hash_table_t *glsl_program_lookup; void *shader_priv; struct StateEntry StateTable[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ @@ -1991,8 +1991,6 @@ extern const SHADER_OPCODE* shader_get_opcode( IWineD3DBaseShader *iface, const DWORD code); -void delete_glsl_program_entry(IWineD3DDevice *iface, struct glsl_shader_prog_link *entry); - /* Vertex shader utility functions */ extern BOOL vshader_get_input( IWineD3DVertexShader* iface,

1 0

Alexander Nicolaysen Sørnes : Find more duplicates in partial searches
by Chris Morgan 08 Jul '08

08 Jul '08

Module: appdb Branch: master Commit: 504817d08f5e2336f7ac79f102a2577924ab1fc3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=504817d08f5e2336f7ac79f1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 8 21:23:07 2008 +0200 Find more duplicates in partial searches --- include/util.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/util.php b/include/util.php index fe80fc3..6fe6c1c 100644 --- a/include/util.php +++ b/include/util.php @@ -430,6 +430,8 @@ function searchForApplicationPartial($sSearchWords) $sSearchWords = cleanupSearchWords($sSearchWords); $aWords = explode(' ', $sSearchWords); $sSearchString = ''; + $sEnsureExactWord = ''; // Used to ensure we don't match partial words when prepending + // a wildcard to the search string for($i = 0; $i < sizeof($aWords); $i++) { @@ -439,13 +441,13 @@ function searchForApplicationPartial($sSearchWords) if(strlen($aWords[$i]) > 4) { if($i < (sizeof($aWords) - 1)) - $sSearchString .= ' '; + $sEnsureExactWord = ' '; break; } } $hResult = query_parameters("SELECT * FROM appFamily WHERE state = 'accepted' AND - appName LIKE '?%'", $sSearchString); + (appName LIKE '?%' OR appName LIKE '?')", $sSearchString.$sEnsureExactWord, $sSearchString); return $hResult; }

1 0

Alexandre Julliard : wine/test.h: Don't allow to use config.h in tests.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 4904c807d89466bd770f74dd447e893861e8abe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4904c807d89466bd770f74dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 8 21:29:28 2008 +0200 wine/test.h: Don't allow to use config.h in tests. --- include/wine/test.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index f3de956..02fc391 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -26,6 +26,9 @@ #include <windef.h> #include <winbase.h> +#ifdef __WINE_CONFIG_H +#error config.h should not be used in Wine tests +#endif #ifdef __WINE_WINE_LIBRARY_H #error wine/library.h should not be used in Wine tests #endif

1 0

Alexander Nicolaysen Sørnes : regedit: Convert import delete handling to unicode.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: eafa99ea559c9c53333af65490e9f3ad5026146a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafa99ea559c9c53333af6549… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 7 23:12:21 2008 +0200 regedit: Convert import delete handling to unicode. --- programs/regedit/regproc.c | 112 +++++++++++++++++++++++++++++++++++++++++++- programs/regedit/regproc.h | 1 + 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b91cbf5..a169889 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -39,6 +39,19 @@ static const CHAR *reg_class_names[] = { "HKEY_CURRENT_CONFIG", "HKEY_CURRENT_USER", "HKEY_DYN_DATA" }; +static const WCHAR hkey_local_machine[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; +static const WCHAR hkey_users[] = {'H','K','E','Y','_','U','S','E','R','S',0}; +static const WCHAR hkey_classes_root[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; +static const WCHAR hkey_current_config[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; +static const WCHAR hkey_current_user[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; +static const WCHAR hkey_dyn_data[] = {'H','K','E','Y','_','D','Y','N','_','D','A','T','A',0}; + +static const WCHAR *reg_class_namesW[] = {hkey_local_machine, hkey_users, + hkey_classes_root, hkey_current_config, + hkey_current_user, hkey_dyn_data + }; + + #define REG_CLASS_NUMBER (sizeof(reg_class_names) / sizeof(reg_class_names[0])) static HKEY reg_class_keys[REG_CLASS_NUMBER] = { @@ -62,6 +75,20 @@ if (!(p)) \ } /****************************************************************************** + * Allocates memory and convers input from wide chars to multibyte + * Returned string must be freed by the caller + */ +char* GetMultiByteString(WCHAR* strW, int len) +{ + char* strA = NULL; + + strA = HeapAlloc(GetProcessHeap(), 0, len); + CHECK_ENOUGH_MEMORY(strA); + WideCharToMultiByte(CP_ACP, 0, strW, len, strA, len, NULL, NULL); + return strA; +} + +/****************************************************************************** * Converts a hex representation of a DWORD into a DWORD. */ static BOOL convertHexToDWord(char* str, DWORD *dw) @@ -229,6 +256,52 @@ static BOOL parseKeyName(LPSTR lpKeyName, HKEY *hKey, LPSTR *lpKeyPath) return TRUE; } +static BOOL parseKeyNameW(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) +{ + WCHAR* lpSlash = NULL; + unsigned int i, len; + + if (lpKeyName == NULL) + return FALSE; + + for(i = 0; *(lpKeyName+i) != 0; i++) + { + if(*(lpKeyName+i) == '\\') + { + lpSlash = lpKeyName+i; + break; + } + } + + if (lpSlash) + { + len = lpSlash-lpKeyName; + } + else + { + len = lstrlenW(lpKeyName); + lpSlash = lpKeyName+len; + } + *hKey = NULL; + + for (i = 0; i < REG_CLASS_NUMBER; i++) { + if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], len) == CSTR_EQUAL && + len == lstrlenW(reg_class_namesW[i])) { + *hKey = reg_class_keys[i]; + break; + } + } + + if (*hKey == NULL) + return FALSE; + + + if (*lpSlash != '\0') + lpSlash++; + *lpKeyPath = lpSlash; + return TRUE; +} + /* Globals used by the setValue() & co */ static LPSTR currentKeyName; static HKEY currentKeyHandle = NULL; @@ -455,10 +528,19 @@ static void processRegEntry(LPSTR stdInput) /* delete the key if we encounter '-' at the start of reg key */ if ( stdInput[0] == '-') - delete_registry_key(stdInput+1); - else if ( openKey(stdInput) != ERROR_SUCCESS ) + { + WCHAR* stdInputW = NULL; + int size = keyEnd - stdInput - 1; + stdInputW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(stdInputW); + MultiByteToWideChar(CP_ACP, 0, stdInput + 1, size, stdInputW, size); + delete_registry_keyW(stdInputW); + HeapFree(GetProcessHeap(), 0, stdInputW); + } else if ( openKey(stdInput) != ERROR_SUCCESS ) + { fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput); + } } else if( currentKeyHandle && (( stdInput[0] == '@') || /* reading a default @=data pair */ ( stdInput[0] == '\"'))) /* reading a new value=data pair */ @@ -1001,3 +1083,29 @@ void delete_registry_key(CHAR *reg_key_name) RegDeleteTreeA(key_class, key_name); } + +void delete_registry_keyW(WCHAR *reg_key_name) +{ + WCHAR *key_name = NULL; + HKEY key_class; + + if (!reg_key_name || !reg_key_name[0]) + return; + + if (!parseKeyNameW(reg_key_name, &key_class, &key_name)) { + char* reg_key_nameA = GetMultiByteString(reg_key_name, lstrlenW(reg_key_name)); + fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", + getAppName(), reg_key_nameA); + HeapFree(GetProcessHeap(), 0, reg_key_nameA); + exit(1); + } + if (!*key_name) { + char* reg_key_nameA = GetMultiByteString(reg_key_name, lstrlenW(reg_key_name)); + fprintf(stderr,"%s: Can't delete registry class '%s'\n", + getAppName(), reg_key_nameA); + HeapFree(GetProcessHeap(), 0, reg_key_nameA); + exit(1); + } + + RegDeleteTreeW(key_class, key_name); +} diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index d0209e8..59e1b0c 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,4 +24,5 @@ const CHAR *getAppName(void); BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); BOOL import_registry_file(LPTSTR filename); void delete_registry_key(CHAR *reg_key_name); +void delete_registry_keyW(WCHAR *reg_key_name); void processRegLines(FILE *in);

1 0

Stefan Dösinger : wined3d: Remove the state table from the shader backend.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: 3a2743f25d30ec9fe05c0b3e66954ba30573bb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2743f25d30ec9fe05c0b3e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 14:56:38 2008 -0500 wined3d: Remove the state table from the shader backend. --- dlls/wined3d/arb_program_shader.c | 1 - dlls/wined3d/ati_fragment_shader.c | 4 ---- dlls/wined3d/baseshader.c | 1 - dlls/wined3d/directx.c | 3 +-- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/state.c | 7 +++---- dlls/wined3d/wined3d_private.h | 5 +---- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4c70331..12d6a5b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2109,5 +2109,4 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_generate_vshader, shader_arb_get_caps, shader_arb_fragment_enable, - FFPStateTable }; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index e596201..ebbb0c6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -853,9 +853,6 @@ static void set_bumpmat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } #undef GLINFO_LOCATION -/* our state table. Borrows lots of stuff from the base implementation */ -struct StateEntry ATIFSStateTable[STATE_HIGHEST + 1]; - const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }}, {STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), set_tex_op_atifs }}, @@ -1126,5 +1123,4 @@ const shader_backend_t atifs_shader_backend = { shader_atifs_generate_vshader, shader_atifs_get_caps, shader_atifs_fragment_enable, - ATIFSStateTable }; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6f24c91..11d807f 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1214,7 +1214,6 @@ const shader_backend_t none_shader_backend = { shader_none_generate_vshader, shader_none_get_caps, shader_none_fragment_enable, - FFPStateTable }; /* ******************************************* diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b421519..10cd52e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3464,8 +3464,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, frag_pipeline = select_fragment_implementation(Adapter, DeviceType); compile_state_table(object->StateTable, object->multistate_funcs, - ffp_vertexstate_template, frag_pipeline, misc_state_template, - object->shader_backend->StateTable_remove); + ffp_vertexstate_template, frag_pipeline, misc_state_template); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader * model can deal with that. It is essentially the same, just with adjusted diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9bbe418..6e21f17 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3708,5 +3708,4 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_generate_vshader, shader_glsl_get_caps, shader_glsl_fragment_enable, - FFPStateTable }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 60089ce..fdb57ad 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2494,7 +2494,7 @@ static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D update_fog = TRUE; } - if(!isStateDirty(context, FFPStateTable[STATE_VSHADER].representative)) { + if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { device->shader_backend->shader_select((IWineD3DDevice *)stateblock->wineD3DDevice, use_pshader, use_vshader); if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT) && (use_vshader || use_pshader)) { @@ -5271,8 +5271,7 @@ void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const struct StateEntryTemplate *vertex, const struct StateEntryTemplate *fragment, - const struct StateEntryTemplate *misc, - const struct StateEntry *temptable /* TODO: Remove this */) { + const struct StateEntryTemplate *misc) { unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; @@ -5336,6 +5335,6 @@ void compile_state_table(struct StateEntry *StateTable, /* TODO Remove this after the state move is done */ for(i = 0; i < STATE_HIGHEST + 1; i++) { if(set[i]) continue; - StateTable[i] = temptable[i]; + StateTable[i] = FFPStateTable[i]; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 168b940..b6377d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -301,7 +301,6 @@ typedef struct { void (*shader_generate_vshader)(IWineD3DVertexShader *iface, SHADER_BUFFER *buffer); void (*shader_get_caps)(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info, struct shader_caps *caps); void (*shader_fragment_enable)(IWineD3DDevice *iface, BOOL enable); - const struct StateEntry *StateTable_remove; /* TODO: This has to go away */ } shader_backend_t; extern const shader_backend_t atifs_shader_backend; @@ -598,13 +597,11 @@ extern const struct StateEntryTemplate ffp_fragmentstate_template[]; extern const struct StateEntryTemplate atifs_fragmentstate_template[]; /* "Base" state table */ -extern const struct StateEntry FFPStateTable[]; void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const struct StateEntryTemplate *vertex, const struct StateEntryTemplate *fragment, - const struct StateEntryTemplate *misc, - const struct StateEntry *temptable /* TODO: Remove this */); + const struct StateEntryTemplate *misc); /* The new context manager that should deal with onscreen and offscreen rendering */ struct WineD3DContext {

1 0

Stefan Dösinger : wined3d: Move Fixed function pipeline states to the new fragment structure.
by Alexandre Julliard 08 Jul '08

08 Jul '08

Module: wine Branch: master Commit: a2628d042353a4343bbe63db3dbde79b01e40fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2628d042353a4343bbe63db3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 15:26:15 2008 -0500 wined3d: Move Fixed function pipeline states to the new fragment structure. --- dlls/wined3d/state.c | 414 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 275 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2628d042353a4343bbe6…

1 0