April 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Hardcode local loop control ints into the code in reps.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 10ad2e8e032ee9f77922237a91b2854ba572ba4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ad2e8e032ee9f77922237a9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 22 19:35:19 2009 +0200 wined3d: Hardcode local loop control ints into the code in reps. This helps the compiler to unroll the loop and dodges a crash on OSX. It is similar to what we do in "loop aL, iX" already. --- dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2985d08..3fd9500 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2359,11 +2359,29 @@ static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; glsl_src_param_t src0_param; + const DWORD *control_values = NULL; + const local_constant *constant; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", - shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, - src0_param.param_str, shader->baseShader.cur_loop_depth); + /* Try to hardcode local values to help the GLSL compiler to unroll and optimize the loop */ + if(ins->src[0].register_type == WINED3DSPR_CONSTINT) { + LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { + if(constant->idx == ins->src[0].register_idx) { + control_values = constant->value; + break; + } + } + } + + if(control_values) { + shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %d; tmpInt%d++) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, + control_values[0], shader->baseShader.cur_loop_depth); + } else { + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); + shader_addline(ins->ctx->buffer, "for (tmpInt%d = 0; tmpInt%d < %s; tmpInt%d++) {\n", + shader->baseShader.cur_loop_depth, shader->baseShader.cur_loop_depth, + src0_param.param_str, shader->baseShader.cur_loop_depth); + } shader->baseShader.cur_loop_depth++; }

1 0

Guy Albertelli : kernel32/tests: Add tests for GetVolumeInformationA and QueryDosDevice.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 6f1390646cdf440ee43a6b06073276c50b00fded URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f1390646cdf440ee43a6b060… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Apr 28 21:07:12 2009 -0400 kernel32/tests: Add tests for GetVolumeInformationA and QueryDosDevice. --- dlls/kernel32/tests/volume.c | 138 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 134 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 97e3559..1bbdb68 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include "winbase.h" +#include <stdio.h> static HINSTANCE hdll; static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); @@ -29,29 +30,62 @@ static BOOL (WINAPI *pFindNextVolumeA)(HANDLE,LPSTR,DWORD); static BOOL (WINAPI *pFindVolumeClose)(HANDLE); static UINT (WINAPI *pGetLogicalDriveStringsA)(UINT,LPSTR); static UINT (WINAPI *pGetLogicalDriveStringsW)(UINT,LPWSTR); +static BOOL (WINAPI *pGetVolumeInformationA)(LPCSTR, LPSTR, DWORD, LPDWORD, LPDWORD, LPDWORD, LPSTR, DWORD); /* ############################### */ static void test_query_dos_deviceA(void) { char drivestr[] = "a:"; - char *p, buffer[2000]; - DWORD ret; + char *p, *q, *buffer, buffer2[2000]; + DWORD ret, ret2, buflen=32768; BOOL found = FALSE; + buffer = HeapAlloc( GetProcessHeap(), 0, buflen ); + ret = QueryDosDeviceA( NULL, buffer, buflen ); + ok(ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER, + "QueryDosDevice buffer too small\n"); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { + HeapFree( GetProcessHeap(), 0, buffer ); + return; + } + ok(ret, "QueryDosDeviceA failed to return list, last error %u\n", GetLastError()); + if (ret) { + p = buffer; + for (;;) { + if (!strlen(p)) break; + trace("device entry %s\n", p); + ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); + ok(ret2, "QueryDosDeviceA failed to return current mapping, last error %u\n", GetLastError()); + if (ret2) { + q = buffer2; + for (;;) { + if (!strlen(q)) break; + trace("for device %s, current mapping %s\n", p, q); + q += strlen(q) + 1; + if (ret2 <= (q-buffer2)) break; + } + } + p += strlen(p) + 1; + if (ret <= (p-buffer)) break; + } + } + if (!pFindFirstVolumeA) { - skip("On win9x, HARDDISK and RAMDISK not present\n"); + win_skip("On win9x, HARDDISK and RAMDISK not present\n"); + HeapFree( GetProcessHeap(), 0, buffer ); return; } for (;drivestr[0] <= 'z'; drivestr[0]++) { - ret = QueryDosDeviceA( drivestr, buffer, sizeof(buffer)); + ret = QueryDosDeviceA( drivestr, buffer, buflen); if(ret) { for (p = buffer; *p; p++) *p = toupper(*p); if (strstr(buffer, "HARDDISK") || strstr(buffer, "RAMDISK")) found = TRUE; } } ok(found, "expected at least one devicename to contain HARDDISK or RAMDISK\n"); + HeapFree( GetProcessHeap(), 0, buffer ); } static void test_FindFirstVolume(void) @@ -216,6 +250,100 @@ static void test_GetLogicalDriveStringsW(void) HeapFree(GetProcessHeap(), 0, buf); } +static void test_GetVolumeInformationA(void) +{ + BOOL ret; + UINT result; + char Root_Dir0[]="C:"; + char Root_Dir1[]="C:\\"; + char Root_Dir2[]="\\\\?\\C:\\"; + char volume[MAX_PATH+1]; + DWORD vol_name_size=MAX_PATH+1, vol_serial_num=-1, max_comp_len=0, fs_flags=0, fs_name_len=MAX_PATH+1; + char vol_name_buf[MAX_PATH+1], fs_name_buf[MAX_PATH+1]; + char windowsdir[MAX_PATH+10]; + + if (!pGetVolumeInformationA) { + win_skip("GetVolumeInformationA not found\n"); + return; + } + if (!pGetVolumeNameForVolumeMountPointA) { + win_skip("GetVolumeNameForVolumeMountPointA not found\n"); + return; + } + + /* get windows drive letter and update strings for testing */ + result = GetWindowsDirectory(windowsdir, sizeof(windowsdir)); + ok(result < sizeof(windowsdir), "windowsdir is abnormally long!\n"); + ok(result != 0, "GetWindowsDirectory: error %d\n", GetLastError()); + Root_Dir0[0] = windowsdir[0]; + Root_Dir1[0] = windowsdir[0]; + Root_Dir2[4] = windowsdir[0]; + + /* get the unique volume name for the windows drive */ + ret = pGetVolumeNameForVolumeMountPointA(Root_Dir1, volume, MAX_PATH); + ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); + + /* **** now start the tests **** */ + /* check for error on no trailing \ */ + ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, + NULL, NULL, fs_name_buf, fs_name_len); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_NAME, + "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError()); + + /* try null root directory to return "root of the current directory" */ + ret = pGetVolumeInformationA(NULL, vol_name_buf, vol_name_size, NULL, + NULL, NULL, fs_name_buf, fs_name_len); + ok(ret, "GetVolumeInformationA failed on null root dir, last error %u\n", GetLastError()); + if (ret) { + trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", + "<NULL>", vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); + } + + /* Try normal drive letter with trailing \ */ + ret = pGetVolumeInformationA(Root_Dir1, vol_name_buf, vol_name_size, + &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); + ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir1, GetLastError()); + if (ret) { + trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", + Root_Dir1, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); + } + + /* try again with dirve letter and the "disable parsing" prefix */ + ret = pGetVolumeInformationA(Root_Dir2, vol_name_buf, vol_name_size, + &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); + todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir2, GetLastError()); + if (ret) { + trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", + Root_Dir2, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); + } + + /* try again with unique voluem name */ + ret = pGetVolumeInformationA(volume, vol_name_buf, vol_name_size, + &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); + todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", volume, GetLastError()); + if (ret) { + trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", + volume, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); + } + + /* try again with device name space */ + Root_Dir2[2] = '.'; + ret = pGetVolumeInformationA(Root_Dir2, vol_name_buf, vol_name_size, + &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); + todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir2, GetLastError()); + if (ret) { + trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", + Root_Dir2, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); + } + + /* try again with a directory off the root - should generate error */ + ret = pGetVolumeInformationA(windowsdir, vol_name_buf, vol_name_size, + &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); + todo_wine ok(!ret && GetLastError()==ERROR_DIR_NOT_ROOT, + "GetVolumeInformationA failed, root=%s, last error=%u\n", windowsdir, GetLastError()); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -226,6 +354,7 @@ START_TEST(volume) pFindVolumeClose = (void *) GetProcAddress(hdll, "FindVolumeClose"); pGetLogicalDriveStringsA = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsA"); pGetLogicalDriveStringsW = (void *) GetProcAddress(hdll, "GetLogicalDriveStringsW"); + pGetVolumeInformationA = (void *) GetProcAddress(hdll, "GetVolumeInformationA"); test_query_dos_deviceA(); test_FindFirstVolume(); @@ -233,4 +362,5 @@ START_TEST(volume) test_GetVolumeNameForVolumeMountPointW(); test_GetLogicalDriveStringsA(); test_GetLogicalDriveStringsW(); + test_GetVolumeInformationA(); }

1 0

Guy Albertelli : kernel32: Fix GetVolumeInformation[AW] to require trailing \.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: f7e6777e6e19ca3be4b84f98baf22ef53ab19f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e6777e6e19ca3be4b84f98b… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Apr 28 21:08:22 2009 -0400 kernel32: Fix GetVolumeInformation[AW] to require trailing \. --- dlls/kernel32/tests/volume.c | 1 - dlls/kernel32/volume.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 1bbdb68..16fad10 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -287,7 +287,6 @@ static void test_GetVolumeInformationA(void) /* check for error on no trailing \ */ ret = pGetVolumeInformationA(Root_Dir0, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_NAME, "GetVolumeInformationA w/o '\\' did not fail, last error %u\n", GetLastError()); diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index e0d0989..1b44ace 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -526,7 +526,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } else { - if (!root[0] || root[1] != ':') + if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\\' ) { SetLastError( ERROR_INVALID_NAME ); return FALSE;

1 0

Guy Albertelli : kernel32/tests: Add tests to verify GetVolumeNameForVolumeMountPointA returns correct string .
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: fce0f9ab8aa21a95209812906fad9267b0ccbb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fce0f9ab8aa21a95209812906… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Tue Apr 28 21:08:36 2009 -0400 kernel32/tests: Add tests to verify GetVolumeNameForVolumeMountPointA returns correct string. --- dlls/kernel32/tests/volume.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 16fad10..49703ef 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -343,6 +343,56 @@ static void test_GetVolumeInformationA(void) "GetVolumeInformationA failed, root=%s, last error=%u\n", windowsdir, GetLastError()); } +/* Test to check that unique volume name from windows dir mount point */ +/* matches at least one of the unique volume names returned from the */ +/* FindFirstVolumeA/FindNextVolumeA list. */ +static void test_enum_vols(void) +{ + DWORD ret; + HANDLE hFind = INVALID_HANDLE_VALUE; + char Volume_1[MAX_PATH] = {0}; + char Volume_2[MAX_PATH] = {0}; + char path[] = "c:\\"; + BOOL found = FALSE; + char windowsdir[MAX_PATH]; + + if (!pGetVolumeNameForVolumeMountPointA) { + win_skip("GetVolumeNameForVolumeMountPointA not found\n"); + return; + } + + /*get windows drive letter and update strings for testing */ + ret = GetWindowsDirectory( windowsdir, sizeof(windowsdir) ); + ok(ret < sizeof(windowsdir), "windowsdir is abnormally long!\n"); + ok(ret != 0, "GetWindowsDirecory: error %d\n", GetLastError()); + path[0] = windowsdir[0]; + + /* get the unique volume name for the windows drive */ + ret = pGetVolumeNameForVolumeMountPointA( path, Volume_1, MAX_PATH ); + ok(ret == TRUE, "GetVolumeNameForVolumeMountPointA failed\n"); +todo_wine + ok(strlen(Volume_1) == 49, "GetVolumeNameForVolumeMountPointA returned wrong length name %s\n", Volume_1); + + /* get first unique volume name of list */ + hFind = pFindFirstVolumeA( Volume_2, MAX_PATH ); + ok(hFind != INVALID_HANDLE_VALUE, "FindFirstVolume failed, err=%u\n", + GetLastError()); + + do + { + /* validate correct length of unique volume name */ + ok(strlen(Volume_2) == 49, "Find[First/Next]Volume returned wrong length name %s\n", Volume_1); + if (memcmp(Volume_1, Volume_2, 49) == 0) + { + found = TRUE; + break; + } + } while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH )); +todo_wine + ok(found, "volume name %s not found by Find[First/Next]Volume\n", Volume_1); + pFindVolumeClose( hFind ); +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -362,4 +412,5 @@ START_TEST(volume) test_GetLogicalDriveStringsA(); test_GetLogicalDriveStringsW(); test_GetVolumeInformationA(); + test_enum_vols(); }

1 0

Nikolay Sivov : comctl32/listview: Handle CCM_[G, S]ETVERSION in listview.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: bbd00da488ee05ace5928b49129ca030cdc7ec0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd00da488ee05ace5928b491… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 29 12:39:17 2009 +0400 comctl32/listview: Handle CCM_[G,S]ETVERSION in listview. --- dlls/comctl32/listview.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b6c6c2d..2c60320 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -309,6 +309,8 @@ typedef struct tagLISTVIEW_INFO INT nMeasureItemHeight; INT xTrackLine; /* The x coefficient of the track line or -1 if none */ DELAYED_ITEM_EDIT itemEdit; /* Pointer to this structure will be the timer ID */ + + DWORD iVersion; /* CCM_[G,S]ETVERSION */ } LISTVIEW_INFO; /* @@ -8133,6 +8135,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ infoPtr->itemEdit.fEnabled = FALSE; + infoPtr->iVersion = COMCTL32_VERSION; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -9759,6 +9762,47 @@ static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iSta /*** * DESCRIPTION: + * Processes CCM_GETVERSION messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * + * RETURN: + * Current version + */ +static inline LRESULT LISTVIEW_GetVersion(LISTVIEW_INFO *infoPtr) +{ + return infoPtr->iVersion; +} + +/*** + * DESCRIPTION: + * Processes CCM_SETVERSION messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] iVersion : version to be set + * + * RETURN: + * -1 when requested version is greater then DLL version; + * previous version otherwise + */ +static LRESULT LISTVIEW_SetVersion(LISTVIEW_INFO *infoPtr, DWORD iVersion) +{ + INT iOldVersion = infoPtr->iVersion; + + if (iVersion > COMCTL32_VERSION) + return -1; + + infoPtr->iVersion = iVersion; + + TRACE("new version %d\n", iVersion); + + return iOldVersion; +} + +/*** + * DESCRIPTION: * Window procedure of the listview control. * */ @@ -10126,6 +10170,12 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_UPDATE: return LISTVIEW_Update(infoPtr, (INT)wParam); + case CCM_GETVERSION: + return LISTVIEW_GetVersion(infoPtr); + + case CCM_SETVERSION: + return LISTVIEW_SetVersion(infoPtr, wParam); + case WM_CHAR: return LISTVIEW_ProcessLetterKeys( infoPtr, wParam, lParam );

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVIF_NORECOMPUTE flag.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 43dcbdeb702b9dd107579c8a0b9327e138aa6cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dcbdeb702b9dd107579c8a0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 28 18:59:25 2009 +0400 comctl32/listview: Some tests for LVIF_NORECOMPUTE flag. --- dlls/comctl32/tests/listview.c | 80 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5d40546..cde7a25 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -158,6 +158,10 @@ static const struct message listview_getorderarray_seq[] = { { 0 } }; +static const struct message empty_seq[] = { + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -1835,6 +1839,81 @@ static void test_ownerdata(void) DestroyWindow(hwnd); } +static void test_norecompute(void) +{ + static CHAR testA[] = "test"; + CHAR buff[10]; + LVITEMA item; + HWND hwnd; + DWORD res; + + /* self containing control */ + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_TEXT | LVIF_STATE; + item.iItem = 0; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + item.pszText = testA; + res = SendMessageA(hwnd, LVM_INSERTITEM, 0, (LPARAM)&item); + expect(0, res); + /* retrieve with LVIF_NORECOMPUTE */ + item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff)/sizeof(CHAR); + res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, res); + ok(lstrcmp(buff, testA) == 0, "Expected (%s), got (%s)\n", testA, buff); + + item.mask = LVIF_TEXT; + item.iItem = 1; + item.pszText = LPSTR_TEXTCALLBACK; + res = SendMessageA(hwnd, LVM_INSERTITEM, 0, (LPARAM)&item); + expect(1, res); + + item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; + item.iItem = 1; + item.pszText = buff; + item.cchTextMax = sizeof(buff)/sizeof(CHAR); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, res); +todo_wine + ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", + LPSTR_TEXTCALLBACK, (VOID*)item.pszText); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq", TRUE); + + DestroyWindow(hwnd); + + /* LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + item.iItem = 0; + res = SendMessageA(hwnd, LVM_INSERTITEM, 0, (LPARAM)&item); + expect(0, res); + + item.mask = LVIF_TEXT | LVIF_NORECOMPUTE; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = sizeof(buff)/sizeof(CHAR); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, res); +todo_wine + ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", + LPSTR_TEXTCALLBACK, (VOID*)item.pszText); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq 2", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -1875,4 +1954,5 @@ START_TEST(listview) test_subitem_rect(); test_sorting(); test_ownerdata(); + test_norecompute(); }

1 0

Nikolay Sivov : comctl32/listview: Handle LVIF_NORECOMPUTE in LVM_GETITEM[A , W].
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: cd8b91f1bb374d07fe4dcd070b2c8da64e23db5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8b91f1bb374d07fe4dcd070… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 28 22:26:38 2009 +0400 comctl32/listview: Handle LVIF_NORECOMPUTE in LVM_GETITEM[A,W]. --- dlls/comctl32/listview.c | 69 ++++++++++++++++++++++++++------------- dlls/comctl32/tests/listview.c | 6 +-- 2 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2c60320..901893f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -72,7 +72,6 @@ * Flags * -- LVIF_COLUMNS * -- LVIF_GROUPID - * -- LVIF_NORECOMPUTE * * States * -- LVIS_ACTIVATING (not currently supported by comctl32.dll version 6.0) @@ -5560,6 +5559,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, /* apparently, we should not callback for lParam in LVS_OWNERDATA */ if ((lpLVItem->mask & ~(LVIF_STATE | LVIF_PARAM)) || infoPtr->uCallbackMask) { + UINT mask = lpLVItem->mask; + /* NOTE: copy only fields which we _know_ are initialized, some apps * depend on the uninitialized fields being 0 */ dispInfo.item.mask = lpLVItem->mask & ~LVIF_PARAM; @@ -5567,34 +5568,49 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, dispInfo.item.iSubItem = isubitem; if (lpLVItem->mask & LVIF_TEXT) { - dispInfo.item.pszText = lpLVItem->pszText; - dispInfo.item.cchTextMax = lpLVItem->cchTextMax; + if (lpLVItem->mask & LVIF_NORECOMPUTE) + /* reset mask */ + dispInfo.item.mask &= ~(LVIF_TEXT | LVIF_NORECOMPUTE); + else + { + dispInfo.item.pszText = lpLVItem->pszText; + dispInfo.item.cchTextMax = lpLVItem->cchTextMax; + } } if (lpLVItem->mask & LVIF_STATE) dispInfo.item.stateMask = lpLVItem->stateMask & infoPtr->uCallbackMask; - notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); - dispInfo.item.stateMask = lpLVItem->stateMask; - if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) + /* could be zeroed on LVIF_NORECOMPUTE case */ + if (dispInfo.item.mask != 0) { - /* full size structure expected - _WIN32IE >= 0x560 */ - *lpLVItem = dispInfo.item; + notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); + dispInfo.item.stateMask = lpLVItem->stateMask; + if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) + { + /* full size structure expected - _WIN32IE >= 0x560 */ + *lpLVItem = dispInfo.item; + } + else if (lpLVItem->mask & LVIF_INDENT) + { + /* indent member expected - _WIN32IE >= 0x300 */ + memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iGroupId )); + } + else + { + /* minimal structure expected */ + memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iIndent )); + } + lpLVItem->mask = mask; + TRACE(" getdispinfo(1):lpLVItem=%s\n", debuglvitem_t(lpLVItem, isW)); } - else if (lpLVItem->mask & LVIF_INDENT) - { - /* indent member expected - _WIN32IE >= 0x300 */ - memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iGroupId )); - } - else - { - /* minimal structure expected */ - memcpy(lpLVItem, &dispInfo.item, offsetof( LVITEMW, iIndent )); - } - TRACE(" getdispinfo(1):lpLVItem=%s\n", debuglvitem_t(lpLVItem, isW)); } /* make sure lParam is zeroed out */ if (lpLVItem->mask & LVIF_PARAM) lpLVItem->lParam = 0; - + + /* callback marked pointer required here */ + if ((lpLVItem->mask & LVIF_TEXT) && (lpLVItem->mask & LVIF_NORECOMPUTE)) + lpLVItem->pszText = LPSTR_TEXTCALLBACKW; + /* we store only a little state, so if we're not asked, we're done */ if (!(lpLVItem->mask & LVIF_STATE) || isubitem) return TRUE; @@ -5651,7 +5667,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ - if ((lpLVItem->mask & LVIF_TEXT) && !is_textW(pItemHdr->pszText)) + if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && + !is_textW(pItemHdr->pszText)) { dispInfo.item.mask |= LVIF_TEXT; dispInfo.item.pszText = lpLVItem->pszText; @@ -5698,7 +5715,8 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } else if (lpLVItem->mask & LVIF_TEXT) { - if (isW) lpLVItem->pszText = pItemHdr->pszText; + /* if LVN_GETDISPINFO's disabled with LVIF_NORECOMPUTE return callback placeholder */ + if (isW || !is_textW(pItemHdr->pszText)) lpLVItem->pszText = pItemHdr->pszText; else textcpynT(lpLVItem->pszText, isW, pItemHdr->pszText, TRUE, lpLVItem->cchTextMax); } @@ -5774,7 +5792,12 @@ static BOOL LISTVIEW_GetItemExtT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte pszText = lpLVItem->pszText; bResult = LISTVIEW_GetItemT(infoPtr, lpLVItem, isW); if (bResult && lpLVItem->pszText != pszText) - textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax); + { + if (lpLVItem->pszText != LPSTR_TEXTCALLBACKW) + textcpynT(pszText, isW, lpLVItem->pszText, isW, lpLVItem->cchTextMax); + else + pszText = LPSTR_TEXTCALLBACKW; + } lpLVItem->pszText = pszText; return bResult; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cde7a25..0ad3175 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1881,10 +1881,9 @@ static void test_norecompute(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); expect(TRUE, res); -todo_wine ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", LPSTR_TEXTCALLBACK, (VOID*)item.pszText); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq", FALSE); DestroyWindow(hwnd); @@ -1906,10 +1905,9 @@ todo_wine flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessageA(hwnd, LVM_GETITEM, 0, (LPARAM)&item); expect(TRUE, res); -todo_wine ok(item.pszText == LPSTR_TEXTCALLBACK, "Expected (%p), got (%p)\n", LPSTR_TEXTCALLBACK, (VOID*)item.pszText); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq 2", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "retrieve with LVIF_NORECOMPUTE seq 2", FALSE); DestroyWindow(hwnd); }

1 0

Vincent Povirk : gdiplus: Implement GdipGetLineBlendCount.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 1e88ee503040bf586b9415a5e5c0e927ee93439e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e88ee503040bf586b9415a5e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:08:54 2009 -0500 gdiplus: Implement GdipGetLineBlendCount. --- dlls/gdiplus/brush.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index eb0df03..20a440c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1163,14 +1163,14 @@ GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count) { - static int calls; - TRACE("(%p, %p)\n", brush, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush || !count) + return InvalidParameter; - return NotImplemented; + *count = brush->blendcount; + + return Ok; } GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line,

1 0

Vincent Povirk : gdiplus: Implement GdipGetLineBlend.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 47a81f5a0c7eaafd6f392f2eea74e9cd42f1f227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a81f5a0c7eaafd6f392f2ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:18:26 2009 -0500 gdiplus: Implement GdipGetLineBlend. --- dlls/gdiplus/brush.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 20a440c..74e7764 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1151,14 +1151,18 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, REAL *positions, INT count) { - static int calls; - TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush || !factors || !positions || count <= 0) + return InvalidParameter; - return NotImplemented; + if (count < brush->blendcount) + return InsufficientBuffer; + + memcpy(factors, brush->blendfac, brush->blendcount * sizeof(REAL)); + memcpy(positions, brush->blendpos, brush->blendcount * sizeof(REAL)); + + return Ok; } GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count)

1 0

Vincent Povirk : gdiplus: Add tests for GdipGet/SetLineBlend.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 47c3993ad31781694e28ad31efeba60308a850d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c3993ad31781694e28ad31e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 17:30:39 2009 -0500 gdiplus: Add tests for GdipGet/SetLineBlend. --- dlls/gdiplus/tests/brush.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 2 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index d2cbd3c..cabbd7f 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -344,6 +344,113 @@ static void test_gradientgetrect(void) status = GdipDeleteBrush((GpBrush*)brush); } +static void test_lineblend(void) +{ + GpLineGradient *brush; + GpStatus status; + GpPointF pt1, pt2; + INT count=10; + int i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + pt1.X = pt1.Y = 1.0; + pt2.X = pt2.Y = 100.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + + status = GdipGetLineBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetLineBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetLineBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetLineBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetLineBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetLineBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetLineBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetLineBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -365,6 +472,7 @@ START_TEST(brush) test_transform(); test_texturewrap(); test_gradientgetrect(); + test_lineblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f8ebc73..4041c2c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -382,6 +382,8 @@ GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);

1 0