Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60416: [URLMON] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:08:52 2013 New Revision: 60416 URL: http://svn.reactos.org/svn/reactos?rev=60416&view=rev Log: [URLMON] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -7,13 +7,11 @@ -DWINE_REGISTER_DLL -DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +#remove_definitions(-D_WIN32_WINNT=0x502) +#add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB) - add_rpcproxy_files(urlmon_urlmon.idl) list(APPEND SOURCE @@ -38,13 +36,12 @@ uri.c urlmon_main.c usrmarshal.c - urlmon.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def) -add_library(urlmon SHARED ${SOURCE}) +add_library(urlmon SHARED ${SOURCE} urlmon.rc) set_module_type(urlmon win32dll) target_link_libraries(urlmon uuid wine ${PSEH_LIB}) add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -299,16 +299,18 @@ return; } - if(!(clsid_str = get_mime_clsid(binding->mime, &clsid))) { + if((clsid_str = get_mime_clsid(binding->mime, &clsid))) + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); + + IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); + + if(clsid_str) { + hres = create_mime_object(binding, &clsid, clsid_str); + heap_free(clsid_str); + }else { FIXME("Could not find object for MIME %s\n", debugstr_w(binding->mime)); - return; - } - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_CLASSIDAVAILABLE, clsid_str); - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_BEGINSYNCOPERATION, NULL); - - hres = create_mime_object(binding, &clsid, clsid_str); - heap_free(clsid_str); + hres = REGDB_E_CLASSNOTREG; + } IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_ENDSYNCOPERATION, NULL); binding->clsid = CLSID_NULL; Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -897,8 +897,12 @@ do { read = 0; + if(is_apartment_thread(This)) + This->continue_call++; hres = IInternetProtocol_Read(This->protocol, buf, sizeof(buf)-This->buf_size, &read); + if(is_apartment_thread(This)) + This->continue_call--; if(FAILED(hres) && hres != E_PENDING) return hres; Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -260,3 +260,410 @@ *ppobj = &ret->IInternetProtocol_iface; return S_OK; } + +static BOOL text_richtext_filter(const BYTE *b, DWORD size) +{ + return size > 5 && !memcmp(b, "{\\rtf", 5); +} + +static BOOL text_html_filter(const BYTE *b, DWORD size) +{ + if(size < 6) + return FALSE; + + if((b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 't' || b[2] == 'T') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L')) + || (b[0] == '<' + && (b[1] == 'h' || b[1] == 'H') + && (b[2] == 'e' || b[2] == 'E') + && (b[3] == 'a' || b[3] == 'A') + && (b[4] == 'd' || b[4] == 'D'))) return TRUE; + + return FALSE; +} + +static BOOL text_xml_filter(const BYTE *b, DWORD size) +{ + if(size < 7) + return FALSE; + + if(b[0] == '<' && b[1] == '?' + && (b[2] == 'x' || b[2] == 'X') + && (b[3] == 'm' || b[3] == 'M') + && (b[4] == 'l' || b[4] == 'L') + && b[5] == ' ') return TRUE; + + return FALSE; +} + +static BOOL audio_basic_filter(const BYTE *b, DWORD size) +{ + return size > 4 + && b[0] == '.' && b[1] == 's' && b[2] == 'n' && b[3] == 'd'; +} + +static BOOL audio_wav_filter(const BYTE *b, DWORD size) +{ + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'W' && b[9] == 'A' && b[10] == 'V' && b[11] == 'E'; +} + +static BOOL image_gif_filter(const BYTE *b, DWORD size) +{ + return size >= 6 + && (b[0] == 'G' || b[0] == 'g') + && (b[1] == 'I' || b[1] == 'i') + && (b[2] == 'F' || b[2] == 'f') + && b[3] == '8' + && (b[4] == '7' || b[4] == '9') + && (b[5] == 'A' || b[5] == 'a'); +} + +static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0xff && b[1] == 0xd8; +} + +static BOOL image_tiff_filter(const BYTE *b, DWORD size) +{ + static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; + static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; + + return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); +} + +static BOOL image_xpng_filter(const BYTE *b, DWORD size) +{ + static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; + return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); +} + +static BOOL image_bmp_filter(const BYTE *b, DWORD size) +{ + return size >= 14 + && b[0] == 0x42 && b[1] == 0x4d + && *(const DWORD *)(b+6) == 0; +} + +static BOOL video_avi_filter(const BYTE *b, DWORD size) +{ + return size > 12 + && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' + && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; +} + +static BOOL video_mpeg_filter(const BYTE *b, DWORD size) +{ + return size > 4 + && !b[0] && !b[1] && b[2] == 0x01 + && (b[3] == 0xb3 || b[3] == 0xba); +} + +static BOOL application_postscript_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == '%' && b[1] == '!'; +} + +static BOOL application_pdf_filter(const BYTE *b, DWORD size) +{ + return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; +} + +static BOOL application_xzip_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0x50 && b[1] == 0x4b; +} + +static BOOL application_xgzip_filter(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 0x1f && b[1] == 0x8b; +} + +static BOOL application_java_filter(const BYTE *b, DWORD size) +{ + return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; +} + +static BOOL application_xmsdownload(const BYTE *b, DWORD size) +{ + return size > 2 && b[0] == 'M' && b[1] == 'Z'; +} + +static inline BOOL is_text_plain_char(BYTE b) +{ + if(b < 0x20 && b != '\n' && b != '\r' && b != '\t') + return FALSE; + return TRUE; +} + +static BOOL text_plain_filter(const BYTE *b, DWORD size) +{ + const BYTE *ptr; + + for(ptr = b; ptr < b+size-1; ptr++) { + if(!is_text_plain_char(*ptr)) + return FALSE; + } + + return TRUE; +} + +static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) +{ + return TRUE; +} + +static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) +{ + const WCHAR *ptr; + DWORD res, size; + WCHAR mime[64]; + HKEY hkey; + + static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; + + ptr = strrchrW(url, '.'); + if(!ptr) + return E_FAIL; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); + if(res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + size = sizeof(mime); + res = RegQueryValueExW(hkey, content_typeW, NULL, NULL, (LPBYTE)mime, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(res); + + TRACE("found MIME %s\n", debugstr_w(mime)); + + *ret = CoTaskMemAlloc(size); + memcpy(*ret, mime, size); + return S_OK; +} + +static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; +static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; +static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; +static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; +static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; +static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; +static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; +static const WCHAR image_tiffW[] = {'i','m','a','g','e','/','t','i','f','f',0}; +static const WCHAR image_xpngW[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; +static const WCHAR image_bmpW[] = {'i','m','a','g','e','/','b','m','p',0}; +static const WCHAR video_aviW[] = {'v','i','d','e','o','/','a','v','i',0}; +static const WCHAR video_mpegW[] = {'v','i','d','e','o','/','m','p','e','g',0}; +static const WCHAR app_postscriptW[] = + {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; +static const WCHAR app_pdfW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; +static const WCHAR app_xzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; +static const WCHAR app_xgzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; +static const WCHAR app_javaW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; +static const WCHAR app_xmsdownloadW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'x','-','m','s','d','o','w','n','l','o','a','d',0}; +static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; +static const WCHAR app_octetstreamW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', + 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; + +static const struct { + const WCHAR *mime; + BOOL (*filter)(const BYTE *,DWORD); +} mime_filters_any_pos[] = { + {text_htmlW, text_html_filter}, + {text_xmlW, text_xml_filter} +}, mime_filters[] = { + {text_richtextW, text_richtext_filter}, + /* {audio_xaiffW, audio_xaiff_filter}, */ + {audio_basicW, audio_basic_filter}, + {audio_wavW, audio_wav_filter}, + {image_gifW, image_gif_filter}, + {image_pjpegW, image_pjpeg_filter}, + {image_tiffW, image_tiff_filter}, + {image_xpngW, image_xpng_filter}, + /* {image_xbitmapW, image_xbitmap_filter}, */ + {image_bmpW, image_bmp_filter}, + /* {image_xjgW, image_xjg_filter}, */ + /* {image_xemfW, image_xemf_filter}, */ + /* {image_xwmfW, image_xwmf_filter}, */ + {video_aviW, video_avi_filter}, + {video_mpegW, video_mpeg_filter}, + {app_postscriptW, application_postscript_filter}, + /* {app_base64W, application_base64_filter}, */ + /* {app_macbinhex40W, application_macbinhex40_filter}, */ + {app_pdfW, application_pdf_filter}, + /* {app_zcompressedW, application_xcompressed_filter}, */ + {app_xzipW, application_xzip_filter}, + {app_xgzipW, application_xgzip_filter}, + {app_javaW, application_java_filter}, + {app_xmsdownloadW, application_xmsdownload}, + {text_plainW, text_plain_filter}, + {app_octetstreamW, application_octet_stream_filter} +}; + +static BOOL is_known_mime_type(const WCHAR *mime) +{ + unsigned i; + + for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(!strcmpW(mime, mime_filters_any_pos[i].mime)) + return TRUE; + } + + for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(!strcmpW(mime, mime_filters[i].mime)) + return TRUE; + } + + return FALSE; +} + +static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *proposed_mime, const WCHAR *url, WCHAR **ret_mime) +{ + int len, i, any_pos_mime = -1; + const WCHAR *ret = NULL; + + if(!buf || !size) { + if(!proposed_mime) + return E_FAIL; + + len = strlenW(proposed_mime)+1; + *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ret_mime) + return E_OUTOFMEMORY; + + memcpy(*ret_mime, proposed_mime, len*sizeof(WCHAR)); + return S_OK; + } + + if(proposed_mime && (!strcmpW(proposed_mime, app_octetstreamW) + || !strcmpW(proposed_mime, text_plainW))) + proposed_mime = NULL; + + if(proposed_mime) { + ret = proposed_mime; + + for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { + any_pos_mime = i; + for(len=size; len>0; len--) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) + break; + } + if(!len) + ret = NULL; + break; + } + } + + if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { + for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { + if(!strcmpW(proposed_mime, mime_filters[i].mime)) { + if(!mime_filters[i].filter(buf, size)) + ret = NULL; + break; + } + } + } + } + + /* Looks like a bug in native implementation, html and xml mimes + * are not looked for if none of them was proposed */ + if(!proposed_mime || any_pos_mime!=-1) { + for(len=size; !ret && len>0; len--) { + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = mime_filters_any_pos[i].mime; + break; + } + } + } + } + + i=0; + while(!ret) { + if(mime_filters[i].filter(buf, size)) + ret = mime_filters[i].mime; + i++; + } + + if(any_pos_mime!=-1 && ret==text_plainW) + ret = mime_filters_any_pos[any_pos_mime].mime; + else if(proposed_mime && ret==app_octetstreamW) { + for(len=size; ret==app_octetstreamW && len>0; len--) { + if(!is_text_plain_char(buf[size-len])) + break; + for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { + if(mime_filters_any_pos[i].filter(buf+size-len, len)) { + ret = text_plainW; + break; + } + } + } + + if(ret == app_octetstreamW) + ret = proposed_mime; + } + + if(url && (ret == app_octetstreamW || ret == text_plainW)) { + WCHAR *url_mime; + HRESULT hres; + + hres = find_mime_from_url(url, &url_mime); + if(SUCCEEDED(hres)) { + if(!is_known_mime_type(url_mime)) { + *ret_mime = url_mime; + return hres; + } + CoTaskMemFree(url_mime); + } + } + + TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); + + len = strlenW(ret)+1; + *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); + if(!*ret_mime) + return E_OUTOFMEMORY; + + memcpy(*ret_mime, ret, len*sizeof(WCHAR)); + return S_OK; +} + +/*********************************************************************** + * FindMimeFromData (URLMON.@) + * + * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. + */ +HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, + DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, + LPWSTR* ppwzMimeOut, DWORD dwReserved) +{ + TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, + debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); + + if(dwMimeFlags) + WARN("dwMimeFlags=%08x\n", dwMimeFlags); + if(dwReserved) + WARN("dwReserved=%d\n", dwReserved); + + /* pBC seams to not be used */ + + if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) + return E_INVALIDARG; + + if(pwzMimeProposed || pBuffer) + return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, pwzUrl, ppwzMimeOut); + + if(pwzUrl) + return find_mime_from_url(pwzUrl, ppwzMimeOut); + + return E_FAIL; +} Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/protocol.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -78,7 +78,7 @@ if(FAILED(hres)) { protocol_close_connection(protocol); report_result(protocol, hres); - return S_OK; + return hres; } if(protocol->bindf & BINDF_NEEDFILE) { Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -233,7 +233,22 @@ hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) { - FIXME("use running object table\n"); + hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface); + if(hres == S_OK) { + IUnknown *unk = NULL; + + TRACE("Found in running object table\n"); + + hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + } + + IRunningObjectTable_Release(obj_tbl); + return hres; + } + IRunningObjectTable_Release(obj_tbl); } Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/uri.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -422,7 +422,7 @@ else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { *ptr += 2; return TRUE; - } else if(check_hierarchical(ptr)) + } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr)) return TRUE; *ptr = start; @@ -1917,8 +1917,15 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; - - data->path = *ptr; + const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO; + + if (is_mailto && (*ptr)[0] == '/' && (*ptr)[1] == '/') + { + if ((*ptr)[2]) data->path = *ptr + 2; + else data->path = NULL; + } + else + data->path = *ptr; while(!is_path_delim(**ptr)) { if(**ptr == '%' && known_scheme) { @@ -1938,7 +1945,7 @@ ++(*ptr); } - data->path_len = *ptr - data->path; + if (data->path) data->path_len = *ptr - data->path; TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return TRUE; @@ -6461,7 +6468,7 @@ return E_OUTOFMEMORY; } - parse_uri(&data, 0); + parse_uri(&data, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -6800,7 +6807,7 @@ } } - hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL; return hr; Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -157,6 +157,7 @@ break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; process_detach(); DeleteCriticalSection(&tls_cs); break; @@ -696,377 +697,6 @@ return S_OK; } -static BOOL text_richtext_filter(const BYTE *b, DWORD size) -{ - return size > 5 && !memcmp(b, "{\\rtf", 5); -} - -static BOOL text_html_filter(const BYTE *b, DWORD size) -{ - if(size < 6) - return FALSE; - - if((b[0] == '<' - && (b[1] == 'h' || b[1] == 'H') - && (b[2] == 't' || b[2] == 'T') - && (b[3] == 'm' || b[3] == 'M') - && (b[4] == 'l' || b[4] == 'L')) - || (b[0] == '<' - && (b[1] == 'h' || b[1] == 'H') - && (b[2] == 'e' || b[2] == 'E') - && (b[3] == 'a' || b[3] == 'A') - && (b[4] == 'd' || b[4] == 'D'))) return TRUE; - - return FALSE; -} - -static BOOL text_xml_filter(const BYTE *b, DWORD size) -{ - if(size < 7) - return FALSE; - - if(b[0] == '<' && b[1] == '?' - && (b[2] == 'x' || b[2] == 'X') - && (b[3] == 'm' || b[3] == 'M') - && (b[4] == 'l' || b[4] == 'L') - && b[5] == ' ') return TRUE; - - return FALSE; -} - -static BOOL audio_basic_filter(const BYTE *b, DWORD size) -{ - return size > 4 - && b[0] == '.' && b[1] == 's' && b[2] == 'n' && b[3] == 'd'; -} - -static BOOL audio_wav_filter(const BYTE *b, DWORD size) -{ - return size > 12 - && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' - && b[8] == 'W' && b[9] == 'A' && b[10] == 'V' && b[11] == 'E'; -} - -static BOOL image_gif_filter(const BYTE *b, DWORD size) -{ - return size >= 6 - && (b[0] == 'G' || b[0] == 'g') - && (b[1] == 'I' || b[1] == 'i') - && (b[2] == 'F' || b[2] == 'f') - && b[3] == '8' - && (b[4] == '7' || b[4] == '9') - && (b[5] == 'A' || b[5] == 'a'); -} - -static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0xff && b[1] == 0xd8; -} - -static BOOL image_tiff_filter(const BYTE *b, DWORD size) -{ - static const BYTE magic1[] = {0x4d,0x4d,0x00,0x2a}; - static const BYTE magic2[] = {0x49,0x49,0x2a,0xff}; - - return size >= 4 && (!memcmp(b, magic1, 4) || !memcmp(b, magic2, 4)); -} - -static BOOL image_xpng_filter(const BYTE *b, DWORD size) -{ - static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; - return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); -} - -static BOOL image_bmp_filter(const BYTE *b, DWORD size) -{ - return size >= 14 - && b[0] == 0x42 && b[1] == 0x4d - && *(const DWORD *)(b+6) == 0; -} - -static BOOL video_avi_filter(const BYTE *b, DWORD size) -{ - return size > 12 - && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' - && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; -} - -static BOOL video_mpeg_filter(const BYTE *b, DWORD size) -{ - return size > 4 - && !b[0] && !b[1] && b[2] == 0x01 - && (b[3] == 0xb3 || b[3] == 0xba); -} - -static BOOL application_postscript_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == '%' && b[1] == '!'; -} - -static BOOL application_pdf_filter(const BYTE *b, DWORD size) -{ - return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; -} - -static BOOL application_xzip_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0x50 && b[1] == 0x4b; -} - -static BOOL application_xgzip_filter(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 0x1f && b[1] == 0x8b; -} - -static BOOL application_java_filter(const BYTE *b, DWORD size) -{ - return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; -} - -static BOOL application_xmsdownload(const BYTE *b, DWORD size) -{ - return size > 2 && b[0] == 'M' && b[1] == 'Z'; -} - -static inline BOOL is_text_plain_char(BYTE b) -{ - if(b < 0x20 && b != '\n' && b != '\r' && b != '\t') - return FALSE; - return TRUE; -} - -static BOOL text_plain_filter(const BYTE *b, DWORD size) -{ - const BYTE *ptr; - - for(ptr = b; ptr < b+size-1; ptr++) { - if(!is_text_plain_char(*ptr)) - return FALSE; - } - - return TRUE; -} - -static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) -{ - return TRUE; -} - -static HRESULT find_mime_from_buffer(const BYTE *buf, DWORD size, const WCHAR *proposed_mime, WCHAR **ret_mime) -{ - LPCWSTR ret = NULL; - int len, i, any_pos_mime = -1; - - static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; - static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; - static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; - static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; - static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; - static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; - static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; - static const WCHAR image_tiffW[] = {'i','m','a','g','e','/','t','i','f','f',0}; - static const WCHAR image_xpngW[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; - static const WCHAR image_bmpW[] = {'i','m','a','g','e','/','b','m','p',0}; - static const WCHAR video_aviW[] = {'v','i','d','e','o','/','a','v','i',0}; - static const WCHAR video_mpegW[] = {'v','i','d','e','o','/','m','p','e','g',0}; - static const WCHAR app_postscriptW[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; - static const WCHAR app_pdfW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; - static const WCHAR app_xzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR app_xgzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR app_javaW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'j','a','v','a',0}; - static const WCHAR app_xmsdownloadW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','m','s','d','o','w','n','l','o','a','d',0}; - static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; - static const WCHAR app_octetstreamW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; - - static const struct { - LPCWSTR mime; - BOOL (*filter)(const BYTE *,DWORD); - } mime_filters_any_pos[] = { - {text_htmlW, text_html_filter}, - {text_xmlW, text_xml_filter} - }, mime_filters[] = { - {text_richtextW, text_richtext_filter}, - /* {audio_xaiffW, audio_xaiff_filter}, */ - {audio_basicW, audio_basic_filter}, - {audio_wavW, audio_wav_filter}, - {image_gifW, image_gif_filter}, - {image_pjpegW, image_pjpeg_filter}, - {image_tiffW, image_tiff_filter}, - {image_xpngW, image_xpng_filter}, - /* {image_xbitmapW, image_xbitmap_filter}, */ - {image_bmpW, image_bmp_filter}, - /* {image_xjgW, image_xjg_filter}, */ - /* {image_xemfW, image_xemf_filter}, */ - /* {image_xwmfW, image_xwmf_filter}, */ - {video_aviW, video_avi_filter}, - {video_mpegW, video_mpeg_filter}, - {app_postscriptW, application_postscript_filter}, - /* {app_base64W, application_base64_filter}, */ - /* {app_macbinhex40W, application_macbinhex40_filter}, */ - {app_pdfW, application_pdf_filter}, - /* {app_zcompressedW, application_xcompressed_filter}, */ - {app_xzipW, application_xzip_filter}, - {app_xgzipW, application_xgzip_filter}, - {app_javaW, application_java_filter}, - {app_xmsdownloadW, application_xmsdownload}, - {text_plainW, text_plain_filter}, - {app_octetstreamW, application_octet_stream_filter} - }; - - if(!buf || !size) { - if(!proposed_mime) - return E_FAIL; - - len = strlenW(proposed_mime)+1; - *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ret_mime) - return E_OUTOFMEMORY; - - memcpy(*ret_mime, proposed_mime, len*sizeof(WCHAR)); - return S_OK; - } - - if(proposed_mime && (!strcmpW(proposed_mime, app_octetstreamW) - || !strcmpW(proposed_mime, text_plainW))) - proposed_mime = NULL; - - if(proposed_mime) { - ret = proposed_mime; - - for(i=0; i < sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(!strcmpW(proposed_mime, mime_filters_any_pos[i].mime)) { - any_pos_mime = i; - for(len=size; len>0; len--) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) - break; - } - if(!len) - ret = NULL; - break; - } - } - - if(i == sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos)) { - for(i=0; i < sizeof(mime_filters)/sizeof(*mime_filters); i++) { - if(!strcmpW(proposed_mime, mime_filters[i].mime)) { - if(!mime_filters[i].filter(buf, size)) - ret = NULL; - break; - } - } - } - } - - /* Looks like a bug in native implementation, html and xml mimes - * are not looked for if none of them was proposed */ - if(!proposed_mime || any_pos_mime!=-1) { - for(len=size; !ret && len>0; len--) { - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) { - ret = mime_filters_any_pos[i].mime; - break; - } - } - } - } - - i=0; - while(!ret) { - if(mime_filters[i].filter(buf, size)) - ret = mime_filters[i].mime; - i++; - } - - if(any_pos_mime!=-1 && ret==text_plainW) - ret = mime_filters_any_pos[any_pos_mime].mime; - else if(proposed_mime && ret==app_octetstreamW) { - for(len=size; ret==app_octetstreamW && len>0; len--) { - if(!is_text_plain_char(buf[size-len])) - break; - for(i=0; i<sizeof(mime_filters_any_pos)/sizeof(*mime_filters_any_pos); i++) { - if(mime_filters_any_pos[i].filter(buf+size-len, len)) { - ret = text_plainW; - break; - } - } - } - - if(ret == app_octetstreamW) - ret = proposed_mime; - } - TRACE("found %s for %s\n", debugstr_w(ret), debugstr_an((const char*)buf, min(32, size))); - - len = strlenW(ret)+1; - *ret_mime = CoTaskMemAlloc(len*sizeof(WCHAR)); - if(!*ret_mime) - return E_OUTOFMEMORY; - - memcpy(*ret_mime, ret, len*sizeof(WCHAR)); - return S_OK; -} - -/*********************************************************************** - * FindMimeFromData (URLMON.@) - * - * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. - */ -HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, - DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, - LPWSTR* ppwzMimeOut, DWORD dwReserved) -{ - TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, - debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); - - if(dwMimeFlags) - WARN("dwMimeFlags=%08x\n", dwMimeFlags); - if(dwReserved) - WARN("dwReserved=%d\n", dwReserved); - - /* pBC seams to not be used */ - - if(!ppwzMimeOut || (!pwzUrl && !pBuffer)) - return E_INVALIDARG; - - if(pwzMimeProposed || pBuffer) - return find_mime_from_buffer(pBuffer, cbSize, pwzMimeProposed, ppwzMimeOut); - - if(pwzUrl) { - HKEY hkey; - DWORD res, size; - LPCWSTR ptr; - WCHAR mime[64]; - - static const WCHAR wszContentType[] = - {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; - - ptr = strrchrW(pwzUrl, '.'); - if(!ptr) - return E_FAIL; - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); - if(res != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(res); - - size = sizeof(mime); - res = RegQueryValueExW(hkey, wszContentType, NULL, NULL, (LPBYTE)mime, &size); - RegCloseKey(hkey); - if(res != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(res); - - *ppwzMimeOut = CoTaskMemAlloc(size); - memcpy(*ppwzMimeOut, mime, size); - return S_OK; - } - - return E_FAIL; -} - /*********************************************************************** * GetClassFileOrMime (URLMON.@) * Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:08:52 2013 @@ -192,7 +192,7 @@ reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 -reactos/dll/win32/urlmon # Synced to Wine-1.5.26 +reactos/dll/win32/urlmon # Synced to Wine-1.7.1 reactos/dll/win32/usp10 # Synced to Wine-1.5.26 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to Wine-1.5.26

11 years, 2 months

[akhaldi] 60415: [TAPI32] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:07:20 2013 New Revision: 60415 URL: http://svn.reactos.org/svn/reactos?rev=60415&view=rev Log: [TAPI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt trunk/reactos/dll/win32/tapi32/assisted.c trunk/reactos/dll/win32/tapi32/line.c trunk/reactos/dll/win32/tapi32/phone.c trunk/reactos/dll/win32/tapi32/tapi32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(tapi32.dll tapi32.spec) list(APPEND SOURCE @@ -13,12 +12,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def) add_library(tapi32 SHARED ${SOURCE}) - set_module_type(tapi32 win32dll) - target_link_libraries(tapi32 wine) - -add_importlibs(tapi32 msvcrt advapi32 kernel32 ntdll) -add_dependencies(tapi32 psdk) - +add_importlibs(tapi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET tapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/tapi32/assisted.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/assisted.… ============================================================================== --- trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/assisted.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -2,6 +2,7 @@ * TAPI32 Assisted Telephony * * Copyright 1999 Andreas Mohr + * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,50 +34,61 @@ #include <winreg.h> #include <objbase.h> #include <tapi.h> +#include <wine/unicode.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** - * tapiGetLocationInfo (TAPI32.@) + * tapiGetLocationInfoW (TAPI32.@) */ -DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) +DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) { HKEY hkey, hsubkey; DWORD currid; DWORD valsize; DWORD type; DWORD bufsize; - BYTE buf[100]; - char szlockey[20]; - if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Locations", - &hkey) != ERROR_SUCCESS) { + BYTE buf[200]; + WCHAR szlockey[20]; + + static const WCHAR currentidW[] = {'C','u','r','r','e','n','t','I','D',0}; + static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n','%','u',0}; + static const WCHAR areacodeW[] = {'A','r','e','a','C','o','d','e',0}; + static const WCHAR countryW[] = {'C','o','u','n','t','r','y',0}; + static const WCHAR fmtW[] = {'%','u',0}; + + static const WCHAR locations_keyW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; + + if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { valsize = sizeof( DWORD); - if(!RegQueryValueExA(hkey, "CurrentID", 0, &type, (LPBYTE) &currid, - &valsize) && type == REG_DWORD) { + if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && + type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintf( szlockey, "Location%u", currid); - if( !RegOpenKeyA( hkey, szlockey, &hsubkey)) { - if( lpszCityCode) { + sprintfW( szlockey, locationW, currid); + if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { + if( citycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "AreaCode", 0, &type, buf, - &bufsize) && type == REG_SZ) { - lstrcpynA( lpszCityCode, (char *) buf, 8); + if( !RegQueryValueExW( hsubkey, areacodeW, 0, &type, buf, &bufsize) && + type == REG_SZ) { + lstrcpynW( citycode, (WCHAR *) buf, 8); } else - lpszCityCode[0] = '\0'; + citycode[0] = '\0'; } - if( lpszCountryCode) { + if( countrycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "Country", 0, &type, buf, - &bufsize) && type == REG_DWORD) - snprintf( lpszCountryCode, 8, "%u", *(LPDWORD) buf ); + if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && + type == REG_DWORD) + snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); else - lpszCountryCode[0] = '\0'; + countrycode[0] = '\0'; } - TRACE("(%p \"%s\", %p \"%s\"): success.\n", - lpszCountryCode, debugstr_a(lpszCountryCode), - lpszCityCode, debugstr_a(lpszCityCode)); + TRACE("(%p \"%s\", %p \"%s\"): success.\n", countrycode, debugstr_w(countrycode), + citycode, debugstr_w(citycode)); RegCloseKey( hkey); RegCloseKey( hsubkey); return 0; /* SUCCESS */ @@ -84,9 +96,32 @@ } RegCloseKey( hkey); } - WARN("(%p, %p): failed (no telephony registry entries?).\n", - lpszCountryCode, lpszCityCode); + WARN("(%p, %p): failed (no telephony registry entries?).\n", countrycode, citycode); return TAPIERR_REQUESTFAILED; +} + + +/*********************************************************************** + * tapiGetLocationInfoA (TAPI32.@) + */ +DWORD WINAPI tapiGetLocationInfoA(LPSTR countrycode, LPSTR citycode) +{ + DWORD ret, len; + LPWSTR country, city; + + len = MultiByteToWideChar( CP_ACP, 0, countrycode, -1, NULL, 0 ); + country = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, countrycode, -1, country, len ); + + len = MultiByteToWideChar( CP_ACP, 0, citycode, -1, NULL, 0 ); + city = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, citycode, -1, city, len ); + + ret = tapiGetLocationInfoW(country, city); + + HeapFree( GetProcessHeap(), 0, city ); + HeapFree( GetProcessHeap(), 0, country ); + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/tapi32/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/line.c?re… ============================================================================== --- trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/line.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -35,6 +35,7 @@ #include <objbase.h> #include <tapi.h> #include <wine/debug.h> +#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -138,6 +139,15 @@ } /*********************************************************************** + * lineConfigDialogW (TAPI32.@) + */ +DWORD WINAPI lineConfigDialogW(DWORD dwDeviceID, HWND hwndOwner, LPCWSTR lpszDeviceClass) +{ + FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, debugstr_w(lpszDeviceClass)); + return 0; +} + +/*********************************************************************** * lineConfigDialogEdit (TAPI32.@) */ DWORD WINAPI lineConfigDialogEditA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass, LPVOID const lpDeviceConfigIn, DWORD dwSize, LPVARSTRING lpDeviceConfigOut) @@ -192,6 +202,15 @@ } /*********************************************************************** + * lineDialW (TAPI32.@) + */ +DWORD WINAPI lineDialW(HCALL hCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode) +{ + FIXME("(%p, %s, %08x): stub.\n", hCall, debugstr_w(lpszDestAddress), dwCountryCode); + return 1; +} + +/*********************************************************************** * lineDrop (TAPI32.@) */ DWORD WINAPI lineDrop(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) @@ -299,18 +318,8 @@ return 0; } -typedef struct tagTAPI_CountryInfo -{ - DWORD dwCountryID; - DWORD dwCountryCode; - LPSTR lpCountryName; - LPSTR lpSameAreaRule; - LPSTR lpLongDistanceRule; - LPSTR lpInternationalRule; -} TAPI_CountryInfo; - -/*********************************************************************** - * lineGetCountry (TAPI32.@) +/*********************************************************************** + * lineGetCountryA (TAPI32.@) */ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList) { @@ -470,12 +479,151 @@ } /*********************************************************************** + * lineGetCountryW (TAPI32.@) + */ +DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) +{ + static const WCHAR country_listW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','C','o','u','n','t','r','y',' ','L','i','s','t',0}; + static const WCHAR international_ruleW[] = + {'I','n','t','e','r','n','a','t','i','o','n','a','l','R','u','l','e',0}; + static const WCHAR longdistance_ruleW[] = + {'L','o','n','g','D','i','s','t','a','n','c','e','R','u','l','e',0}; + static const WCHAR samearea_ruleW[] = + {'S','a','m','e','A','r','e','a','R','u','l','e',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR country_codeW[] = + {'C','o','u','n','t','r','y','C','o','d','e',0}; + DWORD total_size, offset, i, num_countries, max_subkey_len; + LINECOUNTRYENTRY *entry; + WCHAR *subkey_name; + HKEY hkey; + + if (!list) return LINEERR_INVALPOINTER; + TRACE("(%08x, %08x, %p(%d))\n", id, version, list, list->dwTotalSize); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, country_listW, &hkey) != ERROR_SUCCESS) + return LINEERR_INIFILECORRUPT; + + total_size = list->dwTotalSize; + offset = sizeof(LINECOUNTRYLIST); + if (total_size < offset) return LINEERR_STRUCTURETOOSMALL; + + memset(list, 0, total_size); + list->dwTotalSize = total_size; + list->dwUsedSize = offset; + list->dwNumCountries = 0; + list->dwCountryListSize = 0; + list->dwCountryListOffset = offset; + + entry = (LINECOUNTRYENTRY *)(list + 1); + + if (RegQueryInfoKeyW(hkey, NULL, NULL, NULL, &num_countries, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hkey); + return LINEERR_OPERATIONFAILED; + } + if (id) offset = sizeof(LINECOUNTRYENTRY); + else offset += num_countries * sizeof(LINECOUNTRYENTRY); + + max_subkey_len++; + if (!(subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)))) + { + RegCloseKey(hkey); + return LINEERR_NOMEM; + } + for (i = 0; i < num_countries; i++) + { + DWORD len, size, size_int, size_long, size_name, size_same; + HKEY hsubkey; + + if (RegEnumKeyW(hkey, i, subkey_name, max_subkey_len) != ERROR_SUCCESS) continue; + if (id && (atoiW(subkey_name) != id)) continue; + if (RegOpenKeyW(hkey, subkey_name, &hsubkey) != ERROR_SUCCESS) continue; + + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, NULL, &size_int); + len = size_int; + + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, NULL, &size_long); + len += size_long; + + RegQueryValueExW(hsubkey, nameW, NULL, NULL, NULL, &size_name); + len += size_name; + + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, NULL, &size_same); + len += size_same; + + if (total_size < offset + len) + { + offset += len; + RegCloseKey(hsubkey); + if (id) break; + continue; + } + list->dwNumCountries++; + list->dwCountryListSize += sizeof(LINECOUNTRYENTRY); + list->dwUsedSize += len + sizeof(LINECOUNTRYENTRY); + + if (id) i = 0; + entry[i].dwCountryID = atoiW(subkey_name); + size = sizeof(DWORD); + RegQueryValueExW(hsubkey, country_codeW, NULL, NULL, (BYTE *)&entry[i].dwCountryCode, &size); + entry[i].dwNextCountryID = 0; + + if (i > 0) entry[i - 1].dwNextCountryID = entry[i].dwCountryID; + + /* add country name */ + entry[i].dwCountryNameSize = size_name; + entry[i].dwCountryNameOffset = offset; + RegQueryValueExW(hsubkey, nameW, NULL, NULL, (BYTE *)list + offset, &size_name); + offset += size_name; + + /* add Same Area Rule */ + entry[i].dwSameAreaRuleSize = size_same; + entry[i].dwSameAreaRuleOffset = offset; + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, (BYTE *)list + offset, &size_same); + offset += size_same; + + /* add Long Distance Rule */ + entry[i].dwLongDistanceRuleSize = size_long; + entry[i].dwLongDistanceRuleOffset = offset; + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, (BYTE *)list + offset, &size_long); + offset += size_long; + + /* add Long Distance Rule */ + entry[i].dwInternationalRuleSize = size_int; + entry[i].dwInternationalRuleOffset = offset; + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, (BYTE *)list + offset, &size_int); + offset += size_int; + RegCloseKey(hsubkey); + + TRACE("added country %s at %p\n", + debugstr_w((const WCHAR *)((const char *)list + entry[i].dwCountryNameOffset)), &entry[i]); + if (id) break; + } + list->dwNeededSize = offset; + + TRACE("%d available %d required\n", total_size, offset); + + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return 0; +} + +/*********************************************************************** * lineGetDevCapsW (TAPI32.@) */ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -486,7 +634,10 @@ DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -538,6 +689,15 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus) { FIXME("(%p, %p): stub.\n", hLine, lpLineDevStatus); + return 0; +} + +/*********************************************************************** + * lineGetMessage (TAPI32.@) + */ +DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hLineApp, lpMessage, dwTimeout); return 0; } @@ -818,7 +978,7 @@ strptr = ((LPBYTE) lpTranslateCaps) + lpTranslateCaps->dwCardListOffset + lpTranslateCaps->dwCardListSize; pLocEntry = (LPLINELOCATIONENTRY) (lpTranslateCaps + 1); - /* key with Preferred CardID's */ + /* key with Preferred CardIDs */ if( RegOpenKeyA(HKEY_CURRENT_USER, szLocationsKey, &hkCardLocations) != ERROR_SUCCESS ) hkCardLocations = 0; @@ -1023,6 +1183,16 @@ } /*********************************************************************** + * lineInitializeExW (TAPI32.@) + */ +LONG WINAPI lineInitializeExW(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECALLBACK lpfnCallback, LPCWSTR lpszFriendlyAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPLINEINITIALIZEEXPARAMS lpLineInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphLineApp, hInstance, + lpfnCallback, debugstr_w(lpszFriendlyAppName), lpdwNumDevs, lpdwAPIVersion, lpLineInitializeExParams); + return 0; +} + +/*********************************************************************** * lineMakeCallW (TAPI32.@) */ DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress, @@ -1083,8 +1253,11 @@ LPLINEEXTENSIONID lpExtensionID ) { - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, - dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; } @@ -1366,6 +1539,18 @@ } /*********************************************************************** + * lineTranslateAddressW (TAPI32.@) + */ +DWORD WINAPI lineTranslateAddressW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, LPCWSTR lpszAddressIn, DWORD dwCard, + DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput) +{ + FIXME("(%p, %08x, %08x, %s, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + debugstr_w(lpszAddressIn), dwCard, dwTranslateOptions, lpTranslateOutput); + return 0; +} + +/*********************************************************************** * lineTranslateDialog (TAPI32.@) */ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn) @@ -1375,6 +1560,17 @@ } /*********************************************************************** + * lineTranslateDialogW (TAPI32.@) + */ +DWORD WINAPI lineTranslateDialogW(HLINEAPP hLineApp, DWORD dwDeviceID, + DWORD dwAPIVersion, HWND hwndOwner, LPCWSTR lpszAddressIn) +{ + FIXME("(%p, %08x, %08x, %p, %s): stub.\n", hLineApp, dwDeviceID, + dwAPIVersion, hwndOwner, debugstr_w(lpszAddressIn)); + return 0; +} + +/*********************************************************************** * lineUncompleteCall (TAPI32.@) */ DWORD WINAPI lineUncompleteCall(HLINE hLine, DWORD dwCompletionID) Modified: trunk/reactos/dll/win32/tapi32/phone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/phone.c?r… ============================================================================== --- trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/phone.c [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -160,6 +160,15 @@ } /*********************************************************************** + * phoneGetMessage (TAPI32.@) + */ +DWORD WINAPI phoneGetMessage(HPHONEAPP hPhoneApp, LPPHONEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hPhoneApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * phoneGetRing (TAPI32.@) */ DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume) @@ -205,6 +214,26 @@ DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs) { FIXME("(%p, %p, %p, %s, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs); + return 0; +} + +/*********************************************************************** + * phoneInitializeiExA (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExA(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** + * phoneInitializeiExW (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExW(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCWSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, debugstr_w(lpszAppName), lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; return 0; } Modified: trunk/reactos/dll/win32/tapi32/tapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -30,6 +30,7 @@ @ stdcall lineAccept(long str long) @ stdcall lineAddProvider(str long ptr) lineAddProviderA @ stdcall lineAddProviderA(str long ptr) +@ stdcall lineAddProviderW(wstr long ptr) @ stdcall lineAddToConference(long long) @ stub lineAgentSpecific @ stdcall lineAnswer(long str long) @@ -41,10 +42,10 @@ @ stdcall lineCompleteTransfer(long long ptr long) @ stdcall lineConfigDialog(long long str) lineConfigDialogA @ stdcall lineConfigDialogA(long long str) +@ stdcall lineConfigDialogW(long long wstr) @ stdcall lineConfigDialogEdit(long long str ptr long ptr) lineConfigDialogEditA @ stdcall lineConfigDialogEditA(long long str ptr long ptr) @ stub lineConfigDialogEditW -@ stub lineConfigDialogW @ stdcall lineConfigProvider(long long) @ stub lineCreateAgentA @ stub lineCreateAgentSessionA @@ -55,7 +56,7 @@ @ stdcall lineDevSpecificFeature(long long ptr long) @ stdcall lineDial(long str long) lineDialA @ stdcall lineDialA(long str long) -@ stub lineDialW +@ stdcall lineDialW(long wstr long) @ stdcall lineDrop(long str long) @ stdcall lineForward(long long long ptr long ptr ptr) lineForwardA @ stdcall lineForwardA(long long long ptr long ptr ptr) @@ -97,10 +98,10 @@ @ stdcall lineGetConfRelatedCalls(long ptr) @ stdcall lineGetCountry(long long ptr) lineGetCountryA @ stdcall lineGetCountryA(long long ptr) -@ stub lineGetCountryW +@ stdcall lineGetCountryW(long long ptr) @ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA @ stdcall lineGetDevCapsA(long long long long ptr) -@ stdcall lineGetDevCapsW(ptr long long long ptr) +@ stdcall lineGetDevCapsW(long long long long ptr) @ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA @ stdcall lineGetDevConfigA(long ptr str) @ stub lineGetDevConfigW @@ -108,14 +109,14 @@ @ stub lineGetGroupListW @ stdcall lineGetID(long long long long ptr str) lineGetIDA @ stdcall lineGetIDA(long long long long ptr str) -@ stdcall lineGetIDW(ptr long ptr long ptr ptr) +@ stdcall lineGetIDW(long long long long ptr wstr) @ stdcall lineGetIcon(long str ptr) lineGetIconA @ stdcall lineGetIconA(long str ptr) @ stub lineGetIconW @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA @ stdcall lineGetLineDevStatusA(long ptr) @ stub lineGetLineDevStatusW -@ stub lineGetMessage +@ stdcall lineGetMessage(long ptr long) @ stdcall lineGetNewCalls(long long long ptr) @ stdcall lineGetNumRings(long long ptr) @ stdcall lineGetProviderList(long ptr) lineGetProviderListA @@ -138,10 +139,10 @@ @ stdcall lineHold(long) @ stdcall lineInitialize(ptr long ptr str ptr) @ stdcall lineInitializeExA(ptr long ptr str ptr ptr ptr) -@ stub lineInitializeExW +@ stdcall lineInitializeExW(ptr long ptr wstr ptr ptr ptr) @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) -@ stdcall lineMakeCallW(ptr ptr ptr long ptr) +@ stdcall lineMakeCallW(long ptr wstr long ptr) @ stdcall lineMonitorDigits(long long) @ stdcall lineMonitorMedia(long long) @ stdcall lineMonitorTones(long ptr long) @@ -209,10 +210,10 @@ @ stdcall lineSwapHold(long long) @ stdcall lineTranslateAddress(long long long str long long ptr) lineTranslateAddressA @ stdcall lineTranslateAddressA(long long long str long long ptr) -@ stub lineTranslateAddressW +@ stdcall lineTranslateAddressW(long long long wstr long long ptr) @ stdcall lineTranslateDialog(long long long long str) lineTranslateDialogA @ stdcall lineTranslateDialogA(long long long long str) -@ stub lineTranslateDialogW +@ stdcall lineTranslateDialogW(long long long long wstr) @ stdcall lineUncompleteCall(long long) @ stdcall lineUnhold(long) @ stdcall lineUnpark(long long ptr str) lineUnparkA @@ -240,7 +241,7 @@ @ stdcall phoneGetIconA(long str ptr) @ stub phoneGetIconW @ stdcall phoneGetLamp(long long ptr) -@ stub phoneGetMessage +@ stdcall phoneGetMessage(long ptr long) @ stdcall phoneGetRing(long ptr ptr) @ stdcall phoneGetStatus(long ptr) phoneGetStatusA @ stdcall phoneGetStatusA(long ptr) @@ -248,8 +249,8 @@ @ stub phoneGetStatusW @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) -@ stub phoneInitializeExA -@ stub phoneInitializeExW +@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) @@ -267,7 +268,7 @@ @ stdcall phoneShutdown(long) @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) -@ stub tapiGetLocationInfoW +@ stdcall tapiGetLocationInfoW(wstr wstr) @ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:07:20 2013 @@ -186,7 +186,7 @@ reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.7.1 -reactos/dll/win32/tapi32 # Autosync +reactos/dll/win32/tapi32 # Synced to Wine-1.7.1 reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!)

11 years, 2 months

[akhaldi] 60414: [SXS_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:06:21 2013 New Revision: 60414 URL: http://svn.reactos.org/svn/reactos?rev=60414&view=rev Log: [SXS_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/sxs/CMakeLists.txt trunk/rostests/winetests/sxs/cache.c trunk/rostests/winetests/sxs/testlist.c Modified: trunk/rostests/winetests/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -1,14 +1,9 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(sxs_winetest cache.c name.c testlist.c) -target_link_libraries(sxs_winetest wine uuid) set_module_type(sxs_winetest win32cui) -add_importlibs(sxs_winetest sxs msvcrt kernel32 ntdll) +add_importlibs(sxs_winetest sxs msvcrt kernel32) add_cd_file(TARGET sxs_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/sxs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/cache.c?rev… ============================================================================== --- trunk/rostests/winetests/sxs/cache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/cache.c [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -104,17 +104,17 @@ hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine2W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine3W, NULL ); ok( hr == HRESULT_FROM_WIN32( ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE ) || - broken(hr == 0x80070490) /* winxp */, "got %08x\n", hr ); + broken(hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND )) /* winxp */, "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine4W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, NULL ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); GetWindowsDirectoryA( comctl_path1, MAX_PATH ); lstrcatA( comctl_path1, "\\winsxs\\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef" ); @@ -141,7 +141,7 @@ memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, wine5W, &info ); - todo_wine ok( hr == 0x80070490, "got %08x\n", hr ); + todo_wine ok( hr == HRESULT_FROM_WIN32( ERROR_NOT_FOUND ), "got %08x\n", hr ); memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); Modified: trunk/rostests/winetests/sxs/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sxs/testlist.c?… ============================================================================== --- trunk/rostests/winetests/sxs/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sxs/testlist.c [iso-8859-1] Sat Sep 28 15:06:21 2013 @@ -1,8 +1,7 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cache(void); extern void func_name(void);

11 years, 2 months

[akhaldi] 60413: [SXS] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:05:24 2013 New Revision: 60413 URL: http://svn.reactos.org/svn/reactos?rev=60413&view=rev Log: [SXS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt trunk/reactos/dll/win32/sxs/cache.c trunk/reactos/dll/win32/sxs/name.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(sxs.dll sxs.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -14,6 +13,5 @@ add_library(sxs SHARED ${SOURCE}) set_module_type(sxs win32dll) target_link_libraries(sxs wine) -add_importlibs(sxs msvcrt oleaut32 ole32 kernel32 ntdll) -add_dependencies(sxs psdk) +add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll) add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/sxs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/cache.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/cache.c [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -73,7 +73,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { - IUnknown_AddRef( iface ); + IAssemblyCache_AddRef( iface ); *obj = cache; return S_OK; } Modified: trunk/reactos/dll/win32/sxs/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/name.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/name.c [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -72,7 +72,7 @@ if (IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IAssemblyName )) { - IUnknown_AddRef( iface ); + IAssemblyName_AddRef( iface ); *obj = name; return S_OK; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:05:24 2013 @@ -185,7 +185,7 @@ reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.7.1 -reactos/dll/win32/sxs # Synced to Wine-1.5.4 +reactos/dll/win32/sxs # Synced to Wine-1.7.1 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/twain_32 # Out of sync

11 years, 2 months

[akhaldi] 60412: [STI_WINETEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:04:20 2013 New Revision: 60412 URL: http://svn.reactos.org/svn/reactos?rev=60412&view=rev Log: [STI_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/sti/CMakeLists.txt trunk/rostests/winetests/sti/testlist.c Modified: trunk/rostests/winetests/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/sti/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:04:20 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(sti_winetest sti.c testlist.c) -target_link_libraries(sti_winetest wine uuid) set_module_type(sti_winetest win32cui) -add_importlibs(sti_winetest ole32 msvcrt kernel32 ntdll) +add_importlibs(sti_winetest ole32 msvcrt kernel32) add_cd_file(TARGET sti_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/sti/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/sti/testlist.c?… ============================================================================== --- trunk/rostests/winetests/sti/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/sti/testlist.c [iso-8859-1] Sat Sep 28 15:04:20 2013 @@ -1,8 +1,7 @@ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> +/* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_sti(void);

11 years, 2 months

[akhaldi] 60411: [STI] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 15:03:41 2013 New Revision: 60411 URL: http://svn.reactos.org/svn/reactos?rev=60411&view=rev Log: [STI] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/win32/sti/sti_private.h Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt trunk/reactos/dll/win32/sti/sti_wia.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ @@ -9,19 +6,17 @@ -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(sti.dll sti.spec) list(APPEND SOURCE sti.c sti_main.c - sti.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c ${CMAKE_CURRENT_BINARY_DIR}/sti.def) add_rpcproxy_files(sti_wia.idl) -add_library(sti SHARED ${SOURCE}) +add_library(sti SHARED ${SOURCE} sti.rc) set_module_type(sti win32dll) target_link_libraries(sti wine uuid ${PSEH_LIB}) add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll) Removed: trunk/reactos/dll/win32/sti/sti_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_private.… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_private.h (removed) @@ -1,32 +0,0 @@ -/* - * STI private definitions - * - * Copyright 2009 Damjan Jovanovic - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __STI_PRIVATE__ -#define __STI_PRIVATE__ - -typedef struct _stillimage -{ - const struct IStillImageWVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; - IUnknown *pUnkOuter; - LONG ref; -} stillimage; - -#endif /* __STI_PRIVATE__ */ Modified: trunk/reactos/dll/win32/sti/sti_wia.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/sti_wia.idl?… ============================================================================== --- trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sti/sti_wia.idl [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -18,7 +18,6 @@ #include "wia_lh.idl" -#ifdef __WIDL__ [ threading(both), uuid(4db1ad10-3391-11d2-9a33-00c04fa36145) /* IWiaItem */ @@ -30,4 +29,3 @@ uuid(b323f8e0-2e68-11d0-90ea-00aa0060f86c) ] coclass StillImage { interface IStillImageW; } -#endif Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 28 15:03:41 2013 @@ -184,7 +184,7 @@ reactos/dll/win32/spoolss # Synced to Wine-1.7.1 reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 -reactos/dll/win32/sti # Synced to Wine-1.5.4 +reactos/dll/win32/sti # Synced to Wine-1.7.1 reactos/dll/win32/sxs # Synced to Wine-1.5.4 reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/traffic # Synced to Wine-1.5.19

11 years, 2 months

[akhaldi] 60410: [PSDK] * Update tapi.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 14:59:56 2013 New Revision: 60410 URL: http://svn.reactos.org/svn/reactos?rev=60410&view=rev Log: [PSDK] * Update tapi.h. Modified: trunk/reactos/include/psdk/tapi.h Modified: trunk/reactos/include/psdk/tapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tapi.h?rev=60… ============================================================================== --- trunk/reactos/include/psdk/tapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tapi.h [iso-8859-1] Sat Sep 28 14:59:56 2013 @@ -749,6 +749,15 @@ DWORD dwTranslateResults; } LINETRANSLATEOUTPUT, *LPLINETRANSLATEOUTPUT; +typedef struct linemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} LINEMESSAGE, *LPLINEMESSAGE; + typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); typedef struct _PHONEAPP { @@ -818,6 +827,27 @@ DWORD dwExtensionID2; DWORD dwExtensionID3; } PHONEEXTENSIONID, *LPPHONEEXTENSIONID; + +typedef struct phoneinitializeexparams_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwOptions; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; + DWORD dwCompletionKey; +} PHONEINITIALIZEEXPARAMS, *LPPHONEINITIALIZEEXPARAMS; + +typedef struct phonemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} PHONEMESSAGE, *LPPHONEMESSAGE; typedef struct phonestatus_tag { DWORD dwTotalSize;

11 years, 2 months

[akhaldi] 60409: [PSDK] * Add some missing SP_PROT_TLS* definitions. * Correct SCHANNEL_CRED structure.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 28 14:55:32 2013 New Revision: 60409 URL: http://svn.reactos.org/svn/reactos?rev=60409&view=rev Log: [PSDK] * Add some missing SP_PROT_TLS* definitions. * Correct SCHANNEL_CRED structure. Modified: trunk/reactos/include/psdk/schannel.h Modified: trunk/reactos/include/psdk/schannel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/schannel.h?re… ============================================================================== --- trunk/reactos/include/psdk/schannel.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/schannel.h [iso-8859-1] Sat Sep 28 14:55:32 2013 @@ -27,6 +27,10 @@ #define SCHANNEL_SESSION 3 #define SP_PROT_TLS1_CLIENT 128 +#define SP_PROT_TLS1_1_CLIENT 512 +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_2_CLIENT 2048 + #define SP_PROT_TLS1_SERVER 64 #define SP_PROT_SSL3_CLIENT 32 #define SP_PROT_SSL3_SERVER 16 @@ -39,6 +43,8 @@ #define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) #define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) #define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) + +#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) #define SCH_CRED_NO_SYSTEM_MAPPER 2 #define SCH_CRED_NO_SERVERNAME_CHECK 4 @@ -85,9 +91,9 @@ DWORD grbitEnabledProtocols; DWORD dwMinimumCipherStrength; DWORD dwMaximumCipherStrength; - DWORD dwSessionLength; + DWORD dwSessionLifespan; DWORD dwFlags; - DWORD reserved; + DWORD dwCredFormat; } SCHANNEL_CRED, *PSCHANNEL_CRED; typedef struct _SecPkgCred_SupportedAlgs

11 years, 2 months

[tfaber] 60408: [NTDLL_APITEST] - Add a test for NtCreateFile with invalid ObjectAttributes. Patch by Aleksandar Andrejevic. CORE-7167

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 28 11:39:51 2013 New Revision: 60408 URL: http://svn.reactos.org/svn/reactos?rev=60408&view=rev Log: [NTDLL_APITEST] - Add a test for NtCreateFile with invalid ObjectAttributes. Patch by Aleksandar Andrejevic. CORE-7167 Added: trunk/rostests/apitests/ntdll/NtCreateFile.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -3,6 +3,7 @@ LdrEnumResources.c NtAllocateVirtualMemory.c NtContinue.c + NtCreateFile.c NtCreateThread.c NtFreeVirtualMemory.c NtMapViewOfSection.c Added: trunk/rostests/apitests/ntdll/NtCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtCreateFi… ============================================================================== --- trunk/rostests/apitests/ntdll/NtCreateFile.c (added) +++ trunk/rostests/apitests/ntdll/NtCreateFile.c [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: See COPYING in the top level directory + * PURPOSE: Test for NtCreateFile + * PROGRAMMER: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +//#include <ndk/iotypes.h> +#include <ndk/iofuncs.h> +//#include <ndk/obtypes.h> +//#include <ndk/obfuncs.h> + +START_TEST(NtCreateFile) +{ + NTSTATUS Status; + HANDLE FileHandle; + IO_STATUS_BLOCK StatusBlock; + + Status = NtCreateFile(&FileHandle, + FILE_READ_DATA, + (POBJECT_ATTRIBUTES)0xCCCCCCCC, + &StatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, + FILE_OPEN_IF, + FILE_NON_DIRECTORY_FILE, + NULL, + 0); + + ok_hex(Status, STATUS_ACCESS_VIOLATION); +} Propchange: trunk/rostests/apitests/ntdll/NtCreateFile.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat Sep 28 11:39:51 2013 @@ -6,6 +6,7 @@ extern void func_LdrEnumResources(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtContinue(void); +extern void func_NtCreateFile(void); extern void func_NtCreateThread(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); @@ -31,6 +32,7 @@ { "LdrEnumResources", func_LdrEnumResources }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtContinue", func_NtContinue }, + { "NtCreateFile", func_NtCreateFile }, { "NtCreateThread", func_NtCreateThread }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection },

11 years, 2 months

[tfaber] 60407: [NTOS:EX] - Correctly return STATUS_TIMER_RESOLUTION_NOT_SET if the resolution was not changed in NtSetTimerResolution. Patch by Aleksandar Andrejevic. CORE-7387

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 28 11:37:08 2013 New Revision: 60407 URL: http://svn.reactos.org/svn/reactos?rev=60407&view=rev Log: [NTOS:EX] - Correctly return STATUS_TIMER_RESOLUTION_NOT_SET if the resolution was not changed in NtSetTimerResolution. Patch by Aleksandar Andrejevic. CORE-7387 Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Sat Sep 28 11:37:08 2013 @@ -527,6 +527,7 @@ IN BOOLEAN SetResolution, OUT PULONG CurrentResolution) { + NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process = PsGetCurrentProcess(); ULONG NewResolution; @@ -551,15 +552,21 @@ NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); *CurrentResolution = NewResolution; - if (SetResolution) - { - /* Set the flag that the resolution has been changed */ - Process->SetTimerResolution = TRUE; - } - - /* Return success if the process changed its timer resolution */ - if (Process->SetTimerResolution) return STATUS_SUCCESS; - else return STATUS_TIMER_RESOLUTION_NOT_SET; + if (SetResolution || Process->SetTimerResolution) + { + /* The resolution has been changed now or in an earlier call */ + Status = STATUS_SUCCESS; + } + else + { + /* The resolution hasn't been changed */ + Status = STATUS_TIMER_RESOLUTION_NOT_SET; + } + + /* Update the flag */ + Process->SetTimerResolution = SetResolution; + + return Status; } /* EOF */

11 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013