September 2007 - Wine-commits

Alexander Nicolaysen Sørnes : wordpad: Store bar states in the registry.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: d95fac1575459e3edf5a9ed1927a81b0b996f97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95fac1575459e3edf5a9ed19… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 22 22:41:25 2007 +0200 wordpad: Store bar states in the registry. --- programs/wordpad/resource.h | 8 +- programs/wordpad/wordpad.c | 192 ++++++++++++++++++++++++++++++------------- 2 files changed, 141 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d95fac1575459e3edf5a9…

1 0

Chris Robinson : winex11: Remove improper comment and dead code from SetPixelFormat.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f0e0e9fb9bb9c77f38aaaf6dbf5ab4c985b74dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e0e9fb9bb9c77f38aaaf6db… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 14:23:52 2007 -0700 winex11: Remove improper comment and dead code from SetPixelFormat. --- dlls/winex11.drv/opengl.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 07d0b84..3dab1b6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1374,22 +1374,6 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVICE *physDev, if (TRACE_ON(opengl)) { int gl_test = 0; - /* - * How to test if hdc current drawable is compatible (visual/FBConfig) ? - * - * in case of root window created HDCs we crash here :( - * - Drawable drawable = get_drawable( physDev->hdc ); - TRACE(" drawable (%p,%p) have :\n", drawable, root_window); - pglXQueryDrawable(gdi_display, drawable, GLX_FBCONFIG_ID, (unsigned int*) &value); - TRACE(" - FBCONFIG_ID as 0x%x\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_VISUAL_ID, (unsigned int*) &value); - TRACE(" - VISUAL_ID as 0x%x\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_WIDTH, (unsigned int*) &value); - TRACE(" - WIDTH as %d\n", tmp); - pglXQueryDrawable(gdi_display, drawable, GLX_HEIGHT, (unsigned int*) &value); - TRACE(" - HEIGHT as %d\n", tmp); - */ gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n");

1 0

Chris Robinson : winex11: Remove useless checks from wglCreateContext.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: e46d621bb6c80752afb4d209092f5a31f41423ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46d621bb6c80752afb4d2090… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 13:55:11 2007 -0700 winex11: Remove useless checks from wglCreateContext. --- dlls/winex11.drv/opengl.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7f093c6..07d0b84 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1416,8 +1416,6 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) WineGLPixelFormat *fmt; int hdcPF = physDev->current_pf; int fmt_count = 0; - int value = 0; - int gl_test = 0; HDC hdc = physDev->hdc; TRACE("(%p)->(PF:%d)\n", hdc, hdcPF); @@ -1427,9 +1425,6 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) return 0; } - /* First, get the visual in use by the X11DRV */ - if (!gdi_display) return 0; - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, TRUE /* Offscreen */, &fmt_count); /* We can render using the iPixelFormat (1) of Wine's Main visual AND using some offscreen formats. * Note that standard WGL-calls don't recognize offscreen-only formats. For that reason pbuffers @@ -1441,19 +1436,6 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) return NULL; } - if (fmt_count < hdcPF) { - ERR("(%p): unexpected pixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, hdcPF, fmt_count); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; - } - - gl_test = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_FBCONFIG_ID, &value); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; - } - /* The context will be allocated in the wglMakeCurrent call */ wine_tsx11_lock(); ret = alloc_context();

1 0

Chris Robinson : winex11: Free visual info stored with the context.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 57380c2d9aecb22abe43d99cf794c98f1c2644e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57380c2d9aecb22abe43d99cf… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Sep 11 13:52:23 2007 -0700 winex11: Free visual info stored with the context. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b30ab37..7f093c6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -545,6 +545,7 @@ static inline void free_context(Wine_GLContext *context) if (context->prev != NULL) context->prev->next = context->next; else context_list = context->next; + if (context->vis) XFree(context->vis); HeapFree(GetProcessHeap(), 0, context); }

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 15d591fa08f0c151672713a0d664b280540099e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d591fa08f0c151672713a0d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 11 23:45:29 2007 +0100 shell32: Constify some variables. --- dlls/shell32/pidl.c | 8 ++++---- dlls/shell32/pidl.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index ef24927..bf15e05 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2304,7 +2304,7 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) * * copies an aPidl struct */ -LPITEMIDLIST* _ILCopyaPidl(LPCITEMIDLIST * apidlsrc, UINT cidl) +LPITEMIDLIST* _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) { UINT i; LPITEMIDLIST *apidldest; @@ -2324,7 +2324,7 @@ LPITEMIDLIST* _ILCopyaPidl(LPCITEMIDLIST * apidlsrc, UINT cidl) * * creates aPidl from CIDA */ -LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida) +LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) { UINT i; LPITEMIDLIST *dst; @@ -2334,10 +2334,10 @@ LPITEMIDLIST* _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida) return NULL; if (pidl) - *pidl = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]])); + *pidl = ILClone((LPCITEMIDLIST)(&((const BYTE*)cida)[cida->aoffset[0]])); for (i = 0; i < cida->cidl; i++) - dst[i] = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]])); + dst[i] = ILClone((LPCITEMIDLIST)(&((const BYTE*)cida)[cida->aoffset[i + 1]])); return dst; } diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 06372fa..010947c 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -275,8 +275,8 @@ BOOL pcheck (LPCITEMIDLIST pidl); * aPidl helper */ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl); -LPITEMIDLIST * _ILCopyaPidl(LPCITEMIDLIST * apidlsrc, UINT cidl); -LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, LPIDA cida); +LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl); +LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR path, DWORD type); BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type);

1 0

Jason Edmeades : cmd.exe: Fix redirect ordering on a command line.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 1ee75382c703c18ae277d992216ea02aade314a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee75382c703c18ae277d9922… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:08 2007 +0100 cmd.exe: Fix redirect ordering on a command line. --- programs/cmd/batch.c | 1 + programs/cmd/builtins.c | 12 +- programs/cmd/directory.c | 1 + programs/cmd/wcmd.h | 5 +- programs/cmd/wcmdmain.c | 346 +++++++++++++++++++++++++++++----------------- 5 files changed, 232 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ee75382c703c18ae277d…

1 0

Andrew Talbot : shell32: Constify a variable.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 66cd1fd748cc1d9ee942f986737a10a4463e0702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cd1fd748cc1d9ee942f9867… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 11 23:45:32 2007 +0100 shell32: Constify a variable. --- dlls/shell32/shell.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 2703c7a..26b6146 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -307,7 +307,7 @@ static LPSTR SHELL_FindString(LPSTR lpEnv, LPCSTR entry) /**********************************************************************/ -SEGPTR WINAPI FindEnvironmentString16(LPSTR str) +SEGPTR WINAPI FindEnvironmentString16(LPCSTR str) { SEGPTR spEnv; LPSTR lpEnv,lpString; TRACE("\n");

1 0

Jason Edmeades : cmd.exe: Add basic for /F string support.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f3ae48cbdafb93936f51133045714f7a64f3ce12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ae48cbdafb93936f5113304… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:06 2007 +0100 cmd.exe: Add basic for /F string support. --- programs/cmd/builtins.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ee8f1b3..a58acde 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -770,10 +770,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Loop through all entries on the same line */ WCHAR *item; + WCHAR *itemStart; WINE_TRACE("Processing for set %p\n", thisSet); i = 0; - while (*(item = WCMD_parameter (thisSet->command, i, NULL))) { + while (*(item = WCMD_parameter (thisSet->command, i, &itemStart))) { /* * If the parameter within the set has a wildcard then search for matching files @@ -817,7 +818,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (itemNum <=3) numbers[itemNum-1] = atolW(item); /* else ignore them! */ - } else if (doFileset) { + /* Filesets - either a list of files, or a command to run and parse the output */ + } else if (doFileset && *itemStart != '"') { HANDLE input; @@ -847,6 +849,8 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { wine_dbgstr_w(buffer)); if (where) { + /* FIXME: The following should be moved into its own routine and + reused for the string literal parsing below */ thisCmdStart = cmdStart; WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); cmdEnd = thisCmdStart; @@ -857,6 +861,25 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } CloseHandle (input); } + + /* Filesets - A string literal */ + } else if (doFileset && *itemStart == '"') { + WCHAR buffer[MAXSTRING] = {'\0'}; + WCHAR *where, *parm; + + /* Skip blank lines, and re-extract parameter now string has quotes removed */ + strcpyW(buffer, item); + parm = WCMD_parameter (buffer, 0, &where); + WINE_TRACE("Parsed parameter: %s from %s\n", wine_dbgstr_w(parm), + wine_dbgstr_w(buffer)); + + if (where) { + /* FIXME: The following should be moved into its own routine and + reused for the string literal parsing below */ + thisCmdStart = cmdStart; + WCMD_part_execute(&thisCmdStart, firstCmd, variable, parm, FALSE, TRUE); + cmdEnd = thisCmdStart; + } } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd);

1 0

Jason Edmeades : cmd.exe: Add basic support for FOR / F parsing launched programs output.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: c7b88e95f566aa32c11512b4f15a7dbf9701413e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b88e95f566aa32c11512b4f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:07 2007 +0100 cmd.exe: Add basic support for FOR /F parsing launched programs output. --- programs/cmd/builtins.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a58acde..f58ad94 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -822,14 +822,41 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } else if (doFileset && *itemStart != '"') { HANDLE input; + WCHAR temp_file[MAX_PATH]; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, wine_dbgstr_w(item)); - /* Open the file, read line by line and process */ - input = CreateFile (item, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); + /* If backquote or single quote, we need to launch that command + and parse the results - use a temporary file */ + if (*itemStart == '`' || *itemStart == '\'') { + WCHAR temp_path[MAX_PATH], temp_cmd[MAXSTRING]; + static const WCHAR redirOut[] = {'%','s',' ','>',' ','%','s','\0'}; + static const WCHAR cmdW[] = {'C','M','D','\0'}; + + /* Remove trailing character */ + itemStart[strlenW(itemStart)-1] = 0x00; + + /* Get temp filename */ + GetTempPath (sizeof(temp_path)/sizeof(WCHAR), temp_path); + GetTempFileName (temp_path, cmdW, 0, temp_file); + + /* Execute program and redirect output */ + wsprintf (temp_cmd, redirOut, (itemStart+1), temp_file); + WCMD_execute (temp_cmd, NULL, NULL, NULL); + + /* Open the file, read line by line and process */ + input = CreateFile (temp_file, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + } else { + + /* Open the file, read line by line and process */ + input = CreateFile (item, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + } + + /* Process the input file */ if (input == INVALID_HANDLE_VALUE) { WCMD_print_error (); WCMD_output (WCMD_LoadMessage(WCMD_READFAIL), item); @@ -862,6 +889,11 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { CloseHandle (input); } + /* Delete the temporary file */ + if (*itemStart == '`' || *itemStart == '\'') { + DeleteFile (temp_file); + } + /* Filesets - A string literal */ } else if (doFileset && *itemStart == '"') { WCHAR buffer[MAXSTRING] = {'\0'};

1 0

Jason Edmeades : cmd.exe: Add suport for if 1==1 echo yes.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: bcaf4fb43f780b307d21aefc6ad6a51903ec76ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcaf4fb43f780b307d21aefc6… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Sep 11 21:43:05 2007 +0100 cmd.exe: Add suport for if 1==1 echo yes. --- programs/cmd/builtins.c | 2 ++ programs/cmd/wcmdmain.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8fbf292..ee8f1b3 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1160,6 +1160,8 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { else { strcpyW (condition, param1); } + WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); + if (!lstrcmpiW (condition, errlvlW)) { if (errorlevel >= atoiW(WCMD_parameter (p, 1+negate, NULL))) test = 1; WCMD_parameter (p, 2+negate, &command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b44b0ed..818710c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -708,6 +708,8 @@ void WCMD_execute (WCHAR *command, } p = WCMD_strtrim_leading_spaces (&whichcmd[count]); WCMD_parse (p, quals, param1, param2); + WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); + switch (i) { case WCMD_ATTRIB: @@ -1313,11 +1315,15 @@ int p = 0; case '\0': return; default: - while ((*s != '\0') && (*s != ' ') && (*s != '\t')) { + while ((*s != '\0') && (*s != ' ') && (*s != '\t') + && (*s != '=') && (*s != ',') ) { if (p == 0) *p1++ = *s++; else if (p == 1) *p2++ = *s++; else s++; } + /* Skip concurrent parms */ + while ((*s == ' ') || (*s == '\t') || (*s == '=') || (*s == ',') ) s++; + if (p == 0) *p1 = '\0'; if (p == 1) *p2 = '\0'; p++;

1 0