April 2008 - wine-commits

Dan Hipschman : widl: Fix a mistake in an ordered list (keywords).
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 976f570f61af5a7bf3aaf3102c7a7f5490f208e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976f570f61af5a7bf3aaf3102… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Apr 2 17:17:01 2008 -0700 widl: Fix a mistake in an ordered list (keywords). --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 66110b6..5b24b26 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -187,8 +187,8 @@ static const struct keyword keywords[] = { {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, - {"__pascal", tPASCAL}, {"__int64", tINT64}, + {"__pascal", tPASCAL}, {"__stdcall", tSTDCALL}, {"_cdecl", tCDECL}, {"_fastcall", tFASTCALL},

1 0

James Hawkins : msi: Fix joining a nonexistent table with another table.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 061085fa942d28031eaade9a4c511f0272e49164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061085fa942d28031eaade9a4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 18:31:18 2008 -0500 msi: Fix joining a nonexistent table with another table. --- dlls/msi/join.c | 3 ++- dlls/msi/tests/db.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index e24eace..756db6f 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -341,7 +341,8 @@ UINT JOIN_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables ) r = TABLE_CreateView( db, tables, &table->view ); if( r != ERROR_SUCCESS ) { - ERR("can't create table\n"); + WARN("can't create table: %s\n", debugstr_w(tables)); + r = ERROR_BAD_QUERY_SYNTAX; goto end; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index aee2e80..9be1691 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3213,6 +3213,11 @@ static void test_join(void) MsiViewClose(hview); MsiCloseHandle(hview); + query = "SELECT * FROM `Nonexistent`, `One`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok( r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r ); + MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

James Hawkins : msi: Downgrade a few messages to WARN.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: c48daf93bb41ab8557ee822341114d1676075c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48daf93bb41ab8557ee82234… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 18:30:37 2008 -0500 msi: Downgrade a few messages to WARN. --- dlls/msi/action.c | 4 ++-- dlls/msi/dialog.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b19e015..ef0e136 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1053,7 +1053,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, if (!handled) { - FIXME("unhandled msi action %s\n",debugstr_w(action)); + WARN("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } @@ -1077,7 +1077,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip if (!handled) { - FIXME("unhandled msi action %s\n",debugstr_w(action)); + WARN("unhandled msi action %s\n",debugstr_w(action)); rc = ERROR_FUNCTION_NOT_CALLED; } diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index e084bf8..035d7f5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2917,7 +2917,7 @@ static MSIRECORD *msi_get_dialog_record( msi_dialog *dialog ) rec = MSI_QueryGetRecord( package->db, query, dialog->name ); if( !rec ) - ERR("query failed for dialog %s\n", debugstr_w(dialog->name)); + WARN("query failed for dialog %s\n", debugstr_w(dialog->name)); return rec; }

1 0

James Hawkins : msi: Handle the case where no files match the wildcard in MoveFiles.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: a7d02a1f08194accdd3714a82bac19298c5c9fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d02a1f08194accdd3714a82… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 17:41:47 2008 -0500 msi: Handle the case where no files match the wildcard in MoveFiles. --- dlls/msi/action.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 982c9f0..b19e015 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5413,6 +5413,10 @@ static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) msi_free(path); } + /* no files match the wildcard */ + if (list_empty(&files.entry)) + goto done; + /* only the first wildcard match gets renamed to dest */ file = LIST_ENTRY(list_head(&files.entry), FILE_LIST, entry); size = (strrchrW(file->dest, '\\') - file->dest) + lstrlenW(file->destname) + 2;

1 0

Maarten Lankhorst : quartz: Fix memory leak found by valgrind.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: cfeca053b843be495f356837b1dcfdf314717b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfeca053b843be495f356837b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 23:00:57 2008 -0700 quartz: Fix memory leak found by valgrind. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0a841d9..417ec3f 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -407,7 +407,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, LPWSTR * pNewNames = CoTaskMemAlloc(newCapacity * sizeof(LPWSTR)); memcpy(ppNewFilters, This->ppFiltersInGraph, This->nFilters * sizeof(IBaseFilter*)); memcpy(pNewNames, This->pFilterNames, This->nFilters * sizeof(LPWSTR)); - if (!This->filterCapacity) + if (This->filterCapacity) { CoTaskMemFree(This->ppFiltersInGraph); CoTaskMemFree(This->pFilterNames);

1 0

Maarten Lankhorst : winemp3: Change a few more fprintf's to wine logs.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: f5fdb793edd20abd152b50b90ebd2eb78492cdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5fdb793edd20abd152b50b90… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 14:58:23 2008 -0700 winemp3: Change a few more fprintf's to wine logs. --- dlls/winemp3.acm/interface.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemp3.acm/interface.c b/dlls/winemp3.acm/interface.c index 775c001..a1d09f2 100644 --- a/dlls/winemp3.acm/interface.c +++ b/dlls/winemp3.acm/interface.c @@ -24,6 +24,7 @@ #include "mpg123.h" #include "mpglib.h" +WINE_DEFAULT_DEBUG_CHANNEL(mpeg3); BOOL InitMP3(struct mpstr *mp) { @@ -72,12 +73,13 @@ static struct buf *addbuf(struct mpstr *mp,const unsigned char *buf,int size) nbuf = malloc( sizeof(struct buf) ); if(!nbuf) { - fprintf(stderr,"Out of memory!\n"); + WARN("Out of memory!\n"); return NULL; } nbuf->pnt = malloc(size); if(!nbuf->pnt) { free(nbuf); + WARN("Out of memory!\n"); return NULL; } nbuf->size = size; @@ -156,7 +158,7 @@ int decodeMP3(struct mpstr *mp,const unsigned char *in,int isize,unsigned char * int len; if(osize < 4608) { - fprintf(stderr,"To less out space\n"); + ERR("Output buffer too small\n"); return MP3_ERR; } @@ -229,7 +231,8 @@ int set_pointer(struct mpstr *mp, long backstep) { unsigned char *bsbufold; if(mp->fsizeold < 0 && backstep > 0) { - fprintf(stderr,"Can't step back %ld!\n",backstep); + /* This is not a bug if we just did seeking, the first frame is dropped then */ + WARN("Can't step back %ld!\n",backstep); return MP3_ERR; } bsbufold = mp->bsspace[mp->bsnum] + 512;

1 0

James Hawkins : shell32: Fix and simplify the FO_COPY operation, with tests .
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 5469551f6b38950fcbc591f46d10527788633511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5469551f6b38950fcbc591f46… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 2 16:13:11 2008 -0500 shell32: Fix and simplify the FO_COPY operation, with tests. --- dlls/shell32/shlfileop.c | 75 ++++++++++++------------ dlls/shell32/tests/shlfileop.c | 125 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 161 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5469551f6b38950fcbc59…

1 0

Lei Zhang : user32: Correctly handle VK_RETURN for edit controls with ES_WANTRETURN style.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 376e45429cda0844b2106cc444a8cf7bac33de00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376e45429cda0844b2106cc44… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 11:33:19 2008 -0700 user32: Correctly handle VK_RETURN for edit controls with ES_WANTRETURN style. --- dlls/user32/edit.c | 5 ++--- dlls/user32/tests/edit.c | 22 +++++++++++++++++----- dlls/user32/tests/resource.rc | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dd5ba0a..e6d2530 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -811,9 +811,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, { switch (vk) { - case VK_RETURN: - SendMessageW(GetParent(hwnd), WM_COMMAND, IDOK, (LPARAM)GetDlgItem(GetParent(hwnd), IDOK)); - break; case VK_ESCAPE: SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); break; @@ -4608,6 +4605,8 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); } + else + SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); } break; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 123fd4f..0e9487d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -39,6 +39,7 @@ static struct edit_notify notifications; static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + static int num_ok_commands = 0; switch (msg) { case WM_INITDIALOG: @@ -62,6 +63,13 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); break; + /* test cases for pressing enter */ + case 3: + num_ok_commands = 0; + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + default: break; } @@ -75,11 +83,7 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara switch (LOWORD(wparam)) { case IDOK: - EndDialog(hdlg, 111); - break; - - case IDCANCEL: - EndDialog(hdlg, 222); + num_ok_commands++; break; default: @@ -109,6 +113,12 @@ static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wpara else EndDialog(hdlg, 4444); break; + case 1: + if ((hfocus == hedit) && (num_ok_commands == 0)) + EndDialog(hdlg, 11); + else + EndDialog(hdlg, 22); + break; default: EndDialog(hdlg, 5555); } @@ -1441,6 +1451,8 @@ static void test_multi_edit_dialog(void) ok(1111 == r, "Expected %d, got %d\n", 1111, r); r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 2); ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 3); + ok(11 == r, "Expected %d, got %d\n", 11, r); } static BOOL RegisterWindowClasses (void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 24c5e33..80abf08 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -103,7 +103,7 @@ STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Multiple Edit Test" FONT 8, "MS Shell Dlg" { - EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | ES_WANTRETURN EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP }

1 0

Lei Zhang : user32: Dialog should ignore WM_KEYDOWN messages if it gets DLGC_WANTCHARS.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 08a4d2afc2ddfc1e508ef8528d5332d4b915b0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a4d2afc2ddfc1e508ef8528… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 11:04:23 2008 -0700 user32: Dialog should ignore WM_KEYDOWN messages if it gets DLGC_WANTCHARS. --- dlls/user32/dialog.c | 2 +- dlls/user32/tests/edit.c | 103 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 ++++ 3 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index bb0d460..243bb5a 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1094,7 +1094,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { case WM_KEYDOWN: dlgCode = SendMessageW( msg->hwnd, WM_GETDLGCODE, msg->wParam, (LPARAM)msg ); - if (dlgCode & DLGC_WANTMESSAGE) break; + if (dlgCode & (DLGC_WANTCHARS|DLGC_WANTMESSAGE)) break; switch(msg->wParam) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index a40251c..123fd4f 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -37,6 +37,95 @@ struct edit_notify { static struct edit_notify notifications; +static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases related to bug 12319 */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 1: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hfocus = GetFocus(); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hedit2 = GetDlgItem(hdlg, 1001); + HWND hedit3 = GetDlgItem(hdlg, 1002); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if (hfocus == hedit) + EndDialog(hdlg, 1111); + else if (hfocus == hedit2) + EndDialog(hdlg, 2222); + else if (hfocus == hedit3) + EndDialog(hdlg, 3333); + else + EndDialog(hdlg, 4444); + break; + default: + EndDialog(hdlg, 5555); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -1341,6 +1430,19 @@ static void test_edit_dialog(void) ok(33 == r, "Expected %d, got %d\n", 33, r); } +static void test_multi_edit_dialog(void) +{ + int r; + + /* test for multiple edit dialogs (bug 12319) */ + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 0); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 1); + ok(1111 == r, "Expected %d, got %d\n", 1111, r); + r = DialogBoxParam(hinst, "MULTI_EDIT_DIALOG", NULL, (DLGPROC)multi_edit_dialog_proc, 2); + ok(2222 == r, "Expected %d, got %d\n", 2222, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1410,6 +1512,7 @@ START_TEST(edit) test_espassword(); test_undo(); test_edit_dialog(); + test_multi_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index b0c4967..24c5e33 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -98,6 +98,16 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END +MULTI_EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 75 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Multiple Edit Test" +FONT 8, "MS Shell Dlg" +{ + EDITTEXT 1000, 5, 5, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1001, 5, 25, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1002, 5, 45, 150, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +} + EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test"

1 0

Lei Zhang : user32: Add more edit dialog tests.
by Alexandre Julliard 03 Apr '08

03 Apr '08

Module: wine Branch: master Commit: 1d1f1373af9b0210a09add13e2c7013cbe578b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1f1373af9b0210a09add13e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 2 10:50:09 2008 -0700 user32: Add more edit dialog tests. --- dlls/user32/tests/edit.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 74092be..a40251c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -90,6 +90,19 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); break; + /* multiple tab tests */ + case 9: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 10: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + default: break; } @@ -119,7 +132,9 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA { int len; HWND hok = GetDlgItem(hdlg, IDOK); + HWND hcancel = GetDlgItem(hdlg, IDCANCEL); HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); if (wparam != 0xdeadbeef) break; @@ -136,12 +151,23 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA case 1: len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); - if ((GetFocus() == hok) && len == 0) + if ((hfocus == hok) && len == 0) EndDialog(hdlg, 444); else EndDialog(hdlg, 555); break; + case 2: + if (hfocus == hok) + EndDialog(hdlg, 11); + else if (hfocus == hcancel) + EndDialog(hdlg, 22); + else if (hfocus == hedit) + EndDialog(hdlg, 33); + else + EndDialog(hdlg, 44); + break; + default: EndDialog(hdlg, 555); } @@ -1307,6 +1333,12 @@ static void test_edit_dialog(void) todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* multiple tab tests */ + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 9); + ok(22 == r, "Expected %d, got %d\n", 22, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 10); + ok(33 == r, "Expected %d, got %d\n", 33, r); } static BOOL RegisterWindowClasses (void)

1 0

Mikołaj Zalewski : winecfg: Update Polish translation.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 1eba09b86f13f37613f53e14e5a3968b3950d639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eba09b86f13f37613f53e14e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Apr 2 20:29:20 2008 +0200 winecfg: Update Polish translation. --- programs/winecfg/Pl.rc | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 78d7618..f0c347e 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -295,8 +295,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDC_SYSPARAMS_BUTTON "T�o kontrolek" - IDC_SYSPARAMS_BUTTON_TEXT "Tekst kontrolek" + IDC_SYSPARAMS_BUTTON "Kontrolki - t�o" + IDC_SYSPARAMS_BUTTON_TEXT "Kontrolki - tekst" IDC_SYSPARAMS_DESKTOP "Pulpit" IDC_SYSPARAMS_MENU "T�o menu" IDC_SYSPARAMS_MENU_TEXT "Tekst menu" @@ -312,4 +312,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "T�o nag��wka nieaktywnego okna" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Tytu� nieaktywnego okna" IDC_SYSPARAMS_MSGBOX_TEXT "Tekst okien komunikat�w" + IDC_SYSPARAMS_APPWORKSPACE "Wn�trze okna aplikacji" + IDC_SYSPARAMS_WINDOW_FRAME "Ramka okna" + IDC_SYSPARAMS_ACTIVE_BORDER "Obramowanie aktywnego okna" + IDC_SYSPARAMS_INACTIVE_BORDER "Obramowanie nieaktywnego okna" + IDC_SYSPARAMS_BUTTON_SHADOW "Kontrolki - cie�" + IDC_SYSPARAMS_GRAY_TEXT "Szary tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Kontrolki - pod�wietlenie" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Kontrolki - g��bszy cie�" + IDC_SYSPARAMS_BUTTON_LIGHT "Kontrolki - ja�niejszy cie�" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Kontrolki - alternatywne t�o" + IDC_SYSPARAMS_HOT_TRACKING "�ledzony element" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradient nag��wka aktywnego okna" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradient nag��wka nieaktywnego okna" + IDC_SYSPARAMS_MENU_HILIGHT "Pod�wietlone menu" + IDC_SYSPARAMS_MENUBAR "Pasek menu" END

1 0

Austin English : Spelling fixes.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b4f52938e4cbf80d28eb4852b9749a612097e822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f52938e4cbf80d28eb4852b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 2 15:10:47 2008 -0500 Spelling fixes. --- dlls/d3d9/tests/visual.c | 4 ++-- dlls/dmloader/container.c | 12 ++++++------ dlls/dmstyle/style.c | 12 ++++++------ dlls/dmusic/collection.c | 2 +- dlls/dnsapi/ns_name.c | 2 +- dlls/dplayx/dplay.c | 4 ++-- dlls/dplayx/dplayx_global.c | 16 ++++++++-------- dlls/dplayx/dplayx_main.c | 6 +++--- dlls/dplayx/dplobby.c | 4 ++-- dlls/dplayx/tests/dplayx.c | 2 +- dlls/dsound/mixer.c | 6 +++--- dlls/faultrep/faultrep.c | 4 ++-- 12 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4f52938e4cbf80d28eb4…

1 0

Maarten Lankhorst : quartz: Implement seeking on the null renderer.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9c0ea9eaa8ef3faacd27b759153a435739825418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0ea9eaa8ef3faacd27b7591… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 11:57:58 2008 -0700 quartz: Implement seeking on the null renderer. --- dlls/quartz/nullrenderer.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index d494ca5..6b543c5 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -65,6 +65,7 @@ typedef struct NullRendererImpl IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; + MediaSeekingImpl mediaSeeking; } NullRendererImpl; static const IMemInputPinVtbl MemInputPin_Vtbl = @@ -145,6 +146,62 @@ static HRESULT NullRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_OK; } +static inline NullRendererImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) +{ + return (NullRendererImpl *)((char*)iface - FIELD_OFFSET(NullRendererImpl, mediaSeeking.lpVtbl)); +} + +static HRESULT WINAPI NullRendererImpl_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); +} + +static ULONG WINAPI NullRendererImpl_Seeking_AddRef(IMediaSeeking * iface) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_AddRef((IUnknown *)This); +} + +static ULONG WINAPI NullRendererImpl_Seeking_Release(IMediaSeeking * iface) +{ + NullRendererImpl *This = impl_from_IMediaSeeking(iface); + + return IUnknown_Release((IUnknown *)This); +} + +static const IMediaSeekingVtbl TransformFilter_Seeking_Vtbl = +{ + NullRendererImpl_Seeking_QueryInterface, + NullRendererImpl_Seeking_AddRef, + NullRendererImpl_Seeking_Release, + MediaSeekingImpl_GetCapabilities, + MediaSeekingImpl_CheckCapabilities, + MediaSeekingImpl_IsFormatSupported, + MediaSeekingImpl_QueryPreferredFormat, + MediaSeekingImpl_GetTimeFormat, + MediaSeekingImpl_IsUsingTimeFormat, + MediaSeekingImpl_SetTimeFormat, + MediaSeekingImpl_GetDuration, + MediaSeekingImpl_GetStopPosition, + MediaSeekingImpl_GetCurrentPosition, + MediaSeekingImpl_ConvertTimeFormat, + MediaSeekingImpl_SetPositions, + MediaSeekingImpl_GetPositions, + MediaSeekingImpl_GetAvailable, + MediaSeekingImpl_SetRate, + MediaSeekingImpl_GetRate, + MediaSeekingImpl_GetPreroll +}; + +static HRESULT NullRendererImpl_Change(IBaseFilter *iface) +{ + TRACE("(%p)\n", iface); + return S_OK; +} + HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) { HRESULT hr; @@ -181,6 +238,9 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) if (SUCCEEDED(hr)) { pNullRenderer->ppPins[0] = (IPin *)pNullRenderer->pInputPin; + MediaSeekingImpl_Init((IBaseFilter*)pNullRenderer, NullRendererImpl_Change, NullRendererImpl_Change, NullRendererImpl_Change, &pNullRenderer->mediaSeeking, &pNullRenderer->csFilter); + pNullRenderer->mediaSeeking.lpVtbl = &TransformFilter_Seeking_Vtbl; + *ppv = (LPVOID)pNullRenderer; } else @@ -212,6 +272,8 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID *ppv = (LPVOID)This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = (LPVOID)This; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &This->mediaSeeking; if (*ppv) {

1 0

Maarten Lankhorst : quartz: Fix stop_playback used in pullpin.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 9d6239bdace63b9148fb03b8c24965a4fa28b43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6239bdace63b9148fb03b8c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 2 10:45:32 2008 -0700 quartz: Fix stop_playback used in pullpin. --- dlls/quartz/pin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 686669e..270a3c5 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1517,7 +1517,7 @@ HRESULT PullPin_PauseProcessing(PullPin * This) PullPin_WaitForStateChange(This, INFINITE); EnterCriticalSection(This->pin.pCritSec); - This->stop_playback = 0; + This->stop_playback = 1; LeaveCriticalSection(This->pin.pCritSec); ResetEvent(This->hEventStateChanged); @@ -1535,7 +1535,7 @@ HRESULT PullPin_StopProcessing(PullPin * This) { PullPin_WaitForStateChange(This, INFINITE); - This->stop_playback = 0; + This->stop_playback = 1; ResetEvent(This->hEventStateChanged); if (!QueueUserAPC(PullPin_Thread_Stop, This->hThread, (ULONG_PTR)This))

1 0

Frans Kool : shell32: Corrected/added Dutch translations.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 46ab1b2b1ee8252d0a5bfec498349437359e0986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ab1b2b1ee8252d0a5bfec49… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 2 14:05:56 2008 +0200 shell32: Corrected/added Dutch translations. --- dlls/shell32/shell32_Nl.rc | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 8c6f0b2..d22a07a 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -113,7 +114,7 @@ FONT 8, "MS Shell Dlg" { LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDD_FOLDER, 10, 156, 40, 12 + LTEXT "Map:", IDD_FOLDER, 10, 156, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, @@ -143,10 +144,12 @@ CAPTION "Info %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + PUSHBUTTON "Wine &licentie...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 + LTEXT "Draait op %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine is geschreven door:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } @@ -249,3 +252,21 @@ STRINGTABLE IDS_NEWFOLDER "Nieuwe Map" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Wine Licentie" +/* Only translated the title, since there is no official translation of the LGPL */ +IDS_LICENSE, +"Wine is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\n\ +Wine is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +}

1 0

Alexandre Julliard : winedevice: Apply relocations to the driver in cases where the loader doesn't do it.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 52ca8cd3ce40f11dd846739da6c017db0430e1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ca8cd3ce40f11dd846739da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:40:27 2008 +0200 winedevice: Apply relocations to the driver in cases where the loader doesn't do it. --- programs/winedevice/device.c | 51 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5e9c322..d48017a 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "ntstatus.h" @@ -58,6 +61,52 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return NULL; } +/* load the driver module file */ +static HMODULE load_driver_module( const WCHAR *name ) +{ + const IMAGE_NT_HEADERS *nt; + size_t page_size = getpagesize(); + int delta; + HMODULE module = LoadLibraryW( name ); + + if (!module) return NULL; + nt = RtlImageNtHeader( module ); + + if (!(delta = (char *)module - (char *)nt->OptionalHeader.ImageBase)) return module; + + /* the loader does not apply relocations to non page-aligned binaries or executables, + * we have to do it ourselves */ + + if (nt->OptionalHeader.SectionAlignment < page_size || + !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) + { + ULONG size; + DWORD old; + IMAGE_BASE_RELOCATION *rel, *end; + + if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) + { + WINE_TRACE( "%s: relocating from %p to %p\n", + wine_dbgstr_w(name), (char *)module - delta, module ); + end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); + while (rel < end && rel->SizeOfBlock) + { + void *page = (char *)module + rel->VirtualAddress; + VirtualProtect( page, page_size, PAGE_EXECUTE_READWRITE, &old ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); + if (!rel) goto error; + } + } + } + return module; + +error: + FreeLibrary( module ); + return NULL; +} + /* call the driver init entry point */ static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) { @@ -146,7 +195,7 @@ static BOOL load_driver(void) WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); - module = LoadLibraryW( str ); + module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); if (!module) return FALSE;

1 0

Alexandre Julliard : ntdll: Use LdrProcessRelocationBlock to apply relocations.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: ce21f2924f776956654e5af4dab5a1e0153f3eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce21f2924f776956654e5af4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:39:22 2008 +0200 ntdll: Use LdrProcessRelocationBlock to apply relocations. Don't apply relocations to non page-aligned binaries. --- dlls/ntdll/virtual.c | 107 +++++++------------------------------------------ 1 files changed, 16 insertions(+), 91 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a5b299d..812c9bd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -880,76 +880,6 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz /*********************************************************************** - * do_relocations - * - * Apply the relocations to a mapped PE image - */ -static int do_relocations( char *base, const IMAGE_DATA_DIRECTORY *dir, - int delta, SIZE_T total_size ) -{ - IMAGE_BASE_RELOCATION *rel; - - TRACE_(module)( "relocating from %p-%p to %p-%p\n", - base - delta, base - delta + total_size, base, base + total_size ); - - for (rel = (IMAGE_BASE_RELOCATION *)(base + dir->VirtualAddress); - ((char *)rel < base + dir->VirtualAddress + dir->Size) && rel->SizeOfBlock; - rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock) ) - { - char *page = base + rel->VirtualAddress; - WORD *TypeOffset = (WORD *)(rel + 1); - int i, count = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(*TypeOffset); - - if (!count) continue; - - /* sanity checks */ - if ((char *)rel + rel->SizeOfBlock > base + dir->VirtualAddress + dir->Size) - { - ERR_(module)("invalid relocation %p,%x,%d at %p,%x,%x\n", - rel, rel->VirtualAddress, rel->SizeOfBlock, - base, dir->VirtualAddress, dir->Size ); - return 0; - } - - if (page > base + total_size) - { - WARN_(module)("skipping %d relocations for page %p beyond module %p-%p\n", - count, page, base, base + total_size ); - continue; - } - - TRACE_(module)("%d relocations for page %x\n", count, rel->VirtualAddress); - - /* patching in reverse order */ - for (i = 0 ; i < count; i++) - { - int offset = TypeOffset[i] & 0xFFF; - int type = TypeOffset[i] >> 12; - switch(type) - { - case IMAGE_REL_BASED_ABSOLUTE: - break; - case IMAGE_REL_BASED_HIGH: - *(short*)(page+offset) += HIWORD(delta); - break; - case IMAGE_REL_BASED_LOW: - *(short*)(page+offset) += LOWORD(delta); - break; - case IMAGE_REL_BASED_HIGHLOW: - *(int*)(page+offset) += delta; - /* FIXME: if this is an exported address, fire up enhanced logic */ - break; - default: - FIXME_(module)("Unknown/unsupported fixup type %d.\n", type); - break; - } - } - } - return 1; -} - - -/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -1055,16 +985,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz VIRTUAL_SetProt( view, ptr, total_size, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); - /* perform relocations if necessary */ - /* FIXME: not 100% compatible, Windows doesn't do this for non page-aligned binaries */ - if (ptr != base) - { - const IMAGE_DATA_DIRECTORY *relocs; - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - if (relocs->VirtualAddress && relocs->Size) - do_relocations( ptr, relocs, ptr - base, total_size ); - } - + /* no relocations are performed on non page-aligned binaries */ goto done; } @@ -1167,27 +1088,31 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !NtCurrentTeb()->Peb->ImageBaseAddress) ) { + int delta = ptr - base; + IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { - WARN_(module)( "Need to relocate module from addr %lx, but there are no relocation records\n", - (ULONG_PTR)nt->OptionalHeader.ImageBase ); + WARN_(module)( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, ptr ); status = STATUS_CONFLICTING_ADDRESSES; goto error; } - /* FIXME: If we need to relocate a system DLL (base > 2GB) we should - * really make sure that the *new* base address is also > 2GB. - * Some DLLs really check the MSB of the module handle :-/ - */ - if ((nt->OptionalHeader.ImageBase & 0x80000000) && !((ULONG_PTR)base & 0x80000000)) - ERR_(module)( "Forced to relocate system DLL (base > 2GB). This is not good.\n" ); + TRACE_(module)( "relocating from %p-%p to %p-%p\n", + base, base + total_size, ptr, ptr + total_size ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); + end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - if (!do_relocations( ptr, relocs, ptr - base, total_size )) + while (rel < end && rel->SizeOfBlock) { - goto error; + rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) goto error; } }

1 0

Alexandre Julliard : ntdll: Implemented LdrProcessRelocationBlock.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: fca606774864794ddc29745f076a8b2d55c1da48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca606774864794ddc29745f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:38:51 2008 +0200 ntdll: Implemented LdrProcessRelocationBlock. --- dlls/ntdll/loader.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 3 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1091c32..b0000b8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2035,6 +2035,41 @@ NTSTATUS WINAPI LdrAddRefDll( ULONG flags, HMODULE module ) } +/*********************************************************************** + * LdrProcessRelocationBlock (NTDLL.@) + * + * Apply relocations to a given page of a mapped PE image. + */ +IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count, + USHORT *relocs, INT delta ) +{ + while (count--) + { + USHORT offset = *relocs & 0xfff; + int type = *relocs >> 12; + switch(type) + { + case IMAGE_REL_BASED_ABSOLUTE: + break; + case IMAGE_REL_BASED_HIGH: + *(short *)((char *)page + offset) += HIWORD(delta); + break; + case IMAGE_REL_BASED_LOW: + *(short *)((char *)page + offset) += LOWORD(delta); + break; + case IMAGE_REL_BASED_HIGHLOW: + *(int *)((char *)page + offset) += delta; + break; + default: + FIXME("Unknown/unsupported fixup type %x.\n", type); + return NULL; + } + relocs++; + } + return (IMAGE_BASE_RELOCATION *)relocs; /* return address of next block */ +} + + /****************************************************************** * LdrQueryProcessModuleInformation * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2d27d61..23ee968 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -72,7 +72,7 @@ @ stub LdrLoadAlternateResourceModule @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) -@ stub LdrProcessRelocationBlock +@ stdcall LdrProcessRelocationBlock(ptr long ptr long) @ stub LdrQueryImageFileExecutionOptions @ stdcall LdrQueryProcessModuleInformation(ptr long ptr) @ stub LdrSetAppCompatDllRedirectionCallback diff --git a/include/winternl.h b/include/winternl.h index eafbbed..39339c2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1844,6 +1844,7 @@ NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, UL NTSYSAPI void WINAPI LdrInitializeThunk(ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); +IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void);

1 0

Frans Kool : winecfg: Added missing Dutch translations.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: d2dd8f94db5514a24768e1894172c5659a6a585c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dd8f94db5514a24768e1894… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 2 14:24:16 2008 +0200 winecfg: Added missing Dutch translations. --- programs/winecfg/Nl.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index c9c5cd3..5fb6929 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -309,4 +309,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inactieve Titel Balk" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactieve Title Tekst" IDC_SYSPARAMS_MSGBOX_TEXT "Melding Window Tekst" + IDC_SYSPARAMS_APPWORKSPACE "Applicatie Werkruimte" + IDC_SYSPARAMS_WINDOW_FRAME "Window Raamwerk" + IDC_SYSPARAMS_ACTIVE_BORDER "Actieve Rand" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactieve Rand" + IDC_SYSPARAMS_BUTTON_SHADOW "Knoppen Schaduw" + IDC_SYSPARAMS_GRAY_TEXT "Grijze Tekst" + IDC_SYSPARAMS_BUTTON_HILIGHT "Knoppen Gemarkeerd" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Knoppen Donkere Schaduw" + IDC_SYSPARAMS_BUTTON_LIGHT "Knoppen Licht" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Knoppen Alternatieve Achtergrond" + IDC_SYSPARAMS_HOT_TRACKING "'Hot-Tracked' Onderdeel" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Actieve Titelbalk Verloop" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactieve Titelbalk Verloop" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Gemarkeerd" + IDC_SYSPARAMS_MENUBAR "Menubalk" END

1 0

Stefan Dösinger : ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 2e26c176ec61a25856a0a426074a667c803bf87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e26c176ec61a25856a0a4260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:47:26 2008 +0100 ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock. --- dlls/ddraw/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 08852d4..dc4ff47 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -175,7 +175,7 @@ static DWORD getPixelColor(IDirect3DDevice7 *device, UINT x, UINT y) * really important for these tests */ ret = ((DWORD *) ddsd.lpSurface)[0] & 0x00ffffff; - hr = IDirectDrawSurface7_Unlock(surf, &rectToLock); + hr = IDirectDrawSurface7_Unlock(surf, NULL); if(FAILED(hr)) { trace("Can't unlock the offscreen surface, hr=%08x\n", hr); @@ -971,7 +971,7 @@ static DWORD D3D1_getPixelColor(IDirectDraw *DirectDraw1, IDirectDrawSurface *Su * really important for these tests */ ret = ((DWORD *) ddsd.lpSurface)[0] & 0x00ffffff; - hr = IDirectDrawSurface_Unlock(surf, &rectToLock); + hr = IDirectDrawSurface_Unlock(surf, NULL); if(FAILED(hr)) { trace("Can't unlock the offscreen surface, hr=%08x\n", hr);

1 0

Stefan Dösinger : ddraw: Remove some leftover test debug output.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: c1503a2579b10ef2f41831f50b1bff0978504b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1503a2579b10ef2f41831f50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:40:07 2008 +0100 ddraw: Remove some leftover test debug output. --- dlls/ddraw/tests/dsurface.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 99c45fd..7ff1fe7 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1504,7 +1504,6 @@ static void CubeMapTest(void) IDirectDrawSurface7_EnumAttachedSurfaces(cubemap, &num, CubeTestLvl1Enum); - trace("Enumerated %d surfaces in total\n", num); ok(num == 6, "Surface has %d attachments\n", num); IDirectDrawSurface7_Release(cubemap); @@ -2110,7 +2109,6 @@ static void SizeTest(void) desc.dwSize = sizeof(desc); desc.dwFlags = DDSD_CAPS; desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN; - trace("before offscreenplain create dsurface = %p\n", dsurface); ret = IDirectDraw_CreateSurface(lpDD, &desc, &dsurface, NULL); ok(ret == DDERR_INVALIDPARAMS, "Creating an offscreen plain surface without a size info returned %08x (dsurface=%p)\n", ret, dsurface); if(dsurface)

1 0

Stefan Dösinger : ddraw: Add a D3D7 cube map test.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: ab7630fbe373426f00d1083f54325eac9499fbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7630fbe373426f00d1083f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:36:27 2008 +0100 ddraw: Add a D3D7 cube map test. The DirectDraw cube mapping interface has a few pitfalls. So far we have a test testing the surface enumeration, this adds a rendering test. So far everything used in the test works. --- dlls/ddraw/tests/visual.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 580bf88..08852d4 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1915,6 +1915,160 @@ static void p8_primary_test() if(window) DestroyWindow(window); } +static void cubemap_test(IDirect3DDevice7 *device) +{ + IDirect3D7 *d3d; + IDirectDraw7 *ddraw; + IDirectDrawSurface7 *cubemap, *surface; + D3DDEVICEDESC7 d3dcaps; + HRESULT hr; + DWORD color; + DDSURFACEDESC2 ddsd; + DDBLTFX DDBltFx; + DDSCAPS2 caps; + static float quad[] = { + -1.0, -1.0, 0.1, 1.0, 0.0, 0.0, /* Lower left */ + 0.0, -1.0, 0.1, 1.0, 0.0, 0.0, + -1.0, 0.0, 0.1, 1.0, 0.0, 0.0, + 0.0, 0.0, 0.1, 1.0, 0.0, 0.0, + + 0.0, -1.0, 0.1, 0.0, 1.0, 0.0, /* Lower right */ + 1.0, -1.0, 0.1, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.1, 0.0, 1.0, 0.0, + 1.0, 0.0, 0.1, 0.0, 1.0, 0.0, + + 0.0, 0.0, 0.1, 0.0, 0.0, 1.0, /* upper right */ + 1.0, 0.0, 0.1, 0.0, 0.0, 1.0, + 0.0, 1.0, 0.1, 0.0, 0.0, 1.0, + 1.0, 1.0, 0.1, 0.0, 0.0, 1.0, + + -1.0, 0.0, 0.1, -1.0, 0.0, 0.0, /* Upper left */ + 0.0, 0.0, 0.1, -1.0, 0.0, 0.0, + -1.0, 1.0, 0.1, -1.0, 0.0, 0.0, + 0.0, 1.0, 0.1, -1.0, 0.0, 0.0, + }; + + memset(&DDBltFx, 0, sizeof(DDBltFx)); + DDBltFx.dwSize = sizeof(DDBltFx); + + memset(&d3dcaps, 0, sizeof(d3dcaps)); + hr = IDirect3DDevice7_GetCaps(device, &d3dcaps); + ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); + if(!(d3dcaps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cubemap support\n"); + return; + } + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "IDirect3DDevice7_GetDirect3D returned %08x\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **) &ddraw); + ok(hr == D3D_OK, "IDirect3D7_QueryInterface returned %08x\n", hr); + IDirect3D7_Release(d3d); + + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_TEXTUREMANAGE; + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 32; + ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000; + ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00; + ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &cubemap, NULL); + ok(hr == DD_OK, "IDirectDraw7_CreateSurface returned %08x\n", hr); + IDirectDraw7_Release(ddraw); + + /* Positive X */ + DDBltFx.dwFillColor = 0x00ff0000; + hr = IDirectDrawSurface7_Blt(cubemap, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_TEXTURE; + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x0000ffff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x0000ff00; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x000000ff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x00ffff00; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x00ff00ff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + hr = IDirect3DDevice7_SetTexture(device, 0, cubemap); + ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "IDirect3DDevice7_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 0 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 4 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 8 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 12* 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "IDirect3DDevice7_EndScene returned %08x\n", hr); + } + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + + color = getPixelColor(device, 160, 360); /* lower left quad - positivex */ + ok(color == 0x00ff0000, "DDSCAPS2_CUBEMAP_POSITIVEX has color 0x%08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 160, 120); /* upper left quad - negativex */ + ok(color == 0x0000ffff, "DDSCAPS2_CUBEMAP_NEGATIVEX has color 0x%08x, expected 0x0000ffff\n", color); + color = getPixelColor(device, 480, 360); /* lower right quad - positivey */ + ok(color == 0x00ff00ff, "DDSCAPS2_CUBEMAP_POSITIVEY has color 0x%08x, expected 0x00ff00ff\n", color); + color = getPixelColor(device, 480, 120); /* upper right quad - positivez */ + ok(color == 0x000000ff, "DDSCAPS2_CUBEMAP_POSITIVEZ has color 0x%08x, expected 0x000000ff\n", color); + hr = IDirect3DDevice7_SetTexture(device, 0, NULL); + ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); + IDirectDrawSurface7_Release(cubemap); +} + START_TEST(visual) { HRESULT hr; @@ -1961,6 +2115,7 @@ START_TEST(visual) offscreen_test(Direct3DDevice); alpha_test(Direct3DDevice); rhw_zero_test(Direct3DDevice); + cubemap_test(Direct3DDevice); releaseObjects(); /* release DX7 interfaces to test D3D1 */

1 0

Stefan Dösinger : d3d9: Make the shading test even more precision tolerant.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 685d14818c33f1952612ca36ed76fef9397ea9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=685d14818c33f1952612ca36e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 13:56:56 2008 +0100 d3d9: Make the shading test even more precision tolerant. This is needed on both windows and wine, seems to be a hardware thing. --- dlls/d3d9/tests/visual.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index da4d7ab..418e92c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright 2005, 2007 Henri Verbeet - * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) + * Copyright (C) 2007-2008 Stefan D�singer(for CodeWeavers) * Copyright (C) 2008 Jason Green(for TransGaming) * * This library is free software; you can redistribute it and/or @@ -6426,12 +6426,12 @@ static void shademode_test(IDirect3DDevice9 *device) r = (color0 & 0x00ff0000) >> 16; g = (color0 & 0x0000ff00) >> 8; b = (color0 & 0x000000ff); - ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); r = (color1 & 0x00ff0000) >> 16; g = (color1 & 0x0000ff00) >> 8; b = (color1 & 0x000000ff); - ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); color0_gouraud = color0; @@ -6444,12 +6444,12 @@ static void shademode_test(IDirect3DDevice9 *device) r = (color0 & 0x00ff0000) >> 16; g = (color0 & 0x0000ff00) >> 8; b = (color0 & 0x000000ff); - ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); r = (color1 & 0x00ff0000) >> 16; g = (color1 & 0x0000ff00) >> 8; b = (color1 & 0x000000ff); - ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); ok(color0 == color0_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n",

1 0

Stefan Dösinger : wined3d: Update copyright lines.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b1d8af7926554c363223b062af47fd206df1f601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d8af7926554c363223b062a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 02:36:13 2008 +0100 wined3d: Update copyright lines. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/basetexture.c | 1 + dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 1 + dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/indexbuffer.c | 1 + dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/query.c | 3 +-- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexbuffer.c | 1 + dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 22 files changed, 22 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d8af7926554c363223b…

1 0

Stefan Dösinger : wined3d: Implement TSSARGTEMP with register combiners.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: bd68237096eb7731239359a2b4941163be015f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd68237096eb7731239359a2b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 13:55:59 2008 +0100 wined3d: Implement TSSARGTEMP with register combiners. --- dlls/wined3d/baseshader.c | 6 +++- dlls/wined3d/state.c | 34 ++++++++++------------------- dlls/wined3d/utils.c | 46 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 43 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd68237096eb773123935…

1 0

Stefan Dösinger : wined3d: Do not report pixel shaders if not supported.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 0f1c2370b11d913c862ce8dc151f5392e8bf5eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1c2370b11d913c862ce8dc1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 1 16:02:10 2008 +0200 wined3d: Do not report pixel shaders if not supported. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8868dac..e372cdc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2049,13 +2049,17 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info */ none_shader_backend.shader_get_caps(devtype, gl_info, pCaps); - 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); + if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { + 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); + } - pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); - pCaps->PixelShader1xMaxValue = 8.0; - TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); + if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); + pCaps->PixelShader1xMaxValue = 8.0; + TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); + } } static void shader_arb_load_init(void) {

1 0

Stefan Dösinger : wined3d: Implement D3DTA_TEMP in the GL_ATI_fragment_shader codepath.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 287f60a2b20902d5e3b12b5236927e8faf929623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287f60a2b20902d5e3b12b523… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 23:55:09 2008 +0100 wined3d: Implement D3DTA_TEMP in the GL_ATI_fragment_shader codepath. --- dlls/wined3d/ati_fragment_shader.c | 78 +++++++++++++++++++++++++++++++++++- dlls/wined3d/baseshader.c | 9 ++++ dlls/wined3d/directx.c | 11 +---- dlls/wined3d/utils.c | 3 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 94 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d483c22..cd6f892 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -208,13 +208,73 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int return ret; } +static GLuint find_tmpreg(struct texture_stage_op op[MAX_TEXTURES]) { + int lowest_read = -1; + int lowest_write = -1; + int i; + BOOL tex_used[MAX_TEXTURES]; + + memset(tex_used, 0, sizeof(tex_used)); + for(i = 0; i < MAX_TEXTURES; i++) { + if(op[i].cop == WINED3DTOP_DISABLE) { + break; + } + + if(lowest_read == -1 && + (op[i].carg1 == WINED3DTA_TEMP || op[i].carg2 == WINED3DTA_TEMP || op[i].carg0 == WINED3DTA_TEMP || + op[i].aarg1 == WINED3DTA_TEMP || op[i].aarg2 == WINED3DTA_TEMP || op[i].aarg0 == WINED3DTA_TEMP)) { + lowest_read = i; + } + + if(lowest_write == -1 && op[i].dst == WINED3DTA_TEMP) { + lowest_write = i; + } + + if(op[i].carg1 == WINED3DTA_TEXTURE || op[i].carg2 == WINED3DTA_TEXTURE || op[i].carg0 == WINED3DTA_TEXTURE || + op[i].aarg1 == WINED3DTA_TEXTURE || op[i].aarg2 == WINED3DTA_TEXTURE || op[i].aarg0 == WINED3DTA_TEXTURE) { + tex_used[i] = TRUE; + } + } + + /* Temp reg not read? We don't need it, return GL_NONE */ + if(lowest_read == -1) return GL_NONE; + + if(lowest_write >= lowest_read) { + FIXME("Temp register read before beeing written\n"); + } + + if(lowest_write == -1) { + /* This needs a test. Maybe we are supposed to return 0.0/0.0/0.0/0.0, or fail drawprim, or whatever */ + FIXME("Temp register read without beeing written\n"); + return GL_REG_1_ATI; + } else if(lowest_write >= 1) { + /* If we're writing to the temp reg at earliest in stage 1, we can use register 1 for the temp result. + * there may be texture data stored in reg 1, but we do not need it any longer since stage 1 already + * read it + */ + return GL_REG_1_ATI; + } else { + /* Search for a free texture register. We have 6 registers available. GL_REG_0_ATI is already used + * for the regular result + */ + for(i = 1; i < 6; i++) { + if(!tex_used[i]) { + return GL_REG_0_ATI + i; + } + } + /* What to do here? Report it in ValidateDevice? */ + FIXME("Could not find a register for the temporary register\n"); + return 0; + } +} + static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_GL_Info *gl_info) { GLuint ret = GL_EXTCALL(glGenFragmentShadersATI(1)); unsigned int stage; GLuint arg0, arg1, arg2, extrarg; GLuint dstmod, argmod0, argmod1, argmod2, argmodextra; GLuint swizzle; - GLuint tmparg = -1; + GLuint tmparg = find_tmpreg(op); GLuint dstreg; if(!ret) { @@ -358,7 +418,16 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G break; } - dstreg = GL_REG_0_ATI; + if(op[stage].dst == WINED3DTA_TEMP) { + /* If we're writing to D3DTA_TEMP, but never reading from it we don't have to write there in the first place. + * skip the entire stage, this saves some GPU time + */ + if(tmparg == GL_NONE) continue; + + dstreg = tmparg; + } else { + dstreg = GL_REG_0_ATI; + } arg0 = register_for_arg(op[stage].carg0, gl_info, stage, &argmod0, tmparg); arg1 = register_for_arg(op[stage].carg1, gl_info, stage, &argmod1, tmparg); @@ -803,6 +872,9 @@ static void init_state_table() { ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].apply = set_tex_op_atifs; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].representative = rep; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].apply = set_tex_op_atifs; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].representative = rep; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00)].apply = set_bumpmat; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT01)].apply = set_bumpmat; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT10)].apply = set_bumpmat; @@ -942,6 +1014,8 @@ static void shader_atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_in WARN("but GL_ATI_fragment_shader limits this to 6\n"); caps->MaxSimultaneousTextures = 6; } + + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; } static void shader_atifs_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 678b119..4bb1ee7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1169,6 +1169,15 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf pCaps->VertexShaderVersion = 0; pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0; + + /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ +#if 0 + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; + if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; +#endif + } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6baf8d3..8cb8ca6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2791,14 +2791,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if(GL_SUPPORT(EXT_BLEND_EQUATION_SEPARATE) && GL_SUPPORT(EXT_BLEND_FUNC_SEPARATE)) pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; -/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ -#if 0 - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; - if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; -#endif - pCaps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT | WINED3DPRASTERCAPS_WFOG | @@ -3089,6 +3081,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, shader_backend = select_shader_backend(Adapter, DeviceType); shader_backend->shader_get_caps(DeviceType, &GLINFO_LOCATION, &shader_caps); + /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ + pCaps->PrimitiveMiscCaps |= shader_caps.PrimitiveMiscCaps; + /* This takes care for disabling vertex shader or pixel shader caps while leaving the other one enabled. * Ignore shader model capabilities if disabled in config */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d0285df..f55ca14 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3271,6 +3271,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct texture_stage_op op[M op[i].carg0 = op[i].carg1 = op[i].carg2 = 0xffffffff; op[i].aarg0 = op[i].aarg1 = op[i].aarg2 = 0xffffffff; op[i].color_correction = WINED3DFMT_UNKNOWN; + op[i].dst = 0xffffffff; i++; break; } @@ -3344,6 +3345,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct texture_stage_op op[M } else { op[i].projected = proj_none; } + + op[i].dst = stateblock->textureState[i][WINED3DTSS_RESULTARG]; } /* Clear unsupported stages */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3f4910..0044bab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -259,6 +259,8 @@ typedef struct SHADER_BUFFER { } SHADER_BUFFER; struct shader_caps { + DWORD PrimitiveMiscCaps; + DWORD TextureOpCaps; DWORD MaxTextureBlendStages; DWORD MaxSimultaneousTextures; @@ -730,6 +732,7 @@ struct texture_stage_op DWORD carg1, carg2, carg0; DWORD aarg1, aarg2, aarg0; WINED3DFORMAT color_correction; + DWORD dst; enum projection_types projected; };

1 0

Stefan Dösinger : wined3d: Prepare the atifs shader generator for temp register support.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 8f9a14e312a382be1c7e33720c92eecb5165a8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9a14e312a382be1c7e33720… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 00:41:07 2008 +0100 wined3d: Prepare the atifs shader generator for temp register support. --- dlls/wined3d/ati_fragment_shader.c | 249 ++++++++++++++++++++++-------------- 1 files changed, 152 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f9a14e312a382be1c7e3…

1 0

Stefan Dösinger : d3d9: Add a test for temporary results.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 20a2afe6aacaac5596bf58e1e9b4a60bcd3bb606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a2afe6aacaac5596bf58e1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 1 16:00:20 2008 +0200 d3d9: Add a test for temporary results. --- dlls/d3d9/tests/visual.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20f3b4e..da4d7ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8561,6 +8561,82 @@ out: } } +static void tssargtemp_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD color; + static const struct vertex quad[] = { + {-1.0, -1.0, 0.1, 0x00ff0000}, + { 1.0, -1.0, 0.1, 0x00ff0000}, + {-1.0, 1.0, 0.1, 0x00ff0000}, + { 1.0, 1.0, 0.1, 0x00ff0000} + }; + D3DCAPS9 caps; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed with %s\n", DXGetErrorString9(hr)); + if(!(caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP)) { + skip("D3DPMISCCAPS_TSSARGTEMP not supported\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_TEMP); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_ADD); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLORARG1, D3DTA_CURRENT); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLORARG2, D3DTA_TEMP); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x0000ff00); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr = %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed with %s\n", DXGetErrorString9(hr)); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 320, 240); + ok(color == 0x00FFFF00, "TSSARGTEMP test returned color 0x%08x, expected 0x00FFFF00\n", color); + + /* Set stage 1 back to default */ + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_CURRENT); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -8654,6 +8730,7 @@ START_TEST(visual) skip("No two sided stencil support\n"); } pointsize_test(device_ptr); + tssargtemp_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) {

1 0

Aric Stewart : imm32: Keep track of context associations between HWND and HIMC.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: dd0c9300f99a9cc4a2ce1178a6fa7e40afe2dc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0c9300f99a9cc4a2ce1178a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 2 08:48:22 2008 -0500 imm32: Keep track of context associations between HWND and HIMC. --- dlls/imm32/imm.c | 55 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ab57bce..4ba1d63 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -110,6 +110,7 @@ static UINT WM_MSIME_RECONVERT; static UINT WM_MSIME_QUERYPOSITION; static UINT WM_MSIME_DOCUMENTFEED; +static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; /* * prototypes */ @@ -623,12 +624,10 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { + HIMC old = NULL; InputContextData *data = (InputContextData*)hIMC; - WARN("(%p, %p): semi-stub\n", hWnd, hIMC); - - if (!hIMC) - return NULL; + TRACE("(%p, %p):\n", hWnd, hIMC); /* * WINE SPECIFIC! MAY CONFLICT @@ -642,9 +641,30 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) /* * If already associated just return */ - if (data->IMC.hWnd == hWnd) + if (hIMC && data->IMC.hWnd == hWnd) return hIMC; + if (hWnd) + { + old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); + + if (old == NULL) + old = (HIMC)root_context; + else if (old == (HIMC)-1) + old = NULL; + + if (hIMC != (HIMC)root_context) + { + if (hIMC == NULL) /* Meaning disable imm for that window*/ + SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); + else + SetPropW(hWnd,szwWineIMCProperty,(HANDLE)hIMC); + } + } + + if (!hIMC) + return old; + if (IsWindow(data->IMC.hWnd)) { /* @@ -663,11 +683,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); } - /* - * TODO: We need to keep track of the old context associated - * with a window and return it for now we will return NULL; - */ - return NULL; + return old; } /*********************************************************************** @@ -1176,13 +1192,24 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) */ HIMC WINAPI ImmGetContext(HWND hWnd) { + HIMC rc = NULL; + TRACE("%p\n", hWnd); - if (!root_context) - return NULL; + rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); + if (rc == (HIMC)-1) + rc = NULL; + else if (rc == NULL) + rc = (HIMC)root_context; + + if (rc) + { + InputContextData *data = (InputContextData*)rc; + data->IMC.hWnd = hWnd; + } + TRACE("returning %p\n", rc); - root_context->IMC.hWnd = hWnd; - return (HIMC)root_context; + return rc; } /***********************************************************************

1 0

Alexandre Julliard : wordpad: Display the larger icon in the about box.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: a54ac90000ec9ecfde1ca2600d22b8c0e3e1c5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54ac90000ec9ecfde1ca2600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:05:33 2008 +0200 wordpad: Display the larger icon in the about box. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2df6ea7..b03ae2e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -883,7 +883,7 @@ static void DialogOpenFile(void) static void dialog_about(void) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HICON icon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); + HICON icon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); ShellAboutW(hMainWnd, wszAppTitle, 0, icon); }

1 0

Herve Chanal : wordpad: A nicer icon.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: a4e01d67b5e2b380ff9f0ae1105d5ed5fb21e60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e01d67b5e2b380ff9f0ae11… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Wed Apr 2 15:46:53 2008 +0200 wordpad: A nicer icon. --- programs/wordpad/Makefile.in | 2 + programs/wordpad/wordpad.ico | Bin 2238 -> 15086 bytes programs/wordpad/wordpad.svg | 930 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 932 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4e01d67b5e2b380ff9f0…

1 0

Paul Vriens : shlwapi/tests: Turn printf into trace or skip.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 428543d9eab687147feb7a4a13f22b3e2e62ee03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428543d9eab687147feb7a4a1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Apr 2 16:51:11 2008 +0200 shlwapi/tests: Turn printf into trace or skip. --- dlls/shlwapi/tests/istream.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index df83786..8eac740 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -192,7 +192,7 @@ static void test_SHCreateStreamOnFileA(DWORD mode) ULONG refcount; static const char * test_file = "c:\\test.txt"; - printf("SHCreateStreamOnFileA: testing mode %d\n", mode); + trace("SHCreateStreamOnFileA: testing mode %d\n", mode); /* invalid arguments */ @@ -287,7 +287,7 @@ static void test_SHCreateStreamOnFileW(DWORD mode) ULONG refcount; static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; - printf("SHCreateStreamOnFileW: testing mode %d\n", mode); + trace("SHCreateStreamOnFileW: testing mode %d\n", mode); /* invalid arguments */ @@ -384,7 +384,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ULONG refcount; static const WCHAR test_file[] = { 'c', ':', '\\', 't', 'e', 's', 't', '.', 't', 'x', 't' }; - printf("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); + trace("SHCreateStreamOnFileEx: testing mode %d, STGM flags %08x\n", mode, stgm); /* invalid arguments */ @@ -415,7 +415,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) "SHCreateStreamOnFileEx: expected E_INVALIDARG or HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); if (ret == E_INVALIDARG) { - printf("SHCreateStreamOnFileEx: STGM_TRANSACTED not supported in this configuration... skipping.\n"); + skip("SHCreateStreamOnFileEx: STGM_TRANSACTED not supported in this configuration.\n"); return; } } else { @@ -554,13 +554,13 @@ START_TEST(istream) pSHCreateStreamOnFileEx = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); if (!pSHCreateStreamOnFileA) - printf("SHCreateStreamOnFileA not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileA not found.\n"); if (!pSHCreateStreamOnFileW) - printf("SHCreateStreamOnFileW not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileW not found.\n"); if (!pSHCreateStreamOnFileEx) - printf("SHCreateStreamOnFileEx not found... those tests will be skipped.\n"); + skip("SHCreateStreamOnFileEx not found.\n"); for (i = 0; i != sizeof(stgm_access)/sizeof(stgm_access[0]); i++) { if (pSHCreateStreamOnFileA)

1 0

Paul Vriens : setupapi/tests: No need to use GetProcAddress as all functions exist on all platforms.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: c535a27670e55b74f934d05122423b879fbc389b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c535a27670e55b74f934d0512… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Apr 2 14:44:32 2008 +0200 setupapi/tests: No need to use GetProcAddress as all functions exist on all platforms. --- dlls/setupapi/tests/query.c | 94 ++++++++++++++++--------------------------- 1 files changed, 35 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c535a27670e55b74f934d…

1 0

Rob Shearman : widl: Turn on verbose errors, which gives a little more information in the case of a syntax error.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: f7f31150eea61387be75321cfd98596ad591d386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f31150eea61387be75321cf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:47 2008 +0100 widl: Turn on verbose errors, which gives a little more information in the case of a syntax error. --- tools/widl/parser.y | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0f22c65..46418a3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -63,6 +63,8 @@ # endif #endif +#define YYERROR_VERBOSE + unsigned char pointer_default = RPC_FC_UP; static int is_object_interface = FALSE;

1 0

Rob Shearman : widl: Fix the writing out of function pointers with more than one level of indirection .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: bfde2c2e7980c6ca6cd39a48c0e20f140ed3275c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfde2c2e7980c6ca6cd39a48c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:38 2008 +0100 widl: Fix the writing out of function pointers with more than one level of indirection. --- tools/widl/header.c | 30 +++++++++++++++++++++--------- tools/widl/parser.y | 8 ++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9fe5082..a568bb4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -296,24 +296,36 @@ void write_type_right(FILE *h, type_t *t, int is_field) void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const char *fmt, va_list args) { + type_t *pt; + int ptr_level = 0; + if (!h) return; - if (t->type == RPC_FC_FUNCTION) { - const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV); + for (pt = t; is_ptr(pt); pt = pt->ref, ptr_level++) + ; + + if (pt->type == RPC_FC_FUNCTION) { + int i; + const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); if (!callconv) callconv = ""; - write_type_left(h, t->ref, declonly); - fprintf(h, " (%s *", callconv); + write_type_left(h, pt->ref, declonly); + fputc(' ', h); + if (ptr_level) fputc('(', h); + fprintf(h, "%s ", callconv); + for (i = 0; i < ptr_level; i++) + fputc('*', h); } else write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) - fprintf(h, " "); + fputc(' ', h); vfprintf(h, fmt, args); } - if (t->type == RPC_FC_FUNCTION) { - fprintf(h, ")("); - write_args(h, t->fields_or_args, NULL, 0, FALSE); - fprintf(h, ")"); + if (pt->type == RPC_FC_FUNCTION) { + if (ptr_level) fputc(')', h); + fputc('(', h); + write_args(h, pt->fields_or_args, NULL, 0, FALSE); + fputc(')', h); } else write_type_right(h, t, is_field); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 155e026..0f22c65 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1375,8 +1375,6 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (pident && pident->is_func) { int func_ptr_level = pident->func_ptr_level; - /* function pointers always have one implicit level of pointer */ - if (func_ptr_level == 1) func_ptr_level = 0; v->type = make_type(RPC_FC_FUNCTION, v->type); v->type->fields_or_args = pident->args; if (pident->callconv) @@ -1738,12 +1736,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a } if (pident->is_func) { int func_ptr_level = pident->func_ptr_level; - /* function pointers always have one implicit level of pointer */ - if (func_ptr_level == 1) func_ptr_level = 0; cur = make_type(RPC_FC_FUNCTION, cur); cur->fields_or_args = pident->args; - for (; func_ptr_level > 0; func_ptr_level--) - cur = make_type(pointer_default, cur); if (pident->callconv) cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); else if (is_object_interface) { @@ -1751,6 +1745,8 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); } + for (; func_ptr_level > 0; func_ptr_level--) + cur = make_type(pointer_default, cur); } cur = alias(cur, name->name); cur->attrs = attrs;

1 0

Rob Shearman : widl: Add a newline between function prototypes for non-object interfaces.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 5a378905bedb264ad1667d1ecbb0067b065bddbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a378905bedb264ad1667d1ec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:27 2008 +0100 widl: Add a newline between function prototypes for non-object interfaces. --- tools/widl/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d2f7ae4..9fe5082 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -871,7 +871,7 @@ static void write_function_proto(const type_t *iface, const func_t *fun, const c write_args(header, fun->args, iface->name, 0, TRUE); else fprintf(header, " void"); - fprintf(header, ");\n"); + fprintf(header, ");\n\n"); } static void write_function_protos(const type_t *iface)

1 0

Rob Shearman : widl: Support __fastcall and __pascal calling conventions.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 35ba23bd48b718c22dec69e047405d6156d875dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ba23bd48b718c22dec69e04… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:21 2008 +0100 widl: Support __fastcall and __pascal calling conventions. Support the synonyms for these and existing calling conventions. --- tools/widl/parser.l | 8 ++++++++ tools/widl/parser.y | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 3bcdc26..66110b6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -186,13 +186,19 @@ static const struct keyword keywords[] = { {"FALSE", tFALSE}, {"TRUE", tTRUE}, {"__cdecl", tCDECL}, + {"__fastcall", tFASTCALL}, + {"__pascal", tPASCAL}, {"__int64", tINT64}, {"__stdcall", tSTDCALL}, + {"_cdecl", tCDECL}, + {"_fastcall", tFASTCALL}, + {"_pascal", tPASCAL}, {"_stdcall", tSTDCALL}, {"boolean", tBOOLEAN}, {"byte", tBYTE}, {"callback", tCALLBACK}, {"case", tCASE}, + {"cdecl", tCDECL}, {"char", tCHAR}, {"coclass", tCOCLASS}, {"code", tCODE}, @@ -217,11 +223,13 @@ static const struct keyword keywords[] = { {"long", tLONG}, {"methods", tMETHODS}, {"module", tMODULE}, + {"pascal", tPASCAL}, {"properties", tPROPERTIES}, {"short", tSHORT}, {"signed", tSIGNED}, {"sizeof", tSIZEOF}, {"small", tSMALL}, + {"stdcall", tSTDCALL}, {"struct", tSTRUCT}, {"switch", tSWITCH}, {"typedef", tTYPEDEF}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 685322a..155e026 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -181,6 +181,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tENTRY tENUM tERRORSTATUST %token tEXPLICITHANDLE tEXTERN %token tFALSE +%token tFASTCALL %token tFLOAT %token tHANDLE %token tHANDLET @@ -208,6 +209,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %token tOBJECT tODL tOLEAUTOMATION %token tOPTIONAL %token tOUT +%token tPASCAL %token tPOINTERDEFAULT %token tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF @@ -520,6 +522,8 @@ uuid_string: ; callconv: tCDECL { $$ = $<str>1; } + | tFASTCALL { $$ = $<str>1; } + | tPASCAL { $$ = $<str>1; } | tSTDCALL { $$ = $<str>1; } ;

1 0

Rob Shearman : widl: Support parsing calling conventions for function identifiers.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: d97f3205bac5dd26bb0cf6eceb68925484430398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97f3205bac5dd26bb0cf6ece… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:56:13 2008 +0100 widl: Support parsing calling conventions for function identifiers. Support automatically setting the calling convention to STDMETHODCALLTYPE if it is part of an object interface. Write out the calling convention in write_type_v. --- tools/widl/header.c | 27 ++++++++++++++------------- tools/widl/parser.y | 43 +++++++++++++++++++++++++++++++++++-------- tools/widl/widltypes.h | 2 ++ 3 files changed, 51 insertions(+), 21 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 08964cb..d2f7ae4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -298,13 +298,24 @@ void write_type_v(FILE *h, type_t *t, int is_field, int declonly, { if (!h) return; - write_type_left(h, t, declonly); + if (t->type == RPC_FC_FUNCTION) { + const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; + write_type_left(h, t->ref, declonly); + fprintf(h, " (%s *", callconv); + } else + write_type_left(h, t, declonly); if (fmt) { if (needs_space_after(t)) fprintf(h, " "); vfprintf(h, fmt, args); } - write_type_right(h, t, is_field); + if (t->type == RPC_FC_FUNCTION) { + fprintf(h, ")("); + write_args(h, t->fields_or_args, NULL, 0, FALSE); + fprintf(h, ")"); + } else + write_type_right(h, t, is_field); } void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *fmt, ...) @@ -690,17 +701,7 @@ void write_args(FILE *h, const var_list_t *args, const char *name, int method, i } else fprintf(h, ","); } - if (arg->type->type == RPC_FC_FUNCTION) - { - write_type_decl_left(h, arg->type->ref); - fprintf(h, " (STDMETHODCALLTYPE *"); - write_name(h,arg); - fprintf(h, ")("); - write_args(h, arg->type->fields_or_args, NULL, 0, FALSE); - fprintf(h, ")"); - } - else - write_type_decl(h, arg->type, "%s", arg->name); + write_type_decl(h, arg->type, "%s", arg->name); count++; } if (do_indent) indentation--; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5e54daa..685322a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -64,6 +64,7 @@ #endif unsigned char pointer_default = RPC_FC_UP; +static int is_object_interface = FALSE; typedef struct list typelist_t; struct typenode { @@ -265,7 +266,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr +%type <str> libraryhdr callconv %type <uuid> uuid_string %type <num> import_start @@ -518,8 +519,8 @@ uuid_string: $$ = parse_uuid($1); } ; -callconv: - | tSTDCALL +callconv: tCDECL { $$ = $<str>1; } + | tSTDCALL { $$ = $<str>1; } ; cases: { $$ = NULL; } @@ -653,11 +654,11 @@ s_field: m_attributes type pident array { $$ = $3->var; ; funcdef: - m_attributes type callconv pident { var_t *v = $4->var; - var_list_t *args = $4->args; + m_attributes type pident { var_t *v = $3->var; + var_list_t *args = $3->args; v->attrs = $1; - set_type(v, $2, $4, NULL, FALSE); - free($4); + set_type(v, $2, $3, NULL, FALSE); + free($3); $$ = make_func(v, args); if (is_attr(v->attrs, ATTR_IN)) { error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); @@ -757,6 +758,7 @@ dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; + is_object_interface = TRUE; $$ = $2; if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); @@ -806,6 +808,7 @@ interfacehdr: attributes interface { $$.interface = $2; $$.old_pointer_default = pointer_default; if (is_attr($1, ATTR_POINTERDEFAULT)) pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); + is_object_interface = is_object($1); if ($2->defined) error_loc("multiple definition error\n"); $2->attrs = $1; $2->defined = TRUE; @@ -863,10 +866,19 @@ moduledef: modulehdr '{' int_statements '}' pident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } | tCONST pident { $$ = $2; /* FIXME */ } + | callconv pident { $$ = $2; + if ($$->callconv) parser_warning("multiple calling conventions %s, %s for function %s\n", $$->callconv, $1, $$->var->name); + $$->callconv = $1; + } | direct_ident ; -func_ident: direct_ident '(' m_args ')' { $$ = $1; $1->args = $3; $1->is_func = TRUE; } +func_ident: direct_ident '(' m_args ')' + { $$ = $1; + $1->args = $3; + $1->is_func = TRUE; + } + ; direct_ident: ident { $$ = make_pident($1); } | '(' pident ')' { $$ = $2; } @@ -1363,6 +1375,13 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (func_ptr_level == 1) func_ptr_level = 0; v->type = make_type(RPC_FC_FUNCTION, v->type); v->type->fields_or_args = pident->args; + if (pident->callconv) + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + v->type->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } for (; func_ptr_level > 0; func_ptr_level--) v->type = make_type(ptr_type, v->type); } @@ -1542,6 +1561,7 @@ static pident_t *make_pident(var_t *var) p->ptr_level = 0; p->func_ptr_level = 0; p->args = NULL; + p->callconv = NULL; return p; } @@ -1720,6 +1740,13 @@ static type_t *reg_typedefs(type_t *type, pident_list_t *pidents, attr_list_t *a cur->fields_or_args = pident->args; for (; func_ptr_level > 0; func_ptr_level--) cur = make_type(pointer_default, cur); + if (pident->callconv) + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, pident->callconv)); + else if (is_object_interface) { + static char *stdmethodcalltype; + if (!stdmethodcalltype) stdmethodcalltype = strdup("STDMETHODCALLTYPE"); + cur->attrs = append_attr(NULL, make_attrp(ATTR_CALLCONV, stdmethodcalltype)); + } } cur = alias(cur, name->name); cur->attrs = attrs; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d8f4c69..259049e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -70,6 +70,7 @@ enum attr_type ATTR_AUTO_HANDLE, ATTR_BINDABLE, ATTR_CALLAS, + ATTR_CALLCONV, /* calling convention pseudo-attribute */ ATTR_CASE, ATTR_CONTEXTHANDLE, ATTR_CONTROL, @@ -250,6 +251,7 @@ struct _pident_t { /* levels of indirection for function pointers */ int func_ptr_level; var_list_t *args; + char *callconv; /* parser-internal */ struct list entry;

1 0

Rob Shearman : widl: Store function and function pointer types completely within type_t type.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 6a0c5a4fe9beb9de0c4689ee3cb08c48d0c3ac12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0c5a4fe9beb9de0c4689ee3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:55:53 2008 +0100 widl: Store function and function pointer types completely within type_t type. --- tools/widl/header.c | 14 ++++---- tools/widl/parser.y | 71 ++++++++++++++++++++++++++++++---------------- tools/widl/typegen.c | 62 ++++++++++++++++++++-------------------- tools/widl/widltypes.h | 10 ++++-- tools/widl/write_msft.c | 12 ++++---- 5 files changed, 97 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a0c5a4fe9beb9de0c468…

1 0

Rob Shearman : widl: Add a function to get the return type of a parsed function.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: a04b150839ea1351854b3ab8f8e288d515de93c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04b150839ea1351854b3ab8f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 2 12:55:34 2008 +0100 widl: Add a function to get the return type of a parsed function. This clarifies its use in code and makes it simpler to change the way functions are parsed into types. --- tools/widl/client.c | 24 +++++++++--------- tools/widl/header.c | 16 ++++++------ tools/widl/proxy.c | 22 ++++++++++------- tools/widl/server.c | 6 ++-- tools/widl/typegen.c | 61 ++++++++++++++++++++++++++-------------------- tools/widl/typegen.h | 2 +- tools/widl/widltypes.h | 5 ++++ tools/widl/write_msft.c | 2 +- 8 files changed, 77 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04b150839ea1351854b3…

1 0

Alexandre Julliard : winex11: Allow mapping/ unmapping a window even while processing another event.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: f41e2339b73eb624e5d3136ef9b4fe6c38ed3843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41e2339b73eb624e5d3136ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 16:57:17 2008 +0200 winex11: Allow mapping/unmapping a window even while processing another event. --- dlls/winex11.drv/winpos.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e858acf..912ddfb 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -388,14 +388,11 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) event_type = thread_data->current_event->type; - if (event_type == ConfigureNotify || event_type == PropertyNotify) - { - TRACE( "not changing window %p/%lx while processing event %u\n", - hwnd, data->whole_window, event_type ); - return; - } + if (event_type != ConfigureNotify && event_type != PropertyNotify) + event_type = 0; /* ignore other events */ - if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) + if (data->mapped && (!(new_style & WS_VISIBLE) || + (!event_type && !X11DRV_is_window_rect_mapped( rectWindow )))) { TRACE( "unmapping win %p/%lx\n", hwnd, data->whole_window ); wait_for_withdrawn_state( display, data, FALSE ); @@ -408,7 +405,8 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, } /* don't change position if we are about to minimize or maximize a managed window */ - if (!(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) + if (!event_type && + !(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & (WS_MINIMIZE|WS_MAXIMIZE)))) X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); if ((new_style & WS_VISIBLE) &&

1 0

Alexandre Julliard : winex11: Replace the lock_changes flag by a check on the event currently being processed .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 86675edfeeb12deae0bbdd610e4ddb4d5188f76c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86675edfeeb12deae0bbdd610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 16:43:49 2008 +0200 winex11: Replace the lock_changes flag by a check on the event currently being processed. --- dlls/winex11.drv/event.c | 4 ---- dlls/winex11.drv/winpos.c | 20 ++++++++++++++++---- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c57d497..8fd9b20 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -743,17 +743,13 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - data->lock_changes++; SetWindowPlacement( data->hwnd, &wp ); - data->lock_changes--; } else if (!data->iconic && data->wm_state == IconicState) { TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - data->lock_changes++; ShowWindow( data->hwnd, SW_MINIMIZE ); - data->lock_changes--; } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e60d42a..e858acf 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -300,10 +300,12 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *rectWindow, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - Display *display = thread_display(); + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); RECT old_window_rect, old_whole_rect, old_client_rect; + int event_type; if (!data) { @@ -379,7 +381,19 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, X11DRV_sync_client_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); - if (!data->whole_window || data->lock_changes) return; /* nothing more to do */ + if (!data->whole_window) return; + + /* check if we are currently processing an event relevant to this window */ + event_type = 0; + if (thread_data->current_event && thread_data->current_event->xany.window == data->whole_window) + event_type = thread_data->current_event->type; + + if (event_type == ConfigureNotify || event_type == PropertyNotify) + { + TRACE( "not changing window %p/%lx while processing event %u\n", + hwnd, data->whole_window, event_type ); + return; + } if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { @@ -578,9 +592,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) TRACE( "%p resizing from (%dx%d) to (%dx%d)\n", hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); - data->lock_changes++; SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); - data->lock_changes--; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index fbf9ebc..ab5ff76 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -678,7 +678,6 @@ struct x11drv_win_data BOOL iconic : 1; /* is window in iconic state? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ - unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; };

1 0

Alexandre Julliard : winex11: Rely on PropertyNotify events instead of Map/ UnmapNotify to detect iconification.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: a442d3b46db31fbaa8ee7aad64373bcb951bda7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a442d3b46db31fbaa8ee7aad6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:58:59 2008 +0200 winex11: Rely on PropertyNotify events instead of Map/UnmapNotify to detect iconification. --- dlls/winex11.drv/event.c | 55 ++++++++++++++++++++++++++++++++++++--- dlls/winex11.drv/winpos.c | 62 --------------------------------------------- dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 50 insertions(+), 68 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1bcec8c..c57d497 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -104,7 +104,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = /* VisibilityNotify */ /* CreateNotify */ { DestroyNotify, X11DRV_DestroyNotify }, - { UnmapNotify, X11DRV_UnmapNotify }, + /* UnmapNotify */ { MapNotify, X11DRV_MapNotify }, /* MapRequest */ /* ReparentNotify */ @@ -123,7 +123,7 @@ static struct event_handler handlers[MAX_EVENT_HANDLERS] = { MappingNotify, X11DRV_MappingNotify }, }; -static int nb_event_handlers = 19; /* change this if you add handlers above */ +static int nb_event_handlers = 18; /* change this if you add handlers above */ /* return the name of an X event */ @@ -691,7 +691,8 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) * * Handle a PropertyNotify for WM_STATE. */ -static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event, + BOOL update_window ) { switch(event->state) { @@ -710,6 +711,50 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent } break; } + + if (!update_window || !data->managed || !data->mapped) return; + + if (data->iconic && data->wm_state == NormalState) /* restore window */ + { + int x, y; + unsigned int width, height, border, depth; + Window root, top; + WINDOWPLACEMENT wp; + RECT rect; + + /* FIXME: hack */ + wine_tsx11_lock(); + XGetGeometry( event->display, data->whole_window, &root, &x, &y, &width, &height, + &border, &depth ); + XTranslateCoordinates( event->display, data->whole_window, root, 0, 0, &x, &y, &top ); + wine_tsx11_unlock(); + rect.left = x; + rect.top = y; + rect.right = x + width; + rect.bottom = y + height; + OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); + X11DRV_X_to_window_rect( data, &rect ); + + wp.length = sizeof(wp); + GetWindowPlacement( data->hwnd, &wp ); + wp.flags = 0; + wp.showCmd = SW_RESTORE; + wp.rcNormalPosition = rect; + + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = FALSE; + data->lock_changes++; + SetWindowPlacement( data->hwnd, &wp ); + data->lock_changes--; + } + else if (!data->iconic && data->wm_state == IconicState) + { + TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); + data->iconic = TRUE; + data->lock_changes++; + ShowWindow( data->hwnd, SW_MINIMIZE ); + data->lock_changes--; + } } @@ -724,7 +769,7 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event, TRUE ); } @@ -762,7 +807,7 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B else { wine_tsx11_unlock(); - handle_wm_state_notify( data, &event.xproperty ); + handle_wm_state_notify( data, &event.xproperty, FALSE ); wine_tsx11_lock(); } } diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 13ec6f1..e60d42a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -437,7 +437,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->mapped) return; @@ -446,71 +445,10 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { HWND hwndFocus = GetFocus(); if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ - return; } - if (!data->iconic) return; - - state = get_window_wm_state( event->xmap.display, data ); - if (state == NormalState) - { - int x, y; - unsigned int width, height, border, depth; - Window root, top; - WINDOWPLACEMENT wp; - RECT rect; - - /* FIXME: hack */ - wine_tsx11_lock(); - XGetGeometry( event->xmap.display, data->whole_window, &root, &x, &y, &width, &height, - &border, &depth ); - XTranslateCoordinates( event->xmap.display, data->whole_window, root, 0, 0, &x, &y, &top ); - wine_tsx11_unlock(); - rect.left = x; - rect.top = y; - rect.right = x + width; - rect.bottom = y + height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - X11DRV_X_to_window_rect( data, &rect ); - - wp.length = sizeof(wp); - GetWindowPlacement( hwnd, &wp ); - wp.flags = 0; - wp.showCmd = SW_RESTORE; - wp.rcNormalPosition = rect; - - TRACE( "restoring win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = FALSE; - data->lock_changes++; - SetWindowPlacement( hwnd, &wp ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); } -/********************************************************************** - * X11DRV_UnmapNotify - */ -void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) -{ - struct x11drv_win_data *data; - int state; - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->managed || !data->mapped || data->iconic) return; - - state = get_window_wm_state( event->xunmap.display, data ); - if (state == IconicState) - { - TRACE( "minimizing win %p/%lx\n", hwnd, data->whole_window ); - data->iconic = TRUE; - data->lock_changes++; - ShowWindow( hwnd, SW_MINIMIZE ); - data->lock_changes--; - } - else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); -} - struct desktop_resize_data { RECT old_screen_rect; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 52670e8..fbf9ebc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -630,7 +630,6 @@ extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_Expose( HWND hwnd, XEvent *event ); extern void X11DRV_DestroyNotify( HWND hwnd, XEvent *event ); extern void X11DRV_MapNotify( HWND hwnd, XEvent *event ); -extern void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ); extern void X11DRV_ConfigureNotify( HWND hwnd, XEvent *event ); extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event );

1 0

Alexandre Julliard : winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: f89aa1282907bb5d1192fbdaa53becbb6a109150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89aa1282907bb5d1192fbdaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 15:55:25 2008 +0200 winex11: Move handling of WM_STATE changes to a separate function, and call it directly from wait_from_withdrawn_state. --- dlls/winex11.drv/event.c | 56 ++++++++++++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cd6eaf6..1bcec8c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -687,28 +687,19 @@ int get_window_wm_state( Display *display, struct x11drv_win_data *data ) /*********************************************************************** - * EVENT_PropertyNotify + * handle_wm_state_notify + * + * Handle a PropertyNotify for WM_STATE. */ -static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent *event ) { - XPropertyEvent *event = &xev->xproperty; - struct x11drv_win_data *data; - - if (!hwnd) return; - if (!(data = X11DRV_get_win_data( hwnd ))) return; - switch(event->state) { case PropertyDelete: - if (event->atom == x11drv_atom(WM_STATE)) - { - data->wm_state = WithdrawnState; - TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); - } + data->wm_state = WithdrawnState; + TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); break; - case PropertyNewValue: - if (event->atom == x11drv_atom(WM_STATE)) { int new_state = get_window_wm_state( event->display, data ); if (new_state != -1 && new_state != data->wm_state) @@ -722,6 +713,21 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) } +/*********************************************************************** + * EVENT_PropertyNotify + */ +static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) +{ + XPropertyEvent *event = &xev->xproperty; + struct x11drv_win_data *data; + + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( data, event ); +} + + /* event filter to wait for a WM_STATE change notification on a window */ static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) { @@ -744,7 +750,25 @@ void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, B while (data->whole_window && ((data->wm_state == WithdrawnState) == !set)) { - if (!process_events( display, is_wm_state_notify, data->whole_window )) + XEvent event; + int count = 0; + + wine_tsx11_lock(); + while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)data->whole_window )) + { + count++; + if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ + if (event.type == DestroyNotify) call_event_handler( display, &event ); + else + { + wine_tsx11_unlock(); + handle_wm_state_notify( data, &event.xproperty ); + wine_tsx11_lock(); + } + } + wine_tsx11_unlock(); + + if (!count) { struct pollfd pfd; int timeout = end - GetTickCount();

1 0

Alexander Morozov : setupapi: Create DeviceInstance value in registry, delete todo_wine from test.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 997bea9b896fa748d6ec185c5462f11e0326904d URL: http://source.winehq.org/git/wine.git/?a=commit;h=997bea9b896fa748d6ec185c5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:10 2008 +0300 setupapi: Create DeviceInstance value in registry, delete todo_wine from test. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++++++---------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ebfeee0..75cb38b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2650,20 +2650,31 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( samDesired, NULL, &interfKey, NULL); if (!l) { - if (instancePath) - { - LONG l; + struct DeviceInfo *devInfo = + (struct DeviceInfo *)ifaceInfo->device->Reserved; - l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + l = RegSetValueExW(interfKey, DeviceInstance, 0, REG_SZ, + (BYTE *)devInfo->instanceId, + (lstrlenW(devInfo->instanceId) + 1) * sizeof(WCHAR)); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); } + else + SetLastError(l); RegCloseKey(interfKey); } else diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index af98eb2..7f63afc 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -816,7 +816,6 @@ static void testRegisterAndGetDetail(void) SetLastError(0xdeadbeef); ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); - todo_wine ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); @@ -836,7 +835,6 @@ static void testRegisterAndGetDetail(void) ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, detail, dwSize, &dwSize, NULL); ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); - todo_wine ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); HeapFree(GetProcessHeap(), 0, detail);

1 0

Alexander Morozov : setupapi: Create device interface keys in registry as in Windows XP.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 6a5c1ca25bd77fde9e825e31dca4d4cc0d1fea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5c1ca25bd77fde9e825e31d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:25:01 2008 +0300 setupapi: Create device interface keys in registry as in Windows XP. --- dlls/setupapi/devinst.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e9c8124..ebfeee0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2631,21 +2631,44 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW( struct InterfaceInfo *ifaceInfo = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; PWSTR instancePath = SETUPDI_GetInstancePath(ifaceInfo); + PWSTR interfKeyName = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(ifaceInfo->symbolicLink) + 1) * sizeof(WCHAR)); + HKEY interfKey; + WCHAR *ptr; - if (instancePath) + lstrcpyW(interfKeyName, ifaceInfo->symbolicLink); + if (lstrlenW(ifaceInfo->symbolicLink) > 3) { - LONG l; - - l = RegCreateKeyExW(parent, instancePath, 0, NULL, 0, - samDesired, NULL, &key, NULL); - if (l) + interfKeyName[0] = '#'; + interfKeyName[1] = '#'; + interfKeyName[3] = '#'; + } + ptr = strchrW(interfKeyName, '\\'); + if (ptr) + *ptr = 0; + l = RegCreateKeyExW(parent, interfKeyName, 0, NULL, 0, + samDesired, NULL, &interfKey, NULL); + if (!l) + { + if (instancePath) { - SetLastError(l); - key = INVALID_HANDLE_VALUE; + LONG l; + + l = RegCreateKeyExW(interfKey, instancePath, 0, NULL, 0, + samDesired, NULL, &key, NULL); + if (l) + { + SetLastError(l); + key = INVALID_HANDLE_VALUE; + } + else if (InfHandle) + FIXME("INF section installation unsupported\n"); } - else if (InfHandle) - FIXME("INF section installation unsupported\n"); + RegCloseKey(interfKey); } + else + SetLastError(l); + HeapFree(GetProcessHeap(), 0, interfKeyName); HeapFree(GetProcessHeap(), 0, instancePath); RegCloseKey(parent); }

1 0

Alexander Morozov : setupapi: Added a test for registering device interface and getting device path.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: c4fb0f236eadadf0910e59e8bfd87b610774c09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb0f236eadadf0910e59e8b… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Mar 28 20:38:46 2008 +0300 setupapi: Added a test for registering device interface and getting device path. --- dlls/setupapi/tests/devinst.c | 68 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2704d31..af98eb2 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); static void init_function_pointers(void) { @@ -70,6 +71,7 @@ static void init_function_pointers(void) pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); + pSetupDiGetClassDevsA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetClassDevsA"); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -779,6 +781,71 @@ static void testDevRegKey(void) devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } +static void testRegisterAndGetDetail(void) +{ + HDEVINFO set; + BOOL ret; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; + SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), { 0 } }; + DWORD dwSize = 0; + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_ALLCLASSES); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, NULL, 0, + DICD_GENERATE_ID, &devInfo); + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, &interfaceData); + ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); + ok(ret, "SetupDiRegisterDeviceInfo failed: %08x\n", GetLastError()); + + pSetupDiDestroyDeviceInfoList(set); + + SetLastError(0xdeadbeef); + set = pSetupDiGetClassDevsA(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); + ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsA failed: %08x\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetupDiEnumDeviceInterfaces(set, NULL, &guid, 0, &interfaceData); + todo_wine + ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, NULL, 0, &dwSize, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + static const char path[] = + "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; + + detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); + if (detail) + { + detail->cbSize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInterfaceDetailA(set, &interfaceData, + detail, dwSize, &dwSize, NULL); + ok(ret, "SetupDiGetDeviceInterfaceDetailA failed: %08x\n", GetLastError()); + todo_wine + ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", + detail->DevicePath); + HeapFree(GetProcessHeap(), 0, detail); + } + } + + pSetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { init_function_pointers(); @@ -799,4 +866,5 @@ START_TEST(devinst) testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); testDevRegKey(); + testRegisterAndGetDetail(); }

1 0

Alexander Morozov : setupapi: Creating SymbolicLink value in registry as in Windows XP.
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: b622101ef252071f6797368f0b4c0911ade2bd5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b622101ef252071f6797368f0… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Apr 1 14:24:50 2008 +0300 setupapi: Creating SymbolicLink value in registry as in Windows XP. --- dlls/setupapi/devinst.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 60da5e8..e9c8124 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -244,7 +244,7 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* omit length of format specifiers, but include NULL terminator: */ len = lstrlenW(fmt) - 4 + 1; len += lstrlenW(instanceId) + lstrlenW(guidStr); - if (ReferenceString) + if (ReferenceString && *ReferenceString) { /* space for a hash between string and reference string: */ len += lstrlenW(ReferenceString) + 1; @@ -258,10 +258,10 @@ static LPWSTR SETUPDI_CreateSymbolicLinkPath(LPCWSTR instanceId, /* replace '\\' with '#' after the "\\\\?\\" beginning */ for (ptr = strchrW(ret + 4, '\\'); ptr; ptr = strchrW(ptr + 1, '\\')) *ptr = '#'; - if (ReferenceString) + if (ReferenceString && *ReferenceString) { - ret[printed - 1] = '\\'; - lstrcpyW(ret + printed, ReferenceString); + ret[printed] = '\\'; + lstrcpyW(ret + printed + 1, ReferenceString); } } return ret;

1 0

Mikołaj Zalewski : gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts .
by Alexandre Julliard 02 Apr '08

02 Apr '08

Module: wine Branch: master Commit: 4094ff025675a14e7572d975d4fd1bf7c11dc2e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4094ff025675a14e7572d975d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 30 21:43:15 2008 +0200 gdi32: Fix GetGlyphIndices to select properly the invalid char glyph for TrueType fonts. --- dlls/gdi32/freetype.c | 21 ++++++++++++++------- dlls/gdi32/tests/font.c | 32 +++++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 04db3ae..6356c1f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4068,26 +4068,33 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) /************************************************************* * WineEngGetGlyphIndices * - * FIXME: add support for GGI_MARK_NONEXISTING_GLYPHS */ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - WCHAR default_char = 0; - TEXTMETRICW textm; + int default_char = -1; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0x001f; /* Indicate non existence */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (!default_char) + if (default_char == -1) { - WineEngGetTextMetrics(font, &textm); - default_char = textm.tmDefaultChar; + if (FT_IS_SFNT(font->ft_face)) + { + TT_OS2 *pOS2 = pFT_Get_Sfnt_Table(font->ft_face, ft_sfnt_os2); + default_char = (pOS2->usDefaultChar ? get_glyph_index(font, pOS2->usDefaultChar) : 0); + } + else + { + TEXTMETRICW textm; + WineEngGetTextMetrics(font, &textm); + default_char = textm.tmDefaultChar; + } } pgi[i] = default_char; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ce34ab2..d85ab12 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -583,35 +583,49 @@ static void test_GetGlyphIndices(void) WCHAR testtext[] = {'T','e','s','t',0xffff,0}; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRIC textm; + HFONT hOldFont; if (!pGetGlyphIndicesW) { skip("GetGlyphIndices not available on platform\n"); return; } - if(!is_font_installed("Symbol")) + hdc = GetDC(0); + + ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); + flags |= GGI_MARK_NONEXISTING_GLYPHS; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + flags = 0; + charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); + ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + textm.tmDefaultChar, glyphs[4]); + + if(!is_font_installed("Tahoma")) { - skip("Symbol is not installed so skipping this test\n"); + skip("Tahoma is not installed so skipping this test\n"); return; } - memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Symbol"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; hfont = CreateFontIndirectA(&lf); - hdc = GetDC(0); - + hOldFont = SelectObject(hdc, hfont); ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == UNICODE_NOCHAR /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; + testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + DeleteObject(SelectObject(hdc, hOldFont)); } static void test_GetKerningPairs(void)

1 0

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 April 2008