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

Stefan Dösinger : wined3d: Move shader caps setting into the arb and glsl shader backends.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: ee7e149998196f75f5fd48a5231e03290c70c485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7e149998196f75f5fd48a52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 22 14:27:53 2008 +0100 wined3d: Move shader caps setting into the arb and glsl shader backends. --- dlls/wined3d/arb_program_shader.c | 16 ++++- dlls/wined3d/baseshader.c | 140 +----------------------------------- dlls/wined3d/directx.c | 95 ++++++++++++++++++++++++- dlls/wined3d/glsl_shader.c | 54 ++++++++++++++- dlls/wined3d/wined3d_private.h | 6 -- 5 files changed, 161 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee7e149998196f75f5fd4…

1 0

Stefan Dösinger : d3d: De-pointerize the WINED3DCAPS structure.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 8869c0f147f2b9bc38706559bca6f69d9d9f5554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8869c0f147f2b9bc38706559b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:26:00 2008 +0100 d3d: De-pointerize the WINED3DCAPS structure. --- dlls/d3d8/d3d8_private.h | 108 ++++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d9/d3d9_private.h | 154 +++++----- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/direct3d.c | 147 +++------ dlls/wined3d/directx.c | 711 +++++++++++++++++++++--------------------- include/wine/wined3d_types.h | 186 ++++++------ 9 files changed, 626 insertions(+), 688 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8869c0f147f2b9bc38706…

1 0

Huw Davies : mscms: Fix compilation without lcms.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 31666b311dd149957feba2e25e788ab7b8a6557b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31666b311dd149957feba2e25… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 25 12:47:14 2008 +0000 mscms: Fix compilation without lcms. --- dlls/mscms/mscms_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index a7cf23b..00e2a75 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -46,7 +46,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) DisableThreadLibraryCalls( hinst ); break; case DLL_PROCESS_DETACH: +#ifdef HAVE_LCMS free_handle_tables(); +#endif break; } return TRUE;

1 0

Alexandre Julliard : comdlg32: Fixed a number of buffer overflows in the file dialog.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 1e9acad3a07cd5e631829dd1ee7cee14b41884d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9acad3a07cd5e631829dd1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 25 17:34:32 2008 +0100 comdlg32: Fixed a number of buffer overflows in the file dialog. --- dlls/comdlg32/filedlg.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 13b4c79..3e662ec 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -889,7 +889,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer { /* 'n' includes trailing \0 */ bufW[n-1] = '\\'; - memcpy( &bufW[n], lpstrFileList, (size-n)*sizeof(WCHAR) ); + lstrcpynW( &bufW[n], lpstrFileList, size - n ); } TRACE("returned -> %s\n",debugstr_wn(bufW, total)); } @@ -931,16 +931,15 @@ static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); if( fodInfos->unicode ) { - LPWSTR bufW = buffer; - memcpy( bufW, lpstrFileList, sizeof(WCHAR)*sizeUsed ); + lstrcpynW( buffer, lpstrFileList, size ); } else { LPSTR bufA = buffer; - sizeUsed = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, - NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, - bufA, size, NULL, NULL); + DWORD sizeA = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, bufA, size, NULL, NULL); + if (size && size < sizeA) bufA[size - 1] = 0; + sizeUsed = sizeA; } MemFree(lpstrFileList); @@ -3237,29 +3236,27 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen)) { (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; - (*sizeUsed)++; nStrCharCount++; } (*lpstrFileList)[nFileIndex++] = separator; - (*sizeUsed)++; nFileCount++; } nStrCharCount++; } /* single, unquoted string */ - if ((nStrLen > 0) && (*sizeUsed == 0) ) + if ((nStrLen > 0) && (nFileIndex == 0) ) { lstrcpyW(*lpstrFileList, lpstrEdit); nFileIndex = lstrlenW(lpstrEdit) + 1; - (*sizeUsed) = nFileIndex; nFileCount = 1; } - /* trailing \0 */ - (*lpstrFileList)[nFileIndex] = '\0'; - (*sizeUsed)++; + /* trailing \0 */ + if (nFileIndex && separator) nFileIndex--; /* remove trailing separator */ + (*lpstrFileList)[nFileIndex++] = '\0'; + *sizeUsed = nFileIndex; MemFree(lpstrEdit); return nFileCount; }

1 0

Stefan Dösinger : wined3d: Make the state table a property of the shader backend.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 84258723f9ffac0d78c9febe63d7b0ed31efc407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84258723f9ffac0d78c9febe6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 9 19:30:08 2008 +0100 wined3d: Make the state table a property of the shader backend. --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/context.c | 82 +++++++++++++++++++----------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/wined3d_private.h | 5 +- 7 files changed, 58 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84258723f9ffac0d78c9f…

1 0

Stefan Dösinger : wined3d: Move shader generation into the shader backend.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: a66fb40d834e8f9b2d1502300e13376722c95bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66fb40d834e8f9b2d1502300… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:19:16 2008 +0100 wined3d: Move shader generation into the shader backend. Generating the shader ID and parts of the shader prolog and epilog was done by the common vertexshader.c / pixelshader.c, which is ugly. This patch doesn't get rid of all the uglyness, somewhen we'll still have to sort out the relationship of [arb|glsl]_generate_shader and [arb|glsl]_generate_declarations. --- dlls/wined3d/arb_program_shader.c | 171 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/baseshader.c | 8 ++ dlls/wined3d/glsl_shader.c | 143 +++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 171 +------------------------------------ dlls/wined3d/vertexshader.c | 126 +--------------------------- dlls/wined3d/wined3d_private.h | 18 ++-- 6 files changed, 336 insertions(+), 301 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a66fb40d834e8f9b2d150…

1 0

Stefan Dösinger : wined3d: Move the shader backend selection into a separate function.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 6d5f562dcf951471567d5d32de3da7f24312c28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5f562dcf951471567d5d32d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 18 19:37:53 2008 +0100 wined3d: Move the shader backend selection into a separate function. --- dlls/wined3d/directx.c | 47 +++++++++++++++---------------------------- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef6b6df..20b2c11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2638,6 +2638,22 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormatConversion(IWineD3D *iface, return WINED3D_OK; } +static const shader_backend_t *select_shader_backend(UINT Adapter, WINED3DDEVTYPE DeviceType) { + const shader_backend_t *ret; + int vs_selected_mode; + int ps_selected_mode; + + select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode); + if (vs_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_GLSL) { + ret = &glsl_shader_backend; + } else if (vs_selected_mode == SHADER_ARB || ps_selected_mode == SHADER_ARB) { + ret = &arb_program_shader_backend; + } else { + ret = &none_shader_backend; + } + return ret; +} + /* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true subset of a D3DCAPS9 structure. However, it has to come via a void * as the d3d8 interface cannot import the d3d9 header */ @@ -3221,27 +3237,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, return WINED3D_OK; } -static unsigned int glsl_program_key_hash(void *key) { - glsl_program_key_t *k = (glsl_program_key_t *)key; - - unsigned int hash = k->vshader | k->pshader << 16; - hash += ~(hash << 15); - hash ^= (hash >> 10); - hash += (hash << 3); - hash ^= (hash >> 6); - hash += ~(hash << 11); - hash ^= (hash >> 16); - - return hash; -} - -static BOOL glsl_program_key_compare(void *keya, void *keyb) { - glsl_program_key_t *ka = (glsl_program_key_t *)keya; - glsl_program_key_t *kb = (glsl_program_key_t *)keyb; - - return ka->vshader == kb->vshader && ka->pshader == kb->pshader; -} - /* Note due to structure differences between dx8 and dx9 D3DPRESENT_PARAMETERS, and fields being inserted in the middle, a new structure is used in place */ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, HWND hFocusWindow, @@ -3302,15 +3297,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->devType = DeviceType; select_shader_mode(&GLINFO_LOCATION, DeviceType, &object->ps_selected_mode, &object->vs_selected_mode); - if (object->ps_selected_mode == SHADER_GLSL || object->vs_selected_mode == SHADER_GLSL) { - object->shader_backend = &glsl_shader_backend; - object->glsl_program_lookup = hash_table_create(&glsl_program_key_hash, &glsl_program_key_compare); - } else if (object->ps_selected_mode == SHADER_ARB || object->vs_selected_mode == SHADER_ARB) { - object->shader_backend = &arb_program_shader_backend; - } else { - object->shader_backend = &none_shader_backend; - } - if(FAILED(object->shader_backend->shader_alloc_private((IWineD3DDevice *) object))) { + object->shader_backend = select_shader_backend(Adapter, DeviceType); if(FAILED(object->shader_backend->shader_alloc_private((IWineD3DDevice *) object))) { IWineD3D_Release(object->wineD3D); HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 293a310..d7b609d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3346,9 +3346,31 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { This->baseShader.is_compiled = FALSE; } +static unsigned int glsl_program_key_hash(void *key) { + glsl_program_key_t *k = (glsl_program_key_t *)key; + + unsigned int hash = k->vshader | k->pshader << 16; + hash += ~(hash << 15); + hash ^= (hash >> 10); + hash += (hash << 3); + hash ^= (hash >> 6); + hash += ~(hash << 11); + hash ^= (hash >> 16); + + return hash; +} + +static BOOL glsl_program_key_compare(void *keya, void *keyb) { + glsl_program_key_t *ka = (glsl_program_key_t *)keya; + glsl_program_key_t *kb = (glsl_program_key_t *)keyb; + + return ka->vshader == kb->vshader && ka->pshader == kb->pshader; +} + 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); return WINED3D_OK; }

1 0

Herve Chanal : regedit: A nicer icon.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: c440322647cbb6291f8e3b4f0bb0abb44ba8fc8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c440322647cbb6291f8e3b4f0… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Tue Mar 25 15:14:28 2008 +0100 regedit: A nicer icon. --- programs/regedit/Makefile.in | 2 + programs/regedit/regedit.ico | Bin 22534 -> 15086 bytes programs/regedit/regedit.svg | 947 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 949 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c440322647cbb6291f8e3…

1 0

Alexandre Julliard : regedit: Display a larger icon in the About box.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 255e7b427435df3079fb0db7e96646a2f80f88d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=255e7b427435df3079fb0db7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 25 16:14:35 2008 +0100 regedit: Display a larger icon in the About box. --- programs/regedit/about.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/about.c b/programs/regedit/about.c index 7258a4d..89960ad 100644 --- a/programs/regedit/about.c +++ b/programs/regedit/about.c @@ -28,7 +28,8 @@ void ShowAboutBox(HWND hWnd) { - TCHAR title[64]; - LoadString(hInst, IDS_APP_TITLE, title, COUNT_OF(title)); - ShellAbout(hWnd, title, _T(""), LoadIcon(hInst, MAKEINTRESOURCE(IDI_REGEDIT))); + WCHAR title[64]; + HICON icon = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, 48, 48, LR_SHARED ); + LoadStringW(hInst, IDS_APP_TITLE, title, COUNT_OF(title)); + ShellAboutW(hWnd, title, NULL, icon); }

1 0

Marcus Meissner : msxml3: Fixed include of SAX.h.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 5fd2e6e7b1ecad17bc34162cca2e1bc7fc5fef45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd2e6e7b1ecad17bc34162cc… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 25 15:42:22 2008 +0100 msxml3: Fixed include of SAX.h. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index ba5d925..fa4074f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -38,7 +38,7 @@ #include "msxml_private.h" -#include "libxml/SAX2.h" +#include <libxml/SAX2.h> WINE_DEFAULT_DEBUG_CHANNEL(msxml);

1 0