September 2008 - Wine-commits

Rob Shearman : msvcrt: Fix character count passed into fgetws in test_fileops.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 0848a19ec0d237029ad7ab5f7799f64ab7dfa6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0848a19ec0d237029ad7ab5f7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:56:21 2008 +0100 msvcrt: Fix character count passed into fgetws in test_fileops. --- dlls/msvcrt/tests/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0cf13fd..97f9646 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -114,13 +114,13 @@ static void test_fileops( void ) fclose (file); fd = open ("fdopen.tst", O_RDONLY | O_TEXT); file = fdopen (fd, "rt"); /* open in TEXT mode */ - ok(fgetws(wbuffer,sizeof(wbuffer),file) !=0,"fgetws failed unexpected\n"); - ok(fgetws(wbuffer,sizeof(wbuffer),file) ==0,"fgetws didn't signal EOF\n"); + ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) !=0,"fgetws failed unexpected\n"); + ok(fgetws(wbuffer,sizeof(wbuffer)/sizeof(wbuffer[0]),file) ==0,"fgetws didn't signal EOF\n"); ok(feof(file) !=0,"feof doesn't signal EOF\n"); rewind(file); ok(fgetws(wbuffer,strlen(outbuffer),file) !=0,"fgetws failed unexpected\n"); ok(lstrlenW(wbuffer) == (lstrlenA(outbuffer) -1),"fgetws didn't read right size\n"); - ok(fgetws(wbuffer,sizeof(outbuffer),file) !=0,"fgets failed unexpected\n"); + ok(fgetws(wbuffer,sizeof(outbuffer)/sizeof(outbuffer[0]),file) !=0,"fgets failed unexpected\n"); ok(lstrlenW(wbuffer) == 1,"fgets dropped chars\n"); fclose (file);

1 0

Rob Shearman : kernel32: Fix character count passed to GlobalGetAtomNameW in test_get_atom_name.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 1229e0ab29a6cab6b25585775ca9728b14dd94f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1229e0ab29a6cab6b25585775… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 17 10:55:43 2008 +0100 kernel32: Fix character count passed to GlobalGetAtomNameW in test_get_atom_name. --- dlls/kernel32/tests/atom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index fcf60e2..9601fd6 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -304,7 +304,7 @@ static void test_get_atom_name(void) do_initW(inW, "abcdefghij", 255); atom = GlobalAddAtomW(inW); ok(atom, "couldn't add atom for %s\n", in); - len = GlobalGetAtomNameW(atom, outW, sizeof(outW)); + len = GlobalGetAtomNameW(atom, outW, sizeof(outW)/sizeof(outW[0])); ok(len == 255, "length mismatch (%u instead of 255)\n", len); for (i = 0; i < 255; i++) {

1 0

Peter Dons Tychsen : winedevice: Fix problems with driver entries without the "ImagePath" entry in registry .
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: bc7b194bf9ec41387fc269649ee739928028a2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc7b194bf9ec41387fc269649… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Sep 17 00:33:26 2008 +0200 winedevice: Fix problems with driver entries without the "ImagePath" entry in registry. --- programs/winedevice/device.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5a1ba99..7afe97e 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -147,6 +147,8 @@ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) /* load the .sys module for a device driver */ static BOOL load_driver(void) { + static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; + static const WCHAR postfixW[] = {'.','s','y','s',0}; static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; static const WCHAR ImagePathW[] = {'I','m','a','g','e','P','a','t','h',0}; static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', @@ -174,17 +176,31 @@ static BOOL load_driver(void) /* read the executable path from memory */ size = 0; - if (RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, NULL, &size )) return FALSE; - - str = HeapAlloc( GetProcessHeap(), 0, size ); - if (!RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, (LPBYTE)str, &size )) + if (!RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, NULL, &size )) + { + str = HeapAlloc( GetProcessHeap(), 0, size ); + if (!RegQueryValueExW( driver_hkey, ImagePathW, NULL, &type, (LPBYTE)str, &size )) + { + size = ExpandEnvironmentStringsW(str,NULL,0); + path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); + ExpandEnvironmentStringsW(str,path,size); + } + HeapFree( GetProcessHeap(), 0, str ); + if (!path) return FALSE; + } + else { - size = ExpandEnvironmentStringsW(str,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - ExpandEnvironmentStringsW(str,path,size); + /* default is to use the driver name + ".sys" */ + WCHAR buffer[MAX_PATH]; + GetSystemDirectoryW(buffer, MAX_PATH); + path = HeapAlloc(GetProcessHeap(),0, + (strlenW(buffer) + strlenW(driversW) + strlenW(driver_name) + strlenW(postfixW) + 1) + *sizeof(WCHAR)); + lstrcpyW(path, buffer); + lstrcatW(path, driversW); + lstrcatW(path, driver_name); + lstrcatW(path, postfixW); } - HeapFree( GetProcessHeap(), 0, str ); - if (!path) return FALSE; /* GameGuard uses an NT-style path name */ str = path;

1 0

Huw Davies : inetcomm: Implement IMimeInternational_ConvertString.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 0d04d7acb145aaf3af583e4a59749fbb5772e89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d04d7acb145aaf3af583e4a5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 16 11:48:16 2008 +0100 inetcomm: Implement IMimeInternational_ConvertString. --- dlls/inetcomm/mimeintl.c | 68 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 48deebf..5c4c867 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -34,6 +34,7 @@ #include "mlang.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" #include "inetcomm_private.h" @@ -395,12 +396,71 @@ static HRESULT WINAPI MimeInternat_ConvertBuffer(IMimeInternational *iface, CODE } static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODEPAGEID cpiSource, - CODEPAGEID cpiDest, - LPPROPVARIANT pIn, + CODEPAGEID cpiDest, LPPROPVARIANT pIn, LPPROPVARIANT pOut) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr; + int src_len; + IMultiLanguage *ml; + + TRACE("(%p)->(%d, %d, %p %p)\n", iface, cpiSource, cpiDest, pIn, pOut); + + switch(pIn->vt) + { + case VT_LPSTR: + if(cpiSource == CP_UNICODE) cpiSource = GetACP(); + src_len = strlen(pIn->u.pszVal); + break; + case VT_LPWSTR: + cpiSource = CP_UNICODE; + src_len = strlenW(pIn->u.pwszVal) * sizeof(WCHAR); + break; + default: + return E_INVALIDARG; + } + + hr = get_mlang(&ml); + if(SUCCEEDED(hr)) + { + DWORD mode = 0; + UINT in_size = src_len, out_size; + + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, + NULL, &out_size); + if(hr == S_OK) /* S_FALSE means the conversion could not be performed */ + { + out_size += (cpiDest == CP_UNICODE) ? sizeof(WCHAR) : sizeof(char); + + pOut->u.pszVal = CoTaskMemAlloc(out_size); + if(!pOut->u.pszVal) + hr = E_OUTOFMEMORY; + else + { + mode = 0; + in_size = src_len; + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, + (BYTE*)pOut->u.pszVal, &out_size); + + if(hr == S_OK) + { + if(cpiDest == CP_UNICODE) + { + pOut->u.pwszVal[out_size / sizeof(WCHAR)] = 0; + pOut->vt = VT_LPWSTR; + } + else + { + pOut->u.pszVal[out_size] = '\0'; + pOut->vt = VT_LPSTR; + } + } + else + CoTaskMemFree(pOut->u.pszVal); + } + } + IMultiLanguage_Release(ml); + } + return hr; } static HRESULT WINAPI MimeInternat_MLANG_ConvertInetReset(IMimeInternational *iface)

1 0

Huw Davies : inetcomm/tests: Add tests for IMimeInternational_ConvertString .
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 5497ff016c4ed1286b5ba18a40e5b5fd95d77ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5497ff016c4ed1286b5ba18a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 16 11:49:02 2008 +0100 inetcomm/tests: Add tests for IMimeInternational_ConvertString. --- dlls/inetcomm/tests/mimeintl.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 0de56b2..e7cdd87 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -216,7 +216,9 @@ static void test_convert(void) HRESULT hr; BLOB src, dst; ULONG read; - static const char test_string[] = "test string"; + PROPVARIANT prop_in, prop_out; + static char test_string[] = "test string"; + static WCHAR test_stringW[] = {'t','e','s','t',' ','s','t','r','i','n','g',0}; hr = MimeOleGetInternat(&internat); ok(hr == S_OK, "ret %08x\n", hr); @@ -236,6 +238,40 @@ static void test_convert(void) ok(dst.cbSize == 2, "got %d\n", dst.cbSize); CoTaskMemFree(dst.pBlobData); + prop_in.vt = VT_LPWSTR; + prop_in.u.pwszVal = test_stringW; + hr = IMimeInternational_ConvertString(internat, CP_UNICODE, 1252, &prop_in, &prop_out); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop_out.vt == VT_LPSTR, "got %d\n", prop_out.vt); + ok(!strcmp(prop_out.u.pszVal, test_string), "got %s\n", prop_out.u.pszVal); + PropVariantClear(&prop_out); + + /* If in.vt is VT_LPWSTR, ignore cpiSrc */ + prop_in.vt = VT_LPWSTR; + prop_in.u.pwszVal = test_stringW; + hr = IMimeInternational_ConvertString(internat, 28591, 1252, &prop_in, &prop_out); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop_out.vt == VT_LPSTR, "got %d\n", prop_out.vt); + ok(!strcmp(prop_out.u.pszVal, test_string), "got %s\n", prop_out.u.pszVal); + PropVariantClear(&prop_out); + + prop_in.vt = VT_LPSTR; + prop_in.u.pszVal = test_string; + hr = IMimeInternational_ConvertString(internat, 28591, CP_UNICODE, &prop_in, &prop_out); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop_out.vt == VT_LPWSTR, "got %d\n", prop_out.vt); + ok(!lstrcmpW(prop_out.u.pwszVal, test_stringW), "mismatched strings\n"); + PropVariantClear(&prop_out); + + /* If in.vt is VT_LPSTR and cpiSrc is CP_UNICODE, use another multibyte codepage (probably GetACP()) */ + prop_in.vt = VT_LPSTR; + prop_in.u.pszVal = test_string; + hr = IMimeInternational_ConvertString(internat, CP_UNICODE, CP_UNICODE, &prop_in, &prop_out); + ok(hr == S_OK, "ret %08x\n", hr); + ok(prop_out.vt == VT_LPWSTR, "got %d\n", prop_out.vt); + ok(!lstrcmpW(prop_out.u.pwszVal, test_stringW), "mismatched strings\n"); + PropVariantClear(&prop_out); + IMimeInternational_Release(internat); }

1 0

Huw Davies : inetcomm: Implement MimeOleGetCharsetInfo.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: bdc9440d657e48479a92bc736958affcbf4d8463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc9440d657e48479a92bc736… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 16 12:09:37 2008 +0100 inetcomm: Implement MimeOleGetCharsetInfo. --- dlls/inetcomm/mimeintl.c | 16 ++++++++++++++++ dlls/inetcomm/mimeole.c | 7 ------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 5c4c867..262bdc5 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -546,3 +546,19 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) IMimeInternational_AddRef(*internat); return S_OK; } + +HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%p, %p)\n", hCharset, pCsetInfo); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_GetCharsetInfo(internat, hCharset, pCsetInfo); + IMimeInternational_Release(internat); + } + return S_OK; +} diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 7e9d709..617286c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2930,10 +2930,3 @@ HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator **alloc) { return MimeAllocator_create(NULL, (void**)alloc); } - -HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) -{ - FIXME("(%p, %p)\n", hCharset, pCsetInfo); - if(!hCharset) return E_INVALIDARG; - return E_FAIL; -}

1 0

Lei Zhang : qcap: Make sure input to AMStreamConfig_SetFormat is not NULL.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 62823d272dd988f9417fa1bc4207c8cc9467d7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62823d272dd988f9417fa1bc4… Author: Lei Zhang <thestig(a)google.com> Date: Tue Sep 16 13:54:20 2008 -0700 qcap: Make sure input to AMStreamConfig_SetFormat is not NULL. --- dlls/qcap/vfwcapture.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index fa4754f..738e1d2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -400,7 +400,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); IPinImpl *pin; - TRACE("(%p): %p->%p\n", iface, pmt, pmt->pbFormat); + TRACE("(%p): %p->%p\n", iface, pmt, pmt ? pmt->pbFormat : NULL); if (This->state != State_Stopped) { @@ -408,6 +408,12 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) return VFW_E_NOT_STOPPED; } + if (!pmt) + { + TRACE("pmt is NULL\n"); + return E_POINTER; + } + dump_AM_MEDIA_TYPE(pmt); pin = (IPinImpl *)This->pOutputPin;

1 0

Peter Dons Tychsen : services: Fixed problem with services where DependOnServices key is REG_SZ and not REG_MULTI_SZ .
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 741dd708c432823ceb4343a7867fd784ce3212e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741dd708c432823ceb4343a78… Author: Peter Dons Tychsen <donpedro(a)tdcadsl.dk> Date: Wed Sep 17 00:35:01 2008 +0200 services: Fixed problem with services where DependOnServices key is REG_SZ and not REG_MULTI_SZ. --- programs/services/services.c | 4 ++-- programs/services/services.h | 2 +- programs/services/utils.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 36ed117..cd71a1f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -106,9 +106,9 @@ static DWORD load_service_config(HKEY hKey, struct service_entry *entry) return err; if ((err = load_reg_string(hKey, SZ_DESCRIPTION, 0, &entry->description)) != 0) return err; - if ((err = load_reg_multisz(hKey, SZ_DEPEND_ON_SERVICE, &entry->dependOnServices)) != 0) + if ((err = load_reg_multisz(hKey, SZ_DEPEND_ON_SERVICE, TRUE, &entry->dependOnServices)) != 0) return err; - if ((err = load_reg_multisz(hKey, SZ_DEPEND_ON_GROUP, &entry->dependOnGroups)) != 0) + if ((err = load_reg_multisz(hKey, SZ_DEPEND_ON_GROUP, FALSE, &entry->dependOnGroups)) != 0) return err; if ((err = load_reg_dword(hKey, SZ_TYPE, &entry->config.dwServiceType)) != 0) diff --git a/programs/services/services.h b/programs/services/services.h index fd99bf9..cd7de02 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -87,7 +87,7 @@ LPWSTR strdupW(LPCWSTR str); BOOL check_multisz(LPCWSTR lpMultiSz, DWORD cbSize); DWORD load_reg_string(HKEY hKey, LPCWSTR szValue, BOOL bExpand, LPWSTR *output); -DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, LPWSTR *output); +DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, BOOL bAllowSingle, LPWSTR *output); DWORD load_reg_dword(HKEY hKey, LPCWSTR szValue, DWORD *output); static inline LPCWSTR get_display_name(struct service_entry *service) diff --git a/programs/services/utils.c b/programs/services/utils.c index 89eb500..191cc5f 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -102,7 +102,7 @@ failed: return err; } -DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, LPWSTR *output) +DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, BOOL bAllowSingle, LPWSTR *output) { DWORD size, type; LPWSTR buf = NULL; @@ -118,7 +118,7 @@ DWORD load_reg_multisz(HKEY hKey, LPCWSTR szValue, LPWSTR *output) } goto failed; } - if (type != REG_MULTI_SZ) + if (!((type == REG_MULTI_SZ) || ((type == REG_SZ) && bAllowSingle))) { err = ERROR_INVALID_DATATYPE; goto failed;

1 0

Dmitry Timoshkov : winhttp: Move common code to the upper level, avoid accessing the buffer before the buffer size check, make the code conform to existing rules.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: 24e426517edb1ba81cb34fdbe3e3b63787db74e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e426517edb1ba81cb34fdbe… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 17 11:41:26 2008 +0900 winhttp: Move common code to the upper level, avoid accessing the buffer before the buffer size check, make the code conform to existing rules. --- dlls/winhttp/session.c | 88 +++++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 42 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 4967aff..545ed04 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -85,12 +85,6 @@ static void session_destroy( object_header_t *hdr ) static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { - if (!buflen) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (option) { case WINHTTP_OPTION_REDIRECT_POLICY: @@ -98,7 +92,7 @@ static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buf if (!buffer || *buflen < sizeof(DWORD)) { *buflen = sizeof(DWORD); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -108,19 +102,13 @@ static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buf } default: FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_INVALID_PARAMETER); + set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } } static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) { - if (!buffer) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (option) { case WINHTTP_OPTION_PROXY: @@ -136,7 +124,7 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe if (buflen != sizeof(policy)) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -146,11 +134,11 @@ static BOOL session_set_option( object_header_t *hdr, DWORD option, LPVOID buffe return TRUE; } case WINHTTP_OPTION_DISABLE_FEATURE: - SetLastError(ERROR_WINHTTP_INCORRECT_HANDLE_TYPE); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; default: FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_INVALID_PARAMETER); + set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } } @@ -310,12 +298,6 @@ static void request_destroy( object_header_t *hdr ) static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { - if (!buflen) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (option) { case WINHTTP_OPTION_SECURITY_FLAGS: @@ -325,7 +307,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf if (!buffer || *buflen < sizeof(flags)) { *buflen = sizeof(flags); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -343,7 +325,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf if (!buffer || *buflen < sizeof(cert)) { *buflen = sizeof(cert); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -357,7 +339,7 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf if (!buffer || *buflen < sizeof(DWORD)) { *buflen = sizeof(DWORD); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } @@ -367,19 +349,13 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf } default: FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_INVALID_PARAMETER); + set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } } static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD buflen ) { - if (!buffer) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - switch (option) { case WINHTTP_OPTION_PROXY: @@ -391,49 +367,52 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } case WINHTTP_OPTION_DISABLE_FEATURE: { - DWORD disable = *(DWORD *)buffer; + DWORD disable; if (buflen != sizeof(DWORD)) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } + disable = *(DWORD *)buffer; TRACE("0x%x\n", disable); hdr->disable_flags |= disable; return TRUE; } case WINHTTP_OPTION_AUTOLOGON_POLICY: { - DWORD policy = *(DWORD *)buffer; + DWORD policy; if (buflen != sizeof(DWORD)) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } + policy = *(DWORD *)buffer; TRACE("0x%x\n", policy); hdr->logon_policy = policy; return TRUE; } case WINHTTP_OPTION_REDIRECT_POLICY: { - DWORD policy = *(DWORD *)buffer; + DWORD policy; if (buflen != sizeof(DWORD)) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } + policy = *(DWORD *)buffer; TRACE("0x%x\n", policy); hdr->redirect_policy = policy; return TRUE; } default: FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_INVALID_PARAMETER); + set_last_error( ERROR_INVALID_PARAMETER ); return TRUE; } } @@ -531,10 +510,23 @@ static BOOL query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPD { BOOL ret = FALSE; + if (!buflen) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (option) { case WINHTTP_OPTION_CONTEXT_VALUE: { + if (!buffer || *buflen < sizeof(DWORD_PTR)) + { + *buflen = sizeof(DWORD_PTR); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + *(DWORD_PTR *)buffer = hdr->context; *buflen = sizeof(DWORD_PTR); return TRUE; @@ -544,7 +536,7 @@ static BOOL query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPD else { FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_WINHTTP_INCORRECT_HANDLE_TYPE); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } break; @@ -578,10 +570,22 @@ static BOOL set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD { BOOL ret = TRUE; + if (!buffer) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (option) { case WINHTTP_OPTION_CONTEXT_VALUE: { + if (buflen != sizeof(DWORD_PTR)) + { + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + hdr->context = *(DWORD_PTR *)buffer; return TRUE; } @@ -590,7 +594,7 @@ static BOOL set_option( object_header_t *hdr, DWORD option, LPVOID buffer, DWORD else { FIXME("unimplemented option %u\n", option); - SetLastError(ERROR_WINHTTP_INCORRECT_HANDLE_TYPE); + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } break;

1 0

Dmitry Timoshkov : kernel32: Fix the target buffer size.
by Alexandre Julliard 17 Sep '08

17 Sep '08

Module: wine Branch: master Commit: b4e6aa645b58fe755eefe619c8d7df2b9669377d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e6aa645b58fe755eefe619c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 17 11:38:51 2008 +0900 kernel32: Fix the target buffer size. --- dlls/kernel32/tests/locale.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f792da2..da7a97d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1332,14 +1332,14 @@ static void test_LCMapStringW(void) /* test srclen = 0 */ SetLastError(0xdeadbeef); - ret = LCMapStringW(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf)); + ret = LCMapStringW(LOCALE_USER_DEFAULT, 0, upper_case, 0, buf, sizeof(buf)/sizeof(WCHAR)); ok(!ret, "LCMapStringW should fail with srclen = 0\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "unexpected error code %d\n", GetLastError()); } /* this requires collation table patch to make it MS compatible */ -const char *strings_sorted[] = +static const char * const strings_sorted[] = { "'", "-", @@ -1371,7 +1371,7 @@ const char *strings_sorted[] = "C" }; -const char *strings[] = +static const char * const strings[] = { "C", "\"",

1 0