wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Matteo Bruni : d3dcompiler: Declare predefined data types.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: e7a9218ef1d7cdc12f3de26b021f0425ed04ca2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a9218ef1d7cdc12f3de26b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:05 2012 +0200 d3dcompiler: Declare predefined data types. --- dlls/d3dcompiler_43/hlsl.y | 71 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 +++++- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 7ed50b4..35c9a4c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -175,6 +175,76 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +{ + if (get_type(scope, def->name, FALSE)) + return FALSE; + + list_add_tail(&scope->types, &def->scope_entry); + return TRUE; +} + +static void declare_predefined_types(struct hlsl_scope *scope) +{ + struct hlsl_type *type; + unsigned int x, y, bt; + static const char *names[] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + char name[10]; + + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", names[bt], x, y); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); + add_type_to_scope(scope, type); + + if (y == 1) + { + sprintf(name, "%s%u", names[bt], x); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); + add_type_to_scope(scope, type); + + if (x == 1) + { + sprintf(name, "%s", names[bt]); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); + add_type_to_scope(scope, type); + } + } + } + } + } + + /* DX8 effects predefined types */ + type = new_hlsl_type(d3dcompiler_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); + add_type_to_scope(scope, type); +} + static unsigned int components_count_expr_list(struct list *list) { struct hlsl_ir_node *node; @@ -1486,6 +1556,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino push_scope(&hlsl_ctx); hlsl_ctx.globals = hlsl_ctx.cur_scope; + declare_predefined_types(hlsl_ctx.globals); hlsl_parse(); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ad7887a..f288efc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -860,7 +860,15 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { - FIXME("stub.\n"); + struct hlsl_type *type; + + LIST_FOR_EACH_ENTRY(type, &scope->types, struct hlsl_type, scope_entry) + { + if (strcmp(type->name, name) == 0) + return type; + } + if (recursive && scope->upper) + return get_type(scope->upper, name, recursive); return NULL; }

1 0

Dmitry Timoshkov : gdiplus: Add some tests for GIF properties.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 058963282e0938bdff470f1b4bae8e7dbe56333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=058963282e0938bdff470f1b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 13:02:36 2012 +0900 gdiplus: Add some tests for GIF properties. --- dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusimaging.h | 3 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 95dd2cd..e373a8c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3920,6 +3920,99 @@ static void test_DrawImage_scale(void) expect(Ok, status); } +static void test_gif_properties(void) +{ + static const struct test_data + { + ULONG type, id, length; + const BYTE value[12]; + } td[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,10,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0,0,0,0xff,0xff,0xff,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 0 } } + }; + GpStatus status; + GpImage *image; + GUID guid; + UINT dim_count, frame_count, prop_count, prop_size, i; + PROPID *prop_id; + PropertyItem *prop_item; + + image = load_image(gifanimation, sizeof(gifanimation)); + ok(image != 0, "Failed to load GIF image data\n"); + if (!image) return; + + status = GdipImageGetFrameDimensionsCount(image, &dim_count); + expect(Ok, status); + expect(1, dim_count); + + status = GdipImageGetFrameDimensionsList(image, &guid, 1); + expect(Ok, status); + expect_guid(&FrameDimensionTime, &guid, __LINE__, FALSE); + + status = GdipImageGetFrameCount(image, &guid, &frame_count); + expect(Ok, status); + expect(2, frame_count); + + status = GdipGetPropertyCount(image, &prop_count); + expect(Ok, status); +todo_wine + ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, + "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + + if (prop_count != sizeof(td)/sizeof(td[0])) + { + GdipDisposeImage(image); + return; + } + + prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + + status = GdipGetPropertyIdList(image, prop_count, prop_id); + expect(Ok, status); + + for (i = 0; i < prop_count; i++) + { + status = GdipGetPropertyItemSize(image, prop_id[i], &prop_size); + expect(Ok, status); + if (status != Ok) break; + ok(prop_size > sizeof(*prop_item), "%u: too small item length %u\n", i, prop_size); + + prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, prop_size); + status = GdipGetPropertyItem(image, prop_id[i], prop_size, prop_item); + expect(Ok, status); + ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value); + ok(td[i].type == prop_item->type, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type); + ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); + prop_size -= sizeof(*prop_item); + ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); + ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); + if (td[i].length == prop_item->length) + { + int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; + ok(match || broken(td[i].length <= 4 && !match), "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item->value; + printf("id %#x:", prop_item->id); + for (j = 0; j < prop_item->length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + HeapFree(GetProcessHeap(), 0, prop_item); + } + + HeapFree(GetProcessHeap(), 0, prop_id); + + GdipDisposeImage(image); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3940,6 +4033,7 @@ START_TEST(image) test_tiff_palette(); test_GdipGetAllPropertyItems(); test_tiff_properties(); + test_gif_properties(); test_image_properties(); test_Scan0(); test_FromGdiDib(); diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 7c199c3..93114d9 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -364,6 +364,9 @@ typedef struct PropertyItem #define PropertyTagFrameDelay 0x5100 #define PropertyTagLoopCount 0x5101 +#define PropertyTagGlobalPalette 0x5102 +#define PropertyTagIndexBackground 0x5103 +#define PropertyTagIndexTransparent 0x5104 #define PropertyTagPixelUnit 0x5110 #define PropertyTagPixelPerUnitX 0x5111

1 0

Dmitry Timoshkov : gdiplus: Add preliminary support for pixel offset modes.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 4d42626dbe265e700bb72420a1d6a683bfbcf16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d42626dbe265e700bb72420a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 12:04:59 2012 +0900 gdiplus: Add preliminary support for pixel offset modes. --- dlls/gdiplus/graphics.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e986c94..7e16460 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -836,7 +836,7 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT width, UINT height, GpPointF *point, GDIPCONST GpImageAttributes *attributes, - InterpolationMode interpolation) + InterpolationMode interpolation, PixelOffsetMode offset_mode) { static int fixme; @@ -881,8 +881,25 @@ static ARGB resample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT return blend_colors(top, bottom, point->Y - topyf); } case InterpolationModeNearestNeighbor: + { + FLOAT pixel_offset; + switch (offset_mode) + { + default: + case PixelOffsetModeNone: + case PixelOffsetModeHighSpeed: + pixel_offset = 0.5; + break; + + case PixelOffsetModeHalf: + case PixelOffsetModeHighQuality: + pixel_offset = 0.0; + break; + } return sample_bitmap_pixel(src_rect, bits, width, height, - gdip_round(point->X), gdip_round(point->Y), attributes); + floorf(point->X + pixel_offset), floorf(point->Y + pixel_offset), attributes); + } + } } @@ -1176,7 +1193,8 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, argb_pixels[x + y*cdwStride] = resample_bitmap_pixel( &src_area, fill->bitmap_bits, bitmap->width, bitmap->height, - &point, fill->imageattributes, graphics->interpolation); + &point, fill->imageattributes, graphics->interpolation, + graphics->pixeloffset); } } } @@ -3122,6 +3140,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image LPBYTE src_data, dst_data; BitmapData lockeddata; InterpolationMode interpolation = graphics->interpolation; + PixelOffsetMode offset_mode = graphics->pixeloffset; GpPointF dst_to_src_points[3] = {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}; REAL x_dx, x_dy, y_dx, y_dy; static const GpImageAttributes defaultImageAttributes = {WrapModeClamp, 0, FALSE}; @@ -3228,7 +3247,8 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_color = (ARGB*)(dst_data + dst_stride * (y - dst_area.top) + sizeof(ARGB) * (x - dst_area.left)); if (src_pointf.X >= srcx && src_pointf.X < srcx + srcwidth && src_pointf.Y >= srcy && src_pointf.Y < srcy+srcheight) - *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, imageAttributes, interpolation); + *dst_color = resample_bitmap_pixel(&src_area, src_data, bitmap->width, bitmap->height, &src_pointf, + imageAttributes, interpolation, offset_mode); else *dst_color = 0; }

1 0

Dmitry Timoshkov : gdiplus: Add some tests for scaling an image with various pixel offset modes.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 556bdf249e9108f465cea404d034b899002a8492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=556bdf249e9108f465cea404d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 12:03:41 2012 +0900 gdiplus: Add some tests for scaling an image with various pixel offset modes. --- dlls/gdiplus/tests/image.c | 54 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 45ac01f..95dd2cd 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3808,19 +3808,53 @@ static void test_DrawImage_scale(void) 0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; static const BYTE image_250[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80, 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40 }; + static const BYTE image_120_half[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_150_half[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_200_half[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_250_half[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40 }; static const struct test_data { REAL scale_x; + PixelOffsetMode pixel_offset_mode; const BYTE *image; + BOOL todo; } td[] = { - { 0.8, image_080 }, - { 1.0, image_100 }, - { 1.2, image_120 }, - { 1.5, image_150 }, - { 1.8, image_180 }, - { 2.0, image_200 }, - { 2.5, image_250 } + { 0.8, PixelOffsetModeNone, image_080 }, /* 0 */ + { 1.0, PixelOffsetModeNone, image_100 }, + { 1.2, PixelOffsetModeNone, image_120 }, + { 1.5, PixelOffsetModeNone, image_150 }, + { 1.8, PixelOffsetModeNone, image_180 }, + { 2.0, PixelOffsetModeNone, image_200 }, + { 2.5, PixelOffsetModeNone, image_250 }, + + { 0.8, PixelOffsetModeHighSpeed, image_080 }, /* 7 */ + { 1.0, PixelOffsetModeHighSpeed, image_100 }, + { 1.2, PixelOffsetModeHighSpeed, image_120 }, + { 1.5, PixelOffsetModeHighSpeed, image_150 }, + { 1.8, PixelOffsetModeHighSpeed, image_180 }, + { 2.0, PixelOffsetModeHighSpeed, image_200 }, + { 2.5, PixelOffsetModeHighSpeed, image_250 }, + + { 0.8, PixelOffsetModeHalf, image_080 }, /* 14 */ + { 1.0, PixelOffsetModeHalf, image_100 }, + { 1.2, PixelOffsetModeHalf, image_120_half, TRUE }, + { 1.5, PixelOffsetModeHalf, image_150_half, TRUE }, + { 1.8, PixelOffsetModeHalf, image_180 }, + { 2.0, PixelOffsetModeHalf, image_200_half, TRUE }, + { 2.5, PixelOffsetModeHalf, image_250_half, TRUE }, + + { 0.8, PixelOffsetModeHighQuality, image_080 }, /* 21 */ + { 1.0, PixelOffsetModeHighQuality, image_100 }, + { 1.2, PixelOffsetModeHighQuality, image_120_half, TRUE }, + { 1.5, PixelOffsetModeHighQuality, image_150_half, TRUE }, + { 1.8, PixelOffsetModeHighQuality, image_180 }, + { 2.0, PixelOffsetModeHighQuality, image_200_half, TRUE }, + { 2.5, PixelOffsetModeHighQuality, image_250_half, TRUE }, }; BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; BYTE dst_8x1[24]; @@ -3850,6 +3884,9 @@ static void test_DrawImage_scale(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { + status = GdipSetPixelOffsetMode(graphics, td[i].pixel_offset_mode); + expect(Ok, status); + status = GdipCreateMatrix2(td[i].scale_x, 0.0, 0.0, 1.0, 0.0, 0.0, &matrix); expect(Ok, status); status = GdipSetWorldTransform(graphics, matrix); @@ -3861,6 +3898,9 @@ static void test_DrawImage_scale(void) expect(Ok, status); match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; + if (!match && td[i].todo) + todo_wine ok(match, "%d: data should match\n", i); + else ok(match, "%d: data should match\n", i); if (!match) {

1 0

Alistair Leslie-Hughes : odbccu32: Add new dll.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: cee8a76ecc702340ddf96e527089e4d0dda32f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee8a76ecc702340ddf96e527… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 18 10:59:04 2012 +1000 odbccu32: Add new dll. --- configure | 1 + configure.ac | 1 + dlls/odbccu32/Makefile.in | 8 +++++++ dlls/odbccu32/odbccu32.spec | 37 ++++++++++++++++++++++++++++++++++++ dlls/odbccu32/odbccu32_main.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/odbccu32/version.rc | 27 ++++++++++++++++++++++++++ 6 files changed, 116 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 87f93f9..21044af 100755 --- a/configure +++ b/configure @@ -15593,6 +15593,7 @@ wine_fn_config_dll objsel enable_objsel wine_fn_config_dll odbc32 enable_odbc32 implib wine_fn_config_dll odbccp32 enable_odbccp32 implib wine_fn_config_test dlls/odbccp32/tests odbccp32_test +wine_fn_config_dll odbccu32 enable_odbccu32 wine_fn_config_dll ole2.dll16 enable_win16 wine_fn_config_dll ole2conv.dll16 enable_win16 wine_fn_config_dll ole2disp.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 8a69570..84b5de8 100644 --- a/configure.ac +++ b/configure.ac @@ -2866,6 +2866,7 @@ WINE_CONFIG_DLL(objsel) WINE_CONFIG_DLL(odbc32,,[implib]) WINE_CONFIG_DLL(odbccp32,,[implib]) WINE_CONFIG_TEST(dlls/odbccp32/tests) +WINE_CONFIG_DLL(odbccu32) WINE_CONFIG_DLL(ole2.dll16,enable_win16) WINE_CONFIG_DLL(ole2conv.dll16,enable_win16) WINE_CONFIG_DLL(ole2disp.dll16,enable_win16) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in new file mode 100644 index 0000000..cc8bf71 --- /dev/null +++ b/dlls/odbccu32/Makefile.in @@ -0,0 +1,8 @@ +MODULE = odbccu32.dll + +C_SRCS = \ + odbccu32_main.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32.spec b/dlls/odbccu32/odbccu32.spec new file mode 100644 index 0000000..e0dec29 --- /dev/null +++ b/dlls/odbccu32/odbccu32.spec @@ -0,0 +1,37 @@ + 4 stdcall SQLBindCol(long long long ptr long ptr) odbc32.SQLBindCol + 5 stdcall SQLCancel(long) odbc32.SQLCancel + 6 stub ReleaseCLStmtResources + 11 stdcall SQLExecDirect(long str long) odbc32.SQLExecDirect + 12 stdcall SQLExecute(long) odbc32.SQLExecute + 13 stdcall SQLFetch(long) odbc32.SQLFetch + 16 stdcall SQLFreeStmt(long long ) odbc32.SQLFreeStmt + 19 stdcall SQLPrepare(long str long) odbc32.SQLPrepare + 20 stdcall SQLRowCount(long ptr) odbc32.SQLRowCount + 23 stdcall SQLTransact(long long long) odbc32.SQLTransact + 26 stdcall SQLCloseCursor(long) odbc32.SQLCloseCursor + 29 stdcall SQLEndTran(long long long) odbc32.SQLEndTran + 30 stdcall SQLFetchScroll(long long long) odbc32.SQLFetchScroll + 31 stdcall SQLFreeHandle(long long) odbc32.SQLFreeHandle + 33 stdcall SQLGetDescField(long long long ptr long ptr) odbc32.SQLGetDescField + 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) odbc32.SQLGetDescRec + 38 stdcall SQLGetStmtAttr(long long ptr long ptr) odbc32.SQLGetStmtAttr + 39 stdcall SQLSetConnectAttr(long long ptr long) odbc32.SQLSetConnectAttr + 43 stdcall SQLGetData(long long long ptr long ptr) odbc32.SQLGetData + 45 stdcall SQLGetInfo(long long ptr long ptr) odbc32.SQLGetInfo + 46 stdcall SQLGetStmtOption(long long ptr) odbc32.SQLGetStmtOption + 48 stdcall SQLParamData(long ptr) odbc32.SQLParamData + 49 stdcall SQLPutData(long ptr long) odbc32.SQLPutData + 50 stdcall SQLSetConnectOption(long long long) odbc32.SQLSetConnectOption + 51 stdcall SQLSetStmtOption(long long long) odbc32.SQLSetStmtOption + 59 stdcall SQLExtendedFetch(long long long ptr ptr) odbc32.SQLExtendedFetch + 61 stdcall SQLMoreResults(long) odbc32.SQLMoreResults + 62 stdcall SQLNativeSql(long str long str long ptr) odbc32.SQLNativeSql + 63 stdcall SQLNumParams(long ptr) odbc32.SQLNumParams + 64 stdcall SQLParamOptions(long long ptr) odbc32.SQLParamOptions + 68 stdcall SQLSetPos(long long long long) odbc32.SQLSetPos + 69 stdcall SQLSetScrollOptions(long long long long) odbc32.SQLSetScrollOptions + 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) odbc32.SQLBindParameter + 73 stdcall SQLSetDescField(long long long ptr long) odbc32.SQLSetDescField + 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) odbc32.SQLSetDescRec + 76 stdcall SQLSetStmtAttr(long long ptr long) odbc32.SQLSetStmtAttr + 78 stdcall SQLBulkOperations(long long) odbc32.SQLBulkOperations diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c new file mode 100644 index 0000000..09abf2b --- /dev/null +++ b/dlls/odbccu32/odbccu32_main.c @@ -0,0 +1,42 @@ +/* + * ODBC Cursor Library + * + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/odbccu32/version.rc b/dlls/odbccu32/version.rc new file mode 100644 index 0000000..bc1e6f2 --- /dev/null +++ b/dlls/odbccu32/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2012 Alistair Leslie-Hughes + * + * 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ODBC Cursor Library" +#define WINE_FILENAME_STR "odbcu32.dll" +#define WINE_FILEVERSION 6,1,7601,17632 +#define WINE_FILEVERSION_STR "6.1.7601.17632" +#define WINE_PRODUCTVERSION 6,1,7601,17632 +#define WINE_PRODUCTVERSION_STR "6.1.7601.17632" + +#include "wine/wine_common_ver.rc"

1 0

Erich Hoover : ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: b0cefe897c6dbd846b0525e3f3aab59cae75eb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cefe897c6dbd846b0525e3f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Sep 17 14:18:39 2012 -0600 ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx. --- dlls/ddraw/main.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e98b533..6d0ddc4 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -374,6 +374,8 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) ***********************************************************************/ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { + struct wined3d *wined3d; + TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | @@ -384,23 +386,50 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex if (flags) FIXME("flags 0x%08x not handled\n", flags); - TRACE("Enumerating default DirectDraw HAL interface\n"); + TRACE("Enumerating ddraw interfaces\n"); + wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); - /* We only have one driver by now */ __TRY { + /* QuickTime expects the description "DirectDraw HAL" */ static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - - /* QuickTime expects the description "DirectDraw HAL" */ - callback(NULL, driver_desc, driver_name, context, 0); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr = S_OK; + UINT adapter = 0; + BOOL cont_enum; + + /* The Battle.net System Checker expects both a NULL device and a GUID-based device */ + TRACE("Default interface: DirectDraw HAL\n"); + cont_enum = callback(NULL, driver_desc, driver_name, context, 0); + for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) + { + char DriverName[512] = ""; + + /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the + * Driver Name, so obtain the DeviceName and GUID from D3D. */ + memset(&adapter_id, 0x0, sizeof(adapter_id)); + adapter_id.device_name = DriverName; + adapter_id.device_name_size = sizeof(DriverName); + wined3d_mutex_lock(); + hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); + wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); + cont_enum = callback(&adapter_id.device_identifier, driver_desc, + adapter_id.device_name, context, 0); + } + } } __EXCEPT_PAGE_FAULT { + wined3d_decref(wined3d); return DDERR_INVALIDPARAMS; } __ENDTRY; + wined3d_decref(wined3d); TRACE("End of enumeration\n"); return DD_OK; }

1 0

Erich Hoover : ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 83b02573cc498176c222dd877aabb53597846335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b02573cc498176c222dd877… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Sep 17 14:17:40 2012 -0600 ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx. --- dlls/ddraw/main.c | 52 ++++++++++++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 61e8ec9..e98b533 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -46,6 +46,22 @@ static HINSTANCE instance; /* value of ForceRefreshRate */ DWORD force_refresh_rate = 0; +/* Structure for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +struct callback_info +{ + LPDDENUMCALLBACKA callback; + void *context; +}; + +/* Enumeration callback for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ +static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *driver_name, + void *context, HMONITOR monitor) +{ + const struct callback_info *info = context; + + return info->callback(guid, description, driver_name, info->context); +} + /* Handle table functions */ BOOL ddraw_handle_table_init(struct ddraw_handle_table *t, UINT initial_size) { @@ -336,27 +352,15 @@ DirectDrawCreateEx(GUID *guid, * * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) +HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) { - TRACE("callback %p, context %p.\n", Callback, Context); - - TRACE(" Enumerating default DirectDraw HAL interface\n"); - /* We only have one driver */ - __TRY - { - static CHAR driver_desc[] = "DirectDraw HAL", - driver_name[] = "display"; + struct callback_info info; - Callback(NULL, driver_desc, driver_name, Context); - } - __EXCEPT_PAGE_FAULT - { - return DDERR_INVALIDPARAMS; - } - __ENDTRY + TRACE("callback %p, context %p.\n", callback, context); - TRACE(" End of enumeration\n"); - return DD_OK; + info.callback = callback; + info.context = context; + return DirectDrawEnumerateExA(enum_callback, &info, 0x0); } /*********************************************************************** @@ -368,17 +372,17 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, void *Context) * The Flag member is not supported right now. * ***********************************************************************/ -HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Context, DWORD Flags) +HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { - TRACE("callback %p, context %p, flags %#x.\n", Callback, Context, Flags); + TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); - if (Flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | + if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | DDENUM_DETACHEDSECONDARYDEVICES | DDENUM_NONDISPLAYDEVICES)) return DDERR_INVALIDPARAMS; - if (Flags) - FIXME("flags 0x%08x not handled\n", Flags); + if (flags) + FIXME("flags 0x%08x not handled\n", flags); TRACE("Enumerating default DirectDraw HAL interface\n"); @@ -389,7 +393,7 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, void *Contex driver_name[] = "display"; /* QuickTime expects the description "DirectDraw HAL" */ - Callback(NULL, driver_desc, driver_name, Context, 0); + callback(NULL, driver_desc, driver_name, context, 0); } __EXCEPT_PAGE_FAULT {

1 0

Piotr Caban : wininet/tests: Remove all temporary files.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 95a4f3dd6d6d2fee277c2bd035acd1d9287095db URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a4f3dd6d6d2fee277c2bd03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:51 2012 +0200 wininet/tests: Remove all temporary files. --- dlls/wininet/tests/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 8c5c988..4118220 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -358,6 +358,8 @@ static void test_urlcacheA(void) ret = CreateUrlCacheEntry(TEST_URL, 0, "html", filenameA1, 0); ok(ret, "CreateUrlCacheEntry failed with error %d\n", GetLastError()); + check_file_exists(filenameA1); + DeleteFileA(filenameA1); ok(lstrcmpiA(filenameA, filenameA1), "expected a different file name\n");

1 0

Piotr Caban : wininet: Set entry type based on container type.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 65034ce2a45fbd2280364cb5836e397d9175b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65034ce2a45fbd2280364cb58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:31 2012 +0200 wininet: Set entry type based on container type. --- dlls/wininet/tests/urlcache.c | 3 --- dlls/wininet/urlcache.c | 17 +++++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 443caf0..8c5c988 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -377,7 +377,6 @@ static void test_urlcacheA(void) "expected zero ExpireTime\n"); ok(!memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected zero LastModifiedTime\n"); - todo_wine ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -406,7 +405,6 @@ static void test_urlcacheA(void) "expected positive ExpireTime\n"); ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); - todo_wine ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -515,7 +513,6 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* with the previous entry type retained.. */ - todo_wine ok(lpCacheEntryInfo->CacheEntryType & NORMAL_CACHE_ENTRY, "expected cache entry type NORMAL_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2b0ebf4..04ffd90 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -186,6 +186,7 @@ typedef struct _URLCACHECONTAINER HANDLE hMapping; /* handle of file mapping */ DWORD file_size; /* size of file when mapping was opened */ HANDLE hMutex; /* handle of mutex */ + DWORD default_entry_type; } URLCACHECONTAINER; @@ -475,7 +476,8 @@ static void URLCacheContainer_CloseIndex(URLCACHECONTAINER * pContainer) pContainer->hMapping = NULL; } -static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, LPWSTR mutex_name) +static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, + LPCWSTR path, DWORD default_entry_type, LPWSTR mutex_name) { URLCACHECONTAINER * pContainer = heap_alloc(sizeof(URLCACHECONTAINER)); int cache_prefix_len = strlenW(cache_prefix); @@ -487,6 +489,7 @@ static BOOL URLCacheContainers_AddContainer(LPCWSTR cache_prefix, LPCWSTR path, pContainer->hMapping = NULL; pContainer->file_size = 0; + pContainer->default_entry_type = default_entry_type; pContainer->path = heap_strdupW(path); if (!pContainer->path) @@ -545,11 +548,12 @@ void URLCacheContainers_CreateDefaults(void) int nFolder; /* CSIDL_* constant */ const WCHAR * shpath_suffix; /* suffix on path returned by SHGetSpecialFolderPath */ const WCHAR * cache_prefix; /* prefix used to reference the container */ + DWORD default_entry_type; } DefaultContainerData[] = { - { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix }, - { CSIDL_HISTORY, HistorySuffix, HistoryPrefix }, - { CSIDL_COOKIES, CookieSuffix, CookiePrefix }, + { CSIDL_INTERNET_CACHE, UrlSuffix, UrlPrefix, NORMAL_CACHE_ENTRY }, + { CSIDL_HISTORY, HistorySuffix, HistoryPrefix, URLHISTORY_CACHE_ENTRY }, + { CSIDL_COOKIES, CookieSuffix, CookiePrefix, COOKIE_CACHE_ENTRY }, }; DWORD i; @@ -585,7 +589,8 @@ void URLCacheContainers_CreateDefaults(void) wszCachePath[path_len + suffix_len + 2] = '\0'; } - URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, wszMutexName); + URLCacheContainers_AddContainer(DefaultContainerData[i].cache_prefix, wszCachePath, + DefaultContainerData[i].default_entry_type, wszMutexName); } } @@ -2858,7 +2863,7 @@ static BOOL CommitUrlCacheEntryInternal( url_entry_offset = (LPBYTE)pUrlEntry - (LPBYTE)pHeader; pUrlEntry->CacheFileEntry.dwSignature = URL_SIGNATURE; pUrlEntry->CacheDir = cDirectory; - pUrlEntry->CacheEntryType = CacheEntryType; + pUrlEntry->CacheEntryType = CacheEntryType | pContainer->default_entry_type; pUrlEntry->dwHeaderInfoSize = dwHeaderSize; if ((CacheEntryType & STICKY_CACHE_ENTRY) && !exempt_delta) {

1 0

Piotr Caban : wininet: Added support for cache entries overwriting.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 8f2b0fdf526ef9e53af0fc5a4cc601d9b70b4af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2b0fdf526ef9e53af0fc5a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 18 14:44:14 2012 +0200 wininet: Added support for cache entries overwriting. --- dlls/wininet/tests/urlcache.c | 14 ++++---------- dlls/wininet/urlcache.c | 20 +++++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 4238c60..443caf0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -363,7 +363,7 @@ static void test_urlcacheA(void) create_and_write_file(filenameA, &zero_byte, sizeof(zero_byte)); - ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, NULL, 0, "html", NULL); + ret = CommitUrlCacheEntry(TEST_URL1, NULL, filetime_zero, filetime_zero, NORMAL_CACHE_ENTRY, NULL, 0, "html", NULL); ok(ret, "CommitUrlCacheEntry failed with error %d\n", GetLastError()); cbCacheEntryInfo = 0; ret = GetUrlCacheEntryInfo(TEST_URL1, NULL, &cbCacheEntryInfo); @@ -377,6 +377,7 @@ static void test_urlcacheA(void) "expected zero ExpireTime\n"); ok(!memcmp(&lpCacheEntryInfo->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected zero LastModifiedTime\n"); + todo_wine ok(lpCacheEntryInfo->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", @@ -401,32 +402,27 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL1, lpCacheEntryInfo2, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* but it does change the time.. */ - todo_wine ok(memcmp(&lpCacheEntryInfo2->ExpireTime, &filetime_zero, sizeof(FILETIME)), "expected positive ExpireTime\n"); - todo_wine ok(memcmp(&lpCacheEntryInfo2->LastModifiedTime, &filetime_zero, sizeof(FILETIME)), "expected positive LastModifiedTime\n"); + todo_wine ok(lpCacheEntryInfo2->CacheEntryType == (NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY) || broken(lpCacheEntryInfo2->CacheEntryType == NORMAL_CACHE_ENTRY /* NT4/W2k */), "expected type NORMAL_CACHE_ENTRY|URLHISTORY_CACHE_ENTRY, got %08x\n", lpCacheEntryInfo2->CacheEntryType); /* and set the headers. */ - todo_wine ok(lpCacheEntryInfo2->dwHeaderInfoSize == 19, "expected headers size 19, got %d\n", lpCacheEntryInfo2->dwHeaderInfoSize); /* Hit rate gets incremented by 1 */ - todo_wine ok((lpCacheEntryInfo->dwHitRate + 1) == lpCacheEntryInfo2->dwHitRate, "HitRate not incremented by one on commit\n"); /* Last access time should be updated */ - todo_wine ok(!(lpCacheEntryInfo->LastAccessTime.dwHighDateTime == lpCacheEntryInfo2->LastAccessTime.dwHighDateTime && lpCacheEntryInfo->LastAccessTime.dwLowDateTime == lpCacheEntryInfo2->LastAccessTime.dwLowDateTime), "Last accessed time was not updated by commit\n"); /* File extension should be unset */ - todo_wine ok(lpCacheEntryInfo2->lpszFileExtension == NULL, "Fileextension isn't unset: %s\n", lpCacheEntryInfo2->lpszFileExtension); @@ -519,16 +515,15 @@ static void test_urlcacheA(void) ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); /* with the previous entry type retained.. */ + todo_wine ok(lpCacheEntryInfo->CacheEntryType & NORMAL_CACHE_ENTRY, "expected cache entry type NORMAL_CACHE_ENTRY, got %d (0x%08x)\n", lpCacheEntryInfo->CacheEntryType, lpCacheEntryInfo->CacheEntryType); /* and the headers overwritten.. */ - todo_wine ok(!lpCacheEntryInfo->dwHeaderInfoSize, "expected headers size 0, got %d\n", lpCacheEntryInfo->dwHeaderInfoSize); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); /* and the previous filename shouldn't exist. */ - todo_wine check_file_not_exists(filenameA); check_file_exists(filenameA1); @@ -537,7 +532,6 @@ static void test_urlcacheA(void) ret = pDeleteUrlCacheEntryA(TEST_URL); ok(ret, "DeleteUrlCacheEntryA failed with error %d\n", GetLastError()); check_file_not_exists(filenameA); - todo_wine check_file_not_exists(filenameA1); /* Just in case, clean up files */ DeleteFileA(filenameA1); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e1d189e..2b0ebf4 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2693,6 +2693,8 @@ static BOOL CommitUrlCacheEntryInternal( LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; char *pchLocalFileName = 0; + DWORD hit_rate = 0; + DWORD exempt_delta = 0; DWORD error; TRACE("(%s, %s, ..., ..., %x, %p, %d, %s, %s)\n", @@ -2775,12 +2777,9 @@ static BOOL CommitUrlCacheEntryInternal( goto cleanup; } - FIXME("entry already in cache - don't know what to do!\n"); -/* - * SetLastError(ERROR_FILE_NOT_FOUND); - * return FALSE; - */ - goto cleanup; + hit_rate = pUrlEntry->dwHitRate; + exempt_delta = pUrlEntry->dwExemptDelta; + DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } if (lpszLocalFileName) @@ -2861,14 +2860,13 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->CacheDir = cDirectory; pUrlEntry->CacheEntryType = CacheEntryType; pUrlEntry->dwHeaderInfoSize = dwHeaderSize; - if (CacheEntryType & STICKY_CACHE_ENTRY) + if ((CacheEntryType & STICKY_CACHE_ENTRY) && !exempt_delta) { /* Sticky entries have a default exempt time of one day */ - pUrlEntry->dwExemptDelta = 86400; + exempt_delta = 86400; } - else - pUrlEntry->dwExemptDelta = 0; - pUrlEntry->dwHitRate = 0; + pUrlEntry->dwExemptDelta = exempt_delta; + pUrlEntry->dwHitRate = hit_rate+1; pUrlEntry->dwOffsetFileExtension = dwOffsetFileExtension; pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012