June 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Add a comment about texbem and X2D.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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);

1 0

Aurimas Fišeras : kernel32/nls: Add missing translations for lth.nls.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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�" }

1 0

Jacek Caban : wininet: Move strings to avoid duplications.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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…

1 0

Jacek Caban : wininet: Always set path in HttpOpenRequest.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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)

1 0

Jacek Caban : wininet: Change read_buf type to BYTE.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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;

1 0