November 2010 - Wine-Commits

Eric Pouech : kernel32: Control characters should be returned while reading a line from console.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 9c577630d11cd19273b93eeb6295c0b2b75fa42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c577630d11cd19273b93eeb6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 28 22:10:36 2010 +0100 kernel32: Control characters should be returned while reading a line from console. --- dlls/kernel32/editline.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index b79c5cb..4d02d77 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -247,9 +247,6 @@ static void WCEL_InsertChar(WCEL_Context* ctx, WCHAR c) { WCHAR buffer[2]; - /* do not insert 0..31 control characters */ - if (c < ' ' && c != '\t') return; - buffer[0] = c; buffer[1] = 0; WCEL_InsertString(ctx, buffer);

1 0

Michael Stefaniuc : msimtf: Use an interface instance instead of a vtbl pointer.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 41dce7cfec131b4e95fb81b69f451ff008ce57bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=41dce7cfec131b4e95fb81b69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 01:01:31 2010 +0100 msimtf: Use an interface instance instead of a vtbl pointer. --- dlls/msimtf/main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msimtf/main.c b/dlls/msimtf/main.c index 6b8957b..dab1e27 100644 --- a/dlls/msimtf/main.c +++ b/dlls/msimtf/main.c @@ -60,11 +60,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(IUnknown*,IUnknown**); } ClassFactory; +static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { @@ -100,7 +105,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) { - ClassFactory *This = (ClassFactory*)iface; + ClassFactory *This = impl_from_IClassFactory(iface); HRESULT ret; IUnknown *obj; TRACE("(%p, %p, %s, %p)\n", iface, pOuter, debugstr_guid(riid), ppv); @@ -135,7 +140,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_CActiveIMM, rclsid)) { static ClassFactory cf = { - &ClassFactoryVtbl, + { &ClassFactoryVtbl }, ActiveIMMApp_Constructor, };

1 0

Michael Stefaniuc : atl: Use an iface instead of a vtbl pointer in the Registrar object.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 0fd3f0a006fc6b1a5372f267a259505f512ab034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd3f0a006fc6b1a5372f267a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 29 00:54:44 2010 +0100 atl: Use an iface instead of a vtbl pointer in the Registrar object. --- dlls/atl/registrar.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 99dfe73..2188850 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -78,7 +78,7 @@ typedef struct rep_list_str { } rep_list; typedef struct { - const IRegistrarVtbl *lpVtbl; + IRegistrar IRegistrar_iface; LONG ref; rep_list *rep; } Registrar; @@ -89,6 +89,11 @@ typedef struct { DWORD len; } strbuf; +static inline Registrar *impl_from_IRegistrar(IRegistrar *iface) +{ + return CONTAINING_RECORD(iface, Registrar, IRegistrar_iface); +} + static void strbuf_init(strbuf *buf) { buf->str = HeapAlloc(GetProcessHeap(), 0, 128*sizeof(WCHAR)); @@ -549,7 +554,7 @@ static HRESULT WINAPI Registrar_QueryInterface(IRegistrar *iface, REFIID riid, v static ULONG WINAPI Registrar_AddRef(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ->%d\n", This, ref); return ref; @@ -557,7 +562,7 @@ static ULONG WINAPI Registrar_AddRef(IRegistrar *iface) static ULONG WINAPI Registrar_Release(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ->%d\n", This, ref); @@ -571,7 +576,7 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, LPCOLESTR item) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); int len; rep_list *new_rep; @@ -595,7 +600,7 @@ static HRESULT WINAPI Registrar_AddReplacement(IRegistrar *iface, LPCOLESTR Key, static HRESULT WINAPI Registrar_ClearReplacements(IRegistrar *iface) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); rep_list *iter, *iter2; TRACE("(%p)\n", This); @@ -619,7 +624,7 @@ static HRESULT WINAPI Registrar_ClearReplacements(IRegistrar *iface) static HRESULT WINAPI Registrar_ResourceRegisterSz(IRegistrar* iface, LPCOLESTR resFileName, LPCOLESTR szID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(resFileName), debugstr_w(szID), debugstr_w(szType)); return resource_register(This, resFileName, szID, szType, TRUE); } @@ -627,35 +632,35 @@ static HRESULT WINAPI Registrar_ResourceRegisterSz(IRegistrar* iface, LPCOLESTR static HRESULT WINAPI Registrar_ResourceUnregisterSz(IRegistrar* iface, LPCOLESTR resFileName, LPCOLESTR szID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(resFileName), debugstr_w(szID), debugstr_w(szType)); return resource_register(This, resFileName, szID, szType, FALSE); } static HRESULT WINAPI Registrar_FileRegister(IRegistrar* iface, LPCOLESTR fileName) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(fileName)); return file_register(This, fileName, TRUE); } static HRESULT WINAPI Registrar_FileUnregister(IRegistrar* iface, LPCOLESTR fileName) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(fileName)); return file_register(This, fileName, FALSE); } static HRESULT WINAPI Registrar_StringRegister(IRegistrar* iface, LPCOLESTR data) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(data)); return string_register(This, data, TRUE); } static HRESULT WINAPI Registrar_StringUnregister(IRegistrar* iface, LPCOLESTR data) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(data)); return string_register(This, data, FALSE); } @@ -663,7 +668,7 @@ static HRESULT WINAPI Registrar_StringUnregister(IRegistrar* iface, LPCOLESTR da static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %d %s)\n", iface, debugstr_w(resFileName), nID, debugstr_w(szType)); return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, TRUE); } @@ -671,7 +676,7 @@ static HRESULT WINAPI Registrar_ResourceRegister(IRegistrar* iface, LPCOLESTR re static HRESULT WINAPI Registrar_ResourceUnregister(IRegistrar* iface, LPCOLESTR resFileName, UINT nID, LPCOLESTR szType) { - Registrar *This = (Registrar*)iface; + Registrar *This = impl_from_IRegistrar(iface); TRACE("(%p)->(%s %d %s)\n", This, debugstr_w(resFileName), nID, debugstr_w(szType)); return resource_register(This, resFileName, MAKEINTRESOURCEW(nID), szType, FALSE); } @@ -700,7 +705,7 @@ static HRESULT Registrar_create(const IUnknown *pUnkOuter, REFIID riid, void **p return E_NOINTERFACE; ret = HeapAlloc(GetProcessHeap(), 0, sizeof(Registrar)); - ret->lpVtbl = &RegistrarVtbl; + ret->IRegistrar_iface.lpVtbl = &RegistrarVtbl; ret->ref = 1; ret->rep = NULL; *ppvObject = ret;

1 0

Eric Pouech : kernel32: Properly manage ctrl-Z (and ctrl-D) in ReadFile when dealing with a console handle.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: ead4712606307bf92525e9aad1374a2cc0bc8fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead4712606307bf92525e9aad… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 28 22:10:43 2010 +0100 kernel32: Properly manage ctrl-Z (and ctrl-D) in ReadFile when dealing with a console handle. --- dlls/kernel32/file.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index e32d75d..67c886e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -406,7 +406,23 @@ BOOL WINAPI ReadFile( HANDLE hFile, LPVOID buffer, DWORD bytesToRead, if (!bytesToRead) return TRUE; if (is_console_handle(hFile)) - return ReadConsoleA(hFile, buffer, bytesToRead, bytesRead, NULL); + { + DWORD conread, mode; + if (!ReadConsoleA(hFile, buffer, bytesToRead, &conread, NULL) || + !GetConsoleMode(hFile, &mode)) + return FALSE; + /* ctrl-Z (26) means end of file on window (if at beginning of buffer) + * but Unix uses ctrl-D (4), and ctrl-Z is a bad idea on Unix :-/ + * So map both ctrl-D ctrl-Z to EOF. + */ + if ((mode & ENABLE_PROCESSED_INPUT) && conread > 0 && + (((char*)buffer)[0] == 26 || ((char*)buffer)[0] == 4)) + { + conread = 0; + } + if (bytesRead) *bytesRead = conread; + return TRUE; + } if (overlapped != NULL) {

1 0

Eric Pouech : wineconsole: Move the curses critical section inside the private data.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: ac256c7352bd597c6264faf8ac2ac478c4867635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac256c7352bd597c6264faf8a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Nov 28 22:10:49 2010 +0100 wineconsole: Move the curses critical section inside the private data. --- programs/wineconsole/curses.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 172ac47..f1cab51 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -73,13 +73,12 @@ struct inner_data_curse unsigned long initial_mouse_mask; int sync_pipe[2]; HANDLE input_thread; + CRITICAL_SECTION lock; WINDOW* pad; chtype* line; int allow_scroll; }; -static CRITICAL_SECTION WCCURSES_CritSect; - static void *nc_handle = NULL; #ifdef initscr /* work around Solaris breakage */ @@ -953,7 +952,7 @@ static DWORD CALLBACK input_thread( void *arg ) if (!(pfd[0].revents & POLLIN)) continue; /* we're called from input thread (not main thread), so force unique access */ - EnterCriticalSection(&WCCURSES_CritSect); + EnterCriticalSection(&PRIVATE(data)->lock); if ((inchar = wgetch(stdscr)) != ERR) { WINE_TRACE("Got o%o (0x%x)\n", inchar,inchar); @@ -965,7 +964,7 @@ static DWORD CALLBACK input_thread( void *arg ) if (numEvent) WriteConsoleInputW(data->hConIn, ir, numEvent, &n); } - LeaveCriticalSection(&WCCURSES_CritSect); + LeaveCriticalSection(&PRIVATE(data)->lock); } close( PRIVATE(data)->sync_pipe[0] ); return 0; @@ -986,6 +985,7 @@ static void WCCURSES_DeleteBackend(struct inner_data* data) WaitForSingleObject( PRIVATE(data)->input_thread, INFINITE ); CloseHandle( PRIVATE(data)->input_thread ); } + DeleteCriticalSection(&PRIVATE(data)->lock); delwin(PRIVATE(data)->pad); #ifdef HAVE_MOUSEMASK @@ -1018,9 +1018,9 @@ static int WCCURSES_MainLoop(struct inner_data* data) while (cont && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) { - EnterCriticalSection(&WCCURSES_CritSect); + EnterCriticalSection(&PRIVATE(data)->lock); cont = WINECON_GrabChanges(data); - LeaveCriticalSection(&WCCURSES_CritSect); + LeaveCriticalSection(&PRIVATE(data)->lock); } close( PRIVATE(data)->sync_pipe[1] ); @@ -1103,6 +1103,7 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) PRIVATE(data)->initial_mouse_mask = mm; } #endif + InitializeCriticalSection(&PRIVATE(data)->lock); return init_success; }

1 0

Eryk Wieliczko : msvcp90/tests: Added basic_string<{char, wchar}>. capacity tests.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 5101cfc1a52a9e4b0a0bcc2d45fb9f46b7af8f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5101cfc1a52a9e4b0a0bcc2d4… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sun Nov 28 22:50:44 2010 +0100 msvcp90/tests: Added basic_string<{char, wchar}>.capacity tests. --- dlls/msvcp90/tests/string.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 1a03c44..3147018 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -60,6 +60,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_assign_cstr_len)(const ch static const char* (WINAPI *p_basic_string_char_cstr)(void); static const char* (WINAPI *p_basic_string_char_data)(void); static size_t (WINAPI *p_basic_string_char_size)(void); +static size_t (WINAPI *p_basic_string_char_capacity)(void); static void (WINAPI *p_basic_string_char_swap)(basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, size_t, size_t); @@ -75,6 +76,7 @@ static basic_string_wchar* (WINAPI *p_basic_string_wchar_assign_cstr_len)(const static const wchar_t* (WINAPI *p_basic_string_wchar_cstr)(void); static const wchar_t* (WINAPI *p_basic_string_wchar_data)(void); static size_t (WINAPI *p_basic_string_wchar_size)(void); +static size_t (WINAPI *p_basic_string_wchar_capacity)(void); static void (WINAPI *p_basic_string_wchar_swap)(basic_string_wchar*); #else static basic_string_char* (__cdecl *p_basic_string_char_ctor)(basic_string_char*); @@ -86,6 +88,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_assign_cstr_len)(basic_s static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); static const char* (__cdecl *p_basic_string_char_data)(basic_string_char*); static size_t (__cdecl *p_basic_string_char_size)(basic_string_char*); +static size_t (__cdecl *p_basic_string_char_capacity)(basic_string_char*); static void (__cdecl *p_basic_string_char_swap)(basic_string_char*, basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append)(basic_string_char*, basic_string_char*); static basic_string_char* (WINAPI *p_basic_string_char_append_substr)(basic_string_char*, basic_string_char*, size_t, size_t); @@ -101,6 +104,7 @@ static basic_string_wchar* (__cdecl *p_basic_string_wchar_assign_cstr_len)(basic static const wchar_t* (__cdecl *p_basic_string_wchar_cstr)(basic_string_wchar*); static const wchar_t* (__cdecl *p_basic_string_wchar_data)(basic_string_wchar*); static size_t (__cdecl *p_basic_string_wchar_size)(basic_string_wchar*); +static size_t (__cdecl *p_basic_string_wchar_capacity)(basic_string_wchar*); static void (__cdecl *p_basic_string_wchar_swap)(basic_string_wchar*, basic_string_wchar*); #endif @@ -359,6 +363,8 @@ static BOOL init(void) "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ"); + p_basic_string_char_capacity = (void*)GetProcAddress(msvcp, + "?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ"); p_basic_string_char_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXAEAV12@@Z"); p_basic_string_char_append = (void*)GetProcAddress(msvcp, @@ -388,6 +394,8 @@ static BOOL init(void) "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ"); p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ"); + p_basic_string_wchar_capacity = (void*)GetProcAddress(msvcp, + "?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ"); p_basic_string_wchar_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXAEAV12@@Z"); } else { @@ -409,6 +417,8 @@ static BOOL init(void) "?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ"); + p_basic_string_char_capacity = (void*)GetProcAddress(msvcp, + "?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ"); p_basic_string_char_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXAAV12@@Z"); p_basic_string_char_append = (void*)GetProcAddress(msvcp, @@ -438,6 +448,8 @@ static BOOL init(void) "?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ"); p_basic_string_wchar_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ"); + p_basic_string_wchar_capacity = (void*)GetProcAddress(msvcp, + "?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ"); p_basic_string_wchar_swap = (void*)GetProcAddress(msvcp, "?swap@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXAAV12@@Z"); } @@ -448,13 +460,13 @@ static BOOL init(void) static void test_basic_string_char(void) { basic_string_char str1, str2, *pstr; const char *str; - size_t size; + size_t size, capacity; if(!p_basic_string_char_ctor || !p_basic_string_char_copy_ctor || !p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor || !p_basic_string_char_erase || !p_basic_string_char_assign_cstr_len || !p_basic_string_char_cstr || !p_basic_string_char_data - || !p_basic_string_char_size) { + || !p_basic_string_char_size || !p_basic_string_char_capacity) { win_skip("basic_string<char> unavailable\n"); return; } @@ -477,6 +489,8 @@ static void test_basic_string_char(void) { ok(!memcmp(str, "test", 5), "str = %s\n", str); size = (size_t)call_func1(p_basic_string_char_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_char_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); pstr = call_func2(p_basic_string_char_copy_ctor, &str2, &str1); ok(pstr == &str2, "pstr != &str2\n"); @@ -492,6 +506,8 @@ static void test_basic_string_char(void) { ok(!memcmp(str, "tt", 3), "str = %s\n", str); size = (size_t)call_func1(p_basic_string_char_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_char_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); call_func3(p_basic_string_char_erase, &str2, 1, 100); str = call_func1(p_basic_string_char_cstr, &str2); @@ -500,6 +516,8 @@ static void test_basic_string_char(void) { ok(!memcmp(str, "t", 2), "str = %s\n", str); size = (size_t)call_func1(p_basic_string_char_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_char_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); call_func3(p_basic_string_char_assign_cstr_len, &str2, "test", 4); str = call_func1(p_basic_string_char_cstr, &str2); @@ -631,13 +649,13 @@ static void test_basic_string_wchar(void) { basic_string_wchar str1, str2, *pstr; const wchar_t *str; - size_t size; + size_t size, capacity; if(!p_basic_string_wchar_ctor || !p_basic_string_wchar_copy_ctor || !p_basic_string_wchar_ctor_cstr || !p_basic_string_wchar_dtor || !p_basic_string_wchar_erase || !p_basic_string_wchar_assign_cstr_len || !p_basic_string_wchar_cstr || !p_basic_string_wchar_data - || !p_basic_string_wchar_size) { + || !p_basic_string_wchar_size || !p_basic_string_wchar_capacity) { win_skip("basic_string<wchar_t> unavailable\n"); return; } @@ -660,6 +678,8 @@ static void test_basic_string_wchar(void) { ok(!memcmp(str, test, 5*sizeof(wchar_t)), "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); memset(&str2, 0, sizeof(basic_string_wchar)); pstr = call_func2(p_basic_string_wchar_copy_ctor, &str2, &str1); @@ -676,6 +696,8 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='t' && str[2]=='\0', "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); call_func3(p_basic_string_wchar_erase, &str2, 1, 100); str = call_func1(p_basic_string_wchar_cstr, &str2); @@ -684,6 +706,8 @@ static void test_basic_string_wchar(void) { ok(str[0]=='t' && str[1]=='\0', "str = %s\n", wine_dbgstr_w(str)); size = (size_t)call_func1(p_basic_string_wchar_size, &str1); ok(size == 4, "size = %lu\n", (unsigned long)size); + capacity = (size_t)call_func1(p_basic_string_wchar_capacity, &str1); + ok(capacity >= size, "capacity = %lu < size = %lu\n", (unsigned long)capacity, (unsigned long)size); call_func3(p_basic_string_wchar_assign_cstr_len, &str2, test, 4); str = call_func1(p_basic_string_wchar_cstr, &str2);

1 0

Eryk Wieliczko : msvcp90: Added basic_string<{char, wchar}>. capacity implementation.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: f84243667f3569a4ff827cdc2b6454516fe3250f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84243667f3569a4ff827cdc2… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sun Nov 28 22:50:43 2010 +0100 msvcp90: Added basic_string<{char, wchar}>.capacity implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 8dd5d8a..d0f6ec3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3047,12 +3047,12 @@ @ stub -arch=win64 ?c_str@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAPEBGXZ @ thiscall -arch=win32 ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ(ptr) MSVCP_basic_string_wchar_c_str @ cdecl -arch=win64 ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ(ptr) MSVCP_basic_string_wchar_c_str -@ stub -arch=win32 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ -@ stub -arch=win64 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_char_capacity +@ cdecl -arch=win64 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_char_capacity @ stub -arch=win32 ?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ @ stub -arch=win64 ?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ -@ stub -arch=win32 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ -@ stub -arch=win64 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ(ptr) MSVCP_basic_string_wchar_capacity +@ cdecl -arch=win64 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ(ptr) MSVCP_basic_string_wchar_capacity @ stub ?cerr(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A @ stub ?cin(a)std@@3V?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A @ stub -arch=win32 ?classic(a)locale@std@@SAABV12(a)XZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index b7d0a2e..af95b83 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -700,6 +700,15 @@ const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) return basic_string_char_const_ptr(this); } +/* ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ */ +/* ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_capacity, 4) +size_t __thiscall MSVCP_basic_string_char_capacity(basic_string_char *this) +{ + TRACE("%p\n", this); + return this->res; +} + /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE(a)XZ */ /* ??0?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor, 4) @@ -1096,6 +1105,15 @@ const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *thi return basic_string_wchar_const_ptr(this); } +/* ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ */ +/* ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_capacity, 4) +size_t __thiscall MSVCP_basic_string_wchar_capacity(basic_string_wchar *this) +{ + TRACE("%p\n", this); + return this->res; +} + /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ */ /* ??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_ctor, 4)

1 0

Thomas Mullaly : urlmon: Implemented PARSE_DOCUMENT for CoInternetParseIUri .
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 6a459d1117f50cba9e1ff5651585331f2e00ca5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a459d1117f50cba9e1ff5651… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Nov 28 16:21:00 2010 -0500 urlmon: Implemented PARSE_DOCUMENT for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 10 +++++++++- dlls/urlmon/uri.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index c03e516..706e8b5 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5933,7 +5933,15 @@ static const uri_parse_test uri_parse_tests[] = { {"zip://google.com/",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, {"file:///c:/testing/",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, {"file://server/test",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, - {"zip:test/test",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE} + {"zip:test/test",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, + + /* PARSE_DOCUMENT tests. */ + {"http://test(a)google.com/test?query#frag",0,PARSE_DOCUMENT,0,"http://test(a)google.com/test?query",S_OK,FALSE}, + {"http:testing#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + {"file:///c:/test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + {"zip://google.com/#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + {"zip:test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + {"testing#frag",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOCUMENT,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 475db7f..4247c71 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6265,6 +6265,39 @@ static HRESULT parse_rootdocument(const Uri *uri, LPWSTR output, DWORD output_le return S_OK; } +static HRESULT parse_document(const Uri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + DWORD len = 0; + + /* It has to be a known scheme type, but, it can't be a file + * scheme. It also has to hierarchical. + */ + if(uri->scheme_type == URL_SCHEME_UNKNOWN || + uri->scheme_type == URL_SCHEME_FILE || + uri->authority_start == -1) { + *result_len = 0; + if(output_len < 1) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + output[0] = 0; + return S_OK; + } + + if(uri->fragment_start > -1) + len = uri->fragment_start; + else + len = uri->canon_len; + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + memcpy(output, uri->canon_uri, len*sizeof(WCHAR)); + output[len] = 0; + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6308,6 +6341,15 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_rootdocument(uri, pwzResult, cchResult, pcchResult); break; + case PARSE_DOCUMENT: + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + hr = parse_document(uri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Austin English : tools: Fix install-dev target.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: fcd01fa418e5846a25166f1e0f7a62209ea047f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd01fa418e5846a25166f1e0… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 29 00:15:02 2010 -0800 tools: Fix install-dev target. --- tools/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 7499d4a..c00dfaf 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -70,7 +70,7 @@ install install-lib:: wine.inf $(INSTALLDIRS) $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop -$(UPDATE_DESKTOP_DATABASE) -install install-dev:: $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) +install install-dev:: $(INSTALLDIRS) $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker $(INSTALL_DATA) winemaker.man $(DESTDIR)$(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(INSTALL_DATA) winemaker.de.man $(DESTDIR)$(mandir)/de.UTF-8/man$(prog_manext)/winemaker.$(prog_manext)

1 0

Thomas Mullaly : urlmon: Added implementation for PARSE_ROOTDOCUMENT for CoInternetParseIUri.
by Alexandre Julliard Nov. 29, 2010

Nov. 29, 2010

Module: wine Branch: master Commit: 81c274a5f0acadc09916b461893b198323f6c98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c274a5f0acadc09916b4618… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Nov 28 15:42:16 2010 -0500 urlmon: Added implementation for PARSE_ROOTDOCUMENT for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 10 +++++++- dlls/urlmon/uri.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index dfeed9b..c03e516 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5925,7 +5925,15 @@ static const uri_parse_test uri_parse_tests[] = { /* PARSE_FRIENDLY tests. */ {"http://test(a)google.com/test#test",0,PARSE_FRIENDLY,0,"http://google.com/test#test",S_OK,FALSE}, - {"zip://test(a)google.com/test",0,PARSE_FRIENDLY,0,"zip://test(a)google.com/test",S_OK,FALSE} + {"zip://test(a)google.com/test",0,PARSE_FRIENDLY,0,"zip://test(a)google.com/test",S_OK,FALSE}, + + /* PARSE_ROOTDOCUMENT tests. */ + {"http://google.com:200/test/test",0,PARSE_ROOTDOCUMENT,0,"http://google.com:200/",S_OK,FALSE}, + {"http://google.com",Uri_CREATE_NO_CANONICALIZE,PARSE_ROOTDOCUMENT,0,"http://google.com/",S_OK,FALSE}, + {"zip://google.com/",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, + {"file:///c:/testing/",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, + {"file://server/test",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE}, + {"zip:test/test",0,PARSE_ROOTDOCUMENT,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 64eaba2..475db7f 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6214,6 +6214,57 @@ static HRESULT parse_friendly(IUri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_rootdocument(const Uri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + static const WCHAR colon_slashesW[] = {':','/','/'}; + + WCHAR *ptr; + DWORD len = 0; + + /* Windows only returns the root document if the URI has an authority + * and it's not an unknown scheme type or a file scheme type. + */ + if(uri->authority_start == -1 || + uri->scheme_type == URL_SCHEME_UNKNOWN || + uri->scheme_type == URL_SCHEME_FILE) { + *result_len = 0; + if(!output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + output[0] = 0; + return S_OK; + } + + len = uri->scheme_len+uri->authority_len; + /* For the "://" and '/' which will be added. */ + len += 4; + + if(len+1 > output_len) { + *result_len = len; + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + + ptr = output; + memcpy(ptr, uri->canon_uri+uri->scheme_start, uri->scheme_len*sizeof(WCHAR)); + + /* Add the "://". */ + ptr += uri->scheme_len; + memcpy(ptr, colon_slashesW, sizeof(colon_slashesW)); + + /* Add the authority. */ + ptr += sizeof(colon_slashesW)/sizeof(WCHAR); + memcpy(ptr, uri->canon_uri+uri->authority_start, uri->authority_len*sizeof(WCHAR)); + + /* Add the '/' after the authority. */ + ptr += uri->authority_len; + *ptr = '/'; + ptr[1] = 0; + + *result_len = len; + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6248,6 +6299,15 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_FRIENDLY: hr = parse_friendly(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_ROOTDOCUMENT: + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + hr = parse_rootdocument(uri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0