November 2011 - Wine-commits

Bernhard Loos : winedevice: A driver path can also start with \systemroot\.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 6840a9273c92875c551e669b00d48c2944b3ef0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6840a9273c92875c551e669b0… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Nov 23 13:12:31 2011 +0100 winedevice: A driver path can also start with \systemroot\. --- programs/winedevice/device.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 2ce8c15..e48218e 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -170,6 +170,7 @@ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) static BOOL load_driver(void) { static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; + static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',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}; @@ -209,6 +210,24 @@ static BOOL load_driver(void) } HeapFree( GetProcessHeap(), 0, str ); if (!path) return FALSE; + + if (!strncmpiW( path, systemrootW, 12 )) + { + WCHAR buffer[MAX_PATH]; + + GetWindowsDirectoryW(buffer, MAX_PATH); + + str = HeapAlloc(GetProcessHeap(), 0, (size -11 + strlenW(buffer)) + * sizeof(WCHAR)); + lstrcpyW(str, buffer); + lstrcatW(str, path + 11); + HeapFree( GetProcessHeap(), 0, path ); + path = str; + } + else if (!strncmpW( path, ntprefixW, 4 )) + str = path + 4; + else + str = path; } else { @@ -222,12 +241,9 @@ static BOOL load_driver(void) lstrcatW(path, driversW); lstrcatW(path, driver_name); lstrcatW(path, postfixW); + str = path; } - /* GameGuard uses an NT-style path name */ - str = path; - if (!strncmpW( path, ntprefixW, 4 )) str += 4; - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str );

1 0

Piotr Caban : msvcp90: Added partial locale::_Locimp implementation.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: b7b0c1b18ba2df0fc99e8d1fe885d82d8ab2b3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b0c1b18ba2df0fc99e8d1fe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 16:13:46 2011 +0100 msvcp90: Added partial locale::_Locimp implementation. --- dlls/msvcp90/locale.c | 119 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6ebfb51..ad6c44b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -115,6 +115,25 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi static const vtable_ptr MSVCP_locale_facet_vtable[] = { (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) }; +#ifdef __i386__ +static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) +{ + locale_facet *ret; + void *dummy; + + __asm__ __volatile__ ("pushl %3\n\tcall *%2" + : "=a" (ret), "=c" (dummy) + : "r" (this->vtable[0]), "r" (flags), "1" (this) + : "edx", "memory" ); + return ret; +} +#else +static inline locale_facet* call_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) +{ + locale_facet * (__thiscall *dtor)(locale_facet *, unsigned int) = (void *)this->vtable[0]; + return dtor(this, flags); +} +#endif /* ??0id(a)locale@std@@QAE(a)I@Z */ /* ??0id(a)locale@std@@QEAA(a)_K@Z */ @@ -214,7 +233,7 @@ locale_facet* __thiscall locale_facet__Decref(locale_facet *this) if(this->refs) this->refs--; - ret = this->refs ? this : NULL; + ret = this->refs ? NULL : this; _Lockit_dtor(&lock); return ret; @@ -228,22 +247,26 @@ MSVCP_size_t __cdecl locale_facet__Getcat(const locale_facet **facet, const loca return -1; } -/* ??_F_Locimp(a)locale@std@@QAEXXZ */ -/* ??_F_Locimp(a)locale@std@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor, 4) -locale__Locimp* __thiscall locale__Locimp_ctor(locale__Locimp *this) -{ - FIXME("(%p) stub\n", this); - return NULL; -} - /* ??0_Locimp(a)locale@std@@AAE(a)_N@Z */ /* ??0_Locimp(a)locale@std@@AEAA(a)_N@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor_transparent, 8) locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this, MSVCP_bool transparent) { - FIXME("(%p %d) stub\n", this, transparent); - return NULL; + TRACE("(%p %d)\n", this, transparent); + + memset(this, 0, sizeof(locale__Locimp)); + locale_facet_ctor_refs(&this->facet, 1); + this->transparent = transparent; + MSVCP_basic_string_char_ctor_cstr(&this->name, "*"); + return this; +} + +/* ??_F_Locimp(a)locale@std@@QAEXXZ */ +/* ??_F_Locimp(a)locale@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor, 4) +locale__Locimp* __thiscall locale__Locimp_ctor(locale__Locimp *this) +{ + return locale__Locimp_ctor_transparent(this, FALSE); } /* ??0_Locimp(a)locale@std@@AAE(a)ABV012@@Z */ @@ -251,16 +274,32 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this, DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8) locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + MSVCP_size_t i; + + TRACE("(%p %p)\n", this, copy); + + memcpy(this, copy, sizeof(locale__Locimp)); + locale_facet_ctor_refs(&this->facet, 1); + if(copy->facetvec) { + this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); + if(!this->facetvec) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i]) + locale_facet__Incref(this->facetvec[i]); + } + MSVCP_basic_string_char_copy_ctor(&this->name, &copy->name); + return this; } /* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z */ /* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z */ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const locale__Locimp *copy) { - FIXME("(%p %p) stub\n", this, copy); - return NULL; + return locale__Locimp_copy_ctor(this, copy); } /* ??1_Locimp(a)locale@std@@MAE(a)XZ */ @@ -268,20 +307,30 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(locale_facet__Decref(&this->facet)) { + MSVCP_size_t i; + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 0); + + MSVCRT_operator_delete(this->facetvec); + MSVCP_basic_string_char_dtor(&this->name); + } } /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z */ void __cdecl locale__Locimp__Locimp_dtor(locale__Locimp *this) { - FIXME("(%p) stub\n", this); + locale__Locimp_dtor(this); } DEFINE_THISCALL_WRAPPER(MSVCP_locale__Locimp_vector_dtor, 8) locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this, unsigned int flags) { - TRACE("(%p %x) stub\n", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1; @@ -302,7 +351,35 @@ locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id) { - FIXME("(%p %p %lu) stub\n", locimp, facet, id); + TRACE("(%p %p %lu)\n", locimp, facet, id); + + if(id >= locimp->facet_cnt) { + MSVCP_size_t new_size = id+1; + locale_facet **new_facetvec; + + if(new_size < locale_id__Id_cnt+1) + new_size = locale_id__Id_cnt+1; + + new_facetvec = MSVCRT_operator_new(sizeof(locale_facet*)*new_size); + if(!new_facetvec) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return; + } + + memset(new_facetvec, 0, sizeof(locale_facet*)*new_size); + memcpy(new_facetvec, locimp->facetvec, sizeof(locale_facet*)*locimp->facet_cnt); + MSVCRT_operator_delete(locimp->facetvec); + locimp->facetvec = new_facetvec; + locimp->facet_cnt = new_size; + } + + if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) + call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + + locimp->facetvec[id] = facet; + if(facet) + locale_facet__Incref(facet); } /* ?_Addfac(a)_Locimp@locale(a)std@@AAEXPAVfacet(a)23@I(a)Z */ @@ -310,7 +387,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet DEFINE_THISCALL_WRAPPER(locale__Locimp__Addfac, 12) void __thiscall locale__Locimp__Addfac(locale__Locimp *this, locale_facet *facet, MSVCP_size_t id) { - FIXME("(%p %p %lu) stub\n", this, facet, id); + locale__Locimp__Locimp_Addfac(this, facet, id); } /* ?_Clocptr_func(a)_Locimp@locale(a)std@@CAAAPAV123(a)XZ */

1 0

Piotr Caban : msvcp90: Added empty locale constructor and destructor implementation.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: a3c395b7918f3d5f6110ec40a7d9edb30d29e174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c395b7918f3d5f6110ec40a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 16:14:11 2011 +0100 msvcp90: Added empty locale constructor and destructor implementation. --- dlls/msvcp90/locale.c | 17 +++++++++++++---- dlls/msvcp90/msvcp90.h | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index ad6c44b..f05cc79 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -491,8 +491,16 @@ locale* __thiscall locale_ctor_uninitialized(locale *this, int uninitialized) DEFINE_THISCALL_WRAPPER(locale_ctor, 4) locale* __thiscall locale_ctor(locale *this) { - FIXME("(%p) stub\n", this); - return NULL; + TRACE("(%p)\n", this); + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + + locale__Locimp_ctor(this->ptr); + return this; } /* ??1locale(a)std@@QAE(a)XZ */ @@ -500,13 +508,14 @@ locale* __thiscall locale_ctor(locale *this) DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + locale__Locimp_dtor(this->ptr); } DEFINE_THISCALL_WRAPPER(MSVCP_locale_vector_dtor, 8) locale* __thiscall MSVCP_locale_vector_dtor(locale *this, unsigned int flags) { - TRACE("(%p %x) stub\n", this, flags); + TRACE("(%p %x)\n", this, flags); if(flags & 2) { /* we have an array, with the number of elements stored before the first object */ int i, *ptr = (int *)this-1; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b9000a4..cb2a9b8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -195,7 +195,7 @@ MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); /* class locale */ typedef struct { - struct locale__Locimp *ptr; + struct _locale__Locimp *ptr; } locale; locale* __thiscall locale_ctor(locale*);

1 0

Dmitry Timoshkov : ntdll: Change the virtual memory test to accept both READWRITE and WRITECOPY protections .
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 277259157b5c68123cb6c5ee6c5acee6cc832834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277259157b5c68123cb6c5ee6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 21:14:55 2011 +0800 ntdll: Change the virtual memory test to accept both READWRITE and WRITECOPY protections. --- dlls/ntdll/tests/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index ec1ce3d..440f602 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1293,7 +1293,8 @@ static void test_queryvirtualmemory(void) { ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, + "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ }

1 0

Dmitry Timoshkov : ntdll: Revert 33b0f0edffa0c8a06b4ee8831c92fdc373f83ece.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 517d0800df64239df484d231063d3fdace1abead URL: http://source.winehq.org/git/wine.git/?a=commit;h=517d0800df64239df484d2310… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 18:03:22 2011 +0800 ntdll: Revert 33b0f0edffa0c8a06b4ee8831c92fdc373f83ece. The tests clearly show that this commit is wrong. --- dlls/kernel32/tests/loader.c | 10 ---------- dlls/ntdll/virtual.c | 8 +------- 2 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 3bc7540..2af7cc5 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -691,11 +691,6 @@ static void test_section_access(void) "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && - (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); - else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); @@ -735,11 +730,6 @@ static void test_section_access(void) "%d: VirtualQuery error %d\n", i, GetLastError()); ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); - /* FIXME: remove the condition below once Wine is fixed */ - if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && - (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) - todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); - else ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index fb8786f..9853628 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1345,14 +1345,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) - { - if (sec->Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - vprot |= VPROT_WRITE; - else - vprot |= VPROT_WRITECOPY; - } /* Dumb game crack lets the AOEP point into a data section. Adjust. */ if ((nt->OptionalHeader.AddressOfEntryPoint >= sec->VirtualAddress) &&

1 0

Piotr Caban : msvcrt: Keep FILE critical section initialized after closing file.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 3fe5e6ee8a89cce691144e0a3d501be43d09c566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe5e6ee8a89cce691144e0a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 23 12:32:45 2011 +0100 msvcrt: Keep FILE critical section initialized after closing file. --- dlls/msvcrt/file.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c636e85..7a034d3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -362,7 +362,12 @@ static MSVCRT_FILE* msvcrt_alloc_fp(void) if (file->_flag == 0) { - if (i == MSVCRT_stream_idx) MSVCRT_stream_idx++; + if (i == MSVCRT_stream_idx) + { + InitializeCriticalSection(&((file_crit*)file)->crit); + ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + MSVCRT_stream_idx++; + } return file; } } @@ -385,12 +390,6 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) file->_file = fd; file->_flag = stream_flags; - if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) - { - InitializeCriticalSection(&((file_crit*)file)->crit); - ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); - } - TRACE(":got FILE* (%p)\n",file); return 0; } @@ -985,6 +984,16 @@ void msvcrt_free_io(void) for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]); + for(i=0; i<MSVCRT_stream_idx; i++) + { + MSVCRT_FILE *file = msvcrt_get_file(i); + if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + { + ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&((file_crit*)file)->crit); + } + } + for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) MSVCRT_free(MSVCRT_fstream[i]); @@ -2607,18 +2616,6 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) file->_flag = 0; MSVCRT__unlock_file(file); - if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) - { - ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&((file_crit*)file)->crit); - } - - if(file == msvcrt_get_file(MSVCRT_stream_idx-1)) { - while(MSVCRT_stream_idx>3 && !file->_flag) { - MSVCRT_stream_idx--; - file = msvcrt_get_file(MSVCRT_stream_idx-1); - } - } return ((r == -1) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); }

1 0

Jacek Caban : mshtml: Use IUri for IHTMLLocation:: get_hostname implementation.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: dd61c7953ee83b61bfb438425136e05f2914c660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd61c7953ee83b61bfb438425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 23 15:30:06 2011 +0100 mshtml: Use IUri for IHTMLLocation::get_hostname implementation. --- dlls/mshtml/htmllocation.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index cf591d7..b3354f0 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -359,7 +359,7 @@ static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + BSTR hostname; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -367,19 +367,21 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - url.dwHostNameLength = 1; - hres = get_url_components(This, &url); - if(FAILED(hres)) - return hres; + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } - if(!url.dwHostNameLength){ + hres = IUri_GetHost(This->window->uri, &hostname); + if(hres == S_OK) { + *p = hostname; + }else if(hres == S_FALSE) { + SysFreeString(hostname); *p = NULL; - return S_OK; + }else { + return hres; } - *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); - if(!*p) - return E_OUTOFMEMORY; return S_OK; }

1 0

Jacek Caban : mshtml: Added nsIChannel::SetContentCharset implementation.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 3a3daead74927c1871d0dac4bf1df75a8d1ea4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a3daead74927c1871d0dac4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 23 16:18:53 2011 +0100 mshtml: Added nsIChannel::SetContentCharset implementation. --- dlls/mshtml/nsio.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 59f9c2f..faf40ed 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -802,10 +802,19 @@ static nsresult NSAPI nsChannel_SetContentCharset(nsIHttpChannel *iface, const nsACString *aContentCharset) { nsChannel *This = impl_from_nsIHttpChannel(iface); + const char *data; + char *charset; - FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(aContentCharset)); + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aContentCharset)); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aContentCharset, &data); + charset = heap_strdupA(data); + if(!charset) + return NS_ERROR_OUT_OF_MEMORY; + + heap_free(This->charset); + This->charset = charset; + return NS_OK; } static nsresult NSAPI nsChannel_GetContentLength(nsIHttpChannel *iface, PRInt32 *aContentLength)

1 0

Jacek Caban : mshtml: Use codepage reported by http headers.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: 42d98d2a3ed5b04b6e1cddabbe9ef7926a320103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d98d2a3ed5b04b6e1cddabb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 23 16:19:05 2011 +0100 mshtml: Use codepage reported by http headers. --- dlls/mshtml/navigate.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fe0d4c6..2d8bcd8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -626,6 +626,57 @@ static void call_docview_84(HTMLDocumentObj *doc) FIXME("handle result\n"); } +static void parse_content_type(nsChannelBSC *This, const WCHAR *value) +{ + const WCHAR *ptr; + size_t len; + + static const WCHAR charsetW[] = {'c','h','a','r','s','e','t','='}; + + ptr = strchrW(value, ';'); + if(!ptr) + return; + + ptr++; + while(*ptr && isspaceW(*ptr)) + ptr++; + + len = strlenW(value); + if(ptr + sizeof(charsetW)/sizeof(WCHAR) < value+len && !memicmpW(ptr, charsetW, sizeof(charsetW)/sizeof(WCHAR))) { + size_t charset_len, lena; + nsACString charset_str; + const WCHAR *charset; + char *charseta; + + ptr += sizeof(charsetW)/sizeof(WCHAR); + + if(*ptr == '\'') { + FIXME("Quoted value\n"); + return; + }else { + charset = ptr; + while(*ptr && *ptr != ',') + ptr++; + charset_len = ptr-charset; + } + + lena = WideCharToMultiByte(CP_ACP, 0, charset, charset_len, NULL, 0, NULL, NULL); + charseta = heap_alloc(lena+1); + if(!charseta) + return; + + WideCharToMultiByte(CP_ACP, 0, charset, charset_len, charseta, lena, NULL, NULL); + charseta[lena] = 0; + + nsACString_InitDepend(&charset_str, charseta); + nsIHttpChannel_SetContentCharset(&This->nschannel->nsIHttpChannel_iface, &charset_str); + nsACString_Finish(&charset_str); + heap_free(charseta); + }else { + FIXME("unhandled: %s\n", debugstr_wn(ptr, len - (ptr-value))); + } +} + static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) { const WCHAR *header, *header_end, *colon, *value; @@ -659,6 +710,25 @@ static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) return S_OK; } +static HRESULT process_response_headers(nsChannelBSC *This, const WCHAR *headers) +{ + http_header_t *iter; + HRESULT hres; + + static const WCHAR content_typeW[] = {'c','o','n','t','e','n','t','-','t','y','p','e',0}; + + hres = parse_headers(headers, &This->nschannel->response_headers); + if(FAILED(hres)) + return hres; + + LIST_FOR_EACH_ENTRY(iter, &This->nschannel->response_headers, http_header_t, entry) { + if(!strcmpiW(iter->header, content_typeW)) + parse_content_type(This, iter->data); + } + + return S_OK; +} + HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -1471,7 +1541,7 @@ static HRESULT nsChannelBSC_on_response(BSCallback *bsc, DWORD response_code, headers = strchrW(response_headers, '\r'); if(headers && headers[1] == '\n') { headers += 2; - hres = parse_headers(headers, &This->nschannel->response_headers); + hres = process_response_headers(This, headers); if(FAILED(hres)) { WARN("parsing headers failed: %08x\n", hres); return hres;

1 0

Jacek Caban : mshtml: Added IMutable::SetMutable implementation.
by Alexandre Julliard 23 Nov '11

23 Nov '11

Module: wine Branch: master Commit: e034ddee5e7846ffb4d07e79d33e13f61300b5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e034ddee5e7846ffb4d07e79d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 23 16:19:42 2011 +0100 mshtml: Added IMutable::SetMutable implementation. --- dlls/mshtml/nsio.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index faf40ed..251c4b2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -66,6 +66,7 @@ struct nsWineURI { IUri *uri; IUriBuilder *uri_builder; BOOL is_doc_uri; + BOOL is_mutable; }; static BOOL ensure_uri(nsWineURI *This) @@ -1656,6 +1657,11 @@ static void invalidate_uri(nsWineURI *This) static BOOL ensure_uri_builder(nsWineURI *This) { + if(!This->is_mutable) { + WARN("Not mutable URI\n"); + return FALSE; + } + if(!This->uri_builder) { HRESULT hres; @@ -1792,6 +1798,9 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aSpec)); + if(!This->is_mutable) + return NS_ERROR_UNEXPECTED; + nsACString_GetData(aSpec, &speca); spec = heap_strdupAtoW(speca); if(!spec) @@ -2473,6 +2482,9 @@ static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); + if(!This->is_mutable) + return NS_ERROR_UNEXPECTED; + return nsIURL_SetPath(&This->nsIURL_iface, aFilePath); } @@ -2595,6 +2607,9 @@ static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileNa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); + if(!This->is_mutable) + return NS_ERROR_UNEXPECTED; + if(This->nsurl) { invalidate_uri(This); return nsIURL_SetFileName(This->nsurl, aFileName); @@ -2623,6 +2638,9 @@ static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFi TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); + if(!This->is_mutable) + return NS_ERROR_UNEXPECTED; + if(This->nsurl) { invalidate_uri(This); return nsIURL_SetFileBaseName(This->nsurl, aFileBaseName); @@ -2647,6 +2665,9 @@ static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aF TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); + if(!This->is_mutable) + return NS_ERROR_UNEXPECTED; + if(This->nsurl) { invalidate_uri(This); return nsIURL_SetFileExtension(This->nsurl, aFileExtension); @@ -2766,15 +2787,18 @@ static nsresult NSAPI nsStandardURL_GetMutable(nsIStandardURL *iface, PRBool *aM TRACE("(%p)->(%p)\n", This, aMutable); - *aMutable = TRUE; + *aMutable = This->is_mutable; return NS_OK; } static nsresult NSAPI nsStandardURL_SetMutable(nsIStandardURL *iface, PRBool aMutable) { nsWineURI *This = impl_from_nsIStandardURL(iface); - FIXME("(%p)->(%x)\n", This, aMutable); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%x)\n", This, aMutable); + + This->is_mutable = aMutable; + return NS_OK; } static nsresult NSAPI nsStandardURL_Init(nsIStandardURL *iface, PRUint32 aUrlType, PRInt32 aDefaultPort, @@ -2802,6 +2826,7 @@ static nsresult create_nsuri(IUri *iuri, nsIURI *nsuri, HTMLWindow *window, NSCo ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; ret->ref = 1; ret->nsuri = nsuri; + ret->is_mutable = TRUE; set_uri_nscontainer(ret, container); set_uri_window(ret, window);

1 0