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

Jörg Höhle : winecfg: Provide trailing \ now required by GetVolumeInformation.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 079074e006f94156807b57cfd5cc14b01609591f URL: http://source.winehq.org/git/wine.git/?a=commit;h=079074e006f94156807b57cfd… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jun 23 09:34:36 2009 +0200 winecfg: Provide trailing \ now required by GetVolumeInformation. --- programs/winecfg/drive.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 1afeced..f536bd6 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -260,7 +260,7 @@ BOOL load_drives(void) { DWORD i, size = 1024; HANDLE mgr; - WCHAR root[] = {'A',':',0}; + WCHAR root[] = {'A',':','\\',0}; if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return FALSE;

1 0

Paul Chitescu : shell32: Completed Romanian translation, fixed minor typos.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: a70e4248a3af3fc7c77af02d8ed8a572f63aaec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70e4248a3af3fc7c77af02d8… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Jun 23 14:12:01 2009 +0300 shell32: Completed Romanian translation, fixed minor typos. --- dlls/shell32/shell32_Ro.rc | 76 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shell32_Ro.rc b/dlls/shell32/shell32_Ro.rc index e1a652e..48a9259 100644 --- a/dlls/shell32/shell32_Ro.rc +++ b/dlls/shell32/shell32_Ro.rc @@ -26,7 +26,7 @@ BEGIN MENUITEM "Pictograme &mari", FCIDM_SHVIEW_BIGICON MENUITEM "Pictograme m&ici", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Detailii", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&Detalii", FCIDM_SHVIEW_REPORTVIEW END /* @@ -41,7 +41,7 @@ BEGIN MENUITEM "Pictograme &mari", FCIDM_SHVIEW_BIGICON MENUITEM "Pictograme m&ici", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Detailii", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&Detalii", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR POPUP "Aranjează &pictogramele" @@ -53,7 +53,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Aranjează automat", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Alinează pictogramele", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Aliniază pictogramele", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Actualizează", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR @@ -106,7 +106,7 @@ BEGIN MENUITEM "Pictograme &mari", FCIDM_SHVIEW_BIGICON MENUITEM "Pictograme m&ici", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Detailii", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&Detalii", FCIDM_SHVIEW_REPORTVIEW END POPUP "&Help" @@ -187,7 +187,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 39, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Renunță", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Navigează...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Navighează...", 12288, 170, 63, 50, 14, WS_TABSTOP } STRINGTABLE @@ -197,7 +197,7 @@ STRINGTABLE IDS_SHV_COLUMN2 "Mărime" IDS_SHV_COLUMN3 "Tip" IDS_SHV_COLUMN4 "Modificat" - IDS_SHV_COLUMN5 "Atributuri" + IDS_SHV_COLUMN5 "Atribute" IDS_SHV_COLUMN6 "Mărime" IDS_SHV_COLUMN7 "Spațiu disponibil" IDS_SHV_COLUMN8 "Nume" @@ -211,29 +211,79 @@ STRINGTABLE IDS_DESKTOP "Birou" IDS_MYCOMPUTER "Computerul meu" IDS_RECYCLEBIN_FOLDER_NAME "Gunoi" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panoul de control" /* context menus */ IDS_VIEW_LARGE "Pictograme &mari" IDS_VIEW_SMALL "Pictograme m&ici" IDS_VIEW_LIST "&Listă" - IDS_VIEW_DETAILS "&Detailii" + IDS_VIEW_DETAILS "&Detalii" IDS_SELECT "Selectează" IDS_OPEN "Deschide" + IDS_CREATEFOLDER_DENIED "Nu se poate crea un nou dosar: Permisiune refuzată." + IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" + IDS_DELETEITEM_CAPTION "Confirmați ștergerea fișierului" + IDS_DELETEFOLDER_CAPTION "Confirmați ștergerea dosarului" + IDS_DELETEITEM_TEXT "Sunteți sigur că vreți să ștergeți '%1'?" + IDS_DELETEMULTIPLE_TEXT "Sunteți sigur că vreți să ștergeți acest %1 elemente?" + IDS_DELETESELECTED_TEXT "Sunteți sigur că vreți să ștergeți elementele selectate?" + IDS_TRASHITEM_TEXT "Sunteți sigur că vreți să trimiteți '%1' la gunoi?" + IDS_TRASHFOLDER_TEXT "Sunteți sigur că vreți să trimiteți '%1' și tot conținutul lui la gunoi?" + IDS_TRASHMULTIPLE_TEXT "Sunteți sigur că vreți să trimiteți aceste %1 elemente la gunoi?" + IDS_CANTTRASH_TEXT "Elementul '%1' nu poate fi trimis la gunoi. Vreți să îl ștergeți?" + IDS_OVERWRITEFILE_TEXT "Acest dosar conține deja un fișier numit '%1'.\n\nVreți să îl înlocuiți?" + IDS_OVERWRITEFILE_CAPTION "Confirmați suprascrierea fișierului" + IDS_OVERWRITEFOLDER_TEXT "Acest dosar conține deja un dosar numit '%1'.\n\n"\ + "Dacă fișierele din dosarul destinație au același nume cu fișierele din dosarul\n"\ + "selectat vor fi înlocuite. Mai vreți să mutați sau să copiați dosarul?" + /* message box strings */ IDS_RESTART_TITLE "Repornire" IDS_RESTART_PROMPT "Vreți să simulați o repornire de Windows?" IDS_SHUTDOWN_TITLE "Oprire" IDS_SHUTDOWN_PROMPT "Vreți să opriți sesiunea de Wine?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Nu se poate afișa caseta de rulare fișier (eroare internă)" + IDS_RUNDLG_BROWSE_ERROR "Nu se poate afișa caseta de navigare (eroare internă)" + IDS_RUNDLG_BROWSE_CAPTION "Navighează" + IDS_RUNDLG_BROWSE_FILTER "Fișiere executabile\0*.exe\0Toate fișierele\0*.*\0\0" + /* shell folder path default values */ - IDS_PROGRAMS "Meniu Start\\Programe" - IDS_PERSONAL "Documentele mele" - IDS_FAVORITES "Favorite" + IDS_PROGRAMS "Meniu Start\\Programe" + IDS_PERSONAL "Documentele mele" + IDS_FAVORITES "Favorite" + IDS_STARTUP "Meniu Start\\Programe\\AutoStart" + IDS_RECENT "Recente" + IDS_SENDTO "SendTo" + IDS_STARTMENU "Meniu Start" + IDS_MYMUSIC "Muzica mea" + IDS_MYVIDEO "Filmele mele" + IDS_DESKTOPDIRECTORY "Desktop" + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "Templates" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "My Pictures" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "Documente" + IDS_ADMINTOOLS "Meniu Start\\Programe\\Scule administrative" + IDS_COMMON_MUSIC "Documente\\Muzica mea" + IDS_COMMON_PICTURES "Documente\\Pozele mele" + IDS_COMMON_VIDEO "Documente\\Filmele mele" + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "Dosar nou" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Panoul de control al Wine" + IDS_CPANEL_NAME "Nume" + IDS_CPANEL_DESCRIPTION "Descriere" } STRINGTABLE

1 0

Stefan Dösinger : wined3d: Fix pixelshader ifc.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: e0ec956b3df219474bdcc4f65f0473887e3cea1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ec956b3df219474bdcc4f65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jun 19 20:47:47 2009 +0200 wined3d: Fix pixelshader ifc. The NVfp2 control flow uses the D3D syntax, and doesn't need the inversed branch condition we're using in the vertex shader. --- dlls/wined3d/arb_program_shader.c | 64 +++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e28f3e..72e438c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2500,6 +2500,38 @@ static void shader_hw_break(const struct wined3d_shader_instruction *ins) } } +static const char *get_compare(COMPARISON_TYPE flags) +{ + switch (flags) + { + case COMPARISON_GT: return "GT"; + case COMPARISON_EQ: return "EQ"; + case COMPARISON_GE: return "GE"; + case COMPARISON_LT: return "LT"; + case COMPARISON_NE: return "NE"; + case COMPARISON_LE: return "LE"; + default: + FIXME("Unrecognized comparison value: %u\n", flags); + return "(\?\?)"; + } +} + +static COMPARISON_TYPE invert_compare(COMPARISON_TYPE flags) +{ + switch (flags) + { + case COMPARISON_GT: return COMPARISON_LE; + case COMPARISON_EQ: return COMPARISON_NE; + case COMPARISON_GE: return COMPARISON_LT; + case COMPARISON_LT: return COMPARISON_GE; + case COMPARISON_NE: return COMPARISON_EQ; + case COMPARISON_LE: return COMPARISON_GT; + default: + FIXME("Unrecognized comparison value: %u\n", flags); + return -1; + } +} + static void shader_hw_breakc(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -2507,24 +2539,11 @@ static void shader_hw_breakc(const struct wined3d_shader_instruction *ins) const struct control_frame *control_frame = find_last_loop(ins->ctx->backend_data); char src_name0[50]; char src_name1[50]; - const char *comp; + const char *comp = get_compare(ins->flags); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name0); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name1); - switch (ins->flags) - { - case COMPARISON_GT: comp = "GT"; break; - case COMPARISON_EQ: comp = "EQ"; break; - case COMPARISON_GE: comp = "GE"; break; - case COMPARISON_LT: comp = "LT"; break; - case COMPARISON_NE: comp = "NE"; break; - case COMPARISON_LE: comp = "LE"; break; - default: - FIXME("Unrecognized comparison value: %u\n", ins->flags); - comp = "(\?\?)"; - } - if(vshader) { /* SUBC CC, src0, src1" works only in pixel shaders, so use TA to throw @@ -2551,30 +2570,19 @@ static void shader_hw_ifc(const struct wined3d_shader_instruction *ins) char src_name1[50]; BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); - /* Invert the flag. We jump to the else label if the condition is NOT true */ - switch(ins->flags) - { - case COMPARISON_GT: comp = "LE"; break; - case COMPARISON_EQ: comp = "NE"; break; - case COMPARISON_GE: comp = "LT"; break; - case COMPARISON_LT: comp = "GE"; break; - case COMPARISON_NE: comp = "EQ"; break; - case COMPARISON_LE: comp = "GT"; break; - default: - FIXME("Unrecognized comparison value: %u\n", ins->flags); - comp = "\?\?"; - } - shader_arb_get_src_param(ins, &ins->src[0], 0, src_name0); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name1); if(vshader) { + /* Invert the flag. We jump to the else label if the condition is NOT true */ + comp = get_compare(invert_compare(ins->flags)); shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "BRA ifc_%u_endif (%s.x);\n", control_frame->ifc_no, comp); } else { + comp = get_compare(ins->flags); shader_addline(buffer, "SUBC TA, %s, %s;\n", src_name0, src_name1); shader_addline(buffer, "IF %s.x;\n", comp); }

1 0

Aric Stewart : wininet: Semi-stub for quering Http INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: c6ae945bf7f9d121eb11736882cc129ac52c5498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ae945bf7f9d121eb1173688… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 23 15:29:00 2009 +0900 wininet: Semi-stub for quering Http INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/http.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2013909..3cdc8a6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1584,6 +1584,23 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; switch(option) { + case INTERNET_OPTION_SECURITY_FLAGS: + { + LPWININETHTTPSESSIONW lpwhs; + lpwhs = req->lpHttpSession; + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE) + *(DWORD*)buffer = SECURITY_FLAG_SECURE; + else + *(DWORD*)buffer = 0; + FIXME("Semi-STUB INTERNET_OPTION_SECURITY_FLAGS: %x\n",*(DWORD*)buffer); + return ERROR_SUCCESS; + } + case INTERNET_OPTION_HANDLE_TYPE: TRACE("INTERNET_OPTION_HANDLE_TYPE\n");

1 0

Alexandre Julliard : wrc: Use an EOF rule instead of lex_destroy for compatibility with prediluvian flex versions .
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 1405c00ecbcf5509c9475759b8230c019070b663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1405c00ecbcf5509c9475759b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 14:48:29 2009 +0200 wrc: Use an EOF rule instead of lex_destroy for compatibility with prediluvian flex versions. --- tools/wrc/parser.h | 1 - tools/wrc/parser.l | 1 + tools/wrc/wrc.c | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/wrc/parser.h b/tools/wrc/parser.h index e9fc8e6..b9e2045 100644 --- a/tools/wrc/parser.h +++ b/tools/wrc/parser.h @@ -34,6 +34,5 @@ extern char *parser_text; extern int yy_flex_debug; int parser_lex(void); -int parser_lex_destroy(void); #endif diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index e706100..d92e973 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -586,6 +586,7 @@ L\" { isprint(*yytext & 0xff) ? *yytext : '.', *yytext, YY_START); } +<<EOF>> current_codepage = -1; yyterminate(); %% /* These dup functions copy the enclosed '\0' from diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 833d602..52267ab 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -284,7 +284,6 @@ static int load_file( const char *input_name, const char *output_name ) ret = parser_parse(); fclose(parser_in); - parser_lex_destroy(); if (temp_name) { unlink( temp_name );

1 0

Paul Chitescu : winecfg: Reordered controls in the About dialog so labels can have accelerators.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 05109761b46b742109c3d116b89854442562a81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05109761b46b742109c3d116b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Jun 23 12:55:29 2009 +0300 winecfg: Reordered controls in the About dialog so labels can have accelerators. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 4 ++-- programs/winecfg/En.rc | 4 ++-- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 4 ++-- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 4 ++-- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Zh.rc | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05109761b46b742109c3d…

1 0

Aric Stewart : wininet: Improve HTTP status 100 handling.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: b9f2f9d2265616286eb7a6271852cfdcc121ae90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f2f9d2265616286eb7a6271… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 23 14:30:38 2009 +0900 wininet: Improve HTTP status 100 handling. --- dlls/wininet/http.c | 42 ++++++++++++++++++++++++++---------------- dlls/wininet/tests/http.c | 19 +++++++++++++++++++ 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6b3fb9a..2013909 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4200,13 +4200,13 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) DWORD buflen = MAX_REPLY_LEN; BOOL bSuccess = FALSE; INT rc = 0; - static const WCHAR szHundred[] = {'1','0','0',0}; char bufferA[MAX_REPLY_LEN]; - LPWSTR status_code, status_text; + LPWSTR status_code = NULL, status_text = NULL; DWORD cchMaxRawHeaders = 1024; LPWSTR lpszRawHeaders = HeapAlloc(GetProcessHeap(), 0, (cchMaxRawHeaders+1)*sizeof(WCHAR)); LPWSTR temp; DWORD cchRawHeaders = 0; + BOOL codeHundred = FALSE; TRACE("-->\n"); @@ -4217,6 +4217,7 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) goto lend; do { + static const WCHAR szHundred[] = {'1','0','0',0}; /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ @@ -4225,23 +4226,32 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) goto lend; rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); + /* check is this a status code line? */ + if (!strncmpW(buffer, g_szHttp1_0, 4)) + { + /* split the version from the status code */ + status_code = strchrW( buffer, ' ' ); + if( !status_code ) + goto lend; + *status_code++=0; - /* split the version from the status code */ - status_code = strchrW( buffer, ' ' ); - if( !status_code ) - goto lend; - *status_code++=0; - - /* split the status code from the status text */ - status_text = strchrW( status_code, ' ' ); - if( !status_text ) - goto lend; - *status_text++=0; + /* split the status code from the status text */ + status_text = strchrW( status_code, ' ' ); + if( !status_text ) + goto lend; + *status_text++=0; - TRACE("version [%s] status code [%s] status text [%s]\n", - debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); + TRACE("version [%s] status code [%s] status text [%s]\n", + debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); - } while (!strcmpW(status_code, szHundred)); /* ignore "100 Continue" responses */ + codeHundred = (!strcmpW(status_code, szHundred)); + } + else if (!codeHundred) + { + FIXME("Non status line at head of response (%s)\n",debugstr_w(buffer)); + continue; + } + } while (codeHundred); /* Add status code */ HTTP_ProcessHeader(lpwhr, szStatus, status_code, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f7994c5..bf6ca02 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1482,9 +1482,18 @@ done: ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } +static const char garbagemsg[] = +"Garbage: Header\r\n"; + static const char contmsg[] = "HTTP/1.1 100 Continue\r\n"; +static const char expandcontmsg[] = +"HTTP/1.1 100 Continue\r\n" +"Server: winecontinue\r\n" +"Tag: something witty\r\n" +"\r\n"; + static const char okmsg[] = "HTTP/1.1 200 OK\r\n" "Server: winetest\r\n" @@ -1710,6 +1719,15 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, page1, sizeof page1-1, 0); last_request = 1; } + if (strstr(buffer, "GET /testF")) + { + send(c, expandcontmsg, sizeof expandcontmsg-1, 0); + send(c, garbagemsg, sizeof garbagemsg-1, 0); + send(c, contmsg, sizeof contmsg-1, 0); + send(c, garbagemsg, sizeof garbagemsg-1, 0); + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2316,6 +2334,7 @@ static void test_http_connection(void) test_basic_request(si.port, "RPC_IN_DATA", "/test5"); test_basic_request(si.port, "RPC_OUT_DATA", "/test5"); test_basic_request(si.port, "GET", "/test6"); + test_basic_request(si.port, "GET", "/testF"); test_connection_header(si.port); test_http1_1(si.port); test_cookie_header(si.port);

1 0

Stefan Dösinger : wined3d: Add a function to control use of NV_vp2 clipplanes.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: e64d48371fcacce83fb0c95b3179b00a81d2ad06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64d48371fcacce83fb0c95b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 22:23:28 2009 +0200 wined3d: Add a function to control use of NV_vp2 clipplanes. I find it helpful for debugging to have this controlled at a central place, without having to disable the entire GL extension or manually find all the places where GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) controls clipplane use. It is useful for debugging the emulation code on NV cards and for debugging mac driver issues. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0e6b307..f0bedd9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -72,6 +72,12 @@ static inline BOOL ffp_clip_emul(IWineD3DStateBlockImpl *stateblock) return stateblock->lowest_disabled_stage < 7; } +/* Returns TRUE if result.clip from GL_NV_vertex_program2 should be used and FALSE otherwise */ +static inline BOOL use_nv_clip(const WineD3D_GL_Info *gl_info) +{ + return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); +} + /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1, * so upload them above that */ @@ -3502,7 +3508,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - if(priv_ctx.target_version >= NV2) + if(use_nv_clip(gl_info) && priv_ctx.target_version >= NV2) { for(i = 0; i < num_clipplanes; i++) { @@ -3781,7 +3787,14 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW else { args->ps_signature = ~0; - args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; + if(dev->vs_clipping) + { + args->boolclip.clip_control[0] = 0; + } + else + { + args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; + } } if(args->boolclip.clip_control[0]) @@ -3809,7 +3822,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW /* Skip if unused or local */ int_skip = ~shader->baseShader.reg_maps.integer_constants | shader->baseShader.reg_maps.local_int_consts; - if(int_skip == 0xffff || GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) + if(int_skip == 0xffff || GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) /* This is about flow control, not clipping */ { memset(&args->loop_ctrl, 0, sizeof(args->loop_ctrl)); return; @@ -4164,7 +4177,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); } - pCaps->VSClipping = GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION); + pCaps->VSClipping = use_nv_clip(gl_info); } static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup)

1 0

Stefan Dösinger : wined3d: Find the clip texcoord before compiling.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 7ffd10da2850eada5634949ed2331cf2556ff33c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffd10da2850eada5634949ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 22:24:19 2009 +0200 wined3d: Find the clip texcoord before compiling. The best is to put this together with the rest of the shader_arb_priv initialization. --- dlls/wined3d/arb_program_shader.c | 93 +++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f0bedd9..bb53455 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3592,6 +3592,42 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, return ret; } +static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps) +{ + struct arb_pshader_private *shader_priv = ps->backend_priv; + int i; + const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)ps->baseShader.device)->adapter->gl_info; + + /* See if we can use fragment.texcoord[7] for clipplane emulation + * + * Don't do this if it is not supported, or fragment.texcoord[7] is used + */ + if(ps->baseShader.reg_maps.shader_version.major < 3) + { + for(i = GL_LIMITS(texture_stages); i > 0; i--) + { + if(!ps->baseShader.reg_maps.texcoord[i - 1]) + { + shader_priv->clipplane_emulation = i; + return; + } + } + WARN("Did not find a free clip reg(2.0)\n"); + } + else + { + for(i = GL_LIMITS(texture_stages); i > 0; i--) + { + if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) + { + shader_priv->clipplane_emulation = i; + return; + } + } + WARN("Did not find a free clip reg(3.0)\n"); + } +} + /* GL locking is done by the caller */ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl *shader, const struct arb_ps_compile_args *args) { @@ -3603,9 +3639,20 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * GLuint ret; if(!shader->backend_priv) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) shader->baseShader.device; + struct shader_arb_priv *priv = device->shader_priv; + shader->backend_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*shader_data)); shader_data = shader->backend_priv; shader_data->clamp_consts = shader->baseShader.reg_maps.shader_version.major == 1; + + if(shader->baseShader.reg_maps.shader_version.major < 3) shader_data->input_signature_idx = ~0; + else shader_data->input_signature_idx = find_input_signature(priv, shader->input_signature); + + shader_data->has_signature_idx = TRUE; + TRACE("Shader got assigned input signature index %u\n", shader_data->input_signature_idx); + + if(!device->vs_clipping) find_clip_texcoord(shader); } shader_data = shader->backend_priv; @@ -3845,39 +3892,6 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW } } -static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps, const WineD3D_GL_Info *gl_info) -{ - struct arb_pshader_private *shader_priv = ps->backend_priv; - int i; - - /* See if we can use fragment.texcoord[7] for clipplane emulation - * - * Don't do this if it is not supported, or fragment.texcoord[7] is used - */ - if(ps->baseShader.reg_maps.shader_version.major < 3) - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if(!ps->baseShader.reg_maps.texcoord[i - 1]) - { - shader_priv->clipplane_emulation = i; - break; - } - } - } - else - { - for(i = GL_LIMITS(texture_stages); i > 0; i--) - { - if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) - { - shader_priv->clipplane_emulation = i; - break; - } - } - } -} - /* GL locking is done by the caller */ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -3889,7 +3903,6 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { if (usePS) { struct arb_ps_compile_args compile_args; struct arb_ps_compiled_shader *compiled; - struct arb_pshader_private *shader_priv; IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) This->stateBlock->pixelShader; TRACE("Using pixel shader %p\n", This->stateBlock->pixelShader); @@ -3898,18 +3911,6 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { priv->current_fprogram_id = compiled->prgId; priv->compiled_fprog = compiled; - shader_priv = ps->backend_priv; - if(!shader_priv->has_signature_idx) - { - if(ps->baseShader.reg_maps.shader_version.major < 3) shader_priv->input_signature_idx = ~0; - else shader_priv->input_signature_idx = find_input_signature(priv, ps->input_signature); - - shader_priv->has_signature_idx = TRUE; - TRACE("Shader got assigned input signature index %u\n", shader_priv->input_signature_idx); - - if(!This->vs_clipping) find_clip_texcoord(ps, gl_info); - } - /* Bind the fragment program */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id);");

1 0

Stefan Dösinger : wined3d: Use a local parameter for the position fixup.
by Alexandre Julliard June 23, 2009

June 23, 2009

Module: wine Branch: master Commit: 444b7ac7e56672be2951cd09173eb673a4c2c127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444b7ac7e56672be2951cd091… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 16:35:05 2009 +0200 wined3d: Use a local parameter for the position fixup. I don't like that I have to do this because the posFixup is in all vertex programs, so its at the same position and could be loaded globally. Unfortunately, there are only 256 env parameters usually, which makes it impossible for any shader to use c256, even if it does not use indirect addressing, and so we can't claim 256 constant support. --- dlls/wined3d/arb_program_shader.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bb53455..3e28f3e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -158,6 +158,7 @@ struct arb_vs_compiled_shader GLuint prgId; UINT int_consts[MAX_CONST_I]; char num_int_consts; + UINT pos_fixup; }; struct recorded_instruction @@ -419,14 +420,16 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock; - const WineD3D_GL_Info *gl_info; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; unsigned char i; struct shader_arb_priv *priv = deviceImpl->shader_priv; const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; + /* Upload the position fixup */ + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, deviceImpl->posFixup)); + if(gl_shader->num_int_consts == 0) return; - gl_info = &deviceImpl->adapter->gl_info; stateBlock = deviceImpl->stateBlock; for(i = 0; i < MAX_CONST_I; i++) @@ -471,9 +474,6 @@ static void shader_arb_load_constants( stateBlock->vertexShaderConstantF, deviceImpl->activeContext->vshader_const_dirty); - /* Upload the position fixup */ - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, ARB_SHADER_PRIVCONST_POS, deviceImpl->posFixup)); - shader_arb_vs_local_constants(deviceImpl); } @@ -581,7 +581,7 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if(ctx->target_version >= NV2) *num_clipplanes = GL_LIMITS(clipplanes); else *num_clipplanes = min(GL_LIMITS(clipplanes), 4); - max_constantsF = GL_LIMITS(vshader_constantsF) - 1; + max_constantsF = GL_LIMITS(vshader_constantsF); } } @@ -3455,7 +3455,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, } /* We need a constant to fixup the final position */ - shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); + shader_addline(buffer, "PARAM posFixup = program.local[%u];\n", next_local); + compiled->pos_fixup = next_local++; /* Initialize output parameters. GL_ARB_vertex_program does not require special initialization values * for output parameters. D3D in theory does not do that either, but some applications depend on a @@ -4154,7 +4155,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF) - 1; + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); } if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {

1 0