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

Dmitry Timoshkov : gdiplus/tests: Add a test for image flags to PNG grayscale image tests.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 221c04d0dfb813750a458dfd6b40b828403ed958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221c04d0dfb813750a458dfd6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 28 11:30:15 2017 -0500 gdiplus/tests: Add a test for image flags to PNG grayscale image tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b9685c3..9f7cf66 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4980,22 +4980,24 @@ static void test_png_color_formats(void) { char bit_depth, color_type; PixelFormat format; + UINT flags; } td[] = { /* 2 - PNG_COLOR_TYPE_RGB */ - { 8, 2, PixelFormat24bppRGB }, + { 8, 2, PixelFormat24bppRGB, ImageFlagsColorSpaceRGB }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, PixelFormat1bppIndexed }, - { 2, 0, PixelFormat32bppARGB }, - { 4, 0, PixelFormat32bppARGB }, - { 8, 0, PixelFormat32bppARGB }, - { 16, 0, PixelFormat32bppARGB }, + { 1, 0, PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }, + { 2, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 4, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 8, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 16, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, }; BYTE buf[sizeof(png_1x1_data)]; GpStatus status; GpImage *image; ImageType type; PixelFormat format; + UINT flags; int i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) @@ -5018,6 +5020,13 @@ static void test_png_color_formats(void) broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].format, format); + status = GdipGetImageFlags(image, &flags); + expect(Ok, status); +todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0) + ok((flags & td[i].flags) == td[i].flags || + broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */ + "%d: expected %#x, got %#x\n", i, td[i].flags, flags); + GdipDisposeImage(image); } }

1 0

Dmitry Timoshkov : gdiplus: Set correct color space flags for grayscale images.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 8c593bd37ad1177144d720d17b6b706d2ee619f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c593bd37ad1177144d720d17… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 28 11:30:16 2017 -0500 gdiplus: Set correct color space flags for grayscale images. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 9 ++++++++- dlls/gdiplus/tests/image.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e3bc70e..80ad65f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3718,7 +3718,14 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi if (status == Ok) { /* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */ - bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; + bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI; + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat2bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat4bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat8bppGray) || + IsEqualGUID(&wic_format, &GUID_WICPixelFormat16bppGray)) + bitmap->image.flags |= ImageFlagsColorSpaceGRAY; + else + bitmap->image.flags |= ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.decoder = decoder; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9f7cf66..a1bd056 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5022,7 +5022,6 @@ static void test_png_color_formats(void) status = GdipGetImageFlags(image, &flags); expect(Ok, status); -todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0) ok((flags & td[i].flags) == td[i].flags || broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].flags, flags);

1 0

Vincent Povirk : gdiplus: Check for invalid coordinate space in GdipTransformPoints.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 5c12cede8daece645fa5d6f7df644efa58725588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c12cede8daece645fa5d6f7d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 28 11:42:13 2017 -0500 gdiplus: Check for invalid coordinate space in GdipTransformPoints. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 +++- dlls/gdiplus/tests/graphics.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 80e565b..ce223aa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6606,7 +6606,9 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace GpMatrix matrix; GpStatus stat; - if(!graphics || !points || count <= 0) + if(!graphics || !points || count <= 0 || + dst_space < 0 || dst_space > CoordinateSpaceDevice || + src_space < 0 || src_space > CoordinateSpaceDevice) return InvalidParameter; if(graphics->busy) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6802184..9a6dd1b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1868,6 +1868,15 @@ static void test_transformpoints(void) status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice+1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, -1, CoordinateSpaceWorld, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceDevice+1, ptf, 2); + expect(InvalidParameter, status); + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, -1, ptf, 2); + expect(InvalidParameter, status); + ptf[0].X = 1.0; ptf[0].Y = 0.0; ptf[1].X = 0.0;

1 0

Vincent Povirk : gdiplus: Replace DPtoLP with an internal coordinate space constant.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: cfa4f088ee10861a0d3ec2d1cd8c84cfb8c036d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa4f088ee10861a0d3ec2d1c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 28 11:42:14 2017 -0500 gdiplus: Replace DPtoLP with an internal coordinate space constant. This will allow us to temporarily remove gdi transforms later, without affecting internal logic that accounts for them. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 ++ dlls/gdiplus/graphics.c | 131 +++++++++++++++++++++++++++++------------ 2 files changed, 98 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e1169c6..9980afc 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -79,8 +79,12 @@ extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; +#define WineCoordinateSpaceGdiDevice ((GpCoordinateSpace)4) + extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) DECLSPEC_HIDDEN; +extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) DECLSPEC_HIDDEN; extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; extern GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ce223aa..a250678 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2067,19 +2067,30 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) if (graphics->hdc) { - POINT points[2]; + GpPointF points[4], min_point, max_point; + int i; + + points[0].X = points[2].X = rect->X; + points[0].Y = points[1].Y = rect->Y; + points[1].X = points[3].X = rect->X + rect->Width; + points[2].Y = points[3].Y = rect->Y + rect->Height; - points[0].x = rect->X; - points[0].y = rect->Y; - points[1].x = rect->X + rect->Width; - points[1].y = rect->Y + rect->Height; + gdip_transform_points(graphics, CoordinateSpaceDevice, WineCoordinateSpaceGdiDevice, points, 4); - DPtoLP(graphics->hdc, points, sizeof(points)/sizeof(points[0])); + min_point = max_point = points[0]; - rect->X = min(points[0].x, points[1].x); - rect->Y = min(points[0].y, points[1].y); - rect->Width = abs(points[1].x - points[0].x); - rect->Height = abs(points[1].y - points[0].y); + for (i=1; i<4; i++) + { + if (points[i].X < min_point.X) min_point.X = points[i].X; + if (points[i].Y < min_point.Y) min_point.Y = points[i].Y; + if (points[i].X > max_point.X) max_point.X = points[i].X; + if (points[i].Y > max_point.Y) max_point.Y = points[i].Y; + } + + rect->X = min_point.X; + rect->Y = min_point.Y; + rect->Width = max_point.X - min_point.X; + rect->Height = max_point.Y - min_point.Y; } return stat; @@ -6547,6 +6558,20 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) return Ok; } +static void get_gdi_transform(GpGraphics *graphics, GpMatrix *matrix) +{ + XFORM xform; + + if (graphics->hdc == NULL) + { + GdipSetMatrixElements(matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + return; + } + + GetTransform(graphics->hdc, 0x204, &xform); + GdipSetMatrixElements(matrix, xform.eM11, xform.eM12, xform.eM21, xform.eM22, xform.eDx, xform.eDy); +} + GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) { @@ -6566,23 +6591,29 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac scale_y *= graphics->scale; } - /* transform from src_space to CoordinateSpacePage */ - switch (src_space) + if (dst_space < src_space) { - case CoordinateSpaceWorld: - GdipMultiplyMatrix(matrix, &graphics->worldtrans, MatrixOrderAppend); - break; - case CoordinateSpacePage: - break; - case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, 1.0/scale_x, 1.0/scale_y, MatrixOrderAppend); - break; - } - - /* transform from CoordinateSpacePage to dst_space */ - switch (dst_space) - { - case CoordinateSpaceWorld: + /* transform towards world space */ + switch ((int)src_space) + { + case WineCoordinateSpaceGdiDevice: + { + GpMatrix gdixform; + get_gdi_transform(graphics, &gdixform); + stat = GdipInvertMatrix(&gdixform); + if (stat != Ok) + break; + GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + if (dst_space == CoordinateSpaceDevice) + break; + /* else fall-through */ + } + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, 1.0/scale_x, 1.0/scale_y, MatrixOrderAppend); + if (dst_space == CoordinateSpacePage) + break; + /* else fall-through */ + case CoordinateSpacePage: { GpMatrix inverted_transform = graphics->worldtrans; stat = GdipInvertMatrix(&inverted_transform); @@ -6590,22 +6621,51 @@ GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_spac GdipMultiplyMatrix(matrix, &inverted_transform, MatrixOrderAppend); break; } - case CoordinateSpacePage: - break; - case CoordinateSpaceDevice: - GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); - break; + } + } + else + { + /* transform towards device space */ + switch ((int)src_space) + { + case CoordinateSpaceWorld: + GdipMultiplyMatrix(matrix, &graphics->worldtrans, MatrixOrderAppend); + if (dst_space == CoordinateSpacePage) + break; + /* else fall-through */ + case CoordinateSpacePage: + GdipScaleMatrix(matrix, scale_x, scale_y, MatrixOrderAppend); + if (dst_space == CoordinateSpaceDevice) + break; + /* else fall-through */ + case CoordinateSpaceDevice: + { + GpMatrix gdixform; + get_gdi_transform(graphics, &gdixform); + GdipMultiplyMatrix(matrix, &gdixform, MatrixOrderAppend); + break; + } + } } } return stat; } -GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, - GpCoordinateSpace src_space, GpPointF *points, INT count) +GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) { GpMatrix matrix; GpStatus stat; + stat = get_graphics_transform(graphics, dst_space, src_space, &matrix); + if (stat != Ok) return stat; + + return GdipTransformMatrixPoints(&matrix, points, count); +} + +GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, + GpCoordinateSpace src_space, GpPointF *points, INT count) +{ if(!graphics || !points || count <= 0 || dst_space < 0 || dst_space > CoordinateSpaceDevice || src_space < 0 || src_space > CoordinateSpaceDevice) @@ -6618,10 +6678,7 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace if (src_space == dst_space) return Ok; - stat = get_graphics_transform(graphics, dst_space, src_space, &matrix); - if (stat != Ok) return stat; - - return GdipTransformMatrixPoints(&matrix, points, count); + return gdip_transform_points(graphics, dst_space, src_space, points, count); } GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space,

1 0

Changhui Liu : gdiplus/tests: Add test for hdc with window origin point changed.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: cbaa358d6def2f66879d406fdbeba909f1e41494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa358d6def2f66879d406fd… Author: Changhui Liu <liuchanghui(a)linuxdeepin.com> Date: Mon Aug 28 11:42:15 2017 -0500 gdiplus/tests: Add test for hdc with window origin point changed. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 90 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9a6dd1b..74d85d1 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6188,6 +6188,95 @@ static void test_GdipGraphicsSetAbort(void) ReleaseDC(hwnd, hdc); } +#define BLUE_COLOR (0xff0000ff) +#define is_blue_color(color) ( ((color) & 0x00ffffff) == 0xff ) +#define get_bitmap_pixel(x,y) pixel[(y)*(width) + (x)] +static DWORD* GetBitmapPixelBuffer(HDC hdc, HBITMAP hbmp, int width, int height) +{ + BITMAPINFOHEADER bi; + UINT lines = 0; + DWORD *buffer = (DWORD *)GdipAlloc(width*height*4); + + bi.biSize = sizeof(BITMAPINFOHEADER); + bi.biWidth = width; + bi.biHeight = -height; /*very Important, set negative, indicating a top-down DIB*/ + bi.biPlanes = 1; + bi.biBitCount = 32; + bi.biCompression = BI_RGB; + bi.biSizeImage = 0; + bi.biXPelsPerMeter = 0; + bi.biYPelsPerMeter = 0; + bi.biClrUsed = 0; + bi.biClrImportant = 0; + + lines = GetDIBits(hdc, hbmp, 0, height, buffer, (BITMAPINFO *)&bi, DIB_RGB_COLORS); + ok(lines == height, "Expected GetDIBits:%p,%d->%d,%d\n", buffer, height, lines, GetLastError()); + + return buffer; +} + +static void ReleaseBitmapPixelBuffer(DWORD* buffer) +{ + if (buffer) GdipFree(buffer); +} + +static void test_GdipFillRectanglesOnMemoryDCSolidBrush(void) +{ + ARGB color[6] = {0,0,0,0,0,0}; + POINT pt = {0,0}; + RECT rect = {100, 100, 180, 180}; + UINT width = rect.right - rect.left; + UINT height = rect.bottom - rect.top; + GpStatus status = 0; + GpSolidFill *brush = NULL; + GpGraphics *graphics = NULL; + HDC dc = GetDC( hwnd); + HDC hdc = CreateCompatibleDC(dc); + HBITMAP bmp = CreateCompatibleBitmap(dc, width, height); + HGDIOBJ old = SelectObject(hdc, bmp); + DWORD* pixel = NULL; + + /*Change the window origin is the key test point*/ + SetWindowOrgEx(hdc, rect.left, rect.top, &pt); + + status = GdipCreateSolidFill(BLUE_COLOR, &brush); + expect(Ok, status); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipSetClipRectI(graphics, rect.left+width/2, rect.top+height/2, + width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipFillRectangleI(graphics, (GpBrush*)brush, 0, 0, rect.right, rect.bottom); + expect(Ok, status); + + GdipDeleteBrush((GpBrush*)brush); + GdipDeleteGraphics(graphics); + + pixel = GetBitmapPixelBuffer(hdc, bmp, width, height); + if (pixel) + { + color[0] = get_bitmap_pixel(width/2, height/2); + color[1] = get_bitmap_pixel(width/2+1, height/2); + color[2] = get_bitmap_pixel(width/2, height/2+1); + color[3] = get_bitmap_pixel(width/2-1, height/2-1); + color[4] = get_bitmap_pixel(width/2-1, height-1); + color[5] = get_bitmap_pixel(width-1, height/2-1); + } + + todo_wine ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + color[3] == 0 && color[4] == 0 && color[5] == 0, + "Expected GdipFillRectangleI take effect!\n" ); + ReleaseBitmapPixelBuffer(pixel); + + SelectObject(hdc, old); + DeleteObject(bmp); + DeleteDC(hdc); + ReleaseDC(hwnd, dc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6271,6 +6360,7 @@ START_TEST(graphics) test_bitmapfromgraphics(); test_GdipFillRectangles(); test_GdipGetVisibleClipBounds_memoryDC(); + test_GdipFillRectanglesOnMemoryDCSolidBrush(); test_container_rects(); test_GdipGraphicsSetAbort();

1 0

Paul Gofman : d3dx9: Factor out set_constants_device() function.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: c579a81a6353dd7c843270561cd5763ff895de40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579a81a6353dd7c843270561… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Aug 10 13:02:50 2017 +0300 d3dx9: Factor out set_constants_device() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 29846a0..f38f875 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1419,6 +1419,47 @@ static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, regstore_set_modified(rs, table, offset, count); } +static HRESULT set_constants_device(ID3DXEffectStateManager *manager, struct IDirect3DDevice9 *device, + D3DXPARAMETER_TYPE type, enum pres_reg_tables table, void *ptr, + unsigned int start, unsigned int count) +{ + if (type == D3DXPT_VERTEXSHADER) + { + switch(table) + { + case PRES_REGTAB_OCONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantF, start, ptr, count); + case PRES_REGTAB_OICONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantI, start, ptr, count); + case PRES_REGTAB_OBCONST: + return SET_D3D_STATE_(manager, device, SetVertexShaderConstantB, start, ptr, count); + default: + FIXME("Unexpected register table %u.\n", table); + return D3DERR_INVALIDCALL; + } + } + else if (type == D3DXPT_PIXELSHADER) + { + switch(table) + { + case PRES_REGTAB_OCONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantF, start, ptr, count); + case PRES_REGTAB_OICONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantI, start, ptr, count); + case PRES_REGTAB_OBCONST: + return SET_D3D_STATE_(manager, device, SetPixelShaderConstantB, start, ptr, count); + default: + FIXME("Unexpected register table %u.\n", table); + return D3DERR_INVALIDCALL; + } + } + else + { + FIXME("Unexpected parameter type %u.\n", type); + return D3DERR_INVALIDCALL; + } +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1686,49 +1727,8 @@ static HRESULT set_shader_constants_device(ID3DXEffectStateManager *manager, str TRACE("Setting %u constants at %u.\n", count, start); ptr = (BYTE *)rs->tables[table] + get_offset_reg(table, start) * table_info[table].component_size; - if (type == D3DXPT_VERTEXSHADER) - { - switch(table) - { - case PRES_REGTAB_OCONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantF, start, (const float *)ptr, count); - break; - case PRES_REGTAB_OICONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantI, start, (const int *)ptr, count); - break; - case PRES_REGTAB_OBCONST: - hr = SET_D3D_STATE_(manager, device, SetVertexShaderConstantB, start, (const BOOL *)ptr, count); - break; - default: - FIXME("Unexpected register table %u.\n", table); - return D3DERR_INVALIDCALL; - } - } - else if (type == D3DXPT_PIXELSHADER) - { - switch(table) - { - case PRES_REGTAB_OCONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantF, start, (const float *)ptr, count); - break; - case PRES_REGTAB_OICONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantI, start, (const int *)ptr, count); - break; - case PRES_REGTAB_OBCONST: - hr = SET_D3D_STATE_(manager, device, SetPixelShaderConstantB, start, (const BOOL *)ptr, count); - break; - default: - FIXME("Unexpected register table %u.\n", table); - return D3DERR_INVALIDCALL; - } - } - else - { - FIXME("Unexpected parameter type %u.\n", type); - return D3DERR_INVALIDCALL; - } - if (FAILED(hr)) + if (FAILED(hr = set_constants_device(manager, device, type, table, ptr, start, count))) { ERR("Setting constants failed, type %u, table %u, hr %#x.\n", type, table, hr); result = hr;

1 0

Alexandre Julliard : kernel32: Implement AddDllDirectory and RemoveDllDirectory.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 12167d2e36084e169dcdc4b9da072ce464676b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12167d2e36084e169dcdc4b9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 08:16:52 2017 +0200 kernel32: Implement AddDllDirectory and RemoveDllDirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-libraryloader-l1-1-0.spec | 4 +- .../api-ms-win-core-libraryloader-l1-1-1.spec | 4 +- .../api-ms-win-core-libraryloader-l1-2-0.spec | 4 +- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/module.c | 54 ++++++++++++++++++++++ dlls/kernel32/tests/module.c | 50 ++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 4 +- 7 files changed, 114 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12167d2e36084e169dcdc…

1 0

Alexandre Julliard : kernel32: Add helper functions for building the load path.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 8abbfbbe2431c1e09aede38531635a0c8b12bc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abbfbbe2431c1e09aede3853… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 09:33:07 2017 +0200 kernel32: Add helper functions for building the load path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 60 +++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 54a04be..30f33a6 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -888,6 +888,32 @@ static inline const WCHAR *get_module_path_end(const WCHAR *module) return mod_end; } + +/****************************************************************** + * append_path_len + * + * Append a counted string to the load path. Helper for MODULE_get_dll_load_path. + */ +static inline WCHAR *append_path_len( WCHAR *p, const WCHAR *str, DWORD len ) +{ + if (!len) return p; + memcpy( p, str, len * sizeof(WCHAR) ); + p[len] = ';'; + return p + len + 1; +} + + +/****************************************************************** + * append_path + * + * Append a string to the load path. Helper for MODULE_get_dll_load_path. + */ +static inline WCHAR *append_path( WCHAR *p, const WCHAR *str ) +{ + return append_path_len( p, str, strlenW(str) ); +} + + /****************************************************************** * MODULE_get_dll_load_path * @@ -897,6 +923,7 @@ static inline const WCHAR *get_module_path_end(const WCHAR *module) WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) { static const WCHAR pathW[] = {'P','A','T','H',0}; + static const WCHAR dotW[] = {'.',0}; const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; @@ -935,31 +962,14 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) { - if (module) - { - memcpy( ret, module, (mod_end - module) * sizeof(WCHAR) ); - p += (mod_end - module); - *p++ = ';'; - } - if (dll_directory) - { - strcpyW( p, dll_directory ); - p += strlenW(p); - *p++ = ';'; - } - else if (!safe_mode) - { - *p++ = '.'; - *p++ = ';'; - } - strcpyW( p, system_path ); - p += strlenW(p); - *p++ = ';'; - if (!dll_directory && safe_mode) - { - *p++ = '.'; - *p++ = ';'; - } + if (module) p = append_path_len( p, module, mod_end - module ); + + if (dll_directory) p = append_path( p, dll_directory ); + else if (!safe_mode) p = append_path( p, dotW ); + + p = append_path( p, system_path ); + + if (!dll_directory && safe_mode) p = append_path( p, dotW ); } RtlLeaveCriticalSection( &dlldir_section ); if (!ret) return NULL;

1 0

Alexandre Julliard : kernel32: Implement LOAD_LIBRARY_SEARCH_* flags.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 3b399bbbf894b894f8ee753465ad90d7bfb7841d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b399bbbf894b894f8ee75346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 09:37:06 2017 +0200 kernel32: Implement LOAD_LIBRARY_SEARCH_* flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 99 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 88 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 30f33a6..9bd11c77 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -67,11 +67,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION dlldir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_USER_DIRS | - LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); - /**************************************************************************** * GetDllDirectoryA (KERNEL32.@) */ @@ -212,6 +207,12 @@ BOOL WINAPI RemoveDllDirectory( DLL_DIRECTORY_COOKIE cookie ) */ BOOL WINAPI SetDefaultDllDirectories( DWORD flags ) { + /* LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR doesn't make sense in default dirs */ + const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); + if (!flags || (flags & ~load_library_search_flags)) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -998,6 +999,75 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) /****************************************************************** + * get_dll_load_path_search_flags + */ +static WCHAR *get_dll_load_path_search_flags( LPCWSTR module, DWORD flags ) +{ + const WCHAR *image = NULL, *mod_end, *image_end; + struct dll_dir_entry *dir; + WCHAR *p, *ret; + int len = 1; + + if (flags & LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) + flags |= (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32); + + if (flags & LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) + { + DWORD type = RtlDetermineDosPathNameType_U( module ); + if (type != ABSOLUTE_DRIVE_PATH && type != ABSOLUTE_PATH) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + mod_end = get_module_path_end( module ); + len += (mod_end - module) + 1; + } + else module = NULL; + + RtlEnterCriticalSection( &dlldir_section ); + + if (flags & LOAD_LIBRARY_SEARCH_APPLICATION_DIR) + { + image = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer; + image_end = get_module_path_end( image ); + len += (image_end - image) + 1; + } + + if (flags & LOAD_LIBRARY_SEARCH_USER_DIRS) + { + LIST_FOR_EACH_ENTRY( dir, &dll_dir_list, struct dll_dir_entry, entry ) + len += strlenW( dir->dir ) + 1; + if (dll_directory) len += strlenW(dll_directory) + 1; + } + + if (flags & LOAD_LIBRARY_SEARCH_SYSTEM32) len += GetSystemDirectoryW( NULL, 0 ); + + if ((p = ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + if (module) p = append_path_len( p, module, mod_end - module ); + if (image) p = append_path_len( p, image, image_end - image ); + if (flags & LOAD_LIBRARY_SEARCH_USER_DIRS) + { + LIST_FOR_EACH_ENTRY( dir, &dll_dir_list, struct dll_dir_entry, entry ) + p = append_path( p, dir->dir ); + if (dll_directory) p = append_path( p, dll_directory ); + } + if (flags & LOAD_LIBRARY_SEARCH_SYSTEM32) GetSystemDirectoryW( p, ret + len - p ); + else + { + if (p > ret) p--; + *p = 0; + } + } + + RtlLeaveCriticalSection( &dlldir_section ); + return ret; +} + + +/****************************************************************** * load_library_as_datafile */ static BOOL load_library_as_datafile( LPCWSTR name, HMODULE *hmod, DWORD flags ) @@ -1050,18 +1120,25 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; - static const DWORD unsupported_flags = load_library_search_flags | - LOAD_IGNORE_CODE_AUTHZ_LEVEL | - LOAD_LIBRARY_AS_IMAGE_RESOURCE | - LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | + LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); + const DWORD unsupported_flags = (LOAD_IGNORE_CODE_AUTHZ_LEVEL | + LOAD_LIBRARY_AS_IMAGE_RESOURCE | + LOAD_LIBRARY_REQUIRE_SIGNED_TARGET); if (!(flags & load_library_search_flags)) flags |= default_search_flags; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); - load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + if (flags & load_library_search_flags) + load_path = get_dll_load_path_search_flags( libname->Buffer, flags ); + else + load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL ); + if (!load_path) return 0; if (flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE)) {

1 0

Alexandre Julliard : kernel32/tests: Add tests for the LOAD_LIBRARY_SEARCH_* flags.
by Alexandre Julliard 29 Aug '17

29 Aug '17

Module: wine Branch: master Commit: 934cb440e0b8f07316aa6e9d0bf31e35ebdcc86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=934cb440e0b8f07316aa6e9d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 10:50:17 2017 +0200 kernel32/tests: Add tests for the LOAD_LIBRARY_SEARCH_* flags. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 214 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 560a147..bfe94b9 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -20,6 +20,7 @@ #include "wine/test.h" #include <windows.h> +#include <stdio.h> #include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); @@ -45,6 +46,89 @@ static BOOL cmpStrAW(const char* a, const WCHAR* b, DWORD lenA, DWORD lenB) return memcmp(aw, b, len * sizeof(WCHAR)) == 0; } +static const struct +{ + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS nt; + IMAGE_SECTION_HEADER section; +} dll_image = +{ + { IMAGE_DOS_SIGNATURE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0 }, 0, 0, { 0 }, + sizeof(IMAGE_DOS_HEADER) }, + { + IMAGE_NT_SIGNATURE, /* Signature */ + { +#if defined __i386__ + IMAGE_FILE_MACHINE_I386, /* Machine */ +#elif defined __x86_64__ + IMAGE_FILE_MACHINE_AMD64, /* Machine */ +#elif defined __powerpc__ + IMAGE_FILE_MACHINE_POWERPC, /* Machine */ +#elif defined __arm__ + IMAGE_FILE_MACHINE_ARMNT, /* Machine */ +#elif defined __aarch64__ + IMAGE_FILE_MACHINE_ARM64, /* Machine */ +#else +# error You must specify the machine type +#endif + 1, /* NumberOfSections */ + 0, /* TimeDateStamp */ + 0, /* PointerToSymbolTable */ + 0, /* NumberOfSymbols */ + sizeof(IMAGE_OPTIONAL_HEADER), /* SizeOfOptionalHeader */ + IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_DLL /* Characteristics */ + }, + { IMAGE_NT_OPTIONAL_HDR_MAGIC, /* Magic */ + 1, /* MajorLinkerVersion */ + 0, /* MinorLinkerVersion */ + 0, /* SizeOfCode */ + 0, /* SizeOfInitializedData */ + 0, /* SizeOfUninitializedData */ + 0, /* AddressOfEntryPoint */ + 0x1000, /* BaseOfCode */ +#ifndef _WIN64 + 0, /* BaseOfData */ +#endif + 0x10000000, /* ImageBase */ + 0x1000, /* SectionAlignment */ + 0x1000, /* FileAlignment */ + 4, /* MajorOperatingSystemVersion */ + 0, /* MinorOperatingSystemVersion */ + 1, /* MajorImageVersion */ + 0, /* MinorImageVersion */ + 4, /* MajorSubsystemVersion */ + 0, /* MinorSubsystemVersion */ + 0, /* Win32VersionValue */ + 0x2000, /* SizeOfImage */ + sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS), /* SizeOfHeaders */ + 0, /* CheckSum */ + IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ + 0, /* DllCharacteristics */ + 0, /* SizeOfStackReserve */ + 0, /* SizeOfStackCommit */ + 0, /* SizeOfHeapReserve */ + 0, /* SizeOfHeapCommit */ + 0, /* LoaderFlags */ + 0, /* NumberOfRvaAndSizes */ + { { 0 } } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ + } + }, + { ".rodata", { 0 }, 0x1000, 0x1000, 0, 0, 0, 0, 0, + IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ } +}; + +static void create_test_dll( const char *name ) +{ + DWORD dummy; + HANDLE handle = CreateFileA( name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0 ); + + ok( handle != INVALID_HANDLE_VALUE, "failed to create file err %u\n", GetLastError() ); + WriteFile( handle, &dll_image, sizeof(dll_image), &dummy, NULL ); + SetFilePointer( handle, dll_image.nt.OptionalHeader.SizeOfImage, NULL, FILE_BEGIN ); + SetEndOfFile( handle ); + CloseHandle( handle ); +} + static void testGetModuleFileName(const char* name) { HMODULE hMod; @@ -410,6 +494,132 @@ static void testLoadLibraryEx(void) FreeLibrary(hmodule); } +static void test_LoadLibraryEx_search_flags(void) +{ + static const struct + { + int add_dirs[4]; + int dll_dir; + int expect; + } tests[] = + { + { { 1, 2, 3 }, 4, 3 }, /* 0 */ + { { 1, 3, 2 }, 4, 2 }, + { { 3, 1 }, 4, 1 }, + { { 5, 6 }, 4, 4 }, + { { 5, 2 }, 4, 2 }, + { { 0 }, 4, 4 }, /* 5 */ + { { 0 }, 0, 0 }, + { { 6, 5 }, 5, 0 }, + { { 1, 1, 2 }, 0, 2 }, + }; + char *p, path[MAX_PATH], buf[MAX_PATH]; + WCHAR bufW[MAX_PATH]; + DLL_DIRECTORY_COOKIE cookies[4]; + unsigned int i, j, k; + BOOL ret; + HMODULE mod; + + if (!pAddDllDirectory || !pSetDllDirectoryA) return; + + GetTempPathA( sizeof(path), path ); + GetTempFileNameA( path, "tmp", 0, buf ); + DeleteFileA( buf ); + ret = CreateDirectoryA( buf, NULL ); + ok( ret, "CreateDirectory failed err %u\n", GetLastError() ); + p = buf + strlen( buf ); + for (i = 1; i <= 6; i++) + { + sprintf( p, "\\%u", i ); + ret = CreateDirectoryA( buf, NULL ); + ok( ret, "CreateDirectory failed err %u\n", GetLastError() ); + if (i >= 5) continue; /* dirs 5 and 6 are left empty */ + sprintf( p, "\\%u\\winetestdll.dll", i ); + create_test_dll( buf ); + } + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "foo\\winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "\\windows\\winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !mod, "LoadLibrary succeeded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + for (j = 0; j < sizeof(tests) / sizeof(tests[0]); j++) + { + for (k = 0; tests[j].add_dirs[k]; k++) + { + sprintf( p, "\\%u", tests[j].add_dirs[k] ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, bufW, MAX_PATH ); + cookies[k] = pAddDllDirectory( bufW ); + ok( cookies[k] != NULL, "failed to add %s\n", buf ); + } + if (tests[j].dll_dir) + { + sprintf( p, "\\%u", tests[j].dll_dir ); + pSetDllDirectoryA( buf ); + } + else pSetDllDirectoryA( NULL ); + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "winetestdll.dll", 0, LOAD_LIBRARY_SEARCH_USER_DIRS ); + if (tests[j].expect) + { + ok( mod != NULL, "%u: LoadLibrary failed err %u\n", j, GetLastError() ); + GetModuleFileNameA( mod, path, MAX_PATH ); + sprintf( p, "\\%u\\winetestdll.dll", tests[j].expect ); + ok( !lstrcmpiA( path, buf ), "%u: wrong module %s expected %s\n", j, path, buf ); + } + else + { + ok( !mod, "%u: LoadLibrary succeeded\n", j ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND || broken(GetLastError() == ERROR_NOT_ENOUGH_MEMORY), + "%u: wrong error %u\n", j, GetLastError() ); + } + FreeLibrary( mod ); + + for (k = 0; tests[j].add_dirs[k]; k++) pRemoveDllDirectory( cookies[k] ); + } + + for (i = 1; i <= 6; i++) + { + sprintf( p, "\\%u\\winetestdll.dll", i ); + DeleteFileA( buf ); + sprintf( p, "\\%u", i ); + RemoveDirectoryA( buf ); + } + *p = 0; + RemoveDirectoryA( buf ); +} + static void testGetDllDirectory(void) { CHAR bufferA[MAX_PATH]; @@ -814,6 +1024,9 @@ static void test_SetDefaultDllDirectories(void) mod = LoadLibraryA( "authz.dll" ); ok( mod != NULL, "loading authz failed\n" ); FreeLibrary( mod ); + mod = LoadLibraryExA( "authz.dll", 0, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); mod = LoadLibraryA( "authz.dll" ); @@ -881,6 +1094,7 @@ START_TEST(module) testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); testLoadLibraryEx(); + test_LoadLibraryEx_search_flags(); testGetModuleHandleEx(); testK32GetModuleInformation(); test_AddDllDirectory();

1 0