wine-commits June 2006

wine-commits@winehq.org

3 participants
854 discussions

Juan Lang : oleaut32: Handle bstr length of -1 in typelibs.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: 24dd931a56e59dcf6a44a7fc15a530353bcb9c31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24dd931a56e59dcf6a44a7f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 27 23:09:33 2006 -0700 oleaut32: Handle bstr length of -1 in typelibs. --- dlls/oleaut32/typelib.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 619a286..d55120d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1367,12 +1367,13 @@ static void *TLB_CopyTypeDesc( TYPEDESC * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) */ -/* read function */ -static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) +static inline unsigned int MSFT_Tell(TLBContext *pcx) { - TRACE_(typelib)("pos=0x%08x len=0x%08lx 0x%08x 0x%08x 0x%08lx\n", - pcx->pos, count, pcx->oStart, pcx->length, where); + return pcx->pos; +} +static inline void MSFT_Seek(TLBContext *pcx, long where) +{ if (where != DO_NOT_SEEK) { where += pcx->oStart; @@ -1384,6 +1385,15 @@ static DWORD MSFT_Read(void *buffer, DW } pcx->pos = where; } +} + +/* read function */ +static DWORD MSFT_Read(void *buffer, DWORD count, TLBContext *pcx, long where ) +{ + TRACE_(typelib)("pos=0x%08x len=0x%08lx 0x%08x 0x%08x 0x%08lx\n", + pcx->pos, count, pcx->oStart, pcx->length, where); + + MSFT_Seek(pcx, where); if (pcx->pos + count > pcx->length) count = pcx->length - pcx->pos; memcpy( buffer, (char *)pcx->mapping + pcx->pos, count ); pcx->pos += count; @@ -1561,16 +1571,23 @@ static void MSFT_ReadValue( VARIANT * pV char * ptr; MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); if(size < 0) { - FIXME("BSTR length = %d?\n", size); - } else { - ptr=TLB_Alloc(size);/* allocate temp buffer */ - MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])=L'\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; - TLB_Free(ptr); + char next; + DWORD origPos = MSFT_Tell(pcx), nullPos; + + do { + MSFT_Read(&next, 1, pcx, DO_NOT_SEEK); + } while (next); + nullPos = MSFT_Tell(pcx); + size = nullPos - origPos; + MSFT_Seek(pcx, origPos); } + ptr=TLB_Alloc(size);/* allocate temp buffer */ + MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ + V_BSTR(pVar)=SysAllocStringLen(NULL,size); + /* FIXME: do we need a AtoW conversion here? */ + V_UNION(pVar, bstrVal[size])=L'\0'; + while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + TLB_Free(ptr); } size=-4; break; /* FIXME: this will not work AT ALL when the variant contains a pointer */

1 0

Juan Lang : shell32: Add a stub for InvalidateDriveType.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: bf680011d79f3e11760843a664d6a2838159d715 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf680011d79f3e11760843a… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jun 27 17:21:13 2006 -0700 shell32: Add a stub for InvalidateDriveType. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index c6a307d..4d02d7a 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -59,7 +59,7 @@ # This list was updated to dll version 4 62 stdcall -noname PickIconDlg(long long long long) 63 stdcall -noname GetFileNameFromBrowse(long long long long str str str) 64 stdcall -noname DriveType(long) - 65 stub -noname InvalidateDriveType + 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -noname IsNetDrive(long) 67 stdcall -noname Shell_MergeMenus(long long long long long long) 68 stdcall -noname SHGetSetSettings(ptr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5e5ea58..38ebcbb 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1301,6 +1301,14 @@ HRESULT WINAPI DriveType(DWORD u) return 0; } /************************************************************************* + * InvalidateDriveType [SHELL32.65] + * + */ +int WINAPI InvalidateDriveType(int u) +{ FIXME("0x%08x stub\n",u); + return 0; +} +/************************************************************************* * SHAbortInvokeCommand [SHELL32.198] * */

1 0

H. Verbeet : wined3d: Use register combiners for texture stage operations.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: 7f9e61f7d2bc54731f755d10c9cc91cd7d8b6b08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f9e61f7d2bc54731f755d1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:44:26 2006 +0200 wined3d: Use register combiners for texture stage operations. Make wined3d use register combiners for texture stage operations. In order to do that the texture unit index needs to be separated from the texture stage index. For cards that don't support the NV_register_combiners extension nothing should change. --- dlls/wined3d/device.c | 29 +++-- dlls/wined3d/directx.c | 4 + dlls/wined3d/drawprim.c | 220 ++++++++++++++++++++++---------------- dlls/wined3d/stateblock.c | 59 +++++----- include/wine/wined3d_interface.h | 4 - 5 files changed, 179 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7f9e61f7d2bc54731f7…

1 0

H. Verbeet : wined3d: Add code for using register combiners for texture stage operations.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: f3a2a9f30aa5e860eabb6a3df6e5d9f40359bb31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f3a2a9f30aa5e860eabb6a3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:42:35 2006 +0200 wined3d: Add code for using register combiners for texture stage operations. On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not larger than 4. In Direct3D that would correspond to MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages (which can be much larger) to which it currently corresponds in wined3d. Using register combiners we can get around that limitation and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture stages. This patch adds code for doing the texture operations with register combiners instead of ARB_texture_env_combine or NV_texture_env_combine4, but doesn't make use of that code yet. That's what the next patch will do. --- dlls/wined3d/utils.c | 357 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 2 files changed, 358 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f3a2a9f30aa5e860eab…

1 0

H. Verbeet : wined3d: Fix uploading of textures for shaders.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: ac98d566acc20b0334d3deacd7c95869336f4d53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac98d566acc20b0334d3dea… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:41:27 2006 +0200 wined3d: Fix uploading of textures for shaders. The code for uploading / binding textures for use with pixel shaders is slightly different from the one for uploading / binding textures for use with the fixed function pipeline. It would be possible to keep the code in a single function with a couple of conditionals, but in combination with the changes needed for register combiners that would become quite messy. --- dlls/wined3d/drawprim.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 675813f..157ec0f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2076,6 +2076,46 @@ void inline drawPrimitiveTraceDataLocati } +static void drawPrimitiveUploadTexturesPS(IWineD3DDeviceImpl* This) { + INT i; + + for (i = 0; i < GL_LIMITS(samplers); ++i) { + /* Pixel shader support should imply multitexture support. */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i) { + WARN("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + } + + if (!This->stateBlock->textures[i]) continue; + + /* Enable the correct target. Is this required for GLSL? For ARB_fragment_program it isn't, afaik. */ + glDisable(GL_TEXTURE_1D); + This->stateBlock->textureDimensions[i] = IWineD3DBaseTexture_GetTextureDimensions(This->stateBlock->textures[i]); + switch(This->stateBlock->textureDimensions[i]) { + case GL_TEXTURE_2D: + glDisable(GL_TEXTURE_3D); + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + break; + case GL_TEXTURE_3D: + glDisable(GL_TEXTURE_CUBE_MAP_ARB); + glDisable(GL_TEXTURE_2D); + break; + case GLTEXTURECUBEMAP: + glDisable(GL_TEXTURE_2D); + glDisable(GL_TEXTURE_3D); + break; + } + glEnable(This->stateBlock->textureDimensions[i]); + + /* Upload texture, apply states */ + IWineD3DBaseTexture_PreLoad((IWineD3DBaseTexture *) This->stateBlock->textures[i]); + IWineD3DDevice_SetupTextureStates((IWineD3DDevice *)This, i, REAPPLY_ALPHAOP); + IWineD3DBaseTexture_ApplyStateChanges(This->stateBlock->textures[i], This->stateBlock->textureState[i], This->stateBlock->samplerState[i]); + } +} + /* uploads textures and setup texture states ready for rendering */ void inline drawPrimitiveUploadTextures(IWineD3DDeviceImpl* This) { @@ -2282,8 +2322,11 @@ void drawPrimitive(IWineD3DDevice *iface /* Now initialize the materials state */ init_materials(iface, (dataLocations->u.s.diffuse.lpData != NULL || dataLocations->u.s.diffuse.VBO != 0)); - drawPrimitiveUploadTextures(This); - + if (usePixelShaderFunction) { + drawPrimitiveUploadTexturesPS(This); + } else { + drawPrimitiveUploadTextures(This); + } { GLenum glPrimType;

1 0

H. Verbeet : wined3d: Texture limits fixes.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: a54e36adfebd721c1f5c823b2edf784f1af1d9c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a54e36adfebd721c1f5c823… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:40:42 2006 +0200 wined3d: Texture limits fixes. GL_LIMITS(textures) is currently used for both the number of texture stages and the maximum number of simultaneous textures. In the current code that's the same, but in a later patch that will be separated, since a texture stage doesn't have to reference an actual texture. Also, shaders can access a larger number of samplers than the number of texture units the fixed function pipeline can access. --- dlls/wined3d/device.c | 32 +++++++++++++++-------------- dlls/wined3d/directx.c | 10 ++++++--- dlls/wined3d/drawprim.c | 6 +++-- dlls/wined3d/stateblock.c | 44 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d_gl.h | 2 ++ 6 files changed, 50 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a54e36adfebd721c1f5…

1 0

H. Verbeet : wined3d: Add register combiner function pointers.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: f40dd7635e95ea2033d54e7801d29dff83954dcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f40dd7635e95ea2033d54e7… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:40:14 2006 +0200 wined3d: Add register combiner function pointers. --- include/wine/wined3d_gl.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index a960f6f..304ae0c 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1530,6 +1530,13 @@ #define GL_EXT_FUNCS_GEN \ /* GL_ATI_separate_stencil */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ + /* GL_NV_register_combiners */ \ + USE_GL_FUNC(PGLFNCOMBINERINPUTNVPROC, glCombinerInputNV); \ + USE_GL_FUNC(PGLFNCOMBINEROUTPUTNVPROC, glCombinerOutputNV); \ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERFNVPROC, glCombinerParameterfNV); \ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERFVNVPROC, glCombinerParameterfvNV); \ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERINVPROC, glCombinerParameteriNV); \ + USE_GL_FUNC(PGLFNCOMBINERPARAMETERIVNVPROC, glCombinerParameterivNV); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

H. Verbeet : wined3d: Add & use D3DTEXTUREOP dumping code.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: 085e20c0da728883a02f7f08343baed24902177f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=085e20c0da728883a02f7f0… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 27 23:40:02 2006 +0200 wined3d: Add & use D3DTEXTUREOP dumping code. --- dlls/wined3d/utils.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bcf8913..0a21fd9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -480,6 +480,41 @@ #undef D3DSTATE_TO_STR } } +const char* debug_d3dtop(D3DTEXTUREOP d3dtop) { + switch (d3dtop) { +#define D3DTOP_TO_STR(u) case u: return #u + D3DTOP_TO_STR(D3DTOP_DISABLE); + D3DTOP_TO_STR(D3DTOP_SELECTARG1); + D3DTOP_TO_STR(D3DTOP_SELECTARG2); + D3DTOP_TO_STR(D3DTOP_MODULATE); + D3DTOP_TO_STR(D3DTOP_MODULATE2X); + D3DTOP_TO_STR(D3DTOP_MODULATE4X); + D3DTOP_TO_STR(D3DTOP_ADD); + D3DTOP_TO_STR(D3DTOP_ADDSIGNED); + D3DTOP_TO_STR(D3DTOP_SUBTRACT); + D3DTOP_TO_STR(D3DTOP_ADDSMOOTH); + D3DTOP_TO_STR(D3DTOP_BLENDDIFFUSEALPHA); + D3DTOP_TO_STR(D3DTOP_BLENDTEXTUREALPHA); + D3DTOP_TO_STR(D3DTOP_BLENDFACTORALPHA); + D3DTOP_TO_STR(D3DTOP_BLENDTEXTUREALPHAPM); + D3DTOP_TO_STR(D3DTOP_BLENDCURRENTALPHA); + D3DTOP_TO_STR(D3DTOP_PREMODULATE); + D3DTOP_TO_STR(D3DTOP_MODULATEALPHA_ADDCOLOR); + D3DTOP_TO_STR(D3DTOP_MODULATECOLOR_ADDALPHA); + D3DTOP_TO_STR(D3DTOP_MODULATEINVALPHA_ADDCOLOR); + D3DTOP_TO_STR(D3DTOP_MODULATEINVCOLOR_ADDALPHA); + D3DTOP_TO_STR(D3DTOP_BUMPENVMAP); + D3DTOP_TO_STR(D3DTOP_BUMPENVMAPLUMINANCE); + D3DTOP_TO_STR(D3DTOP_DOTPRODUCT3); + D3DTOP_TO_STR(D3DTOP_MULTIPLYADD); + D3DTOP_TO_STR(D3DTOP_LERP); +#undef D3DTOP_TO_STR + default: + FIXME("Unrecognized %u D3DTOP\n", d3dtop); + return "unrecognized"; + } +} + const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { #define POOL_TO_STR(p) case p: return #p; @@ -601,7 +636,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl * BOOL Handled = FALSE; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("Alpha?(%d), Stage:%d Op(%d), a1(%ld), a2(%ld), a3(%ld)\n", isAlpha, Stage, op, arg1, arg2, arg3); + TRACE("Alpha?(%d), Stage:%d Op(%s), a1(%ld), a2(%ld), a3(%ld)\n", isAlpha, Stage, debug_d3dtop(op), arg1, arg2, arg3); ENTER_GL(); @@ -1665,7 +1700,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl * Handled = FALSE; break; default: - FIXME("Can't use COMBINE4 and COMBINE together, thisop=%d, otherop=%ld, isAlpha(%d)\n", op, op2, isAlpha); + FIXME("Can't use COMBINE4 and COMBINE together, thisop=%s, otherop=%s, isAlpha(%d)\n", debug_d3dtop(op), debug_d3dtop(op2), isAlpha); LEAVE_GL(); return; } @@ -1684,7 +1719,7 @@ #define GLINFO_LOCATION ((IWineD3DImpl * LEAVE_GL(); /* After all the extensions, if still unhandled, report fixme */ - FIXME("Unhandled texture operation %d\n", op); + FIXME("Unhandled texture operation %s\n", debug_d3dtop(op)); #undef GLINFO_LOCATION } #endif

1 0

James Hawkins : shlwapi: Add tests for PathAppendA.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: 3a1a607a008f4ad1b5f1c3a248199fb2a12e277b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a1a607a008f4ad1b5f1c3a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 27 13:05:30 2006 -0700 shlwapi: Add tests for PathAppendA. --- dlls/shlwapi/tests/path.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index f8c74ab..826b6b6 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1163,6 +1163,139 @@ static void test_PathAddBackslash(void) ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); } +static void test_PathAppendA(void) +{ + char path[MAX_PATH]; + char too_long[LONG_LEN]; + char one[HALF_LEN], two[HALF_LEN]; + BOOL res; + + lstrcpy(path, "C:\\one"); + + /* try NULL pszMore */ + SetLastError(0xdeadbeef); + res = PathAppendA(path, NULL); + ok(!res, "Expected failure\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one"), "Expected C:\\one, got %s\n", path); + + /* try empty pszMore */ + SetLastError(0xdeadbeef); + res = PathAppendA(path, ""); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one"), "Expected C:\\one, got %s\n", path); + + /* try NULL pszPath */ + SetLastError(0xdeadbeef); + res = PathAppendA(NULL, "two\\three"); + ok(!res, "Expected failure\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + + /* try empty pszPath */ + path[0] = '\0'; + SetLastError(0xdeadbeef); + res = PathAppendA(path, "two\\three"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "two\\three"), "Expected \\two\\three, got %s\n", path); + + /* try empty pszPath and empty pszMore */ + path[0] = '\0'; + SetLastError(0xdeadbeef); + res = PathAppendA(path, ""); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "\\"), "Expected \\, got %s\n", path); + + /* try legit params */ + lstrcpy(path, "C:\\one"); + SetLastError(0xdeadbeef); + res = PathAppendA(path, "two\\three"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one\\two\\three"), "Expected C:\\one\\two\\three, got %s\n", path); + + /* try pszPath with backslash after it */ + lstrcpy(path, "C:\\one\\"); + SetLastError(0xdeadbeef); + res = PathAppendA(path, "two\\three"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one\\two\\three"), "Expected C:\\one\\two\\three, got %s\n", path); + + /* try pszMore with backslash before it */ + lstrcpy(path, "C:\\one"); + SetLastError(0xdeadbeef); + res = PathAppendA(path, "\\two\\three"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one\\two\\three"), "Expected C:\\one\\two\\three, got %s\n", path); + + /* try pszMore with backslash after it */ + lstrcpy(path, "C:\\one"); + SetLastError(0xdeadbeef); + res = PathAppendA(path, "two\\three\\"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one\\two\\three\\"), "Expected C:\\one\\two\\three\\, got %s\n", path); + + /* try spaces in pszPath */ + lstrcpy(path, "C: \\ one "); + SetLastError(0xdeadbeef); + res = PathAppendA(path, "two\\three"); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C: \\ one \\two\\three"), "Expected C: \\ one \\two\\three, got %s\n", path); + + /* try spaces in pszMore */ + lstrcpy(path, "C:\\one"); + SetLastError(0xdeadbeef); + res = PathAppendA(path, " two \\ three "); + ok(res, "Expected success\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(!lstrcmp(path, "C:\\one\\ two \\ three "), "Expected 'C:\\one\\ two \\ three ', got %s\n", path); + + /* pszPath is too long */ + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + SetLastError(0xdeadbeef); + res = PathAppendA(too_long, "two\\three"); + todo_wine + { + ok(!res, "Expected failure\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(lstrlen(too_long) == 0, "Expected length of too_long to be zero, got %i\n", lstrlen(too_long)); + } + + /* pszMore is too long */ + lstrcpy(path, "C:\\one"); + memset(too_long, 'a', LONG_LEN); + too_long[LONG_LEN - 1] = '\0'; + SetLastError(0xdeadbeef); + res = PathAppendA(path, too_long); + todo_wine + { + ok(!res, "Expected failure\n"); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); + ok(lstrlen(path) == 0, "Expected length of path to be zero, got %i\n", lstrlen(path)); + } + + /* both params combined are too long */ + memset(one, 'a', HALF_LEN); + one[HALF_LEN - 1] = '\0'; + memset(two, 'b', HALF_LEN); + two[HALF_LEN - 1] = '\0'; + SetLastError(0xdeadbeef); + res = PathAppendA(one, two); + todo_wine + { + ok(!res, "Expected failure\n"); + ok(lstrlen(one) == 0, "Expected length of one to be zero, got %i\n", lstrlen(one)); + } + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); +} + START_TEST(path) { hShlwapi = LoadLibraryA("shlwapi.dll"); @@ -1202,4 +1335,5 @@ START_TEST(path) test_PathCombineW(); test_PathCombineA(); + test_PathAppendA(); }

1 0

Mikołaj Zalewski : shell32: If needed show a confirmation dialog when deleting with SHFileOperation.
by Alexandre Julliard 28 Jun '06

28 Jun '06

Module: wine Branch: refs/heads/master Commit: ce9471f18ed06566b7d84accceacf262212fb3cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce9471f18ed06566b7d84ac… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jun 27 21:51:35 2006 +0200 shell32: If needed show a confirmation dialog when deleting with SHFileOperation. Show a confirmation dialog in SHFileOperationW for the FO_DELETE operation when called without FOF_NOCONFIRMATION or with FOF_WANTNUKEWARNING. That way the user's files won't be deleted without a warning. --- dlls/shell32/shlfileop.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b5e2e74..4651614 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1043,17 +1043,45 @@ static HRESULT copy_files(LPSHFILEOPSTRU return ERROR_SUCCESS; } +static BOOL confirm_delete_list(DWORD fFlags, FILE_LIST *flFrom) +{ + if (flFrom->dwNumFiles > 1) + { + WCHAR tmp[8]; + const WCHAR format[] = {'%','d',0}; + + wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles); + return SHELL_ConfirmDialogW(ASK_DELETE_MULTIPLE_ITEM, tmp); + } + else + { + FILE_ENTRY *fileEntry = &flFrom->feFiles[0]; + + if (IsAttribFile(fileEntry->attributes)) + return SHELL_ConfirmDialogW(ASK_DELETE_FILE, fileEntry->szFullPath); + else if (!(fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) + return SHELL_ConfirmDialogW(ASK_DELETE_FOLDER, fileEntry->szFullPath); + } + return TRUE; +} + /* the FO_DELETE operation */ static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom) { FILE_ENTRY *fileEntry; DWORD i; BOOL bPathExists; - BOOL bConfirm = !(lpFileOp->fFlags & FOF_NOCONFIRMATION); if (!flFrom->dwNumFiles) return ERROR_SUCCESS; + if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING)) + if (!confirm_delete_list(lpFileOp->fFlags, flFrom)) + { + lpFileOp->fAnyOperationsAborted = TRUE; + return 0; + } + for (i = 0; i < flFrom->dwNumFiles; i++) { bPathExists = TRUE; @@ -1063,7 +1091,7 @@ static HRESULT delete_files(LPSHFILEOPST if (IsAttribFile(fileEntry->attributes)) bPathExists = DeleteFileW(fileEntry->szFullPath); else if (!(lpFileOp->fFlags & FOF_FILESONLY && fileEntry->bFromWildcard)) - bPathExists = SHELL_DeleteDirectoryW(fileEntry->szFullPath, bConfirm); + bPathExists = SHELL_DeleteDirectoryW(fileEntry->szFullPath, FALSE); if (!bPathExists) return ERROR_PATH_NOT_FOUND; @@ -1192,7 +1220,7 @@ static HRESULT rename_files(LPSHFILEOPST static void check_flags(FILEOP_FLAGS fFlags) { WORD wUnsupportedFlags = FOF_ALLOWUNDO | FOF_NO_CONNECTED_ELEMENTS | - FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | FOF_WANTNUKEWARNING | + FOF_NOCOPYSECURITYATTRIBS | FOF_NORECURSEREPARSE | FOF_RENAMEONCOLLISION | FOF_WANTMAPPINGHANDLE; if (fFlags & wUnsupportedFlags)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2006