November 2011 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the COMPARISON_TYPE typedef.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: adf7c3302387a4000f1a5cde53315feffa277b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf7c3302387a4000f1a5cde5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:59 2011 +0100 wined3d: Get rid of the COMPARISON_TYPE typedef. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 25 +++++++++++++------------ dlls/wined3d/shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a4f2e68..19e565e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2943,34 +2943,34 @@ static void shader_hw_break(const struct wined3d_shader_instruction *ins) } } -static const char *get_compare(COMPARISON_TYPE flags) +static const char *get_compare(enum wined3d_shader_rel_op op) { - switch (flags) + switch (op) { - case COMPARISON_GT: return "GT"; - case COMPARISON_EQ: return "EQ"; - case COMPARISON_GE: return "GE"; - case COMPARISON_LT: return "LT"; - case COMPARISON_NE: return "NE"; - case COMPARISON_LE: return "LE"; + case WINED3D_SHADER_REL_OP_GT: return "GT"; + case WINED3D_SHADER_REL_OP_EQ: return "EQ"; + case WINED3D_SHADER_REL_OP_GE: return "GE"; + case WINED3D_SHADER_REL_OP_LT: return "LT"; + case WINED3D_SHADER_REL_OP_NE: return "NE"; + case WINED3D_SHADER_REL_OP_LE: return "LE"; default: - FIXME("Unrecognized comparison value: %u\n", flags); + FIXME("Unrecognized operator %#x.\n", op); return "(\?\?)"; } } -static COMPARISON_TYPE invert_compare(COMPARISON_TYPE flags) +static enum wined3d_shader_rel_op invert_compare(enum wined3d_shader_rel_op op) { - switch (flags) + switch (op) { - case COMPARISON_GT: return COMPARISON_LE; - case COMPARISON_EQ: return COMPARISON_NE; - case COMPARISON_GE: return COMPARISON_LT; - case COMPARISON_LT: return COMPARISON_GE; - case COMPARISON_NE: return COMPARISON_EQ; - case COMPARISON_LE: return COMPARISON_GT; + case WINED3D_SHADER_REL_OP_GT: return WINED3D_SHADER_REL_OP_LE; + case WINED3D_SHADER_REL_OP_EQ: return WINED3D_SHADER_REL_OP_NE; + case WINED3D_SHADER_REL_OP_GE: return WINED3D_SHADER_REL_OP_LT; + case WINED3D_SHADER_REL_OP_LT: return WINED3D_SHADER_REL_OP_GE; + case WINED3D_SHADER_REL_OP_NE: return WINED3D_SHADER_REL_OP_EQ; + case WINED3D_SHADER_REL_OP_LE: return WINED3D_SHADER_REL_OP_GT; default: - FIXME("Unrecognized comparison value: %u\n", flags); + FIXME("Unrecognized operator %#x.\n", op); return -1; } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6ccb94a..fc642c9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1634,17 +1634,18 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in } } -static inline const char *shader_get_comp_op(DWORD op) -{ - switch (op) { - case COMPARISON_GT: return ">"; - case COMPARISON_EQ: return "=="; - case COMPARISON_GE: return ">="; - case COMPARISON_LT: return "<"; - case COMPARISON_NE: return "!="; - case COMPARISON_LE: return "<="; +static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) +{ + switch (op) + { + case WINED3D_SHADER_REL_OP_GT: return ">"; + case WINED3D_SHADER_REL_OP_EQ: return "=="; + case WINED3D_SHADER_REL_OP_GE: return ">="; + case WINED3D_SHADER_REL_OP_LT: return "<"; + case WINED3D_SHADER_REL_OP_NE: return "!="; + case WINED3D_SHADER_REL_OP_LE: return "<="; default: - FIXME("Unrecognized comparison value: %u\n", op); + FIXME("Unrecognized operator %#x.\n", op); return "(\?\?)"; } } @@ -2958,7 +2959,7 @@ static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(ins->ctx->buffer, "if (%s %s %s) {\n", - src0_param.param_str, shader_get_comp_op(ins->flags), src1_param.param_str); + src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } static void shader_glsl_else(const struct wined3d_shader_instruction *ins) @@ -2981,7 +2982,7 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param); shader_addline(ins->ctx->buffer, "if (%s %s %s) break;\n", - src0_param.param_str, shader_get_comp_op(ins->flags), src1_param.param_str); + src0_param.param_str, shader_glsl_get_rel_op(ins->flags), src1_param.param_str); } static void shader_glsl_label(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b708e48..42c71ed 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1439,12 +1439,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { switch (ins.flags) { - case COMPARISON_GT: TRACE("_gt"); break; - case COMPARISON_EQ: TRACE("_eq"); break; - case COMPARISON_GE: TRACE("_ge"); break; - case COMPARISON_LT: TRACE("_lt"); break; - case COMPARISON_NE: TRACE("_ne"); break; - case COMPARISON_LE: TRACE("_le"); break; + case WINED3D_SHADER_REL_OP_GT: TRACE("_gt"); break; + case WINED3D_SHADER_REL_OP_EQ: TRACE("_eq"); break; + case WINED3D_SHADER_REL_OP_GE: TRACE("_ge"); break; + case WINED3D_SHADER_REL_OP_LT: TRACE("_lt"); break; + case WINED3D_SHADER_REL_OP_NE: TRACE("_ne"); break; + case WINED3D_SHADER_REL_OP_LE: TRACE("_le"); break; default: TRACE("_(%u)", ins.flags); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 07b94f8..11e0297 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -360,15 +360,15 @@ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE #define WINED3DSI_TEXLD_PROJECT 1 #define WINED3DSI_TEXLD_BIAS 2 -typedef enum COMPARISON_TYPE -{ - COMPARISON_GT = 1, - COMPARISON_EQ = 2, - COMPARISON_GE = 3, - COMPARISON_LT = 4, - COMPARISON_NE = 5, - COMPARISON_LE = 6, -} COMPARISON_TYPE; +enum wined3d_shader_rel_op +{ + WINED3D_SHADER_REL_OP_GT = 1, + WINED3D_SHADER_REL_OP_EQ = 2, + WINED3D_SHADER_REL_OP_GE = 3, + WINED3D_SHADER_REL_OP_LT = 4, + WINED3D_SHADER_REL_OP_NE = 5, + WINED3D_SHADER_REL_OP_LE = 6, +}; #define WINED3D_SM1_VS 0xfffe #define WINED3D_SM1_PS 0xffff

1 0

Thomas Faber : kernel32/tests: Add tests for GetDllDirectory.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 5d5fd2fa9b5bd76ebeaf34bd99956108a3cd1c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5fd2fa9b5bd76ebeaf34bd9… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Nov 8 19:42:18 2011 +0100 kernel32/tests: Add tests for GetDllDirectory. --- dlls/kernel32/tests/module.c | 117 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 07d5892..06cf557 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -21,6 +21,11 @@ #include "wine/test.h" #include <windows.h> +static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); +static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); + +static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); + static BOOL is_unicode_enabled = TRUE; static BOOL cmpStrAW(const char* a, const WCHAR* b, DWORD lenA, DWORD lenB) @@ -386,6 +391,114 @@ static void testLoadLibraryEx(void) } +static void testGetDllDirectory(void) +{ + CHAR bufferA[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + size_t length; + DWORD ret; + int i; + static const char *dll_directories[] = + { + "", + "C:\\Some\\Path", + "C:\\Some\\Path\\", + "Q:\\A\\Long\\Path with spaces that\\probably\\doesn't exist!", + }; + const int test_count = sizeof(dll_directories) / sizeof(dll_directories[0]); + + if (!pGetDllDirectoryA || !pGetDllDirectoryW) + { + win_skip("GetDllDirectory not available\n"); + return; + } + if (!pSetDllDirectoryA) + { + win_skip("SetDllDirectoryA not available\n"); + return; + } + + for (i = 0; i < test_count; i++) + { + length = strlen(dll_directories[i]); + if (!pSetDllDirectoryA(dll_directories[i])) + { + skip("i=%d, SetDllDirectoryA failed\n", i); + continue; + } + + /* no buffer, determine length */ + ret = pGetDllDirectoryA(0, NULL); + ok(ret == length + 1, "Expected %u, got %u\n", length + 1, ret); + + ret = pGetDllDirectoryW(0, NULL); + ok(ret == length + 1, "Expected %u, got %u\n", length + 1, ret); + + /* buffer of exactly the right size */ + bufferA[length] = 'A'; + bufferA[length + 1] = 'A'; + ret = pGetDllDirectoryA(length + 1, bufferA); + ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(bufferA[length + 1] == 'A', "i=%d, Buffer overflow\n", i); + ok(strcmp(bufferA, dll_directories[i]) == 0, "i=%d, Wrong path returned: '%s'\n", i, bufferA); + + bufferW[length] = 'A'; + bufferW[length + 1] = 'A'; + ret = pGetDllDirectoryW(length + 1, bufferW); + ok(ret == length, "i=%d, Expected %u, got %u\n", i, length, ret); + ok(bufferW[length + 1] == 'A', "i=%d, Buffer overflow\n", i); + ok(cmpStrAW(dll_directories[i], bufferW, length, length), + "i=%d, Wrong path returned: %s\n", i, wine_dbgstr_w(bufferW)); + + /* zero size buffer + * the A version always null-terminates the buffer, + * the W version doesn't do it on some platforms */ + bufferA[0] = 'A'; + ret = pGetDllDirectoryA(0, bufferA); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + + bufferW[0] = 'A'; + ret = pGetDllDirectoryW(0, bufferW); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferW[0] == 0 || /* XP, 2003 */ + broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); + + /* buffer just one too short */ + bufferA[0] = 'A'; + ret = pGetDllDirectoryA(length, bufferA); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferA[0] == 0, "i=%d, Buffer not null terminated\n", i); + + bufferW[0] = 'A'; + ret = pGetDllDirectoryW(length, bufferW); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + ok(bufferW[0] == 0 || /* XP, 2003 */ + broken(bufferW[0] == 'A'), "i=%d, Buffer overflow\n", i); + + /* no buffer, but too short length */ + ret = pGetDllDirectoryA(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + + ret = pGetDllDirectoryW(length, NULL); + ok(ret == length + 1, "i=%d, Expected %u, got %u\n", i, length + 1, ret); + } + + /* unset whatever we did so following tests won't be affected */ + pSetDllDirectoryA(NULL); +} + +static void init_pointers(void) +{ + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + +#define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hKernel32, #f)) + MAKEFUNC(GetDllDirectoryA); + MAKEFUNC(GetDllDirectoryW); + MAKEFUNC(SetDllDirectoryA); +#undef MAKEFUNC +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -400,10 +513,14 @@ START_TEST(module) is_unicode_enabled = FALSE; } + init_pointers(); + testGetModuleFileName(NULL); testGetModuleFileName("kernel32.dll"); testGetModuleFileName_Wrong(); + testGetDllDirectory(); + testLoadLibraryA(); testNestedLoadLibraryA(); testLoadLibraryA_Wrong();

1 0

Alexandre Julliard : gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 0c5d619bd38554d406b11973cdd5653192137025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5d619bd38554d406b11973c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:06:57 2011 +0100 gdi32: Use the CopyBitmap entry point to copy the bitmap of a pattern brush. --- dlls/gdi32/bitmap.c | 53 ---------------------------------------------- dlls/gdi32/brush.c | 16 +++++++++++++- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9042b88..282e22b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -510,59 +510,6 @@ LONG WINAPI SetBitmapBits( return count; } -/********************************************************************** - * BITMAP_CopyBitmap - * - */ -HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) -{ - HBITMAP res; - DIBSECTION dib; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (!bmp) return 0; - if (bmp->dib) - { - void *bits; - BITMAPINFO *bi; - HDC dc; - - dib = *bmp->dib; - GDI_ReleaseObj( hbitmap ); - dc = CreateCompatibleDC( NULL ); - - if (!dc) return 0; - if (!(bi = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) - { - DeleteDC( dc ); - return 0; - } - bi->bmiHeader = dib.dsBmih; - - /* Get the color table or the color masks */ - GetDIBits( dc, hbitmap, 0, 0, NULL, bi, DIB_RGB_COLORS ); - bi->bmiHeader.biHeight = dib.dsBmih.biHeight; - - res = CreateDIBSection( dc, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); - if (res) SetDIBits( dc, res, 0, dib.dsBm.bmHeight, dib.dsBm.bmBits, bi, DIB_RGB_COLORS ); - HeapFree( GetProcessHeap(), 0, bi ); - DeleteDC( dc ); - return res; - } - dib.dsBm = bmp->bitmap; - dib.dsBm.bmBits = NULL; - GDI_ReleaseObj( hbitmap ); - - res = CreateBitmapIndirect( &dib.dsBm ); - if(res) { - char *buf = HeapAlloc( GetProcessHeap(), 0, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight ); - GetBitmapBits (hbitmap, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - SetBitmapBits (res, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - HeapFree( GetProcessHeap(), 0, buf ); - } - return res; -} - static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index ccd1369..579e9fd 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -99,8 +99,22 @@ static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) if (!bmp->dib) { + if ((brush->bitmap = CreateBitmap( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, + bmp->bitmap.bmPlanes, bmp->bitmap.bmBitsPixel, NULL ))) + { + if (bmp->funcs->pCopyBitmap( bitmap, brush->bitmap )) + { + BITMAPOBJ *copy = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + copy->funcs = bmp->funcs; + GDI_ReleaseObj( copy ); + } + else + { + DeleteObject( brush->bitmap ); + brush->bitmap = 0; + } + } GDI_ReleaseObj( bitmap ); - brush->bitmap = BITMAP_CopyBitmap( bitmap ); return brush->bitmap != 0; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ab5cf25..3b3022a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Implement the CopyBitmap entry point.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: d9a45745a71f379d00aff0b06cf4923633a378e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a45745a71f379d00aff0b06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 22:04:00 2011 +0100 winex11: Implement the CopyBitmap entry point. --- dlls/winex11.drv/bitmap.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 10 +++++++++- 4 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index ea1c7ac..09da565 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -199,6 +199,42 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) } +/**************************************************************************** + * CopyBitmap (X11DRV.@) + */ +BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + X_PHYSBITMAP *phys_src, *phys_dst; + BITMAP bitmap; + + if (!(phys_src = X11DRV_get_phys_bitmap( src ))) return FALSE; + if (!GetObjectW( dst, sizeof(bitmap), &bitmap )) return FALSE; + + TRACE("%p->%p %dx%d %d bpp\n", src, dst, bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); + + if (!(phys_dst = X11DRV_init_phys_bitmap( dst ))) return FALSE; + + phys_dst->depth = phys_src->depth; + phys_dst->trueColor = phys_src->trueColor; + if (phys_dst->trueColor) phys_dst->color_shifts = phys_src->color_shifts; + + wine_tsx11_lock(); + phys_dst->pixmap = XCreatePixmap( gdi_display, root_window, + bitmap.bmWidth, bitmap.bmHeight, phys_dst->depth ); + XCopyArea( gdi_display, phys_src->pixmap, phys_dst->pixmap, + get_bitmap_gc(phys_dst->depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + wine_tsx11_unlock(); + + if (!phys_dst->pixmap) + { + WARN("Can't create Pixmap\n"); + HeapFree( GetProcessHeap(), 0, phys_dst ); + return FALSE; + } + return TRUE; +} + + /*********************************************************************** * DeleteBitmap (X11DRV.@) */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6574270..8d61b5b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,7 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + X11DRV_CopyBitmap, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1d6ce53..4967866 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -181,6 +181,7 @@ extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL X11DRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_CopyBitmap( HBITMAP src, HBITMAP dst ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *bmi, UINT usage ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 30b9553..7ba61a3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1276,6 +1276,14 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID } /**************************************************************************** + * xrenderdrv_CopyBitmap + */ +static BOOL xrenderdrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return X11DRV_CopyBitmap( src, dst ); +} + +/**************************************************************************** * xrenderdrv_CreateBitmap */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) @@ -3060,7 +3068,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ - NULL, /* pCopyBitmap */ + xrenderdrv_CopyBitmap, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSAMPLER_TEXTURE_TYPE typedef .
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 323a95418ed044a443946fec243278bb907111da URL: http://source.winehq.org/git/wine.git/?a=commit;h=323a95418ed044a443946fec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:58 2011 +0100 wined3d: Get rid of the WINED3DSAMPLER_TEXTURE_TYPE typedef. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b271f5b..db57c72 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2898,7 +2898,7 @@ static void device_map_fixed_function_samplers(struct wined3d_device *device, co static void device_map_psamplers(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) { - const WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = + const enum wined3d_sampler_texture_type *sampler_type = device->stateBlock->state.pixel_shader->reg_maps.sampler_type; unsigned int i; @@ -2915,8 +2915,8 @@ static void device_map_psamplers(struct wined3d_device *device, const struct win } static BOOL device_unit_free_for_vs(const struct wined3d_device *device, - const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_tokens, - const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_tokens, DWORD unit) + const enum wined3d_sampler_texture_type *pshader_sampler_tokens, + const enum wined3d_sampler_texture_type *vshader_sampler_tokens, DWORD unit) { DWORD current_mapping = device->rev_tex_unit_map[unit]; @@ -2941,9 +2941,9 @@ static BOOL device_unit_free_for_vs(const struct wined3d_device *device, static void device_map_vsamplers(struct wined3d_device *device, BOOL ps, const struct wined3d_gl_info *gl_info) { - const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_type = + const enum wined3d_sampler_texture_type *vshader_sampler_type = device->stateBlock->state.vertex_shader->reg_maps.sampler_type; - const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_type = NULL; + const enum wined3d_sampler_texture_type *pshader_sampler_type = NULL; int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 32ac385..6ccb94a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1652,7 +1652,7 @@ static inline const char *shader_get_comp_op(DWORD op) static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { - WINED3DSAMPLER_TEXTURE_TYPE sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; + enum wined3d_sampler_texture_type sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = shader_is_pshader_version(ctx->reg_maps->shader_version.type) && (((const struct shader_glsl_ctx_priv *)ctx->backend_data)->cur_ps_args->shadow & (1 << sampler_idx)); @@ -3036,7 +3036,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD flags = (priv->cur_ps_args->tex_transform >> sampler_idx * WINED3D_PSARGS_TEXTRANSFORM_SHIFT) & WINED3D_PSARGS_TEXTRANSFORM_MASK; - WINED3DSAMPLER_TEXTURE_TYPE sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; + enum wined3d_sampler_texture_type sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; /* Projected cube textures don't make a lot of sense, the resulting coordinates stay the same. */ if (flags & WINED3D_PSARGS_PROJECTED && sampler_type != WINED3DSTT_CUBE) { diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 334a2fd..b708e48 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2157,7 +2157,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de void pixelshader_update_samplers(struct wined3d_shader_reg_maps *reg_maps, struct wined3d_texture * const *textures) { - WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = reg_maps->sampler_type; + enum wined3d_sampler_texture_type *sampler_type = reg_maps->sampler_type; unsigned int i; if (reg_maps->shader_version.major != 1) return; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ef09e26..07b94f8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -277,14 +277,14 @@ struct wined3d_settings extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN; -typedef enum _WINED3DSAMPLER_TEXTURE_TYPE +enum wined3d_sampler_texture_type { WINED3DSTT_UNKNOWN = 0, WINED3DSTT_1D = 1, WINED3DSTT_2D = 2, WINED3DSTT_CUBE = 3, WINED3DSTT_VOLUME = 4, -} WINED3DSAMPLER_TEXTURE_TYPE; +}; typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE { @@ -544,7 +544,7 @@ struct wined3d_shader_reg_maps WORD local_int_consts; /* MAX_CONST_I, 16 */ WORD local_bool_consts; /* MAX_CONST_B, 16 */ - WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + enum wined3d_sampler_texture_type sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ @@ -637,7 +637,7 @@ struct wined3d_shader_semantic { WINED3DDECLUSAGE usage; UINT usage_idx; - WINED3DSAMPLER_TEXTURE_TYPE sampler_type; + enum wined3d_sampler_texture_type sampler_type; struct wined3d_shader_dst_param reg; };

1 0

Michael Stefaniuc : include: Fixup "long" numeric constants in vfw.h.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 84fac09bb05337f6e3c049a816a154d4afb56062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fac09bb05337f6e3c049a81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 8 23:33:03 2011 +0100 include: Fixup "long" numeric constants in vfw.h. --- include/vfw.h | 76 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/vfw.h b/include/vfw.h index c0689fb..a2dad18 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -167,7 +167,7 @@ typedef struct { /* 24: */ } ICOPEN,*LPICOPEN; -#define ICCOMPRESS_KEYFRAME 0x00000001L +#define ICCOMPRESS_KEYFRAME __MSABI_LONG(0x00000001) typedef struct { DWORD dwFlags; @@ -471,15 +471,15 @@ static inline LRESULT VFWAPI ICDecompressExQuery(HIC hic, DWORD dwFlags, #define ICDecompressExEnd(hic) \ ICSendMessage(hic, ICM_DECOMPRESSEX_END, 0, 0) -#define ICDRAW_QUERY 0x00000001L /* test for support */ -#define ICDRAW_FULLSCREEN 0x00000002L /* draw to full screen */ -#define ICDRAW_HDC 0x00000004L /* draw to a HDC/HWND */ -#define ICDRAW_ANIMATE 0x00000008L /* expect palette animation */ -#define ICDRAW_CONTINUE 0x00000010L /* draw is a continuation of previous draw */ -#define ICDRAW_MEMORYDC 0x00000020L /* DC is offscreen, by the way */ -#define ICDRAW_UPDATING 0x00000040L /* We're updating, as opposed to playing */ -#define ICDRAW_RENDER 0x00000080L /* used to render data not draw it */ -#define ICDRAW_BUFFER 0x00000100L /* buffer data offscreen, we will need to update it */ +#define ICDRAW_QUERY __MSABI_LONG(0x00000001) /* test for support */ +#define ICDRAW_FULLSCREEN __MSABI_LONG(0x00000002) /* draw to full screen */ +#define ICDRAW_HDC __MSABI_LONG(0x00000004) /* draw to a HDC/HWND */ +#define ICDRAW_ANIMATE __MSABI_LONG(0x00000008) /* expect palette animation */ +#define ICDRAW_CONTINUE __MSABI_LONG(0x00000010) /* draw is a continuation of previous draw */ +#define ICDRAW_MEMORYDC __MSABI_LONG(0x00000020) /* DC is offscreen, by the way */ +#define ICDRAW_UPDATING __MSABI_LONG(0x00000040) /* We're updating, as opposed to playing */ +#define ICDRAW_RENDER __MSABI_LONG(0x00000080) /* used to render data not draw it */ +#define ICDRAW_BUFFER __MSABI_LONG(0x00000100) /* buffer data offscreen, we will need to update it */ #define ICDecompressOpen(fccType, fccHandler, lpbiIn, lpbiOut) \ ICLocate(fccType, fccHandler, lpbiIn, lpbiOut, ICMODE_DECOMPRESS) @@ -597,11 +597,11 @@ typedef struct { DWORD dwScale; } ICDRAWBEGIN; -#define ICDRAW_HURRYUP 0x80000000L /* don't draw just buffer (hurry up!) */ -#define ICDRAW_UPDATE 0x40000000L /* don't draw just update screen */ -#define ICDRAW_PREROLL 0x20000000L /* this frame is before real start */ -#define ICDRAW_NULLFRAME 0x10000000L /* repeat last frame */ -#define ICDRAW_NOTKEYFRAME 0x08000000L /* this frame is not a key frame */ +#define ICDRAW_HURRYUP __MSABI_LONG(0x80000000) /* don't draw just buffer (hurry up!) */ +#define ICDRAW_UPDATE __MSABI_LONG(0x40000000) /* don't draw just update screen */ +#define ICDRAW_PREROLL __MSABI_LONG(0x20000000) /* this frame is before real start */ +#define ICDRAW_NULLFRAME __MSABI_LONG(0x10000000) /* repeat last frame */ +#define ICDRAW_NOTKEYFRAME __MSABI_LONG(0x08000000) /* this frame is not a key frame */ typedef struct { DWORD dwFlags; @@ -632,10 +632,10 @@ static inline LRESULT VFWAPI ICDrawSuggestFormat(HIC hic, LPBITMAPINFOHEADER lpb } #define ICDrawQuery(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_QUERY, (DWORD_PTR)(LPVOID)(lpbiInput), 0) #define ICDrawChangePalette(hic, lpbiInput) \ - ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), 0L) + ICSendMessage(hic, ICM_DRAW_CHANGEPALETTE, (DWORD_PTR)(LPVOID)(lpbiInput), 0) #define ICGetBuffersWanted(hic, lpdwBuffers) \ ICSendMessage(hic, ICM_GETBUFFERSWANTED, (DWORD_PTR)(LPVOID)(lpdwBuffers), 0) @@ -750,7 +750,7 @@ typedef WORD TWOCC; #define ckidAVINEWINDEX mmioFOURCC('i', 'd', 'x', '1') -#define streamtypeANY 0UL +#define streamtypeANY 0U #define streamtypeVIDEO mmioFOURCC('v', 'i', 'd', 's') #define streamtypeAUDIO mmioFOURCC('a', 'u', 'd', 's') #define streamtypeMIDI mmioFOURCC('m', 'i', 'd', 's') @@ -964,22 +964,22 @@ typedef struct { DWORD dwInterleaveEvery; /* for non-video streams only */ } AVICOMPRESSOPTIONS, *LPAVICOMPRESSOPTIONS,*PAVICOMPRESSOPTIONS; -#define FIND_DIR 0x0000000FL /* direction mask */ -#define FIND_NEXT 0x00000001L /* search forward */ -#define FIND_PREV 0x00000004L /* search backward */ -#define FIND_FROM_START 0x00000008L /* start at the logical beginning */ +#define FIND_DIR __MSABI_LONG(0x0000000F) /* direction mask */ +#define FIND_NEXT __MSABI_LONG(0x00000001) /* search forward */ +#define FIND_PREV __MSABI_LONG(0x00000004) /* search backward */ +#define FIND_FROM_START __MSABI_LONG(0x00000008) /* start at the logical beginning */ -#define FIND_TYPE 0x000000F0L /* type mask */ -#define FIND_KEY 0x00000010L /* find a key frame */ -#define FIND_ANY 0x00000020L /* find any (non-empty) sample */ -#define FIND_FORMAT 0x00000040L /* find a formatchange */ +#define FIND_TYPE __MSABI_LONG(0x000000F0) /* type mask */ +#define FIND_KEY __MSABI_LONG(0x00000010) /* find a key frame */ +#define FIND_ANY __MSABI_LONG(0x00000020) /* find any (non-empty) sample */ +#define FIND_FORMAT __MSABI_LONG(0x00000040) /* find a formatchange */ -#define FIND_RET 0x0000F000L /* return mask */ -#define FIND_POS 0x00000000L /* return logical position */ -#define FIND_LENGTH 0x00001000L /* return logical size */ -#define FIND_OFFSET 0x00002000L /* return physical position */ -#define FIND_SIZE 0x00003000L /* return physical size */ -#define FIND_INDEX 0x00004000L /* return physical index position */ +#define FIND_RET __MSABI_LONG(0x0000F000) /* return mask */ +#define FIND_POS __MSABI_LONG(0x00000000) /* return logical position */ +#define FIND_LENGTH __MSABI_LONG(0x00001000) /* return logical size */ +#define FIND_OFFSET __MSABI_LONG(0x00002000) /* return physical position */ +#define FIND_SIZE __MSABI_LONG(0x00003000) /* return physical size */ +#define FIND_INDEX __MSABI_LONG(0x00004000) /* return physical index position */ #include <ole2.h> @@ -1039,7 +1039,7 @@ DECLARE_INTERFACE_(IAVIStream,IUnknown) #define IAVIStream_SetInfo(p,a,b) (p)->lpVtbl->SetInfo(p,a,b) #endif -#define AVISTREAMREAD_CONVENIENT (-1L) +#define AVISTREAMREAD_CONVENIENT (__MSABI_LONG(-1)) ULONG WINAPI AVIStreamAddRef(PAVISTREAM iface); ULONG WINAPI AVIStreamRelease(PAVISTREAM iface); @@ -1444,17 +1444,17 @@ HWND VFWAPIV MCIWndCreateW(HWND, HINSTANCE, DWORD, LPCWSTR); #define MCIWndSetActiveTimer(hWnd,active) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETACTIVETIMER, \ - (WPARAM)(UINT)(active),0L) + (WPARAM)(UINT)(active),0) #define MCIWndSetInactiveTimer(hWnd,inactive) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETINACTIVETIMER, \ - (WPARAM)(UINT)(inactive),0L) + (WPARAM)(UINT)(inactive),0) #define MCIWndSetTimers(hWnd,active,inactive) \ (VOID)MCIWndSM(hWnd,MCIWNDM_SETTIMERS,(WPARAM)(UINT)(active),\ (LPARAM)(UINT)(inactive)) #define MCIWndGetActiveTimer(hWnd) \ - (UINT)MCIWndSM(hWnd,MCIWNDM_GETACTIVETIMER,0,0L); + (UINT)MCIWndSM(hWnd,MCIWNDM_GETACTIVETIMER,0,0); #define MCIWndGetInactiveTimer(hWnd) \ - (UINT)MCIWndSM(hWnd,MCIWNDM_GETINACTIVETIMER,0,0L); + (UINT)MCIWndSM(hWnd,MCIWNDM_GETINACTIVETIMER,0,0); #define MCIWndRealize(hWnd,fBkgnd) (LONG)MCIWndSM(hWnd,MCIWNDM_REALIZE,(WPARAM)(BOOL)(fBkgnd),0) @@ -1468,7 +1468,7 @@ HWND VFWAPIV MCIWndCreateW(HWND, HINSTANCE, DWORD, LPCWSTR); #define MCIWndGetFileName(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETFILENAME,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp)) #define MCIWndGetDevice(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETDEVICE,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp)) -#define MCIWndGetStyles(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETSTYLES,0,0L) +#define MCIWndGetStyles(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETSTYLES,0,0) #define MCIWndChangeStyles(hWnd,mask,value) (LONG)MCIWndSM(hWnd,MCIWNDM_CHANGESTYLES,(WPARAM)(UINT)(mask),(LPARAM)(LONG)(value)) #define MCIWndOpenInterface(hWnd,pUnk) (LONG)MCIWndSM(hWnd,MCIWNDM_OPENINTERFACE,0,(LPARAM)(LPUNKNOWN)(pUnk))

1 0

Jacek Caban : winegecko: Added 1.4 release.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: tools Branch: master Commit: aa3be3c61cba02e9f634753d5c8c28a9d3b3fa91 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aa3be3c61cba02e9f634753d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 9 18:11:27 2011 +0100 winegecko: Added 1.4 release. --- winegecko.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/winegecko.php b/winegecko.php index 5be7585..05d6f33 100644 --- a/winegecko.php +++ b/winegecko.php @@ -60,7 +60,9 @@ $aFileSizes = array( '1.2.0-x86'=>12604928, '1.2.0-x86_64'=>12841472, '1.3-x86'=>13609984, - '1.3-x86_64'=>13835776 + '1.3-x86_64'=>13835776, + '1.4-x86'=>14732288, + '1.4-x86_64'=>14980096 ); // Exact size of the file:

1 0

Aric Stewart : usp10: Avoid an end of buffer overrun when seeking non space characters at an end of a BiDi string .
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 38aa7696c57f9d3484a97ce9fb209c2ce1e9c32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38aa7696c57f9d3484a97ce9f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 09:31:57 2011 -0600 usp10: Avoid an end of buffer overrun when seeking non space characters at an end of a BiDi string. --- dlls/usp10/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 05468eb..2a6107e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -856,7 +856,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int int j = 1; while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ)) j++; - New_Script = get_char_script(pwcInChars[cnt+j]); + if (cnt + j < cInChars) + New_Script = get_char_script(pwcInChars[cnt+j]); + else + New_Script = get_char_script(pwcInChars[cnt]); } if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control)

1 0

Aric Stewart : usp10: Add a few chars that Windows itemizes as punctuation.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: cd3d305b6040c6e46ceed97603c22ef45c46a668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3d305b6040c6e46ceed9760… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 10:33:43 2011 -0600 usp10: Add a few chars that Windows itemizes as punctuation. --- dlls/usp10/usp10.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2a6107e..a19ed81 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -494,6 +494,10 @@ static WORD get_char_script( WCHAR ch) if (ch == 0xc || ch == 0x20 || ch == 0x202f) return Script_CR; + /* These chars are itemized as Punctuation by Windows */ + if (ch == 0x2212 || ch == 0x2044 || ch == 0x00a0) + return Script_Punctuation; + GetStringTypeW(CT_CTYPE1, &ch, 1, &type); if (type == 0)

1 0

Jacek Caban : mshtml: Make nsIURL::GetParam a stub.
by Alexandre Julliard Nov. 8, 2011

Nov. 8, 2011

Module: wine Branch: master Commit: 1ca84cb72977750629d7c88a8b1cbbaad58b6a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca84cb72977750629d7c88a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 16:17:31 2011 +0100 mshtml: Make nsIURL::GetParam a stub. --- dlls/mshtml/nsio.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f127bbc..aa34ddd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2333,13 +2333,11 @@ static nsresult NSAPI nsURL_GetParam(nsIURL *iface, nsACString *aParam) { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%p)\n", This, aParam); + WARN("(%p)->(%p)\n", This, aParam); - if(This->nsurl) - return nsIURL_GetParam(This->nsurl, aParam); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + /* This is a leftover of ';' special handling in URLs. It will be removed from Gecko soon */ + nsACString_SetData(aParam, ""); + return NS_OK; } static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam)

1 0