wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Ken Thomases : user32: Remove dead code for suppressing menu drawing.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 029aec19ff7676433b61896699fe452aad72f0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=029aec19ff7676433b6189669… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 24 17:35:50 2013 -0500 user32: Remove dead code for suppressing menu drawing. --- dlls/user32/controls.h | 3 +-- dlls/user32/menu.c | 19 ++----------------- dlls/user32/nonclient.c | 8 ++++---- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index e168f16..32e9815 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -160,8 +160,7 @@ extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth, extern BOOL MENU_SetMenu(HWND, HMENU) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, - HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; +extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f39ae7c..73b20b9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1801,11 +1801,9 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) * Paint a menu bar. Returns the height of the menu bar. * called from [windows/nonclient.c] */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, - BOOL suppress_draw) +UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) { LPPOPUPMENU lppop; - HFONT hfontOld = 0; HMENU hMenu = GetMenu(hwnd); lppop = MENU_GetMenu( hMenu ); @@ -1814,20 +1812,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, return GetSystemMetrics(SM_CYMENU); } - if (suppress_draw) - { - hfontOld = SelectObject( hDC, get_menu_font(FALSE)); - - if (lppop->Height == 0) - MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); - - lprect->bottom = lprect->top + lppop->Height; - - if (hfontOld) SelectObject( hDC, hfontOld); - return lppop->Height; - } - else - return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); + return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 050af90..da9c6bd 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -980,7 +980,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, * * Paint the non-client area for windows. */ -static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) +static void NC_DoNCPaint( HWND hwnd, HRGN clip ) { HDC hdc; RECT rfuzz, rect, rectClip; @@ -1062,7 +1062,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) TRACE("Calling DrawMenuBar with rect (%s)\n", wine_dbgstr_rect(&r)); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd ) + 1; } TRACE("After MenuBar, rect is (%s).\n", wine_dbgstr_rect(&rect)); @@ -1109,7 +1109,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) if( dwStyle & WS_MINIMIZE ) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, clip, FALSE ); + NC_DoNCPaint( hwnd, clip ); } return 0; } @@ -1143,7 +1143,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (IsIconic(hwnd)) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, (HRGN)1, FALSE ); + NC_DoNCPaint( hwnd, (HRGN)1 ); } return TRUE;

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct array test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: b196d0ccdcbbe54e5df0745b3d170ee76fa15185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b196d0ccdcbbe54e5df0745b3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:31 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct array test. --- dlls/d3dx9_36/tests/shader.c | 377 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 377 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b196d0ccdcbbe54e5df07…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable struct test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: cf5a2b641715cdee478e5e51751e84016ed7e829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5a2b641715cdee478e5e517… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:27 2013 +0200 d3dx9/tests: Add ID3DXConstantTable struct test. --- dlls/d3dx9_36/tests/shader.c | 308 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 308 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf5a2b641715cdee478e5…

1 0

Rico Schüller : d3dx9: Add support for structs to ID3DXConstantTable.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: bdec3f951b26d9dec2e706b5ac0bfc3081f40e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdec3f951b26d9dec2e706b5a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:21 2013 +0200 d3dx9: Add support for structs to ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d44316f..15dbb7a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -958,8 +958,83 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, /* D3DXPC_STRUCT is somewhat special */ if (desc->Class == D3DXPC_STRUCT) { - FIXME("Structs are not supported, yet.\n"); - return 0; + /* + * Struct array sets the last complete input to the first struct element, all other + * elements are not set. + * E.g.: struct {int i;} s1[2]; + * SetValue(device, "s1", [1, 2], 8) => s1 = {2, x}; + * + * struct {int i; int n} s2[2]; + * SetValue(device, "s2", [1, 2, 3, 4, 5], 20) => s1 = {{3, 4}, {x, x}}; + */ + if (desc->Elements > 1) + { + UINT offset = *size / (desc->Rows * desc->Columns) - 1; + + offset = min(desc->Elements - 1, offset); + last = offset * desc->Rows * desc->Columns; + + if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer); + } + else + { + last += set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + } + } + else + { + /* + * D3DXRS_BOOL is always set. As there are only 16 bools and there are + * exactly 16 input values, use matrix transpose. + */ + if (inclass == D3DXPC_MATRIX_ROWS && desc->RegisterSet == D3DXRS_BOOL) + { + D3DXMATRIX mat, *m, min; + D3DXMatrixTranspose(&mat, &min); + + if (is_pointer) + min = *(D3DXMATRIX *)(indata[index / 16]); + else + min = **(D3DXMATRIX **)indata; + + D3DXMatrixTranspose(&mat, &min); + m = &mat; + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], (const void **)&m, intype, size, incol, + D3DXPC_SCALAR, index + last, is_pointer); + } + } + /* + * For pointers or for matrix rows, only the first member is set. + * All other members are set to 0. This is not true for D3DXRS_BOOL. + * E.g.: struct {int i; int n} s; + * SetValue(device, "s", [1, 2], 8) => s = {1, 0}; + */ + else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + { + last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, + index + last, is_pointer); + + for (i = 1; i < desc->StructMembers; ++i) + { + set(table, device, &constant->constants[i], NULL, intype, size, incol, inclass, 0, is_pointer); + } + } + else + { + for (i = 0; i < desc->StructMembers; ++i) + { + last += set(table, device, &constant->constants[i], indata, intype, size, incol, D3DXPC_SCALAR, + index + last, is_pointer); + } + } + } + + return last; } /* elements */

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix row array test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 6705073016ce6b332448f75e3056ba34e1d0e3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6705073016ce6b332448f75e3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:17 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix row array test. --- dlls/d3dx9_36/tests/shader.c | 521 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 521 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6705073016ce6b332448f…

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable matrix row test.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 4e925d7d313af4c2f962c500325b766415cc59aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e925d7d313af4c2f962c5003… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 22:30:06 2013 +0200 d3dx9/tests: Add ID3DXConstantTable matrix row test. --- dlls/d3dx9_36/tests/shader.c | 332 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 332 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e925d7d313af4c2f962c…

1 0

Jacek Caban : urlmon/tests: Added more FindMimeFromData tests.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 7fbcd4cb8152af2094f752ef6f5b6b93c8788a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbcd4cb8152af2094f752ef6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:53 2013 +0200 urlmon/tests: Added more FindMimeFromData tests. --- dlls/urlmon/tests/misc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1a5a3bb..cf5c943 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -685,6 +685,12 @@ static const struct { {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data2, sizeof(data2), "text/css", NULL, NULL, "http://www.winehq.org/test.css"}, + {data10, sizeof(data10), "text/html", NULL, NULL, "http://www.winehq.org/test.css"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, + {data1, sizeof(data1), "text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, + {data1, sizeof(data1), "text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} }; static void test_FindMimeFromData(void)

1 0

Jacek Caban : urlmon: Fallback to URL-based MIME search in FindMimeFromData if found MIME is not concrete .
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: e5d09bea249d9b8b6d1a9fb7e7967dc5fac2b38a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d09bea249d9b8b6d1a9fb7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:44 2013 +0200 urlmon: Fallback to URL-based MIME search in FindMimeFromData if found MIME is not concrete. --- dlls/urlmon/mimefilter.c | 208 +++++++++++++++++++++++++++------------------- 1 files changed, 122 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5d09bea249d9b8b6d1a9…

1 0

Jacek Caban : urlmon: Moved FindMimeFromData to mimefilter.c.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: dbfe0572bd0d12f08b2987bec4b8bcf8f0258634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe0572bd0d12f08b2987bec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:32 2013 +0200 urlmon: Moved FindMimeFromData to mimefilter.c. --- dlls/urlmon/mimefilter.c | 371 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 371 --------------------------------------------- 2 files changed, 371 insertions(+), 371 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbfe0572bd0d12f08b298…

1 0

Jacek Caban : urlmon/tests: Make array-based MIME tests more generic.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: e7ca2655e8947b629fe309400a1e371e1d1f63da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ca2655e8947b629fe309400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 24 15:13:19 2013 +0200 urlmon/tests: Make array-based MIME tests more generic. --- dlls/urlmon/tests/misc.c | 81 ++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 98947fd..1a5a3bb 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -87,6 +87,26 @@ static int strcmp_wa(const WCHAR *strw, const char *stra) return lstrcmpW(strw, buf); } +static void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +static WCHAR *a2w(const char *str) +{ + WCHAR *ret; + int len; + + if(!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -561,6 +581,8 @@ static const struct { const char *mime; const char *mime_pjpeg; const char *broken_mime; + const char *url; + const char *proposed_mime; } mime_tests2[] = { {data1, sizeof(data1), "text/plain"}, {data2, sizeof(data2), "application/octet-stream", "image/pjpeg"}, @@ -657,13 +679,18 @@ static const struct { {data93, sizeof(data93), "text/xml", "text/plain"}, {data94, sizeof(data94), "text/html", "text/plain"}, {data95, sizeof(data95), "text/xml", "text/richtext"}, - {data96, sizeof(data96), "text/plain"} + {data96, sizeof(data96), "text/plain"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {NULL, 0, "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, + {data1, sizeof(data1), "text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, + {NULL, sizeof(data1), "text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, }; static void test_FindMimeFromData(void) { + WCHAR *mime, *proposed_mime, *url; HRESULT hres; - LPWSTR mime; BYTE b; int i; @@ -701,14 +728,18 @@ static void test_FindMimeFromData(void) } for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) { - hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, - NULL, 0, &mime, 0); + url = a2w(mime_tests2[i].url); + proposed_mime = a2w(mime_tests2[i].proposed_mime); + hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, + proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); b = !strcmp_wa(mime, mime_tests2[i].mime); ok(b || broken(mime_tests2[i].broken_mime && !strcmp_wa(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + heap_free(proposed_mime); + heap_free(url); CoTaskMemFree(mime); - if(!b) + if(!b || url || proposed_mime) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size, @@ -746,46 +777,6 @@ static void test_FindMimeFromData(void) CoTaskMemFree(mime); } - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), app_octet_streamW, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url4, data1, sizeof(data1), app_octet_streamW, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, NULL, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, 0, NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, 0, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/html"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - - hres = pFindMimeFromData(NULL, url1, data1, sizeof(data1), NULL, 0, &mime, 0); - ok(hres == S_OK, "FindMimeFromData failed: %08x, expected S_OK\n", hres); - ok(!strcmp_wa(mime, "text/plain"), "wrong mime: %s\n", wine_dbgstr_w(mime)); - CoTaskMemFree(mime); - hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
45
Older →

Jump to page:

2025

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 July 2013