wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Liam Middlebrook : d3dx11: Add D3DX11SaveTextureToFileA/W() stub.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 8743e7a3038763d6044f754c486dfe3b7fa64a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8743e7a3038763d6044f754c… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Wed Nov 6 10:06:31 2019 +0100 d3dx11: Add D3DX11SaveTextureToFileA/W() stub. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit adef99a21c5205f02464be3139031d09fa2ce69a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 18 ++++++++++++++++++ include/d3dx11tex.h | 10 ++++------ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index cb1f7805ff..c584810db4 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -39,6 +39,6 @@ @ stub D3DX11PreprocessShaderFromResourceA @ stub D3DX11PreprocessShaderFromResourceW @ stub D3DX11SHProjectCubeMap -@ stub D3DX11SaveTextureToFileA -@ stub D3DX11SaveTextureToFileW +@ stdcall D3DX11SaveTextureToFileA(ptr ptr long str) +@ stdcall D3DX11SaveTextureToFileW(ptr ptr long wstr) @ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index dde8821a30..30bdba4244 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -39,6 +39,6 @@ @ stub D3DX11PreprocessShaderFromResourceA @ stub D3DX11PreprocessShaderFromResourceW @ stub D3DX11SHProjectCubeMap -@ stub D3DX11SaveTextureToFileA -@ stub D3DX11SaveTextureToFileW +@ stdcall D3DX11SaveTextureToFileA(ptr ptr long str) +@ stdcall D3DX11SaveTextureToFileW(ptr ptr long wstr) @ stdcall D3DX11SaveTextureToMemory(ptr ptr long ptr long) diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 6aaf8a7e02..b4d9bd106f 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -65,6 +65,24 @@ HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *d return E_NOTIMPL; } +HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const WCHAR *filename) +{ + FIXME("context %p, texture %p, format %u, filename %s stub!\n", + context, texture, format, debugstr_w(filename)); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const char *filename) +{ + FIXME("context %p, texture %p, format %u, filename %s stub!\n", + context, texture, format, debugstr_a(filename)); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags) { diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 4f792ec13e..b7c00ac4fd 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -110,23 +110,21 @@ extern "C" { HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult); - HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter); - HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, D3DX11_IMAGE_INFO *img_info, HRESULT *hresult); - +HRESULT WINAPI D3DX11SaveTextureToFileA(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const char *filename); +HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, + D3DX11_IMAGE_FILE_FORMAT format, const WCHAR *filename); HRESULT WINAPI D3DX11SaveTextureToMemory(ID3D11DeviceContext *context, ID3D11Resource *texture, D3DX11_IMAGE_FILE_FORMAT format, ID3D10Blob **buffer, UINT flags);

1 0

Louis Lenders : wine.inf: Add value for DigitalProductId.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 42594c785d365fef292521a50211ff36eef33129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42594c785d365fef292521a5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 5 18:48:37 2019 +0100 wine.inf: Add value for DigitalProductId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24529 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51c297afa5ee9220280a1f853fcba77d20890afb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index bf2785b703..983168f63b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3602,6 +3602,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 @@ -3613,6 +3620,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100

1 0

Damjan Jovanovic : comctl32: Implement treeview edit control text trimming and overwriting.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 2cf27cba96a94daa3686d371bcd4a1802e13fbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cf27cba96a94daa3686d371… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:15 2019 +0200 comctl32: Implement treeview edit control text trimming and overwriting. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80bd7fdd5629a89dec7ee5e14a05c2ff512301c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 8 ++++---- dlls/comctl32/treeview.c | 21 +++++++++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 192ca8c636..b27dda8664 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1327,7 +1327,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) { - todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); if (g_endedit_overwrite_contents) strcpy(disp->item.pszText, g_endedit_overwrite_contents); if (g_endedit_overwrite_ptr) @@ -1705,7 +1705,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, strlen(item.pszText)); /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1723,7 +1723,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + expect(MAX_PATH - 1, strlen(item.pszText)); /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1757,7 +1757,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(0, strcmp(item.pszText, "<new_ptr>")); + expect(0, strcmp(item.pszText, "<new_ptr>")); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9f16888241..85a963ddc1 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3997,8 +3997,8 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; - WCHAR tmpText[1024] = { '\0' }; - WCHAR *newText = tmpText; + WCHAR tmpText[MAX_PATH] = { '\0' }; + WCHAR *newText; int iLength = 0; if (!IsWindow(infoPtr->hwndEdit)) return FALSE; @@ -4011,18 +4011,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!bCancel) { if (!infoPtr->bNtfUnicode) - iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, 1023); + iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, ARRAY_SIZE(tmpText)); else - iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, 1023); - - if (iLength >= 1023) - { - ERR("Insufficient space to retrieve new item label\n"); - } + iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, ARRAY_SIZE(tmpText)); tvdi.item.mask = TVIF_TEXT; tvdi.item.pszText = tmpText; - tvdi.item.cchTextMax = iLength + 1; + tvdi.item.cchTextMax = ARRAY_SIZE(tmpText); } else { @@ -4036,11 +4031,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { if (!infoPtr->bNtfUnicode) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, NULL, 0 ); newText = heap_alloc(len * sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len ); + MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, newText, len ); iLength = len - 1; } + else + newText = tvdi.item.pszText; if (strcmpW(newText, editedItem->pszText) != 0) {

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText pointer in TVN_ENDLABELEDIT.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 0a1ba97b04666f66e3806274b237e7438c1e0b45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a1ba97b04666f66e3806274… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:13 2019 +0200 comctl32: Test overwriting of pszText pointer in TVN_ENDLABELEDIT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59bb622088b967aef7d1cdebe0ac6a2fbd5a84f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index bfde77df79..192ca8c636 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -43,6 +43,7 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; static const char *g_endedit_overwrite_contents; +static char *g_endedit_overwrite_ptr; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1329,6 +1330,8 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); if (g_endedit_overwrite_contents) strcpy(disp->item.pszText, g_endedit_overwrite_contents); + if (g_endedit_overwrite_ptr) + disp->item.pszText = g_endedit_overwrite_ptr; } return TRUE; } @@ -1739,6 +1742,23 @@ static void test_itemedit(void) expect(TRUE, r); expect(0, strcmp(item.pszText, "<new_contents>")); + /* Overwriting of pszText pointer in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_ptr = (char*) "<new_ptr>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_ptr = NULL; + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(0, strcmp(item.pszText, "<new_ptr>")); + DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: c3399383e4183f685c9237e7e6ac06db312475db URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3399383e4183f685c9237e7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:11 2019 +0200 comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1fa32f9a5396934c6788ac02402cccc020237bf4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 6b97853377..bfde77df79 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; +static const char *g_endedit_overwrite_contents; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1324,7 +1325,11 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) + { todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + if (g_endedit_overwrite_contents) + strcpy(disp->item.pszText, g_endedit_overwrite_contents); + } return TRUE; } case TVN_ITEMEXPANDINGA: @@ -1717,6 +1722,23 @@ static void test_itemedit(void) expect(TRUE, r); todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_contents = "<new_contents>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_contents = NULL; + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + expect(0, strcmp(item.pszText, "<new_contents>")); + DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 016bcb6f57fcf3e662d858b1919ff3de694eea88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=016bcb6f57fcf3e662d858b1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:09 2019 +0200 comctl32: Test text buffer passed to TVN_ENDLABELEDIT is always MAX_PATH chars long. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 565b0f5d5079eeb17dbf3aaa22088d022428cb07) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3e9666f535..6b97853377 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1320,7 +1320,13 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } - case TVN_ENDLABELEDITA: return TRUE; + case TVN_ENDLABELEDITA: + { + NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; + if (disp->item.mask & TVIF_TEXT) + todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + return TRUE; + } case TVN_ITEMEXPANDINGA: { UINT newmask = pTreeView->itemNew.mask & ~TVIF_CHILDREN;

1 0

Damjan Jovanovic : comctl32: Test treeview text trimming after label editing is complete.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 7abfa62850fc89ecea709c81d3503c02fb6f47e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7abfa62850fc89ecea709c81… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:07 2019 +0200 comctl32: Test treeview text trimming after label editing is complete. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8fd0ecc6cd0bf99803d8e8ac1a520d93b53b52f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 9e74016a08..3e9666f535 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1576,7 +1576,7 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buffA[20]; + CHAR buffA[500]; HWND hTree; hTree = create_treeview_control(0); @@ -1675,8 +1675,41 @@ static void test_itemedit(void) ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); expect(MAX_PATH - 1, r); + /* WM_SETTEXT can set more... */ + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); + expect(ARRAY_SIZE(buffA) - 1, r); + /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + + /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + SendMessageA(edit, EM_SETLIMITTEXT, ARRAY_SIZE(buffA)-1, 0); + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Implement treeview edit control EM_SETLIMITTEXT.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: a9b3fe4f872e95a0b80844a9725e0eb28745776c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b3fe4f872e95a0b80844a9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:04 2019 +0200 comctl32: Implement treeview edit control EM_SETLIMITTEXT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5e2e794ad6ee346f0f8cfc1f85556105d680f5a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 3d4d51a5b2..9e74016a08 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1674,7 +1674,7 @@ static void test_itemedit(void) edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); - todo_wine expect(MAX_PATH - 1, r); + expect(MAX_PATH - 1, r); r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bbef651597..9f16888241 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3971,6 +3971,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); + SendMessageW(hwndEdit, EM_SETLIMITTEXT, MAX_PATH - 1, 0); if (hItem->pszText) SetWindowTextW(hwndEdit, hItem->pszText);

1 0

Damjan Jovanovic : comctl32: Test the treeview edit control EM_LIMITTEXT.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 13f43c319d36915c3d53146202197349726deb8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=13f43c319d36915c3d531462… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:02 2019 +0200 comctl32: Test the treeview edit control EM_LIMITTEXT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6fb210d7b4fed68aed31fda16a9b395c58794720) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8ba7f543de..3d4d51a5b2 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1667,6 +1667,17 @@ static void test_itemedit(void) GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); ok(!strcmp(buffA, "<edittextaltered>"), "got string %s\n", buffA); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + + /* How much text can be typed? */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); + todo_wine expect(MAX_PATH - 1, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + DestroyWindow(hTree); }

1 0

Alex Henrie : ntoskrnl: Implement IoCreateUnprotectedSymbolicLink.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 01269a0b0089608ca11212e10ece84f1e1db5507 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01269a0b0089608ca11212e1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 24 21:20:54 2019 -0600 ntoskrnl: Implement IoCreateUnprotectedSymbolicLink. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47986 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 380d31b17ae96d231d6d0e802d17bb6dc3d1a11d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5958907a1e..a84805b703 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1312,6 +1312,27 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ } +/*********************************************************************** + * IoCreateUnprotectedSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateUnprotectedSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *target ) +{ + HANDLE handle; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); + /* FIXME: store handle somewhere */ + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); +} + + /*********************************************************************** * IoDeleteSymbolicLink (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c62a79eb0a..64090ac0c4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -350,7 +350,7 @@ @ stub IoCreateStreamFileObjectLite @ stdcall IoCreateSymbolicLink(ptr ptr) @ stdcall IoCreateSynchronizationEvent(ptr ptr) -@ stub IoCreateUnprotectedSymbolicLink +@ stdcall IoCreateUnprotectedSymbolicLink(ptr ptr) @ stdcall IoCsqInitialize(ptr ptr ptr ptr ptr ptr ptr) @ stub IoCsqInsertIrp @ stub IoCsqRemoveIrp

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020