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

Henri Verbeet : wined3d: Recognize geometry shaders in shader_trace_init().
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: ca69ec0e852a6f2e877f1c93d7a37d6f857bf9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca69ec0e852a6f2e877f1c93d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:16 2009 +0200 wined3d: Recognize geometry shaders in shader_trace_init(). --- dlls/wined3d/baseshader.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 45463f0..63a9e96 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1138,14 +1138,34 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, { struct wined3d_shader_version shader_version; const DWORD* pToken = pFunction; + const char *type_prefix; DWORD i; TRACE("Parsing %p\n", pFunction); fe->shader_read_header(fe_data, &pToken, &shader_version); - TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version.type) ? "ps": "vs", - shader_version.major, shader_version.minor); + switch (shader_version.type) + { + case WINED3D_SHADER_TYPE_VERTEX: + type_prefix = "vs"; + break; + + case WINED3D_SHADER_TYPE_GEOMETRY: + type_prefix = "gs"; + break; + + case WINED3D_SHADER_TYPE_PIXEL: + type_prefix = "ps"; + break; + + default: + FIXME("Unhandled shader type %#x.\n", shader_version.type); + type_prefix = "unknown"; + break; + } + + TRACE("%s_%u_%u\n", type_prefix, shader_version.major, shader_version.minor); while (!fe->shader_is_end(fe_data, &pToken)) {

1 0

Henri Verbeet : wined3d: Try to activate the original context for queries.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 50419daa11b921237a0203e713450b7776ea3463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50419daa11b921237a0203e71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:17 2009 +0200 wined3d: Try to activate the original context for queries. --- dlls/wined3d/query.c | 166 +++++++++++++++++++++++++++++++------------------- 1 files changed, 103 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50419daa11b921237a020…

1 0

Henri Verbeet : wined3d: Move the driver_quirk structure to directx.c.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: c475789bb60b7e702d91b257bfa878f1a89b10e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c475789bb60b7e702d91b257b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:18 2009 +0200 wined3d: Move the driver_quirk structure to directx.c. --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1512a31..eda6854 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4203,6 +4203,13 @@ static void quirk_clip_varying(WineD3D_GL_Info *gl_info) { gl_info->glsl_clip_varying = TRUE; } +struct driver_quirk +{ + BOOL (*match)(const WineD3D_GL_Info *gl_info); + void (*apply)(WineD3D_GL_Info *gl_info); + const char *description; +}; + struct driver_quirk quirk_table[] = { { match_ati_r300_to_500, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9f508a8..2d3cc3a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4016,10 +4016,4 @@ typedef struct _WineD3D_GL_Info { } WineD3D_GL_Info; #undef USE_GL_FUNC -struct driver_quirk { - BOOL (*match)(const WineD3D_GL_Info *gl_info); - void (*apply)(WineD3D_GL_Info *gl_info); - const char *description; -}; - #endif /* __WINE_WINED3D_GL */

1 0

Vincent Povirk : gdiplus: Don' t crash when a NULL format is passed to GdipDrawString.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 9fceef33b7d4a0ab88a60af1e8211f83175179d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fceef33b7d4a0ab88a60af1e… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Tue Jun 30 09:23:07 2009 -0500 gdiplus: Don't crash when a NULL format is passed to GdipDrawString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2be64c7..3525743 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2239,7 +2239,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string length = j; - if (format->align == StringAlignmentNear) + if (!format || format->align == StringAlignmentNear) { drawbase.x = corners[0].x; drawbase.y = corners[0].y;

1 0

Rein Klazes : comdlg32: Fix resizing of the file dialog browser that keeps returning to its original size .
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 163914380e1569bf585834e2c4da91ba9e70bf72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163914380e1569bf585834e2c… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jun 30 16:30:45 2009 +0200 comdlg32: Fix resizing of the file dialog browser that keeps returning to its original size. --- dlls/comdlg32/filedlg.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6f89697..e2d6a30 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1051,6 +1051,13 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } + else if( GetDlgCtrlID( ctrl) == IDC_SHELLSTATIC) + { + DeferWindowPos( hdwp, ctrl, NULL, 0, 0, + rc.right - rc.left + chgx, + rc.bottom - rc.top + chgy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + } else if( rc.top > rcview.bottom) { /* if it was below the shell view

1 0

Vladimir Pankratov : shell32: Fix RunFileDialog to close after starting apps.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 6384eb0aec73275b9ff2e838577de7d11573b4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6384eb0aec73275b9ff2e8385… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 30 20:43:41 2009 +0500 shell32: Fix RunFileDialog to close after starting apps. --- dlls/shell32/dialogs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index ac6bf21..0d8dbac 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -230,13 +230,13 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR else sei.lpDirectory = parent = RunDlg_GetParentDir(sei.lpFile); - if (ShellExecuteExW( &sei ) < 33) - { + if (!ShellExecuteExW( &sei )) + { HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, parent); SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ; return TRUE ; - } + } /* FillList is still ANSI */ GetWindowTextA (htxt, (LPSTR)psz, ic + 1) ; @@ -244,7 +244,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, parent); - EndDialog (hwnd, 0) ; + EndDialog (hwnd, 0); } }

1 0

Aurimas Fišeras : comdlg32: Improve Lithuanian translation.
by Alexandre Julliard 01 Jul '09

01 Jul '09

Module: wine Branch: master Commit: 892214aec302c3c65f3bc2a737d551c8f3a66eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892214aec302c3c65f3bc2a73… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 30 18:26:18 2009 +0300 comdlg32: Improve Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 48 ++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/comdlg32/cdlg_Lt.rc b/dlls/comdlg32/cdlg_Lt.rc index 1610413..f6e8a1a 100644 --- a/dlls/comdlg32/cdlg_Lt.rc +++ b/dlls/comdlg32/cdlg_Lt.rc @@ -76,14 +76,14 @@ FONT 8, "MS Shell Dlg" { LTEXT "Spausdintuvas:", 1088, 6, 6, 50, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Spausdinimo intervalas", grp1, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Spausdinimo rėžis", grp1, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Viskas", rad1, 16, 45, 60, 12 RADIOBUTTON "Pažymėtas &tekstas", rad2, 16, 60, 76, 12 RADIOBUTTON "&Puslapiai", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "Spausdinti", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Nuostatos", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "&nuo:", 1090, 60, 80, 30, 9 + LTEXT "n&uo:", 1090, 60, 80, 30, 9 LTEXT "&iki:", 1091, 120, 80, 30, 9 LTEXT "Spausdinimo &kokybė:", 1092, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP @@ -144,7 +144,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Pavyzdys",grp2,98,72,120,36,WS_GROUP CTEXT "AaĄąZzŽž",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Sim&bolių rinkinys:",stc7 ,98,114,60,9 + LTEXT "Si&mbolių rinkinys:",stc7 ,98,114,60,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -156,11 +156,11 @@ CAPTION "Spalva" FONT 8, "MS Shell Dlg" { LTEXT "&Pagrindinės spalvos:", 1088, 4, 4, 140, 10 - LTEXT "&Individualios spalvos:", 1089, 4, 106, 140, 10 + LTEXT "Pr&itaikytos spalvos:", 1089, 4, 106, 140, 10 LTEXT "Spal. | Vient.", 1090, 150, 151, 48, 10 LTEXT "&Raudona:", 726 /*1094*/,243,126,32,10 EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Žalia:",727/*1095*/,243,140,24,10 + LTEXT "Ža&lia:",727/*1095*/,243,140,24,10 EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Mėlyna:",728 /*1096*/,243,154,24,10 EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP @@ -178,8 +178,8 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "Gerai", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Žinynas", pshHelp,100,166, 44, 14 - PUSHBUTTON "&Įdėti prie individualių spalvų", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&pibrėžti individualias spalvas >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Įdėti prie pritaikytų spalvų", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Api&brėžti pritaikytas spalvas >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Skirti raidžių &dydį", chx2, 4, 42, 70, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Kryptis", grp1, 89, 26, 86, 28 CONTROL "&Aukštyn", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 93, 38, 40, 12 - CONTROL "&Žemyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 134, 38, 36, 12 + CONTROL "Ž&emyn", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 134, 38, 36, 12 DEFPUSHBUTTON "Ieškoti &kito", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Atsisakyti", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "Ko &ieškoti:", -1, 4, 9, 48, 8 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Kuo pa&keisti:", -1, 4, 26, 48, 8 + LTEXT "Kuo pak&eisti:", -1, 4, 26, 48, 8 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Tenkina tik &visas žodis", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Skirti raidžių &dydį", chx2, 5, 62, 70, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -253,7 +253,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Su&dėst.", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "Intervalas", grp1, 8,92, 144,64, WS_GROUP + GROUPBOX "Rėžis", grp1, 8,92, 144,64, WS_GROUP CONTROL "V&isi puslapiai", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Pu&slapiai", rad3,"Button",BS_AUTORADIOBUTTON,16,122,40,12 CONTROL "Pažymėtas &tekstas", rad2,"Button",BS_AUTORADIOBUTTON,16,138,72,12 @@ -309,7 +309,7 @@ BEGIN GROUPBOX "Popierius", grp2, 8, 96, 224, 56, BS_GROUPBOX LTEXT "&Dydis:", stc2, 16, 112, 36, 8 COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "Dė&klas:", stc3, 16, 132, 36, 8 + LTEXT "Dėk&las:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Padėtis", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Stačias", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON @@ -339,7 +339,7 @@ FONT 8, "MS Shell Dlg" LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - LTEXT "Failo &vardas:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + LTEXT "&Failo vardas:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "Failų &tipai:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY @@ -392,20 +392,18 @@ STRINGTABLE DISCARDABLE PD32_PRINT_TITLE "Spausdinti" PD32_VALUE_UREADABLE "Neperskaitomas įrašas" - PD32_INVALID_PAGE_RANGE "Ši reikšmė nepatenka į puslapių intervalą.\n\ -Prašome įvesti reikšmę tarp %d ir %d." - PD32_FROM_NOT_ABOVE_TO "'Nuo' reikšmė negali viršyti \ -'iki' reikšmės." - PD32_MARGINS_OVERLAP "Paraštės persidengia arba išeina už \ -popieriaus ribų.\nPrašome įvesti paraštes iš naujo." - PD32_NR_OF_COPIES_EMPTY "Skaitinė 'Kopijų skaičius' \ -reikšmė negali būti tuščia." - PD32_TOO_LARGE_COPIES "Toks didelis kopijų skaičius yra \ -nepalaikomas jūsų spausdintuvo.\nPrašome įvesti reikšmę tarp 1 ir %d." + PD32_INVALID_PAGE_RANGE "Ši reikšmė nepatenka į puslapių rėžį.\n\ + Prašome įvesti reikšmę tarp %d ir %d." + PD32_FROM_NOT_ABOVE_TO "„Nuo“ reikšmė negali viršyti „iki“ reikšmės." + PD32_MARGINS_OVERLAP "Paraštės persidengia arba išeina už popieriaus ribų.\n\ + Prašome įvesti paraštes iš naujo." + PD32_NR_OF_COPIES_EMPTY "Skaitinė „kopijų skaičius“ reikšmė negali būti tuščia." + PD32_TOO_LARGE_COPIES "Toks didelis kopijų skaičius yra nepalaikomas jūsų spausdintuvo.\n\ + Prašome įvesti reikšmę tarp 1 ir %d." PD32_PRINT_ERROR "Įvyko spausdintuvo klaida." PD32_NO_DEFAULT_PRINTER "Nenurodytas pagrindinis spausdintuvas." PD32_CANT_FIND_PRINTER "Nepavyko rasti spausdintuvo." - PD32_OUT_OF_MEMORY "Baigėsi atmintis." + PD32_OUT_OF_MEMORY "Trūksta atminties." PD32_GENERIC_ERROR "Įvyko klaida." PD32_DRIVER_UNKNOWN "Nežinoma spausdintuvo tvarkyklė." PD32_NO_DEVICES "Prieš atlikdami su spausdintuvu susijusius veiksmus, \ @@ -440,7 +438,7 @@ Prašome įdeigti spausdintuvą ir pakartoti." PD32_PRINTER_STATUS_NO_TONER "Nėra dažų; " PD32_PRINTER_STATUS_PAGE_PUNT "Puslapis perkrautas; " PD32_PRINTER_STATUS_USER_INTERVENTION "Pertraukta naudotojo; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "Baigėsi atmintis; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Trūksta atminties; " PD32_PRINTER_STATUS_DOOR_OPEN "Spausdintuvo durelės atidarytos; " PD32_PRINTER_STATUS_SERVER_UNKNOWN "Spausdinimo serveris nežinomas; " PD32_PRINTER_STATUS_POWER_SAVE "Energijos taupymo režimas; " @@ -470,7 +468,7 @@ STRINGTABLE DISCARDABLE /* Color names */ IDS_COLOR_YELLOW "Geltona" IDS_COLOR_BLUE "Mėlyna" IDS_COLOR_FUCHSIA "Fuksija" - IDS_COLOR_AQUA "Akvarelinis cianas" + IDS_COLOR_AQUA "Žydra" IDS_COLOR_WHITE "Balta" }

1 0