February 2006 - Wine-commits

Maarten Lankhorst : riched20: Implement CreateTextServices.
by Alexandre Julliard 01 Feb '06

01 Feb '06

Module: wine Branch: refs/heads/master Commit: 460e2ad7f6197ef3c6f092d4042d02689f11aca5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=460e2ad7f6197ef3c6f092d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 1 12:31:40 2006 +0100 riched20: Implement CreateTextServices. Implement a stub interface that CreateTextServices returns. --- dlls/riched20/Makefile.in | 3 dlls/riched20/editor.c | 14 -- dlls/riched20/txtsrv.c | 390 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 392 insertions(+), 15 deletions(-) create mode 100644 dlls/riched20/txtsrv.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=460e2ad7f6197ef3c6f…

1 0

Detlef Riekenberg : winspool.h: Add missing declarations.
by Alexandre Julliard 01 Feb '06

01 Feb '06

Module: wine Branch: refs/heads/master Commit: c30ac0772d08b57f060f921037d15648f7b9fd77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c30ac0772d08b57f060f921… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 1 12:31:55 2006 +0100 winspool.h: Add missing declarations. --- include/winspool.h | 172 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 159 insertions(+), 13 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index 884da16..6b551aa 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -28,20 +28,20 @@ extern "C" { /* DEFINES */ -#define PRINTER_ATTRIBUTE_QUEUED 0x00000001 -#define PRINTER_ATTRIBUTE_DIRECT 0x00000002 -#define PRINTER_ATTRIBUTE_DEFAULT 0x00000004 -#define PRINTER_ATTRIBUTE_SHARED 0x00000008 -#define PRINTER_ATTRIBUTE_NETWORK 0x00000010 -#define PRINTER_ATTRIBUTE_HIDDEN 0x00000020 -#define PRINTER_ATTRIBUTE_LOCAL 0x00000040 - +#define PRINTER_ATTRIBUTE_QUEUED 0x00000001 +#define PRINTER_ATTRIBUTE_DIRECT 0x00000002 +#define PRINTER_ATTRIBUTE_DEFAULT 0x00000004 +#define PRINTER_ATTRIBUTE_SHARED 0x00000008 +#define PRINTER_ATTRIBUTE_NETWORK 0x00000010 +#define PRINTER_ATTRIBUTE_HIDDEN 0x00000020 +#define PRINTER_ATTRIBUTE_LOCAL 0x00000040 #define PRINTER_ATTRIBUTE_ENABLE_DEVQ 0x00000080 #define PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS 0x00000100 #define PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST 0x00000200 - -#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x00000400 -#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x00000800 +#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x00000400 +#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x00000800 +#define PRINTER_ATTRIBUTE_RAW_ONLY 0x00001000 +#define PRINTER_ATTRIBUTE_PUBLISHED 0x00002000 #define PRINTER_CONTROL_PAUSE 1 #define PRINTER_CONTROL_RESUME 2 @@ -69,6 +69,7 @@ extern "C" { #define PRINTER_ENUM_ICON6 0x00200000 #define PRINTER_ENUM_ICON7 0x00400000 #define PRINTER_ENUM_ICON8 0x00800000 +#define PRINTER_ENUM_HIDE 0x01000000 /* various printer statuses */ @@ -301,7 +302,7 @@ DECL_WINELIB_TYPE_AW(PDRIVER_INFO_1) DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_1) typedef struct _DRIVER_INFO_2A { - DWORD cVersion; + DWORD cVersion; LPSTR pName; LPSTR pEnvironment; LPSTR pDriverPath; @@ -310,7 +311,7 @@ typedef struct _DRIVER_INFO_2A { } DRIVER_INFO_2A, *PDRIVER_INFO_2A, *LPDRIVER_INFO_2A; typedef struct _DRIVER_INFO_2W { - DWORD cVersion; + DWORD cVersion; LPWSTR pName; LPWSTR pEnvironment; LPWSTR pDriverPath; @@ -352,6 +353,112 @@ DECL_WINELIB_TYPE_AW(DRIVER_INFO_3) DECL_WINELIB_TYPE_AW(PDRIVER_INFO_3) DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_3) +typedef struct _DRIVER_INFO_4A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; +} DRIVER_INFO_4A, *PDRIVER_INFO_4A, *LPDRIVER_INFO_4A; + +typedef struct _DRIVER_INFO_4W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; +} DRIVER_INFO_4W, *PDRIVER_INFO_4W, *LPDRIVER_INFO_4W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_4) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_4) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_4) + + +typedef struct _DRIVER_INFO_5A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; +} DRIVER_INFO_5A, *PDRIVER_INFO_5A, *LPDRIVER_INFO_5A; + +typedef struct _DRIVER_INFO_5W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; +} DRIVER_INFO_5W, *PDRIVER_INFO_5W, *LPDRIVER_INFO_5W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_5) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_5) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_5) + +typedef struct _DRIVER_INFO_6A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; +} DRIVER_INFO_6A, *PDRIVER_INFO_6A, *LPDRIVER_INFO_6A; + +typedef struct _DRIVER_INFO_6W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; +} DRIVER_INFO_6W, *PDRIVER_INFO_6W, *LPDRIVER_INFO_6W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_6) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_6) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_6) + + typedef struct _PRINTER_INFO_1A { DWORD Flags; LPSTR pDescription; @@ -471,6 +578,45 @@ typedef struct _PRINTER_INFO_6 { DWORD dwStatus; } PRINTER_INFO_6, *PPRINTER_INFO_6, *LPPRINTER_INFO_6; +typedef struct _PRINTER_INFO_7A { + LPSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7A, *PPRINTER_INFO_7A, *LPPRINTER_INFO_7A; + +typedef struct _PRINTER_INFO_7W { + LPWSTR pszObjectGUID; + DWORD dwAction; +} PRINTER_INFO_7W, *PPRINTER_INFO_7W, *LPPRINTER_INFO_7W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_7) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_7) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_7) + +typedef struct _PRINTER_INFO_8A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_8A, *PPRINTER_INFO_8A, *LPPRINTER_INFO_8A; + +typedef struct _PRINTER_INFO_8W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_8W, *PPRINTER_INFO_8W, *LPPRINTER_INFO_8W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_8) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_8) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_8) + +typedef struct _PRINTER_INFO_9A { + LPDEVMODEA pDevMode; +} PRINTER_INFO_9A, *PPRINTER_INFO_9A, *LPPRINTER_INFO_9A; + +typedef struct _PRINTER_INFO_9W { + LPDEVMODEW pDevMode; +} PRINTER_INFO_9W, *PPRINTER_INFO_9W, *LPPRINTER_INFO_9W; + +DECL_WINELIB_TYPE_AW(PRINTER_INFO_9) +DECL_WINELIB_TYPE_AW(PPRINTER_INFO_9) +DECL_WINELIB_TYPE_AW(LPPRINTER_INFO_9) + + typedef struct _JOB_INFO_1A { DWORD JobId; LPSTR pPrinterName;

1 0

Dmitry Timoshkov : shell32: execute_from_key should fallback to a DDE exec only if the
by Alexandre Julliard 01 Feb '06

01 Feb '06

Module: wine Branch: refs/heads/master Commit: 22204c2c805306d8faf7ac8352e16e554d17d20c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22204c2c805306d8faf7ac8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 1 12:29:39 2006 +0100 shell32: execute_from_key should fallback to a DDE exec only if the command to execute from is not found in the registry. Pass already found executable name to dde_connect. --- dlls/shell32/shlexec.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 8290639..14739d6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -705,7 +705,7 @@ static HDDEDATA CALLBACK dde_cb(UINT uTy * launching an application and trying (#2) to connect to it * */ -static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec, +static unsigned dde_connect(WCHAR* key, const WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) @@ -790,7 +790,7 @@ static unsigned dde_connect(WCHAR* key, */ if (unicode) hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0, - XTYP_EXECUTE, 10000, &tid); + XTYP_EXECUTE, 30000, &tid); else { DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL); @@ -818,18 +818,36 @@ static unsigned dde_connect(WCHAR* key, * execute_from_key [Internal] */ static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, + LPCWSTR executable_name, SHELL_ExecuteW32 execfunc, LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) { - WCHAR cmd[1024]; + WCHAR cmd[256]; LONG cmdlen = sizeof(cmd); UINT_PTR retval = 31; + TRACE("%s %s %s %s %s\n", debugstr_w(key), debugstr_w(lpFile), debugstr_w(env), + debugstr_w(szCommandline), debugstr_w(executable_name)); + cmd[0] = '\0'; - /* Get the application for the registry */ + /* Get the application from the registry */ if (RegQueryValueW(HKEY_CLASSES_ROOT, key, cmd, &cmdlen) == ERROR_SUCCESS) { + WCHAR param[1024]; + + TRACE("got cmd: %s\n", debugstr_w(cmd)); + + param[0] = '\0'; + + /* Is there a replace() function anywhere? */ + cmdlen /= sizeof(WCHAR); + cmd[cmdlen] = '\0'; + SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); + retval = execfunc(param, env, FALSE, psei, psei_out); + } + else + { static const WCHAR wCommand[] = {'c','o','m','m','a','n','d',0}; static const WCHAR wDdeexec[] = {'d','d','e','e','x','e','c',0}; LPWSTR tmp; @@ -844,21 +862,16 @@ static UINT_PTR execute_from_key(LPWSTR assert(tmp); strcpyW(tmp, wDdeexec); + TRACE("trying ddeexec cmd: %s\n", debugstr_w(key)); + if (RegQueryValueW(HKEY_CLASSES_ROOT, key, param, &paramlen) == ERROR_SUCCESS) { TRACE("Got ddeexec %s => %s\n", debugstr_w(key), debugstr_w(param)); - retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out); + retval = dde_connect(key, executable_name, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out); } else - { - /* Is there a replace() function anywhere? */ - cmdlen /= sizeof(WCHAR); - cmd[cmdlen] = '\0'; - SHELL_ArgifyW(param, sizeof(param)/sizeof(WCHAR), cmd, lpFile, psei->lpIDList, szCommandline); - retval = execfunc(param, env, FALSE, psei, psei_out); - } + WARN("Nothing appropriate found for %s\n", debugstr_w(key)); } - else TRACE("ooch\n"); return retval; } @@ -1448,7 +1461,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW } TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(sei_tmp.lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol)); if (*lpstrProtocol) - retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, wcmd, execfunc, &sei_tmp, sei); else retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei); HeapFree( GetProcessHeap(), 0, env ); @@ -1481,7 +1494,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW lpFile += iSize; while (*lpFile == ':') lpFile++; } - retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, wcmd, execfunc, &sei_tmp, sei); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3))

1 0

Dmitry Timoshkov : Translate pen width from logical units only for geometric pens.
by Alexandre Julliard 01 Feb '06

01 Feb '06

Module: wine Branch: refs/heads/master Commit: ef4fc8fd91fba52322a2e1cee55ec2abbd82d1a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4fc8fd91fba52322a2e1c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 1 12:30:15 2006 +0100 Translate pen width from logical units only for geometric pens. --- dlls/wineps/pen.c | 9 ++++++--- dlls/x11drv/pen.c | 9 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c index 590acaf..9f92cbe 100644 --- a/dlls/wineps/pen.c +++ b/dlls/wineps/pen.c @@ -58,9 +58,12 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *phy TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor); - physDev->pen.width = PSDRV_XWStoDS(physDev, logpen.lopnWidth.x); - if(physDev->pen.width < 0) - physDev->pen.width = -physDev->pen.width; + physDev->pen.width = logpen.lopnWidth.x; + if (logpen.lopnStyle & PS_GEOMETRIC) + { + physDev->pen.width = PSDRV_XWStoDS( physDev, physDev->pen.width ); + if(physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; + } PSDRV_CreateColor(physDev, &physDev->pen.color, logpen.lopnColor); physDev->pen.style = logpen.lopnStyle & PS_STYLE_MASK; diff --git a/dlls/x11drv/pen.c b/dlls/x11drv/pen.c index 2db5136..8fb1fa3 100644 --- a/dlls/x11drv/pen.c +++ b/dlls/x11drv/pen.c @@ -58,8 +58,13 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p physDev->pen.endcap = logpen.lopnStyle & PS_ENDCAP_MASK; physDev->pen.linejoin = logpen.lopnStyle & PS_JOIN_MASK; - physDev->pen.width = X11DRV_XWStoDS( physDev, logpen.lopnWidth.x ); - if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; + physDev->pen.width = logpen.lopnWidth.x; + if (logpen.lopnStyle & PS_GEOMETRIC) + { + physDev->pen.width = X11DRV_XWStoDS( physDev, physDev->pen.width ); + if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; + } + if (physDev->pen.width == 1) physDev->pen.width = 0; /* Faster */ if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( physDev->hdc );

1 0

Robert Shearman : widl: Fix a SEGV when using arrays declared using a pointer and
by Alexandre Julliard 01 Feb '06

01 Feb '06

Module: wine Branch: refs/heads/master Commit: 0d4e1bc33679f4997f0d178ee88000914794f3bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d4e1bc33679f4997f0d178… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 1 12:29:23 2006 +0100 widl: Fix a SEGV when using arrays declared using a pointer and attributes, instead of array indices (reported by Eric Kohl). --- tools/widl/typegen.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8b6e081..546e693 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -639,7 +639,7 @@ static size_t write_array_tfs(FILE *file /* FIXME: need to analyse type for pointers */ - if (NEXT_LINK(array)) /* multi-dimensional array */ + if (array && NEXT_LINK(array)) /* multi-dimensional array */ { error("write_array_tfs: Multi-dimensional arrays not implemented yet (param %s)\n", name); return 0; @@ -1170,7 +1170,7 @@ void marshall_arguments(FILE *file, int int has_length = length_is && (length_is->type != EXPR_VOID); int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const; - if (NEXT_LINK(var->array)) /* multi-dimensional array */ + if (var->array && NEXT_LINK(var->array)) /* multi-dimensional array */ array_type = "ComplexArray"; else { @@ -1364,7 +1364,7 @@ void unmarshall_arguments(FILE *file, in int has_length = length_is && (length_is->type != EXPR_VOID); int has_size = (size_is && (size_is->type != EXPR_VOID)) || !var->array->is_const; - if (NEXT_LINK(var->array)) /* multi-dimensional array */ + if (var->array && NEXT_LINK(var->array)) /* multi-dimensional array */ array_type = "ComplexArray"; else {

1 0

docs/en wine-faq.sgml
by Dimi Paun 31 Jan '06

31 Jan '06

ChangeSet ID: 1138769225678170579326437 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/01/31 20:47:05 Modified files: en : wine-faq.sgml Log message: Roger Ye <roger.ye(a)gmail.com> Fix trivial typo. Old revision New revision Changes Path 1.14 1.15 +1 -1 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.14 docs/en/wine-faq.sgml:1.15 --- docs/en/wine-faq.sgml 1 Feb 2006 4:47: 5 -0000 +++ /dev/null 1 Feb 2006 4:47: 5 -0000 @@ -1034,7 +1034,7 @@ wine <para> As of Wine release 20050725 the config file has been disabled and the values are now stored instead in registry files in your .wine directory. - The preferred method to configure Wine is with winecfg, winefcg is a + The preferred method to configure Wine is with winecfg, winecfg is a tool to make it easy for new users to edit some of the contents of there registry files. </para>

1 0