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

Stefan Dösinger : wined3d: Some point sprite fixes.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: a3854be0b3e2e7a1f863b5db42d7b4287f5eede7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3854be0b3e2e7a1f863b5db4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 17 00:26:17 2007 +0200 wined3d: Some point sprite fixes. --- dlls/wined3d/context.c | 10 ++++++++-- dlls/wined3d/state.c | 26 ++++---------------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5570225..60830dc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -206,6 +206,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar GLXFBConfig *cfgs = NULL; GLXContext ctx = NULL, oldCtx; WineD3DContext *ret = NULL; + int s; TRACE("(%p): Creating a %s context for render target %p\n", This, win ? "onscreen" : "offscreen", target); @@ -368,8 +369,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glEnable(GL_WEIGHT_SUM_UNITY_ARB)"); } if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - int s; - glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); @@ -382,6 +381,13 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ...\n"); } } + if(GL_SUPPORT(ARB_POINT_SPRITE)) { + for(s = 0; s < GL_LIMITS(textures); s++) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + s)); + glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); + checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)\n"); + } + } if(oldDrawable && oldCtx) { glXMakeCurrent(display, oldDrawable, oldCtx); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2a5f67e..e91441a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1315,9 +1315,6 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - unsigned int i; - int val; - /* TODO: NV_POINT_SPRITE */ if (!GL_SUPPORT(ARB_POINT_SPRITE)) { TRACE("Point sprites not supported\n"); @@ -1325,26 +1322,11 @@ static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, W } if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { - val = GL_TRUE; + glEnable(GL_POINT_SPRITE_ARB); + checkGLcall("glEnable(GL_POINT_SPRITE_ARB)\n"); } else { - val = GL_FALSE; - } - - for (i = 0; i < GL_LIMITS(textures); i++) { - /* Note the WINED3DRS value applies to all textures, but GL has one - * per texture, so apply it now ready to be used! - */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } else if (i==1) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - break; - } - - glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, val); - checkGLcall((val?"glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE)": - "glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_FALSE)")); + glDisable(GL_POINT_SPRITE_ARB); + checkGLcall("glDisable(GL_POINT_SPRITE_ARB)\n"); } }

1 0

Rob Shearman : advapi32: Always set the requested fields of the security descriptor according to the info flags in GetNamedSecurityInfoW .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: d521a2c6d3cbdfa42de8725c5af8700c737d5fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d521a2c6d3cbdfa42de8725c5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 15:00:38 2007 +0100 advapi32: Always set the requested fields of the security descriptor according to the info flags in GetNamedSecurityInfoW. Also, set the control flags so that other security descriptor functions can retrieve the info from it. --- dlls/advapi32/security.c | 22 ++++++++++++++-------- dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 126a4ac..b46a6f7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3951,32 +3951,38 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, buffer = (BYTE *)relative; offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); - if (owner && (info & OWNER_SECURITY_INFORMATION)) + if (info & OWNER_SECURITY_INFORMATION) { memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); relative->Owner = offset; - *owner = buffer + offset; + if (owner) + *owner = buffer + offset; offset += sizeof(sidWorld); } - if (group && (info & GROUP_SECURITY_INFORMATION)) + if (info & GROUP_SECURITY_INFORMATION) { memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); relative->Group = offset; - *group = buffer + offset; + if (group) + *group = buffer + offset; offset += sizeof(sidWorld); } - if (dacl && (info & DACL_SECURITY_INFORMATION)) + if (info & DACL_SECURITY_INFORMATION) { + relative->Control |= SE_DACL_PRESENT; GetWorldAccessACL( (PACL)(buffer + offset) ); relative->Dacl = offset; - *dacl = (PACL)(buffer + offset); + if (dacl) + *dacl = (PACL)(buffer + offset); offset += WINE_SIZE_OF_WORLD_ACCESS_ACL; } - if (sacl && (info & SACL_SECURITY_INFORMATION)) + if (info & SACL_SECURITY_INFORMATION) { + relative->Control |= SE_SACL_PRESENT; GetWorldAccessACL( (PACL)(buffer + offset) ); relative->Sacl = offset; - *sacl = (PACL)(buffer + offset); + if (sacl) + *sacl = (PACL)(buffer + offset); } return ERROR_SUCCESS; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9aba94b..532dc69 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1718,6 +1718,40 @@ static void test_SetEntriesInAcl(void) ok(acl == NULL, "acl=%p, expected NULL\n", acl); } +static void test_GetNamedSecurityInfoA(void) +{ + PSECURITY_DESCRIPTOR pSecDesc; + DWORD revision; + SECURITY_DESCRIPTOR_CONTROL control; + PSID owner; + PSID group; + BOOL owner_defaulted; + BOOL group_defaulted; + DWORD error; + BOOL ret; + CHAR windows_dir[MAX_PATH]; + + ret = GetWindowsDirectoryA(windows_dir, MAX_PATH); + ok(ret, "GetWindowsDirectory failed with error %d\n", GetLastError()); + + error = GetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSecDesc); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + ret = GetSecurityDescriptorControl(pSecDesc, &control, &revision); + ok(ret, "GetSecurityDescriptorControl failed with error %d\n", GetLastError()); + ok((control & (SE_SELF_RELATIVE|SE_DACL_PRESENT)) == (SE_SELF_RELATIVE|SE_DACL_PRESENT), + "control (0x%x) doesn't have (SE_SELF_RELATIVE|SE_DACL_PRESENT) flags set\n", control); + ok(revision == SECURITY_DESCRIPTOR_REVISION1, "revision was %d instead of 1\n", revision); + ret = GetSecurityDescriptorOwner(pSecDesc, &owner, &owner_defaulted); + ok(ret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); + ok(owner != NULL, "owner should not be NULL\n"); + ret = GetSecurityDescriptorGroup(pSecDesc, &group, &group_defaulted); + ok(ret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); + ok(group != NULL, "group should not be NULL\n"); +} + START_TEST(security) { init(); @@ -1739,4 +1773,5 @@ START_TEST(security) test_process_security(); test_impersonation_level(); test_SetEntriesInAcl(); + test_GetNamedSecurityInfoA(); }

1 0

Alexandre Julliard : ntdll: Use the standard exception handling for vm86 GP faults too.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: b5953831c3002f3ea33b5faf58a6ab1ab808ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5953831c3002f3ea33b5faf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 19:47:58 2007 +0200 ntdll: Use the standard exception handling for vm86 GP faults too. --- dlls/ntdll/signal_i386.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 39f6f4b..d58b4c8 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1464,8 +1464,7 @@ void __wine_enter_vm86( CONTEXT *context ) { case VM86_UNKNOWN: /* unhandled GP fault - IO-instruction or similar */ rec.ExceptionCode = EXCEPTION_PRIV_INSTRUCTION; - raise_segv_exception( &rec, context ); - continue; + break; case VM86_TRAP: /* return due to DOS-debugger request */ switch(VM86_ARG(res)) {

1 0

Alexandre Julliard : mapi32: Get rid of unneeded CharNextA call.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 24eee19bfd1ad1ac19c2ddf6075bde1391065a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eee19bfd1ad1ac19c2ddf60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 19:48:15 2007 +0200 mapi32: Get rid of unneeded CharNextA call. --- dlls/mapi32/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index edfeab5..6621e6f 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -656,7 +656,7 @@ UINT WINAPI UFromSz(LPCSTR lpszStr) while (*lpszStr >= '0' && *lpszStr <= '9') { ulRet = ulRet * 10 + (*lpszStr - '0'); - lpszStr = CharNextA(lpszStr); + lpszStr++; } } return ulRet;

1 0

Alexandre Julliard : crypt32: Fix incorrect usage of CharNextA.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: c2cf60fcee4e10092cebeb40d41c3494bf0c7950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf60fcee4e10092cebeb40d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 19:55:29 2007 +0200 crypt32: Fix incorrect usage of CharNextA. --- dlls/crypt32/str.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index a4e9e92..6d879c5 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -447,7 +447,7 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, *ppszError = pszX500; for (i = 0; i < errorStr - x500; i++) - CharNextA(*ppszError); + *ppszError = CharNextA(*ppszError); } CryptMemFree(x500); }

1 0

Stefan Dösinger : wined3d: Clamp material power to 128 .0.
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 4f8eb6a32e0cf67842f42c4b5b66e23e9c6a9a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8eb6a32e0cf67842f42c4b5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 15 22:38:14 2007 +0200 wined3d: Clamp material power to 128.0. --- dlls/ddraw/tests/d3d.c | 21 +++++++++++++++++++++ dlls/wined3d/state.c | 14 +++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e994097..0c69b42 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -172,6 +172,7 @@ static void LightTest(void) BOOL bEnabled = FALSE; float one = 1.0f; float zero= 0.0f; + D3DMATERIAL7 mat; /* Set a few lights with funky indices. */ memset(&light, 0, sizeof(light)); @@ -315,6 +316,26 @@ static void LightTest(void) light.dvAttenuation0 = -1.0; rc = IDirect3DDevice7_SetLight(lpD3DDevice, 103, &light); ok(rc==D3D_OK, "SetLight returned: %x\n", rc); + + memset(&mat, 0, sizeof(mat)); + rc = IDirect3DDevice7_SetMaterial(lpD3DDevice, &mat); + ok(rc == D3D_OK, "IDirect3DDevice7_SetMaterial returned: %x\n", rc); + + mat.power = 129.0; + rc = IDirect3DDevice7_SetMaterial(lpD3DDevice, &mat); + ok(rc == D3D_OK, "IDirect3DDevice7_SetMaterial(power = 129.0) returned: %x\n", rc); + memset(&mat, 0, sizeof(mat)); + rc = IDirect3DDevice7_GetMaterial(lpD3DDevice, &mat); + ok(rc == D3D_OK, "IDirect3DDevice7_GetMaterial returned: %x\n", rc); + ok(mat.power == 129, "Returned power is %f\n", mat.power); + + mat.power = -1.0; + rc = IDirect3DDevice7_SetMaterial(lpD3DDevice, &mat); + ok(rc == D3D_OK, "IDirect3DDevice7_SetMaterial(power = -1.0) returned: %x\n", rc); + memset(&mat, 0, sizeof(mat)); + rc = IDirect3DDevice7_GetMaterial(lpD3DDevice, &mat); + ok(rc == D3D_OK, "IDirect3DDevice7_GetMaterial returned: %x\n", rc); + ok(mat.power == -1, "Returned power is %f\n", mat.power); } static void ProcessVerticesTest(void) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d83e7f7..2a5f67e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -509,8 +509,20 @@ state_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon if (stateblock->renderState[WINED3DRS_SPECULARENABLE]) { glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &stateblock->material.Specular); checkGLcall("glMaterialfv"); - glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); + + if(stateblock->material.Power > 128.0) { + /* glMaterialf man page says that the material says that GL_SHININESS must be between 0.0 + * and 128.0, although in d3d neither -1 nor 129 produce an error. For values > 128 clamp + * them, since 128 results in a hardly visible specular highlight, so it should be safe to + * to clamp to 128 + */ + WARN("Material power > 128\n"); + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, 128.0); + } else { + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, stateblock->material.Power); + } checkGLcall("glMaterialf(GL_SHININESS"); + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { glEnable(GL_COLOR_SUM_EXT); } else {

1 0

Stefan Dösinger : wined3d: Skip the start offset to the source array in IWIneD3DVertexShaderImpl_SetLocalConstantsF .
by Alexandre Julliard 26 Jun '07

26 Jun '07

Module: wine Branch: master Commit: 97b1d0692c45336f18348584d1e3651341b12333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b1d0692c45336f18348584d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Jun 16 11:44:08 2007 +0200 wined3d: Skip the start offset to the source array in IWIneD3DVertexShaderImpl_SetLocalConstantsF. --- dlls/wined3d/vertexshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b534918..af6bc36 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -613,7 +613,7 @@ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertex if (!lconst) return E_OUTOFMEMORY; lconst->idx = i; - CopyMemory(lconst->value, src_data + i * 4, 4 * sizeof(float)); + memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); list_add_head(&This->baseShader.constantsF, &lconst->entry); }

1 0

Alexandre Julliard : server: Make crash error message more explicit.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 6d1605a6a4c7d291189a593ed356070c1025e70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1605a6a4c7d291189a593ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 14:13:21 2007 +0200 server: Make crash error message more explicit. --- server/signal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/signal.c b/server/signal.c index fb16c2f..c8120ac 100644 --- a/server/signal.c +++ b/server/signal.c @@ -225,7 +225,7 @@ static void do_sigchld( int signum ) /* SIGSEGV handler */ static void do_sigsegv( int signum ) { - fprintf( stderr, "wineserver crashed, please report this.\n"); + fprintf( stderr, "wineserver crashed, please enable coredumps (ulimit -c unlimited) and restart.\n"); abort(); }

1 0

Alexandre Julliard : advpack: Get rid of CharPrevW.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 9c08c46e1fd3162b3990a79ce732beaf66bc447b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c08c46e1fd3162b3990a79ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 14:02:29 2007 +0200 advpack: Get rid of CharPrevW. --- dlls/advpack/files.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 134ed1c..163f994 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -331,7 +331,6 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; - static const WCHAR backslash[] = {'\\',0}; static const WCHAR asterisk[] = {'*',0}; static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; @@ -344,11 +343,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) int fname_len = lstrlenW(fname); /* Generate a path with wildcard suitable for iterating */ - if (lstrcmpW(CharPrevW(fname, fname + fname_len), backslash)) - { - lstrcpyW(fname + fname_len, backslash); - ++fname_len; - } + if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; lstrcpyW(fname + fname_len, asterisk); if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : comctl32: Get rid of CharNextW/CharPrevW. Simplify some string functions.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 52e5d3849ffb2eb22aba2e624ff5248ec685f2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e5d3849ffb2eb22aba2e624… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 13:51:00 2007 +0200 comctl32: Get rid of CharNextW/CharPrevW. Simplify some string functions. --- dlls/comctl32/string.c | 167 ++++++++++++++---------------------------------- 1 files changed, 49 insertions(+), 118 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 654c467..f6dbd8c 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -81,22 +81,6 @@ static BOOL COMCTL32_ChrCmpHelperA(WORD ch1, WORD ch2, DWORD dwFlags) } /************************************************************************* - * COMCTL32_ChrCmpHelperW - * - * Internal helper for COMCTL32_ChrCmpW/ChrCmpIW. - */ -static BOOL COMCTL32_ChrCmpHelperW(WCHAR ch1, WCHAR ch2, DWORD dwFlags) -{ - WCHAR str1[2], str2[2]; - - str1[0] = ch1; - str1[1] = '\0'; - str2[0] = ch2; - str2[1] = '\0'; - return CompareStringW(GetThreadLocale(), dwFlags, str1, 2, str2, 2) - 2; -} - -/************************************************************************* * COMCTL32_ChrCmpA (internal) * * Internal helper function. @@ -127,23 +111,13 @@ static BOOL COMCTL32_ChrCmpIA(WORD ch1, WORD ch2) } /************************************************************************* - * COMCTL32_ChrCmpW - * - * Internal helper function. - */ -static BOOL COMCTL32_ChrCmpW(WCHAR ch1, WCHAR ch2) -{ - return COMCTL32_ChrCmpHelperW(ch1, ch2, 0); -} - -/************************************************************************* * COMCTL32_ChrCmpIW * * Internal helper function. */ -static BOOL COMCTL32_ChrCmpIW(WCHAR ch1, WCHAR ch2) +static inline BOOL COMCTL32_ChrCmpIW(WCHAR ch1, WCHAR ch2) { - return COMCTL32_ChrCmpHelperW(ch1, ch2, NORM_IGNORECASE); + return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - 2; } /************************************************************************** @@ -372,30 +346,6 @@ static LPSTR COMCTL32_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, return NULL; } -/************************************************************************* - * COMCTL32_StrStrHelperW - * - * Internal implementation of StrStrW/StrStrIW - */ -static LPWSTR COMCTL32_StrStrHelperW(LPCWSTR lpszStr, LPCWSTR lpszSearch, - INT (WINAPI *pStrCmpFn)(LPCWSTR,LPCWSTR,INT)) -{ - int iLen; - - if (!lpszStr || !lpszSearch || !*lpszSearch) - return NULL; - - iLen = strlenW(lpszSearch); - - while (*lpszStr) - { - if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) - return (LPWSTR)lpszStr; - lpszStr = CharNextW(lpszStr); - } - return NULL; -} - /************************************************************************** * StrStrIA [COMCTL32.355] * @@ -439,9 +389,22 @@ INT WINAPI StrToIntA (LPCSTR lpszStr) */ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { + int iLen; + TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); - return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, StrCmpNIW); + if (!lpszStr || !lpszSearch || !*lpszSearch) + return NULL; + + iLen = strlenW(lpszSearch); + + while (*lpszStr) + { + if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) + return (LPWSTR)lpszStr; + lpszStr++; + } + return NULL; } /************************************************************************** @@ -602,25 +565,18 @@ LPSTR WINAPI StrRChrA(LPCSTR lpszStr, LPCSTR lpszEnd, WORD ch) * * See StrRChrA. */ -LPWSTR WINAPI StrRChrW(LPCWSTR lpszStr, LPCWSTR lpszEnd, WORD ch) +LPWSTR WINAPI StrRChrW(LPCWSTR str, LPCWSTR end, WORD ch) { - LPCWSTR lpszRet = NULL; - - TRACE("(%s,%s,%x)\n", debugstr_w(lpszStr), debugstr_w(lpszEnd), ch); - - if (lpszStr) - { - if (!lpszEnd) - lpszEnd = lpszStr + strlenW(lpszStr); + WCHAR *ret = NULL; - while (*lpszStr && lpszStr <= lpszEnd) + if (!str) return NULL; + if (!end) end = str + strlenW(str); + while (str < end) { - if (!COMCTL32_ChrCmpW(ch, *lpszStr)) - lpszRet = lpszStr; - lpszStr = CharNextW(lpszStr); + if (*str == ch) ret = (WCHAR *)str; + str++; } - } - return (LPWSTR)lpszRet; + return ret; } /************************************************************************** @@ -649,9 +605,8 @@ LPSTR WINAPI StrStrA(LPCSTR lpszStr, LPCSTR lpszSearch) */ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { - TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); - - return COMCTL32_StrStrHelperW(lpszStr, lpszSearch, StrCmpNW); + if (!lpszStr || !lpszSearch) return NULL; + return strstrW( lpszStr, lpszSearch ); } /************************************************************************* @@ -700,7 +655,7 @@ LPWSTR WINAPI StrChrIW(LPCWSTR lpszStr, WCHAR ch) { if (toupperW(*lpszStr) == ch) return (LPWSTR)lpszStr; - lpszStr = CharNextW(lpszStr); + lpszStr++; } lpszStr = NULL; } @@ -780,38 +735,12 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) lpszRet = (LPWSTR)lpszStr; } - lpszStr = CharNextW(lpszStr); + lpszStr++; } return lpszRet; } /************************************************************************* - * COMCTL32_StrSpnHelperW - * - * Internal implementation of StrSpnW/StrCSpnW/StrCSpnIW - */ -static int COMCTL32_StrSpnHelperW(LPCWSTR lpszStr, LPCWSTR lpszMatch, - LPWSTR (WINAPI *pStrChrFn)(LPCWSTR,WCHAR), - BOOL bInvert) -{ - LPCWSTR lpszRead = lpszStr; - if (lpszStr && *lpszStr && lpszMatch) - { - while (*lpszRead) - { - LPCWSTR lpszTest = pStrChrFn(lpszMatch, *lpszRead); - - if (!bInvert && !lpszTest) - break; - if (bInvert && lpszTest) - break; - lpszRead = CharNextW(lpszRead); - }; - } - return lpszRead - lpszStr; -} - -/************************************************************************* * StrCSpnIA [COMCTL32.374] * * Find the length of the start of a string that does not contain certain @@ -839,9 +768,19 @@ int WINAPI StrCSpnIA(LPCSTR lpszStr, LPCSTR lpszMatch) */ int WINAPI StrCSpnIW(LPCWSTR lpszStr, LPCWSTR lpszMatch) { + LPCWSTR lpszRead = lpszStr; + TRACE("(%s,%s)\n",debugstr_w(lpszStr), debugstr_w(lpszMatch)); - return COMCTL32_StrSpnHelperW(lpszStr, lpszMatch, StrChrIW, TRUE); + if (lpszStr && *lpszStr && lpszMatch) + { + while (*lpszRead) + { + if (StrChrIW(lpszMatch, *lpszRead)) break; + lpszRead++; + } + } + return lpszRead - lpszStr; } /************************************************************************** @@ -889,25 +828,18 @@ LPSTR WINAPI StrRChrIA(LPCSTR lpszStr, LPCSTR lpszEnd, WORD ch) * * See StrRChrIA. */ -LPWSTR WINAPI StrRChrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, WORD ch) +LPWSTR WINAPI StrRChrIW(LPCWSTR str, LPCWSTR end, WORD ch) { - LPCWSTR lpszRet = NULL; - - TRACE("(%s,%s,%x)\n", debugstr_w(lpszStr), debugstr_w(lpszEnd), ch); - - if (lpszStr) - { - if (!lpszEnd) - lpszEnd = lpszStr + strlenW(lpszStr); + WCHAR *ret = NULL; - while (*lpszStr && lpszStr <= lpszEnd) + if (!str) return NULL; + if (!end) end = str + strlenW(str); + while (str < end) { - if (ch == *lpszStr) - lpszRet = lpszStr; - lpszStr = CharNextW(lpszStr); + if (!COMCTL32_ChrCmpIW(*str, ch)) ret = (WCHAR *)str; + str++; } - } - return (LPWSTR)lpszRet; + return ret; } /************************************************************************* @@ -917,9 +849,8 @@ LPWSTR WINAPI StrRChrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, WORD ch) */ int WINAPI StrCSpnW(LPCWSTR lpszStr, LPCWSTR lpszMatch) { - TRACE("(%s,%s)\n",debugstr_w(lpszStr), debugstr_w(lpszMatch)); - - return COMCTL32_StrSpnHelperW(lpszStr, lpszMatch, StrChrW, TRUE); + if (!lpszStr || !lpszMatch) return 0; + return strcspnW( lpszStr, lpszMatch ); } /*************************************************************************

1 0