June 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: e8cb3bdba5dfefb9a1bf0e858dd755ca6637149a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8cb3bdba5dfefb9a1bf0e858… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 2 16:39:46 2015 +0200 wined3d: Always enable GL_PROGRAM_POINT_SIZE in the GLSL backend. Core contexts don't support clamping the point size to GL_POINT_SIZE_MIN / GL_POINT_SIZE_MAX. Incidentally this mostly fixes per-vertex point sizes for vertex shader version 1 and 2. --- dlls/wined3d/arb_program_shader.c | 3 ++ dlls/wined3d/context.c | 1 + dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++-------------------- dlls/wined3d/shader.c | 8 +++++ dlls/wined3d/state.c | 8 ++--- dlls/wined3d/wined3d_private.h | 24 +++++++------- 6 files changed, 59 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8cb3bdba5dfefb9a1bf0…

1 0

Matteo Bruni : wined3d: Clamp per-vertex point size in vertex shaders.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: c186939f32b749508c191b8f27c36c999c296ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c186939f32b749508c191b8f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 2 16:39:47 2015 +0200 wined3d: Clamp per-vertex point size in vertex shaders. --- dlls/wined3d/glsl_shader.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4bef5b..87ff576 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4925,7 +4925,7 @@ static void handle_ps3_input(struct shader_glsl_priv *priv, /* Context activation is done by the caller. */ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, const struct wined3d_shader *ps, - const struct wined3d_gl_info *gl_info) + BOOL per_vertex_point_size, const struct wined3d_gl_info *gl_info) { struct wined3d_string_buffer *buffer = &priv->shader_buffer; GLuint ret = 0; @@ -4939,6 +4939,14 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); + if (per_vertex_point_size) + { + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " float size_min;\n"); + shader_addline(buffer, " float size_max;\n"); + shader_addline(buffer, "} ffp_point;\n"); + } + if (ps_major < 3) { shader_addline(buffer, "void order_ps_input(in vec4 vs_out[%u])\n{\n", vs->limits->packed_output); @@ -4983,9 +4991,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); } } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE)) + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) { - shader_addline(buffer, "gl_PointSize = vs_out[%u].%c;\n", output->register_idx, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(vs_out[%u].%c, ffp_point.size_min, ffp_point.size_max);\n", + output->register_idx, reg_mask[1]); } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) { @@ -5019,9 +5028,10 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, shader_addline(buffer, "gl_Position%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); } - else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE)) + else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_PSIZE) && per_vertex_point_size) { - shader_addline(buffer, "gl_PointSize = vs_out[%u].%c;\n", output->register_idx, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(vs_out[%u].%c, ffp_point.size_min, ffp_point.size_max);\n", + output->register_idx, reg_mask[1]); } } @@ -6711,7 +6721,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD map = vshader->reg_maps.input_registers; struct wined3d_string_buffer *tmp_name = string_buffer_get(&priv->string_buffers); - reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, gl_info); + reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, + state->gl_primitive_type == GL_POINTS && vshader->reg_maps.point_size, gl_info); TRACE("Attaching GLSL shader object %u to program %u.\n", reorder_shader_id, program_id); GL_EXTCALL(glAttachShader(program_id, reorder_shader_id)); checkGLcall("glAttachShader");

1 0

Nikolay Sivov : winex11: Remove unreachable XFreePixmap(), mask_pixmap is always NULL on failure (Coverity).
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: c0af3fad4ef02ac82e472f05048e866506aae589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0af3fad4ef02ac82e472f050… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 13:52:11 2015 +0300 winex11: Remove unreachable XFreePixmap(), mask_pixmap is always NULL on failure (Coverity). --- dlls/winex11.drv/window.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ea37dd7..14dc44c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -573,7 +573,6 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret failed: if (color_pixmap) XFreePixmap( gdi_display, color_pixmap ); - if (mask_pixmap) XFreePixmap( gdi_display, mask_pixmap ); HeapFree( GetProcessHeap(), 0, bits.ptr ); return FALSE; }

1 0

Piotr Caban : msvcrt: Use fd critical section in dup2.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: c7b0fb51543a166508dbbc28945b163bba4713d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b0fb51543a166508dbbc289… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:10 2015 +0200 msvcrt: Use fd critical section in dup2. --- dlls/msvcrt/file.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1ba5fd..1077752 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -260,8 +260,15 @@ static inline ioinfo* get_ioinfo_nolock(int fd) static inline ioinfo* get_ioinfo(int fd) { ioinfo *ret = get_ioinfo_nolock(fd); - if(ret->exflag & EF_CRIT_INIT) - EnterCriticalSection(&ret->crit); + if(!(ret->exflag & EF_CRIT_INIT)) { + LOCK_FILES(); + if(!(ret->exflag & EF_CRIT_INIT)) { + InitializeCriticalSection(&ret->crit); + ret->exflag |= EF_CRIT_INIT; + } + UNLOCK_FILES(); + } + EnterCriticalSection(&ret->crit); return ret; } @@ -1016,20 +1023,33 @@ int CDECL MSVCRT__close(int fd) */ int CDECL MSVCRT__dup2(int od, int nd) { + ioinfo *info_od, *info_nd; int ret; TRACE("(od=%d, nd=%d)\n", od, nd); LOCK_FILES(); - if (nd < MSVCRT_MAX_FILES && nd >= 0 && msvcrt_is_valid_fd(od)) + + if (od < nd) + { + info_od = get_ioinfo(od); + info_nd = get_ioinfo(nd); + } + else + { + info_nd = get_ioinfo(nd); + info_od = get_ioinfo(od); + } + + if (nd < MSVCRT_MAX_FILES && nd >= 0 && (info_od->wxflag & WX_OPEN)) { HANDLE handle; - if (DuplicateHandle(GetCurrentProcess(), get_ioinfo_nolock(od)->handle, + if (DuplicateHandle(GetCurrentProcess(), info_od->handle, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - int wxflag = get_ioinfo_nolock(od)->wxflag & ~MSVCRT__O_NOINHERIT; + int wxflag = info_od->wxflag & ~MSVCRT__O_NOINHERIT; - if (msvcrt_is_valid_fd(nd)) + if (info_nd->wxflag & WX_OPEN) MSVCRT__close(nd); ret = msvcrt_set_fd(handle, wxflag, nd); if (ret == -1) @@ -1054,6 +1074,9 @@ int CDECL MSVCRT__dup2(int od, int nd) *MSVCRT__errno() = MSVCRT_EBADF; ret = -1; } + + release_ioinfo(info_od); + release_ioinfo(info_nd); UNLOCK_FILES(); return ret; }

1 0

Piotr Caban : msvcrt: Use fd critical section in msvcrt_free_fd.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: b052afd4afab68eb9319e2b19fb18152f395b409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b052afd4afab68eb9319e2b19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:23 2015 +0200 msvcrt: Use fd critical section in msvcrt_free_fd. --- dlls/msvcrt/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1077752..616e205 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -332,10 +332,8 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - ioinfo *fdinfo; + ioinfo *fdinfo = get_ioinfo(fd); - LOCK_FILES(); - fdinfo = get_ioinfo_nolock(fd); if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; @@ -358,7 +356,9 @@ static void msvcrt_free_fd(int fd) break; } } + release_ioinfo(fdinfo); + LOCK_FILES(); if (fd == MSVCRT_fdend - 1) MSVCRT_fdend--; if (fd < MSVCRT_fdstart)

1 0

Piotr Caban : msvcrt: Use fd critical section in read.
by Alexandre Julliard 03 Jun '15

03 Jun '15

Module: wine Branch: master Commit: 16285f5700ff713d376b930e3bd6963d821931f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16285f5700ff713d376b930e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 3 13:25:35 2015 +0200 msvcrt: Use fd critical section in read. --- dlls/msvcrt/file.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 616e205..25c5626 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2468,9 +2468,8 @@ static inline int get_utf8_char_len(char ch) /********************************************************************* * (internal) read_utf8 */ -static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) +static int read_utf8(ioinfo *fdinfo, MSVCRT_wchar_t *buf, unsigned int count) { - ioinfo *fdinfo = get_ioinfo_nolock(fd); HANDLE hand = fdinfo->handle; char min_buf[4], *readbuf, lookahead; DWORD readbuf_size, pos=0, num_read=1, char_len, i, j; @@ -2645,12 +2644,10 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) * the file pointer on the \r character while getc() goes on to * the following \n */ -static int read_i(int fd, void *buf, unsigned int count) +static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count) { DWORD num_read, utf16; char *bufstart = buf; - HANDLE hand = msvcrt_fdtoh(fd); - ioinfo *fdinfo = get_ioinfo_nolock(fd); if (count == 0) return 0; @@ -2661,8 +2658,8 @@ static int read_i(int fd, void *buf, unsigned int count) } /* Don't trace small reads, it gets *very* annoying */ if (count > 4) - TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); - if (hand == INVALID_HANDLE_VALUE) + TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n", fd, fdinfo->handle, buf, count); + if (fdinfo->handle == INVALID_HANDLE_VALUE) { *MSVCRT__errno() = MSVCRT_EBADF; return -1; @@ -2676,9 +2673,9 @@ static int read_i(int fd, void *buf, unsigned int count) } if((fdinfo->wxflag&WX_TEXT) && (fdinfo->exflag&EF_UTF8)) - return read_utf8(fd, buf, count); + return read_utf8(fdinfo, buf, count); - if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL)) + if (fdinfo->lookahead[0]!='\n' || ReadFile(fdinfo->handle, bufstart, count, &num_read, NULL)) { if (fdinfo->lookahead[0] != '\n') { @@ -2691,7 +2688,7 @@ static int read_i(int fd, void *buf, unsigned int count) fdinfo->lookahead[1] = '\n'; } - if(count>1+utf16 && ReadFile(hand, bufstart+1+utf16, count-1-utf16, &num_read, NULL)) + if(count>1+utf16 && ReadFile(fdinfo->handle, bufstart+1+utf16, count-1-utf16, &num_read, NULL)) num_read += 1+utf16; else num_read = 1+utf16; @@ -2736,7 +2733,7 @@ static int read_i(int fd, void *buf, unsigned int count) DWORD len; lookahead[1] = '\n'; - if (ReadFile(hand, lookahead, 1+utf16, &len, NULL) && len) + if (ReadFile(fdinfo->handle, lookahead, 1+utf16, &len, NULL) && len) { if(lookahead[0]=='\n' && (!utf16 || lookahead[1]==0) && j==0) { @@ -2809,9 +2806,10 @@ static int read_i(int fd, void *buf, unsigned int count) */ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) { - int num_read; - num_read = read_i(fd, buf, count); - return num_read; + ioinfo *info = get_ioinfo(fd); + int num_read = read_i(fd, info, buf, count); + release_ioinfo(info); + return num_read; } /********************************************************************* @@ -3558,14 +3556,14 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; - if ((r = read_i(file->_file,&c,1)) != 1) { + if ((r = MSVCRT__read(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; return MSVCRT_EOF; } return c; } else { - file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); + file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); if(file->_cnt<=0) { file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_cnt = 0;

1 0

Akihiro Sagawa : shell32/tests: Make tests run on win2k again.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 4c31892ea50eede74b91078e67af3f2119f8b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c31892ea50eede74b91078e6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:04 2015 +0900 shell32/tests: Make tests run on win2k again. --- dlls/shell32/tests/shlfolder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 1b457bb..822acf6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -75,6 +75,7 @@ static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static HRESULT (WINAPI *pSHCreateShellFolderView)(const SFV_CREATE *pcsfv, IShellView **ppsv); static HRESULT (WINAPI *pSHCreateShellFolderViewEx)(LPCSFV psvcbi, IShellView **ppv); +static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static WCHAR *make_wstr(const char *str) { @@ -140,6 +141,7 @@ static void init_function_pointers(void) MAKEFUNC_ORD(ILFindLastID, 16); MAKEFUNC_ORD(ILIsEqual, 21); MAKEFUNC_ORD(ILCombine, 25); + MAKEFUNC_ORD(SHILCreateFromPath, 28); MAKEFUNC_ORD(ILFree, 155); MAKEFUNC_ORD(SHSimpleIDListFromPathAW, 162); #undef MAKEFUNC_ORD @@ -4974,9 +4976,9 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].pidl = NULL; if(has_unicode) - hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); else - hr = SHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + hr = pSHILCreateFromPath((LPCVOID)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); entries[0].fRecursive = TRUE;

1 0

Akihiro Sagawa : shell32/tests: Add tests for DragQueryFile.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 37d7d6f81c45f14e56b5a4ae81fcd3cf5c4ab1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7d6f81c45f14e56b5a4ae8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:06 2015 +0900 shell32/tests: Add tests for DragQueryFile. --- dlls/shell32/tests/shellole.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 3f0b490..308134a 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "shlobj.h" +#include "shellapi.h" #include "initguid.h" DEFINE_GUID(FMTID_Test,0x12345678,0x1234,0x1234,0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12); @@ -742,10 +743,126 @@ static void test_SHCreateQueryCancelAutoPlayMoniker(void) IMoniker_Release(mon); } +#define DROPTEST_FILENAME "c:\\wintest.bin" +struct DragParam { + HWND hwnd; + HANDLE ready; +}; + +static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) { + case WM_DROPFILES: + { + HDROP hDrop = (HDROP)wparam; + char filename[MAX_PATH] = "dummy"; + UINT num; + num = DragQueryFileA(hDrop, 0xffffffff, NULL, 0); + ok(num == 1, "expected 1, got %u\n", num); + num = DragQueryFileA(hDrop, 0xffffffff, (char*)0xdeadbeef, 0xffffffff); + todo_wine ok(num == 1, "expected 1, got %u\n", num); + num = DragQueryFileA(hDrop, 0, filename, sizeof(filename)); + ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); + ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename); + DragFinish(hDrop); + return 0; + } + } + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +static DWORD WINAPI drop_window_therad(void *arg) +{ + struct DragParam *param = arg; + WNDCLASSA cls; + WINDOWINFO info; + BOOL r; + MSG msg; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = drop_window_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "drop test"; + RegisterClassA(&cls); + + param->hwnd = CreateWindowA("drop test", NULL, 0, 0, 0, 0, 0, + NULL, 0, NULL, 0); + ok(param->hwnd != NULL, "CreateWindow failed: %d\n", GetLastError()); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + r = GetWindowInfo(param->hwnd, &info); + ok(r, "got %d\n", r); + ok(!(info.dwExStyle & WS_EX_ACCEPTFILES), "got %08x\n", info.dwExStyle); + + DragAcceptFiles(param->hwnd, TRUE); + + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + r = GetWindowInfo(param->hwnd, &info); + ok(r, "got %d\n", r); + ok((info.dwExStyle & WS_EX_ACCEPTFILES), "got %08x\n", info.dwExStyle); + + SetEvent(param->ready); + + while ((r = GetMessageA(&msg, NULL, 0, 0)) != 0) { + if (r == (BOOL)-1) { + ok(0, "unexpected return value, got %d\n", r); + break; + } + DispatchMessageA(&msg); + } + + DestroyWindow(param->hwnd); + UnregisterClassA("drop test", GetModuleHandleA(NULL)); + return 0; +} + +static void test_DragQueryFile(void) +{ + struct DragParam param; + HANDLE hThread; + DWORD rc; + HGLOBAL hDrop; + DROPFILES *pDrop; + int ret; + BOOL r; + + param.ready = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(param.ready != NULL, "can't create event\n"); + hThread = CreateThread(NULL, 0, drop_window_therad, &param, 0, NULL); + + rc = WaitForSingleObject(param.ready, 5000); + ok(rc == WAIT_OBJECT_0, "got %u\n", rc); + + hDrop = GlobalAlloc(GHND, sizeof(DROPFILES) + (strlen(DROPTEST_FILENAME) + 2) * sizeof(WCHAR)); + pDrop = GlobalLock(hDrop); + pDrop->pFiles = sizeof(DROPFILES); + ret = MultiByteToWideChar(CP_ACP, 0, DROPTEST_FILENAME, -1, + (LPWSTR)(pDrop + 1), strlen(DROPTEST_FILENAME) + 1); + ok(ret > 0, "got %d\n", ret); + pDrop->fWide = TRUE; + GlobalUnlock(hDrop); + + r = PostMessageA(param.hwnd, WM_DROPFILES, (WPARAM)hDrop, 0); + ok(r, "got %d\n", r); + + r = PostMessageA(param.hwnd, WM_QUIT, 0, 0); + ok(r, "got %d\n", r); + + rc = WaitForSingleObject(hThread, 5000); + ok(rc == WAIT_OBJECT_0, "got %d\n", rc); + + CloseHandle(param.ready); + CloseHandle(hThread); +} +#undef DROPTEST_FILENAME + START_TEST(shellole) { init(); test_SHPropStg_functions(); test_SHCreateQueryCancelAutoPlayMoniker(); + test_DragQueryFile(); }

1 0

Akihiro Sagawa : shell32: Skip buffer allocation when querying drop file numbers.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: d2e9856a567bd1b83644993bf3b75c0a64cb2916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e9856a567bd1b83644993bf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:08 2015 +0900 shell32: Skip buffer allocation when querying drop file numbers. --- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/tests/shellole.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 74c5965..637a101 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -578,7 +578,7 @@ UINT WINAPI DragQueryFileA( if(lpDropFileStruct->fWide) { LPWSTR lpszFileW = NULL; - if(lpszFile) { + if(lpszFile && lFile != 0xFFFFFFFF) { lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; @@ -633,7 +633,7 @@ UINT WINAPI DragQueryFileW( if(lpDropFileStruct->fWide == FALSE) { LPSTR lpszFileA = NULL; - if(lpszwFile) { + if(lpszwFile && lFile != 0xFFFFFFFF) { lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); if(lpszFileA == NULL) { goto end; diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index 308134a..71ba477 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -760,7 +760,7 @@ static LRESULT WINAPI drop_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA num = DragQueryFileA(hDrop, 0xffffffff, NULL, 0); ok(num == 1, "expected 1, got %u\n", num); num = DragQueryFileA(hDrop, 0xffffffff, (char*)0xdeadbeef, 0xffffffff); - todo_wine ok(num == 1, "expected 1, got %u\n", num); + ok(num == 1, "expected 1, got %u\n", num); num = DragQueryFileA(hDrop, 0, filename, sizeof(filename)); ok(num == strlen(DROPTEST_FILENAME), "got %u\n", num); ok(!strcmp(filename, DROPTEST_FILENAME), "got %s\n", filename);

1 0

Akihiro Sagawa : mciqtz32: Watch the player thread while waiting a player task.
by Alexandre Julliard 02 Jun '15

02 Jun '15

Module: wine Branch: master Commit: 998af35a3e587c8ce4a5f3fb130f9d942df72bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=998af35a3e587c8ce4a5f3fb1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 2 01:22:09 2015 +0900 mciqtz32: Watch the player thread while waiting a player task. --- dlls/mciqtz32/mciqtz.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 413c2f6..d018a54 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -75,6 +75,8 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, { WINE_MCIQTZ *wma; LRESULT res; + HANDLE handles[2]; + DWORD ret; TRACE("(%08lX, %08x, %08x, %08lx)\n", dwDevID, wMsg, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(dwDevID); @@ -86,7 +88,11 @@ static LRESULT MCIQTZ_relayTaskMessage(DWORD_PTR dwDevID, UINT wMsg, wma->task.flags = dwFlags; wma->task.parms = lpParms; SetEvent(wma->task.notify); - if (WaitForSingleObject(wma->task.done, INFINITE) == WAIT_OBJECT_0) + handles[0] = wma->task.done; + handles[1] = wma->task.thread; + ret = WaitForMultipleObjects(sizeof(handles)/sizeof(handles[0]), handles, + FALSE, INFINITE); + if (ret == WAIT_OBJECT_0) res = wma->task.res; else res = MCIERR_INTERNAL;

1 0