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

Jacek Caban : urlmon.idl: Added IBindStatusCallbackEx declaration.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: c907d2bbdc6bf3981763bb99b28b96119f0d4794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c907d2bbdc6bf3981763bb99b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 23 15:08:30 2009 +0200 urlmon.idl: Added IBindStatusCallbackEx declaration. --- include/urlmon.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 13c09be..4e902a2 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -311,6 +311,45 @@ interface IBindStatusCallback : IUnknown } /***************************************************************************** + * IBindStatusCallbackEx interface + */ +[ + object, + uuid(aaa74ef9-8ee7-4659-88d9-f8c504da73cc), + pointer_default(unique) +] +interface IBindStatusCallbackEx : IBindStatusCallback +{ + typedef [unique] IBindStatusCallbackEx *LPBINDSTATUSCALLBACKEX; + + typedef enum { + BINDF2_DISABLEBASICOVERHTTP = 0x00000001, + BINDF2_DISABLEAUTOCOOKIEHANDLING = 0x00000002, + BINDF2_READ_DATA_GREATER_THAN_4GB = 0x00000004, + BINDF2_DISABLE_HTTP_REDIRECT_XSECURITYID = 0x00000008, + BINDF2_RESERVED_3 = 0x20000000, + BINDF2_RESERVED_2 = 0x40000000, + BINDF2_RESERVED_1 = 0x80000000, + } BINDF2; + + [local] + HRESULT GetBindInfoEx( + [out] DWORD *grfBINDF, + [in, out, unique] BINDINFO *pbindinfo, + [out] DWORD *grfBINDF2, + [out] DWORD *pdwReserved); + + [call_as(GetBindInfoEx)] + HRESULT RemoteGetBindInfoEx( + [out] DWORD *grfBINDF, + [in, out, unique] RemBINDINFO *pbindinfo, + [in, out, unique] RemSTGMEDIUM *pstgmed, + [out] DWORD *grfBINDF2, + [out] DWORD *pdwReserved); +} + + +/***************************************************************************** * IAuthenticate interface */ [

1 0

Stefan Dösinger : wined3d: Fix pixelshader ifc.
by Alexandre Julliard 23 Jun '09

23 Jun '09

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: Improve HTTP status 100 handling.
by Alexandre Julliard 23 Jun '09

23 Jun '09

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

Aric Stewart : wininet: Semi-stub for quering Http INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard 23 Jun '09

23 Jun '09

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 23 Jun '09

23 Jun '09

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 23 Jun '09

23 Jun '09

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

Paul Chitescu : shell32: Completed Romanian translation, fixed minor typos.
by Alexandre Julliard 23 Jun '09

23 Jun '09

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

Alexandre Julliard : winebuild: Enforce header size alignment when outputting resources.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 2189b101de0449cbf19a155de73bb8d394065abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2189b101de0449cbf19a155de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 13:25:50 2009 +0200 winebuild: Enforce header size alignment when outputting resources. --- tools/winebuild/res32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 93d9c3c..0aaf2f0 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -577,7 +577,7 @@ void output_res_o_file( DLLSPEC *spec ) unsigned int header_size = get_resource_header_size( &spec->resources[i] ); put_dword( spec->resources[i].data_size ); - put_dword( header_size ); + put_dword( (header_size + 3) & ~3 ); put_string( &spec->resources[i].type ); put_string( &spec->resources[i].name ); if ((unsigned long)file_out_pos & 2) put_word( 0 );

1 0

Ken Sharp : gdiplus: Add GdipIsVisibleRegionPointI stub.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: e096b59ceb394096f31fc8c5f0a0fb9cc8b6c5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e096b59ceb394096f31fc8c5f… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Mon Jun 22 21:59:59 2009 +0100 gdiplus: Add GdipIsVisibleRegionPointI stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 03c9629..b93d5f6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -432,7 +432,7 @@ @ stub GdipIsVisibleRect @ stub GdipIsVisibleRectI @ stub GdipIsVisibleRegionPoint -@ stub GdipIsVisibleRegionPointI +@ stdcall GdipIsVisibleRegionPointI(ptr long long ptr ptr) @ stub GdipIsVisibleRegionRect @ stub GdipIsVisibleRegionRectI @ stdcall GdipLoadImageFromFile(wstr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a9adac1..27cd6fb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3878,3 +3878,12 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 FIXME("(%p %p %d %p %p %p %d %p): stub\n", graphics, text, length, font, brush, positions, flags, matrix); return NotImplemented; } + +/***************************************************************************** + * GdipIsVisibleRegionPointI [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipIsVisibleRegionPointI(GpRegion *region, INT x, INT y, GpGraphics *graphics, BOOL *result) +{ + FIXME("(%p %d %d %p %p): stub\n", region, x, y, graphics, result); + return NotImplemented; +}

1 0

Stefan Dösinger : wined3d: Don' t emulate clipplanes with ffp vp and fix a wrong if condition.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 85af0b2943825cf63666bc9a3eae214ca9a9cff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85af0b2943825cf63666bc9a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 22 16:25:37 2009 +0200 wined3d: Don't emulate clipplanes with ffp vp and fix a wrong if condition. b2f09fd20421d0a5e179b42332ca63bc5ac17d8a accidentally got the device->vs_clipping check wrong. The FFP replacement should emulate clipping if GL can't do this natively with vertex shaders, not the other way. Also don't emulate clipping if we're using fixed function vertex processing because (a) clipping is always supported by GL in this case, and (b), fragment.texcoord[7] is undefined. (Or in the worst case set to something bad by the app). --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/utils.c | 15 +++++++++++---- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 710cf68..0e6b307 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5151,7 +5151,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; const char *final_combiner_src = "ret"; - IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -5242,7 +5241,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi srgb_sub_high, 0.0, 0.0, 0.0); } - if(ffp_clip_emul(stateblock) && device->vs_clipping) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); + if(ffp_clip_emul(stateblock) && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 82d5527..b501bba 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2091,6 +2091,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; for(i = 0; i < GL_LIMITS(texture_stages); i++) { IWineD3DBaseTextureImpl *texture; @@ -2144,8 +2145,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting carg2 = (args[cop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_COLORARG2] : ARG_UNUSED; carg0 = (args[cop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_COLORARG0] : ARG_UNUSED; - if(is_invalid_op(stateblock->wineD3DDevice, i, cop, - carg1, carg2, carg0)) { + if(is_invalid_op(device, i, cop, carg1, carg2, carg0)) { carg0 = ARG_UNUSED; carg2 = ARG_UNUSED; carg1 = WINED3DTA_CURRENT; @@ -2204,8 +2204,7 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } } - if(is_invalid_op(stateblock->wineD3DDevice, i, aop, - aarg1, aarg2, aarg0)) { + if(is_invalid_op(device, i, aop, aarg1, aarg2, aarg0)) { aarg0 = ARG_UNUSED; aarg2 = ARG_UNUSED; aarg1 = WINED3DTA_CURRENT; @@ -2284,6 +2283,14 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting } else { settings->sRGB_write = 0; } + if(device->vs_clipping || !use_vs(stateblock)) { + /* No need to emulate clipplanes if GL supports native vertex shader clipping or if + * the fixed function vertex pipeline is used(which always supports clipplanes) + */ + settings->emul_clipplanes = 0; + } else { + settings->emul_clipplanes = 1; + } } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3bbddd8..afef4af 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1378,8 +1378,9 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[MAX_TEXTURES]; enum fogmode fog; - /* Use an int instead of a char to get dword alignment */ - unsigned int sRGB_write; + /* Use shorts instead of chars to get dword alignment */ + unsigned short sRGB_write; + unsigned short emul_clipplanes; }; struct ffp_frag_desc

1 0