May 2006 - Wine-commits - list.winehq.org

Phil Costin : wined3d: Add check for GL Shading Language 100 Extension.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 9413c89c33cd49a3de8fb26800e219ce04c8ebd9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9413c89c33cd49a3de8fb26… Author: Phil Costin <philcostin(a)hotmail.com> Date: Mon May 8 21:39:04 2006 +0100 wined3d: Add check for GL Shading Language 100 Extension. --- dlls/wined3d/directx.c | 45 ++++++++++++++++++++++++++++++++++----------- include/wine/wined3d_gl.h | 1 + 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b58aeeb..ce05a45 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -489,6 +489,9 @@ #undef USE_GL_FUNC glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); TRACE_(d3d_caps)(" FOUND: ARB Pixel Shader support - GL_MAX_TEXTURE_IMAGE_UNITS_ARB=%u\n", gl_max); gl_info->max_samplers = min(MAX_SAMPLERS, gl_max); + } else if (strcmp(ThisExtn, "GL_ARB_shading_language_100") == 0) { + TRACE_(d3d_caps)(" FOUND: GL Shading Language v100 support\n"); + gl_info->supported[ARB_SHADING_LANGUAGE_100] = TRUE; } else if (strcmp(ThisExtn, "GL_ARB_multisample") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Multisample support\n"); gl_info->supported[ARB_MULTISAMPLE] = TRUE; @@ -1674,28 +1677,48 @@ #endif *pCaps->MaxStreams = MAX_STREAMS; *pCaps->MaxStreamStride = 1024; - if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (wined3d_settings.vs_mode == VS_SW) || (DeviceType == WINED3DDEVTYPE_REF)) { - *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); + if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && DeviceType != WINED3DDEVTYPE_REF) { + /* FIXME: Uncomment the line below and remove the line beneath that to set Vertex Shader 2.0+ capability */ + /* *pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); */ + *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); + TRACE_(d3d_caps)("Hardware Vertex Shaders versions 2.0+ enabled\n"); + } else if (wined3d_settings.vs_mode == VS_HW && GL_SUPPORT(ARB_VERTEX_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { + *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); + TRACE_(d3d_caps)("Hardware Vertex Shader version 1.1 enabled\n"); + } else if (wined3d_settings.vs_mode == VS_SW || DeviceType == WINED3DDEVTYPE_REF) { + *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); + TRACE_(d3d_caps)("Software Vertex Shader version 1.1 enabled\n"); + } else { + *pCaps->VertexShaderVersion = 0; + TRACE_(d3d_caps)("Vertex Shader functionality not available\n"); + } - if (This->gl_info.gl_vendor == VENDOR_MESA || - This->gl_info.gl_vendor == VENDOR_WINE) { + if (This->gl_info.gl_vendor == VENDOR_MESA || This->gl_info.gl_vendor == VENDOR_WINE) { *pCaps->MaxVertexShaderConst = 95; - } else { - *pCaps->MaxVertexShaderConst = WINED3D_VSHADER_MAX_CONSTANTS; - } } else { - *pCaps->VertexShaderVersion = 0; - *pCaps->MaxVertexShaderConst = 0; + *pCaps->MaxVertexShaderConst = WINED3D_VSHADER_MAX_CONSTANTS; } - if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != WINED3DDEVTYPE_REF)) { + if (wined3d_settings.ps_mode == PS_HW && GL_SUPPORT(ARB_SHADING_LANGUAGE_100) && DeviceType != WINED3DDEVTYPE_REF) { + /* FIXME: Uncomment the following line and remove the line beneath that to set Pixel Shader 2.0+ capability */ + /* *pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); */ + *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); + *pCaps->PixelShader1xMaxValue = 1.0; + TRACE_(d3d_caps)("Hardware Pixel Shaders versions 2.0+ enabled\n"); + } else if (wined3d_settings.ps_mode == PS_HW && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && DeviceType != WINED3DDEVTYPE_REF) { + *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); + *pCaps->PixelShader1xMaxValue = 1.0; + TRACE_(d3d_caps)("Hardware Pixel Shaders version 1.4 enabled\n"); + /* FIXME: Uncomment this when there is support for software Pixel Shader 1.4 and PS_SW is defined + } else if (wined3d_settings.ps_mode == PS_SW || DeviceType == WINED3DDEVTYPE_REF) { *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); *pCaps->PixelShader1xMaxValue = 1.0; + TRACE_(d3d_caps)("Software Pixel Shader version 1.4 enabled\n"); */ } else { *pCaps->PixelShaderVersion = 0; *pCaps->PixelShader1xMaxValue = 0.0; + TRACE_(d3d_caps)("Pixel Shader functionality not available\n"); } - /* TODO: ARB_FRAGMENT_PROGRAM_100 */ /* ------------------------------------------------ The following fields apply to d3d9 only diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 63e79ee..92f4267 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1126,6 +1126,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_PROGRAM, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, + ARB_SHADING_LANGUAGE_100, /* EXT */ EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT,

1 0

Ivan Gyurdiev : wined3d: Clean up per version shader limits code.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: c93239d36d937e2b9923ce590afefe6029d92636 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c93239d36d937e2b9923ce5… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon May 8 17:09:21 2006 -0400 wined3d: Clean up per version shader limits code. --- dlls/wined3d/pixelshader.c | 162 ++++++++++++++++++++++------------------ dlls/wined3d/vertexshader.c | 143 +++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 11 +++ 3 files changed, 178 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c93239d36d937e2b992…

1 0

Ivan Gyurdiev : wined3d: Addline cleanup.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 5f105607622eb705cd724edcc1842f3f9c5e83c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f105607622eb705cd724ed… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Mon May 8 15:44:25 2006 -0400 wined3d: Addline cleanup. --- dlls/wined3d/Makefile.in | 1 dlls/wined3d/baseshader.c | 57 +++++++++ dlls/wined3d/pixelshader.c | 251 ++++++++++++++-------------------------- dlls/wined3d/vertexshader.c | 120 ++++++------------- dlls/wined3d/wined3d_private.h | 13 ++ 5 files changed, 196 insertions(+), 246 deletions(-) create mode 100644 dlls/wined3d/baseshader.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5f105607622eb705cd7…

1 0

Hans Leidekker : dnsapi: Partially implement DnsQueryConfig.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: da1d724c406075ec3e24458c25be6434ee0826ab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da1d724c406075ec3e24458… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 9 10:47:06 2006 +0200 dnsapi: Partially implement DnsQueryConfig. --- dlls/dnsapi/Makefile.in | 1 dlls/dnsapi/dnsapi.spec | 2 dlls/dnsapi/query.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletions(-) create mode 100644 dlls/dnsapi/query.c diff --git a/dlls/dnsapi/Makefile.in b/dlls/dnsapi/Makefile.in index 3565873..1ff2025 100644 --- a/dlls/dnsapi/Makefile.in +++ b/dlls/dnsapi/Makefile.in @@ -10,6 +10,7 @@ EXTRALIBS = $(LIBUNICODE) @RESOLVLIBS@ C_SRCS = \ main.c \ name.c \ + query.c \ record.c SUBDIRS = tests diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index e6a42b0..ccbc555 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -77,7 +77,7 @@ @ stub DnsNameCopyAllocate @ stub DnsNotifyResolver @ stub DnsQuery_A -@ stub DnsQueryConfig +@ stdcall DnsQueryConfig(long long wstr ptr ptr ptr) @ stub DnsQueryEx @ stub DnsQuery_UTF8 @ stub DnsQuery_W diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c new file mode 100644 index 0000000..414c61e --- /dev/null +++ b/dlls/dnsapi/query.c @@ -0,0 +1,198 @@ +/* + * DNS support + * + * Copyright (C) 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#include <stdarg.h> +#include <string.h> +#include <sys/types.h> + +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> +#endif +#ifdef HAVE_RESOLV_H +# include <resolv.h> +#endif +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winnls.h" +#include "windns.h" + +#include "dnsapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); + +#ifdef HAVE_RESOLV + +static CRITICAL_SECTION resolver_cs; +static CRITICAL_SECTION_DEBUG resolver_cs_debug = +{ + 0, 0, &resolver_cs, + { &resolver_cs_debug.ProcessLocksList, + &resolver_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": resolver_cs") } +}; +static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; + +#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) +#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) + + +/* the resolver lock must be held and res_init() must have been + * called before calling this function. + */ +static DNS_STATUS dns_get_serverlist( PIP4_ARRAY addrs, PDWORD len ) +{ + unsigned int i, size; + + size = sizeof(IP4_ARRAY) + sizeof(IP4_ADDRESS) * (_res.nscount - 1); + if (!addrs || *len < size) + { + *len = size; + return ERROR_INSUFFICIENT_BUFFER; + } + + addrs->AddrCount = _res.nscount; + + for (i = 0; i < _res.nscount; i++) + addrs->AddrArray[i] = _res.nsaddr_list[i].sin_addr.s_addr; + + return ERROR_SUCCESS; +} + +#endif /* HAVE_RESOLV */ + +static DNS_STATUS dns_get_hostname_a( COMPUTER_NAME_FORMAT format, + LPSTR buffer, PDWORD len ) +{ + char name[256]; + DWORD size = sizeof(name); + + if (!GetComputerNameExA( format, name, &size )) + return DNS_ERROR_NAME_DOES_NOT_EXIST; + + if (!buffer || (size = lstrlenA( name ) + 1) > *len) + { + *len = size; + return ERROR_INSUFFICIENT_BUFFER; + } + + lstrcpyA( buffer, name ); + return ERROR_SUCCESS; +} + +static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, + LPWSTR buffer, PDWORD len ) +{ + WCHAR name[256]; + DWORD size = sizeof(name); + + if (!GetComputerNameExW( format, name, &size )) + return DNS_ERROR_NAME_DOES_NOT_EXIST; + + if (!buffer || (size = lstrlenW( name ) + 1) > *len) + { + *len = size; + return ERROR_INSUFFICIENT_BUFFER; + } + + lstrcpyW( buffer, name ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsQueryConfig [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adapter, + PVOID reserved, PVOID buffer, PDWORD len ) +{ + DNS_STATUS ret = ERROR_INVALID_PARAMETER; + + TRACE( "(%d,0x%08lx,%s,%p,%p,%p)\n", config, flag, debugstr_w(adapter), + reserved, buffer, len ); + + if (!len) return ERROR_INVALID_PARAMETER; + + switch (config) + { + case DnsConfigDnsServerList: + { +#ifdef HAVE_RESOLV + LOCK_RESOLVER(); + + res_init(); + ret = dns_get_serverlist( (IP4_ARRAY *)buffer, len ); + + UNLOCK_RESOLVER(); + break; +#else + WARN( "compiled without resolver support\n" ); + break; +#endif + } + case DnsConfigHostName_A: + case DnsConfigHostName_UTF8: + return dns_get_hostname_a( ComputerNameDnsHostname, buffer, len ); + + case DnsConfigFullHostName_A: + case DnsConfigFullHostName_UTF8: + return dns_get_hostname_a( ComputerNameDnsFullyQualified, buffer, len ); + + case DnsConfigPrimaryDomainName_A: + case DnsConfigPrimaryDomainName_UTF8: + return dns_get_hostname_a( ComputerNameDnsDomain, buffer, len ); + + case DnsConfigHostName_W: + return dns_get_hostname_w( ComputerNameDnsHostname, buffer, len ); + + case DnsConfigFullHostName_W: + return dns_get_hostname_w( ComputerNameDnsFullyQualified, buffer, len ); + + case DnsConfigPrimaryDomainName_W: + return dns_get_hostname_w( ComputerNameDnsDomain, buffer, len ); + + case DnsConfigAdapterDomainName_A: + case DnsConfigAdapterDomainName_W: + case DnsConfigAdapterDomainName_UTF8: + case DnsConfigSearchList: + case DnsConfigAdapterInfo: + case DnsConfigPrimaryHostNameRegistrationEnabled: + case DnsConfigAdapterHostNameRegistrationEnabled: + case DnsConfigAddressRegistrationMaxCount: + FIXME( "unimplemented config type %d\n", config ); + break; + + default: + WARN( "unknown config type: %d\n", config ); + break; + } + return ret; +}

1 0

Saulius Krasuckas : wine.inf: Install comctl32.dll as fake DLL.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: b53f84e02c4265452e1c3e904a0bc08455f39da2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b53f84e02c4265452e1c3e9… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Tue May 9 12:10:42 2006 +0300 wine.inf: Install comctl32.dll as fake DLL. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 848724d..83f0edd 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2112,6 +2112,7 @@ HKLM,%CurrentVersion%\Telephony\Country 10,,winhlp32.exe,winhelp.exe 10,command,start.exe 11,,advapi32.dll +11,,comctl32.dll 11,,comdlg32.dll 11,,control.exe 11,,crypt32.dll

1 0

Robert Reif : winmm: Check waveOutGetVolume parameter.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: a9bd81be63c2ceaae949123a13652febeb376019 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9bd81be63c2ceaae949123… Author: Robert Reif <reif(a)earthlink.net> Date: Mon May 8 20:51:23 2006 -0400 winmm: Check waveOutGetVolume parameter. --- dlls/winmm/tests/wave.c | 3 +++ dlls/winmm/winmm.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a41b9b0..a51fa37 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -640,6 +640,9 @@ static void wave_out_test_deviceOut(int frag.dwFlags=0; frag.dwLoops=0; + rc=waveOutGetVolume(wout,0); + ok(rc==MMSYSERR_INVALPARAM,"waveOutGetVolume(%s,0) expected " + "MMSYSERR_INVALPARAM, got %s\n", dev_name(device),wave_out_error(rc)); rc=waveOutGetVolume(wout,&volume); ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 6b9ccb6..9a4a548 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -2425,7 +2425,12 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hW TRACE("(%p, %08lx);\n", hWaveOut, (DWORD)lpdw); - if ((wmld = MMDRV_Get(hWaveOut, MMDRV_WAVEOUT, TRUE)) == NULL) + if (lpdw == NULL) { + WARN("invalid parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if ((wmld = MMDRV_Get(hWaveOut, MMDRV_WAVEOUT, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, WODM_GETVOLUME, (DWORD_PTR)lpdw, 0L, TRUE);

1 0

Juan Lang : crypt32: Simplify OID decoding
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 2a378eff3b845f39be26dff7718f4e12fbf2e927 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a378eff3b845f39be26dff… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon May 8 23:16:22 2006 -0700 crypt32: Simplify OID decoding Use a more direct function to decode OIDs, instead of the bizarre wrapper. --- dlls/crypt32/encode.c | 236 +++++++++++++++++++++---------------------------- 1 files changed, 101 insertions(+), 135 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2a378eff3b845f39be2…

1 0

Hans Leidekker : gphoto2.ds: Added Dutch resources.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: c2a8d933ec26b8f92bc8561a1621a60911ae57c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c2a8d933ec26b8f92bc8561… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 9 10:11:17 2006 +0200 gphoto2.ds: Added Dutch resources. --- dlls/gphoto2.ds/gphoto2_Nl.rc | 53 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 54 insertions(+), 0 deletions(-) create mode 100644 dlls/gphoto2.ds/gphoto2_Nl.rc diff --git a/dlls/gphoto2.ds/gphoto2_Nl.rc b/dlls/gphoto2.ds/gphoto2_Nl.rc new file mode 100644 index 0000000..ca74faf --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Nl.rc @@ -0,0 +1,53 @@ +/* + * Dutch resources for Twain + * + * Copyright 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Bestanden op de camera" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importeer geselecteerde bestanden",IDC_IMPORT,225,252,56,14 + PUSHBUTTON "Importeer alles",IDC_IMPORTALL,7,252,52,14 + PUSHBUTTON "Afsluiten",IDC_EXIT,295,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transporteren" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Transporteren.... Even geduld",IDC_STATIC,53,19,85,8 +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Verbinden met camera" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Verbinden met camera... Even geduld",IDC_STATIC,128,58, + 116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index de52d79..cec8506 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -28,3 +28,4 @@ #include "resource.h" #include "gphoto2_En.rc" #include "gphoto2_Fr.rc" +#include "gphoto2_Nl.rc"

1 0

Hans Leidekker : sane.ds: Added Dutch resources.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 6aac40364b1f2c72f3b3b65ab4237f8c14199a15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6aac40364b1f2c72f3b3b65… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue May 9 10:11:17 2006 +0200 sane.ds: Added Dutch resources. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Nl.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 dlls/sane.ds/sane_Nl.rc diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index eca031b..b70cee8 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -30,4 +30,5 @@ #include "sane_En.rc" #include "sane_Fi.rc" #include "sane_Fr.rc" #include "sane_Ko.rc" +#include "sane_Nl.rc" #include "sane_No.rc" diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc new file mode 100644 index 0000000..7967bd4 --- /dev/null +++ b/dlls/sane.ds/sane_Nl.rc @@ -0,0 +1,40 @@ +/* + * Dutch resources for Twain + * + * Copyright 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Scannen" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SCANNEN.... Even geduld",IDC_STATIC,53,19,85,8 +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Marcus Meissner : Some documentation changes for twain split.
by Alexandre Julliard 09 May '06

09 May '06

Module: wine Branch: refs/heads/master Commit: 81c2ef541983b24829ed68ca2de3335100787b3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81c2ef541983b24829ed68c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 8 23:15:24 2006 +0200 Some documentation changes for twain split. --- DEVELOPERS-HINTS | 4 +++- documentation/PACKAGING | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index d828e9b..2e24e96 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -64,6 +64,7 @@ DLLs (under dlls/): gdi/ - GDI (graphics) glu32/ - OpenGL Utility library (graphics) glut32/ - OpenGL Utility Toolkit + gphoto2.ds/ - Contains libgphoto2 based TWAIN datasource driver hhctrl.ocx/ - HHCTRL OCX implementation iccvid/ - Radius Cinepak Video Decoder icmp/ - ICMP protocol (networking) @@ -128,6 +129,7 @@ DLLs (under dlls/): rpcrt4/ - Remote Procedure Call runtime rsabase/ - RSA encryption rsaenh/ - Crypto API (DES, 3DES, RSA, etc.) + sane.ds/ - Contains sane based TWAIN datasource driver secur32/ - Contains Windows Security functions security/ - Security Support Provider Interface sensapi/ - System Event Notification Service @@ -144,7 +146,7 @@ DLLs (under dlls/): stdole32.tlb/ - Standard OLE typelib sti/ - Still Image service tapi32/ - Telephone interface - twain/ - TWAIN Imaging device communications + twain_32/ - TWAIN Imaging device communications unicows/ - Unicows replacement (Unicode layer for Win9x) url/ - Internet shortcut shell extension urlmon/ - URL Moniker allows binding to a URL diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 0a10dbf..3443222 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -137,6 +137,12 @@ they should appear as "Suggests" or "Rec * capi4linux Used to implement our capi2032.dll. + * libgphoto2 + Used to implement our gphoto2.ds (TWAIN datasource) + + * hal, dbus-1 + Used to implement CD mount handling (via explorer.exe). + GOALS ~~~~~

1 0