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

Robert Shearman : rpcrt4: Print some more informative error messages when getaddrinfo fails.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 423e7e308958413fdd85a3112964f98b29957ef1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=423e7e308958413fdd85a31… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:25:31 2006 +0100 rpcrt4: Print some more informative error messages when getaddrinfo fails. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 915f59a..34634b5 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -472,7 +472,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op ret = getaddrinfo(Connection->NetworkAddr, Connection->Endpoint, &hints, &ai); if (ret < 0) { - ERR("getaddrinfo failed with %d\n", ret); + ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); return RPC_S_SERVER_UNAVAILABLE; } @@ -597,7 +597,7 @@ static size_t rpcrt4_ncacn_ip_tcp_get_to ret = getaddrinfo(networkaddr, endpoint, &hints, &ai); if (ret < 0) { - ERR("getaddrinfo failed with %d\n", ret); + ERR("getaddrinfo failed: %s\n", gai_strerror(ret)); return 0; }

1 0

Robert Shearman : rpcrt4: Fix the pointer count used when handling embedded pointers in varying arrays .
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 678ad6286c8a4b833f5b27ce323bbbb54ebabe61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=678ad6286c8a4b833f5b27c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:25:44 2006 +0100 rpcrt4: Fix the pointer count used when handling embedded pointers in varying arrays. --- dlls/rpcrt4/ndr_marshall.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 83fc9be..5a1f057 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1073,7 +1073,7 @@ static unsigned char * EmbeddedPointerMa pFormat += 10; break; case RPC_FC_VARIABLE_REPEAT: - rep = pStubMsg->MaxCount; + rep = (pFormat[1] == RPC_FC_VARIABLE_OFFSET) ? pStubMsg->ActualCount : pStubMsg->MaxCount; stride = *(const WORD*)&pFormat[2]; ofs = *(const WORD*)&pFormat[4]; count = *(const WORD*)&pFormat[6]; @@ -1145,7 +1145,7 @@ static unsigned char * EmbeddedPointerUn pFormat += 10; break; case RPC_FC_VARIABLE_REPEAT: - rep = pStubMsg->MaxCount; + rep = (pFormat[1] == RPC_FC_VARIABLE_OFFSET) ? pStubMsg->ActualCount : pStubMsg->MaxCount; stride = *(const WORD*)&pFormat[2]; ofs = *(const WORD*)&pFormat[4]; count = *(const WORD*)&pFormat[6]; @@ -1210,7 +1210,7 @@ static void EmbeddedPointerBufferSize(PM pFormat += 10; break; case RPC_FC_VARIABLE_REPEAT: - rep = pStubMsg->MaxCount; + rep = (pFormat[1] == RPC_FC_VARIABLE_OFFSET) ? pStubMsg->ActualCount : pStubMsg->MaxCount; stride = *(const WORD*)&pFormat[2]; ofs = *(const WORD*)&pFormat[4]; count = *(const WORD*)&pFormat[6]; @@ -1273,7 +1273,7 @@ static unsigned long EmbeddedPointerMemo pFormat += 10; break; case RPC_FC_VARIABLE_REPEAT: - rep = pStubMsg->MaxCount; + rep = (pFormat[1] == RPC_FC_VARIABLE_OFFSET) ? pStubMsg->ActualCount : pStubMsg->MaxCount; stride = *(const WORD*)&pFormat[2]; ofs = *(const WORD*)&pFormat[4]; count = *(const WORD*)&pFormat[6]; @@ -1333,7 +1333,7 @@ static void EmbeddedPointerFree(PMIDL_ST pFormat += 10; break; case RPC_FC_VARIABLE_REPEAT: - rep = pStubMsg->MaxCount; + rep = (pFormat[1] == RPC_FC_VARIABLE_OFFSET) ? pStubMsg->ActualCount : pStubMsg->MaxCount; stride = *(const WORD*)&pFormat[2]; ofs = *(const WORD*)&pFormat[4]; count = *(const WORD*)&pFormat[6];

1 0

Robert Shearman : rpcrt4: CContext can be NULL in NDRCContextMarshall, in which case we should marshall all-zeros.
by Alexandre Julliard 03 Jun '06

03 Jun '06

Module: wine Branch: refs/heads/master Commit: 972ce2f6352a5acc82180ade30a1680730fbba3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=972ce2f6352a5acc82180ad… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 2 20:42:54 2006 +0100 rpcrt4: CContext can be NULL in NDRCContextMarshall, in which case we should marshall all-zeros. --- dlls/rpcrt4/ndr_marshall.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5a1f057..c714017 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4476,21 +4476,29 @@ void WINAPI NDRCContextMarshall(NDR_CCON TRACE("%p %p\n", CContext, pBuff); - EnterCriticalSection(&ndr_context_cs); - che = get_context_entry(CContext); - memcpy(pBuff, &che->wire_data, sizeof (ndr_context_handle)); - LeaveCriticalSection(&ndr_context_cs); + if (CContext) + { + EnterCriticalSection(&ndr_context_cs); + che = get_context_entry(CContext); + memcpy(pBuff, &che->wire_data, sizeof (ndr_context_handle)); + LeaveCriticalSection(&ndr_context_cs); + } + else + { + ndr_context_handle *wire_data = (ndr_context_handle *)pBuff; + wire_data->attributes = 0; + wire_data->uuid = GUID_NULL; + } } static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, RPC_BINDING_HANDLE hBinding, ndr_context_handle *chi) { - static const GUID zeroguid = {0,0,0,{0,0,0,0,0,0,0,0}}; struct context_handle_entry *che = NULL; /* a null UUID means we should free the context handle */ - if (IsEqualGUID(&chi->uuid, &zeroguid)) + if (IsEqualGUID(&chi->uuid, &GUID_NULL)) { che = get_context_entry(*CContext); if (!che)

1 0

Mike McCormack : wininet: Simple tests for InternetGetCookie's parameters.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 24b886d9165c479ee0dc4c8d2824c3f1b94a841c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24b886d9165c479ee0dc4c8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jun 2 19:49:27 2006 +0900 wininet: Simple tests for InternetGetCookie's parameters. --- dlls/wininet/cookie.c | 6 ++++++ dlls/wininet/tests/internet.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index fe32c0b..53ee643 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -264,6 +264,12 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR l TRACE("(%s, %s, %p, %p)\n", debugstr_w(lpszUrl),debugstr_w(lpszCookieName), lpCookieData, lpdwSize); + if (!lpszUrl) + { + SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME); + return FALSE; + } + COOKIE_crackUrlSimple(lpszUrl, hostName, sizeof(hostName)/sizeof(hostName[0]), path, sizeof(path)/sizeof(path[0])); LIST_FOR_EACH(cursor, &domain_list) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 2f0f8b7..d3596ae 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -125,7 +125,10 @@ static void test_null(void) static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; static const WCHAR szEmpty[] = { 0 }; static const WCHAR szUrl[] = { 'h','t','t','p',':','/','/','a','.','b','.','c',0 }; + static const WCHAR szExpect[] = { 's','e','r','v','e','r',';',' ','s','e','r','v','e','r',0 }; + WCHAR buffer[0x20]; BOOL r; + DWORD sz; hi = InternetOpenW(NULL, 0, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); @@ -184,6 +187,33 @@ static void test_null(void) ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); } ok(r == FALSE, "return wrong\n"); + + sz = 0; + r = InternetGetCookieW(NULL, NULL, NULL, &sz); + ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); + ok( r == FALSE, "return wrong\n"); + + r = InternetGetCookieW(szServer, NULL, NULL, &sz); + todo_wine { + ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); + } + ok( r == FALSE, "return wrong\n"); + + sz = 0; + r = InternetGetCookieW(szUrl, szServer, NULL, &sz); + ok( r == TRUE, "return wrong\n"); + todo_wine { + ok( sz == 30, "sz wrong\n"); + } + + sz = 0x20; + memset(buffer, 0, sizeof buffer); + r = InternetGetCookieW(szUrl, szServer, buffer, &sz); + ok( r == TRUE, "return wrong\n"); + todo_wine { + ok( sz == lstrlenW(buffer), "sz wrong\n"); + ok( !lstrcmpW(szExpect, buffer), "cookie data wrong\n"); + } } START_TEST(internet)

1 0

Mike McCormack : wininet: Remove some dead code (Coverity).
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 7b3cf21dc153f069b38742d7c821d1c43ac7757f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b3cf21dc153f069b38742d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jun 2 19:48:49 2006 +0900 wininet: Remove some dead code (Coverity). --- dlls/wininet/internet.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 98710c7..11651e5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2983,10 +2983,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER workRequest.asyncall = INTERNETOPENURLW; workRequest.hdr = WININET_AddRef( &hIC->hdr ); req = &workRequest.u.InternetOpenUrlW; - if (lpszUrl) - req->lpszUrl = WININET_strdupW(lpszUrl); - else - req->lpszUrl = 0; + req->lpszUrl = WININET_strdupW(lpszUrl); if (lpszHeaders) req->lpszHeaders = WININET_strdupW(lpszHeaders); else

1 0

Mike McCormack : wininet: Fix up and test InternetSetCookie parameter checking.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 68d18612a05482f82bd86ff9a0399b2e47f9e3df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68d18612a05482f82bd86ff… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jun 2 19:49:09 2006 +0900 wininet: Fix up and test InternetSetCookie parameter checking. --- dlls/wininet/cookie.c | 4 ++-- dlls/wininet/tests/internet.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index b34fd3f..fe32c0b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -402,9 +402,9 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR l TRACE("(%s,%s,%s)\n", debugstr_w(lpszUrl), debugstr_w(lpszCookieName), debugstr_w(lpCookieData)); - if (!lpCookieData || !strlenW(lpCookieData)) + if (!lpCookieData) { - TRACE("no cookie data, not adding\n"); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } if (!lpszCookieName) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 5f48097..2f0f8b7 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -123,6 +123,9 @@ static void test_null(void) { HINTERNET hi, hc; static const WCHAR szServer[] = { 's','e','r','v','e','r',0 }; + static const WCHAR szEmpty[] = { 0 }; + static const WCHAR szUrl[] = { 'h','t','t','p',':','/','/','a','.','b','.','c',0 }; + BOOL r; hi = InternetOpenW(NULL, 0, NULL, NULL, 0); ok(hi != NULL, "open failed\n"); @@ -152,6 +155,35 @@ static void test_null(void) ok(hc == NULL, "connect failed\n"); InternetCloseHandle(hi); + + r = InternetSetCookieW(NULL, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(r == FALSE, "return wrong\n"); + + r = InternetSetCookieW(szServer, NULL, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(r == FALSE, "return wrong\n"); + + r = InternetSetCookieW(szUrl, szServer, NULL); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error\n"); + ok(r == FALSE, "return wrong\n"); + + r = InternetSetCookieW(szUrl, szServer, szServer); + ok(r == TRUE, "return wrong\n"); + + todo_wine { + r = InternetSetCookieW(szUrl, NULL, szServer); + ok(r == TRUE, "return wrong\n"); + } + + r = InternetSetCookieW(szUrl, szServer, szEmpty); + ok(r == TRUE, "return wrong\n"); + + r = InternetSetCookieW(szServer, NULL, szServer); + todo_wine { + ok(GetLastError() == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "wrong error\n"); + } + ok(r == FALSE, "return wrong\n"); } START_TEST(internet)

1 0

Saulius Krasuckas : advapi32: Enable some tests and extend them to succeed on XP and 2003 SP1.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 67e6040c2d378c95f335db0930926775aa48bdf8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67e6040c2d378c95f335db0… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Fri Jun 2 21:55:08 2006 +0300 advapi32: Enable some tests and extend them to succeed on XP and 2003 SP1. --- dlls/advapi32/tests/registry.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2c079d2..44b0197 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -136,11 +136,11 @@ static void test_enum_value(void) ok( val_count == 2 || val_count == 3, "val_count set to %ld\n", val_count ); ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); -#if 0 - /* v5.1.2600.0 (XP Home) does not touch value or data in this case */ - ok( !strcmp( value, "Te" ), "value set to '%s' instead of 'Te'\n", value ); - ok( !strcmp( data, "foobar" ), "data set to '%s' instead of 'foobar'\n", data ); -#endif + /* v5.1.2600.0 (XP Home and Proffesional) does not touch value or data in this case */ + ok( !strcmp( value, "Te" ) || !strcmp( value, "xxxxxxxxxx" ), + "value set to '%s' instead of 'Te' or 'xxxxxxxxxx'\n", value ); + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow empty name */ val_count = 0; @@ -154,10 +154,9 @@ #endif ok( data_count == 7, "data_count set to %ld instead of 7\n", data_count ); ok( type == REG_SZ, "type %ld is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); -#if 0 - /* v5.1.2600.0 (XP Home) does not touch data in this case */ - ok( !strcmp( data, "foobar" ), "data set to '%s' instead of 'foobar'\n", data ); -#endif + /* v5.1.2600.0 (XP Home and Professional) does not touch data in this case */ + ok( !strcmp( data, "foobar" ) || !strcmp( data, "xxxxxxx" ), + "data set to '%s' instead of 'foobar' or 'xxxxxxx'\n", data ); /* overflow data */ val_count = 20; @@ -379,10 +378,9 @@ static void test_get_value(void) buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, &type, buf, &size); ok(ret == ERROR_SUCCESS, "ret=%ld\n", ret); -#if 0 - /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded length + 1 here. */ - ok(size == strlen(expanded)+1, "strlen(expanded)=%ld size=%ld\n", strlen(expanded), size); -#endif + /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ + ok((size == strlen(expanded)+1) || (size == strlen(sTestpath1)+1), + "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%ld\n", strlen(expanded), strlen(sTestpath1), size); ok(type == REG_SZ, "type=%ld\n", type); ok(!strcmp(expanded, buf), "expanded=\"%s\" buf=\"%s\"\n", expanded, buf);

1 0

Mikołaj Zalewski : shell32: Avoid Unicode-> ANSI conversion when deleting a file.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: b84f3093d56cab18771746b293fe6fe0f189669f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b84f3093d56cab18771746b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 2 17:08:58 2006 +0200 shell32: Avoid Unicode->ANSI conversion when deleting a file. --- dlls/shell32/shell32_main.h | 4 ++-- dlls/shell32/shfldr_fs.c | 27 ++++++++++++++++----------- dlls/shell32/shlfileop.c | 3 +-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 8800a55..7ead345 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -147,8 +147,8 @@ #define ASK_DELETE_MULTIPLE_ITEM 3 #define ASK_CREATE_FOLDER 4 #define ASK_OVERWRITE_FILE 5 -BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI); -BOOL SHELL_DeleteFileA(LPCSTR pszFile, BOOL bShowUI); +BOOL SHELL_DeleteDirectoryW(LPCWSTR pwszDir, BOOL bShowUI); +BOOL SHELL_DeleteFileW(LPCWSTR pwszFile, BOOL bShowUI); BOOL SHELL_ConfirmDialog(int nKindOfDialog, LPCSTR szDir); /* 16-bit functions */ diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 19c5bca..1ac8d0f 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1164,7 +1164,8 @@ ISFHelper_fnDeleteItems (ISFHelper * ifa { IGenericSFImpl *This = impl_from_ISFHelper(iface); UINT i; - char szPath[MAX_PATH]; + WCHAR wszPath[MAX_PATH]; + int iPathLen; BOOL bConfirm = TRUE; TRACE ("(%p)(%u %p)\n", This, cidl, apidl); @@ -1179,18 +1180,22 @@ ISFHelper_fnDeleteItems (ISFHelper * ifa bConfirm = FALSE; } + if (This->sPathTarget) + lstrcpynW(wszPath, This->sPathTarget, MAX_PATH); + else + wszPath[0] = '\0'; + PathAddBackslashW(wszPath); + iPathLen = lstrlenW(wszPath); + for (i = 0; i < cidl; i++) { - if (!WideCharToMultiByte(CP_ACP, 0, This->sPathTarget, -1, szPath, MAX_PATH, NULL, NULL)) - szPath[0] = '\0'; - PathAddBackslashA (szPath); - _ILSimpleGetText (apidl[i], szPath + strlen (szPath), MAX_PATH); + _ILSimpleGetTextW (apidl[i], wszPath+iPathLen, MAX_PATH-iPathLen); if (_ILIsFolder (apidl[i])) { LPITEMIDLIST pidl; - TRACE ("delete %s\n", szPath); - if (!SHELL_DeleteDirectoryA (szPath, bConfirm)) { - TRACE ("delete %s failed, bConfirm=%d\n", szPath, bConfirm); + TRACE ("delete %s\n", debugstr_w(wszPath)); + if (!SHELL_DeleteDirectoryW (wszPath, bConfirm)) { + TRACE ("delete %s failed, bConfirm=%d\n", debugstr_w(wszPath), bConfirm); return E_FAIL; } pidl = ILCombine (This->pidlRoot, apidl[i]); @@ -1199,9 +1204,9 @@ ISFHelper_fnDeleteItems (ISFHelper * ifa } else if (_ILIsValue (apidl[i])) { LPITEMIDLIST pidl; - TRACE ("delete %s\n", szPath); - if (!SHELL_DeleteFileA (szPath, bConfirm)) { - TRACE ("delete %s failed, bConfirm=%d\n", szPath, bConfirm); + TRACE ("delete %s\n", debugstr_w(wszPath)); + if (!SHELL_DeleteFileW (wszPath, bConfirm)) { + TRACE ("delete %s failed, bConfirm=%d\n", debugstr_w(wszPath), bConfirm); return E_FAIL; } pidl = ILCombine (This->pidlRoot, apidl[i]); diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3e087da..64e66e3 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -55,7 +55,6 @@ #define FO_MASK 0xF static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; -static BOOL SHELL_DeleteDirectoryW(LPCWSTR path, BOOL bShowUI); static DWORD SHNotifyCreateDirectoryA(LPCSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyRemoveDirectoryA(LPCSTR path); @@ -170,7 +169,7 @@ BOOL SHELL_DeleteDirectoryA(LPCSTR pszDi return ret; } -static BOOL SHELL_DeleteDirectoryW(LPCWSTR pszDir, BOOL bShowUI) +BOOL SHELL_DeleteDirectoryW(LPCWSTR pszDir, BOOL bShowUI) { BOOL ret = TRUE; HANDLE hFind;

1 0

Mikołaj Zalewski : shell32: Remove the now unused SHELL_DeleteFileA and SHELL_DeleteDirectoryA.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 276bbb9f97a393435b0ccd20a7b86f1c9b63661c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=276bbb9f97a393435b0ccd2… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 2 17:10:17 2006 +0200 shell32: Remove the now unused SHELL_DeleteFileA and SHELL_DeleteDirectoryA. --- dlls/shell32/shlfileop.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 64e66e3..426c022 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -156,19 +156,6 @@ static void SHELL32_FreeUnicodeBuf(LPWST * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ -BOOL SHELL_DeleteDirectoryA(LPCSTR pszDir, BOOL bShowUI) -{ - LPWSTR wPath; - BOOL ret = FALSE; - - if (!SHELL32_AnsiToUnicodeBuf(pszDir, &wPath, 0)) - { - ret = SHELL_DeleteDirectoryW(wPath, bShowUI); - SHELL32_FreeUnicodeBuf(wPath); - } - return ret; -} - BOOL SHELL_DeleteDirectoryW(LPCWSTR pszDir, BOOL bShowUI) { BOOL ret = TRUE; @@ -205,16 +192,8 @@ BOOL SHELL_DeleteDirectoryW(LPCWSTR pszD } /************************************************************************** - * SHELL_DeleteFileA() [internal] + * SHELL_DeleteFileW() [internal] */ -BOOL SHELL_DeleteFileA(LPCSTR pszFile, BOOL bShowUI) -{ - if (bShowUI && !SHELL_ConfirmDialog(ASK_DELETE_FILE, pszFile)) - return FALSE; - - return (SHNotifyDeleteFileA(pszFile) == ERROR_SUCCESS); -} - BOOL SHELL_DeleteFileW(LPCWSTR pszFile, BOOL bShowUI) { if (bShowUI && !SHELL_ConfirmDialogW(ASK_DELETE_FILE, pszFile))

1 0

Saulius Krasuckas : rasenh: Fix a copy&paste bug at passing only one string to RegSetValueExW() at a time.
by Alexandre Julliard 02 Jun '06

02 Jun '06

Module: wine Branch: refs/heads/master Commit: 9b2fe9e1935049659433b82b6942df9095d3ae12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b2fe9e1935049659433b82… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Fri Jun 2 21:55:00 2006 +0300 rasenh: Fix a copy&paste bug at passing only one string to RegSetValueExW() at a time. --- dlls/rsaenh/rsaenh.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 8f31a84..cd474c6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3687,9 +3687,10 @@ HRESULT WINAPI DllRegisterServer(void) 'K','e','y',' ','E','x','c','h','a','n','g','e',')',0 }, { 'R','S','A',' ','S','C','h','a','n','n','e','l',0 } }; - RegSetValueExW(key, szName, 0, REG_SZ, (LPBYTE)szRSAName[i], sizeof(szRSAName)); + RegSetValueExW(key, szName, 0, REG_SZ, + (LPBYTE)szRSAName[i], lstrlenW(szRSAName[i])*sizeof(WCHAR)+sizeof(WCHAR)); RegSetValueExW(key, szTypeName, 0, REG_SZ, - (LPBYTE)szRSATypeName[i],sizeof(szRSATypeName)); + (LPBYTE)szRSATypeName[i], lstrlenW(szRSATypeName[i])*sizeof(WCHAR)+sizeof(WCHAR)); } } RegCloseKey(key);

1 0