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

Henri Verbeet : wined3d: Get rid of the unused gl_version and glx_version fields.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b2331ec79b3471f07f8aa480b5a9e53749ade874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2331ec79b3471f07f8aa480b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:40 2009 +0200 wined3d: Get rid of the unused gl_version and glx_version fields. --- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_gl.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fa89621..9db71af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -471,6 +471,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { unsigned i; HDC hdc; unsigned int vidmem=0; + DWORD gl_version; TRACE_(d3d_caps)("(%p)\n", gl_info); @@ -539,7 +540,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { minor = atoi(gl_string_cursor); TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor); - gl_info->gl_version = MAKEDWORD_VERSION(major, minor); + gl_version = MAKEDWORD_VERSION(major, minor); /* Now parse the driver specific string which we'll report to the app. */ switch (gl_info->gl_vendor) @@ -765,7 +766,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { { \ DWORD ver = ver_for_ext(ext); \ if (gl_info->supported[ext]) gl_info->pfn = (type)pwglGetProcAddress(#pfn); \ - else if (ver && ver <= gl_info->gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ + else if (ver && ver <= gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ else gl_info->pfn = NULL; \ } GL_EXT_FUNCS_GEN; @@ -783,7 +784,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { if (!gl_info->supported[EXTENSION_MAP[i].extension] - && EXTENSION_MAP[i].version <= gl_info->gl_version && EXTENSION_MAP[i].version) + && EXTENSION_MAP[i].version <= gl_version && EXTENSION_MAP[i].version) { TRACE_(d3d_caps)(" GL CORE: %s support.\n", EXTENSION_MAP[i].extension_string); gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0c5cae5..8471842 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3949,10 +3949,6 @@ typedef BOOL (WINAPI * WINED3D_PFNWGLSETPIXELFORMATWINE) (HDC hdc, int iPixelFor #define USE_GL_FUNC(type, pfn, ext, replace) type pfn; typedef struct _WineD3D_GL_Info { - - DWORD glx_version; - DWORD gl_version; - GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem;

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: c9257aed857621cd6dfb7993c14d809c5832ac19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9257aed857621cd6dfb7993c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:42 2009 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/directx.c | 821 ++++++++++++++++++++++++------------------------ 1 files changed, 415 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9257aed857621cd6dfb7…

1 0

Henri Verbeet : wined3d: Remove the gl_renderer field from WineD3D_GL_Info.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4571455fea79c0ad19b4c4bea07493722a60173a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4571455fea79c0ad19b4c4bea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:41 2009 +0200 wined3d: Remove the gl_renderer field from WineD3D_GL_Info. --- dlls/wined3d/directx.c | 294 ++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 172 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4571455fea79c0ad19b4c…

1 0

Paul Vriens : cryptui: Fix Dutch translations.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 5c49cfc09a93723e8f2a6f8ef2bd03cf492aa612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c49cfc09a93723e8f2a6f8ef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 15:05:08 2009 +0200 cryptui: Fix Dutch translations. --- dlls/cryptui/cryptui_Nl.rc | 62 ++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c49cfc09a93723e8f2a6…

1 0

Nikolay Sivov : user32/spy: Update ListView message table.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 49e95baa2ada50cc7f9417852131bc927085587b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e95baa2ada50cc7f9417852… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 5 22:41:51 2009 +0400 user32/spy: Update ListView message table. --- dlls/user32/spy.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index c2bd60b..3301ac1 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -731,7 +731,7 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = }; -#define SPY_MAX_LVMMSGNUM 140 +#define SPY_MAX_LVMMSGNUM 182 static const char * const LVMMessageTypeNames[SPY_MAX_LVMMSGNUM + 1] = { "LVM_GETBKCOLOR", /* 1000 */ @@ -872,9 +872,51 @@ static const char * const LVMMessageTypeNames[SPY_MAX_LVMMSGNUM + 1] = NULL, NULL, NULL, - NULL, "LVM_SETBKIMAGEW", - "LVM_GETBKIMAGEW" /* 0x108B */ + "LVM_GETBKIMAGEW", /* 0x108B */ + "LVM_SETSELECTEDCOLUMN", + "LVM_SETTILEWIDTH", + "LVM_SETVIEW", + "LVM_GETVIEW", + NULL, + "LVM_INSERTGROUP", + NULL, + "LVM_SETGROUPINFO", + NULL, + "LVM_GETGROUPINFO", + "LVM_REMOVEGROUP", + "LVM_MOVEGROUP", + NULL, + NULL, + "LVM_MOVEITEMTOGROUP", + "LVM_SETGROUPMETRICS", + "LVM_GETGROUPMETRICS", + "LVM_ENABLEGROUPVIEW", + "LVM_SORTGROUPS", + "LVM_INSERTGROUPSORTED", + "LVM_REMOVEALLGROUPS", + "LVM_HASGROUP", + "LVM_SETTILEVIEWINFO", + "LVM_GETTILEVIEWINFO", + "LVM_SETTILEINFO", + "LVM_GETTILEINFO", + "LVM_SETINSERTMARK", + "LVM_GETINSERTMARK", + "LVM_INSERTMARKHITTEST", + "LVM_GETINSERTMARKRECT", + "LVM_SETINSERTMARKCOLOR", + "LVM_GETINSERTMARKCOLOR", + NULL, + "LVM_SETINFOTIP", + "LVM_GETSELECTEDCOLUMN", + "LVM_ISGROUPVIEWENABLED", + "LVM_GETOUTLINECOLOR", + "LVM_SETOUTLINECOLOR", + NULL, + "LVM_CANCELEDITLABEL", + "LVM_MAPINDEXTOID", + "LVM_MAPIDTOINDEX", + "LVM_ISITEMVISIBLE" };

1 0

Paul Vriens : cryptui: Show the select store text when browsing stores.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 304806f47588eeab2db63dfcaee0daea520966fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=304806f47588eeab2db63dfca… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 21:17:37 2009 +0200 cryptui: Show the select store text when browsing stores. --- dlls/cryptui/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c11868a..9807064 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5171,6 +5171,7 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, selectInfo.parent = hwnd; selectInfo.dwFlags = CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE; selectInfo.pwszTitle = NULL; + selectInfo.pwszText = NULL; selectInfo.pEnumData = &enumData; selectInfo.pfnSelectedStoreCallback = NULL; if ((store = CryptUIDlgSelectStoreW(&selectInfo)))

1 0

Paul Vriens : crypt32: Make sure we show Unicode characters ( Dutch translation).
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: d0ef19fe9ae75b35bb0b51c00ffee3fd16046ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ef19fe9ae75b35bb0b51c00… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 15:15:41 2009 +0200 crypt32: Make sure we show Unicode characters (Dutch translation). --- dlls/crypt32/crypt32_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index e12d25d..eae902f 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -20,6 +20,8 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Aurimas Fišeras : cryptui: Add Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: d9d9dae71ae65f1ff2b118b6b9cf552585836d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d9dae71ae65f1ff2b118b6b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 14:39:08 2009 +0300 cryptui: Add Lithuanian translation. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_Lt.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9d9dae71ae65f1ff2b11…

1 0

Nikolay Sivov : comctl32/listview: Basic LVM_GETITEMSPACING tests.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 809ef092e85fc3ddb1530e10742f5c7bce6d6af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809ef092e85fc3ddb1530e107… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 5 20:45:55 2009 +0400 comctl32/listview: Basic LVM_GETITEMSPACING tests. --- dlls/comctl32/tests/listview.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d959deb..86b7ff8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3661,6 +3661,74 @@ static void test_mapidindex(void) DestroyWindow(hwnd); } +static void test_getitemspacing(void) +{ + HWND hwnd; + DWORD ret; + INT cx, cy; + HIMAGELIST himl; + HBITMAP hbmp; + LVITEMA itema; + + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); + + /* LVS_ICON */ + hwnd = create_custom_listview_control(0); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + /* now try with icons */ + himl = ImageList_Create(40, 40, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + hbmp = CreateBitmap(40, 40, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + ret = ImageList_Add(himl, hbmp, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + expect(0, ret); + + itema.mask = LVIF_IMAGE; + itema.iImage = 0; + itema.iItem = 0; + itema.iSubItem = 0; + ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); + expect(0, ret); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_SMALLICON */ + hwnd = create_custom_listview_control(LVS_SMALLICON); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_REPORT */ + hwnd = create_custom_listview_control(LVS_REPORT); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_LIST */ + hwnd = create_custom_listview_control(LVS_LIST); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3714,6 +3782,7 @@ START_TEST(listview) test_editbox(); test_notifyformat(); test_indentation(); + test_getitemspacing(); if (!load_v6_module(&ctx_cookie)) {

1 0

Aurimas Fišeras : crypt32: Add Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 359a389868b80f96631f72eb3c8d77c1e45b77f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a389868b80f96631f72eb3… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:08:40 2009 +0300 crypt32: Add Lithuanian translation. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_Lt.rc | 244 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=359a389868b80f96631f7…

1 0