May 2010 - Wine-commits - list.winehq.org

Austin English : qedit: Fix return value of DllUnregisterServer.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: caf0e0befee9622f3ebed0f2a7da71794ca361e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf0e0befee9622f3ebed0f2a… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 22 01:23:56 2010 -0500 qedit: Fix return value of DllUnregisterServer. --- dlls/qedit/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/regsvr.c b/dlls/qedit/regsvr.c index d70c822..d007311 100644 --- a/dlls/qedit/regsvr.c +++ b/dlls/qedit/regsvr.c @@ -326,5 +326,5 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); hr = unregister_coclasses(coclass_list); - return S_OK; + return hr; }

1 0

Marcus Meissner : include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1).
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 122bfcc18526ad51021b987d53b322e1d525a662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=122bfcc18526ad51021b987d5… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 27 15:40:48 2010 +0200 include: Pack NE_NAMEINFO and NE_TYPEINFO pack(1). --- include/wine/winbase16.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index aaa3336..b70ecd6 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -217,8 +217,6 @@ enum arg_types ARG_VARARG /* start of varargs */ }; -#include <poppack.h> - #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) #define INFINITE16 0xFFFF @@ -315,6 +313,7 @@ typedef struct #define NE_RSCTYPE_GROUP_ICON 0x800e #define NE_RSCTYPE_SCALABLE_FONTPATH 0x80cc /* Resource found in .fot files */ +#include <poppack.h> #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT)

1 0

Alexandre Julliard : user32: Don't include winbase16.h.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: ed4846bed92d9c6e2bafa83d729863de018a978e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4846bed92d9c6e2bafa83d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:08 2010 +0200 user32: Don't include winbase16.h. --- dlls/user32/exticon.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a720cf3..fb9ff03 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -37,7 +37,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "wine/winbase16.h" +#include "winnls.h" #include "user_private.h" #include "wine/debug.h" @@ -65,6 +65,26 @@ typedef struct icoICONDIRENTRY idEntries[1]; /* An entry for each image (idCount of 'em) */ } icoICONDIR, *LPicoICONDIR; +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + +#define NE_RSCTYPE_ICON 0x8003 +#define NE_RSCTYPE_GROUP_ICON 0x800e + #include "poppack.h" #if 0

1 0

Alexandre Julliard : version: Don't include winbase16.h.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: c94e7645a48f6639d94f9a8db18772b3e5426195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94e7645a48f6639d94f9a8db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 27 17:04:12 2010 +0200 version: Don't include winbase16.h. --- dlls/version/resource.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index e27a967..64d39dd 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -39,10 +39,25 @@ #include "winver.h" #include "wine/unicode.h" -#include "wine/winbase16.h" - #include "wine/debug.h" +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; + WORD count; + DWORD resloader; +} NE_TYPEINFO; + WINE_DEFAULT_DEBUG_CHANNEL(ver);

1 0

Roderick Colenbrander : wined3d: Mark Geforce GT 140 as a Geforce 9600GT.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: c44603a559c2ed37a8ac6d8bb71133994a61070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44603a559c2ed37a8ac6d8bb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:35 2010 +0200 wined3d: Mark Geforce GT 140 as a Geforce 9600GT. --- dlls/wined3d/directx.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 023bd17..02ebfa3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1327,8 +1327,9 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_9800GT; } - /* Geforce9 - midend */ - if (strstr(gl_renderer, "9600")) + /* Geforce9 - midend (GT 140 uses the same core as the 9600GT) */ + if (strstr(gl_renderer, "9600") + || strstr(gl_renderer, "GT 140")) { *vidmem = 384; /* The 9600GSO has 384MB, the 9600GT has 512-1024MB */ return CARD_NVIDIA_GEFORCE_9600GT;

1 0

Roderick Colenbrander : wined3d: Add support for mobile Geforce 3xx GPUs.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 39eaaeaa27db0c703913f2a49e9b053dc8c34f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39eaaeaa27db0c703913f2a49… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed May 26 21:51:36 2010 +0200 wined3d: Add support for mobile Geforce 3xx GPUs. --- dlls/wined3d/directx.c | 24 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02ebfa3..ba9e551 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1021,6 +1021,8 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", 15, 11, 9775 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", 15, 11, 9775 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ @@ -1275,6 +1277,22 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_GTX470; } + /* Geforce 300 highend mobile */ + if (strstr(gl_renderer, "GTS 350M") + || strstr(gl_renderer, "GTS 360M")) + { + *vidmem = 1024; + return CARD_NVIDIA_GEFORCE_GTS350M; + } + + /* Geforce 300 midend mobile (Geforce GT 325M/330M use the same core) */ + if (strstr(gl_renderer, "GT 325M") + || strstr(gl_renderer, "GT 330M")) + { + *vidmem = 1024; + return CARD_NVIDIA_GEFORCE_GT325M; + } + /* Geforce 200 - highend */ if (strstr(gl_renderer, "GTX 280") || strstr(gl_renderer, "GTX 285") @@ -1310,9 +1328,11 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl *vidmem = 512; /* The GT 220 has 512-1024MB */ return CARD_NVIDIA_GEFORCE_GT220; } - /* Geforce 200 lowend */ + /* Geforce 200 lowend (Geforce 305/310 use the same core) */ if (strstr(gl_renderer, "Geforce 210") - || strstr(gl_renderer, "G 210")) + || strstr(gl_renderer, "G 210") + || strstr(gl_renderer, "Geforce 305") + || strstr(gl_renderer, "Geforce 310")) { *vidmem = 512; return CARD_NVIDIA_GEFORCE_210; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7846ad..77bcf0e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1349,6 +1349,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, + CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX470 = 0x06cd, CARD_NVIDIA_GEFORCE_GTX480 = 0x06c0,

1 0

Austin English : user32/tests: Check return value of GetUpdateRect in test_validatergn.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 6487f3397a1a82405224f23390c3e2f3b7562e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6487f3397a1a82405224f2339… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 26 15:19:46 2010 -0500 user32/tests: Check return value of GetUpdateRect in test_validatergn. --- dlls/user32/tests/win.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 8f0f42d..eadad3a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3213,10 +3213,12 @@ static void test_validatergn(HWND hwnd) GetWindowRect( child, &rc); MapWindowPoints( NULL, hwnd, (POINT*) &rc, 2); ret = GetUpdateRect( child, &rc2, 0); + ok( ret == 1, "Expected GetUpdateRect to return non-zero, got %d\n", ret); ok( rc2.right > rc2.left && rc2.bottom > rc2.top, "Update rectangle is empty!\n"); ValidateRect( hwnd, &rc); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom); @@ -3228,6 +3230,7 @@ static void test_validatergn(HWND hwnd) rgn = CreateRectRgnIndirect( &rc); ValidateRgn( hwnd, rgn); ret = GetUpdateRect( child, &rc2, 0); + ok( !ret, "Expected GetUpdateRect to return zero, got %d\n", ret); ok( rc2.left == 0 && rc2.top == 0 && rc2.right == 0 && rc2.bottom == 0, "Update rectangle %d,%d-%d,%d is not empty!\n", rc2.left, rc2.top, rc2.right, rc2.bottom);

1 0

Vincent Povirk : windowscodecs: Account for a NULL pceltFetched in ComponentEnum_Next.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: 645f7c6208efe0db680d73979fbf73c4d3540a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f7c6208efe0db680d73979… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 15:28:46 2010 -0500 windowscodecs: Account for a NULL pceltFetched in ComponentEnum_Next. --- dlls/windowscodecs/info.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 2e558a8..f790dbc 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -817,7 +817,8 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, This->cursor = list_next(&This->objects, This->cursor); } LeaveCriticalSection(&This->lock); - *pceltFetched = num_fetched; + if (pceltFetched) + *pceltFetched = num_fetched; return hr; }

1 0

Vincent Povirk : ole32/tests: Add more IStream_Seek tests for hglobalstream .
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: ff4292c229ceb4621e661601c9763d13c4f4bab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4292c229ceb4621e661601c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 12:10:53 2010 -0500 ole32/tests: Add more IStream_Seek tests for hglobalstream. --- dlls/ole32/tests/hglobalstream.c | 47 +++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 5632b24..6d2230d 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -151,7 +151,7 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0, "should have set LowPart to 0 instead of %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- invalid LowPart value (seek from current position) */ + /* IStream_Seek -- invalid LowPart value (seek before start of stream) */ ll.u.HighPart = 0; ll.u.LowPart = sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); @@ -166,6 +166,51 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + /* IStream_Seek -- valid LowPart value (seek to start of stream) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = -sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + todo_wine ok_ole_success(hr, "IStream_Seek"); + todo_wine ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* IStream_Seek -- invalid LowPart value (seek to start of stream-1) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = -sizeof(data)-1; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); + ok(ull.u.LowPart == sizeof(data), "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* IStream_Seek -- valid LowPart value (seek forward to 0x80000000) */ + ll.u.HighPart = 0; + ll.u.LowPart = sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + ok_ole_success(hr, "IStream_Seek"); + + ull.u.HighPart = 0xCAFECAFE; + ull.u.LowPart = 0xCAFECAFE; + ll.u.HighPart = 0; + ll.u.LowPart = 0x80000000 - sizeof(data); + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0x80000000, "LowPart set to %d\n", ull.u.LowPart); + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + /* IStream_Seek -- invalid LowPart value (seek to beginning) */ ll.u.HighPart = 0; ll.u.LowPart = sizeof(data);

1 0

Vincent Povirk : ole32: Fix seeking backwards in hglobalstream.
by Alexandre Julliard 27 May '10

27 May '10

Module: wine Branch: master Commit: d64ee9ff11d8712bbb0c643f902a62a0ee557021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64ee9ff11d8712bbb0c643f9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 26 12:15:11 2010 -0500 ole32: Fix seeking backwards in hglobalstream. --- dlls/ole32/hglobalstream.c | 19 +++++++++++-------- dlls/ole32/tests/hglobalstream.c | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 5742f99..ef616de 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -371,12 +371,6 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( TRACE("(%p, %x%08x, %d, %p)\n", iface, dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); - if (dlibMove.u.LowPart >= 0x80000000) - { - hr = STG_E_SEEKERROR; - goto end; - } - /* * The file pointer is moved depending on the given "function" * parameter. @@ -405,10 +399,19 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( newPosition.u.HighPart = 0; newPosition.u.LowPart += dlibMove.QuadPart; -end: - if (plibNewPosition) *plibNewPosition = newPosition; + if (dlibMove.u.LowPart >= 0x80000000 && + newPosition.u.LowPart >= dlibMove.u.LowPart) + { + /* We tried to seek backwards and went past the start. */ + hr = STG_E_SEEKERROR; + goto end; + } + This->currentPosition = newPosition; +end: + if (plibNewPosition) *plibNewPosition = This->currentPosition; + return hr; } diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6d2230d..0810d9f 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -177,8 +177,8 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = -sizeof(data); hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - todo_wine ok_ole_success(hr, "IStream_Seek"); - todo_wine ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0, "LowPart set to %d\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- invalid LowPart value (seek to start of stream-1) */

1 0