November 2005 - Wine-Commits

wine/dlls/kernel/tests path.c
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21210 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:16:20 Modified files: dlls/kernel/tests: path.c Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Add error code valid for Win9x and XP. Patch: http://cvs.winehq.org/patch.py?id=21210 Old revision New revision Changes Path 1.30 1.31 +4 -2 wine/dlls/kernel/tests/path.c Index: wine/dlls/kernel/tests/path.c diff -u -p wine/dlls/kernel/tests/path.c:1.30 wine/dlls/kernel/tests/path.c:1.31 --- wine/dlls/kernel/tests/path.c:1.30 10 Nov 2005 11:16:20 -0000 +++ wine/dlls/kernel/tests/path.c 10 Nov 2005 11:16:20 -0000 @@ -364,10 +364,12 @@ static void test_InitPathA(CHAR *newdir, sprintf(tmpstr,"%s\\%s",newdir,LONGDIR); ok(CreateDirectoryA(tmpstr,NULL),"CreateDirectoryA failed\n"); bRes = CreateDirectoryA("c:",NULL); - ok(!bRes && GetLastError() == ERROR_ACCESS_DENIED, + ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == ERROR_ALREADY_EXISTS), "CreateDirectoryA(\"c:\" should have failed (%ld)\n", GetLastError()); bRes = CreateDirectoryA("c:\\",NULL); - ok(!bRes && GetLastError() == ERROR_ACCESS_DENIED, + ok(!bRes && (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == ERROR_ALREADY_EXISTS), "CreateDirectoryA(\"c:\\\" should have failed (%ld)\n", GetLastError()); sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,SHORTFILE); hndl=CreateFileA(tmpstr,GENERIC_WRITE,0,NULL,

1 0

wine/dlls/shell32 systray.c shlmenu.c shlfileo ...
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21209 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:15:23 Modified files: dlls/shell32 : systray.c shlmenu.c shlfileop.c shellstring.c shellpath.c shellord.c shellole.c shell.c pidl.c brsfolder.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing description - add missing returns section - complete missing A/W pairs - reformate comments, to match c2man requirements Patch: http://cvs.winehq.org/patch.py?id=21209 Old revision New revision Changes Path 1.32 1.33 +1 -1 wine/dlls/shell32/systray.c 1.41 1.42 +2 -0 wine/dlls/shell32/shlmenu.c 1.55 1.56 +12 -4 wine/dlls/shell32/shlfileop.c 1.29 1.30 +1 -1 wine/dlls/shell32/shellstring.c 1.106 1.107 +22 -11 wine/dlls/shell32/shellpath.c 1.136 1.137 +29 -8 wine/dlls/shell32/shellord.c 1.86 1.87 +1 -1 wine/dlls/shell32/shellole.c 1.67 1.68 +5 -4 wine/dlls/shell32/shell.c 1.136 1.137 +10 -0 wine/dlls/shell32/pidl.c 1.66 1.67 +1 -1 wine/dlls/shell32/brsfolder.c

1 0

wine/dlls dxerr9/errors.h dxerr9/errors.dat dx ...
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21208 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:13:00 Modified files: dlls/dxerr9 : errors.h errors.dat dlls/dxerr8 : errors.h errors.dat Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes in the DXErr8/9 error files. Patch: http://cvs.winehq.org/patch.py?id=21208 Old revision New revision Changes Path 1.2 1.3 +34 -34 wine/dlls/dxerr9/errors.h 1.2 1.3 +17 -17 wine/dlls/dxerr9/errors.dat 1.2 1.3 +28 -28 wine/dlls/dxerr8/errors.h 1.2 1.3 +14 -14 wine/dlls/dxerr8/errors.dat

1 0

wine/dlls dxerr9/errors.awk dxerr8/errors.awk
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21207 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:07:20 Modified files: dlls/dxerr9 : errors.awk dlls/dxerr8 : errors.awk Log message: Francois Gouget <fgouget(a)free.fr> Remove extra backslash that was causing an awk warning. Patch: http://cvs.winehq.org/patch.py?id=21207 Old revision New revision Changes Path 1.3 1.4 +1 -1 wine/dlls/dxerr9/errors.awk 1.3 1.4 +1 -1 wine/dlls/dxerr8/errors.awk Index: wine/dlls/dxerr9/errors.awk diff -u -p wine/dlls/dxerr9/errors.awk:1.3 wine/dlls/dxerr9/errors.awk:1.4 --- wine/dlls/dxerr9/errors.awk:1.3 10 Nov 2005 11: 7:20 -0000 +++ wine/dlls/dxerr9/errors.awk 10 Nov 2005 11: 7:20 -0000 @@ -51,7 +51,7 @@ BEGIN { i = 1 len = length(array[word]) + 1 while (i < len) { - if (substr(array[word],i,1) == "\'") + if (substr(array[word],i,1) == "'") printf "'\\''," else printf "'%s',", substr(array[word],i,1) Index: wine/dlls/dxerr8/errors.awk diff -u -p wine/dlls/dxerr8/errors.awk:1.3 wine/dlls/dxerr8/errors.awk:1.4 --- wine/dlls/dxerr8/errors.awk:1.3 10 Nov 2005 11: 7:20 -0000 +++ wine/dlls/dxerr8/errors.awk 10 Nov 2005 11: 7:20 -0000 @@ -51,7 +51,7 @@ BEGIN { i = 1 len = length(array[word]) + 1 while (i < len) { - if (substr(array[word],i,1) == "\'") + if (substr(array[word],i,1) == "'") printf "'\\''," else printf "'%s',", substr(array[word],i,1)

1 0

wine/programs regedit/rsrc.rc clock/rsrc.rc re ...
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21206 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:06:34 Modified files: programs/regedit: rsrc.rc programs/clock : rsrc.rc Added files: programs/regedit: Ko.rc programs/clock : Ko.rc Log message: Mike McCormack <mike(a)codeweavers.com> Added Korean resources. Patch: http://cvs.winehq.org/patch.py?id=21206 Old revision New revision Changes Path 1.16 1.17 +1 -0 wine/programs/regedit/rsrc.rc Added 1.1 +0 -0 wine/programs/regedit/Ko.rc 1.16 1.17 +1 -0 wine/programs/clock/rsrc.rc Added 1.1 +0 -0 wine/programs/clock/Ko.rc

1 0

wine/programs/start start.c
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21205 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:06:15 Modified files: programs/start : start.c Log message: Mike McCormack <mike(a)codeweavers.com> Remove the limit on the length of the command line. Patch: http://cvs.winehq.org/patch.py?id=21205 Old revision New revision Changes Path 1.2 1.3 +29 -18 wine/programs/start/start.c Index: wine/programs/start/start.c diff -u -p wine/programs/start/start.c:1.2 wine/programs/start/start.c:1.3 --- wine/programs/start/start.c:1.2 10 Nov 2005 11: 6:15 -0000 +++ wine/programs/start/start.c 10 Nov 2005 11: 6:15 -0000 @@ -101,12 +101,25 @@ static void license(void) fatal_string(STRING_LICENSE); } +static char *build_args( int argc, char **argv ) +{ + int i, len = 1; + char *ret, *p; + + for (i = 0; i < argc; i++ ) + len += strlen(argv[i]) + 1; + ret = HeapAlloc( GetProcessHeap(), 0, len ); + + for (i = 0, p = ret; i < argc; i++ ) + p += sprintf(p, " %s", argv[i]); + return ret; +} + int main(int argc, char *argv[]) { - char arguments[MAX_PATH]; - char *p; SHELLEXECUTEINFO sei; - int argi; + char *args; + int i; memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -119,24 +132,24 @@ int main(int argc, char *argv[]) * flags start with /, are case insensitive, * and may be run together in same word. */ - for (argi=1; argi<argc; argi++) { + for (i=1; i<argc; i++) { int ci; - if (argv[argi][0] != '/') + if (argv[i][0] != '/') break; /* Handle all options in this word */ - for (ci=0; argv[argi][ci]; ) { + for (ci=0; argv[i][ci]; ) { /* Skip slash */ ci++; - switch(argv[argi][ci]) { + switch(argv[i][ci]) { case 'l': case 'L': license(); break; /* notreached */ case 'm': case 'M': - if (argv[argi][ci+1] == 'a' || argv[argi][ci+1] == 'A') + if (argv[i][ci+1] == 'a' || argv[i][ci+1] == 'A') sei.nShow = SW_SHOWMAXIMIZED; else sei.nShow = SW_SHOWMINIMIZED; @@ -150,30 +163,28 @@ int main(int argc, char *argv[]) sei.fMask |= SEE_MASK_NOCLOSEPROCESS; break; default: - printf("Option '%s' not recognized\n", argv[argi]+ci-1); + printf("Option '%s' not recognized\n", argv[i]+ci-1); usage(); } /* Skip to next slash */ - while (argv[argi][ci] && (argv[argi][ci] != '/')) + while (argv[i][ci] && (argv[i][ci] != '/')) ci++; } } - if (argi == argc) + if (i == argc) usage(); - sei.lpFile = argv[argi++]; - - /* FIXME - prone to overflow */ - arguments[0] = 0; - for (p = arguments; argi < argc; argi++) - p += sprintf(p, " %s", argv[argi]); + sei.lpFile = argv[i++]; - sei.lpParameters = arguments; + args = build_args( argc - i, &argv[i] ); + sei.lpParameters = args; if (!ShellExecuteEx(&sei)) fatal_string_error(STRING_EXECFAIL, GetLastError()); + HeapFree( GetProcessHeap(), 0, args ); + if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; DWORD waitcode;

1 0

wine/dlls/msi msi.c
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21204 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:06:04 Modified files: dlls/msi : msi.c Log message: Aric Stewart <aric(a)codeweavers.com> Use MsiDecomposeDescriptorW in MsiProvideQualifiedComponentExW. Patch: http://cvs.winehq.org/patch.py?id=21204 Old revision New revision Changes Path 1.115 1.116 +8 -25 wine/dlls/msi/msi.c Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.115 wine/dlls/msi/msi.c:1.116 --- wine/dlls/msi/msi.c:1.115 10 Nov 2005 11: 6: 4 -0000 +++ wine/dlls/msi/msi.c 10 Nov 2005 11: 6: 4 -0000 @@ -1491,6 +1491,9 @@ end: return ret; } +/*********************************************************************** + * MsiProvideQualifiedComponentExW [MSI.@] + */ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, DWORD Unused1, DWORD Unused2, LPWSTR lpPathBuf, @@ -1500,10 +1503,9 @@ UINT WINAPI MsiProvideQualifiedComponent UINT rc; LPWSTR info; DWORD sz; - LPWSTR product = NULL; - LPWSTR component = NULL; - LPWSTR ptr; - GUID clsid; + WCHAR product[MAX_FEATURE_CHARS+1]; + WCHAR component[MAX_FEATURE_CHARS+1]; + WCHAR feature[MAX_FEATURE_CHARS+1]; TRACE("%s %s %li %s %li %li %p %p\n", debugstr_w(szComponent), debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), @@ -1530,25 +1532,8 @@ UINT WINAPI MsiProvideQualifiedComponent return ERROR_INDEX_ABSENT; } - /* find the component */ - ptr = strchrW(&info[20],'>'); - if (ptr) - ptr++; - else - { - RegCloseKey(hkey); - msi_free(info); - return ERROR_INDEX_ABSENT; - } - - if (!szProduct) - { - decode_base85_guid(info,&clsid); - StringFromCLSID(&clsid, &product); - } - decode_base85_guid(ptr,&clsid); - StringFromCLSID(&clsid, &component); - + MsiDecomposeDescriptorW(info, product, feature, component, &sz); + if (!szProduct) rc = MsiGetComponentPathW(product, component, lpPathBuf, pcchPathBuf); else @@ -1556,8 +1541,6 @@ UINT WINAPI MsiProvideQualifiedComponent RegCloseKey(hkey); msi_free(info); - msi_free(product); - msi_free(component); if (rc == INSTALLSTATE_LOCAL) return ERROR_SUCCESS;

1 0

wine/dlls/uxtheme system.c
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21203 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:05:45 Modified files: dlls/uxtheme : system.c Log message: Markus Amsler <markus.amsler(a)oribi.org> Improve c2man Documented-Total count. Changes: - add missing returns section Patch: http://cvs.winehq.org/patch.py?id=21203 Old revision New revision Changes Path 1.26 1.27 +31 -1 wine/dlls/uxtheme/system.c Index: wine/dlls/uxtheme/system.c diff -u -p wine/dlls/uxtheme/system.c:1.26 wine/dlls/uxtheme/system.c:1.27 --- wine/dlls/uxtheme/system.c:1.26 10 Nov 2005 11: 5:45 -0000 +++ wine/dlls/uxtheme/system.c 10 Nov 2005 11: 5:45 -0000 @@ -600,7 +600,13 @@ HTHEME WINAPI OpenThemeData(HWND hwnd, L /*********************************************************************** * GetWindowTheme (UXTHEME.@) * - * Retrieve the last theme opened for a window + * Retrieve the last theme opened for a window. + * + * PARAMS + * hwnd [I] window to retrieve the theme for + * + * RETURNS + * The most recent theme. */ HTHEME WINAPI GetWindowTheme(HWND hwnd) { @@ -788,6 +794,10 @@ DWORD WINAPI QueryThemeServices() * pszColorName Color defined in the theme, eg. NormalColor * pszSizeName Size defined in the theme, eg. NormalSize * hThemeFile Handle to theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI OpenThemeFile(LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, HTHEMEFILE *hThemeFile, @@ -806,6 +816,10 @@ HRESULT WINAPI OpenThemeFile(LPCWSTR psz * * PARAMS * hThemeFile Handle to theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI CloseThemeFile(HTHEMEFILE hThemeFile) { @@ -824,6 +838,10 @@ HRESULT WINAPI CloseThemeFile(HTHEMEFILE * unknown See notes * hWnd Window requesting the theme change * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code + * * NOTES * I'm not sure what the second parameter is (the datatype is likely wrong), other then this: * Under XP if I pass @@ -854,6 +872,10 @@ HRESULT WINAPI ApplyTheme(HTHEMEFILE hTh * dwColorNameLen Length, in characters, of color name buffer * pszSizeName Buffer to receive the default size name * dwSizeNameLen Length, in characters, of size name buffer + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI GetThemeDefaults(LPCWSTR pszThemeFileName, LPWSTR pszColorName, DWORD dwColorNameLen, LPWSTR pszSizeName, @@ -885,6 +907,10 @@ HRESULT WINAPI GetThemeDefaults(LPCWSTR * pszThemePath Path containing themes * callback Called for each theme found in path * lpData Passed through to callback + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, EnumThemeProc callback, LPVOID lpData) @@ -1097,6 +1123,10 @@ HRESULT WINAPI ParseThemeIniFile(LPCWSTR * * PARAMS * pszIniFileName Path to a theme file + * + * RETURNS + * Success: S_OK + * Failure: HRESULT error-code */ HRESULT WINAPI CheckThemeSignature(LPCWSTR pszThemeFileName) {

1 0

wine/ include/wingdi.h dlls/x11drv/init.c
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21202 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:05:30 Modified files: include : wingdi.h dlls/x11drv : init.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Added support for SHADEBLENDCAPS. Patch: http://cvs.winehq.org/patch.py?id=21202 Old revision New revision Changes Path 1.128 1.129 +10 -1 wine/include/wingdi.h 1.22 1.23 +2 -0 wine/dlls/x11drv/init.c Index: wine/include/wingdi.h diff -u -p wine/include/wingdi.h:1.128 wine/include/wingdi.h:1.129 --- wine/include/wingdi.h:1.128 10 Nov 2005 11: 5:30 -0000 +++ wine/include/wingdi.h 10 Nov 2005 11: 5:30 -0000 @@ -1635,6 +1635,8 @@ typedef struct tagEXTLOGPEN #define DESKTOPVERTRES 117 #define DESKTOPHORZRES 118 #define BTLALIGNMENT 119 +#define SHADEBLENDCAPS 120 +#define COLORMGMTCAPS 121 /* TECHNOLOGY */ #define DT_PLOTTER 0 @@ -1725,7 +1727,6 @@ typedef struct tagEXTLOGPEN #define RC_DEVBITS 0x8000 /* CAPS1 */ - #define C1_TRANSPARENT 0x0001 #define TC_TT_ABLE 0x0002 #define C1_TT_CR_ANY 0x0004 @@ -1740,6 +1741,14 @@ typedef struct tagEXTLOGPEN #define C1_CMYK_ABLE 0x1000 #define C1_SLOW_CARD 0x2000 +/* SHADEBLENDCAPS */ +#define SB_NONE 0x0000 +#define SB_CONST_ALPHA 0x0001 +#define SB_PIXEL_ALPHA 0x0002 +#define SB_PREMULT_ALPHA 0x0004 +#define SB_GRAD_RECT 0x0010 +#define SB_GRAD_TRI 0x0020 + /* Device-independent bitmaps */ typedef struct { Index: wine/dlls/x11drv/init.c diff -u -p wine/dlls/x11drv/init.c:1.22 wine/dlls/x11drv/init.c:1.23 --- wine/dlls/x11drv/init.c:1.22 10 Nov 2005 11: 5:30 -0000 +++ wine/dlls/x11drv/init.c 10 Nov 2005 11: 5:30 -0000 @@ -227,6 +227,8 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | (palette_size ? RC_PALETTE : 0)); + case SHADEBLENDCAPS: + return (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); case ASPECTX: case ASPECTY: return 36;

1 0

wine/ include/wine/wined3d_gl.h dlls/wined3d/d ...
by Alexandre Julliard Nov. 10, 2005

Nov. 10, 2005

ChangeSet ID: 21201 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/10 05:04:59 Modified files: include/wine : wined3d_gl.h dlls/wined3d : directx.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Define GL_EXT_framebuffer_object and GL_EXT_pixelbuffer_object openGL specs. Support Mesa GL_VERSION on parse. Patch: http://cvs.winehq.org/patch.py?id=21201 Old revision New revision Changes Path 1.11 1.12 +128 -29 wine/include/wine/wined3d_gl.h 1.59 1.60 +37 -1 wine/dlls/wined3d/directx.c

1 0