wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Alexandre Julliard : user32: Compute the size of the message spy arrays at compile time.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: db7ace64d3c390de3d42d282a818bde01f944cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7ace64d3c390de3d42d282a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 4 19:40:36 2011 +0200 user32: Compute the size of the message spy arrays at compile time. --- dlls/user32/spy.c | 157 ++++++++++++++--------------------------------------- 1 files changed, 40 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db7ace64d3c390de3d42d…

1 0

Alexandre Julliard : gdi32: Fix coordinate mapping in Get/SetBoundsRect, with tests.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 4266fcb28dcb0f2bc2c00b9ee6eb816f33660b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4266fcb28dcb0f2bc2c00b9ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 4 16:06:08 2011 +0200 gdi32: Fix coordinate mapping in Get/SetBoundsRect, with tests. --- dlls/gdi32/dc.c | 36 +++++----- dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/tests/dc.c | 169 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 142 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4266fcb28dcb0f2bc2c00…

1 0

Francois Gouget : po: Fix some typography issues in the Czech translation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 32c36b7505e59d29c25e193e598e9edf8496066b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c36b7505e59d29c25e193e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 2 16:06:11 2011 +0200 po: Fix some typography issues in the Czech translation. --- po/cs.po | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6aa2494..df4a5a6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -210,7 +210,7 @@ msgstr "Soubor nebyl nalezen" #: comdlg32.rc:44 msgid "Please verify that the correct file name was given" -msgstr "Ověřte prosím, že název souboru byl zadán správně." +msgstr "Ověřte prosím, že název souboru byl zadán správně" #: comdlg32.rc:45 msgid "" @@ -218,7 +218,7 @@ msgid "" "Do you want to create file?" msgstr "" "Soubor neexistuje.\n" -"Chcete ho vytvořit ?" +"Chcete ho vytvořit?" #: comdlg32.rc:46 msgid "" @@ -226,11 +226,11 @@ msgid "" "Do you want to replace it?" msgstr "" "Soubor již existuje.\n" -"Chcete ho přepsat novým ?" +"Chcete ho přepsat novým?" #: comdlg32.rc:47 msgid "Invalid character(s) in path" -msgstr "Nedovolený(é) znak(y) v cestě k souboru." +msgstr "Nedovolený(é) znak(y) v cestě k souboru" #: comdlg32.rc:48 msgid "" @@ -6897,7 +6897,7 @@ msgid "" "Do you want to replace it?" msgstr "" "Soubor již existuje.\n" -"Chcete ho přepsat novým ?" +"Chcete ho přepsat novým?" #: shell32.rc:259 #, fuzzy @@ -6907,7 +6907,7 @@ msgid "" "Do you want to replace it?" msgstr "" "Soubor již existuje.\n" -"Chcete ho přepsat novým ?" +"Chcete ho přepsat novým?" #: shell32.rc:260 #, fuzzy @@ -7959,7 +7959,7 @@ msgstr "Nápověda k CHDIR\n" #: cmd.rc:44 msgid "CLS clears the console screen.\n" -msgstr "CLS vymaže obrazovku terminálu\n" +msgstr "CLS vymaže obrazovku terminálu.\n" #: cmd.rc:46 #, fuzzy @@ -8388,9 +8388,8 @@ msgid "" "EXIT terminates the current command session and returns\n" "to the operating system or shell from which you invoked cmd.\n" msgstr "" -"EXIT ukončí běžící sezení a vrátí kontrolu\n" -"operačnímu systému nebo příkazovému interpretu,\n" -"ze kterého byl cmd spuštěn.\n" +"EXIT ukončí běžící sezení a vrátí kontrolu operačnímu systému\n" +"nebo příkazovému interpretu, ze kterého byl cmd spuštěn.\n" #: cmd.rc:288 #, fuzzy @@ -8950,7 +8949,7 @@ msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" -"Nebyl zadán žádný text. \n" +"Nebyl zadán žádný text.\n" "Please type something and try again" #: notepad.rc:83 @@ -8959,10 +8958,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"Soubor '%s'\n" -"neexistuje.\n" +"Soubor '%s' neexistuje.\n" "\n" -" Chcete ho vytvořit ?" +"Chcete ho vytvořit?" #: notepad.rc:85 msgid "" @@ -8970,10 +8968,9 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Soubor '%s'\n" -"byl změněn.\n" +"Soubor '%s' byl změněn.\n" "\n" -" Chcete uložit změny ?" +"Chcete uložit změny?" #: notepad.rc:86 msgid "'%s' could not be found." @@ -8984,9 +8981,8 @@ msgid "" "Not enough memory to complete this task.\n" "Close one or more applications to increase the amount of free memory." msgstr "" -"Není dost paměti na dokončení této úlohy. \n" -"Uzavřete jednu či více aplikací abyste získali více\n" -"volné paměti." +"Není dost paměti na dokončení této úlohy.\n" +"Uzavřete jednu či více aplikací abyste získali více volné paměti." #: notepad.rc:90 msgid "Unicode (UTF-16)" @@ -9405,11 +9401,11 @@ msgstr "Smazat" #: progman.rc:65 msgid "Delete group `%s'?" -msgstr "Smazat skupinu `%s' ?" +msgstr "Smazat skupinu `%s'?" #: progman.rc:66 msgid "Delete program `%s'?" -msgstr "Smazat program `%s' ?" +msgstr "Smazat program `%s'?" #: progman.rc:67 winhlp32.rc:82 #, fuzzy @@ -9434,7 +9430,7 @@ msgid "" "Should it be tried further on?" msgstr "" "Soubor skupiny `%s' nemůže být otevřen.\n" -"Mám to zkusit znovu ?" +"Mám to zkusit znovu?" #: progman.rc:74 msgid "Help not available." @@ -10894,7 +10890,7 @@ msgstr "Chyba nastavení" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Zásobník obrazovky musí být větší nebo stejně velký jakzásobník okna." +msgstr "Zásobník obrazovky musí být větší nebo stejně velký jakzásobník okna" #: wineconsole.rc:34 msgid "Each character is %ld pixels wide on %ld pixels high" @@ -11147,7 +11143,7 @@ msgstr "" #: winemine.rc:42 msgid "&Custom..." -msgstr "&Dle libosti" +msgstr "&Dle libosti..." #: winemine.rc:44 #, fuzzy @@ -11214,7 +11210,7 @@ msgstr "Vždy na &vrchu" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Informace..." +msgstr "&Informace" #: winhlp32.rc:64 #, fuzzy

1 0

Bruno Jesus : user32: Fix support for CB_SETDROPPEDWIDTH in combobox.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 7c76a79ffa199c892f9d555bc12e2dd4fe58b1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c76a79ffa199c892f9d555bc… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 1 02:30:50 2011 -0300 user32: Fix support for CB_SETDROPPEDWIDTH in combobox. --- dlls/user32/combo.c | 18 ++++++++++++++---- dlls/user32/tests/combo.c | 22 ++++++++++++++++------ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 9c22df6..4a839ec 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -2112,14 +2112,24 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); case CB_SETLOCALE: return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); + case CB_SETDROPPEDWIDTH: + if( (CB_GETTYPE(lphc) == CBS_SIMPLE) || + (INT)wParam >= 32768 ) + return CB_ERR; + /* new value must be higher than combobox width */ + if((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) + lphc->droppedWidth = wParam; + else if(wParam) + lphc->droppedWidth = 0; + + /* recalculate the combobox area */ + CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + + /* fall through */ case CB_GETDROPPEDWIDTH: if( lphc->droppedWidth ) return lphc->droppedWidth; return lphc->droppedRect.right - lphc->droppedRect.left; - case CB_SETDROPPEDWIDTH: - if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && - (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam; - return CB_ERR; case CB_GETDROPPEDCONTROLRECT: if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); return CB_OKAY; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index eabeeb0..af23f96 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -406,25 +406,35 @@ static void test_changesize( DWORD style) } ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, -1, 0); - todo_wine ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); - todo_wine ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); - todo_wine ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth - 1, 0); - todo_wine ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); - todo_wine ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, clwidth << 1, 0); - todo_wine ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == (clwidth << 1), "drop-width is %d vs %d\n", ddwidth, clwidth << 1); + + ddwidth = SendMessageA(hCombo, CB_SETDROPPEDWIDTH, 1, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + ddwidth = SendMessageA(hCombo, CB_GETDROPPEDWIDTH, 0, 0); + ok( ddwidth == clwidth + 2, "drop-width is %d vs %d\n", ddwidth, clwidth + 2); + DestroyWindow(hCombo); }

1 0

Ričardas Barkauskas : ddraw: Don' t allow SetPalette on mipmap sublevels instead of root surfaces.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: d9ada7929a84bddb7035f849380e1cdbabe87874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ada7929a84bddb7035f8493… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Sep 2 16:37:20 2011 +0300 ddraw: Don't allow SetPalette on mipmap sublevels instead of root surfaces. --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/d3d.c | 3 + dlls/ddraw/tests/dsurface.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c7d52d7..fecda89 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4225,7 +4225,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir return DDERR_INVALIDPIXELFORMAT; } - if (!This->is_complex_root) + if (This->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) { return DDERR_NOTONMIPMAPSUBLEVEL; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index c799678..68d9604 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3029,6 +3029,9 @@ static void DeviceLoadTest(void) hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); + hr = IDirectDrawSurface7_GetPalette(texture_levels[0][1], &palettes[4]); + ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); + hr = IDirectDrawSurface7_GetPalette(texture_levels[1][0], &palettes[4]); ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b4e158b..b93dd14 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1632,6 +1632,21 @@ struct compare UINT mips; }; +static HRESULT WINAPI CubeTestPaletteEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + HRESULT hr; + + hr = IDirectDrawSurface7_SetPalette(surface, context); + if (desc->dwWidth == 64) /* This is for first mimpmap */ + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "SetPalette returned: %x\n",hr); + else + ok(hr == DD_OK, "SetPalette returned: %x\n",hr); + + IDirectDrawSurface7_Release(surface); + + return DDENUMRET_OK; +} + static HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { UINT *mips = context; @@ -1710,11 +1725,23 @@ static void CubeMapTest(void) { IDirectDraw7 *dd7 = NULL; IDirectDrawSurface7 *cubemap = NULL; + IDirectDrawPalette *palette = NULL; DDSURFACEDESC2 ddsd; HRESULT hr; + PALETTEENTRY Table[256]; + int i; UINT num = 0; + UINT ref; struct enumstruct ctx; + for(i=0; i<256; i++) + { + Table[i].peRed = 0xff; + Table[i].peGreen = 0; + Table[i].peBlue = 0; + Table[i].peFlags = 0; + } + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); ok(hr == DD_OK, "IDirectDraw::QueryInterface returned %08x\n", hr); if (FAILED(hr)) goto err; @@ -1814,6 +1841,41 @@ static void CubeMapTest(void) hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7::CreateSurface returned %08x\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); + if (FAILED(hr)) + { + skip("Can't create palletized cubemap surface\n"); + goto err; + } + + hr = IDirectDraw7_CreatePalette(dd7, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); + + hr = IDirectDrawSurface7_EnumAttachedSurfaces(cubemap, palette, CubeTestPaletteEnum); + ok(hr == DD_OK, "EnumAttachedSurfaces failed\n"); + + ref = getRefcount((IUnknown *) palette); + ok(ref == 6, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface7_Release(cubemap); + + ref = getRefcount((IUnknown *) palette); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawPalette_Release(palette); + /* Make sure everything is cleaned up properly. Use the enumSurfaces test infrastructure */ memset(&ctx, 0, sizeof(ctx)); memset(&ddsd, 0, sizeof(ddsd)); @@ -2656,6 +2718,8 @@ static void PaletteTest(void) { HRESULT hr; LPDIRECTDRAWSURFACE lpSurf = NULL; + IDirectDrawSurface *backbuffer = NULL; + DDSCAPS ddscaps; DDSURFACEDESC ddsd; IDirectDrawPalette *palette = NULL; PALETTEENTRY Table[256]; @@ -2760,6 +2824,43 @@ static void PaletteTest(void) if (lpSurf) IDirectDrawSurface_Release(lpSurf); if (palette) IDirectDrawPalette_Release(palette); + + hr = IDirectDraw_CreatePalette(lpDD, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette failed with %08x\n", hr); + + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.dwBackBufferCount = 1; + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &lpSurf, NULL); + ok(hr==DD_OK, "CreateSurface returned: %x\n",hr); + if (FAILED(hr)) + { + skip("failed to create surface\n"); + return; + } + + ddscaps.dwCaps = DDSCAPS_BACKBUFFER; + hr = IDirectDrawSurface_GetAttachedSurface(lpSurf, &ddscaps, &backbuffer); + ok(hr == DD_OK, "GetAttachedSurface returned: %x\n",hr); + + hr = IDirectDrawSurface_SetPalette(backbuffer, palette); + ok(hr == DD_OK, "SetPalette returned: %x\n",hr); + + IDirectDrawPalette_Release(palette); + palette = NULL; + + hr = IDirectDrawSurface_GetPalette(backbuffer, &palette); + ok(hr == DD_OK, "CreateSurface returned: %x\n",hr); + + IDirectDrawSurface_Release(backbuffer); + IDirectDrawSurface_Release(lpSurf); } static void StructSizeTest(void)

1 0

Ričardas Barkauskas : wined3d: Add support for Nvidia GT 555M.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 9425e1be8331ca9f6415f8535f6da3e42ebb6694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9425e1be8331ca9f6415f8535… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Sep 2 16:35:21 2011 +0300 wined3d: Add support for Nvidia GT 555M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8064e9a..116f1be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1117,6 +1117,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, @@ -1483,6 +1484,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ + {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40e7345..e210ca1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1399,6 +1399,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0, CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, + CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560 = 0x1200, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080,

1 0

Piotr Caban : mshtml: Added more IHTMLElement_{put, get}_onclick tests.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: d9a661e21be6c7a2d458b247198672872c321200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a661e21be6c7a2d458b2471… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 14:18:18 2011 +0200 mshtml: Added more IHTMLElement_{put, get}_onclick tests. --- dlls/mshtml/tests/events.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 55baaca..1498818 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1437,6 +1437,20 @@ static void test_onclick(IHTMLDocument2 *doc) hres = IHTMLElement_put_onclick(div, v); ok(hres == E_NOTIMPL, "put_onclick failed: %08x\n", hres); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("function();"); + hres = IHTMLElement_put_onclick(div, v); + todo_wine ok(hres == S_OK, "put_onclick failed: %08x\n", hres); + + if(hres == S_OK) { + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement_get_onclick(div, &v); + ok(hres == S_OK, "get_onclick failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(onclick) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "function();"), "V_BSTR(onclick) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + } + VariantClear(&v); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onclick_obj; hres = IHTMLElement_put_onclick(div, v);

1 0

Piotr Caban : mshtml: Removed typo from HTMLDOMChildrenCollection_invoke function.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 9b26776fda424fb6f4b877d3dccacb646db1df71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b26776fda424fb6f4b877d3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 14:18:08 2011 +0200 mshtml: Removed typo from HTMLDOMChildrenCollection_invoke function. --- dlls/mshtml/htmlnode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e8d6f95..dbb5888 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -241,7 +241,7 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L hres = IHTMLDOMChildrenCollection_item(&This->IHTMLDOMChildrenCollection_iface, id - DISPID_CHILDCOL_0, &disp); - if(0&&FAILED(hres)) + if(FAILED(hres)) return hres; V_VT(res) = VT_DISPATCH;

1 0

Piotr Caban : mshtml/tests: Added IHTMLAttributeCollection IDispatchEx tests.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 48e2f9426cb09957e06bc4281dc0e9ce55a6468d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e2f9426cb09957e06bc4281… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 14:17:58 2011 +0200 mshtml/tests: Added IHTMLAttributeCollection IDispatchEx tests. --- dlls/mshtml/tests/dom.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 959bfe3..ab9e8b5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2413,6 +2413,54 @@ static void test_dynamic_properties(IHTMLElement *elem) SysFreeString(attr1); } +static void test_attr_collection_disp(IDispatch *disp) +{ + IDispatchEx *dispex; + IHTMLDOMAttribute *attr; + DISPPARAMS dp = {NULL, NULL, 0, 0}; + VARIANT var; + EXCEPINFO ei; + DISPID id; + BSTR bstr; + HRESULT hres; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + + bstr = a2bstr("0"); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(bstr); + + VariantInit(&var); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); + VariantClear(&var); + + bstr = a2bstr("attr1"); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + ok(hres == S_OK, "GetDispID failed: %08x\n", hres); + SysFreeString(bstr); + + VariantInit(&var); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, INVOKE_PROPERTYGET, &dp, &var, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(var)=%d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(var) == NULL\n"); + hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLDOMAttribute, (void**)&attr); + ok(hres == S_OK, "QueryInterface failed: %08x\n", hres); + hres = IHTMLDOMAttribute_get_nodeName(attr, &bstr); + ok(hres == S_OK, "get_nodeName failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "attr1"), "node name is %s, expected attr1\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLDOMAttribute_Release(attr); + VariantClear(&var); + + IDispatchEx_Release(dispex); +} + static void test_attr_collection(IHTMLElement *elem) { static const WCHAR testW[] = {'t','e','s','t',0}; @@ -2516,6 +2564,8 @@ static void test_attr_collection(IHTMLElement *elem) ok(hres == E_INVALIDARG, "item failed: %08x\n", hres); VariantClear(&id); + test_attr_collection_disp(disp); + IDispatch_Release(disp); IHTMLAttributeCollection_Release(attr_col); }

1 0

Piotr Caban : mshtml: Added HTMLAttributeCollection_invoke implementation.
by Alexandre Julliard 02 Sep '11

02 Sep '11

Module: wine Branch: master Commit: 648ed1e1c62af7db41d3cfd96afc80922636f314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=648ed1e1c62af7db41d3cfd96… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 2 14:17:49 2011 +0200 mshtml: Added HTMLAttributeCollection_invoke implementation. --- dlls/mshtml/htmlelem.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8b5b7f0..9d9fc8d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2622,12 +2622,36 @@ static HRESULT HTMLAttributeCollection_get_dispid(DispatchEx *dispex, BSTR name, return S_OK; } -static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, - VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { HTMLAttributeCollection *This = HTMLAttributeCollection_from_DispatchEx(dispex); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); - return E_NOTIMPL; + + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, params, res, ei, caller); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + HTMLDOMAttribute *iter; + + id = id-MSHTML_DISPID_CUSTOM_MIN+1; + + LIST_FOR_EACH_ENTRY(iter, &This->attrs, HTMLDOMAttribute, entry) { + if(!(--id)) + break; + } + if(id) + return E_INVALIDARG; + + IHTMLDOMAttribute_AddRef(&iter->IHTMLDOMAttribute_iface); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&iter->IHTMLDOMAttribute_iface; + return S_OK; + } + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } } static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011