January 2017 - Wine-commits

Nikolay Sivov : shell32/tests: Some tests for ExtractAssociatedIcon().
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: bd42aaa801c4bfb5bb2886f42270586d9e9d1438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42aaa801c4bfb5bb2886f42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 21:54:47 2017 +0300 shell32/tests: Some tests for ExtractAssociatedIcon(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 293f69c..b789db4 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1246,6 +1246,57 @@ todo_wine ok(r, "failed to delete file %s (%d)\n", path, GetLastError()); } +static void test_ExtractAssociatedIcon(void) +{ + char pathA[MAX_PATH]; + HICON hicon; + WORD index; + + /* empty path */ + index = 0; + *pathA = 0; + hicon = ExtractAssociatedIconA(NULL, pathA, &index); +todo_wine { + ok(hicon != NULL, "Got icon %p\n", hicon); + ok(!*pathA, "Unexpected path %s\n", pathA); + ok(index == 0, "Unexpected index %u\n", index); +} + DestroyIcon(hicon); + + /* by index */ + index = 0; + strcpy(pathA, "shell32.dll"); + hicon = ExtractAssociatedIconA(NULL, pathA, &index); + ok(hicon != NULL, "Got icon %p\n", hicon); + ok(!strcmp(pathA, "shell32.dll"), "Unexpected path %s\n", pathA); + ok(index == 0, "Unexpected index %u\n", index); + DestroyIcon(hicon); + + /* valid dll name, invalid index */ + index = 5000; + strcpy(pathA, "user32.dll"); + hicon = ExtractAssociatedIconA(NULL, pathA, &index); + CharLowerBuffA(pathA, -1); +todo_wine { + ok(hicon != NULL, "Got icon %p\n", hicon); + ok(!!strstr(pathA, "shell32.dll"), "Unexpected path %s\n", pathA); +} + ok(index != 5000, "Unexpected index %u\n", index); + DestroyIcon(hicon); + + /* associated icon */ + index = 0xcaca; + strcpy(pathA, "dummy.exe"); + hicon = ExtractAssociatedIconA(NULL, pathA, &index); + CharLowerBuffA(pathA, -1); +todo_wine { + ok(hicon != NULL, "Got icon %p\n", hicon); + ok(!!strstr(pathA, "shell32.dll"), "Unexpected path %s\n", pathA); +} + ok(index != 0xcaca, "Unexpected index %u\n", index); + DestroyIcon(hicon); +} + START_TEST(shelllink) { HRESULT r; @@ -1275,6 +1326,7 @@ START_TEST(shelllink) test_SHExtractIcons(); test_propertystore(); test_ExtractIcon(); + test_ExtractAssociatedIcon(); CoUninitialize(); }

1 0

Francois Gouget : kernel32/tests: A couple of spelling fixes in ok() messages.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: ae6c2d235ef2199f8e00dddd07d9d5a277f1afcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6c2d235ef2199f8e00dddd0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:42:38 2017 +0100 kernel32/tests: A couple of spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 28bac91..b9ac06c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1364,8 +1364,8 @@ static void test_CreatePipe(void) ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written); /* and close the write end, read should still succeed*/ ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); - ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe withe with pending data failed\n"); - ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); + ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from broken pipe with pending data failed\n"); + ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); @@ -1380,8 +1380,8 @@ static void test_CreatePipe(void) /* and close the write end, read should still succeed*/ ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); memset( buffer, 0, size ); - ok(ReadFile(piperead, buffer, size, &read, NULL), "Read from broken pipe withe with pending data failed\n"); - ok(read == size, "Read from anonymous pipe got %d bytes\n", read); + ok(ReadFile(piperead, buffer, size, &read, NULL), "Read from broken pipe with pending data failed\n"); + ok(read == size, "Read from anonymous pipe got %d bytes\n", read); for (i = 0; i < size; i++) ok( buffer[i] == (BYTE)i, "invalid data %x at %x\n", buffer[i], i ); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n");

1 0

Francois Gouget : taskschd/tests: Fix a couple of ITriggerCollection ok() messages.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 22c1c9b5518256b9fc8711e8c233878ee2a925c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c1c9b5518256b9fc8711e8c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:32 2017 +0100 taskschd/tests: Fix a couple of ITriggerCollection ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index efd5f60..a71e1c1 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1459,7 +1459,7 @@ if (hr == S_OK) hr = ITaskDefinition_get_Triggers(taskdef, &trigger_col); ok(hr == S_OK, "get_Triggers failed: %08x\n", hr); - ok(trigger_col != NULL, "Trigers = NULL\n"); + ok(trigger_col != NULL, "Triggers = NULL\n"); hr = ITriggerCollection_Create(trigger_col, TASK_TRIGGER_DAILY, &trigger); ok(hr == S_OK, "Create failed: %08x\n", hr); @@ -1470,7 +1470,7 @@ if (hr == S_OK) hr = ITaskDefinition_get_Triggers(taskdef, &trigger_col2); ok(hr == S_OK, "get_Triggers failed: %08x\n", hr); - ok(trigger_col == trigger_col2, "Trigers = NULL\n"); + ok(trigger_col == trigger_col2, "Mismatched triggers\n"); ITriggerCollection_Release(trigger_col2); IRegistrationInfo_Release(reginfo);

1 0

Francois Gouget : cmd/tests: A spelling fix in a comment.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: a29c5bab22a9ded6ea4f5aea8dc3930255671ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29c5bab22a9ded6ea4f5aea8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:44:20 2017 +0100 cmd/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 02d9750..62334b1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -353,7 +353,7 @@ echo --- echo h1|echo h2&echo h3 echo i1|echo i2|echo i3 echo --- chain pipe input -rem The output data of the left side of a pipe can dissapear, probably +rem The output data of the left side of a pipe can disappear, probably rem because it finished too fast and closed the pipe before it could be read, rem which means we can get broken results for the tests of this section. echo @echo off> tmp.cmd

1 0

Francois Gouget : hlink/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: d5485d6ebb31b1dc62dd398c1f85547649f7158d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5485d6ebb31b1dc62dd398c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:44:32 2017 +0100 hlink/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 22cfd10..50f61d5 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -405,7 +405,7 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, (expected_data_alt == expected_hlink_data3_ie7 && i == 109) /* Win10 */ || (expected_data_alt == expected_hlink_data5_ie7 && i == 107) /* Win10 */) { - ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d", data[i]); + ok(data[i] == 0 || broken(data[i] == 1), "Expected 0 or 1, got %d\n", data[i]); continue; } if ((expected_data_alt[i] != data[i]) &&

1 0

Francois Gouget : user32/tests: A spelling fix in a comment.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 0ab75f2e5a6ee26f851770faf7f261226dd04693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab75f2e5a6ee26f851770faf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:44:49 2017 +0100 user32/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index 27a4179..b52fe3a 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -169,7 +169,7 @@ static void test_IsRectEmpty(void) {{-11, -13, -19, -23}, TRUE}, {{11, 13, -17, 19}, TRUE}, {{11, 13, 17, 11}, TRUE}, - /* Non emty rects */ + /* Non empty rects */ {{101, 103, 107, 109}, FALSE}, {{1, -9, 7, 3}, FALSE}, {{-109, -107, -103, -101}, FALSE},

1 0

Michael Stefaniuc : po: Update the Romanian translation.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: acda1bb38a9f33bd020e764902881360dc39e51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acda1bb38a9f33bd020e76490… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 9 10:10:18 2017 +0100 po: Update the Romanian translation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ro.po | 670 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 266 insertions(+), 404 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acda1bb38a9f33bd020e7…

1 0

Zebediah Figura : user.exe16: Fix LPARAM conversions in WM_DDE_EXECUTE.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: abfa87dabfdf0df4de3f8de294e9787ff9f389e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfa87dabfdf0df4de3f8de29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 6 16:52:15 2017 -0600 user.exe16: Fix LPARAM conversions in WM_DDE_EXECUTE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 7bcc8e2..9e07be9 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -900,7 +900,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 } break; /* FIXME don't know how to free allocated memory (handle) !! */ case WM_DDE_EXECUTE: - lParam = convert_handle_16_to_32( lParam, GMEM_DDESHARE ); + lParam = convert_handle_16_to_32( HIWORD(lParam), GMEM_DDESHARE ); ret = callback( hwnd32, msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ case WM_PAINTCLIPBOARD: @@ -1280,7 +1280,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT } break; /* FIXME don't know how to free allocated memory (handle) !! */ case WM_DDE_EXECUTE: - lParam = convert_handle_32_to_16(lParam, GMEM_DDESHARE); + lParam = MAKELPARAM( 0, convert_handle_32_to_16( lParam, GMEM_DDESHARE )); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); break; /* FIXME don't know how to free allocated memory (handle) !! */ case SBM_SETRANGE:

1 0

Hugh McMaster : regedit: Only allow key renaming via the Edit or Popup menus.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 1e1bfba1c459182b3a64c6d70b2a375e9e262390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1bfba1c459182b3a64c6d70… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jan 3 12:33:48 2017 +0000 regedit: Only allow key renaming via the Edit or Popup menus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 8 +++++++- programs/regedit/treeview.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 55b11de..08eeec1 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -419,7 +419,12 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } case TVN_BEGINLABELEDITW: { HKEY hRootKey; - LPWSTR path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); + LPWSTR path; + + if (!GetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA)) + return 1; + + path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); if (!path || !*path) return 1; return 0; } @@ -440,6 +445,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa HeapFree(GetProcessHeap(), 0, fullPath); } HeapFree(GetProcessHeap(), 0, path); + SetWindowLongPtrW(g_pChildWnd->hTreeWnd, GWLP_USERDATA, 0); return res; } default: diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 7afc7bf..07e9b41 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -529,6 +529,7 @@ HWND StartKeyRename(HWND hwndTV) HTREEITEM hItem; if(!(hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0))) return 0; + SetWindowLongPtrW(hwndTV, GWLP_USERDATA, 1); return (HWND)SendMessageW(hwndTV, TVM_EDITLABELW, 0, (LPARAM)hItem); }

1 0

Francois Gouget : wined3d: Make some functions static.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 551705d65f583f68f84aa595d8cd45ab06c44d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551705d65f583f68f84aa595d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:39:55 2017 +0100 wined3d: Make some functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d326a70..6883b40 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -94,7 +94,7 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } -void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) +static void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) { TRACE("buffer %p, location %s.\n", buffer, wined3d_debug_location(location)); @@ -567,7 +567,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, } } -BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, +static BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a24a492..da003e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1390,7 +1390,7 @@ void CDECL wined3d_texture_generate_mipmaps(struct wined3d_texture *texture) FIXME("texture %p stub!\n", texture); } -struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, +static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, unsigned int sub_resource_idx) { UINT sub_count = texture->level_count * texture->layer_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09fbb70..e1787a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2852,8 +2852,6 @@ BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; -struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture, - unsigned int sub_resource_idx) DECLSPEC_HIDDEN; void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, @@ -3253,14 +3251,11 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; -BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, - DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; -void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0