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

Hib Eris : msi/tests: Add tests for order of tables.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 19d783d34d914615f41cb6fc66edcfdf0c3b4f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d783d34d914615f41cb6fc6… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:26:06 2009 +0200 msi/tests: Add tests for order of tables. --- dlls/msi/tests/db.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2d296b5..75a0ebe 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4295,6 +4295,160 @@ static void test_special_tables(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); } +static void test_tables_order(void) +{ + const char *query; + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + UINT r; + char buffer[100]; + DWORD sz; + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `foo` ( " + "`baz` INT NOT NULL PRIMARY KEY `baz`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + query = "CREATE TABLE `bar` ( " + "`foo` INT NOT NULL PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + query = "CREATE TABLE `baz` ( " + "`bar` INT NOT NULL, " + "`baz` INT NOT NULL, " + "`foo` INT NOT NULL PRIMARY KEY `bar`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + /* The names of the tables in the _Tables table must + be in the same order as these names are created in + the strings table. */ + query = "SELECT * FROM `_Tables`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* The names of the tables in the _Columns table must + be in the same order as these names are created in + the strings table. */ + query = "SELECT * FROM `_Columns`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 1, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + sz = sizeof(buffer); + r = MsiRecordGetString(hrec, 3, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + DeleteFile(msifile); +} + static void test_select_markers(void) { MSIHANDLE hdb = 0, rec, view, res; @@ -7942,6 +8096,7 @@ START_TEST(db) test_integers(); test_update(); test_special_tables(); + test_tables_order(); test_select_markers(); test_viewmodify_update(); test_stringtable();

1 0

Hib Eris : msi: Release msi_custom_action_info when no longer needed.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e86ebd75b0eeaa882137ff0a4d46b84fe7c4c3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86ebd75b0eeaa882137ff0a4… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:48:11 2009 +0200 msi: Release msi_custom_action_info when no longer needed. --- dlls/msi/custom.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fa8f951..66751ca 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -888,7 +888,9 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeDll( package, type, tmp_file, target, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, @@ -1167,9 +1169,7 @@ static DWORD ACTION_CallScript( const GUID *guid ) else ERR("failed to create handle for %p\n", info->package ); - if (info->type & msidbCustomActionTypeAsync && - info->type & msidbCustomActionTypeContinue) - release_custom_action_data( info ); + release_custom_action_data( info ); return S_OK; } @@ -1226,13 +1226,16 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { + UINT r; msi_custom_action_info *info; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, @@ -1277,6 +1280,7 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); + release_custom_action_data( info ); done: msi_free(bufferw);

1 0

Nikolay Sivov : comctl32/listview: XP SP3 comctl32 V6 test workaround.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 358fa6cd98648e97d234c792fadb4c22c45191fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=358fa6cd98648e97d234c792f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 21 18:01:11 2009 +0400 comctl32/listview: XP SP3 comctl32 V6 test workaround. --- dlls/comctl32/tests/listview.c | 51 ++++++++++++++++++++++++++------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 060171c..6c6a3b8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3410,6 +3410,24 @@ static BOOL is_below_comctl_5(void) return !ret; } +static void unload_v6_module(ULONG_PTR cookie) +{ + HANDLE hKernel32; + BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); + if (!pDeactivateActCtx) + { + win_skip("Activation contexts unsupported\n"); + return; + } + + pDeactivateActCtx(0, cookie); + + DeleteFileA(manifest_name); +} + static BOOL load_v6_module(ULONG_PTR *pcookie) { HANDLE hKernel32; @@ -3421,6 +3439,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) BOOL ret; HANDLE file; DWORD written; + HWND hwnd; hKernel32 = GetModuleHandleA("kernel32.dll"); pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); @@ -3468,26 +3487,24 @@ static BOOL load_v6_module(ULONG_PTR *pcookie) win_skip("A problem during context activation occured.\n"); DeleteFileA(manifest_name); } - - return ret; -} - -static void unload_v6_module(ULONG_PTR cookie) -{ - HANDLE hKernel32; - BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - if (!pDeactivateActCtx) + else { - win_skip("Activation contexts unsupported\n"); - return; + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, WC_LISTVIEW, "foo", + WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_REPORT, + 0, 0, 100, 100, + hwndparent, NULL, GetModuleHandleA(NULL), NULL); + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create ListView window.\n"); + unload_v6_module(*pcookie); + return FALSE; + } + else + DestroyWindow(hwnd); } - pDeactivateActCtx(0, cookie); - - DeleteFileA(manifest_name); + return ret; } static void test_get_set_view(void)

1 0

Nikolay Sivov : comctl32/listview: Fix a test failure on 4.7x.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 6e09365501391d639f881dd86d258b911415e51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e09365501391d639f881dd86… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 21 16:49:19 2009 +0400 comctl32/listview: Fix a test failure on 4.7x. --- dlls/comctl32/tests/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6f6fdf7..060171c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1362,7 +1362,9 @@ static void test_create(void) ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); + ok(IsWindow(hHeader) || + broken(!IsWindow(hHeader)), /* 4.7x common controls */ + "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList);

1 0

Nikolay Sivov : comctl32/header: Add support for HDS_FLAT style.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 25d916e73a454da0d6fd8ea4f7a8b4927e10047b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d916e73a454da0d6fd8ea4f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 21 01:25:03 2009 +0400 comctl32/header: Add support for HDS_FLAT style. --- dlls/comctl32/header.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fed582d..1486a8a 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -329,18 +329,21 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU } else { HBRUSH hbr; - - if (infoPtr->dwStyle & HDS_BUTTONS) { - if (phdi->bDown) { - DrawEdge (hdc, &r, BDR_RAISEDOUTER, - BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); + + if (!(infoPtr->dwStyle & HDS_FLAT)) + { + if (infoPtr->dwStyle & HDS_BUTTONS) { + if (phdi->bDown) { + DrawEdge (hdc, &r, BDR_RAISEDOUTER, + BF_RECT | BF_FLAT | BF_MIDDLE | BF_ADJUST); + } + else + DrawEdge (hdc, &r, EDGE_RAISED, + BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); } else - DrawEdge (hdc, &r, EDGE_RAISED, - BF_RECT | BF_SOFT | BF_MIDDLE | BF_ADJUST); + DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); } - else - DrawEdge (hdc, &r, EDGE_ETCHED, BF_BOTTOM | BF_RIGHT | BF_ADJUST); hbr = CreateSolidBrush(GetBkColor(hdc)); FillRect(hdc, &r, hbr); @@ -547,14 +550,19 @@ HEADER_Refresh (HEADER_INFO *infoPtr, HDC hdc) if (theme != NULL) { DrawThemeBackground(theme, hdc, HP_HEADERITEM, HIS_NORMAL, &rcRest, NULL); } - else { + else if (infoPtr->dwStyle & HDS_FLAT) { + hbrBk = GetSysColorBrush(COLOR_3DFACE); + FillRect(hdc, &rcRest, hbrBk); + } + else + { if (infoPtr->dwStyle & HDS_BUTTONS) DrawEdge (hdc, &rcRest, EDGE_RAISED, BF_TOP|BF_LEFT|BF_BOTTOM|BF_SOFT|BF_MIDDLE); else DrawEdge (hdc, &rcRest, EDGE_ETCHED, BF_BOTTOM|BF_MIDDLE); } } - + if (infoPtr->iHotDivider != -1) HEADER_DrawHotDivider(infoPtr, hdc);

1 0

Henri Verbeet : wined3d: Add an rtInternal fallback for WINED3DFMT_R16G16_UNORM.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e5e4d1e9a7ace4057eeed3a28d5f0a8ace8b480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e4d1e9a7ace4057eeed3a28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:16:01 2009 +0200 wined3d: Add an rtInternal fallback for WINED3DFMT_R16G16_UNORM. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 881736e..82d5527 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -353,7 +353,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE}, - {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, 0, + {WINED3DFMT_R16G16_UNORM, GL_RGB16_EXT, GL_RGB16_EXT, GL_RGBA16_EXT, GL_RGB, GL_UNSIGNED_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE},

1 0

Aric Stewart : user32: Update Japanese resources.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 98a2b202dd89a7d26489db8970376062fe0a67df URL: http://source.winehq.org/git/wine.git/?a=commit;h=98a2b202dd89a7d26489db897… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Jun 21 16:55:29 2009 +0900 user32: Update Japanese resources. --- dlls/user32/resources/user32_Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc index 19ba770..07121c4 100644 --- a/dlls/user32/resources/user32_Ja.rc +++ b/dlls/user32/resources/user32_Ja.rc @@ -62,8 +62,8 @@ BEGIN PUSHBUTTON "無視(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "はい(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "いいえ(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "再試行(&T)", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "続ける(&C)", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "ヘルプ", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Henri Verbeet : wined3d: Get rid of some asserts.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 404f4f73214c52c985adaeae6e18187c1a08cb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404f4f73214c52c985adaeae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:16:00 2009 +0200 wined3d: Get rid of some asserts. --- dlls/wined3d/directx.c | 3 --- dlls/wined3d/palette.c | 5 +++-- dlls/wined3d/surface_base.c | 5 ----- dlls/wined3d/surface_gdi.c | 1 - 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 25fd4d4..536d7a4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,7 +23,6 @@ */ #include "config.h" -#include <assert.h> #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -242,7 +241,6 @@ static void WineD3D_ReleaseFakeGLContext(void) { wined3d_fake_gl_context_hwnd = NULL; wined3d_fake_gl_context_available = FALSE; } - assert(wined3d_fake_gl_context_ref >= 0); LeaveCriticalSection(&wined3d_fake_gl_context_cs); } @@ -254,7 +252,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { TRACE("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; - assert(0 == wined3d_fake_gl_context_ref); wined3d_fake_gl_context_foreign = TRUE; diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 338e66e..a5447d0 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include <assert.h> #include <string.h> #include "wined3d_private.h" @@ -78,7 +77,9 @@ DWORD IWineD3DPaletteImpl_Size(DWORD dwFlags) { case WINEDDPCAPS_2BIT: return 4; case WINEDDPCAPS_4BIT: return 16; case WINEDDPCAPS_8BIT: return 256; - default: assert(0); return 256; + default: + FIXME("Unhandled size bits %#x.\n", dwFlags & SIZE_BITS); + return 256; } } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d776785..44b9423 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -30,8 +30,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include <assert.h> - WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* See also float_16_to_32() in wined3d_private.h */ @@ -1117,8 +1115,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *D dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; - assert(width <= dlock.Pitch); - if (DestRect && Src != This) dbuf = dlock.pBits; else @@ -1619,7 +1615,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst slock.Pitch = dlock.Pitch; /* Since slock was originally copied from this surface's description, we can just reuse it */ - assert(This->resource.allocatedMemory != NULL); sbuf = This->resource.allocatedMemory + lock_src.top * pitch + lock_src.left * bpp; dbuf = This->resource.allocatedMemory + lock_dst.top * pitch + lock_dst.left * bpp; sEntry = Src->resource.format_desc; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index a194569..96054d9 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -29,7 +29,6 @@ #include "wine/port.h" #include "wined3d_private.h" -#include <assert.h> #include <stdio.h> /* Use the d3d_surface debug channel to have one channel for all surfaces */

1 0

Henri Verbeet : wined3d: Get rid of DEBUG_SINGLE_MODE.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 7598ab2c849a50ca482becab3d19fc1b3b6af7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7598ab2c849a50ca482becab3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:59 2009 +0200 wined3d: Get rid of DEBUG_SINGLE_MODE. --- dlls/wined3d/directx.c | 82 ++++++++++++++++++++--------------------------- 1 files changed, 35 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index df5d4cc..25fd4d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -22,13 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Compile time diagnostics: */ - -#ifndef DEBUG_SINGLE_MODE -/* Set to 1 to force only a single display mode to be exposed: */ -#define DEBUG_SINGLE_MODE 0 -#endif - #include "config.h" #include <assert.h> #include "wined3d_private.h" @@ -1572,40 +1565,39 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad /* TODO: Store modes per adapter and read it from the adapter structure */ if (Adapter == 0) { /* Display */ - int i = 0; - int j = 0; + unsigned int i = 0; + unsigned int j = 0; + DEVMODEW mode; - if (!DEBUG_SINGLE_MODE) { - DEVMODEW DevModeW; + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); - ZeroMemory(&DevModeW, sizeof(DevModeW)); - DevModeW.dmSize = sizeof(DevModeW); - while (EnumDisplaySettingsExW(NULL, j, &DevModeW, 0)) { - j++; - switch (Format) - { - case WINED3DFMT_UNKNOWN: - /* This is for D3D8, do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || - DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_X8R8G8B8: - if (DevModeW.dmBitsPerPel == 32) i++; - break; - case WINED3DFMT_R5G6B5: - if (DevModeW.dmBitsPerPel == 16) i++; - break; - case WINED3DFMT_P8: - if (DevModeW.dmBitsPerPel == 8) i++; - break; - default: - /* Skip other modes as they do not match the requested format */ - break; - } + while (EnumDisplaySettingsExW(NULL, j, &mode, 0)) + { + ++j; + switch (Format) + { + case WINED3DFMT_UNKNOWN: + /* This is for D3D8, do not enumerate P8 here */ + if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; + break; + + case WINED3DFMT_X8R8G8B8: + if (mode.dmBitsPerPel == 32) ++i; + break; + + case WINED3DFMT_R5G6B5: + if (mode.dmBitsPerPel == 16) ++i; + break; + + case WINED3DFMT_P8: + if (mode.dmBitsPerPel == 8) ++i; + break; + + default: + /* Skip other modes as they do not match the requested format */ + break; } - } else { - i = 1; - j = 1; } TRACE_(d3d_caps)("(%p}->(Adapter: %d) => %d (out of %d)\n", This, Adapter, i, j); @@ -1629,7 +1621,8 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte } /* TODO: Store modes per adapter and read it from the adapter structure */ - if (Adapter == 0 && !DEBUG_SINGLE_MODE) { /* Display */ + if (Adapter == 0) + { DEVMODEW DevModeW; int ModeIdx = 0; UINT i = 0; @@ -1693,14 +1686,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte pMode->RefreshRate, pMode->Format, debug_d3dformat(pMode->Format), DevModeW.dmBitsPerPel); - } else if (DEBUG_SINGLE_MODE) { - /* Return one setting of the format requested */ - if (Mode > 0) return WINED3DERR_INVALIDCALL; - pMode->Width = 800; - pMode->Height = 600; - pMode->RefreshRate = 60; - pMode->Format = (Format == WINED3DFMT_UNKNOWN) ? WINED3DFMT_X8R8G8B8 : Format; - } else { + } + else + { FIXME_(d3d_caps)("Adapter not primary display\n"); }

1 0

Henri Verbeet : wined3d: Simplify the transformed position fixup a bit.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 37491bb5d1f9bdb9b68929b6fe38114fe22674eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=37491bb5d1f9bdb9b68929b6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:57 2009 +0200 wined3d: Simplify the transformed position fixup a bit. --- dlls/wined3d/buffer.c | 26 +++++++------------------- dlls/wined3d/directx.c | 9 ++++++--- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e9f3ff6..8896db9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -506,27 +506,15 @@ static inline void fixup_d3dcolor(DWORD *dst_color) static inline void fixup_transformed_pos(float *p) { - float x, y, z, w; - - /* rhw conversion like in drawStridedSlow */ - if (p[3] == 1.0 || ((p[3] < eps) && (p[3] > -eps))) - { - x = p[0]; - y = p[1]; - z = p[2]; - w = 1.0; - } - else + /* rhw conversion like in position_float4(). */ + if (p[3] != 1.0 && p[3] != 0.0) { - w = 1.0 / p[3]; - x = p[0] * w; - y = p[1] * w; - z = p[2] * w; + float w = 1.0 / p[3]; + p[0] *= w; + p[1] *= w; + p[2] *= w; + p[3] = w; } - p[0] = x; - p[1] = y; - p[2] = z; - p[3] = w; } const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 28f07ef..df5d4cc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4316,13 +4316,16 @@ static void WINE_GLAPI position_float4(const void *data) { const GLfloat *pos = data; - if (pos[3] < eps && pos[3] > -eps) - glVertex3fv(pos); - else { + if (pos[3] != 0.0 && pos[3] != 1.0) + { float w = 1.0 / pos[3]; glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); } + else + { + glVertex3fv(pos); + } } static void WINE_GLAPI diffuse_d3dcolor(const void *data)

1 0