wine-commits June 2009

5 participants
1115 discussions

Eric Pouech : winedbg: Pass NULL for some optionals parameters to MinidumpReadDumpStream.

by Alexandre Julliard

Module: wine Branch: master Commit: 277d64bef09735463287db58365ac81e76bdccc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277d64bef09735463287db583… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 30 14:19:26 2009 +0200 winedbg: Pass NULL for some optionals parameters to MinidumpReadDumpStream. --- programs/winedbg/tgt_minidump.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index ec8a5bb..9b40a1c 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -87,13 +87,11 @@ static inline struct tgt_process_minidump_data* private_data(struct dbg_process* static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, void* buffer, SIZE_T len, SIZE_T* rlen) { - ULONG size; - MINIDUMP_DIRECTORY* dir; void* stream; if (!private_data(dbg_curr_process)->mapping) return FALSE; if (MiniDumpReadDumpStream(private_data(dbg_curr_process)->mapping, - MemoryListStream, &dir, &stream, &size)) + MemoryListStream, NULL, &stream, NULL)) { MINIDUMP_MEMORY_LIST* mml = stream; MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; @@ -141,12 +139,10 @@ static BOOL CALLBACK validate_file(PCWSTR name, void* user) static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, MINIDUMP_MODULE* pe_mm) { - ULONG size; - MINIDUMP_DIRECTORY* dir; MINIDUMP_MODULE_LIST* mml; - if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, - (void**)&mml, &size)) + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, NULL, + (void**)&mml, NULL)) { MINIDUMP_MODULE* mm; unsigned i; @@ -163,8 +159,6 @@ static BOOL is_pe_module_embedded(struct tgt_process_minidump_data* data, static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { - ULONG size; - MINIDUMP_DIRECTORY* dir; void* stream; DWORD pid = 1; /* by default */ HANDLE hProc = (HANDLE)0x900DBAAD; @@ -178,7 +172,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) static WCHAR default_exec_name[] = {'<','m','i','n','i','d','u','m','p','-','e','x','e','c','>',0}; /* fetch PID */ - if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, NULL, &stream, NULL)) { MINIDUMP_MISC_INFO* mmi = stream; if (mmi->Flags1 & MINIDUMP_MISC1_PROCESS_ID) @@ -187,7 +181,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) /* fetch executable name (it's normally the first one in module list) */ lstrcpyW(exec_name, default_exec_name); - if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, NULL, &stream, NULL)) { mml = stream; if (mml->NumberOfModules) @@ -210,7 +204,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } - if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, NULL, &stream, NULL)) { MINIDUMP_SYSTEM_INFO* msi = stream; const char *str; @@ -306,7 +300,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) dbg_init(hProc, NULL, FALSE); - if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, NULL, &stream, NULL)) { MINIDUMP_THREAD_LIST* mtl = stream; ULONG i; @@ -318,8 +312,8 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } } /* first load ELF modules, then do the PE ones */ - if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, &dir, - &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, Wine_ElfModuleListStream, NULL, + &stream, NULL)) { WCHAR buffer[MAX_PATH]; @@ -338,7 +332,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } - if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, NULL, &stream, NULL)) { WCHAR buffer[MAX_PATH]; @@ -360,7 +354,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) mm->SizeOfImage, NULL, SLMFLAG_VIRTUAL); } } - if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size)) + if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, NULL, &stream, NULL)) { MINIDUMP_EXCEPTION_STREAM* mes = stream;

14 years, 11 months

Jacek Caban : wininet: Test gzip encoded read.

by Alexandre Julliard

Module: wine Branch: master Commit: ac57ea14f52c7c1c86d04bf77db1f0673430bb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac57ea14f52c7c1c86d04bf77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:35:36 2009 +0200 wininet: Test gzip encoded read. --- dlls/wininet/tests/http.c | 107 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 82 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7e3c08c..326296a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -105,6 +105,35 @@ static CHAR status_string[MAX_INTERNET_STATUS][MAX_STATUS_NAME]; static HANDLE hCompleteEvent; +#define TESTF_REDIRECT 0x01 +#define TESTF_COMPRESSED 0x02 +#define TESTF_ALLOW_COOKIE 0x04 + +typedef struct { + const char *url; + const char *redirected_url; + const char *host; + const char *path; + DWORD flags; +} test_data_t; + +static const test_data_t test_data[] = { + { + "http://test.winehq.org/testredirect", + "http://test.winehq.org/hello.html", + "test.winehq.org", + "/testredirect", + TESTF_REDIRECT + }, + { + "http://www.codeweavers.com/", + "http://www.codeweavers.com/", + "www.codeweavers.com", + "", + TESTF_COMPRESSED|TESTF_ALLOW_COOKIE + } +}; + static INTERNET_STATUS_CALLBACK (WINAPI *pInternetSetStatusCallbackA)(HINTERNET ,INTERNET_STATUS_CALLBACK); @@ -239,7 +268,7 @@ static VOID WINAPI callback( } } -static void InternetReadFile_test(int flags) +static void InternetReadFile_test(int flags, const test_data_t *test) { BOOL res; CHAR buffer[4000]; @@ -250,10 +279,11 @@ static void InternetReadFile_test(int flags) hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); - trace("Starting InternetReadFile test with flags 0x%x\n",flags); + trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); trace("InternetOpenA <--\n"); - hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); + hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", + INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); trace("InternetOpenA -->\n"); @@ -264,7 +294,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("InternetConnectA <--\n"); - hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, + hic=InternetConnectA(hi, test->host, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); trace("InternetConnectA -->\n"); @@ -275,7 +305,7 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", test->path, NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -295,7 +325,7 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://test.winehq.org/testredirect"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, test->url), "Wrong URL %s, expected %s\n", buffer, test->url); length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); @@ -306,6 +336,8 @@ static void InternetReadFile_test(int flags) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + if(test->flags & TESTF_ALLOW_COOKIE) + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); if (first_connection_to_test_url) { SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); @@ -322,12 +354,14 @@ static void InternetReadFile_test(int flags) SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTED_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); - SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, 2); - SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, 2); - SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); - SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + SET_EXPECT2(INTERNET_STATUS_SENDING_REQUEST, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_REQUEST_SENT, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_RECEIVING_RESPONSE, (test->flags & TESTF_REDIRECT) ? 2 : 1); + SET_EXPECT2(INTERNET_STATUS_RESPONSE_RECEIVED, (test->flags & TESTF_REDIRECT) ? 2 : 1); + if(test->flags & TESTF_REDIRECT) { + SET_OPTIONAL2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + SET_OPTIONAL2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + } SET_EXPECT(INTERNET_STATUS_REDIRECT); SET_OPTIONAL(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_OPTIONAL(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -336,9 +370,16 @@ static void InternetReadFile_test(int flags) else SET_WINE_ALLOW(INTERNET_STATUS_REQUEST_COMPLETE); + if(test->flags & TESTF_COMPRESSED) { + BOOL b = TRUE; + + res = InternetSetOption(hor, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + ok(res, "InternetSetOption failed: %08x\n", GetLastError()); + } + trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); - res = HttpSendRequestA(hor, "", -1, NULL, 0); + res = HttpSendRequestA(hor, (test->flags & TESTF_COMPRESSED) ? "Accept-Encoding: gzip, deflate" : "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); @@ -350,6 +391,8 @@ static void InternetReadFile_test(int flags) if (flags & INTERNET_FLAG_ASYNC) WaitForSingleObject(hCompleteEvent, INFINITE); + if(test->flags & TESTF_ALLOW_COOKIE) + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); if (first_connection_to_test_url) { CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); @@ -360,11 +403,12 @@ static void InternetReadFile_test(int flags) CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); } - CHECK_NOTIFIED2(INTERNET_STATUS_SENDING_REQUEST, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, 2); - CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); + CHECK_NOTIFIED2(INTERNET_STATUS_SENDING_REQUEST, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_REQUEST_SENT, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_RECEIVING_RESPONSE, (test->flags & TESTF_REDIRECT) ? 2 : 1); + CHECK_NOTIFIED2(INTERNET_STATUS_RESPONSE_RECEIVED, (test->flags & TESTF_REDIRECT) ? 2 : 1); + if(test->flags & TESTF_REDIRECT) + CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); if (flags & INTERNET_FLAG_ASYNC) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); else @@ -389,16 +433,24 @@ static void InternetReadFile_test(int flags) length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", buffer); + ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); length = 16; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); - trace("Option 0x5 -> %i %s (%u)\n",res,buffer,GetLastError()); + trace("Option HTTP_QUERY_CONTENT_LENGTH -> %i %s (%u)\n",res,buffer,GetLastError()); + if(test->flags & TESTF_COMPRESSED) + ok(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "expected ERROR_HTTP_HEADER_NOT_FOUND, got %x (%u)\n", res, GetLastError()); length = 100; res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; - trace("Option 0x1 -> %i %s\n",res,buffer); + trace("Option HTTP_QUERY_CONTENT_TYPE -> %i %s\n",res,buffer); + + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_ENCODING,buffer,&length,0x0); + buffer[length]=0; + trace("Option HTTP_QUERY_CONTENT_ENCODING -> %i %s\n",res,buffer); SetLastError(0xdeadbeef); res = InternetReadFile(NULL, buffer, 100, &length); @@ -447,8 +499,10 @@ static void InternetReadFile_test(int flags) if (length == 0) break; } - CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); - CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + if(test->flags & TESTF_REDIRECT) { + CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); + CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); + } abort: trace("aborting\n"); SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, (hor != 0x0) + (hic != 0x0)); @@ -2666,8 +2720,11 @@ START_TEST(http) else { init_status_tests(); - InternetReadFile_test(INTERNET_FLAG_ASYNC); - InternetReadFile_test(0); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); + InternetReadFile_test(0, &test_data[0]); + first_connection_to_test_url = TRUE; + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); + InternetReadFile_test(0, &test_data[1]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); test_async_HttpSendRequestEx();

14 years, 11 months

Jacek Caban : wininet: Added support for decompressing gzip encoded content .

by Alexandre Julliard

Module: wine Branch: master Commit: 11ca05f6aea51f20de2baf0c1e73a2e243b0c972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ca05f6aea51f20de2baf0c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:35:13 2009 +0200 wininet: Added support for decompressing gzip encoded content. --- configure | 84 +++++++++++++++++++- configure.ac | 10 ++- dlls/wininet/Makefile.in | 2 +- dlls/wininet/http.c | 197 +++++++++++++++++++++++++++++++++++++++++++--- dlls/wininet/internet.h | 5 + include/config.h.in | 6 ++ 6 files changed, 289 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ca05f6aea51f20de2ba…

14 years, 11 months

Jacek Caban : wininet: Change read_buf type to BYTE.

by Alexandre Julliard

Module: wine Branch: master Commit: 26bbf072aa9ceb9ff10233f7960c89dd9c1645a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bbf072aa9ceb9ff10233f79… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:34:37 2009 +0200 wininet: Change read_buf type to BYTE. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f4b963d..8db3e97 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1697,7 +1697,7 @@ static BOOL read_line( WININETHTTPREQW *req, LPSTR buffer, DWORD *len ) EnterCriticalSection( &req->read_section ); for (;;) { - char *eol = memchr( req->read_buf + req->read_pos, '\n', req->read_size ); + BYTE *eol = memchr( req->read_buf + req->read_pos, '\n', req->read_size ); if (eol) { @@ -1737,7 +1737,7 @@ static BOOL discard_eol( WININETHTTPREQW *req ) { do { - char *eol = memchr( req->read_buf + req->read_pos, '\n', req->read_size ); + BYTE *eol = memchr( req->read_buf + req->read_pos, '\n', req->read_size ); if (eol) { remove_data( req, (eol + 1) - (req->read_buf + req->read_pos) ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c2cb80b..95632bc 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -208,7 +208,7 @@ typedef struct BOOL read_chunked; /* are we reading in chunked mode? */ DWORD read_pos; /* current read position in read_buf */ DWORD read_size; /* valid data size in read_buf */ - char read_buf[4096]; /* buffer for already read but not returned data */ + BYTE read_buf[4096]; /* buffer for already read but not returned data */ } WININETHTTPREQW, *LPWININETHTTPREQW;

14 years, 11 months

Jacek Caban : wininet: Always set path in HttpOpenRequest.

by Alexandre Julliard

Module: wine Branch: master Commit: d1d1da35ca3a55689de3e16a033f31275e3ff844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d1da35ca3a55689de3e16a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:34:25 2009 +0200 wininet: Always set path in HttpOpenRequest. --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bef00e8..f4b963d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2210,6 +2210,10 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(lpszObjectName),rc); strcpyW(lpwhr->lpszPath,lpszObjectName); } + }else { + static const WCHAR slashW[] = {'/',0}; + + lpwhr->lpszPath = WININET_strdupW(slashW); } if (lpszReferrer && *lpszReferrer)

14 years, 11 months

Jacek Caban : wininet: Move strings to avoid duplications.

by Alexandre Julliard

Module: wine Branch: master Commit: 83170893aea849b75ae80c5714f99c3173e3c25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=83170893aea849b75ae80c571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 29 23:34:14 2009 +0200 wininet: Move strings to avoid duplications. --- dlls/wininet/http.c | 135 ++++++++++++++++++++++++-------------------------- 1 files changed, 65 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83170893aea849b75ae80…

14 years, 11 months

Aurimas Fišeras : kernel32/nls: Add missing translations for lth.nls.

by Alexandre Julliard

Module: wine Branch: master Commit: 9ada7fb96683e44d39ae70f8e3367b25a41df9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ada7fb96683e44d39ae70f8e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri May 29 22:49:59 2009 +0300 kernel32/nls: Add missing translations for lth.nls. --- dlls/kernel32/nls/lth.nls | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 9674e85..771b238 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "yyyy 'm.' MMMM" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Vakar� Europos ir JAV" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Centrin�s Europos" + LGRPID_BALTIC+LGRPID_RES_BASE "Balt�" + LGRPID_GREEK+LGRPID_RES_BASE "Graik�" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kirilica" + LGRPID_TURKISH+LGRPID_RES_BASE "Turk�" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�" + LGRPID_KOREAN+LGRPID_RES_BASE "Kor�jie�i�" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Kin� tradicin�" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Kin� supaprastinta" + LGRPID_THAI+LGRPID_RES_BASE "Taj�" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebraj�" + LGRPID_ARABIC+LGRPID_RES_BASE "Arab�" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamie�i�" + LGRPID_INDIC+LGRPID_RES_BASE "Ind�" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruzin�" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�" }

14 years, 11 months

Stefan Dösinger : wined3d: Add a comment about texbem and X2D.

by Alexandre Julliard

Module: wine Branch: master Commit: 38076e08ca0273f5f94634ef27ccacb6c26c09d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38076e08ca0273f5f94634ef2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 17:15:40 2009 +0200 wined3d: Add a comment about texbem and X2D. --- dlls/wined3d/arb_program_shader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0d32bbc..f59ef54 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1399,6 +1399,13 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed * The Tx in which the perturbation map is stored is the tempreg incarnation of the texture register + * + * GL_NV_fragment_program_option could handle this in one instruction via X2D: + * X2D TA.xy, fragment.texcoord, T%u, bumpenvmat%u.xzyw + * + * However, the NV extensions are never enabled for <= 2.0 shaders because of the performance penalty that + * comes with it, and texbem is an 1.x only instruction. No 1.x instruction forces us to enable the NV + * extension. */ shader_addline(buffer, "SWZ TB, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); shader_addline(buffer, "DP3 TA.x, TB, %s;\n", src_reg);

14 years, 11 months

Stefan Dösinger : wined3d: Don' t enable the NV frag extensions if we don't need them.

by Alexandre Julliard

Module: wine Branch: master Commit: de12f880ced7318ba0f8a62946fe0bd292ce66d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de12f880ced7318ba0f8a6294… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 17:11:04 2009 +0200 wined3d: Don't enable the NV frag extensions if we don't need them. Enabling the NV extensions occupies a temp register for some reason. Avoid needlessly enabling it. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a34567..0d32bbc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2058,6 +2058,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; + BOOL want_nv_prog = FALSE; char srgbtmp[4][4]; unsigned int i, found = 0; @@ -2103,14 +2104,38 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, priv_ctx.cur_ps_args = args; list_init(&priv_ctx.if_frames); + /* Avoid enabling NV_fragment_program* if we do not need it. + * + * Enabling GL_NV_fragment_program_option causes the driver to occupy a temporary register, + * and it slows down the shader execution noticeably(about 5%). Usually our instruction emulation + * is faster than what we gain from using higher native instructions. There are some things though + * that cannot be emulated. In that case enable the extensions. + * If the extension is enabled, instruction handlers that support both ways will use it. + * + * Testing shows no performance difference between OPTION NV_fragment_program2 and NV_fragment_program. + * So enable the best we can get. + */ + if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0) + { + want_nv_prog = TRUE; + } + shader_addline(buffer, "!!ARBfp1.0\n"); - if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { + if(want_nv_prog && GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { shader_addline(buffer, "OPTION NV_fragment_program2;\n"); priv_ctx.target_version = NV3; - } else if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { + } else if(want_nv_prog && GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); priv_ctx.target_version = NV2; } else { + if(want_nv_prog) + { + /* This is an error - either we're advertising the wrong shader version, or aren't enforcing some + * limits properly + */ + ERR("The shader requires instructions that are not available in plain GL_ARB_fragment_program\n"); + ERR("Try GLSL\n"); + } priv_ctx.target_version = ARB; } @@ -2131,6 +2156,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } } + /* For now always declare the temps. At least the Nvidia assembler optimizes completely + * unused temps away(but occupies them for the whole shader if they're used once). Always + * declaring them avoids tricky bookkeeping work + */ shader_addline(buffer, "TEMP TA;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TB;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TC;\n"); /* Used for modifiers */ @@ -2227,6 +2256,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); + /* Always enable the NV extension if available. Unlike fragment shaders, there is no + * mesurable performance penalty, and we can always make use of it for clipplanes. + */ if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { shader_addline(buffer, "OPTION NV_vertex_program2;\n"); priv_ctx.target_version = NV2; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9dcdbe6..1a34fa2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -683,6 +683,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usesdsy = 1; } + else if (ins.handler_idx == WINED3DSIH_DSX) + { + reg_maps->usesdsx = 1; + } else if(ins.handler_idx == WINED3DSIH_TEXLDD) { reg_maps->usestexldd = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7bff8..f217366 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,7 +632,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy, usestexldd, usesmova; + char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

14 years, 11 months

Stefan Dösinger : wined3d: Write result. color in one mov.

by Alexandre Julliard

Module: wine Branch: master Commit: 5a07bacd364c826171d3952070935bb77ca9eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a07bacd364c826171d395207… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 16:03:55 2009 +0200 wined3d: Write result.color in one mov. Otherwise the Nvidia assembler needs one temp reg. --- dlls/wined3d/arb_program_shader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0f739b7..2a34567 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2033,9 +2033,15 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); + shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); + shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); + /* Move everything into result.color at once. Nvidia hardware cannot handle partial + * result.color writes(.rgb first, then .a), or handle overwriting already written + * components. The assembler uses a temporary register in this case, which is usually + * not allocated from one of our registers that were used earlier. + */ + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } @@ -2164,7 +2170,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3]); - shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } @@ -3623,7 +3628,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); - shader_addline(&buffer, "MOV result.color.w, ret.w;\n"); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); }

14 years, 11 months

Jump to page:

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 June 2009