February 2006 - Wine-commits

Vitaly Budovski : d3d8: Fixed POINTSCALEENABLE.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 80c82f527f45ea398120baffe9adc7af024810d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80c82f527f45ea398120baf… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 4 17:13:13 2006 +0100 d3d8: Fixed POINTSCALEENABLE. --- dlls/d3d8/device.c | 55 +++++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4952d6e..9786a0d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2976,32 +2976,39 @@ HRESULT WINAPI IDirect3DDevice8Impl_Se case D3DRS_POINTSCALE_B : case D3DRS_POINTSCALE_C : case D3DRS_POINTSCALEENABLE : - { - /* If enabled, supply the parameters, otherwise fall back to defaults */ - if (This->StateBlock->renderstate[D3DRS_POINTSCALEENABLE]) { - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - att[0] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_A]); - att[1] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_B]); - att[2] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_C]); - - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); - checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);"); - } else { - TRACE("D3DRS_POINTSCALEENABLE not supported on this opengl\n"); - } - } else { - GLfloat att[3] = {1.0f, 0.0f, 0.0f}; - if (GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); - checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ...);"); - } else { - TRACE("D3DRS_POINTSCALEENABLE not supported, but not on either\n"); - } - } - break; + { + /* + * POINTSCALEENABLE controls how point size value is treated. If set to + * true, the point size is scaled with respect to height of viewport. + * When set to false point size is in pixels. + * + * http://msdn.microsoft.com/library/en-us/directx9_c/point_sprites.asp + */ + + /* Default values */ + GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + if(This->StateBlock->renderstate[D3DRS_POINTSCALEENABLE]) { + att[0] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_A]) / + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); + att[1] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_B]) / + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); + att[2] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_C]) / + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); } + if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { + glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, att); + checkGLcall("glPointParameterfvARB(GL_DISTANCE_ATTENUATION_ARB, ..."); + } + else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { + GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); + checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ..."); + } + else { + TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); + } + break; + } case D3DRS_COLORWRITEENABLE : { TRACE("Color mask: r(%d) g(%d) b(%d) a(%d)\n",

1 0

Vitaly Budovski : d3d8: Fixed POINTSPRITEENABLE.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: ecacc1ebcba65e5805b942155c54b92d65f1798f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecacc1ebcba65e5805b9421… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 4 17:14:13 2006 +0100 d3d8: Fixed POINTSPRITEENABLE. --- dlls/d3d8/device.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9786a0d..ffa18a5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3095,12 +3095,18 @@ HRESULT WINAPI IDirect3DDevice8Impl_Se break; } + /* + * Point sprites are always enabled. Value controls texture coordinate + * replacement mode. Must be set true for point sprites to use + * textures. + */ + glEnable(GL_POINT_SPRITE_ARB); + checkGLcall("glEnable GL_POINT_SPRITE_ARB"); + if (Value) { - glEnable(GL_POINT_SPRITE_ARB); - checkGLcall("glEnable GL_POINT_SPRITE_ARB"); + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE); } else { - glDisable(GL_POINT_SPRITE_ARB); - checkGLcall("glDisable GL_POINT_SPRITE_ARB"); + glTexEnvf(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE); } break; }

1 0

Vitaly Budovski : d3d8: Fixed point sprite scaling when size < 1.0f.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: d68f7a68c0e81d8a9544542dffe16f1eac019d78 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d68f7a68c0e81d8a9544542… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 4 17:14:38 2006 +0100 d3d8: Fixed point sprite scaling when size < 1.0f. --- dlls/d3d8/device.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ffa18a5..d1f7657 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2987,13 +2987,28 @@ HRESULT WINAPI IDirect3DDevice8Impl_Se /* Default values */ GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + + /* + * Minium valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. + * This means that OpenGL will clamp really small point sizes to 1.0f. + * To correct for this we need to multiply by the scale factor when sizes + * are less than 1.0f. scale_factor = 1.0f / point_size. + */ + GLfloat pointSize = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSIZE]); + GLfloat scaleFactor; + if(pointSize < 1.0f) { + scaleFactor = pointSize * pointSize; + } else { + scaleFactor = 1.0f; + } + if(This->StateBlock->renderstate[D3DRS_POINTSCALEENABLE]) { att[0] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_A]) / - (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height * scaleFactor); att[1] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_B]) / - (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height * scaleFactor); att[2] = *((float*)&This->StateBlock->renderstate[D3DRS_POINTSCALE_C]) / - (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height); + (This->StateBlock->viewport.Height * This->StateBlock->viewport.Height * scaleFactor); } if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {

1 0

Alexandre Julliard : winecfg: Display a warning when the user tries to change the load
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: c919112a740df0003b23ee40d96f4091a3b7aeb9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c919112a740df0003b23ee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 4 17:05:14 2006 +0100 winecfg: Display a warning when the user tries to change the load order of a system dll. --- programs/winecfg/En.rc | 10 ++++++++++ programs/winecfg/libraries.c | 40 ++++++++++++++++++++++++++++++++++++++-- programs/winecfg/resource.h | 7 +++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index a959b60..22bdeb0 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -204,6 +204,16 @@ BEGIN IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" + IDS_DLL_WARNING_CAPTION "Warning: system library" + IDS_DLL_NATIVE "native" + IDS_DLL_BUILTIN "builtin" + IDS_DLL_NATIVE_BUILTIN "native, builtin" + IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_DISABLED "disabled" +END /****************************************************************/ /* English neutral resources diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 7b8e7e8..2d9e60d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -148,8 +148,20 @@ static const char* mode_to_string(enum d /* Convert a dllmode to a pretty string for display. TODO: use translations. */ static const char* mode_to_label(enum dllmode mode) { - WINE_FIXME("translate me\n"); - return mode_to_string(mode); + static char buffer[256]; + UINT id = 0; + + switch( mode ) + { + case NATIVE: id = IDS_DLL_NATIVE; break; + case BUILTIN: id = IDS_DLL_BUILTIN; break; + case NATIVE_BUILTIN: id = IDS_DLL_NATIVE_BUILTIN; break; + case BUILTIN_NATIVE: id = IDS_DLL_BUILTIN_NATIVE; break; + case DISABLE: id = IDS_DLL_DISABLED; break; + default: assert(FALSE); + } + if (!LoadStringA( GetModuleHandleA(NULL), id, buffer, sizeof(buffer) )) buffer[0] = 0; + return buffer; } /* Convert a control id (IDC_ constant) to a dllmode */ @@ -417,6 +429,30 @@ static void on_add_click(HWND dialog) *ptr = '\0'; } } + + /* check if dll is in the builtin-only list */ + if (!(ptr = strrchr( buffer, '\\' ))) + { + ptr = buffer; + if (*ptr == '*') ptr++; + } + else ptr++; + if (is_builtin_only( ptr )) + { + MSGBOXPARAMSA params; + params.cbSize = sizeof(params); + params.hwndOwner = dialog; + params.hInstance = GetModuleHandleA( NULL ); + params.lpszText = MAKEINTRESOURCEA( IDS_DLL_WARNING ); + params.lpszCaption = MAKEINTRESOURCEA( IDS_DLL_WARNING_CAPTION ); + params.dwStyle = MB_ICONWARNING | MB_YESNO; + params.lpszIcon = NULL; + params.dwContextHelpId = 0; + params.lpfnMsgBoxCallback = NULL; + params.dwLanguageId = 0; + if (MessageBoxIndirectA( &params ) != IDYES) return; + } + SendDlgItemMessage(dialog, IDC_DLLCOMBO, WM_SETTEXT, 0, (LPARAM) ""); disable(IDC_DLLS_ADDDLL); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index e7554c3..4fac41f 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -76,6 +76,13 @@ #define IDC_DLLS_REMOVEDLL 8003 #define IDC_DLLCOMBO 8004 #define IDD_LOADORDER 8005 +#define IDS_DLL_WARNING 8010 +#define IDS_DLL_WARNING_CAPTION 8011 +#define IDS_DLL_NATIVE 8012 +#define IDS_DLL_BUILTIN 8013 +#define IDS_DLL_NATIVE_BUILTIN 8014 +#define IDS_DLL_BUILTIN_NATIVE 8015 +#define IDS_DLL_DISABLED 8016 /* drive editing */ #define IDC_LIST_DRIVES 1042

1 0

Alexandre Julliard : ntdll: Added a few helper function to simplify the loadorder code.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 2bddb3047bc87831ac525d3be4d7676118b8ff07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bddb3047bc87831ac525d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 4 17:06:41 2006 +0100 ntdll: Added a few helper function to simplify the loadorder code. Keep the application key open, it's valid for the lifetime of the process. --- dlls/ntdll/loadorder.c | 236 +++++++++++++++++++----------------------------- 1 files changed, 95 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2bddb3047bc87831ac5…

1 0

Vitaly Budovski : wined3d: Fixed point sprite scaling when size < 1.0f.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 3c17322e756a70cf0a6fc3f926445aa5c9dd56d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c17322e756a70cf0a6fc3f… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Feb 4 17:07:36 2006 +0100 wined3d: Fixed point sprite scaling when size < 1.0f. --- dlls/wined3d/device.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec7dc60..5337765 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3506,13 +3506,28 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen /* Default values */ GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + + /* + * Minium valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. + * This means that OpenGL will clamp really small point sizes to 1.0f. + * To correct for this we need to multiply by the scale factor when sizes + * are less than 1.0f. scale_factor = 1.0f / point_size. + */ + GLfloat pointSize = *((float*)&This->stateBlock->renderState[D3DRS_POINTSIZE]); + GLfloat scaleFactor; + if(pointSize < 1.0f) { + scaleFactor = pointSize * pointSize; + } else { + scaleFactor = 1.0f; + } + if(This->stateBlock->renderState[WINED3DRS_POINTSCALEENABLE]) { att[0] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_A]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); att[1] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_B]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); att[2] = *((float*)&This->stateBlock->renderState[WINED3DRS_POINTSCALE_C]) / - (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height); + (This->stateBlock->viewport.Height * This->stateBlock->viewport.Height * scaleFactor); } if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {

1 0

Alexandre Julliard : libwine: Added wine_dll_enum_load_path function to allow querying the dll path.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 65424dc3a85a0aa0e1a2aed62dfd8681c7ba49bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65424dc3a85a0aa0e1a2aed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 4 17:02:05 2006 +0100 libwine: Added wine_dll_enum_load_path function to allow querying the dll path. --- include/wine/library.h | 1 + libs/wine/loader.c | 12 ++++++++++++ libs/wine/wine.def | 1 + libs/wine/wine.map | 1 + 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index d442fba..aa689c0 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -47,6 +47,7 @@ extern void *wine_dll_load( const char * extern void *wine_dll_load_main_exe( const char *name, char *error, int errorsize, int test_only, int *file_exists ); extern void wine_dll_unload( void *handle ); +extern const char *wine_dll_enum_load_path( unsigned int index ); extern int wine_dll_get_owner( const char *name, char *buffer, int size, int *file_exists ); extern int __wine_main_argc; diff --git a/libs/wine/loader.c b/libs/wine/loader.c index ff87d65..50ab544 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -492,6 +492,18 @@ void *wine_dll_load_main_exe( const char /*********************************************************************** + * wine_dll_enum_load_path + * + * Enumerate the dll load path. + */ +const char *wine_dll_enum_load_path( unsigned int index ) +{ + if (index >= nb_dll_paths) return NULL; + return dll_paths[index]; +} + + +/*********************************************************************** * wine_dll_get_owner * * Retrieve the name of the 32-bit owner dll for a 16-bit dll. diff --git a/libs/wine/wine.def b/libs/wine/wine.def index bea6f8a..ffd8667 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -16,6 +16,7 @@ EXPORTS wine_dbgstr_an wine_dbgstr_wn wine_dlclose + wine_dll_enum_load_path; wine_dll_get_owner wine_dll_load wine_dll_load_main_exe diff --git a/libs/wine/wine.map b/libs/wine/wine.map index fabd57b..b230047 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -16,6 +16,7 @@ WINE_1.0 wine_dbgstr_an; wine_dbgstr_wn; wine_dlclose; + wine_dll_enum_load_path; wine_dll_get_owner; wine_dll_load; wine_dll_load_main_exe;

1 0

Alexandre Julliard : winecfg: Populate the dll combo box with the dlls found in the load path.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: d4ea455180934c57a29dbc9510a60e4db47bd859 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4ea455180934c57a29dbc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 4 17:04:22 2006 +0100 winecfg: Populate the dll combo box with the dlls found in the load path. --- programs/winecfg/libraries.c | 149 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 4ae431d..7b8e7e8 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -20,18 +20,72 @@ * */ +#include "config.h" + #define NONAMELESSUNION #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> +#include <wine/library.h> #include <wine/debug.h> #include <stdio.h> +#include <dirent.h> #include <assert.h> +#include <stdlib.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #include "winecfg.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(winecfg); +/* dlls that shouldn't be configured anything other than builtin; list must be sorted*/ +static const char * const builtin_only[] = +{ + "advapi32", + "capi2032", + "dbghelp", + "ddraw", + "gdi32", + "glu32", + "glut32", + "icmp", + "iphlpapi", + "joystick.drv", + "kernel32", + "mswsock", + "ntdll", + "opengl32", + "stdole2.tlb", + "stdole32.tlb", + "twain_32", + "unicows", + "user32", + "vdmdbg", + "w32skrnl", + "winealsa.drv", + "winearts.drv", + "wineaudioio.drv", + "wined3d", + "winedos", + "wineesd.drv", + "winejack.drv", + "winemp3.acm", + "winenas.drv", + "wineoss.drv", + "wineps", + "wineps.drv", + "winex11.drv", + "winmm", + "wintab32", + "wnaspi32", + "wow32", + "ws2_32", + "wsock32", +}; + enum dllmode { BUILTIN_NATIVE, @@ -126,6 +180,21 @@ static DWORD mode_to_id(enum dllmode mod } } +/* helper for is_builtin_only */ +static int compare_dll( const void *ptr1, const void *ptr2 ) +{ + const char * const *name1 = ptr1; + const char * const *name2 = ptr2; + return strcmp( *name1, *name2 ); +} + +/* check if dll is recommended as builtin only */ +static inline int is_builtin_only( const char *name ) +{ + return bsearch( &name, builtin_only, sizeof(builtin_only)/sizeof(builtin_only[0]), + sizeof(builtin_only[0]), compare_dll ) != NULL; +} + static void set_controls_from_selection(HWND dialog) { /* FIXME: display/update some information about the selected dll (purpose, recommended loadorder) maybe? */ @@ -149,6 +218,80 @@ static void clear_settings(HWND dialog) } } +/* check if a given dll is 16-bit */ +static int is_16bit_dll( const char *dir, const char *name ) +{ + char buffer[64]; + int res; + size_t len = strlen(dir) + strlen(name) + 2; + char *path = HeapAlloc( GetProcessHeap(), 0, len ); + + strcpy( path, dir ); + strcat( path, "/" ); + strcat( path, name ); + res = readlink( path, buffer, sizeof(buffer) ); + HeapFree( GetProcessHeap(), 0, path ); + + if (res == -1) return 0; /* not a symlink */ + if (res < 4 || res >= sizeof(buffer)) return 0; + buffer[res] = 0; + if (strchr( buffer, '/' )) return 0; /* contains a path, not valid */ + if (strcmp( buffer + res - 3, ".so" )) return 0; /* does not end in .so, not valid */ + return 1; +} + +/* load the list of available libraries from a given dir */ +static void load_library_list_from_dir( HWND dialog, const char *dir_path ) +{ + char name[256]; + struct dirent *de; + DIR *dir = opendir( dir_path ); + + if (!dir) return; + + while ((de = readdir( dir ))) + { + size_t len = strlen(de->d_name); + if (len > sizeof(name) || len <= 7 || strcmp( de->d_name + len - 7, ".dll.so")) continue; + if (is_16bit_dll( dir_path, de->d_name )) continue; /* 16-bit dlls can't be configured */ + len -= 7; + memcpy( name, de->d_name, len ); + name[len] = 0; + /* skip dlls that should always be builtin */ + if (is_builtin_only( name )) continue; + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_ADDSTRING, 0, (LPARAM)name ); + } + closedir( dir ); +} + +/* load the list of available libraries */ +static void load_library_list( HWND dialog ) +{ + unsigned int i = 0; + const char *path; + char item1[256], item2[256]; + + while ((path = wine_dll_enum_load_path( i++ ))) + load_library_list_from_dir( dialog, path ); + + /* get rid of duplicate entries */ + + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_GETLBTEXT, 0, (LPARAM)item1 ); + i = 1; + while (SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_GETLBTEXT, i, (LPARAM)item2 ) >= 0) + { + if (!strcmp( item1, item2 )) + { + SendDlgItemMessageA( dialog, IDC_DLLCOMBO, CB_DELETESTRING, i, 0 ); + } + else + { + strcpy( item1, item2 ); + i++; + } + } +} + static void load_library_settings(HWND dialog) { char **overrides = enumerate_values(config_key, keypath("DllOverrides")); @@ -218,6 +361,7 @@ static void init_libsheet(HWND dialog) { /* clear the add dll controls */ SendDlgItemMessage(dialog, IDC_DLLCOMBO, WM_SETTEXT, 1, (LPARAM) ""); + load_library_list( dialog ); disable(IDC_DLLS_ADDDLL); } @@ -414,7 +558,10 @@ LibrariesDlgProc (HWND hDlg, UINT uMsg, } break; case LBN_SELCHANGE: - set_controls_from_selection(hDlg); + if(LOWORD(wParam) == IDC_DLLCOMBO) + on_add_combo_change(hDlg); + else + set_controls_from_selection(hDlg); break; } break;

1 0

Kasper Sandberg : Danish language update.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 45269979606dd2b8cd8d05424e145bb9a28a69b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45269979606dd2b8cd8d054… Author: Kasper Sandberg <redeeman(a)metanurb.dk> Date: Sat Feb 4 17:01:25 2006 +0100 Danish language update. --- dlls/shell32/shell32_Da.rc | 8 ++++---- programs/clock/Da.rc | 2 +- programs/notepad/Da.rc | 12 ++++++------ programs/progman/Da.rc | 2 +- programs/winhelp/Da.rc | 3 ++- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32_Da.rc b/dlls/shell32/shell32_Da.rc index f9cd094..f32fcd9 100644 --- a/dlls/shell32/shell32_Da.rc +++ b/dlls/shell32/shell32_Da.rc @@ -37,10 +37,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "Skriv navnet p� et Program, Mappe, Document eller Internet Ressource, for at f� Wine til at �bne det.", 12289, 36, 11, 182, 18 + LTEXT "&�ben:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Annuller", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Bro...", 12288, 170, 63, 50, 14, WS_TABSTOP } diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc index 125fb37..aca9a59 100644 --- a/programs/clock/Da.rc +++ b/programs/clock/Da.rc @@ -36,7 +36,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUB } POPUP "Inf&o" { MENUITEM "&Licens...", IDM_LICENSE - MENUITEM "&NO WARRANTY...", IDM_NOWARRANTY + MENUITEM "&Ingen Garenti...", IDM_NOWARRANTY MENUITEM "&Om Ur...", IDM_ABOUT } } diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 64f0b69..23a155d 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -58,7 +58,7 @@ POPUP "&Hj�lp" { MENUITEM SEPARATOR POPUP "&Om Notesblok..." { MENUITEM "&Licens", CMD_LICENSE - MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "&Ingen Garenti", CMD_NO_WARRANTY MENUITEM "&Om WINE", CMD_ABOUT_WINE } } @@ -114,13 +114,13 @@ STRING_TOOLARGE, \nBrug en anden editor til at redigere filen." STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ \nSkriv noget tekst, og pr�v s� igen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ -Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ -Would you like to save the changes ?" +STRING_DOESNOTEXIST, "Filen '%s'\nfindes ikke\n\n \ +�nsker du at oprette en ny fil ?" +STRING_NOTSAVED, "Filen '%s'\ner blevet �ndret\n\n \ +Vil du gemme �ndringerne ?" STRING_NOTFOUND, "Kan ikke finde '%s'." STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udf�re \ denne operation. \nAfslut et eller flere aktive programmer for at frig�re \ -hukommelse, og pr�v s� igen." +hukommelse, og pr�v igen." } diff --git a/programs/progman/Da.rc b/programs/progman/Da.rc index 5e6ba93..812b6ab 100644 --- a/programs/progman/Da.rc +++ b/programs/progman/Da.rc @@ -54,7 +54,7 @@ #define MENU_INFO "&Om Programstyring..." #define MENU_INFO_LICENSE "&Licens" -#define MENU_INFO_NO_WARRANTY "&NO WARRANTY" +#define MENU_INFO_NO_WARRANTY "&Ingen Garenti" #define MENU_INFO_ABOUT_WINE "&Om WINE" /* Dialogs */ diff --git a/programs/winhelp/Da.rc b/programs/winhelp/Da.rc index 997a3e6..93515fd 100644 --- a/programs/winhelp/Da.rc +++ b/programs/winhelp/Da.rc @@ -50,6 +50,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUB } } + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT @@ -59,7 +60,7 @@ STID_WHERROR, "FEJL" STID_WARNING, "ADVARSEL" STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Ikke implementeret" -STID_HLPFILE_ERROR_s, "Fejl ved l�sning af filen `%s'" +STID_HLPFILE_ERROR_s, "Fejl ved indl�sning af filen `%s'" STID_CONTENTS, "&Indhold" STID_SEARCH, "&S�g" STID_BACK, "&Tilbage"

1 0

Phil Krylov : riched20: Initial support for simple tables.
by Alexandre Julliard 04 Feb '06

04 Feb '06

Module: wine Branch: refs/heads/master Commit: 08bf7180f37153536d871ee5f06b76b7c163c23a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08bf7180f37153536d871ee… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Sat Feb 4 17:01:01 2006 +0100 riched20: Initial support for simple tables. --- dlls/riched20/caret.c | 30 ++++++++++++++++++++++++-- dlls/riched20/editor.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/editor.h | 2 ++ dlls/riched20/editstr.h | 16 ++++++++++++++ dlls/riched20/list.c | 18 +++++++++++++++ dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 12 ++++++++++ dlls/riched20/reader.c | 4 +-- dlls/riched20/run.c | 15 +++++++++---- dlls/riched20/writer.c | 39 ++++++++++++++++++++++++++++++--- 10 files changed, 178 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=08bf7180f37153536d8…

1 0