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

Peter Beutner : msvidc: Change short description to MS-CRAM.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: d5d441d79043a3e789750472c64dff6aecdd7bb7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5d441d79043a3e78975047… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Fri Jun 9 16:31:12 2006 +0200 msvidc: Change short description to MS-CRAM. --- dlls/msvidc32/msvidc32_De.rc | 2 +- dlls/msvidc32/msvidc32_En.rc | 2 +- dlls/msvidc32/msvidc32_Fr.rc | 2 +- dlls/msvidc32/msvidc32_Hu.rc | 2 +- dlls/msvidc32/msvidc32_Ko.rc | 2 +- dlls/msvidc32/msvidc32_No.rc | 2 +- dlls/msvidc32/msvidc32_Tr.rc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvidc32/msvidc32_De.rc b/dlls/msvidc32/msvidc32_De.rc index 10402bc..4ba8b0d 100644 --- a/dlls/msvidc32/msvidc32_De.rc +++ b/dlls/msvidc32/msvidc32_De.rc @@ -21,6 +21,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 Video Codec" } diff --git a/dlls/msvidc32/msvidc32_En.rc b/dlls/msvidc32/msvidc32_En.rc index 8267823..93c8518 100644 --- a/dlls/msvidc32/msvidc32_En.rc +++ b/dlls/msvidc32/msvidc32_En.rc @@ -20,6 +20,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 video codec" } diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index 6cd2fea..bc85e58 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc @@ -20,6 +20,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "codec vid�o Wine Video 1" } diff --git a/dlls/msvidc32/msvidc32_Hu.rc b/dlls/msvidc32/msvidc32_Hu.rc index ed64fc2..c031963 100644 --- a/dlls/msvidc32/msvidc32_Hu.rc +++ b/dlls/msvidc32/msvidc32_Hu.rc @@ -20,6 +20,6 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1 video kodek" } diff --git a/dlls/msvidc32/msvidc32_Ko.rc b/dlls/msvidc32/msvidc32_Ko.rc index 1a5605c..11c18c1 100644 --- a/dlls/msvidc32/msvidc32_Ko.rc +++ b/dlls/msvidc32/msvidc32_Ko.rc @@ -20,6 +20,6 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine �� 1 �� ڵ�" } diff --git a/dlls/msvidc32/msvidc32_No.rc b/dlls/msvidc32/msvidc32_No.rc index da92460..6d27778 100644 --- a/dlls/msvidc32/msvidc32_No.rc +++ b/dlls/msvidc32/msvidc32_No.rc @@ -20,6 +20,6 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGI STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Video 1-videokodek" } diff --git a/dlls/msvidc32/msvidc32_Tr.rc b/dlls/msvidc32/msvidc32_Tr.rc index 6c8feba..2353b0c 100644 --- a/dlls/msvidc32/msvidc32_Tr.rc +++ b/dlls/msvidc32/msvidc32_Tr.rc @@ -22,6 +22,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_NAME "WINE-MS-CRAM" + IDS_NAME "MS-CRAM" IDS_DESCRIPTION "Wine Vidyo 1 vidyo ��z�c�" }

1 0

Dmitry Timoshkov : user: Neither WS_CAPTION nor WS_EX_APPWINDOW has anything to do how
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 2dd2eafd3c6228da2574cc3a09bf1e5b9d7b83dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2dd2eafd3c6228da2574cc3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 9 23:13:50 2006 +0900 user: Neither WS_CAPTION nor WS_EX_APPWINDOW has anything to do how passed in to CreateWindow menu should be handled. --- dlls/user/menu.c | 8 +++ dlls/user/tests/win.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/win.c | 3 - 3 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 4b10e7f..83e55d9 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -4337,7 +4337,13 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID BOOL WINAPI IsMenu(HMENU hmenu) { LPPOPUPMENU menu = MENU_GetMenu(hmenu); - return menu != NULL; + + if (!menu) + { + SetLastError(ERROR_INVALID_MENU_HANDLE); + return FALSE; + } + return TRUE; } /********************************************************************** diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 7adfa35..f291fff 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -3604,6 +3604,138 @@ static void test_IsWindowUnicode(void) DestroyWindow(hwnd); } +static void test_CreateWindow(void) +{ + HWND hwnd, parent; + HMENU hmenu; + +#define expect_menu(window, menu) \ + SetLastError(0xdeadbeef); \ + ok(GetMenu(window) == (HMENU)menu, "GetMenu error %ld\n", GetLastError()) + +#define expect_style(window, style)\ + ok(GetWindowLong(window, GWL_STYLE) == (style), "expected style %lx != %lx\n", (long)(style), GetWindowLong(window, GWL_STYLE)) + +#define expect_ex_style(window, ex_style)\ + ok(GetWindowLong(window, GWL_EXSTYLE) == (ex_style), "expected ex_style %lx != %lx\n", (long)(ex_style), GetWindowLong(window, GWL_EXSTYLE)) + + hmenu = CreateMenu(); + assert(hmenu != 0); + parent = GetDesktopWindow(); + assert(parent != 0); + + SetLastError(0xdeadbeef); + ok(IsMenu(hmenu), "IsMenu error %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, 1); + expect_style(hwnd, WS_CHILD); + expect_ex_style(hwnd, WS_EX_APPWINDOW); + DestroyWindow(hwnd); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_CAPTION, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, 1); + expect_style(hwnd, WS_CHILD | WS_CAPTION); + expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, 1); + expect_style(hwnd, WS_CHILD); + expect_ex_style(hwnd, 0); + DestroyWindow(hwnd); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_CAPTION, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, 1); + expect_style(hwnd, WS_CHILD | WS_CAPTION); + expect_ex_style(hwnd, WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_APPWINDOW); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_APPWINDOW); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_POPUP, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %ld\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, 0); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %ld\n", GetLastError()); + +#undef expect_menu +#undef expect_style +#undef expect_ex_style +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -3651,6 +3783,7 @@ START_TEST(win) test_capture_2(); test_capture_3(hwndMain, hwndMain2); + test_CreateWindow(); test_parent_owner(); test_SetParent(); test_shell_window(); diff --git a/dlls/user/win.c b/dlls/user/win.c index 3d5fecb..593fef1 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -1037,8 +1037,7 @@ static HWND WIN_CreateWindowEx( CREATEST /* Set the window menu */ - if (((wndPtr->dwStyle & (WS_CAPTION|WS_CHILD)) == WS_CAPTION) || - (wndPtr->dwExStyle & WS_EX_APPWINDOW)) + if (!(wndPtr->dwStyle & WS_CHILD)) { if (cs->hMenu) {

1 0

qingdoa daoo : oleaut32: Fix safearray data destruction.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: f80db874d4e73616e74ff4a6c044c389f6dc7bf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f80db874d4e73616e74ff4a… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Fri Jun 9 18:02:04 2006 +0800 oleaut32: Fix safearray data destruction. --- dlls/oleaut32/safearray.c | 22 +++++++++------ dlls/oleaut32/tests/safearray.c | 58 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index cfebfbb..0eb92da 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -284,7 +284,7 @@ static HRESULT SAFEARRAY_DestroyData(SAF if (psa->fFeatures & (FADF_UNKNOWN|FADF_DISPATCH)) { - LPUNKNOWN *lpUnknown = (LPUNKNOWN *)psa->pvData + ulStartCell * psa->cbElements; + LPUNKNOWN *lpUnknown = (LPUNKNOWN *)psa->pvData + ulStartCell; while(ulCellCount--) { @@ -310,7 +310,7 @@ static HRESULT SAFEARRAY_DestroyData(SAF } else if (psa->fFeatures & FADF_BSTR) { - BSTR* lpBstr = (BSTR*)psa->pvData + ulStartCell * psa->cbElements; + BSTR* lpBstr = (BSTR*)psa->pvData + ulStartCell; while(ulCellCount--) { @@ -321,7 +321,7 @@ static HRESULT SAFEARRAY_DestroyData(SAF } else if (psa->fFeatures & FADF_VARIANT) { - VARIANT* lpVariant = (VARIANT*)psa->pvData + ulStartCell * psa->cbElements; + VARIANT* lpVariant = (VARIANT*)psa->pvData + ulStartCell; while(ulCellCount--) { @@ -1234,13 +1234,17 @@ HRESULT WINAPI SafeArrayDestroyData(SAFE if (psa->cLocks) return DISP_E_ARRAYISLOCKED; /* Can't delete a locked array */ - /* If static, keep pvData and don't free */ - if (psa->pvData && !(psa->fFeatures & FADF_STATIC)) - { - /* Delete the actual item data */ - if (FAILED(SAFEARRAY_DestroyData(psa, 0))) - return E_UNEXPECTED; + /* Delete the actual item data */ + if (FAILED(SAFEARRAY_DestroyData(psa, 0))) + return E_UNEXPECTED; + if (psa->pvData) + { + if (psa->fFeatures & FADF_STATIC) + { + ZeroMemory(psa->pvData, SAFEARRAY_GetCellCount(psa) * psa->cbElements); + return S_OK; + } /* If this is not a vector, free the data memory block */ if (!(psa->fFeatures & FADF_CREATEVECTOR)) { diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index c719c69..9fc4061 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -335,8 +335,26 @@ static void test_safearray(void) ok(hres == S_OK, "SAPOI failed with hres %lx\n", hres); SafeArrayAccessData(a, (void **)&ptr2); ok(ptr1 - ptr2 == 14, "SAPOI got wrong ptr\n"); + *(WORD *)ptr1 = 0x55aa; SafeArrayUnaccessData(a); + bound.cElements = 10; + bound.lLbound = 1; + SafeArrayRedim(a, &bound); + ptr1 = NULL; + SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); + ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + + bound.cElements = 10; + bound.lLbound = 0; + SafeArrayRedim(a, &bound); + SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); + ok(*(WORD *)ptr1 == 0, "Expanded area not zero-initialized\n"); + + indices[1] = 1; + SafeArrayPtrOfIndex(a, indices, (void **)&ptr1); + ok(*(WORD *)ptr1 == 0x55aa, "Data not preserved when resizing array\n"); + bounds[0].cElements = 0; bounds[0].lLbound = 1; bounds[1].cElements = 2; bounds[1].lLbound = 23; a = SafeArrayCreate(VT_I4,2,bounds); @@ -1130,6 +1148,39 @@ static void test_SafeArrayGetPutElement_ ok(tunk_xref == 2,"Failed to decrement refcount of iface.\n"); } +static void test_SafeArrayRedim_IUnknown(void) +{ + SAFEARRAYBOUND sab; + LONG indices[1]; + SAFEARRAY *sa; + HRESULT hres; + LPUNKNOWN value; + + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(sa != NULL, "UNKNOWN test couldn't create array\n"); + if (!sa) + return; + + ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); + if (sa->cbElements != sizeof(LPUNKNOWN)) + return; + + indices[0] = 2; + xtunk_iface.lpvtbl = &xtunk_vtbl; + value = (LPUNKNOWN)&xtunk_iface; + tunk_xref = 1; + hres = SafeArrayPutElement(sa, indices, value); + ok(hres == S_OK, "Failed to put IUnknown element hres 0x%lx\n", hres); + ok(tunk_xref == 2,"Failed to increment refcount of iface.\n"); + sab.cElements = 1; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Failed to shrink array hres 0x%lx\n", hres); + ok(tunk_xref == 1, "Failed to decrement refcount\n"); + SafeArrayDestroy(sa); +} + static void test_SafeArrayGetPutElement_VARIANT(void) { SAFEARRAYBOUND sab; @@ -1597,7 +1648,7 @@ static void test_SafeArrayDestroyData (v SAFEARRAYBOUND sab; SAFEARRAY *sa; HRESULT hres; - int value = 0; + int value = 0xdeadbeef; long index[1]; void HUGEP *temp_pvData; @@ -1610,13 +1661,15 @@ static void test_SafeArrayDestroyData (v index[0] = 1; SafeArrayPutElement (sa, index, &value); -/* SafeArrayDestroyData shouldn't do anything if FADF_STATIC is set. */ +/* SafeArrayDestroyData shouldn't free pvData if FADF_STATIC is set. */ sa->fFeatures |= FADF_STATIC; temp_pvData = sa->pvData; hres = SafeArrayDestroyData(sa); ok(hres == S_OK, "SADData FADF_STATIC failed, error code %lx.\n",hres); ok(sa->pvData == temp_pvData, "SADData FADF_STATIC: pvData=%p, expected %p (fFeatures = %d).\n", sa->pvData, temp_pvData, sa->fFeatures); + SafeArrayGetElement (sa, index, &value); + ok(value == 0, "Data not cleared after SADData\n"); /* Clear FADF_STATIC, now really destroy the data. */ sa->fFeatures ^= FADF_STATIC; @@ -1655,5 +1708,6 @@ START_TEST(safearray) test_SafeArrayGetPutElement(); test_SafeArrayGetPutElement_BSTR(); test_SafeArrayGetPutElement_IUnknown(); + test_SafeArrayRedim_IUnknown(); test_SafeArrayGetPutElement_VARIANT(); }

1 0

Alexandre Julliard : opengl32: Store function pointers in a separate array to avoid a bunch of relocations .
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: ad5e02e604c1adc4fd835a859b2ac2fdab5c5f26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad5e02e604c1adc4fd835a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 18:13:09 2006 +0200 opengl32: Store function pointers in a separate array to avoid a bunch of relocations. --- dlls/opengl32/make_opengl | 46 dlls/opengl32/opengl_ext.c | 4375 ++++++++++++++++++++++---------------------- dlls/opengl32/opengl_ext.h | 2 dlls/opengl32/wgl.c | 8 4 files changed, 2215 insertions(+), 2216 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ad5e02e604c1adc4fd8…

1 0

Alexandre Julliard : opengl32: Only store the glX name if different from the wgl name.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 3e68508ecd9327168e4c28b9789a3fea6944f3e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e68508ecd9327168e4c28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 16:26:44 2006 +0200 opengl32: Only store the glX name if different from the wgl name. --- dlls/opengl32/make_opengl | 10 dlls/opengl32/opengl_ext.c | 2186 ++++++++++++++++++++++---------------------- dlls/opengl32/wgl.c | 9 3 files changed, 1107 insertions(+), 1098 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3e68508ecd9327168e4…

1 0

Alexandre Julliard : opengl32: Make all the function pointers and thunks static.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: cac330185492e86e6d8c1fd14c5af0309bc1a596 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cac330185492e86e6d8c1fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 16:11:38 2006 +0200 opengl32: Make all the function pointers and thunks static. --- dlls/opengl32/make_opengl | 35 dlls/opengl32/opengl_ext.c | 7666 +++++++++++++++++++------------------------- dlls/opengl32/opengl_ext.h | 4 3 files changed, 3296 insertions(+), 4409 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cac330185492e86e6d8…

1 0

Mike McCormack : msi: Update the progress control while installing.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 7500e0feabf3b59c74d2faa50781154feda02cab URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7500e0feabf3b59c74d2faa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jun 9 17:05:50 2006 +0900 msi: Update the progress control while installing. --- dlls/msi/dialog.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7949ecd..85976f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -62,6 +62,8 @@ struct msi_control_tag HICON hIcon; LPWSTR tabnext; HMODULE hDll; + float progress_current; + float progress_max; WCHAR name[1]; }; @@ -335,6 +337,8 @@ static msi_control *msi_dialog_create_wi control->hIcon = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); + control->progress_current = 0; + control->progress_max = 100; x = MSI_RecordGetInteger( rec, 4 ); y = MSI_RecordGetInteger( rec, 5 ); @@ -479,11 +483,29 @@ void msi_dialog_handle_event( msi_dialog } else if( !lstrcmpW(attribute, szProgress) ) { - /* FIXME: should forward to progress bar */ - static int display_fixme = 1; - if (display_fixme) - FIXME("Attribute %s not being set\n", debugstr_w(attribute)); - display_fixme = 0; + DWORD func, val; + + func = MSI_RecordGetInteger( rec , 1 ); + val = MSI_RecordGetInteger( rec , 2 ); + + switch (func) + { + case 0: /* init */ + ctrl->progress_max = val; + ctrl->progress_current = 0; + SendMessageW(ctrl->hwnd, PBM_SETRANGE, 0, MAKELPARAM(0,100)); + SendMessageW(ctrl->hwnd, PBM_SETPOS, 0, 0); + break; + case 1: /* FIXME: not sure what this is supposed to do */ + break; + case 2: /* move */ + ctrl->progress_current += val; + SendMessageW(ctrl->hwnd, PBM_SETPOS, 100*(ctrl->progress_current/ctrl->progress_max), 0); + break; + default: + ERR("Unknown progress message %ld\n", func); + break; + } } else {

1 0

Jason Green : wined3d: Allow drawPrim to create and use the GLSL program.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: d5d4568450c2ca087122a06e39814af7ca8d6d14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5d4568450c2ca087122a06… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:37:45 2006 -0400 wined3d: Allow drawPrim to create and use the GLSL program. --- dlls/wined3d/drawprim.c | 15 ++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 853518f..f12e046 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1920,7 +1920,20 @@ #endif TRACE("Loaded arrays\n"); - /* TODO: Bind the correct GLSL shader program here. */ + /* Bind the correct GLSL shader program based on the currently set vertex & pixel shaders. */ + if (wined3d_settings.shader_mode == SHADER_GLSL) { + GLhandleARB programId; + + set_glsl_shader_program(iface); + programId = This->stateBlock->shaderPrgId; + + if (programId != 0) { + /* Start using this program ID */ + TRACE_(d3d_shader)("Using GLSL program %u\n", programId); + GL_EXTCALL(glUseProgramObjectARB(programId)); + checkGLcall("glUseProgramObjectARB"); + } + } if (useVertexShaderFunction) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31afe74..f1ec8bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1317,6 +1317,9 @@ extern const SHADER_OPCODE* shader_get_o /* ARB shader program Prototypes */ extern void shader_hw_def(SHADER_OPCODE_ARG *arg); +/* GLSL helper programs */ +extern void set_glsl_shader_program(IWineD3DDevice *iface); + /** The following translate DirectX pixel/vertex shader opcodes to GLSL lines */ extern void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg); extern void shader_glsl_arith(SHADER_OPCODE_ARG* arg);

1 0

Mike McCormack : msi: Remove some unnecessary NULL checks.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: ea3ab4952b65817b35e7e44f6386aeb009e48cea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea3ab4952b65817b35e7e44… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jun 9 17:05:33 2006 +0900 msi: Remove some unnecessary NULL checks. --- dlls/msi/action.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bf4e2b0..5a8e1ab 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -883,12 +883,6 @@ static BOOL ACTION_HandleStandardAction( BOOL run = force; int i; - if (!package) - { - ERR("package was null!\n"); - return FALSE; - } - if (!run && !package->script->CurrentlyScripting) run = TRUE; @@ -1329,9 +1323,6 @@ static UINT load_all_files(MSIPACKAGE *p '`','F','i','l','e','`',' ', 'O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`', 0}; - if (!package) - return ERROR_INVALID_HANDLE; - rc = MSI_DatabaseOpenViewW(package->db, Query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -2248,9 +2239,6 @@ static UINT ACTION_WriteRegistryValues(M {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','R','e','g','i','s','t','r','y','`',0 }; - if (!package) - return ERROR_INVALID_HANDLE; - rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS;

1 0

Jason Green : wined3d: Add GLSL helper functions to Device.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: b67cda248dcad7790b3da084623d1d59d96c7a07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b67cda248dcad7790b3da08… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:36:55 2006 -0400 wined3d: Add GLSL helper functions to Device. - Add functions to attach & detach shader objects, create and delete programs, and maintain the list of programs. - Add a list of GLSL shader programs to the device which is initialized on Init3D(), and deleted on Release(). --- dlls/wined3d/device.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13d497c..067a871 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -24,12 +24,14 @@ */ #include "config.h" +#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info /* Define the default light parameters as specified by MSDN */ @@ -238,6 +240,183 @@ static void setup_light(IWineD3DDevice * glPopMatrix(); } +/********************************************************** + * GLSL helper functions follow + **********************************************************/ + +/** Attach a GLSL pixel or vertex shader object to the shader program */ +static void attach_glsl_shader(IWineD3DDevice *iface, IWineD3DBaseShader* shader) { + + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + GLhandleARB shaderObj = ((IWineD3DBaseShaderImpl*)shader)->baseShader.prgId; + if (This->stateBlock->shaderPrgId != 0 && shaderObj != 0) { + TRACE_(d3d_shader)("Attaching GLSL shader object %u to program %u\n", shaderObj, This->stateBlock->shaderPrgId); + GL_EXTCALL(glAttachObjectARB(This->stateBlock->shaderPrgId, shaderObj)); + checkGLcall("glAttachObjectARB"); + } +} + +/** Sets the GLSL program ID for the given pixel and vertex shader combination. + * It sets the programId on the current StateBlock (because it should be called + * inside of the DrawPrimitive() part of the render loop). + * + * If a program for the given combination does not exist, create one, and store + * the program in the list. If it creates a program, it will link the given + * objects, too. + * + * We keep the shader programs around on a list because linking + * shader objects together is an expensive operation. It's much + * faster to loop through a list of pre-compiled & linked programs + * each time that the application sets a new pixel or vertex shader + * than it is to re-link them together at that time. + * + * The list will be deleted in IWineD3DDevice::Release(). + */ +void set_glsl_shader_program(IWineD3DDevice *iface) { + + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; + IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; + struct glsl_shader_prog_link *curLink = NULL; + struct glsl_shader_prog_link *newLink = NULL; + struct list *ptr = NULL; + GLhandleARB programId = 0; + + if (NULL == vshader && NULL == pshader) { + /* No pixel or vertex shader specified */ + This->stateBlock->shaderPrgId = 0; + return; + } + + ptr = list_head( &This->glsl_shader_progs ); + while (ptr) { + /* At least one program exists - see if it matches our ps/vs combination */ + curLink = LIST_ENTRY( ptr, struct glsl_shader_prog_link, entry ); + if (vshader == curLink->vertexShader && pshader == curLink->pixelShader) { + /* Existing Program found, use it */ + TRACE_(d3d_shader)("Found existing program (%u) for this vertex/pixel shader combination\n", + curLink->programId); + This->stateBlock->shaderPrgId = curLink->programId; + return; + } + /* This isn't the entry we need - try the next one */ + ptr = list_next( &This->glsl_shader_progs, ptr ); + } + + /* If we get to this point, then no matching program exists, so we create one */ + programId = GL_EXTCALL(glCreateProgramObjectARB()); + TRACE_(d3d_shader)("Created new GLSL shader program %u\n", programId); + This->stateBlock->shaderPrgId = programId; + + if (NULL != vshader) { + int i; + int max_attribs = 16; /* TODO: Will this always be the case? It is at the moment... */ + char tmp_name[10]; + + attach_glsl_shader(iface, (IWineD3DBaseShader*)vshader); + + /* Bind vertex attributes to a corresponding index number to match + * the same index numbers as ARB_vertex_programs (makes loading + * vertex attributes simpler). With this method, we can use the + * exact same code to load the attributes later for both ARB and + * GLSL shaders. + * + * We have to do this here because we need to know the Program ID + * in order to make the bindings work, and it has to be done prior + * to linking the GLSL program. */ + for (i = 0; i < max_attribs; ++i) { + snprintf(tmp_name, sizeof(tmp_name), "attrib%i", i); + GL_EXTCALL(glBindAttribLocationARB(programId, i, tmp_name)); + } + checkGLcall("glBindAttribLocationARB"); + } + + if (NULL != pshader) { + attach_glsl_shader(iface, (IWineD3DBaseShader*)pshader); + } + + /* Link the program */ + TRACE_(d3d_shader)("Linking GLSL shader program %u\n", programId); + GL_EXTCALL(glLinkProgramARB(programId)); + print_glsl_info_log(&GLINFO_LOCATION, programId); + + /* Now, we add a list item to associate this program with the vertex and + * pixel shaders that it is attached to. + * + * These list items will be deleted when the device is released. + */ + newLink = HeapAlloc(GetProcessHeap(), 0, sizeof(struct glsl_shader_prog_link)); + newLink->programId = programId; + newLink->pixelShader = pshader; + newLink->vertexShader = vshader; + list_add_head( &This->glsl_shader_progs, &newLink->entry); + + return; +} + +/** Detach the GLSL pixel or vertex shader object from the shader program */ +static void detach_glsl_shader(IWineD3DDevice *iface, GLhandleARB shaderObj, GLhandleARB programId) { + + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (shaderObj != 0 && programId != 0) { + TRACE_(d3d_shader)("Detaching GLSL shader object %u from program %u\n", shaderObj, programId); + GL_EXTCALL(glDetachObjectARB(programId, shaderObj)); + checkGLcall("glDetachObjectARB"); + } +} + +/** Delete a GLSL shader program */ +static void delete_glsl_shader_program(IWineD3DDevice *iface, GLhandleARB obj) { + + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (obj != 0) { + TRACE_(d3d_shader)("Deleting GLSL shader program %u\n", obj); + GL_EXTCALL(glDeleteObjectARB(obj)); + checkGLcall("glDeleteObjectARB"); + } +} + +/** Delete the list of linked programs this shader is associated with. + * Also at this point, check to see if there are any objects left attached + * to each GLSL program. If not, delete the GLSL program object. + * This will be run when a device is released. */ +static void delete_glsl_shader_list(IWineD3DDevice* iface) { + + struct list *ptr = NULL; + struct glsl_shader_prog_link *curLink = NULL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + int numAttached = 0; + int i; + GLhandleARB objList[2]; /* There should never be more than 2 objects attached + (one pixel shader and one vertex shader at most) */ + + ptr = list_head( &This->glsl_shader_progs ); + while (ptr) { + /* First, get the current item, + * save the link to the next pointer, + * detach and delete shader objects, + * then de-allocate the list item's memory */ + curLink = LIST_ENTRY( ptr, struct glsl_shader_prog_link, entry ); + ptr = list_next( &This->glsl_shader_progs, ptr ); + + /* See if this object is still attached to the program - it may have been detached already */ + GL_EXTCALL(glGetAttachedObjectsARB(curLink->programId, 2, &numAttached, objList)); + TRACE_(d3d_shader)("%i GLSL objects are currently attached to program %u\n", numAttached, curLink->programId); + for (i = 0; i < numAttached; i++) { + detach_glsl_shader(iface, objList[i], curLink->programId); + } + + delete_glsl_shader_program(iface, curLink->programId); + + /* Free the memory for this list item */ + HeapFree(GetProcessHeap(), 0, curLink); + } +} + + /* Apply the current values to the specified texture stage */ void WINAPI IWineD3DDeviceImpl_SetupTextureStates(IWineD3DDevice *iface, DWORD Sampler, DWORD Flags) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -387,6 +566,11 @@ ULONG WINAPI IWineD3DDeviceImpl_Release( /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ + /* Delete any GLSL shader programs that may exist */ + if (wined3d_settings.shader_mode == SHADER_GLSL) { + delete_glsl_shader_list(iface); + } + /* Release the update stateblock */ if(IWineD3DStateBlock_Release((IWineD3DStateBlock *)This->updateStateBlock) > 0){ if(This->updateStateBlock != This->stateBlock) @@ -1737,6 +1921,9 @@ #if 0 #endif LEAVE_GL(); + /* Initialize our list of GLSL programs */ + list_init(&This->glsl_shader_progs); + { /* Set a default viewport */ D3DVIEWPORT9 vp; vp.X = 0;

1 0