August 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the context information in context_set_pixel_format().
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: f7e37715fa6854c3461d812d44b29c96d928d2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e37715fa6854c3461d812d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:35 2017 +0200 wined3d: Use the context information in context_set_pixel_format(). Instead of passing it around. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8ec251..e084d1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1094,15 +1094,18 @@ static BOOL context_restore_pixel_format(struct wined3d_context *ctx) return ret; } -static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BOOL private, int format) +static BOOL context_set_pixel_format(struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL private = context->hdc_is_private; + int format = context->pixel_format; + HDC dc = context->hdc; int current; - if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) + if (private && context->hdc_has_format) return TRUE; - if (dc == context->hdc && !context->hdc_is_private && WindowFromDC(dc) != context->win_handle) + if (!private && WindowFromDC(dc) != context->win_handle) return FALSE; current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); @@ -1159,7 +1162,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO return TRUE; success: - if (dc == context->hdc && context->hdc_is_private) + if (private) context->hdc_has_format = TRUE; return TRUE; } @@ -1169,7 +1172,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, ctx->hdc_is_private, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1203,7 +1206,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) ctx->hdc_is_private = TRUE; ctx->hdc_has_format = FALSE; - if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) + if (!context_set_pixel_format(ctx)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -1820,14 +1823,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *color_format; struct wined3d_context *ret; - BOOL hdc_is_private = FALSE; BOOL auxBuffers = FALSE; HGLRC ctx, share_ctx; DWORD target_usage; - int pixel_format; unsigned int i; DWORD state; - HDC hdc = 0; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1921,12 +1921,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, sizeof(*ret->texture_type)))) goto out; - if (!(hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(ret->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((hdc = swapchain_get_backup_dc(swapchain))) - hdc_is_private = TRUE; + if ((ret->hdc = swapchain_get_backup_dc(swapchain))) + ret->hdc_is_private = TRUE; else { ERR("Failed to retrieve a device context.\n"); @@ -1973,16 +1973,17 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers))) + if (!(ret->pixel_format = context_choose_pixel_format(device, ret->hdc, color_format, ds_format, auxBuffers))) goto out; ret->gl_info = gl_info; + ret->win_handle = swapchain->win_handle; context_enter(ret); - if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) + if (!context_set_pixel_format(ret)) { - ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + ERR("Failed to set pixel format %d on device context %p.\n", ret->pixel_format, ret->hdc); context_release(ret); goto out; } @@ -1990,12 +1991,12 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, share_ctx = device->context_count ? device->contexts[0]->glCtx : NULL; if (gl_info->p_wglCreateContextAttribsARB) { - if (!(ctx = context_create_wgl_attribs(gl_info, hdc, share_ctx))) + if (!(ctx = context_create_wgl_attribs(gl_info, ret->hdc, share_ctx))) goto out; } else { - if (!(ctx = wglCreateContext(hdc))) + if (!(ctx = wglCreateContext(ret->hdc))) { ERR("Failed to create a WGL context.\n"); context_release(ret); @@ -2043,11 +2044,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->valid = 1; ret->glCtx = ctx; - ret->win_handle = swapchain->win_handle; - ret->hdc = hdc; - ret->hdc_is_private = hdc_is_private; ret->hdc_has_format = TRUE; - ret->pixel_format = pixel_format; ret->needs_set = 1; /* Set up the context defaults */ @@ -2217,7 +2214,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return ret; out: - if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); + if (ret->hdc) + wined3d_release_dc(swapchain->win_handle, ret->hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); HeapFree(GetProcessHeap(), 0, ret->texture_type);

1 0

Henri Verbeet : wined3d: Properly update the context when falling back to the backup window in context_set_gl_context ().
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 3441ba9e039521d38be0d8bdad8eca55393e3a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3441ba9e039521d38be0d8bda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:34 2017 +0200 wined3d: Properly update the context when falling back to the backup window in context_set_gl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f9c95ba..d8ec251 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1178,8 +1178,6 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) if (backup || !wglMakeCurrent(ctx->hdc, ctx->glCtx)) { - HDC dc; - WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, GetLastError()); ctx->valid = 0; @@ -1196,24 +1194,27 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!(dc = swapchain_get_backup_dc(swapchain))) + if (!(ctx->hdc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - if (!context_set_pixel_format(ctx, dc, TRUE, ctx->pixel_format)) + ctx->hdc_is_private = TRUE; + ctx->hdc_has_format = FALSE; + + if (!context_set_pixel_format(ctx, ctx->hdc, TRUE, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, dc); + ctx->pixel_format, ctx->hdc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(dc, ctx->glCtx)) + if (!wglMakeCurrent(ctx->hdc, ctx->glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - dc, GetLastError()); + ctx->hdc, GetLastError()); context_set_current(NULL); return FALSE; }

1 0

Henri Verbeet : wined3d: Only flush valid contexts in wined3d_cs_exec_flush().
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 6a5c37254194aaed783b219957e6f204b2d674de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5c37254194aaed783b21995… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 2 18:40:33 2017 +0200 wined3d: Only flush valid contexts in wined3d_cs_exec_flush(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c7df670..c785b72 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -830,7 +830,8 @@ static void wined3d_cs_exec_flush(struct wined3d_cs *cs, const void *data) struct wined3d_context *context; context = context_acquire(cs->device, NULL, 0); - context->gl_info->gl_ops.gl.p_glFlush(); + if (context->valid) + context->gl_info->gl_ops.gl.p_glFlush(); context_release(context); }

1 0

Hugh McMaster : regedit: Use the heap_*() functions in hexedit.c where possible.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 4c25f6497e39be6d713a74b156e56ebfd38ef831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c25f6497e39be6d713a74b15… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 2 12:35:42 2017 +0000 regedit: Use the heap_*() functions in hexedit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 56 ++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 103a062..3f05aa6 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -24,6 +24,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <string.h> #include <assert.h> @@ -35,6 +36,7 @@ #include "commctrl.h" #include "main.h" +#include "regproc.h" /* spaces dividing hex and ASCII */ #define DIV_SPACES 4 @@ -74,13 +76,9 @@ static LPWSTR HexEdit_GetLineText(BYTE *pData, LONG cbData, LONG pad) { static const WCHAR percent_02xW[] = {'%','0','2','X',' ',0}; - LPWSTR lpszLine = HeapAlloc(GetProcessHeap(), 0, - (cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); + WCHAR *lpszLine = heap_xalloc((cbData * 3 + pad * 3 + DIV_SPACES + cbData + 1) * sizeof(WCHAR)); LONG i; - if (!lpszLine) - return NULL; - for (i = 0; i < cbData; i++) wsprintfW(lpszLine + i*3, percent_02xW, pData[i]); for (i = 0; i < pad * 3; i++) @@ -139,7 +137,7 @@ HexEdit_Paint(HEXEDIT_INFO *infoPtr) TextOutW(hdc, nXStart, nYStart, lpszLine, infoPtr->nBytesPerLine * 3 + DIV_SPACES + nLineLen); nYStart += infoPtr->nHeight; - HeapFree(GetProcessHeap(), 0, lpszLine); + heap_free(lpszLine); } SelectObject(hdc, hOldFont); @@ -178,7 +176,7 @@ HexEdit_UpdateCaret(HEXEDIT_INFO *infoPtr) if (!nLineLen) size.cx = 0; - HeapFree(GetProcessHeap(), 0, lpszLine); + heap_free(lpszLine); SetCaretPos( GetSystemMetrics(SM_CXBORDER) + size.cx, @@ -230,22 +228,18 @@ HexEdit_EnsureVisible(HEXEDIT_INFO *infoPtr, INT nCaretPos) static LRESULT HexEdit_SetData(HEXEDIT_INFO *infoPtr, INT cbData, const BYTE *pData) { - HeapFree(GetProcessHeap(), 0, infoPtr->pData); + heap_free(infoPtr->pData); infoPtr->cbData = 0; - infoPtr->pData = HeapAlloc(GetProcessHeap(), 0, cbData); - if (infoPtr->pData) - { - memcpy(infoPtr->pData, pData, cbData); - infoPtr->cbData = cbData; + infoPtr->pData = heap_xalloc(cbData); + memcpy(infoPtr->pData, pData, cbData); + infoPtr->cbData = cbData; - infoPtr->nCaretPos = 0; - HexEdit_UpdateScrollbars(infoPtr); - HexEdit_UpdateCaret(infoPtr); - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); - return TRUE; - } - return FALSE; + infoPtr->nCaretPos = 0; + HexEdit_UpdateScrollbars(infoPtr); + HexEdit_UpdateCaret(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + return TRUE; } static LRESULT @@ -296,8 +290,8 @@ HexEdit_Char (HEXEDIT_INFO *infoPtr, WCHAR ch) { /* make room for another byte */ infoPtr->cbData++; - infoPtr->pData = HeapReAlloc(GetProcessHeap(), 0, infoPtr->pData, infoPtr->cbData + 1); - if (!infoPtr->pData) return 0; + infoPtr->pData = heap_xrealloc(infoPtr->pData, infoPtr->cbData + 1); + /* move everything after caret up one byte */ memmove(infoPtr->pData + nCaretBytePos + 1, infoPtr->pData + nCaretBytePos, @@ -348,9 +342,9 @@ static inline LRESULT HexEdit_Destroy (HEXEDIT_INFO *infoPtr) { HWND hwnd = infoPtr->hwndSelf; - HeapFree(GetProcessHeap(), 0, infoPtr->pData); + heap_free(infoPtr->pData); /* free info data */ - HeapFree(GetProcessHeap(), 0, infoPtr); + heap_free(infoPtr); SetWindowLongPtrW(hwnd, 0, 0); return 0; } @@ -478,7 +472,8 @@ static inline LRESULT HexEdit_NCCreate (HWND hwnd, LPCREATESTRUCTW lpcs) lpcs->dwExStyle | WS_EX_CLIENTEDGE); /* allocate memory for info structure */ - infoPtr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEXEDIT_INFO)); + infoPtr = heap_xalloc(sizeof(HEXEDIT_INFO)); + memset(infoPtr, 0, sizeof(HEXEDIT_INFO)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); /* initialize info structure */ @@ -526,12 +521,15 @@ HexEdit_SetFont (HEXEDIT_INFO *infoPtr, HFONT hFont, BOOL redraw) for (i = 0; ; i++) { - BYTE *pData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, i); - LPWSTR lpszLine = HexEdit_GetLineText(pData, i, 0); + BYTE *pData = heap_xalloc(i); + WCHAR *lpszLine; SIZE size; + + memset(pData, 0, i); + lpszLine = HexEdit_GetLineText(pData, i, 0); GetTextExtentPoint32W(hdc, lpszLine, lstrlenW(lpszLine), &size); - HeapFree(GetProcessHeap(), 0, lpszLine); - HeapFree(GetProcessHeap(), 0, pData); + heap_free(lpszLine); + heap_free(pData); if (size.cx > (rcClient.right - rcClient.left)) { infoPtr->nBytesPerLine = i - 1;

1 0

Alex Henrie : ucrtbase/tests: Add tests for math function errors.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 3bca09ee386e1ea332da2a9760f2eeb729c6031b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bca09ee386e1ea332da2a976… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 1 23:51:37 2017 -0600 ucrtbase/tests: Add tests for math function errors. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 218 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c70e4b6..04718c9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -55,6 +55,22 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() + +#define M_PI_2 1.57079632679489661923 + +#define FE_TONEAREST 0 + +#define _DOMAIN 1 /* domain error in argument */ +#define _SING 2 /* singularity */ +#define _OVERFLOW 3 /* range overflow */ +#define _UNDERFLOW 4 /* range underflow */ + DEFINE_EXPECT(global_invalid_parameter_handler); DEFINE_EXPECT(thread_invalid_parameter_handler); @@ -72,6 +88,18 @@ typedef struct MSVCRT__lldiv_t { LONGLONG rem; /* remainder */ } MSVCRT_lldiv_t; +typedef struct MSVCRT__exception { + int type; + char* name; + double arg1; + double arg2; + double retval; +} MSVCRT__exception; + +typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); + +static HMODULE module; + static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); @@ -92,6 +120,9 @@ static int (CDECL *p__isblank_l)(int,_locale_t); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); +static int (CDECL *p_fesetround)(int); +static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); +static int* (CDECL *p_errno)(void); static void test__initialize_onexit_table(void) { @@ -365,7 +396,7 @@ static void test__get_narrow_winmain_command_line(char *path) static BOOL init(void) { - HMODULE module = LoadLibraryA("ucrtbase.dll"); + module = LoadLibraryA("ucrtbase.dll"); if(!module) { win_skip("ucrtbase.dll not available\n"); @@ -392,6 +423,9 @@ static BOOL init(void) p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); + p_fesetround = (void*)GetProcAddress(module, "fesetround"); + p___setusermatherr = (void*)GetProcAddress(module, "__setusermatherr"); + p_errno = (void*)GetProcAddress(module, "_errno"); return TRUE; } @@ -509,6 +543,187 @@ static void test_isblank(void) } } +static struct MSVCRT__exception exception; + +static int CDECL matherr_callback(struct MSVCRT__exception *e) +{ + memcpy(&exception, e, sizeof(MSVCRT__exception)); + return 0; +} + +static void test_math_errors(void) +{ + const struct { + char func[16]; + double x; + int error; + int exception; + } testsd[] = { + {"_logb", -INFINITY, -1, -1}, + {"_logb", -1, -1, -1}, + {"_logb", 0, ERANGE, _SING}, + {"_logb", INFINITY, -1, -1}, + {"acos", -INFINITY, EDOM, _DOMAIN}, + {"acos", -2, EDOM, _DOMAIN}, + {"acos", -1, -1, -1}, + {"acos", 1, -1, -1}, + {"acos", 2, EDOM, _DOMAIN}, + {"acos", INFINITY, EDOM, _DOMAIN}, + {"acosh", -INFINITY, EDOM, -1}, + {"acosh", 0, EDOM, -1}, + {"acosh", 1, -1, -1}, + {"acosh", INFINITY, -1, -1}, + {"asin", -INFINITY, EDOM, _DOMAIN}, + {"asin", -2, EDOM, _DOMAIN}, + {"asin", -1, -1, -1}, + {"asin", 1, -1, -1}, + {"asin", 2, EDOM, _DOMAIN}, + {"asin", INFINITY, EDOM, _DOMAIN}, + {"asinh", -INFINITY, -1, -1}, + {"asinh", INFINITY, -1, -1}, + {"atan", -INFINITY, -1, -1}, + {"atan", 0, -1, -1}, + {"atan", INFINITY, -1, -1}, + {"atanh", -INFINITY, EDOM, -1}, + {"atanh", -2, EDOM, -1}, + {"atanh", -1, ERANGE, -1}, + {"atanh", 1, ERANGE, -1}, + {"atanh", 2, EDOM, -1}, + {"atanh", INFINITY, EDOM, -1}, + {"cos", -INFINITY, EDOM, _DOMAIN}, + {"cos", INFINITY, EDOM, _DOMAIN}, + {"cosh", -INFINITY, -1, -1}, + {"cosh", 0, -1, -1}, + {"cosh", INFINITY, -1, -1}, + {"exp", -INFINITY, -1, -1}, + {"exp", -1e100, -1, _UNDERFLOW}, + {"exp", 1e100, ERANGE, _OVERFLOW}, + {"exp", INFINITY, -1, -1}, + {"exp2", -INFINITY, -1, -1}, + {"exp2", -1e100, -1, -1}, + {"exp2", 1e100, ERANGE, -1}, + {"exp2", INFINITY, -1, -1}, + {"expm1", -INFINITY, -1, -1}, + {"expm1", INFINITY, -1, -1}, + {"log", -INFINITY, EDOM, _DOMAIN}, + {"log", -1, EDOM, _DOMAIN}, + {"log", 0, ERANGE, _SING}, + {"log", INFINITY, -1, -1}, + {"log10", -INFINITY, EDOM, _DOMAIN}, + {"log10", -1, EDOM, _DOMAIN}, + {"log10", 0, ERANGE, _SING}, + {"log10", INFINITY, -1, -1}, + {"log1p", -INFINITY, EDOM, -1}, + {"log1p", -2, EDOM, -1}, + {"log1p", -1, ERANGE, -1}, + {"log1p", INFINITY, -1, -1}, + {"log2", INFINITY, -1, -1}, + {"sin", -INFINITY, EDOM, _DOMAIN}, + {"sin", INFINITY, EDOM, _DOMAIN}, + {"sinh", -INFINITY, -1, -1}, + {"sinh", 0, -1, -1}, + {"sinh", INFINITY, -1, -1}, + {"sqrt", -INFINITY, EDOM, _DOMAIN}, + {"sqrt", -1, EDOM, _DOMAIN}, + {"sqrt", 0, -1, -1}, + {"sqrt", INFINITY, -1, -1}, + {"tan", -INFINITY, EDOM, _DOMAIN}, + {"tan", -M_PI_2, -1, -1}, + {"tan", M_PI_2, -1, -1}, + {"tan", INFINITY, EDOM, _DOMAIN}, + {"tanh", -INFINITY, -1, -1}, + {"tanh", 0, -1, -1}, + {"tanh", INFINITY, -1, -1}, + }; + const struct { + char func[16]; + double a; + double b; + int error; + int exception; + } tests2d[] = { + {"atan2", -INFINITY, 0, -1, -1}, + {"atan2", 0, 0, -1, -1}, + {"atan2", INFINITY, 0, -1, -1}, + {"atan2", 0, -INFINITY, -1, -1}, + {"atan2", 0, INFINITY, -1, -1}, + }; + const struct { + char func[16]; + double a; + long b; + int error; + int exception; + } testsdl[] = { + {"_scalb", -INFINITY, 1, -1, -1}, + {"_scalb", -1e100, 1, -1, -1}, + {"_scalb", 1e100, 1, -1, -1}, + {"_scalb", INFINITY, 1, -1, -1}, + {"_scalb", 1, 1e9, ERANGE, _OVERFLOW}, + {"ldexp", -INFINITY, 1, -1, -1}, + {"ldexp", -1e100, 1, -1, -1}, + {"ldexp", 1e100, 1, -1, -1}, + {"ldexp", INFINITY, 1, -1, -1}, + {"ldexp", 1, -1e9, -1, _UNDERFLOW}, + {"ldexp", 1, 1e9, ERANGE, _OVERFLOW}, + }; + double (CDECL *p_funcd)(double); + double (CDECL *p_func2d)(double, double); + double (CDECL *p_funcdl)(double, long); + int i; + + p___setusermatherr(matherr_callback); + + /* necessary so that exp(1e100)==INFINITY on glibc, we can remove this if we change our implementation */ + p_fesetround(FE_TONEAREST); + + for(i = 0; i < sizeof(testsd)/sizeof(testsd[0]); i++) { + p_funcd = (void*)GetProcAddress(module, testsd[i].func); + *p_errno() = -1; + exception.type = -1; + p_funcd(testsd[i].x); + ok(*p_errno() == testsd[i].error, + "%s(%f) got errno %d\n", testsd[i].func, testsd[i].x, *p_errno()); + ok(exception.type == testsd[i].exception, + "%s(%f) got exception type %d\n", testsd[i].func, testsd[i].x, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == testsd[i].x, + "%s(%f) got exception arg1 %f\n", testsd[i].func, testsd[i].x, exception.arg1); + } + + for(i = 0; i < sizeof(tests2d)/sizeof(tests2d[0]); i++) { + p_func2d = (void*)GetProcAddress(module, tests2d[i].func); + *p_errno() = -1; + exception.type = -1; + p_func2d(tests2d[i].a, tests2d[i].b); + ok(*p_errno() == tests2d[i].error, + "%s(%f, %f) got errno %d\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, *p_errno()); + ok(exception.type == tests2d[i].exception, + "%s(%f, %f) got exception type %d\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == tests2d[i].a, + "%s(%f, %f) got exception arg1 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg1); + ok(exception.arg2 == tests2d[i].b, + "%s(%f, %f) got exception arg2 %f\n", tests2d[i].func, tests2d[i].a, tests2d[i].b, exception.arg2); + } + + for(i = 0; i < sizeof(testsdl)/sizeof(testsdl[0]); i++) { + p_funcdl = (void*)GetProcAddress(module, testsdl[i].func); + *p_errno() = -1; + exception.type = -1; + p_funcdl(testsdl[i].a, testsdl[i].b); + ok(*p_errno() == testsdl[i].error, + "%s(%f, %ld) got errno %d\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, *p_errno()); + ok(exception.type == testsdl[i].exception, + "%s(%f, %ld) got exception type %d\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.type); + if(exception.type == -1) continue; + ok(exception.arg1 == testsdl[i].a, + "%s(%f, %ld) got exception arg1 %f\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.arg1); + ok(exception.arg2 == testsdl[i].b, + "%s(%f, %ld) got exception arg2 %f\n", testsdl[i].func, testsdl[i].a, testsdl[i].b, exception.arg2); + } +} + START_TEST(misc) { int arg_c; @@ -533,4 +748,5 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_math_errors(); }

1 0

Alistair Leslie-Hughes : msvcp90/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: c4429b6dc25346670b080e0c9052c46dd9cfaffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4429b6dc25346670b080e0c9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 1 01:25:52 2017 +0000 msvcp90/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index c1d6589..90fa6b1 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1132,8 +1132,8 @@ static void test_num_get_get_uint64(void) } ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), - (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); + ok(tests[i].val == val, "wrong val, expected = %s found %s\n", wine_dbgstr_longlong(tests[i].val), + wine_dbgstr_longlong(val)); ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); if(tests[i].lcl) @@ -1159,8 +1159,8 @@ static void test_num_get_get_uint64(void) nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), - (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); + ok(tests[i].val == val, "wrong val, expected = %s found %s\n", wine_dbgstr_longlong(tests[i].val), + wine_dbgstr_longlong(val)); testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus);

1 0

Zebediah Figura : dsquery: Add stub implementation of ICommonQuery.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: 064f74bf0852b47e67e7392980dc7b39fb0ae6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=064f74bf0852b47e67e739298… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 14:24:57 2017 -0500 dsquery: Add stub implementation of ICommonQuery. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsquery/Makefile.in | 1 + dlls/dsquery/main.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in index a3f3224..8fbe92d 100644 --- a/dlls/dsquery/Makefile.in +++ b/dlls/dsquery/Makefile.in @@ -1,4 +1,5 @@ MODULE = dsquery.dll +IMPORTS = uuid C_SRCS = \ main.c diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c index ccf59f8..eee32cb 100644 --- a/dlls/dsquery/main.c +++ b/dlls/dsquery/main.c @@ -20,16 +20,183 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "cmnquery.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dsquery); static HINSTANCE instance; +/****************************************************************** + * IClassFactory implementation + */ +struct query_class_factory { + IClassFactory IClassFactory_iface; + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *outer, REFIID riid, void **out); +}; + +static inline struct query_class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct query_class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IClassFactory) || IsEqualGUID(riid, &IID_IUnknown)) + { + IClassFactory_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) decreasing refcount to %u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *outer, REFIID riid, void **out) +{ + struct query_class_factory *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%p, %s, %p)\n", iface, outer, debugstr_guid(riid), out); + + return This->pfnCreateInstance(outer, riid, out); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("(%p)->(%d)\n", iface, dolock); + + return S_OK; +} + +static const IClassFactoryVtbl query_class_factory_vtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer, +}; + +/****************************************************************** + * ICommonQuery implementation + */ +struct common_query { + ICommonQuery ICommonQuery_iface; + LONG ref; +}; + +static inline struct common_query *impl_from_ICommonQuery(ICommonQuery *iface) +{ + return CONTAINING_RECORD(iface, struct common_query, ICommonQuery_iface); +} + +static HRESULT WINAPI CommonQuery_QueryInterface(ICommonQuery *iface, REFIID riid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_ICommonQuery) || IsEqualGUID(riid, &IID_IUnknown)) + { + ICommonQuery_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI CommonQuery_AddRef(ICommonQuery *iface) +{ + struct common_query *This = impl_from_ICommonQuery(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) increasing refcount to %u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI CommonQuery_Release(ICommonQuery *iface) +{ + struct common_query *This = impl_from_ICommonQuery(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) decreasing refcount to %u\n", iface, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI CommonQuery_OpenQueryWindow(ICommonQuery *iface, + HWND parent, LPOPENQUERYWINDOW query_window, IDataObject **data_object) +{ + FIXME("(%p)->(%p, %p, %p) stub!\n", iface, parent, query_window, data_object); + + return E_NOTIMPL; +} + +static const ICommonQueryVtbl CommonQuery_vtbl = +{ + CommonQuery_QueryInterface, + CommonQuery_AddRef, + CommonQuery_Release, + CommonQuery_OpenQueryWindow, +}; + +static HRESULT CommonQuery_create(IUnknown *outer, REFIID riid, void **out) +{ + struct common_query *query; + + TRACE("outer %p, riid %s, out %p\n", outer, debugstr_guid(riid), out); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*query)))) + return E_OUTOFMEMORY; + + query->ICommonQuery_iface.lpVtbl = &CommonQuery_vtbl; + return ICommonQuery_QueryInterface(&query->ICommonQuery_iface, riid, out); +} + /*********************************************************************** * DllMain */ @@ -63,6 +230,26 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) { TRACE("rclsid %s, riid %s, out %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out); + if (!IsEqualGUID( &IID_IClassFactory, riid) + && !IsEqualGUID( &IID_IUnknown, riid)) + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + if (IsEqualGUID(&CLSID_CommonQuery, rclsid)) + { + struct query_class_factory *factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); + if (!factory) return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &query_class_factory_vtbl; + factory->ref = 1; + factory->pfnCreateInstance = CommonQuery_create; + *out = factory; + return S_OK; + } + FIXME("%s: no class found\n", debugstr_guid(rclsid)); *out = NULL; return CLASS_E_CLASSNOTAVAILABLE;

1 0

Zebediah Figura : dsquery: Add stub DLL.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: f93e42e08868455d8867f7c5995959f7aae455d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93e42e08868455d8867f7c59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 31 14:00:01 2017 -0500 dsquery: Add stub DLL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dsquery/Makefile.in | 4 +++ dlls/dsquery/dsquery.spec | 19 +++++++++++ dlls/dsquery/main.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+) diff --git a/configure b/configure index c79f5e6..b09f065 100755 --- a/configure +++ b/configure @@ -1182,6 +1182,7 @@ enable_dpvoice enable_dpwsockx enable_drmclien enable_dsound +enable_dsquery enable_dssenh enable_dswave enable_dwmapi @@ -18310,6 +18311,7 @@ wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib wine_fn_config_test dlls/dsound/tests dsound_test +wine_fn_config_dll dsquery enable_dsquery wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave clean diff --git a/configure.ac b/configure.ac index ce25b9a..1fbb796 100644 --- a/configure.ac +++ b/configure.ac @@ -3094,6 +3094,7 @@ WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib]) WINE_CONFIG_TEST(dlls/dsound/tests) +WINE_CONFIG_DLL(dsquery) WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave,,[clean]) diff --git a/dlls/dsquery/Makefile.in b/dlls/dsquery/Makefile.in new file mode 100644 index 0000000..a3f3224 --- /dev/null +++ b/dlls/dsquery/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dsquery.dll + +C_SRCS = \ + main.c diff --git a/dlls/dsquery/dsquery.spec b/dlls/dsquery/dsquery.spec new file mode 100644 index 0000000..721435f --- /dev/null +++ b/dlls/dsquery/dsquery.spec @@ -0,0 +1,19 @@ +256 stub OpenSavedDsQuery +257 stub OpenSavedDsQueryW +258 stub OpenQueryWindow +512 stub @ +513 stub @ +514 stub @ +515 stub @ +516 stub @ +517 stub @ +518 stub @ +519 stub @ +520 stub @ +521 stub @ + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllInstall +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dsquery/main.c b/dlls/dsquery/main.c new file mode 100644 index 0000000..ccf59f8 --- /dev/null +++ b/dlls/dsquery/main.c @@ -0,0 +1,85 @@ +/* + * Copyright 2017 Zebediah Figura for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dsquery); + +static HINSTANCE instance; + +/*********************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", inst, reason, reserved); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = inst; + DisableThreadLibraryCalls(inst); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllCanUnloadNow (DSQUERY.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllGetClassObject (DSQUERY.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out) +{ + TRACE("rclsid %s, riid %s, out %p\n", debugstr_guid(rclsid), debugstr_guid(riid), out); + + FIXME("%s: no class found\n", debugstr_guid(rclsid)); + *out = NULL; + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (DSQUERY.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +/*********************************************************************** + * DllUnregisterServer (DSQUERY.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +}

1 0

Zebediah Figura : include: Add initial IDL for cmnquery.h.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: bc89730e51b713a3bf5bbcda3c30268818cba34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc89730e51b713a3bf5bbcda3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 1 10:03:36 2017 -0500 include: Add initial IDL for cmnquery.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/cmnquery.idl | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 063c4ec..81c646e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -24,6 +24,7 @@ IDL_SRCS = \ chprst.idl \ cmdbas.idl \ cmdtxt.idl \ + cmnquery.idl \ colinf.idl \ comcat.idl \ commoncontrols.idl \ diff --git a/include/cmnquery.idl b/include/cmnquery.idl new file mode 100644 index 0000000..f9d2991 --- /dev/null +++ b/include/cmnquery.idl @@ -0,0 +1,79 @@ +/* + * Copyright 2017 Zebediah Figura for Codeweavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; + +[ + object, + uuid(1a3114b8-a62e-11d0-a6c5-00a0c906af45), + local +] +interface IPersistQuery : IPersist +{ + HRESULT WriteString([in] LPCWSTR section, [in] LPCWSTR name, [in] LPCWSTR value); + + HRESULT ReadString([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPWSTR buffer, [in] INT buflen); + + HRESULT WriteInt([in] LPCWSTR section, [in] LPCWSTR name, [in] INT value); + + HRESULT ReadInt([in] LPCWSTR section, [in] LPCWSTR name, [out] INT *value); + + HRESULT WriteStruct([in] LPCWSTR section, [in] LPCWSTR name, [in] LPVOID value, [in] DWORD size); + + HRESULT ReadStruct([in] LPCWSTR section, [in] LPCWSTR name, [out, size_is(buflen)] LPVOID buffer, [in] DWORD buflen); + + HRESULT Clear(); +} + +cpp_quote("#define OQWF_OKCANCEL 0x00000001") +cpp_quote("#define OQWF_DEFAULTFORM 0x00000002") +cpp_quote("#define OQWF_SINGLESELECT 0x00000004") +cpp_quote("#define OQWF_LOADQUERY 0x00000008") +cpp_quote("#define OQWF_REMOVESCOPES 0x00000010") +cpp_quote("#define OQWF_REMOVEFORMS 0x00000020") +cpp_quote("#define OQWF_ISSUEONOPEN 0x00000040") +cpp_quote("#define OQWF_SHOWOPTIONAL 0x00000080") +cpp_quote("#define OQWF_SAVEQUERYONOK 0x00000200") +cpp_quote("#define OQWF_HIDEMENUS 0x00000400") +cpp_quote("#define OQWF_HIDESEARCHUI 0x00000800") +cpp_quote("#define OQWF_PARAMISPROPERTYBAG 0x80000000") + +typedef struct { + DWORD cbStruct; + DWORD dwFlags; + CLSID clsidHandler; + LPVOID pHandlerParameters; + CLSID clsidDefaultForm; + IPersistQuery *pPersistQuery; + union { + void *pFormParameters; + IPropertyBag *ppbFormParameters; + }; +} OPENQUERYWINDOW, *LPOPENQUERYWINDOW; + +[ + object, + uuid(ab50dec0-6f1d-11d0-a1c4-00aa00c16e65), + local +] +interface ICommonQuery : IUnknown +{ + HRESULT OpenQueryWindow([in] HWND parent, [in] LPOPENQUERYWINDOW query_window, [out] IDataObject **data_object); +} + +cpp_quote("DEFINE_GUID(CLSID_CommonQuery, 0x83bc5ec0, 0x6f2a, 0x11d0, 0xa1,0xc4, 0x00,0xaa,0x00,0xc1,0x6e,0x65);")

1 0

Jacek Caban : ws2_32/tests: Added GetAddrInfoExW tests.
by Alexandre Julliard Aug. 2, 2017

Aug. 2, 2017

Module: wine Branch: master Commit: eb32d1a52b4c5a4728b4eab830559e0a9916cb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32d1a52b4c5a4728b4eab83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 18:29:55 2017 +0200 ws2_32/tests: Added GetAddrInfoExW tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e975ea4..43008cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -66,7 +66,13 @@ static void (WINAPI *pfreeaddrinfo)(struct addrinfo *); static int (WINAPI *pgetaddrinfo)(LPCSTR,LPCSTR,const struct addrinfo *,struct addrinfo **); static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW); +static void (WINAPI *pFreeAddrInfoExW)(ADDRINFOEXW *ai); static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *); +static int (WINAPI *pGetAddrInfoExW)(const WCHAR *name, const WCHAR *servname, DWORD namespace, + GUID *namespace_id, const ADDRINFOEXW *hints, ADDRINFOEXW **result, + struct timeval *timeout, OVERLAPPED *overlapped, + LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle); +static int (WINAPI *pGetAddrInfoExOverlappedResult)(OVERLAPPED *overlapped); static PCSTR (WINAPI *pInetNtop)(INT,LPVOID,LPSTR,ULONG); static PCWSTR(WINAPI *pInetNtopW)(INT,LPVOID,LPWSTR,ULONG); static int (WINAPI *pInetPtonA)(INT,LPCSTR,LPVOID); @@ -1226,7 +1232,10 @@ static void Init (void) pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); pFreeAddrInfoW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoW"); + pFreeAddrInfoExW = (void *)GetProcAddress(hws2_32, "FreeAddrInfoExW"); pGetAddrInfoW = (void *)GetProcAddress(hws2_32, "GetAddrInfoW"); + pGetAddrInfoExW = (void *)GetProcAddress(hws2_32, "GetAddrInfoExW"); + pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(hws2_32, "GetAddrInfoExOverlappedResult"); pInetNtop = (void *)GetProcAddress(hws2_32, "inet_ntop"); pInetNtopW = (void *)GetProcAddress(hws2_32, "InetNtopW"); pInetPtonA = (void *)GetProcAddress(hws2_32, "inet_pton"); @@ -7334,6 +7343,95 @@ static void test_GetAddrInfoW(void) ok(result2 == NULL, "got %p\n", result2); } +static void test_GetAddrInfoExW(void) +{ + static const WCHAR empty[] = {0}; + static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + ADDRINFOEXW *result; + OVERLAPPED overlapped; + HANDLE event; + int ret; + + if (!pGetAddrInfoExW || !pGetAddrInfoExOverlappedResult) + { + win_skip("GetAddrInfoExW and/or GetAddrInfoExOverlappedResult not present\n"); + return; + } + + event = WSACreateEvent(); + + result = (ADDRINFOEXW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + + result = NULL; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(empty, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = NULL; + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, NULL, NULL, NULL); + ok(!ret, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + overlapped.hEvent = event; + ResetEvent(event); + ret = pGetAddrInfoExW(localhost, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(!result, "result != NULL\n"); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + ret = pGetAddrInfoExW(winehq, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(overlapped.hEvent == event, "hEvent changed %p\n", overlapped.hEvent); + ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); + ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); + ok(result != NULL, "result == NULL\n"); + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + + result = (void*)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + ret = pGetAddrInfoExW(NULL, NULL, NS_DNS, NULL, NULL, &result, NULL, &overlapped, NULL, NULL); + todo_wine + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + todo_wine + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result == NULL, "got %p\n", result); + ret = WaitForSingleObject(event, 0); + todo_wine_if(ret != WAIT_TIMEOUT) /* Remove when abowe todo_wines are fixed */ + ok(ret == WAIT_TIMEOUT, "wait failed\n"); + + WSACloseEvent(event); +} + static void verify_ipv6_addrinfo(ADDRINFOA *result, const char *expectedIp) { SOCKADDR_IN6 *sockaddr6; @@ -10579,6 +10677,7 @@ START_TEST( sock ) test_ipv6only(); test_TransmitFile(); test_GetAddrInfoW(); + test_GetAddrInfoExW(); test_getaddrinfo(); test_AcceptEx(); test_ConnectEx();

1 0