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

Felix Nawothnig : wined3d: Use GL_TEXTURE_2D for dummy textures.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 18c9e5d5d0835d2bd5434e10e96c6b9a5a6f05e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c9e5d5d0835d2bd5434e10e… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Thu Mar 29 18:45:04 2007 +0200 wined3d: Use GL_TEXTURE_2D for dummy textures. --- dlls/wined3d/baseshader.c | 4 ---- dlls/wined3d/context.c | 4 ---- dlls/wined3d/state.c | 10 ++-------- dlls/wined3d/stateblock.c | 11 ++++++----- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f4230d7..9e937ad 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -333,10 +333,6 @@ HRESULT shader_get_registers_used( } else { int texType = IWineD3DBaseTexture_GetTextureDimensions(stateBlock->textures[sampler_code]); switch(texType) { - case GL_TEXTURE_1D: - reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_1D; - break; - case GL_TEXTURE_2D: reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D; break; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ab8e9ca..02bc406 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -487,8 +487,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glDisable GL_TEXTURE_3D"); glDisable(GL_TEXTURE_2D); checkGLcall("glDisable GL_TEXTURE_2D"); - glDisable(GL_TEXTURE_1D); - checkGLcall("glDisable GL_TEXTURE_1D"); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); @@ -505,8 +503,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); - glDisable(GL_TEXTURE_1D); - checkGLcall("glDisable GL_TEXTURE_1D"); glEnable(GL_TEXTURE_2D); checkGLcall("glEnable GL_TEXTURE_2D"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0548198..07af88d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1549,8 +1549,6 @@ static void state_ckeyblend(DWORD state, IWineD3DStateBlockImpl *stateblock, Win */ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock) { if(stateblock->textures[stage]) { - glDisable(GL_TEXTURE_1D); - checkGLcall("glDisable(GL_TEXTURE_1D)"); switch(stateblock->textureDimensions[stage]) { case GL_TEXTURE_2D: glDisable(GL_TEXTURE_3D); @@ -1590,8 +1588,6 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock) glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); } - glEnable(GL_TEXTURE_1D); - checkGLcall("glEnable(GL_TEXTURE_1D)"); /* Binding textures is done by samplers. A dummy texture will be bound */ } } @@ -1639,8 +1635,6 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D TRACE("Stage disabled\n"); if (mapped_stage != -1) { /* Disable everything here */ - glDisable(GL_TEXTURE_1D); - checkGLcall("glDisable(GL_TEXTURE_1D)"); glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); glDisable(GL_TEXTURE_3D); @@ -2079,8 +2073,8 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont activate_dimensions(sampler, stateblock); } } /* Otherwise tex_colorop disables the stage */ - glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler]); - checkGLcall("glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler])"); + glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler]); + checkGLcall("glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler])"); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5ccd5ee..fe92d1f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1083,13 +1083,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat checkGLcall("glGenTextures"); TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); - /* Generate a dummy 1d texture */ - This->textureDimensions[i] = GL_TEXTURE_1D; - glBindTexture(GL_TEXTURE_1D, ThisDevice->dummyTextureName[i]); + /* Generate a dummy 2d texture (not using 1d because they cause many + * DRI drivers fall back to sw) */ + This->textureDimensions[i] = GL_TEXTURE_2D; + glBindTexture(GL_TEXTURE_2D, ThisDevice->dummyTextureName[i]); checkGLcall("glBindTexture"); - glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); - checkGLcall("glTexImage1D"); + glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); + checkGLcall("glTexImage2D"); } LEAVE_GL();

1 0

Louis Lenders : ntdll: Add NtAreMappedFilesTheSame stub.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: fc1d30f6cab20dc3e03d49ca62884ed7223b8ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1d30f6cab20dc3e03d49ca6… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Mar 29 11:26:38 2007 +0100 ntdll: Add NtAreMappedFilesTheSame stub. --- dlls/ntdll/ntdll.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e315057..346f002 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -104,7 +104,7 @@ # @ stub NtAllocateUserPhysicalPages @ stdcall NtAllocateUuids(ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr ptr ptr long long) -# @ stub NtAreMappedFilesTheSame +@ stub NtAreMappedFilesTheSame # @ stub NtAssignProcessToJobObject @ stub NtCallbackReturn # @ stub NtCancelDeviceWakeupRequest @@ -948,7 +948,7 @@ # @ stub ZwAllocateUserPhysicalPages @ stdcall ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids @ stdcall ZwAllocateVirtualMemory(long ptr ptr ptr long long) NtAllocateVirtualMemory -# @ stub ZwAreMappedFilesTheSame +@ stub ZwAreMappedFilesTheSame # @ stub ZwAssignProcessToJobObject @ stub ZwCallbackReturn # @ stub ZwCancelDeviceWakeupRequest

1 0

Jason Edmeades : xcopy: Add support for xcopy /A and /M (archive copies).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 4794bec1c1266ce907507d699f391204069e7074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4794bec1c1266ce907507d699… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:10 2007 +0100 xcopy: Add support for xcopy /A and /M (archive copies). --- programs/xcopy/xcopy.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 0539716..f957c83 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -55,6 +55,8 @@ #define OPT_COPYHIDSYS 0x00001000 #define OPT_IGNOREERRORS 0x00002000 #define OPT_SRCPROMPT 0x00004000 +#define OPT_ARCHIVEONLY 0x00008000 +#define OPT_REMOVEARCH 0x00010000 #define MAXSTRING 8192 @@ -166,6 +168,9 @@ int main (int argc, char *argv[]) case 'H': flags |= OPT_COPYHIDSYS; break; case 'C': flags |= OPT_IGNOREERRORS; break; case 'P': flags |= OPT_SRCPROMPT; break; + case 'A': flags |= OPT_ARCHIVEONLY; break; + case 'M': flags |= OPT_ARCHIVEONLY | + OPT_REMOVEARCH; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -454,6 +459,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if allowed to copy it */ srcAttribs = GetFileAttributesW(copyFrom); + WINE_TRACE("Source attribs: %d\n", srcAttribs); + if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { @@ -462,6 +469,11 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } } + if (!(srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_ARCHIVEONLY)) { + skipFile = TRUE; + } + /* Prompt each file if necessary */ if (!skipFile && (flags & OPT_SRCPROMPT)) { DWORD count; @@ -483,6 +495,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); + WINE_TRACE("Dest attribs: %d\n", srcAttribs); + if (!skipFile && destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { DWORD count; @@ -551,7 +565,15 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, return RC_WRITEERROR; } } - filesCopied++; + + /* If /M supplied, remove the archive bit after successful copy */ + if (!skipFile) { + if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_REMOVEARCH)) { + SetFileAttributes(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + } + filesCopied++; + } } }

1 0

Felix Nawothnig : wined3d: Only disable GL_TEXTURE_CUBE_MAP_ARB if supported.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 335f978e916ea4c872409ae2e97d92df17c6813b URL: http://source.winehq.org/git/wine.git/?a=commit;h=335f978e916ea4c872409ae2e… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Wed Mar 28 19:17:51 2007 +0200 wined3d: Only disable GL_TEXTURE_CUBE_MAP_ARB if supported. --- dlls/wined3d/context.c | 12 ++++++++---- dlls/wined3d/state.c | 24 ++++++++++++++++-------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b89207e..ab8e9ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -479,8 +479,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); checkGLcall("glActiveTextureARB"); - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); + } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); glDisable(GL_TEXTURE_2D); @@ -497,8 +499,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); } - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); + } glDisable(GL_TEXTURE_3D); checkGLcall("glDisable GL_TEXTURE_3D"); glDisable(GL_TEXTURE_1D); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8e563fb..12ef928 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1552,14 +1552,18 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock) case GL_TEXTURE_2D: glDisable(GL_TEXTURE_3D); checkGLcall("glDisable(GL_TEXTURE_3D)"); - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } glEnable(GL_TEXTURE_2D); checkGLcall("glEnable(GL_TEXTURE_2D)"); break; case GL_TEXTURE_3D: - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); glEnable(GL_TEXTURE_3D); @@ -1579,8 +1583,10 @@ static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock) checkGLcall("glDisable(GL_TEXTURE_2D)"); glDisable(GL_TEXTURE_3D); checkGLcall("glDisable(GL_TEXTURE_3D)"); - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } glEnable(GL_TEXTURE_1D); checkGLcall("glEnable(GL_TEXTURE_1D)"); /* Binding textures is done by samplers. A dummy texture will be bound */ @@ -1636,8 +1642,10 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D checkGLcall("glDisable(GL_TEXTURE_2D)"); glDisable(GL_TEXTURE_3D); checkGLcall("glDisable(GL_TEXTURE_3D)"); - glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); + } } /* All done */ return;

1 0

Felix Nawothnig : wined3d: Fix broken ERR() message.
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 6760ccac1c0bad7fb6a5b7b8c6f6786e2b2be881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6760ccac1c0bad7fb6a5b7b8c… Author: Felix Nawothnig <flexo(a)holycrap.org> Date: Wed Mar 28 20:37:10 2007 +0200 wined3d: Fix broken ERR() message. --- dlls/wined3d/state.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 12ef928..0548198 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1417,7 +1417,10 @@ static void state_patchsegments(DWORD state, IWineD3DStateBlockImpl *stateblock, TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_PATCHSEGMENTS] != tmpvalue.d) - ERR("(WINED3DRS_PATCHSEGMENTS,%d) not yet implemented\n", tmpvalue.d); + { + tmpvalue.d = stateblock->renderState[WINED3DRS_PATCHSEGMENTS]; + ERR("(WINED3DRS_PATCHSEGMENTS,%f) not yet implemented\n", tmpvalue.f); + } } static void state_positiondegree(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {

1 0

Jason Edmeades : xcopy: Add support for /P (Prompt).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 60e79adb53b78d6e78d90fb191ca62cd78fab13a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e79adb53b78d6e78d90fb19… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:09 2007 +0100 xcopy: Add support for /P (Prompt). --- programs/xcopy/xcopy.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 97348dd..0539716 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -54,6 +54,7 @@ #define OPT_REPLACEREAD 0x00000800 #define OPT_COPYHIDSYS 0x00001000 #define OPT_IGNOREERRORS 0x00002000 +#define OPT_SRCPROMPT 0x00004000 #define MAXSTRING 8192 @@ -145,7 +146,10 @@ int main (int argc, char *argv[]) return RC_INITERROR; } } else { - /* Process all the switch options */ + /* Process all the switch options + Note: Windows docs say /P prompts when dest is created + but tests show it is done for each src file + regardless of the destination */ switch (toupper(argvW[0][1])) { case 'I': flags |= OPT_ASSUMEDIR; break; case 'S': flags |= OPT_RECURSIVE; break; @@ -161,6 +165,7 @@ int main (int argc, char *argv[]) case 'R': flags |= OPT_REPLACEREAD; break; case 'H': flags |= OPT_COPYHIDSYS; break; case 'C': flags |= OPT_IGNOREERRORS; break; + case 'P': flags |= OPT_SRCPROMPT; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -457,6 +462,25 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } } + /* Prompt each file if necessary */ + if (!skipFile && (flags & OPT_SRCPROMPT)) { + DWORD count; + char answer[10]; + BOOL answered = FALSE; + + while (!answered) { + printf("%S? (Yes|No)\n", copyFrom); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer), + &count, NULL); + + answered = TRUE; + if (toupper(answer[0]) == 'N') + skipFile = TRUE; + else if (toupper(answer[0]) != 'Y') + answered = FALSE; + } + } + /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); if (!skipFile &&

1 0

Jason Edmeades : xcopy: Add support for /C (Continue if errors).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: d742bb632bb9c83ce494cd644af465ac64ba6e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d742bb632bb9c83ce494cd644… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:08 2007 +0100 xcopy: Add support for /C (Continue if errors). Also fix one place error reporting was missing. --- programs/xcopy/xcopy.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index df81b8f..97348dd 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -53,6 +53,7 @@ #define OPT_MUSTEXIST 0x00000400 #define OPT_REPLACEREAD 0x00000800 #define OPT_COPYHIDSYS 0x00001000 +#define OPT_IGNOREERRORS 0x00002000 #define MAXSTRING 8192 @@ -159,6 +160,7 @@ int main (int argc, char *argv[]) case 'U': flags |= OPT_MUSTEXIST; break; case 'R': flags |= OPT_REPLACEREAD; break; case 'H': flags |= OPT_COPYHIDSYS; break; + case 'C': flags |= OPT_IGNOREERRORS; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -394,6 +396,9 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, BOOL copiedFile = FALSE; DWORD destAttribs, srcAttribs; BOOL skipFile; + LPVOID lpMsgBuf; + DWORD error_code; + int status; /* Allocate some working memory on heap to minimize footprint */ finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); @@ -503,6 +508,24 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } else if (CopyFile(copyFrom, copyTo, FALSE) == 0) { printf("Copying of '%S' to '%S' failed with r/c %d\n", copyFrom, copyTo, GetLastError()); + + error_code = GetLastError (); + status = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, + (LPTSTR) &lpMsgBuf, 0, NULL); + if (!status) { + WINE_FIXME("FIXME: Cannot display message for error %d, status %d\n", + error_code, GetLastError()); + } else { + printf("%S\n", lpMsgBuf); + LocalFree ((HLOCAL)lpMsgBuf); + } + if (flags & OPT_IGNOREERRORS) { + skipFile = TRUE; + } else { + return RC_WRITEERROR; + } } filesCopied++; }

1 0

Jason Edmeades : xcopy: Add support for /H (Hidden/System).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 0a3a741a4ab0001f9b56cf8d5fe5c49e8ccfc12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3a741a4ab0001f9b56cf8d5… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:07 2007 +0100 xcopy: Add support for /H (Hidden/System). --- programs/xcopy/xcopy.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 8baa92f..df81b8f 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -52,6 +52,7 @@ #define OPT_SHORTNAME 0x00000200 #define OPT_MUSTEXIST 0x00000400 #define OPT_REPLACEREAD 0x00000800 +#define OPT_COPYHIDSYS 0x00001000 #define MAXSTRING 8192 @@ -157,6 +158,7 @@ int main (int argc, char *argv[]) case 'N': flags |= OPT_SHORTNAME; break; case 'U': flags |= OPT_MUSTEXIST; break; case 'R': flags |= OPT_REPLACEREAD; break; + case 'H': flags |= OPT_COPYHIDSYS; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -390,7 +392,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, BOOL findres = TRUE; WCHAR *inputpath, *outputpath; BOOL copiedFile = FALSE; - DWORD destAttribs; + DWORD destAttribs, srcAttribs; BOOL skipFile; /* Allocate some working memory on heap to minimize footprint */ @@ -440,9 +442,20 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, wine_dbgstr_w(copyTo)); if (!copiedFile && !(flags & OPT_SIMULATE)) XCOPY_CreateDirectory(deststem); + /* See if allowed to copy it */ + srcAttribs = GetFileAttributesW(copyFrom); + if ((srcAttribs & FILE_ATTRIBUTE_HIDDEN) || + (srcAttribs & FILE_ATTRIBUTE_SYSTEM)) { + + if (!(flags & OPT_COPYHIDSYS)) { + skipFile = TRUE; + } + } + /* See if file exists */ destAttribs = GetFileAttributesW(copyTo); - if (destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { + if (!skipFile && + destAttribs != INVALID_FILE_ATTRIBUTES && !(flags & OPT_NOPROMPT)) { DWORD count; char answer[10]; BOOL answered = FALSE;

1 0

Jason Edmeades : xcopy: Add support for /R (Replace read only files).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: 432d81d704438570921b54b8e7697fd0dff27599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=432d81d704438570921b54b8e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:06 2007 +0100 xcopy: Add support for /R (Replace read only files). --- programs/xcopy/xcopy.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 2f2e7f9..8baa92f 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -51,6 +51,7 @@ #define OPT_NOPROMPT 0x00000100 #define OPT_SHORTNAME 0x00000200 #define OPT_MUSTEXIST 0x00000400 +#define OPT_REPLACEREAD 0x00000800 #define MAXSTRING 8192 @@ -155,6 +156,7 @@ int main (int argc, char *argv[]) case 'Y': flags |= OPT_NOPROMPT; break; case 'N': flags |= OPT_SHORTNAME; break; case 'U': flags |= OPT_MUSTEXIST; break; + case 'R': flags |= OPT_REPLACEREAD; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -475,6 +477,13 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, printf("%S\n", copyFrom); } + /* If allowing overwriting of read only files, remove any + write protection */ + if ((destAttribs & FILE_ATTRIBUTE_READONLY) && + (flags & OPT_REPLACEREAD)) { + SetFileAttributes(copyTo, destAttribs & ~FILE_ATTRIBUTE_READONLY); + } + copiedFile = TRUE; if (flags & OPT_SIMULATE || flags & OPT_NOCOPY) { /* Skip copy */

1 0

Jason Edmeades : xcopy: Add support for /N (shortname copy).
by Alexandre Julliard 30 Mar '07

30 Mar '07

Module: wine Branch: master Commit: fe89021458c470c24e795a3a297ff04f2288432b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe89021458c470c24e795a3a2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 29 22:21:04 2007 +0100 xcopy: Add support for /N (shortname copy). --- programs/xcopy/xcopy.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 0342d39..281f812 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -49,6 +49,7 @@ #define OPT_PAUSE 0x00000040 #define OPT_NOCOPY 0x00000080 #define OPT_NOPROMPT 0x00000100 +#define OPT_SHORTNAME 0x00000200 #define MAXSTRING 8192 @@ -151,6 +152,7 @@ int main (int argc, char *argv[]) case 'W': flags |= OPT_PAUSE; break; case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; case 'Y': flags |= OPT_NOPROMPT; break; + case 'N': flags |= OPT_SHORTNAME; break; case '-': if (toupper(argvW[0][2])=='Y') flags &= ~OPT_NOPROMPT; break; default: @@ -412,11 +414,19 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Get the filename information */ lstrcpyW(copyFrom, srcstem); - lstrcatW(copyFrom, finddata->cFileName); + if (flags & OPT_SHORTNAME) { + lstrcatW(copyFrom, finddata->cAlternateFileName); + } else { + lstrcatW(copyFrom, finddata->cFileName); + } lstrcpyW(copyTo, deststem); if (*destspec == 0x00) { - lstrcatW(copyTo, finddata->cFileName); + if (flags & OPT_SHORTNAME) { + lstrcatW(copyTo, finddata->cAlternateFileName); + } else { + lstrcatW(copyTo, finddata->cFileName); + } } else { lstrcatW(copyTo, destspec); }

1 0