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

Joel Holdsworth : winecfg: Moved about panel code into about.c.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 7342bce80d2863813255dad7869f1574a90f18bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7342bce80d2863813255dad78… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jun 2 23:56:00 2010 +0100 winecfg: Moved about panel code into about.c. --- programs/winecfg/Makefile.in | 1 + programs/winecfg/about.c | 92 ++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/main.c | 60 --------------------------- programs/winecfg/winecfg.h | 1 + 4 files changed, 94 insertions(+), 60 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index ae8fbd0..73ec486 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -7,6 +7,7 @@ APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32 C_SRCS = \ + about.c \ appdefaults.c \ audio.c \ drive.c \ diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c new file mode 100644 index 0000000..7a88e4f --- /dev/null +++ b/programs/winecfg/about.c @@ -0,0 +1,92 @@ +/* + * WineCfg about panel + * + * Copyright 2002 Jaco Greeff + * Copyright 2003 Dimitrie O. Paun + * Copyright 2003 Mike Hearn + * Copyright 2010 Joel Holdsworth + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <windows.h> +#include <commctrl.h> +#include <wine/debug.h> + +#include "resource.h" +#include "winecfg.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winecfg); + +INT_PTR CALLBACK +AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + char *owner, *org; + + switch (uMsg) + { + case WM_NOTIFY: + switch(((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + /*save registration info to registry */ + owner = get_text(hDlg, IDC_ABT_OWNER); + org = get_text(hDlg, IDC_ABT_ORG); + + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + "RegisteredOwner", owner ? owner : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + "RegisteredOrganization", org ? org : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOwner", owner ? owner : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOrganization", org ? org : ""); + apply(); + + HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, org); + break; + } + break; + + case WM_INITDIALOG: + /* read owner and organization info from registry, load it into text box */ + owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOwner", ""); + org = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOrganization", ""); + + SetDlgItemText(hDlg, IDC_ABT_OWNER, owner); + SetDlgItemText(hDlg, IDC_ABT_ORG, org); + + SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0); + + HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, org); + break; + + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case EN_CHANGE: + /* enable apply button */ + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + } + break; + } + return FALSE; +} diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 83a5f05..fdefefb 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -60,66 +60,6 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) return 0; } -static INT_PTR CALLBACK -AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - char *owner, *org; - - switch (uMsg) { - - case WM_NOTIFY: - switch(((LPNMHDR)lParam)->code) - { - case PSN_APPLY: - /*save registration info to registry */ - owner = get_text(hDlg, IDC_ABT_OWNER); - org = get_text(hDlg, IDC_ABT_ORG); - - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", - "RegisteredOwner", owner ? owner : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", - "RegisteredOrganization", org ? org : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOwner", owner ? owner : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOrganization", org ? org : ""); - apply(); - - HeapFree(GetProcessHeap(), 0, owner); - HeapFree(GetProcessHeap(), 0, org); - break; - } - break; - - case WM_INITDIALOG: - /* read owner and organization info from registry, load it into text box */ - owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOwner", ""); - org = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOrganization", ""); - - SetDlgItemText(hDlg, IDC_ABT_OWNER, owner); - SetDlgItemText(hDlg, IDC_ABT_ORG, org); - - SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0); - - HeapFree(GetProcessHeap(), 0, owner); - HeapFree(GetProcessHeap(), 0, org); - break; - - case WM_COMMAND: - switch(HIWORD(wParam)) - { - case EN_CHANGE: - /* enable apply button */ - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - } - break; - } - return FALSE; -} - #define NUM_PROPERTY_PAGES 7 static INT_PTR diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index d730d84..4d4a92f 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* Drive management */ BOOL load_drives(void);

1 0

Mariusz Pluciński : gameux: Add declaration of IGameExplorer interface.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 1c5006e8f39db693236043e00f2fe3a14626134f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5006e8f39db693236043e00… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu May 27 13:50:46 2010 +0200 gameux: Add declaration of IGameExplorer interface. --- include/gameux.idl | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index 639814d..4700d75 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -30,10 +30,38 @@ import "shobjidl.idl"; ] library gameuxLib { + importlib("stdole2.tlb"); + typedef enum { GIS_NOT_INSTALLED = 1, GIS_CURRENT_USER = 2, GIS_ALL_USERS = 3 } GAME_INSTALL_SCOPE; + + [ + object, + uuid(E7B2FB72-D728-49B3-A5F2-18EBF5F1349E) + ] + interface IGameExplorer : IUnknown + { + HRESULT AddGame([in] BSTR sGDFBinaryPath, + [in] BSTR sInstallDirectory, + [in] GAME_INSTALL_SCOPE installScope, + [in, out] GUID* pguidInstanceID); + + HRESULT RemoveGame([in] GUID instanceID); + + HRESULT UpdateGame([in] GUID instanceID); + + HRESULT VerifyAccess([in] BSTR sGDFBinaryPath, [out] BOOL* pHasAccess); + }; + + [ + uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC) + ] + coclass GameExplorer + { + [default] interface IGameExplorer; + }; }

1 0

Matijn Woudt : msi/tests: Testcases for CREATE TABLE.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 1a159dfddc90fb5a734f58014ef5600dc1f3d78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a159dfddc90fb5a734f58014… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Thu Jun 3 15:21:31 2010 +0200 msi/tests: Testcases for CREATE TABLE. --- dlls/msi/tests/db.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5571a71..56fa0f0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8845,6 +8845,112 @@ static void test_columnorder(void) DeleteFileA(msifile); } +static void test_createtable(void) +{ + MSIHANDLE hdb, htab = 0, hrec = 0; + LPCSTR query; + UINT res; + DWORD size; + char buffer[0x20]; + + hdb = create_db(); + ok(hdb, "failed to create db\n"); + + query = "CREATE TABLE `blah` (`foo` CHAR(72) NOT NULL PRIMARY KEY `foo`)"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if(res == ERROR_SUCCESS ) + { + res = MsiViewExecute( htab, hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + query = "CREATE TABLE `a` (`b` INT PRIMARY KEY `b`)"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if(res == ERROR_SUCCESS ) + { + res = MsiViewExecute( htab, 0 ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + query = "SELECT * FROM `a`"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + query = "SELECT * FROM `a`"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + + res = MsiCloseHandle( hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + DeleteFileA(msifile); +} + + START_TEST(db) { test_msidatabase(); @@ -8896,4 +9002,5 @@ START_TEST(db) test_insertorder(); test_columnorder(); test_suminfo_import(); + test_createtable(); }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_GetHost.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: d5e0a2edca9f86b6e10e830cb79b11725efebc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e0a2edca9f86b6e10e830cb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jun 1 20:32:09 2010 -0400 urlmon/tests: Added tests for IUri_GetHost. --- dlls/urlmon/tests/uri.c | 24 ++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 ++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 2351174..6a3f306 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -710,6 +710,9 @@ static void test_IUri_GetStrProperties(void) { hr = IUri_GetFragment(uri, NULL); ok(hr == E_POINTER, "Error: GetFragment returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); + hr = IUri_GetHost(uri, NULL); + ok(hr == E_POINTER, "Error: GetHost returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); + hr = IUri_GetPassword(uri, NULL); ok(hr == E_POINTER, "Error: GetPassword returned 0x%08x, expected 0x%08x.\n", hr, E_POINTER); @@ -883,6 +886,27 @@ static void test_IUri_GetStrProperties(void) { SysFreeString(received); received = NULL; + /* GetHost() tests. */ + prop = test.str_props[Uri_PROPERTY_HOST]; + hr = IUri_GetHost(uri, &received); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + } + todo_wine { + ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n", + prop.value, wine_dbgstr_w(received), i); + } + } else { + ok(hr == prop.expected, "Error: GetHost returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + ok(!strcmp_aw(prop.value, received), "Error: Expected %s but got %s on uri_tests[%d].\n", + prop.value, wine_dbgstr_w(received), i); + } + SysFreeString(received); + received = NULL; + /* GetPassword() tests. */ prop = test.str_props[Uri_PROPERTY_PASSWORD]; hr = IUri_GetPassword(uri, &received); diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b0adb35..df5ca8b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -224,6 +224,10 @@ static HRESULT WINAPI Uri_GetHost(IUri *iface, BSTR *pstrHost) { Uri *This = URI_THIS(iface); FIXME("(%p)->(%p)\n", This, pstrHost); + + if(!pstrHost) + return E_POINTER; + return E_NOTIMPL; }

1 0

Wolfram Sang : user32: No sanity checks for BITMAPCOREINFO in BITMAP_Load.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 0dfedd50c38356c8049aef48e69b630204de0f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dfedd50c38356c8049aef48e… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Jun 5 05:57:19 2010 +0200 user32: No sanity checks for BITMAPCOREINFO in BITMAP_Load. --- dlls/user32/cursoricon.c | 11 ++++++----- dlls/user32/tests/cursoricon.c | 40 ++++++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b54d9fd..0f8d7da 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2233,11 +2233,6 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfOffBits) offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } - if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) { - WARN("Broken BitmapInfoHeader!\n"); - goto end_close; - } - size = bitmap_info_size(info, DIB_RGB_COLORS); fix_info = HeapAlloc(GetProcessHeap(), 0, size); scaled_info = HeapAlloc(GetProcessHeap(), 0, size); @@ -2269,6 +2264,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, } else { + /* Some sanity checks for BITMAPINFO (not applicable to BITMAPCOREINFO) */ + if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) { + WARN("Broken BitmapInfoHeader!\n"); + goto end; + } + scaled_info->bmiHeader.biWidth = new_width; scaled_info->bmiHeader.biHeight = new_height; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8af4126..b2e1d84 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -716,6 +716,13 @@ static unsigned char bmpimage[70] = { 0xFF,0xFF,0x00,0x00,0x00,0x00 }; +/* 1x1 pixel bmp using BITMAPCOREHEADER */ +static unsigned char bmpcoreimage[38] = { +0x42,0x4d,0x26,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x00,0x00,0x0c,0x00, +0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0xff,0xff,0xff,0x00,0x55,0x55, +0x55,0x00,0x00,0x00,0x00,0x00 +}; + /* 2x2 pixel gif */ static unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, @@ -723,7 +730,7 @@ static unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; -static void test_LoadImageBitmap(HBITMAP hbm) +static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) { BITMAP bm; BITMAPINFO bmi; @@ -741,12 +748,12 @@ static void test_LoadImageBitmap(HBITMAP hbm) bmi.bmiHeader.biBitCount= 24; bmi.bmiHeader.biCompression= BI_RGB; ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); - ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); + ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); - ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); + ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); } -static void test_LoadImageFile(unsigned char * image_data, +static void test_LoadImageFile(const char * test_desc, unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle; @@ -768,7 +775,7 @@ static void test_LoadImageFile(unsigned char * image_data, /* Load as cursor. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext); + ok(handle == NULL, "%s: IMAGE_CURSOR succeeded incorrectly.\n", test_desc); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -779,7 +786,7 @@ static void test_LoadImageFile(unsigned char * image_data, /* Load as icon. For all tested formats, this should fail */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); - ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext); + ok(handle == NULL, "%s: IMAGE_ICON succeeded incorrectly.\n", test_desc); error = GetLastError(); ok(error == 0 || broken(error == 0xdeadbeef) || /* Win9x */ @@ -796,10 +803,10 @@ static void test_LoadImageFile(unsigned char * image_data, "Last error: %u\n", error); if (expect_success) { - ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); - if (handle != NULL) test_LoadImageBitmap(handle); + ok(handle != NULL, "%s: IMAGE_BITMAP failed.\n", test_desc); + if (handle != NULL) test_LoadImageBitmap(test_desc, handle); } - else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + else ok(handle == NULL, "%s: IMAGE_BITMAP succeeded incorrectly.\n", test_desc); if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); @@ -892,17 +899,18 @@ static void test_LoadImage(void) HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); - test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 1); - test_LoadImageFile(gifimage, sizeof(gifimage), "gif", 0); - test_LoadImageFile(gif4pixel, sizeof(gif4pixel), "gif", 0); - test_LoadImageFile(jpgimage, sizeof(jpgimage), "jpg", 0); - test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0); + test_LoadImageFile("BMP", bmpimage, sizeof(bmpimage), "bmp", 1); + test_LoadImageFile("BMP (coreinfo)", bmpcoreimage, sizeof(bmpcoreimage), "bmp", 1); + test_LoadImageFile("GIF", gifimage, sizeof(gifimage), "gif", 0); + test_LoadImageFile("GIF (2x2 pixel)", gif4pixel, sizeof(gif4pixel), "gif", 0); + test_LoadImageFile("JPG", jpgimage, sizeof(jpgimage), "jpg", 0); + test_LoadImageFile("PNG", pngimage, sizeof(pngimage), "png", 0); /* Check failure for broken BMP images */ bmpimage[0x14]++; /* biHeight > 65535 */ - test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0); + test_LoadImageFile("BMP (too high)", bmpimage, sizeof(bmpimage), "bmp", 0); bmpimage[0x14]--; bmpimage[0x18]++; /* biWidth > 65535 */ - test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0); + test_LoadImageFile("BMP (too wide)", bmpimage, sizeof(bmpimage), "bmp", 0); bmpimage[0x18]--; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUri_IsEqual.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 68db56d305cfbe821175d351c334b3737acb4b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68db56d305cfbe821175d351c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jun 1 16:43:58 2010 -0400 urlmon/tests: Added tests for IUri_IsEqual. --- dlls/urlmon/tests/uri.c | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 12 +++++ 2 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9e8b32e..2351174 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -435,6 +435,46 @@ static const uri_properties uri_tests[] = { } }; +typedef struct _uri_equality { + const char* a; + DWORD create_flags_a; + BOOL create_todo_a; + const char* b; + DWORD create_flags_b; + BOOL create_todo_b; + BOOL equal; + BOOL todo; +} uri_equality; + +static const uri_equality equality_tests[] = { + { + "HTTP://www.winehq.org/test dir/./",0,FALSE, + "http://www.winehq.org/test dir/../test dir/",0,FALSE, + TRUE, TRUE + }, + { + /* http://www.winehq.org/test%20dir */ + "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0,FALSE, + "http://www.winehq.org/test dir",0,FALSE, + TRUE, TRUE, + }, + { + "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME,FALSE, + "file:///c:/test.mp3",0,FALSE, + TRUE,TRUE + }, + { + "ftp://ftp.winehq.org/",0,FALSE, + "ftp://ftp.winehq.org",0,FALSE, + TRUE, TRUE + }, + { + "ftp://ftp.winehq.org/test/test2/../../testB/",0,FALSE, + "ftp://ftp.winehq.org/t%45stB/",0,FALSE, + FALSE, TRUE + } +}; + static inline LPWSTR a2w(LPCSTR str) { LPWSTR ret = NULL; @@ -1356,6 +1396,86 @@ static void test_IUri_HasProperty(void) { } } +static void test_IUri_IsEqual(void) { + IUri *uriA, *uriB; + HRESULT hrA, hrB; + DWORD i; + + uriA = uriB = NULL; + + /* Make sure IsEqual handles invalid args correctly. */ + hrA = pCreateUri(http_urlW, 0, 0, &uriA); + hrB = pCreateUri(http_urlW, 0, 0, &uriB); + ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); + ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrB, S_OK); + if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { + BOOL equal = -1; + hrA = IUri_IsEqual(uriA, NULL, &equal); + ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); + ok(equal == FALSE, "Error: Expected equal to be FALSE, but was %d instead.\n", equal); + + hrA = IUri_IsEqual(uriA, uriB, NULL); + ok(hrA == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, E_POINTER); + } + if(uriA) IUri_Release(uriA); + if(uriB) IUri_Release(uriB); + + for(i = 0; i < sizeof(equality_tests)/sizeof(equality_tests[0]); ++i) { + uri_equality test = equality_tests[i]; + LPWSTR uriA_W, uriB_W; + + uriA = uriB = NULL; + + uriA_W = a2w(test.a); + uriB_W = a2w(test.b); + + hrA = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA); + if(test.create_todo_a) { + todo_wine { + ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", + hrA, S_OK, i); + } + } else { + ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", + hrA, S_OK, i); + } + + hrB = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB); + if(test.create_todo_b) { + todo_wine { + ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", + hrB, S_OK, i); + } + } else { + ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", + hrB, S_OK, i); + } + + if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { + BOOL equal = -1; + + hrA = IUri_IsEqual(uriA, uriB, &equal); + if(test.todo) { + todo_wine { + ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", + hrA, S_OK, i); + } + todo_wine { + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); + } + } else { + ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hrA, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); + } + } + if(uriA) IUri_Release(uriA); + if(uriB) IUri_Release(uriB); + + heap_free(uriA_W); + heap_free(uriB_W); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -1393,4 +1513,7 @@ START_TEST(uri) { trace("test IUri_HasProperty...\n"); test_IUri_HasProperty(); + + trace("test IUri_IsEqual...\n"); + test_IUri_IsEqual(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a46770b..b0adb35 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -377,6 +377,18 @@ static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) { Uri *This = URI_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pUri, pfEqual); + + if(!pfEqual) + return E_POINTER; + + if(!pUri) { + *pfEqual = FALSE; + + /* For some reason Windows returns S_OK here... */ + return S_OK; + } + FIXME("(%p)->(%p %p)\n", This, pUri, pfEqual); return E_NOTIMPL; }

1 0

Matteo Bruni : d3dx9: Allow D3DXAssembleShader calls with NULL parameters.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 8094c5563e784697787760563fd519e5cc48acfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8094c5563e784697787760563… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sat Jun 5 17:12:14 2010 +0200 d3dx9: Allow D3DXAssembleShader calls with NULL parameters. --- dlls/d3dx9_36/shader.c | 70 +++++++++++++++++++++++++------------------- dlls/d3dx9_36/tests/asm.c | 19 ++++++++++++ 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b226fa6..3a7824a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -411,25 +411,28 @@ HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, TRACE("Shader source:\n"); TRACE("%s\n", debugstr_a(preprocShader)); - size = (messages ? strlen(messages) : 0) + - (preprocMessages ? strlen(preprocMessages) : 0) + 1; - hr = D3DXCreateBuffer(size, &buffer); - if(FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, messages); - if(shader) SlDeleteShader(shader); - return hr; - } - pos = ID3DXBuffer_GetBufferPointer(buffer); - if(preprocMessages) + if(ppErrorMsgs) { - CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1); - pos += strlen(preprocMessages); - } - if(messages) - CopyMemory(pos, messages, strlen(messages) + 1); + size = (messages ? strlen(messages) : 0) + + (preprocMessages ? strlen(preprocMessages) : 0) + 1; + hr = D3DXCreateBuffer(size, &buffer); + if(FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, messages); + if(shader) SlDeleteShader(shader); + return hr; + } + pos = ID3DXBuffer_GetBufferPointer(buffer); + if(preprocMessages) + { + CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1); + pos += strlen(preprocMessages); + } + if(messages) + CopyMemory(pos, messages, strlen(messages) + 1); - *ppErrorMsgs = buffer; + *ppErrorMsgs = buffer; + } HeapFree(GetProcessHeap(), 0, messages); } @@ -448,15 +451,18 @@ HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, return D3DXERR_INVALIDDATA; } - size = HeapSize(GetProcessHeap(), 0, res); - hr = D3DXCreateBuffer(size, &buffer); - if(FAILED(hr)) + if(ppShader) { - HeapFree(GetProcessHeap(), 0, res); - return hr; + size = HeapSize(GetProcessHeap(), 0, res); + hr = D3DXCreateBuffer(size, &buffer); + if(FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, res); + return hr; + } + CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), res, size); + *ppShader = buffer; } - CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), res, size); - *ppShader = buffer; HeapFree(GetProcessHeap(), 0, res); @@ -500,7 +506,8 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, } current_include = include; - *shader = *error_messages = NULL; + if(shader) *shader = NULL; + if(error_messages) *error_messages = NULL; wpp_output_size = wpp_output_capacity = 0; wpp_output = NULL; @@ -525,11 +532,14 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, TRACE("Preprocessor messages:\n"); TRACE("%s", wpp_messages); - size = strlen(wpp_messages) + 1; - hr = D3DXCreateBuffer(size, &buffer); - if(FAILED(hr)) goto cleanup; - CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), wpp_messages, size); - *error_messages = buffer; + if(error_messages) + { + size = strlen(wpp_messages) + 1; + hr = D3DXCreateBuffer(size, &buffer); + if(FAILED(hr)) goto cleanup; + CopyMemory(ID3DXBuffer_GetBufferPointer(buffer), wpp_messages, size); + *error_messages = buffer; + } } if(data) { diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index cc0b6ae..9ed1be8 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1435,6 +1435,25 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); + /* NULL messages test */ + shader = NULL; + hr = D3DXAssembleShader(test1, strlen(test1), + defines, NULL, D3DXSHADER_SKIPVALIDATION, + &shader, NULL); + ok(hr == D3D_OK, "NULL messages test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(shader) ID3DXBuffer_Release(shader); + + /* NULL shader test */ + messages = NULL; + hr = D3DXAssembleShader(test1, strlen(test1), + defines, NULL, D3DXSHADER_SKIPVALIDATION, + NULL, &messages); + ok(hr == D3D_OK, "NULL shader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(messages) { + trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + /* pInclude test */ shader = NULL; messages = NULL;

1 0

Sylvain Petreolle : mshtml: Allow either REG_SZ or REG_EXPAND_SZ for GeckoCabDir.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: cf7de41edc4735819c932bbf719dfc9918851b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7de41edc4735819c932bbf7… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Wed Jun 2 09:44:41 2010 -0700 mshtml: Allow either REG_SZ or REG_EXPAND_SZ for GeckoCabDir. --- dlls/mshtml/install.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 4122194..65faa5a 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -235,13 +235,13 @@ static BOOL install_from_registered_dir(void) return FALSE; file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); if(res == ERROR_MORE_DATA) { file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); } RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { + if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { heap_free(file_name); return FALSE; }

1 0

Marcus Meissner : shlwapi: Handle NULL ptr return from allocation (Coverity ).
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: f01c43c47b9fe4bbc64874edb0af3bcd30c2b9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01c43c47b9fe4bbc64874edb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 3 13:10:17 2010 +0200 shlwapi: Handle NULL ptr return from allocation (Coverity). --- dlls/shlwapi/ordinal.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 18295e4..5f332f3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4506,12 +4506,18 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, { const WCHAR *ptr; UINT len = LoadStringW(hInstance, LOWORD(lpText), (LPWSTR)&ptr, 0); + if (len) { szText = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); if (szText) LoadStringW(hInstance, LOWORD(lpText), szText, len + 1); } pszText = szText; + if (!pszText) { + WARN("Failed to load id %d\n", LOWORD(lpText)); + __ms_va_end(args); + return 0; + } } else pszText = lpText;

1 0

Mariusz Pluciński : gameux: Add initial header for gameux.dll.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 18193428272788aec898c7bee1e86badaf8c60aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=18193428272788aec898c7bee… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Thu May 27 13:33:40 2010 +0200 gameux: Add initial header for gameux.dll. --- .gitignore | 1 + include/Makefile.in | 1 + include/gameux.idl | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index bdd4aa8..7ea85a6 100644 --- a/.gitignore +++ b/.gitignore @@ -160,6 +160,7 @@ include/dxgitype.h include/endpointvolume.h include/exdisp.h include/fusion.h +include/gameux.h include/hlink.h include/htiframe.h include/iads.h diff --git a/include/Makefile.in b/include/Makefile.in index a064076..d1f653a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -37,6 +37,7 @@ PUBLIC_IDL_H_SRCS = \ endpointvolume.idl \ exdisp.idl \ fusion.idl \ + gameux.idl \ hlink.idl \ htiframe.idl \ iads.idl \ diff --git a/include/gameux.idl b/include/gameux.idl new file mode 100644 index 0000000..639814d --- /dev/null +++ b/include/gameux.idl @@ -0,0 +1,39 @@ + /* + * Defines the COM interfaces of Game Explorer + * + * Copyright (C) 2008 Alistair Leslie-Hughes + * Copyright (C) 2010 Mariusz Pluciński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "shobjidl.idl"; + +[ + uuid(1DE6CE3D-EA69-4671-941F-26F789F39C5B), + version(1.0), + helpstring("gameux public 1.0 Type Library") +] +library gameuxLib +{ + typedef enum + { + GIS_NOT_INSTALLED = 1, + GIS_CURRENT_USER = 2, + GIS_ALL_USERS = 3 + } GAME_INSTALL_SCOPE; +}

1 0