April 2007 - Wine-commits - list.winehq.org

appdb/include menu.php sidebar_login.php
by WineHQ 19 Apr '07

19 Apr '07

ChangeSet ID: 31052 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/18 20:20:55 Modified files: include : menu.php sidebar_login.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Use html_tr_hightlight_clickable() in menu.php add() to make linkable rows of menus clickable. Provides visual feedback of which entry is active and enables users to click anywhere in the menu row, not just on the url. Patch: http://cvs.winehq.org/patch.py?id=31052 Old revision New revision Changes Path 1.6 1.7 +11 -7 appdb/include/menu.php 1.22 1.23 +11 -8 appdb/include/sidebar_login.php Index: appdb/include/menu.php diff -u -p appdb/include/menu.php:1.6 appdb/include/menu.php:1.7 --- appdb/include/menu.php:1.6 19 Apr 2007 1:20:55 -0000 +++ appdb/include/menu.php 19 Apr 2007 1:20:55 -0000 @@ -37,20 +37,24 @@ class htmlmenu { } /* add a table row */ - function add($name, $url = null) + function add($sName, $shUrl = null, $sAlign = "left") { - if($url) + if($shUrl) { - echo " <tr class=sideMenu><td width='100%'> <a href='$url' class=menuItem>$name</a></td></tr>\n"; - } else + // we have a valid url, make the entire table row clickable and provide some highlighting + // for visual feedback + html_tr_highlight_clickable($shUrl, "sideMenu", "#e0e6ff", "#ffffff"); + echo "<td width='100%' align=$sAlign> $sName</td>"; + echo "</tr>\n"; + } else { - echo " <tr class=sideMenu><td width='100%'> $name</td></tr>\n"; + echo " <tr class=sideMenu><td width='100%' align=$sAlign> $sName</td></tr>\n"; } } - function addmisc($stuff, $align = "left") + function addmisc($sStuff, $sAlign = "left") { - echo " <tr class=sideMenu><td width='100%' align=$align> $stuff</td></tr>\n"; + echo " <tr class=sideMenu><td width='100%' align=$sAlign> $sStuff</td></tr>\n"; } function done($form = null) Index: appdb/include/sidebar_login.php diff -u -p appdb/include/sidebar_login.php:1.22 appdb/include/sidebar_login.php:1.23 --- appdb/include/sidebar_login.php:1.22 19 Apr 2007 1:20:55 -0000 +++ appdb/include/sidebar_login.php 19 Apr 2007 1:20:55 -0000 @@ -37,8 +37,9 @@ function global_sidebar_login() { $iAppsRejected = application::objectGetEntriesCount(true, true) + version::objectGetEntriesCount(true, true); if($iAppsRejected && !$_SESSION['current']->hasPriv("admin")) - $g->addmisc("<a href='".BASE."appsubmit.php?'>Review Rejected Apps ". - "($iAppsRejected)</a>", "center"); + { + $g->add("Review Rejected Apps ($iAppsRejected)", BASE."appsubmit.php", "center"); + } $aMonitored = Monitor::getVersionsMonitored($_SESSION['current']); if($aMonitored) @@ -47,7 +48,10 @@ function global_sidebar_login() { $g->addmisc("You monitor:\n"); while(list($i, list($iAppId, $iVersionId)) = each($aMonitored)) - $g->addmisc(version::fullNameLink($iVersionId),"center"); + { + $oVersion = new version($iVersionId); + $g->add(version::fullName($iVersionId), $oVersion->objectMakeUrl(), "center"); + } } /* Display a link to the user's queued items, @@ -55,17 +59,16 @@ function global_sidebar_login() { if(!$_SESSION['current']->hasPriv("admin")) { $g->addmisc(""); - $g->addmisc("<a href=\"".BASE."queueditems.php\">Your queued items</a>"); + $g->add("Your queued items", BASE."queueditems.php"); } - } - else + } else { $g->add("Log in", BASE."account.php?sCmd=login"); $g->add("Register", BASE."account.php?sCmd=new"); } - - $g->done(); + + $g->done(); } ?>

1 0

appdb/. objectManager.php
by WineHQ 18 Apr '07

18 Apr '07

ChangeSet ID: 31051 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/18 18:18:45 Modified files: . : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Include testData_queue.php in objectManager. Document usage at the top of objectManager.php. ---------------------------------------------------------------------- Patch: http://cvs.winehq.org/patch.py?id=31051 Old revision New revision Changes Path 1.3 1.4 +19 -5 appdb/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.3 appdb/objectManager.php:1.4 --- appdb/objectManager.php:1.3 18 Apr 2007 23:18:45 -0000 +++ appdb/objectManager.php 18 Apr 2007 23:18:45 -0000 @@ -1,13 +1,27 @@ <?php +/** + * Code for displaying and processing objects that have object management + * methods. + * + * Required parameters + * sClass: The class that is to be handled + * + * Optional parameters + * sTitle: Set the title of the page + * iId: The object id when handling a specific entry + * bIsQueue: Whether we are handling a queue, set automatically if bIsRejected is true + * bIsRejected: Whether we are handling rejected entries, sets bIsQueue to true + * if enabled + * sAction: What to do, defaults to viewing the item if iId is given and to + * displaying a table of objects with the specified queue status otherwise + */ -/* code for displaying and processing objects that have object management - methods */ - -require('path.php'); -require(BASE.'include/incl.php'); +require_once('path.php'); +require_once(BASE.'include/incl.php'); require_once(BASE.'include/objectManager.php'); /* require_once(BASE.'include/application_queue.php'); require_once(BASE.'include/version_queue.php'); */ +require_once(BASE.'include/testData_queue.php'); /* if we have no valid class name we should abort */ if(!$aClean['sClass'])

1 0

Ken Thomases : shell32/tests: Added to-do test showing a bug with file paths with spaces.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 1e5a03eca48fa06130f3adec4edc1457b744ebe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5a03eca48fa06130f3adec4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 17 08:20:57 2007 -0500 shell32/tests: Added to-do test showing a bug with file paths with spaces. If ShellExecuteEx is asked to execute a file which has a space in its path, and if there exists a "masking" file whose name matches the path truncated at a space, then ShellExecuteEx launches the masking file instead. --- dlls/shell32/tests/shlexec.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f16cb72..af07de0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -480,6 +480,8 @@ static const char* testfiles[]= "%s\\test file.shl", "%s\\test file.shlfoo", "%s\\test file.sfe", + "%s\\masked file.shlexec", + "%s\\masked", NULL }; @@ -517,6 +519,9 @@ static filename_tests_t filename_tests[]= {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, + /* Test file masked due to space */ + {NULL, "%s\\masked file.shlexec", 0x1, 33}, + {NULL, NULL, 0} };

1 0

Ken Thomases : shell32: Don' t break file path at spaces in ShellExecuteEx if quoted.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 49c8388a98df45f0c95a897a74ffbecccaeafc57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c8388a98df45f0c95a897a7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 17 08:21:01 2007 -0500 shell32: Don't break file path at spaces in ShellExecuteEx if quoted. --- dlls/shell32/shlexec.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2d4a25e..debef31 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1295,6 +1295,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) WCHAR wcmd[1024]; WCHAR buffer[MAX_PATH]; BOOL done; + BOOL appKnownSingular = FALSE; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ memcpy(&sei_tmp, sei, sizeof(sei_tmp)); @@ -1322,6 +1323,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) memcpy(wszApplicationName, sei_tmp.lpFile+1, (l+1)*sizeof(WCHAR)); if (wszApplicationName[l-1] == '\"') wszApplicationName[l-1] = '\0'; + appKnownSingular = TRUE; TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName)); } else { DWORD l = strlenW(sei_tmp.lpFile)+1; @@ -1370,6 +1372,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName); + appKnownSingular = TRUE; TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } @@ -1419,6 +1422,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* open shell folder for the specified class GUID */ strcpyW(wszParameters, buffer); strcpyW(wszApplicationName, wExplorer); + appKnownSingular = TRUE; sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; } else { @@ -1438,6 +1442,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) buffer, target, sei_tmp.lpIDList, NULL, &resultLen); if (resultLen > dwApplicationNameLen) ERR("Argify buffer not large enough... truncating\n"); + appKnownSingular = FALSE; } sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; } @@ -1455,6 +1460,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) HeapFree(GetProcessHeap(), 0, wszApplicationName); dwApplicationNameLen = len+1; wszApplicationName = buf; + /* appKnownSingular unmodified */ sei_tmp.lpFile = wszApplicationName; } @@ -1495,7 +1501,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir)); /* separate out command line arguments from executable file name */ - if (!*sei_tmp.lpParameters) { + if (!*sei_tmp.lpParameters && !appKnownSingular) { /* If the executable path is quoted, handle the rest of the command line as parameters. */ if (sei_tmp.lpFile[0] == '"') { LPWSTR src = wszApplicationName/*sei_tmp.lpFile*/ + 1;

1 0

Ken Thomases : shell32/tests: Test that quoting file path prevents masking at space.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 42cd970ee01f382db6753bf1f531e4e128479473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cd970ee01f382db6753bf1f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 17 08:21:06 2007 -0500 shell32/tests: Test that quoting file path prevents masking at space. --- dlls/shell32/tests/shlexec.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index af07de0..a226667 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -521,6 +521,8 @@ static filename_tests_t filename_tests[]= /* Test file masked due to space */ {NULL, "%s\\masked file.shlexec", 0x1, 33}, + /* Test if quoting prevents the masking */ + {NULL, "%s\\masked file.shlexec", 0x40, 33}, {NULL, NULL, 0} }; @@ -556,7 +558,16 @@ static void test_filename(void) c++; } } - rc=shell_execute(test->verb, filename, NULL, NULL); + if ((test->todo & 0x40)==0) + { + rc=shell_execute(test->verb, filename, NULL, NULL); + } + else + { + char quoted[MAX_PATH + 2]; + sprintf(quoted, "\"%s\"", filename); + rc=shell_execute(test->verb, quoted, NULL, NULL); + } if (rc > 32) rc=33; if ((test->todo & 0x1)==0)

1 0

Francois Gouget : advapi32/tests: Use memcmp() instead of strcmp() so that we can check 'intrazeroed' strings.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 042a78dd0585ce04f639e24c149bfcb805c2289e URL: http://source.winehq.org/git/wine.git/?a=commit;h=042a78dd0585ce04f639e24c1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 17 14:24:38 2007 +0200 advapi32/tests: Use memcmp() instead of strcmp() so that we can check 'intrazeroed' strings. --- dlls/advapi32/tests/registry.c | 133 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2643334..cf581d7 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -20,6 +20,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdio.h> #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -37,6 +38,127 @@ static HMODULE hadvapi32; static DWORD (WINAPI *pRegGetValueA)(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); static DWORD (WINAPI *pRegDeleteTreeA)(HKEY,LPCSTR); + + +/* Debugging functions from wine/libs/wine/debug.c */ + +/* allocate some tmp string space */ +/* FIXME: this is not 100% thread-safe */ +static char *get_temp_buffer( int size ) +{ + static char *list[32]; + static long pos; + char *ret; + int idx; + + idx = ++pos % (sizeof(list)/sizeof(list[0])); + if ((ret = realloc( list[idx], size ))) list[idx] = ret; + return ret; +} + +/* default implementation of wine_dbgstr_an */ +static const char *wine_debugstr_an( const char *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; + char *dst, *res; + size_t size; + + if (!((ULONG_PTR)str >> 16)) + { + if (!str) return "(null)"; + res = get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); + return res; + } + if (n == -1) n = strlen(str); + if (n < 0) n = 0; + size = 10 + min( 300, n * 4 ); + dst = res = get_temp_buffer( size ); + *dst++ = '"'; + while (n-- > 0 && dst <= res + size - 9) + { + unsigned char c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c >= ' ' && c <= 126) + *dst++ = c; + else + { + *dst++ = '\\'; + *dst++ = 'x'; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; + } + } + } + *dst++ = '"'; + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst++ = 0; + return res; +} + +/* default implementation of wine_dbgstr_wn */ +static const char *wine_debugstr_wn( const WCHAR *str, int n ) +{ + char *dst, *res; + + if (!HIWORD(str)) + { + if (!str) return "(null)"; + res = get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); + return res; + } + if (n == -1) n = lstrlenW(str); + if (n < 0) n = 0; + else if (n > 200) n = 200; + dst = res = get_temp_buffer( n * 5 + 7 ); + *dst++ = 'L'; + *dst++ = '"'; + while (n-- > 0) + { + WCHAR c = *str++; + switch (c) + { + case '\n': *dst++ = '\\'; *dst++ = 'n'; break; + case '\r': *dst++ = '\\'; *dst++ = 'r'; break; + case '\t': *dst++ = '\\'; *dst++ = 't'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '\\': *dst++ = '\\'; *dst++ = '\\'; break; + default: + if (c >= ' ' && c <= 126) + *dst++ = (char)c; + else + { + *dst++ = '\\'; + sprintf(dst,"%04x",c); + dst+=4; + } + } + } + *dst++ = '"'; + if (*str) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst = 0; + return res; +} + + #define ADVAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hadvapi32, #func); \ if(!p ## func) \ @@ -119,8 +241,9 @@ static void test_hkey_main_Value_A(LPCSTR name, LPCSTR string, } else { - ok(strcmp(value, string) == 0, "RegQueryValueExA failed: '%s' != '%s'\n", - value, string); + ok(memcmp(value, string, cbData) == 0, "RegQueryValueExA failed: %s/%d != %s/%d\n", + wine_debugstr_an(value, cbData), cbData, + wine_debugstr_an(string, full_byte_len), full_byte_len); } HeapFree(GetProcessHeap(), 0, value); } @@ -158,7 +281,9 @@ static void test_hkey_main_Value_W(LPCWSTR name, LPCWSTR string, /* When cbData == 0, RegQueryValueExW() should not modify the buffer */ string=nW; } - ok(lstrcmpW(value, string) == 0, "the string RegQueryValueExW is wrong\n"); + ok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", + wine_debugstr_wn(value, cbData), cbData, + wine_debugstr_wn(string, full_byte_len), full_byte_len); HeapFree(GetProcessHeap(), 0, value); } @@ -170,7 +295,7 @@ static void test_set_value(void) static const WCHAR name2W[] = {'S','o','m','e','I','n','t','r','a','Z','e','r','o','e','d','S','t','r','i','n','g', 0}; static const WCHAR emptyW[] = {0}; static const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; - static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 0 ,'L','o','t', 0 , 0 , 0 , 0}; + static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 'L','o','t', 0 , 0 , 0 , 0, 0}; static const char name1A[] = "CleanSingleString"; static const char name2A[] = "SomeIntraZeroedString";

1 0

Bernd Buschinski : wined3d: Fix drawStridedSlow typo.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: aff22d0472a285449b17bdd913143391e8bb08b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff22d0472a285449b17bdd91… Author: Bernd Buschinski <b.buschinski(a)web.de> Date: Sat Apr 14 02:57:37 2007 +0200 wined3d: Fix drawStridedSlow typo. --- dlls/wined3d/drawprim.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9ec6142..dfed5c5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -510,10 +510,10 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData if (sd->u.s.normal.lpData == NULL) { glNormal3f(0, 0, 1); } - if(sd->u.s.diffuse.lpData != NULL) { + if(sd->u.s.diffuse.lpData == NULL) { glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } - if(sd->u.s.specular.lpData != NULL) { + if(sd->u.s.specular.lpData == NULL) { if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); }

1 0

Stefan Dösinger : d3d9: Rework the converted vertex declaration management.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 725f4bfeb10fb1b7574df46e7f6492ab3f581970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725f4bfeb10fb1b7574df46e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 17 20:04:26 2007 +0200 d3d9: Rework the converted vertex declaration management. Instead of creating a converted declaration each time SetFVF is called, exactly one declaration is created for each FVF(on demand) and stored for the lifetime of the device. This avoids memory leaks and makes keeping track of converted declarations easier. Wether a declaration is converted from a fvf or not is now a static information inside the declaration. Those declarations are not destroyed in VertexDeclaration::Release, they stay for the lifetime of the device. This keeps us free from tracking the declaration through stateblocks --- dlls/d3d9/d3d9_private.h | 11 ++-- dlls/d3d9/device.c | 87 +++++++++++++++++++++++++++++------ dlls/d3d9/directx.c | 5 ++ dlls/d3d9/tests/vertexdeclaration.c | 25 ++++++++-- dlls/d3d9/vertexdeclaration.c | 30 ++++++------ 5 files changed, 118 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=725f4bfeb10fb1b7574df…

1 0

José Manuel Ferrer Ortiz : winspool. drv: Add Spanish resources.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 730083f219cf1daa7cc67beefde16cc6bfa67021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730083f219cf1daa7cc67beef… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Tue Apr 17 15:44:07 2007 -0700 winspool.drv: Add Spanish resources. --- dlls/winspool.drv/Es.rc | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.rc | 1 + 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/Es.rc b/dlls/winspool.drv/Es.rc new file mode 100644 index 0000000..32d6e4d --- /dev/null +++ b/dlls/winspool.drv/Es.rc @@ -0,0 +1,38 @@ +/* + * Spanish resources for winspool + * + * Copyright 2007 Jos� Manuel Ferrer Ortiz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Imprimir en archivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nombre del archivo:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Cancelar", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_CAPTION "Puerto local" + IDS_FILE_EXISTS "El archivo de salida ya existe. Pulse Aceptar para sobreescribir." + IDS_CANNOT_OPEN "Incapaz de crear el archivo de salida." +} diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 3ca9dda..a5b4328 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -43,6 +43,7 @@ #include "De.rc" #include "En.rc" #include "Eo.rc" +#include "Es.rc" #include "Fi.rc" #include "Fr.rc" #include "It.rc"

1 0

Andrew Talbot : uxtheme: Fix conflicting declarations.
by Alexandre Julliard 18 Apr '07

18 Apr '07

Module: wine Branch: master Commit: 74018333d87beb47dd01004cc93f16cf47a89eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=74018333d87beb47dd01004cc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Apr 18 07:30:13 2007 +0100 uxtheme: Fix conflicting declarations. --- dlls/uxtheme/msstyles.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 0eef06c..1d02725 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -82,7 +82,7 @@ typedef struct _THEME_FILE { PTHEME_IMAGE images; } THEME_FILE, *PTHEME_FILE; -typedef void* PUXINI_FILE; +typedef struct _UXINI_FILE *PUXINI_FILE; HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWSTR pszSizeName, PTHEME_FILE *tf); void MSSTYLES_CloseThemeFile(PTHEME_FILE tf);

1 0