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

Piotr Caban : msvcp90: Added wctrans and towctrans tests.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a497d36a62637cb022ed02e36e1bc4a09c2947da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a497d36a62637cb022ed02e36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:47 2012 +0100 msvcp90: Added wctrans and towctrans tests. --- dlls/msvcp90/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 5188fd5..2cb7380 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <locale.h> +#include <wctype.h> #include <windef.h> #include <winbase.h> @@ -66,6 +67,8 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static wctrans_t (__cdecl *p_wctrans)(const char*); +static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); #undef __thiscall #ifdef __i386__ @@ -188,6 +191,8 @@ static BOOL init(void) SET(p_wctype, "wctype"); SET(p__Getctype, "_Getctype"); SET(p__Getcoll, "_Getcoll"); + SET(p_wctrans, "wctrans"); + SET(p_towctrans, "towctrans"); SET(basic_ostringstream_char_vbtable, "??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAEADAEBD@Z"); @@ -440,6 +445,37 @@ static void test__Getcoll(void) ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); } +static void test_towctrans(void) +{ + wchar_t ret; + + ret = p_wctrans("tolower"); + ok(ret == 2, "wctrans returned %d, expected 2\n", ret); + ret = p_wctrans("toupper"); + ok(ret == 1, "wctrans returned %d, expected 1\n", ret); + ret = p_wctrans("toLower"); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + ret = p_wctrans(""); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + if(0) { /* crashes on windows */ + ret = p_wctrans(NULL); + ok(ret == 0, "wctrans returned %d, expected 0\n", ret); + } + + ret = p_towctrans('t', 2); + ok(ret == 't', "towctrans('t', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 2); + ok(ret == 't', "towctrans('T', 2) returned %c, expected t\n", ret); + ret = p_towctrans('T', 0); + ok(ret == 't', "towctrans('T', 0) returned %c, expected t\n", ret); + ret = p_towctrans('T', 3); + ok(ret == 't', "towctrans('T', 3) returned %c, expected t\n", ret); + ret = p_towctrans('t', 1); + ok(ret == 'T', "towctrans('t', 1) returned %c, expected T\n", ret); + ret = p_towctrans('T', 1); + ok(ret == 'T', "towctrans('T', 1) returned %c, expected T\n", ret); +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -525,6 +561,7 @@ START_TEST(misc) test_wctype(); test__Getctype(); test__Getcoll(); + test_towctrans(); test_virtual_call(); test_virtual_base_dtors();

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans implementation.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: a71acb30764077e376d7c489994f2245308fe9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71acb30764077e376d7c4899… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:37 2012 +0100 msvcp90: Added wctrans and towctrans implementation. --- dlls/msvcp90/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- include/msvcrt/wctype.h | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 31beeee..c3f48d9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8541,6 +8542,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/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 742f162..e512acb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5807,8 +5807,8 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) #Functions not exported in native dll: diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index d6bed60..81c2e22 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -68,6 +68,11 @@ wchar_t __cdecl towlower(wchar_t); wchar_t __cdecl towupper(wchar_t); #endif /* _WCTYPE_DEFINED */ +typedef wchar_t wctrans_t; +wint_t __cdecl towctrans(wint_t,wctrans_t); +wctrans_t __cdecl wctrans(const char *); +wctype_t __cdecl wctype(const char *); + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcp80: Forward functions that are using String_iterators to msvcp90.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 965543acff6ec3c939385561589e95bd802eada5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965543acff6ec3c9393855615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:09 2012 +0100 msvcp80: Forward functions that are using String_iterators to msvcp90. --- dlls/msvcp80/msvcp80.spec | 132 ++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965543acff6ec3c939385…

1 0

Huw Davies : winspool: Pre-1. 6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 02d41b7b1a605dfbb42f2d13225dc05549bf61f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d41b7b1a605dfbb42f2d132… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 16 09:53:14 2012 +0000 winspool: Pre-1.6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards. --- dlls/winspool.drv/info.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af336cb..172f892 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -833,11 +833,14 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, unix_name, strlen( unix_name ) + 1 ); + + if (http_status != HTTP_OK) unlink( unix_name ); HeapFree( GetProcessHeap(), 0, unix_name ); if (http_status == HTTP_OK) return TRUE; - TRACE( "failed to get ppd for printer %s from cups, calling fallback\n", debugstr_a(printer_name) ); + TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", + debugstr_a(printer_name), http_status ); return get_fallback_ppd( printer_name, ppd ); }

1 0

Jacek Caban : cmd: Added HeapFree wrapper.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 08c17ada571c359d018079eae560b731495bbfdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c17ada571c359d018079eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 10:37:39 2012 +0100 cmd: Added HeapFree wrapper. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 38 +++++++++++++++++++------------------- programs/cmd/directory.c | 20 ++++++++++---------- programs/cmd/wcmd.h | 5 +++++ programs/cmd/wcmdmain.c | 36 ++++++++++++++++++------------------ 5 files changed, 55 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c17ada571c359d01807…

1 0

Austin English : secur32: Get rid of deprecated types.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 62e77128c57d33d0d42a956e87b8ee251a31848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e77128c57d33d0d42a956e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 15 19:53:36 2012 -0800 secur32: Get rid of deprecated types. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 16ce0de..bb481b7 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -129,7 +129,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials)cred); + (gnutls_certificate_credentials_t)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -409,7 +409,7 @@ BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credential void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); + pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); } static void schan_gnutls_log(int level, const char *msg)

1 0

Henri Verbeet : d3d9/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: b52118d53dca8da5d64ee211425ca9317692a627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52118d53dca8da5d64ee2114… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:54 2012 +0100 d3d9/tests: Also test that render states get reset in test_reset(). --- dlls/d3d9/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 614538a..fd3fd30 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -876,6 +876,7 @@ static void test_reset(void) IDirect3DDevice9 *device1 = NULL; IDirect3DDevice9 *device2 = NULL; D3DCAPS9 caps; + DWORD value; struct { UINT w; @@ -976,6 +977,12 @@ static void test_reset(void) hr = IDirect3DDevice9_SetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice9_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -987,6 +994,10 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); + hr = IDirect3DDevice9_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + ZeroMemory(&vp, sizeof(vp)); hr = IDirect3DDevice9_GetViewport(device1, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr);

1 0

Henri Verbeet : d3d8/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: f94f753e51ffc2362fa013cb46326cdf7a87514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f753e51ffc2362fa013cb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:53 2012 +0100 d3d8/tests: Also test that render states get reset in test_reset(). --- dlls/d3d8/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b98a84a..e41aeb3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1022,6 +1022,7 @@ static void test_reset(void) D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; + DWORD value; HRESULT hr; UINT i; @@ -1141,6 +1142,12 @@ static void test_reset(void) hr = IDirect3DDevice8_SetViewport(device1, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice8_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -1152,6 +1159,10 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Make state_geometry_shader() static.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: ffd892f6ddf021253e3d01df71a9c9c75a34571b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd892f6ddf021253e3d01df7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:52 2012 +0100 wined3d: Make state_geometry_shader() static. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2376527..9b5d875 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3760,7 +3760,7 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->load_constants = 1; } -void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { context->select_shader = 1; }

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D3.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: ea4ae09c863264ad82d392cc3b55291a32d58cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea4ae09c863264ad82d392cc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:51 2012 +0100 ddraw: Avoid LPDIRECT3D3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d321846..f1b9e2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1155,7 +1155,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D3 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D3 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport3 **viewport) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D7.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 0fa127b1fabee80a179508a21e83a95420697c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa127b1fabee80a179508a21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:50 2012 +0100 ddraw: Avoid LPDIRECT3D7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 73317a8..6f4416c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -30,7 +30,7 @@ #include "unknwn.h" static IDirectDraw7 *lpDD; -static LPDIRECT3D7 lpD3D = NULL; +static IDirect3D7 *lpD3D; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static IDirect3DDevice7 *lpD3DDevice; diff --git a/include/d3d.h b/include/d3d.h index 4f1ffba..d321846 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D7 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;

1 0

Christian Inci : wined3d: Add support for nVidia GT 640M.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 83ed5efb31ea142a44d5649c81c6dec63aa0fa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ed5efb31ea142a44d5649c8… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Wed Nov 14 03:46:46 2012 +0100 wined3d: Add support for nVidia GT 640M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6060a48..58dc0da 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1110,6 +1110,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1512,6 +1513,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ + {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e026f74..ec7c3bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1434,6 +1434,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, + CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Marcus Meissner : wininet: Move freeing netconn into create_netconn_socket (Coverity).
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 02a80554f833a86851bccd80b0ca21246d4cba05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a80554f833a86851bccd80b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 14 19:59:31 2012 +0100 wininet: Move freeing netconn into create_netconn_socket (Coverity). --- dlls/wininet/netconnection.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b746b54..2abb676 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -655,7 +655,6 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socketFD); - heap_free(netconn); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -674,10 +673,8 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t ioctlsocket(netconn->socketFD, FIONBIO, &flag); } } - if(result == -1) { - heap_free(netconn); + if(result == -1) return sock_get_error(errno); - } #ifdef TCP_NODELAY flag = 1; @@ -717,9 +714,13 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m list_init(&netconn->pool_entry); result = create_netconn_socket(server, netconn, timeout); + if (result != ERROR_SUCCESS) { + heap_free(netconn); + return result; + } + server_addref(server); netconn->server = server; - *ret = netconn; return result; }

1 0

Piotr Caban : urlmon: Update reference counter in bsc_from_bctx.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: c29c639cce45ee5967f14bc9ff240c726ad1a1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29c639cce45ee5967f14bc9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 15 15:51:08 2012 +0100 urlmon: Update reference counter in bsc_from_bctx. --- dlls/urlmon/bindctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 00f6844..b2d2776 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -83,6 +83,7 @@ IBindStatusCallback *bsc_from_bctx(IBindCtx *bctx) if(holder->callback) { IBindStatusCallback_Release(bsc); bsc = holder->callback; + IBindStatusCallback_AddRef(bsc); } IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface);

1 0

Hans Leidekker : advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: bff64e8578d54fa27ee9667d70812c72b8db4d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff64e8578d54fa27ee9667d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:12:22 2012 +0100 advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW. Spotted by Stefan Leichter. --- dlls/advapi32/cred.c | 7 +++++-- dlls/advapi32/tests/cred.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b2597b6..b735821 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <time.h> +#include <limits.h> #ifdef __APPLE__ # include <Security/SecKeychain.h> @@ -2102,7 +2103,7 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) */ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) { - unsigned int len, buflen, size; + unsigned int len, buflen; TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); @@ -2134,8 +2135,10 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; + ULONGLONG size = 0; - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) + if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || + !size || size % sizeof(WCHAR) || size > INT_MAX) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3d37a3c..83212c5 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -670,6 +670,14 @@ static void test_CredUnmarshalCredentialA(void) ok( username->UserName != NULL, "UserName is NULL\n" ); ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } static void test_CredIsMarshaledCredentialA(void)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
29
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