February 2008 - Wine-commits

Rob Shearman : shell32: Fix the logic in Control_LoadApplet determining when to use CPL_INQUIRE and when to use CPL_NEWINQUIRE .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: c627a81a76f0853190702f95b73b8b42d07a8f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c627a81a76f0853190702f95b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 21:30:53 2008 +0000 shell32: Fix the logic in Control_LoadApplet determining when to use CPL_INQUIRE and when to use CPL_NEWINQUIRE. Previously, the code would fail to get the name of an applet that didn't return an icon for CPL_NEWINQUIRE and didn't return set either idName or idIcon to a non-zero value for CPL_INQUIRE. Fix this by sending CPL_INQUIRE first and loading any strings or icon specified and then only fall back to CPL_NEWINQUIRE if any of the required members were zero (i.e. CPL_DYNAMIC_RES) and then only fill in these fields. --- dlls/shell32/control.c | 75 +++++++++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index f38a920..1f17016 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -92,45 +92,54 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) ZeroMemory(&newinfo, sizeof(newinfo)); newinfo.dwSize = sizeof(NEWCPLINFOA); applet->info[i].dwSize = sizeof(NEWCPLINFOW); + applet->info[i].dwFlags = 0; + applet->info[i].dwHelpContext = 0; + applet->info[i].szHelpFile[0] = '\0'; /* proc is supposed to return a null value upon success for * CPL_INQUIRE and CPL_NEWINQUIRE * However, real drivers don't seem to behave like this * So, use introspection rather than return value */ - applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); - if (newinfo.hIcon == 0) { - applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); - if (info.idIcon == 0 || info.idName == 0) { - WARN("Couldn't get info from sp %u\n", i); - applet->info[i].dwSize = 0; - } else { - /* convert the old data into the new structure */ - applet->info[i].dwFlags = 0; - applet->info[i].dwHelpContext = 0; - applet->info[i].lData = info.lData; - applet->info[i].hIcon = LoadIconW(applet->hModule, - MAKEINTRESOURCEW(info.idIcon)); - LoadStringW(applet->hModule, info.idName, - applet->info[i].szName, sizeof(applet->info[i].szName) / sizeof(WCHAR)); - LoadStringW(applet->hModule, info.idInfo, - applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); - applet->info[i].szHelpFile[0] = '\0'; + applet->proc(hWnd, CPL_INQUIRE, i, (LPARAM)&info); + applet->info[i].lData = info.lData; + if (info.idIcon != CPL_DYNAMIC_RES) + applet->info[i].hIcon = LoadIconW(applet->hModule, + MAKEINTRESOURCEW(info.idIcon)); + if (info.idName != CPL_DYNAMIC_RES) + LoadStringW(applet->hModule, info.idName, + applet->info[i].szName, sizeof(applet->info[i].szName) / sizeof(WCHAR)); + if (info.idInfo != CPL_DYNAMIC_RES) + LoadStringW(applet->hModule, info.idInfo, + applet->info[i].szInfo, sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); + + if ((info.idIcon == CPL_DYNAMIC_RES) || (info.idName == CPL_DYNAMIC_RES) || + (info.idInfo == CPL_DYNAMIC_RES)) { + applet->proc(hWnd, CPL_NEWINQUIRE, i, (LPARAM)&newinfo); + + applet->info[i].dwFlags = newinfo.dwFlags; + applet->info[i].dwHelpContext = newinfo.dwHelpContext; + applet->info[i].lData = newinfo.lData; + if (info.idIcon == CPL_DYNAMIC_RES) { + if (!newinfo.hIcon) WARN("couldn't get icon for applet %u\n", i); + applet->info[i].hIcon = newinfo.hIcon; } - } - else - { - CopyMemory(&applet->info[i], &newinfo, newinfo.dwSize); - if (newinfo.dwSize != sizeof(NEWCPLINFOW)) - { - applet->info[i].dwSize = sizeof(NEWCPLINFOW); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szName, - sizeof(((LPNEWCPLINFOA)&newinfo)->szName) / sizeof(CHAR), - applet->info[i].szName, - sizeof(applet->info[i].szName) / sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szInfo, - sizeof(((LPNEWCPLINFOA)&newinfo)->szInfo) / sizeof(CHAR), - applet->info[i].szInfo, - sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); + if (newinfo.dwSize == sizeof(NEWCPLINFOW)) { + if (info.idName == CPL_DYNAMIC_RES) + memcpy(applet->info[i].szName, newinfo.szName, sizeof(newinfo.szName)); + if (info.idInfo == CPL_DYNAMIC_RES) + memcpy(applet->info[i].szInfo, newinfo.szInfo, sizeof(newinfo.szInfo)); + memcpy(applet->info[i].szHelpFile, newinfo.szHelpFile, sizeof(newinfo.szHelpFile)); + } else { + if (info.idName == CPL_DYNAMIC_RES) + MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szName, + sizeof(((LPNEWCPLINFOA)&newinfo)->szName) / sizeof(CHAR), + applet->info[i].szName, + sizeof(applet->info[i].szName) / sizeof(WCHAR)); + if (info.idInfo == CPL_DYNAMIC_RES) + MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szInfo, + sizeof(((LPNEWCPLINFOA)&newinfo)->szInfo) / sizeof(CHAR), + applet->info[i].szInfo, + sizeof(applet->info[i].szInfo) / sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, ((LPNEWCPLINFOA)&newinfo)->szHelpFile, sizeof(((LPNEWCPLINFOA)&newinfo)->szHelpFile) / sizeof(CHAR), applet->info[i].szHelpFile,

1 0

Francois Gouget : mscms/tests: EnumColorProfiles() should not fail even if there are no ICM files in the 'color directory'.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: e68150859105174268d0139ea470299727500cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68150859105174268d0139ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 21:56:45 2008 +0100 mscms/tests: EnumColorProfiles() should not fail even if there are no ICM files in the 'color directory'. --- dlls/mscms/tests/profile.c | 37 ++++++++++++++----------------------- 1 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 1055faa..9b01950 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -788,11 +788,9 @@ static void test_EnumColorProfilesA(void) ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number ); ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); - if (standardprofile) - { - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - } + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + todo_wine + ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); size = 0; @@ -801,13 +799,11 @@ static void test_EnumColorProfilesA(void) /* Functional checks */ - if (standardprofile) - { - size = total; + size = total; + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + todo_wine + ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - } HeapFree( GetProcessHeap(), 0, buffer ); } @@ -842,26 +838,21 @@ static void test_EnumColorProfilesW(void) ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number ); ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); - if (standardprofileW) - { - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - } + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + todo_wine + ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); size = 0; - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); /* Functional checks */ - if (standardprofileW) - { - size = total; + size = total; + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + todo_wine + ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - } HeapFree( GetProcessHeap(), 0, buffer ); }

1 0

Francois Gouget : mscms/tests: The presence of an ICM file in the color directory has nothing to do with the presence of a registered RGB profile .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 331bac4d00a049470e68aef82335c67458207b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331bac4d00a049470e68aef82… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 13 22:00:06 2008 +0100 mscms/tests: The presence of an ICM file in the color directory has nothing to do with the presence of a registered RGB profile. --- dlls/mscms/tests/profile.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 9b01950..5e5dbab 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -537,7 +537,7 @@ static HKEY reg_open_mscms_key(void) return ICM_key; } -static void check_registry(void) +static void check_registry(BOOL *has_space_rgb) { HKEY hkIcmKey; LONG res; @@ -546,6 +546,7 @@ static void check_registry(void) char szData[MAX_PATH+1]; DWORD dwNameLen, dwDataLen, dwType; + *has_space_rgb = FALSE; hkIcmKey = reg_open_mscms_key(); if (!hkIcmKey) { @@ -567,6 +568,8 @@ static void check_registry(void) dwNameLen = sizeof(szName); dwDataLen = sizeof(szData); res = RegEnumValueA( hkIcmKey, i, szName, &dwNameLen, NULL, &dwType, (LPBYTE)szData, &dwDataLen ); + if (strcmp(szName, "RGB") == 0) + *has_space_rgb = TRUE; if (res != ERROR_SUCCESS) { trace("RegEnumValueA() failed (%d), cannot enumerate profiles\n", res); @@ -580,7 +583,7 @@ static void check_registry(void) RegCloseKey( hkIcmKey ); } -static void test_GetStandardColorSpaceProfileA(void) +static void test_GetStandardColorSpaceProfileA(BOOL has_space_rgb) { BOOL ret; DWORD size; @@ -646,7 +649,7 @@ static void test_GetStandardColorSpaceProfileA(void) /* Functional checks */ - if (standardprofile) + if (has_space_rgb) { size = sizeof(oldprofile); @@ -674,7 +677,7 @@ static void test_GetStandardColorSpaceProfileA(void) } } -static void test_GetStandardColorSpaceProfileW(void) +static void test_GetStandardColorSpaceProfileW(BOOL has_space_rgb) { BOOL ret; DWORD size; @@ -696,9 +699,12 @@ static void test_GetStandardColorSpaceProfileW(void) ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); - SetLastError(0xfaceabee); /* 3th param, */ + SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, NULL, &sizeP); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (has_space_rgb) + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + else + todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, NULL); @@ -706,7 +712,11 @@ static void test_GetStandardColorSpaceProfileW(void) SetLastError(0xfaceabee); /* dereferenced 4th param. */ ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, &zero); - ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (has_space_rgb) + ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + else + todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + /* Several invalid parameter checks: */ @@ -729,7 +739,7 @@ static void test_GetStandardColorSpaceProfileW(void) /* Functional checks */ - if (standardprofileW) + if (has_space_rgb) { size = sizeof(oldprofile); @@ -1350,6 +1360,7 @@ START_TEST(profile) char path[MAX_PATH], file[MAX_PATH]; char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; + BOOL has_space_rgb; WCHAR fileW[MAX_PATH]; UINT ret; @@ -1424,10 +1435,10 @@ START_TEST(profile) test_GetCountColorProfileElements(); enum_registered_color_profiles(); - check_registry(); + check_registry(&has_space_rgb); - test_GetStandardColorSpaceProfileA(); - test_GetStandardColorSpaceProfileW(); + test_GetStandardColorSpaceProfileA(has_space_rgb); + test_GetStandardColorSpaceProfileW(has_space_rgb); test_EnumColorProfilesA(); test_EnumColorProfilesW();

1 0

Maarten Lankhorst : user32: Fix a message test that would only pass on wine .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: c6e61fbf892fe80bd34dfedeff3eaeeec43d0236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e61fbf892fe80bd34dfedef… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Feb 13 15:43:21 2008 -0800 user32: Fix a message test that would only pass on wine. --- dlls/user32/tests/msg.c | 2 +- dlls/user32/winpos.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 280b972..575d5d0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8936,7 +8936,7 @@ static const struct message WmSetWindowRgn_no_redraw[] = { }; static const struct message WmSetWindowRgn_clear[] = { - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, /* some versions of 2000/XP also has SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE in wparam */ + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent }, /* wparam != 1 */ { WM_GETTEXT, sent|defwinproc|optional }, diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 40ff927..e6ab36c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -273,8 +273,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) if (ret) { - UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED; - if (hrgn) swp_flags |= SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; + UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; if (!bRedraw) swp_flags |= SWP_NOREDRAW; SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); }

1 0

Divan Burger : comdlg32: Fix memory leak in colour dialog.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: c8b626fa1de2fcab5f929161a6bc5e8b86961665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b626fa1de2fcab5f929161a… Author: Divan Burger <divan.burger(a)gmail.com> Date: Wed Feb 13 17:19:24 2008 +0200 comdlg32: Fix memory leak in colour dialog. --- dlls/comdlg32/colordlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index cb76e7b..1b4c0d5 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -443,6 +443,7 @@ void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) { FillRect(hdc, &rect, hBrush); DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); + DeleteObject(hBrush); } ReleaseDC(hwnd, hdc); }

1 0

Gerald Pfeifer : shell32: Adjust a format specifier and remove a redundant range check in ILGetDisplayNameExW ().
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 8a590e8daa12c9c3eb725d167aacc19ea077baca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a590e8daa12c9c3eb725d167… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 17 19:47:27 2008 +0100 shell32: Adjust a format specifier and remove a redundant range check in ILGetDisplayNameExW(). --- dlls/shell32/pidl.c | 64 ++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 58cb080..e369574 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -97,7 +97,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa STRRET strret; DWORD flag; - TRACE("%p %p %p %d\n", psf, pidl, path, type); + TRACE("%p %p %p %x\n", psf, pidl, path, type); if (!pidl || !path) return FALSE; @@ -109,46 +109,44 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa return FALSE; } - if (type >= 0 && type <= 2) + switch (type) + { + case ILGDN_FORPARSING: + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + case ILGDN_NORMAL: + flag = SHGDN_NORMAL; + break; + case ILGDN_INFOLDER: + flag = SHGDN_INFOLDER; + break; + default: + FIXME("Unknown type parameter = %x\n", type); + flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; + break; + } + + if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) { - switch (type) + ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + if (SUCCEEDED(ret)) { - case ILGDN_FORPARSING: - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; - case ILGDN_NORMAL: - flag = SHGDN_NORMAL; - break; - case ILGDN_INFOLDER: - flag = SHGDN_INFOLDER; - break; - default: - FIXME("Unknown type parameter = %x\n", type); - flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; - break; + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidl)) + ret = E_FAIL; } - if (!*(const WORD*)pidl || type == ILGDN_FORPARSING) + } + else + { + ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); + if (SUCCEEDED(ret)) { - ret = IShellFolder_GetDisplayNameOf(lsf, pidl, flag, &strret); + ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); if (SUCCEEDED(ret)) { - if(!StrRetToStrNW(path, MAX_PATH, &strret, pidl)) + if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) ret = E_FAIL; } - } - else - { - ret = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psfParent, &pidllast); - if (SUCCEEDED(ret)) - { - ret = IShellFolder_GetDisplayNameOf(psfParent, pidllast, flag, &strret); - if (SUCCEEDED(ret)) - { - if(!StrRetToStrNW(path, MAX_PATH, &strret, pidllast)) - ret = E_FAIL; - } - IShellFolder_Release(psfParent); - } + IShellFolder_Release(psfParent); } }

1 0

Alexandre Julliard : kernel32: Fixed the active processor mask on Mac OS.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 3d418add04d272cef566f56bc35d7178a004395e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d418add04d272cef566f56bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 14:09:49 2008 +0100 kernel32: Fixed the active processor mask on Mac OS. --- dlls/kernel32/cpu.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index d9a704b..1f3d945 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -683,12 +683,12 @@ VOID WINAPI GetSystemInfo( } valSize = sizeof(int); if (sysctlbyname ("hw.ncpu", &value, &valSize, NULL, 0) == 0) - cachedsi.dwNumberOfProcessors = value; - + cachedsi.dwNumberOfProcessors = value; + valSize = sizeof(int); if (sysctlbyname ("hw.activecpu", &value, &valSize, NULL, 0) == 0) - cachedsi.dwActiveProcessorMask = value; - + cachedsi.dwActiveProcessorMask = (1 << value) - 1; + valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0) {

1 0

Alexandre Julliard : winedbg: Avoid using size_t in an error message.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: a8b0a5ea911aac9c90773c077e691995a350c15a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b0a5ea911aac9c90773c077… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 14:10:03 2008 +0100 winedbg: Avoid using size_t in an error message. --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index d68bff4..0f95056 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1396,7 +1396,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) if (reg >= cpu_num_regs) { if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) - fprintf(stderr, "Register out of bounds %x (%x)\n", reg, cpu_num_regs); + fprintf(stderr, "Register out of bounds %x\n", reg); return packet_error; } if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread)

1 0

Stefan Dösinger : wined3d: Fix a syntax error in the ARB vertex program offset shader.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: b8c613196d74f89ad0c1168cdd49d4f88dee29ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c613196d74f89ad0c1168cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 11 01:53:53 2008 +0100 wined3d: Fix a syntax error in the ARB vertex program offset shader. As some Mesa developers pointed out, the GL_ARB_vertex_program grammar does not allow an immediate value as source argument in ARL. Most compilers accept it, but since it is not the purpose of the test program to test for this replace it with a proper constant. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3c9ea69..011620d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -426,7 +426,8 @@ static inline BOOL test_arb_vs_offset_limit(WineD3D_GL_Info *gl_info) { "!!ARBvp1.0\n" "PARAM C[66] = { program.env[0..65] };\n" "ADDRESS A0;" - "ARL A0.x, 0.0;\n" + "PARAM zero = {0.0, 0.0, 0.0, 0.0};\n" + "ARL A0.x, zero.x;\n" "MOV result.position, C[A0.x + 65];\n" "END\n";

1 0

Stefan Dösinger : wined3d: Detect and work around the MacOS Geforce 8 PBO brokeness.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 989d283000e5d75b67ad5550e6b97e75c7c67929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=989d283000e5d75b67ad5550e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 11 01:55:11 2008 +0100 wined3d: Detect and work around the MacOS Geforce 8 PBO brokeness. --- dlls/wined3d/directx.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 011620d..2438f54 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2874,6 +2874,68 @@ static BOOL implementation_is_apple(WineD3D_GL_Info *gl_info) { } } +#define GLINFO_LOCATION (*gl_info) +static void test_pbo_functionality(WineD3D_GL_Info *gl_info) { + /* Some OpenGL implementations, namely Apple's Geforce 8 driver, advertises PBOs, + * but glTexSubImage from a PBO fails miserably, with the first line repeated over + * all the texture. This function detects this bug by its symptom and disables PBOs + * if the test fails. + * + * The test uplaods a 4x4 texture via the PBO in the "native" format GL_BGRA, + * GL_UNSIGNED_INT_8_8_8_8_REV. This format triggers the bug, and it is what we use + * for D3DFMT_A8R8G8B8. Then the texture is read back without any PBO and the data + * read back is compared to the original. If they are equal PBOs are assumed to work, + * otherwise the PBO extension is disabled. + */ + GLuint texture, pbo; + static const unsigned int pattern[] = { + 0x00000000, 0x000000ff, 0x0000ff00, 0x40ff0000, + 0x80ffffff, 0x40ffff00, 0x00ff00ff, 0x0000ffff, + 0x00ffff00, 0x00ff00ff, 0x0000ffff, 0x000000ff, + 0x80ff00ff, 0x0000ffff, 0x00ff00ff, 0x40ff00ff + }; + unsigned int check[sizeof(pattern) / sizeof(pattern[0])]; + + if(!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) { + /* No PBO -> No point in testing them */ + return; + } + + while(glGetError()); + glGenTextures(1, &texture); + glBindTexture(GL_TEXTURE_2D, texture); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); + checkGLcall("Specifying the PBO test texture\n"); + + GL_EXTCALL(glGenBuffersARB(1, &pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pbo)); + GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, sizeof(pattern), pattern, GL_STREAM_DRAW_ARB)); + checkGLcall("Specifying the PBO test pbo\n"); + + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + checkGLcall("Loading the PBO test texture\n"); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + glFinish(); /* just to be sure */ + + memset(check, 0, sizeof(check)); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, check); + checkGLcall("Reading back the PBO test texture\n"); + + glDeleteTextures(1, &texture); + GL_EXTCALL(glDeleteBuffersARB(1, &pbo)); + checkGLcall("PBO test cleanup\n"); + + if(memcmp(check, pattern, sizeof(check)) != 0) { + WARN_(d3d_caps)("PBO test failed, read back data doesn't match original\n"); + WARN_(d3d_caps)("Disabling PBOs. This may result in slower performance\n"); + gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] = FALSE; + } else { + TRACE_(d3d_caps)("PBO test successfull\n"); + } +} +#undef GLINFO_LOCATION + /* Certain applications(Steam) complain if we report an outdated driver version. In general, * reporting a driver version is moot because we are not the Windows driver, and we have different * bugs, features, etc. @@ -2965,6 +3027,9 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } } + /* Find out if PBOs work as they are supposed to */ + test_pbo_functionality(gl_info); + /* Fixup the driver version */ for(i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); i++) { if(gl_info->gl_vendor == driver_version_table[i].vendor &&

1 0