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

Jason Edmeades : cmd.exe: Add 2>&1 and 1>&2 support.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: a801995cdbe4976785762e431b9d0648696ff46a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a801995cdbe4976785762e431… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:10:38 2007 +0000 cmd.exe: Add 2>&1 and 1>&2 support. --- programs/cmd/wcmdmain.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 037efcc..1bb9154 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -533,18 +533,37 @@ void WCMD_process_command (char *command) else { creationDisposition = CREATE_ALWAYS; } + + /* Add support for 2>&1 */ redir = p; - h = CreateFile (WCMD_parameter (p, 0, NULL), GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - HeapFree( GetProcessHeap(), 0, cmd ); - return; - } - if (SetFilePointer (h, 0, NULL, FILE_END) == - INVALID_SET_FILE_POINTER) { - WCMD_print_error (); + if (*p == '&') { + int idx = *(p+1) - '0'; + + if (DuplicateHandle(GetCurrentProcess(), + GetStdHandle(idx_stdhandles[idx]), + GetCurrentProcess(), + &h, + 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { + WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + } + WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); + + } else { + char *param = WCMD_parameter (p, 0, NULL); + h = CreateFile (param, GENERIC_WRITE, 0, &sa, creationDisposition, + FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) { + WCMD_print_error (); + HeapFree( GetProcessHeap(), 0, cmd ); + return; + } + if (SetFilePointer (h, 0, NULL, FILE_END) == + INVALID_SET_FILE_POINTER) { + WCMD_print_error (); + } + WINE_TRACE("Redirect %d to '%s' (%p)\n", handle, param, h); } + old_stdhandles[handle] = GetStdHandle (idx_stdhandles[handle]); SetStdHandle (idx_stdhandles[handle], h); }

1 0

Jason Edmeades : cmd.exe: Add support for stderr redirection to a file.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 085c0f4a3a367eb52721140c109343b47cee9170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085c0f4a3a367eb52721140c1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:09:05 2007 +0000 cmd.exe: Add support for stderr redirection to a file. --- programs/cmd/wcmdmain.c | 67 ++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 11c2576..eaac82b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -385,15 +385,20 @@ int main (int argc, char *argv[]) void WCMD_process_command (char *command) { - char *cmd, *p, *s, *t; + char *cmd, *p, *s, *t, *redir; int status, i; DWORD count, creationDisposition; HANDLE h; char *whichcmd; SECURITY_ATTRIBUTES sa; char *new_cmd; - HANDLE old_stdin = INVALID_HANDLE_VALUE; - HANDLE old_stdout = INVALID_HANDLE_VALUE; + char *first_redir = NULL; + HANDLE old_stdhandles[3] = {INVALID_HANDLE_VALUE, + INVALID_HANDLE_VALUE, + INVALID_HANDLE_VALUE}; + DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, + STD_OUTPUT_HANDLE, + STD_ERROR_HANDLE}; /* Move copy of the command onto the heap so it can be expanded */ new_cmd = HeapAlloc( GetProcessHeap(), 0, MAXSTRING ); @@ -486,16 +491,16 @@ void WCMD_process_command (char *command) return; } - /* Don't issue newline WCMD_output (newline); @JED*/ - sa.nLength = sizeof(sa); sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; + /* - * Redirect stdin and/or stdout if required. + * Redirect stdin, stdout and/or stderr if required. */ if ((p = strchr(cmd,'<')) != NULL) { + if (first_redir == NULL) first_redir = p; h = CreateFile (WCMD_parameter (++p, 0, NULL), GENERIC_READ, FILE_SHARE_READ, &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { @@ -503,11 +508,24 @@ void WCMD_process_command (char *command) HeapFree( GetProcessHeap(), 0, cmd ); return; } - old_stdin = GetStdHandle (STD_INPUT_HANDLE); + old_stdhandles[0] = GetStdHandle (STD_INPUT_HANDLE); SetStdHandle (STD_INPUT_HANDLE, h); } - if ((p = strchr(cmd,'>')) != NULL) { - *p++ = '\0'; + + /* Scan the whole command looking for > and 2> */ + redir = cmd; + while (redir != NULL && ((p = strchr(redir,'>')) != NULL)) { + int handle = 0; + + if (*(p-1)!='2') { + if (first_redir == NULL) first_redir = p; + handle = 1; + } else { + if (first_redir == NULL) first_redir = (p-1); + handle = 2; + } + + p++; if ('>' == *p) { creationDisposition = OPEN_ALWAYS; p++; @@ -515,21 +533,24 @@ void WCMD_process_command (char *command) else { creationDisposition = CREATE_ALWAYS; } + redir = p; h = CreateFile (WCMD_parameter (p, 0, NULL), GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); + FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); + WCMD_print_error (); HeapFree( GetProcessHeap(), 0, cmd ); - return; + return; } if (SetFilePointer (h, 0, NULL, FILE_END) == - INVALID_SET_FILE_POINTER) { + INVALID_SET_FILE_POINTER) { WCMD_print_error (); } - old_stdout = GetStdHandle (STD_OUTPUT_HANDLE); - SetStdHandle (STD_OUTPUT_HANDLE, h); + old_stdhandles[handle] = GetStdHandle (idx_stdhandles[handle]); + SetStdHandle (idx_stdhandles[handle], h); } - if ((p = strchr(cmd,'<')) != NULL) *p = '\0'; + + /* Terminate the command string at <, or first 2> or > */ + if (first_redir != NULL) *first_redir = '\0'; /* * Strip leading whitespaces, and a '@' if supplied @@ -681,13 +702,13 @@ void WCMD_process_command (char *command) WCMD_run_program (whichcmd, 0); } HeapFree( GetProcessHeap(), 0, cmd ); - if (old_stdin != INVALID_HANDLE_VALUE) { - CloseHandle (GetStdHandle (STD_INPUT_HANDLE)); - SetStdHandle (STD_INPUT_HANDLE, old_stdin); - } - if (old_stdout != INVALID_HANDLE_VALUE) { - CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE)); - SetStdHandle (STD_OUTPUT_HANDLE, old_stdout); + + /* Restore old handles */ + for (i=0; i<3; i++) { + if (old_stdhandles[i] != INVALID_HANDLE_VALUE) { + CloseHandle (GetStdHandle (idx_stdhandles[i])); + SetStdHandle (idx_stdhandles[i], old_stdhandles[i]); + } } }

1 0

Jason Edmeades : cmd.exe: Add support for FTYPE.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 9e041c6bc9663ec78582e7975fdec18049e7e966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e041c6bc9663ec78582e7975… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:06:58 2007 +0000 cmd.exe: Add support for FTYPE. --- programs/cmd/Cs.rc | 1 + programs/cmd/De.rc | 1 + programs/cmd/En.rc | 1 + programs/cmd/Es.rc | 1 + programs/cmd/Fr.rc | 1 + programs/cmd/Ja.rc | 1 + programs/cmd/Ko.rc | 1 + programs/cmd/Nl.rc | 1 + programs/cmd/No.rc | 1 + programs/cmd/Pl.rc | 1 + programs/cmd/Pt.rc | 1 + programs/cmd/Ru.rc | 1 + programs/cmd/Si.rc | 1 + programs/cmd/Tr.rc | 1 + programs/cmd/builtins.c | 53 +++++++++++++++++++++++++++++++++++----------- programs/cmd/wcmd.h | 6 +++- programs/cmd/wcmdmain.c | 8 +++++- 17 files changed, 64 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e041c6bc9663ec78582e…

1 0

Jason Edmeades : cmd.exe: Save initial working directory.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: d0db751e0cb7a0526c3aecca489189f4fa600bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0db751e0cb7a0526c3aecca4… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:08:00 2007 +0000 cmd.exe: Save initial working directory. --- programs/cmd/wcmdmain.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index dedf8da..11c2576 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -60,6 +60,7 @@ static char *WCMD_expand_envvar(char *start); int main (int argc, char *argv[]) { char string[1024]; + char envvar[4]; char* cmd=NULL; DWORD count; HANDLE h; @@ -327,6 +328,13 @@ int main (int argc, char *argv[]) } + /* Save cwd into appropriate env var */ + GetCurrentDirectory(1024, string); + if (IsCharAlpha(string[0]) && string[1] == ':') { + sprintf(envvar, "=%c:", string[0]); + SetEnvironmentVariable(envvar, string); + } + if (opt_k) { WCMD_process_command(cmd); HeapFree(GetProcessHeap(), 0, cmd);

1 0

H. Verbeet : wined3d: Remove a redundant check in handleStreams().
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 6998d0d472b5392ed06c16a7c97ebb2b07d68177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6998d0d472b5392ed06c16a7c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:22:16 2007 +0100 wined3d: Remove a redundant check in handleStreams(). --- dlls/wined3d/state.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f3acb3b..4349206 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2800,7 +2800,7 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer if(TRACE_ON(d3d)) { drawPrimitiveTraceDataLocations(dataLocations); } - } else if (stateblock->vertexDecl || stateblock->vertexShader) { + } else if (stateblock->vertexDecl) { /* Note: This is a fixed function or shader codepath. * This means it must handle both types of strided data. * Shaders must go through here to zero the strided data, even if they @@ -2808,11 +2808,8 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer */ TRACE("================ Vertex Declaration ===================\n"); memset(dataLocations, 0, sizeof(*dataLocations)); - - if (stateblock->vertexDecl) { - primitiveDeclarationConvertToStridedData((IWineD3DDevice *) device, useVertexShaderFunction, - dataLocations, &fixup); - } + primitiveDeclarationConvertToStridedData((IWineD3DDevice *) device, + useVertexShaderFunction, dataLocations, &fixup); } else { /* Note: This codepath is not reachable from d3d9 (see fvf->decl9 conversion) * It is reachable through d3d8, but only for fixed-function.

1 0

H. Verbeet : wined3d: Remove some redundant code in IWineD3DVertexBufferImpl_FindDecl().
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 62fff2eab869a5f92fef0727511e027ea5bcff0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62fff2eab869a5f92fef07275… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:22:22 2007 +0100 wined3d: Remove some redundant code in IWineD3DVertexBufferImpl_FindDecl(). --- dlls/wined3d/vertexbuffer.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 63b381a..e832439 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -172,7 +172,6 @@ inline BOOL WINAPI IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T return FALSE; } - memset(&strided, 0, sizeof(strided)); /* There are certain vertex data types that need to be fixed up. The Vertex Buffers FVF doesn't * help finding them, only the vertex declaration or the device FVF can determine that at drawPrim * time. Rules are as follows: @@ -211,12 +210,6 @@ inline BOOL WINAPI IWineD3DVertexBufferImpl_FindDecl(IWineD3DVertexBufferImpl *T if(strided.u.s.position2.VBO != This->vbo) memset(&strided.u.s.position2, 0, sizeof(strided.u.s.position2)); } - /* Filter out data that does not come from this VBO */ - if(strided.u.s.position.VBO != This->vbo) memset(&strided.u.s.position, 0, sizeof(strided.u.s.position)); - if(strided.u.s.diffuse.VBO != This->vbo) memset(&strided.u.s.diffuse, 0, sizeof(strided.u.s.diffuse)); - if(strided.u.s.specular.VBO != This->vbo) memset(&strided.u.s.specular, 0, sizeof(strided.u.s.specular)); - if(strided.u.s.position2.VBO != This->vbo) memset(&strided.u.s.position2, 0, sizeof(strided.u.s.position2)); - /* We have a declaration now in the buffer */ This->Flags |= VBFLAG_HASDESC;

1 0

H. Verbeet : wined3d: Disable vertex shaders when transformed vertices are used.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 30ee071eb968033fc2645836e153fd754470c532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ee071eb968033fc2645836e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:22:00 2007 +0100 wined3d: Disable vertex shaders when transformed vertices are used. --- dlls/wined3d/drawprim.c | 23 +++++++++++++---------- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/state.c | 30 +++++++++++++++++------------- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 5 files changed, 49 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30ee071eb968033fc2645…

1 0

H. Verbeet : wined3d: Remove some redundant checks in the vertexdeclaration () state handler.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: 05d461aee99e861388a0f451b9e626fd5fa07495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d461aee99e861388a0f451b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:22:06 2007 +0100 wined3d: Remove some redundant checks in the vertexdeclaration() state handler. --- dlls/wined3d/state.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5b4a304..f3acb3b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2905,10 +2905,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W handleStreams(stateblock, useVertexShaderFunction, context); - /* Do I have to use ? TRUE : FALSE ? Or can I rely on 15==15 being equal to TRUE(=1)? */ - transformed = ((device->strided_streams.u.s.position.lpData != NULL || - device->strided_streams.u.s.position.VBO != 0) && - device->strided_streams.u.s.position_transformed) ? TRUE : FALSE; + transformed = device->strided_streams.u.s.position_transformed; if (transformed) useVertexShaderFunction = FALSE; if(transformed != context->last_was_rhw && !useVertexShaderFunction) {

1 0

H. Verbeet : wined3d: Remove FVF related fields from IWineD3DVertexDeclaration.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: ee09e8bfd6e7f5e84d0a37eeb221497cf682da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee09e8bfd6e7f5e84d0a37eeb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:21:54 2007 +0100 wined3d: Remove FVF related fields from IWineD3DVertexDeclaration. --- dlls/wined3d/device.c | 1 - dlls/wined3d/wined3d_private.h | 21 +++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10b03bf..c20779c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1548,7 +1548,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* This, ((IWineD3DImpl *)This->wineD3D)->dxVersion, elements, element_count, ppVertexDeclaration); D3DCREATEOBJECTINSTANCE(object, VertexDeclaration) - object->allFVF = 0; hr = IWineD3DVertexDeclaration_SetDeclaration((IWineD3DVertexDeclaration *)object, elements, element_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d80d83..dab9f35 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1145,18 +1145,15 @@ BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4] * IWineD3DVertexDeclaration implementation structure */ typedef struct IWineD3DVertexDeclarationImpl { - /* IUnknown Information */ - const IWineD3DVertexDeclarationVtbl *lpVtbl; - LONG ref; /* Note: Ref counting not required */ - - IUnknown *parent; - /** precomputed fvf if simple declaration */ - IWineD3DDeviceImpl *wineD3DDevice; - DWORD fvf[MAX_STREAMS]; - DWORD allFVF; - - WINED3DVERTEXELEMENT *pDeclarationWine; - UINT declarationWNumElements; + /* IUnknown Information */ + const IWineD3DVertexDeclarationVtbl *lpVtbl; + LONG ref; + + IUnknown *parent; + IWineD3DDeviceImpl *wineD3DDevice; + + WINED3DVERTEXELEMENT *pDeclarationWine; + UINT declarationWNumElements; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

1 0

H. Verbeet : wined3d: 11 space indent is ugly.
by Alexandre Julliard 13 Mar '07

13 Mar '07

Module: wine Branch: master Commit: b22ca33a856cfb65a24251c0e7324cdfcbafac70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ca33a856cfb65a24251c0e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Mar 12 23:21:49 2007 +0100 wined3d: 11 space indent is ugly. --- dlls/wined3d/drawprim.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c34c642..14fb3e0 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -207,25 +207,25 @@ void primitiveDeclarationConvertToStridedData( stride_used = fixed_get_input(element->Usage, element->UsageIndex, &idx); if (stride_used) { - TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, " - "stream=%u, offset=%u, stride=%u, VBO=%u]\n", - useVertexShaderFunction? "shader": "fixed function", idx, - debug_d3ddeclusage(element->Usage), element->UsageIndex, - element->Stream, element->Offset, stride, streamVBO); - - strided->u.input[idx].lpData = data; - strided->u.input[idx].dwType = element->Type; - strided->u.input[idx].dwStride = stride; - strided->u.input[idx].VBO = streamVBO; - strided->u.input[idx].streamNo = element->Stream; - if (!useVertexShaderFunction) { - if (element->Usage == WINED3DDECLUSAGE_POSITION) - strided->u.s.position_transformed = FALSE; - else if (element->Usage == WINED3DDECLUSAGE_POSITIONT) - strided->u.s.position_transformed = TRUE; - } + TRACE("Loaded %s array %u [usage=%s, usage_idx=%u, " + "stream=%u, offset=%u, stride=%u, VBO=%u]\n", + useVertexShaderFunction? "shader": "fixed function", idx, + debug_d3ddeclusage(element->Usage), element->UsageIndex, + element->Stream, element->Offset, stride, streamVBO); + + strided->u.input[idx].lpData = data; + strided->u.input[idx].dwType = element->Type; + strided->u.input[idx].dwStride = stride; + strided->u.input[idx].VBO = streamVBO; + strided->u.input[idx].streamNo = element->Stream; + if (!useVertexShaderFunction) { + if (element->Usage == WINED3DDECLUSAGE_POSITION) + strided->u.s.position_transformed = FALSE; + else if (element->Usage == WINED3DDECLUSAGE_POSITIONT) + strided->u.s.position_transformed = TRUE; + } } - }; + } /* Now call PreLoad on all the vertex buffers. In the very rare case * that the buffers stopps converting PreLoad will dirtify the VDECL again. * The vertex buffer can now use the strided structure in the device instead of finding its @@ -235,7 +235,7 @@ void primitiveDeclarationConvertToStridedData( * once in there. */ for(i=0; i < numPreloadStreams; i++) { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[i]]); + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[i]]); } }

1 0