wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Jacek Caban : wininet: Store both proxy and destination host in http_request_t.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: c8da35729c89d634cecc6438f2b8ebda9c229e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8da35729c89d634cecc6438f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:38:56 2012 +0100 wininet: Store both proxy and destination host in http_request_t. --- dlls/wininet/http.c | 24 +++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8937a39..1c24153 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1729,8 +1729,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(!new_server) return FALSE; - server_release(request->server); - request->server = new_server; + request->proxy = new_server; TRACE("proxy server=%s port=%d\n", debugstr_w(new_server->name), new_server->port); return TRUE; @@ -1738,7 +1737,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { - server_t *server = request->server; + server_t *server = request->proxy ? request->proxy : request->server; socklen_t addr_len; void *addr; @@ -1829,6 +1828,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) if(request->server) server_release(request->server); + if(request->proxy) + server_release(request->proxy); heap_free(request->path); heap_free(request->verb); @@ -3933,8 +3934,6 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; - appinfo_t *hIC = session->appInfo; - BOOL using_proxy = hIC->proxy && hIC->proxy[0]; WCHAR path[INTERNET_MAX_PATH_LENGTH]; int index; @@ -4020,7 +4019,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) reset_data_stream(request); - if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { + if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; new_server = get_server(hostName, urlComponents.nPort, TRUE); @@ -4084,6 +4083,7 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static DWORD HTTP_SecureProxyConnect(http_request_t *request) { + server_t *server = request->server; LPWSTR lpszPath; LPWSTR requestString; INT len; @@ -4093,12 +4093,11 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) DWORD res; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','u',0}; - http_session_t *session = request->session; TRACE("\n"); - lpszPath = heap_alloc((lstrlenW( session->hostName ) + 13)*sizeof(WCHAR)); - sprintfW( lpszPath, szFormat, session->hostName, session->hostPort ); + lpszPath = heap_alloc((lstrlenW(server->name) + 13)*sizeof(WCHAR)); + sprintfW(lpszPath, szFormat, server->name, server->port); requestString = HTTP_BuildHeaderRequestString( request, szConnect, lpszPath, g_szHttp1_1 ); heap_free( lpszPath ); @@ -4712,12 +4711,15 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) return ERROR_SUCCESS; } + TRACE("connecting to %s, proxy %s\n", debugstr_w(request->server->name), + request->proxy ? debugstr_w(request->proxy->name) : "(null)"); + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->server, request->security_flags, + res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { @@ -4738,7 +4740,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if(request->session->appInfo->proxy) + if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) res = NETCON_secure_connect(request->netconn); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 181ef4c..3873855 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -314,6 +314,7 @@ typedef struct object_header_t hdr; http_session_t *session; server_t *server; + server_t *proxy; LPWSTR path; LPWSTR verb; LPWSTR rawHeaders;

1 0

Alexandre Julliard : user32: Initialize some system parameters in the registry on first run.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 7c2ce566dad0167279f4f2dc0cf416e82785545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2ce566dad0167279f4f2dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 16:52:40 2012 +0100 user32: Initialize some system parameters in the registry on first run. --- dlls/user32/sysparams.c | 249 ++++++++++++++++++++++++++++++++++++----------- tools/wine.inf.in | 19 ---- 2 files changed, 191 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c2ce566dad0167279f4f…

1 0

Alexandre Julliard : user32: Maintain a cache of registry keys for the various parameters.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 9c729720a9d824d1c695e4043b3a562e7c5418bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c729720a9d824d1c695e4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 12:39:43 2012 +0100 user32: Maintain a cache of registry keys for the various parameters. --- dlls/user32/sysparams.c | 86 +++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 47 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e1b8b72..6d10642 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -558,65 +558,44 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) } } - -/*********************************************************************** - * Saves system parameter to user profile. - */ - -/* Save data as-is */ -static BOOL SYSPARAMS_SaveRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, - const void *lpValue, DWORD valueSize, - DWORD type, UINT fWinIni ) +/* retrieve the cached base keys for a given entry */ +static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { - HKEY hKey; - HKEY hBaseKey; - DWORD dwOptions; - BOOL ret = FALSE; + static HKEY base_keys[NB_PARAM_KEYS]; + static HKEY volatile_keys[NB_PARAM_KEYS]; + HKEY key; - if (fWinIni & SPIF_UPDATEINIFILE) - { - hBaseKey = HKEY_CURRENT_USER; - dwOptions = 0; - } - else + if (!base_keys[index] && base_key) { - hBaseKey = get_volatile_regkey(); - dwOptions = REG_OPTION_VOLATILE; + if (RegCreateKeyW( HKEY_CURRENT_USER, parameter_key_names[index], &key )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&base_keys[index], key, 0 )) + RegCloseKey( key ); } - - if (RegCreateKeyExW( hBaseKey, lpRegKey, - 0, 0, dwOptions, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) + if (!volatile_keys[index] && volatile_key) { - if (RegSetValueExW( hKey, lpValName, 0, type, - lpValue, valueSize) == ERROR_SUCCESS) - { - ret = TRUE; - if (hBaseKey == HKEY_CURRENT_USER) - RegDeleteKeyW( get_volatile_regkey(), lpRegKey ); - } - RegCloseKey( hKey ); + if (RegCreateKeyExW( get_volatile_regkey(), parameter_key_names[index], + 0, 0, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &key, 0 )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&volatile_keys[index], key, 0 )) + RegCloseKey( key ); } - return ret; + if (base_key) *base_key = base_keys[index]; + if (volatile_key) *volatile_key = volatile_keys[index]; + return TRUE; } /* load a value to a registry entry */ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) { DWORD type, count = 0; - HKEY key; + HKEY base_key, volatile_key; - if (!RegOpenKeyW( get_volatile_regkey(), parameter_key_names[entry->regval[0]], &key )) - { - count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); - } - if (!count && !RegOpenKeyW( HKEY_CURRENT_USER, parameter_key_names[entry->regval[0]], &key )) + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + + count = size; + if (RegQueryValueExW( volatile_key, entry->regval + 1, NULL, &type, data, &count )) { count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); + if (RegQueryValueExW( base_key, entry->regval + 1, NULL, &type, data, &count )) count = 0; } /* make sure strings are null-terminated */ if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; @@ -628,9 +607,22 @@ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) static BOOL save_entry( const struct sysparam_entry *entry, const void *data, DWORD size, DWORD type, UINT flags ) { - if (!SYSPARAMS_SaveRaw( parameter_key_names[entry->regval[0]], entry->regval + 1, data, size, type, flags )) - return FALSE; - if (entry->mirror) SYSPARAMS_SaveRaw( parameter_key_names[entry->mirror[0]], entry->mirror + 1, data, size, type, flags ); + HKEY base_key, volatile_key; + + if (flags & SPIF_UPDATEINIFILE) + { + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + if (RegSetValueExW( base_key, entry->regval + 1, 0, type, data, size )) return FALSE; + RegDeleteValueW( volatile_key, entry->regval + 1 ); + + if (entry->mirror && get_base_keys( entry->mirror[0], &base_key, NULL )) + RegSetValueExW( base_key, entry->mirror + 1, 0, type, data, size ); + } + else + { + if (!get_base_keys( entry->regval[0], NULL, &volatile_key )) return FALSE; + if (RegSetValueExW( volatile_key, entry->regval + 1, 0, type, data, size )) return FALSE; + } return TRUE; }

1 0

Alexandre Julliard : user32: Define a global list of parameter registry keys and store an index in the value string .
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 2959b312d99400fbf5f6e08e1c23f12bde61e596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2959b312d99400fbf5f6e08e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 12:22:31 2012 +0100 user32: Define a global list of parameter registry keys and store an index in the value string. --- dlls/user32/sysparams.c | 325 +++++++++++++++++++++-------------------------- 1 files changed, 142 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2959b312d99400fbf5f6e…

1 0

Detlef Riekenberg : ktmw32: Add a stub for CommitTransaction.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 6e53b8dd577439560ee9dee934c19706d2c59033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e53b8dd577439560ee9dee93… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 16 01:07:59 2012 +0100 ktmw32: Add a stub for CommitTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index cda7bbd..0d549bf 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -1,6 +1,6 @@ @ stub CommitComplete @ stub CommitEnlistment -@ stub CommitTransaction +@ stdcall CommitTransaction(ptr) @ stub CommitTransactionAsync @ stub CreateEnlistment @ stub CreateResourceManager diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 0650b09..6aee549 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -44,6 +44,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * CommitTransaction (ktmw32.@) + */ +BOOL WINAPI CommitTransaction(HANDLE transaction) +{ + FIXME("(%p): stub\n", transaction); + return TRUE; +} + +/*********************************************************************** * CreateTransaction (ktmw32.@) */ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD options,

1 0

Detlef Riekenberg : ktmw32: Add a stub for CreateTransaction.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: e3df9043e9e8921110ea4e0aeb30a68b6c0b053b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3df9043e9e8921110ea4e0ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 16 01:07:56 2012 +0100 ktmw32: Add a stub for CreateTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index 062f1f2..cda7bbd 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -4,7 +4,7 @@ @ stub CommitTransactionAsync @ stub CreateEnlistment @ stub CreateResourceManager -@ stub CreateTransaction +@ stdcall CreateTransaction(ptr ptr long long long long wstr) @ stub CreateTransactionManager @ stub GetCurrentClockTransactionManager @ stub GetEnlistmentId diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 738b11d..0650b09 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -23,6 +23,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ktmw32); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -39,3 +42,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * CreateTransaction (ktmw32.@) + */ +HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD options, + DWORD level, DWORD flags, DWORD timeout, LPWSTR description) +{ + + FIXME("(%p %p 0x%x 0x%x 0x%x, %u, %s): stub\n", + pattr, pguid, options, level, flags, timeout, debugstr_w(description)); + + return (HANDLE) 1; +}

1 0

Dmitry Timoshkov : fonts: Update 10-pixel and some rarely used 9-pixel cyrillic bitmaps for Tahoma Bold .
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 1a6e9d4a50ec4a1a5464ca9c3bb02921d50eb777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6e9d4a50ec4a1a5464ca9c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 16 16:55:02 2012 +0800 fonts: Update 10-pixel and some rarely used 9-pixel cyrillic bitmaps for Tahoma Bold. --- fonts/tahomabd.sfd | 442 ++++++++++++++++++++++++++------------------------- fonts/tahomabd.ttf | Bin 92720 -> 92804 bytes 2 files changed, 225 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a6e9d4a50ec4a1a5464c…

1 0

Michael Stefaniuc : krnl386.exe16: Use FIELD_OFFSET for the size of structs with varlength arrays.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a5c621d40e83c8dad7261ee484adbad7a06a3ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c621d40e83c8dad7261ee48… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 16 11:15:06 2012 +0100 krnl386.exe16: Use FIELD_OFFSET for the size of structs with varlength arrays. --- dlls/krnl386.exe16/atom.c | 2 +- dlls/krnl386.exe16/task.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/atom.c b/dlls/krnl386.exe16/atom.c index 0c52f1f..a059561 100644 --- a/dlls/krnl386.exe16/atom.c +++ b/dlls/krnl386.exe16/atom.c @@ -163,7 +163,7 @@ WORD WINAPI InitAtomTable16( WORD entries ) /* Allocate the table */ if (!entries) entries = DEFAULT_ATOMTABLE_SIZE; /* sanity check */ - handle = LocalAlloc16( LMEM_FIXED, sizeof(ATOMTABLE) + (entries-1) * sizeof(HANDLE16) ); + handle = LocalAlloc16( LMEM_FIXED, FIELD_OFFSET( ATOMTABLE, entries[entries] )); if (!handle) return 0; table = MapSL( MAKESEGPTR( CURRENT_DS, handle ) ); table->size = entries; diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index b067c81..f3fc56d 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -200,7 +200,7 @@ static SEGPTR TASK_AllocThunk(void) sel = pThunk->next; if (!sel) /* Allocate a new segment */ { - sel = GLOBAL_Alloc( GMEM_FIXED, sizeof(THUNKS) + (MIN_THUNKS-1)*8, + sel = GLOBAL_Alloc( GMEM_FIXED, FIELD_OFFSET( THUNKS, thunks[MIN_THUNKS] ), pTask->hPDB, WINE_LDT_FLAGS_CODE ); if (!sel) return 0; TASK_CreateThunks( sel, 0, MIN_THUNKS );

1 0

Michael Stefaniuc : ws2_32: Avoid using sizeof on structs with variable length array.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 0b02d25f6d915a5a4bc1bc6571f97020399c14ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b02d25f6d915a5a4bc1bc657… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 16 11:11:57 2012 +0100 ws2_32: Avoid using sizeof on structs with variable length array. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5c69d21..ceda75b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1912,7 +1912,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) TRACE("s %ld type %d\n", s, type); - wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); + wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); if ( !wsa ) return WSAEFAULT; @@ -2450,7 +2450,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n FD_WINE_CONNECTED|FD_WINE_LISTENING); /* Indirectly call WSASend */ - if (!(wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ))) + if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )))) { SetLastError(WSAEFAULT); }

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 15bef00d65f3c640a607f7520b9a93fed3c523af URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bef00d65f3c640a607f7520… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:54:27 2012 +0100 msvcp: Sync implementations. --- dlls/msvcp100/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp60/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp70/msvcp70.spec | 4 ++-- dlls/msvcp71/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp71/string.c | 4 ++-- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/string.c | 4 ++-- 10 files changed, 80 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 65749d1..198cc33 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -7778,6 +7779,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@_W@std@@"); diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d6cb46c..85e6107 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2865,6 +2865,6 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index a2a50df..1ad21ae 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -7652,6 +7653,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@_W@std@@"); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 9a64013..8dcf374 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4312,9 +4312,9 @@ @ stub mbrlen # msvcrt.mbrlen @ stub mbrtowc # msvcrt.mbrtowc @ stub mbsrtowcs # msvcrt.mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) @ stub wcrtomb # msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 3d836b2..aa6aa17 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5101,9 +5101,9 @@ @ stub mbrlen @ stub mbrtowc @ stub mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) msvcp90.towctrans @ stub wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) msvcp90.wctrans @ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index de5f7fa..381c21e 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8275,6 +8276,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate@_W@std@@"); diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index c351c44..7ac0eb3 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5161,9 +5161,9 @@ @ stub mbrlen @ stub mbrtowc @ stub mbsrtowcs -@ stub towctrans +@ cdecl towctrans(long long) @ stub wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob -@ stub wctrans +@ cdecl wctrans(str) @ cdecl wctype(str) diff --git a/dlls/msvcp71/string.c b/dlls/msvcp71/string.c index fd3bffa..415e514 100644 --- a/dlls/msvcp71/string.c +++ b/dlls/msvcp71/string.c @@ -565,7 +565,7 @@ MSVCP_bool __thiscall basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEX_NI@Z */ @@ -2256,7 +2256,7 @@ MSVCP_bool __thiscall basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEX_NI@Z */ diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 7946f0c..902b636 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5785,6 +5785,6 @@ @ stub __Stofx @ stub __Stoldx @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) msvcp90.towctrans +@ cdecl wctrans(str) msvcp90.wctrans @ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 838d1b0..a0359a1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -563,7 +563,7 @@ MSVCP_bool __thiscall basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEX_NI@Z */ @@ -2377,7 +2377,7 @@ MSVCP_bool __thiscall basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEX_NI@Z */

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012