May 2009 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Populate the installed font collection.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: ef4d0d970de5d25b2ddaaeb14db32a738b29b64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4d0d970de5d25b2ddaaeb14… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 27 18:56:56 2009 -0500 gdiplus: Populate the installed font collection. --- dlls/gdiplus/font.c | 66 +++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/gdiplus.c | 4 ++ dlls/gdiplus/gdiplus_private.h | 3 ++ 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 0b582a7..89498bc 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -844,6 +844,7 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti (*fontCollection)->FontFamilies = NULL; (*fontCollection)->count = 0; + (*fontCollection)->allocated = 0; return Ok; } @@ -930,14 +931,77 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( return Ok; } +void free_installed_fonts(void) +{ + while (installedFontCollection.count) + GdipDeleteFontFamily(installedFontCollection.FontFamilies[--installedFontCollection.count]); + HeapFree(GetProcessHeap(), 0, installedFontCollection.FontFamilies); + installedFontCollection.FontFamilies = NULL; + installedFontCollection.allocated = 0; +} + +static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, + DWORD type, LPARAM lParam) +{ + GpFontCollection* fonts = (GpFontCollection*)lParam; + int i; + + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) + return 1; + + if (fonts->allocated == fonts->count) + { + INT new_alloc_count = fonts->allocated+50; + GpFontFamily** new_family_list = HeapAlloc(GetProcessHeap(), 0, new_alloc_count*sizeof(void*)); + + if (!new_family_list) + return 0; + + memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); + HeapFree(GetProcessHeap(), 0, fonts->FontFamilies); + fonts->FontFamilies = new_family_list; + fonts->allocated = new_alloc_count; + } + + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) + fonts->count++; + else + return 0; + + return 1; +} + GpStatus WINGDIPAPI GdipNewInstalledFontCollection( GpFontCollection** fontCollection) { - FIXME("stub: %p\n",fontCollection); + TRACE("(%p)\n",fontCollection); if (!fontCollection) return InvalidParameter; + if (installedFontCollection.count == 0) + { + HDC hdc; + LOGFONTW lfw; + + hdc = GetDC(0); + + lfw.lfCharSet = DEFAULT_CHARSET; + lfw.lfFaceName[0] = 0; + lfw.lfPitchAndFamily = 0; + + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) + { + free_installed_fonts(); + ReleaseDC(0, hdc); + return OutOfMemory; + } + + ReleaseDC(0, hdc); + } + *fontCollection = &installedFontCollection; return Ok; diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 52a9c39..950e002 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -64,6 +64,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break; + + case DLL_PROCESS_DETACH: + free_installed_fonts(); + break; } return TRUE; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1ee24a1..af20c75 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -52,6 +52,8 @@ extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, REAL tension, REAL *x, REAL *y); +extern void free_installed_fonts(void); + extern BOOL lengthen_path(GpPath *path, INT len); extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); @@ -245,6 +247,7 @@ struct GpStringFormat{ struct GpFontCollection{ GpFontFamily **FontFamilies; INT count; + INT allocated; }; struct GpFontFamily{

1 0

Alexandre Julliard : wininet/tests: Add a test for reading chunked data.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: bb5d973127a4f2ef5cb55be7ce7ffdd109adf528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb5d973127a4f2ef5cb55be7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:49:19 2009 +0200 wininet/tests: Add a test for reading chunked data. --- dlls/wininet/tests/http.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 085bd67..7e3c08c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -493,6 +493,114 @@ abort: first_connection_to_test_url = FALSE; } +static void InternetReadFile_chunked_test(void) +{ + BOOL res; + CHAR buffer[4000]; + DWORD length; + const char *types[2] = { "*", NULL }; + HINTERNET hi, hic = 0, hor = 0; + + trace("Starting InternetReadFile chunked test\n"); + + trace("InternetOpenA <--\n"); + hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok((hi != 0x0),"InternetOpen failed with error %u\n", GetLastError()); + trace("InternetOpenA -->\n"); + + if (hi == 0x0) goto abort; + + trace("InternetConnectA <--\n"); + hic=InternetConnectA(hi, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok((hic != 0x0),"InternetConnect failed with error %u\n", GetLastError()); + trace("InternetConnectA -->\n"); + + if (hic == 0x0) goto abort; + + trace("HttpOpenRequestA <--\n"); + hor = HttpOpenRequestA(hic, "GET", "/testchunked", NULL, NULL, types, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, + 0xdeadbead); + if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { + /* + * If the internet name can't be resolved we are probably behind + * a firewall or in some other way not directly connected to the + * Internet. Not enough reason to fail the test. Just ignore and + * abort. + */ + } else { + ok((hor != 0x0),"HttpOpenRequest failed with error %u\n", GetLastError()); + } + trace("HttpOpenRequestA -->\n"); + + if (hor == 0x0) goto abort; + + trace("HttpSendRequestA -->\n"); + SetLastError(0xdeadbeef); + res = HttpSendRequestA(hor, "", -1, NULL, 0); + ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), + "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); + trace("HttpSendRequestA <--\n"); + + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); + buffer[length]=0; + trace("Option CONTENT_TYPE -> %i %s\n",res,buffer); + + SetLastError( 0xdeadbeef ); + length = 100; + res = HttpQueryInfoA(hor,HTTP_QUERY_TRANSFER_ENCODING,buffer,&length,0x0); + buffer[length]=0; + trace("Option TRANSFER_ENCODING -> %i %s\n",res,buffer); + ok( res, "Failed to get TRANSFER_ENCODING option, error %u\n", GetLastError() ); + ok( !strcmp( buffer, "chunked" ), "Wrong transfer encoding '%s'\n", buffer ); + + SetLastError( 0xdeadbeef ); + length = 16; + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); + ok( !res, "Found CONTENT_LENGTH option '%s'\n", buffer ); + ok( GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Wrong error %u\n", GetLastError() ); + + length = 100; + trace("Entering Query loop\n"); + + while (TRUE) + { + res = InternetQueryDataAvailable(hor,&length,0x0,0x0); + ok(!(!res && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); + ok(res, "InternetQueryDataAvailable failed, error %d\n", GetLastError()); + trace("got %u available\n",length); + if (length) + { + DWORD got; + char *buffer = HeapAlloc(GetProcessHeap(),0,length+1); + + res = InternetReadFile(hor,buffer,length,&got); + + buffer[got]=0; + trace("ReadFile -> %i %i\n",res,got); + ok( length == got, "only got %u of %u available\n", got, length ); + ok( buffer[got-1] == '\n', "received partial line '%s'\n", buffer ); + + HeapFree(GetProcessHeap(),0,buffer); + if (!got) break; + } + if (length == 0) + break; + } +abort: + trace("aborting\n"); + if (hor != 0x0) { + res = InternetCloseHandle(hor); + ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); + } + if (hi != 0x0) { + res = InternetCloseHandle(hi); + ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); + } +} + static void InternetReadFileExA_test(int flags) { DWORD rc; @@ -2571,5 +2679,6 @@ START_TEST(http) test_http_connection(); test_user_agent_header(); test_bogus_accept_types_array(); + InternetReadFile_chunked_test(); HttpSendRequestEx_test(); }

1 0

Stefan Dösinger : wined3d: Centralize WINED3DSPDM_SATURATE handling.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 0123f81ce517ad7c003f063509209f7ce8d514ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0123f81ce517ad7c003f06350… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:47:59 2009 +0200 wined3d: Centralize WINED3DSPDM_SATURATE handling. Besides the cleanup this patch will help to implement D3DSPDM_PARTIALPRECISION with GL_NV_vertex_program2_option / GL_NV_fragment_program_option. --- dlls/wined3d/arb_program_shader.c | 67 +++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bab6b27..fc01142 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -785,6 +785,31 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in sprintf(outregstr, "T%c%s", 'A' + tmpreg, swzstr); } +static const char *shader_arb_get_modifier(const struct wined3d_shader_instruction *ins) +{ + DWORD mod; + const char *ret = ""; + if (!ins->dst_count) return ""; + + mod = ins->dst[0].modifiers; + if(mod & WINED3DSPDM_SATURATE) { + ret = "_SAT"; + mod &= ~WINED3DSPDM_SATURATE; + } + if(mod & WINED3DSPDM_PARTIALPRECISION) { + FIXME("Unhandled modifier WINED3DSPDM_PARTIALPRECISION\n"); + mod &= ~WINED3DSPDM_PARTIALPRECISION; + } + if(mod & WINED3DSPDM_MSAMPCENTROID) { + FIXME("Unhandled modifier WINED3DSPDM_MSAMPCENTROID\n"); + mod &= ~WINED3DSPDM_MSAMPCENTROID; + } + if(mod) { + FIXME("Unknown modifiers 0x%08x\n", mod); + } + return ret; +} + static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; @@ -827,7 +852,6 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; - BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); @@ -837,13 +861,13 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue) { - shader_addline(buffer, "MOV%s %s, %s;\n", sat ? "_SAT" : "", dst_name, src_name[1]); + shader_addline(buffer, "MOV%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[1]); } else { shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); shader_addline(buffer, "ADD TMP, -%s, coefdiv.x;\n", src_name[0]); shader_addline(buffer, "CMP%s %s, TMP, %s, %s;\n", - sat ? "_SAT" : "", dst_name, src_name[1], src_name[2]); + shader_arb_get_modifier(ins), dst_name, src_name[1], src_name[2]); } } @@ -853,7 +877,6 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; - BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; shader_arb_get_dst_param(ins, dst, dst_name); @@ -862,7 +885,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); - shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", sat ? "_SAT" : "", dst_name, + shader_addline(buffer, "CMP%s %s, %s, %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[0], src_name[2], src_name[1]); } @@ -874,7 +897,6 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[3][50]; - BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); @@ -885,7 +907,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MOV TMP, %s;\n", src_name[0]); shader_addline(buffer, "MOV TMP.z, 0.0;\n"); shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); - shader_addline(buffer, "ADD%s %s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, src_name[2]); + shader_addline(buffer, "ADD%s %s, TMP2, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[2]); } /* Map the opcode 1-to-1 to the GL code */ @@ -896,7 +918,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) char arguments[256], dst_str[50]; unsigned int i; const struct wined3d_shader_dst_param *dst = &ins->dst[0]; - const char *modifier; switch (ins->handler_idx) { @@ -927,10 +948,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) break; } - /* All instructions handled by this function have a destination parameter */ - if(dst->modifiers & WINED3DSPDM_SATURATE) modifier = "_SAT"; - else modifier = ""; - /* Note that shader_arb_add_dst_param() adds spaces. */ arguments[0] = '\0'; shader_arb_get_dst_param(ins, dst, dst_str); @@ -941,7 +958,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[i], i, operand); strcat(arguments, operand); } - shader_addline(buffer, "%s%s %s%s;\n", instruction, modifier, dst_str, arguments); + shader_addline(buffer, "%s%s %s%s;\n", instruction, shader_arb_get_modifier(ins), dst_str, arguments); } static void shader_hw_nop(const struct wined3d_shader_instruction *ins) @@ -1537,7 +1554,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; - const char *instruction, *sat; + const char *instruction; char dst[50]; char src[50]; @@ -1551,9 +1568,6 @@ static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) break; } - if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) sat = "_SAT"; - else sat = ""; - shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ shader_arb_get_src_param(ins, &ins->src[0], 0, src); if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) @@ -1564,23 +1578,21 @@ static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) strcat(src, ".w"); } - shader_addline(buffer, "%s%s %s, %s;\n", instruction, sat, dst, src); + shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); } static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) { - const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); shader_addline(buffer, "RSQ TMP, TMP.x;\n"); /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ - shader_addline(buffer, "MUL%s %s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, + shader_addline(buffer, "MUL%s %s, %s, TMP;\n", shader_arb_get_modifier(ins), dst_name, src_name); } @@ -1590,15 +1602,13 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) * must contain fixed constants. So we need a separate function to filter those constants and * can't use map2gl */ - const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; shader_arb_get_dst_param(ins, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "SCS%s %s, %s;\n", sat ? "_SAT" : "", dst_name, + shader_addline(buffer, "SCS%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name); } @@ -2118,7 +2128,6 @@ static BOOL shader_arb_color_fixup_supported(struct color_fixup_desc fixup) } static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) { - BOOL saturate; DWORD shift; char write_mask[20], regstr[50]; SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -2130,13 +2139,15 @@ static void shader_arb_add_instruction_modifiers(const struct wined3d_shader_ins dst = &ins->dst[0]; shift = dst->shift; if(shift == 0) return; /* Saturate alone is handled by the instructions */ - saturate = dst->modifiers & WINED3DSPDM_SATURATE; shader_arb_get_write_mask(ins, dst, write_mask); shader_arb_get_register_name(ins->ctx->shader, &dst->reg, regstr, &is_color); - /* Generate a line that does the output modifier computation */ - shader_addline(buffer, "MUL%s %s%s, %s, %s;\n", saturate ? "_SAT" : "", + /* Generate a line that does the output modifier computation + * FIXME: _SAT vs shift? _SAT alone is already handled in the instructions, if this + * maps problems in e.g. _d4_sat modify shader_arb_get_modifier + */ + shader_addline(buffer, "MUL%s %s%s, %s, %s;\n", shader_arb_get_modifier(ins), regstr, write_mask, regstr, shift_tab[shift]); }

1 0

Nikolay Sivov : comctl32/tab: Fix TabCtrl_* macros.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 24d6c88d16c46f00d99fd8529196590aca88b0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d6c88d16c46f00d99fd8529… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 13 23:23:57 2009 +0400 comctl32/tab: Fix TabCtrl_* macros. --- include/commctrl.h | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7f431e3..aacfc96 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4035,11 +4035,11 @@ static const WCHAR WC_TABCONTROLW[] = { 'S','y','s', /* TabCtrl Macros */ #define TabCtrl_GetImageList(hwnd) \ - (HIMAGELIST)SNDMSGA((hwnd), TCM_GETIMAGELIST, 0, 0L) + (HIMAGELIST)SNDMSG((hwnd), TCM_GETIMAGELIST, 0, 0L) #define TabCtrl_SetImageList(hwnd, himl) \ - (HIMAGELIST)SNDMSGA((hwnd), TCM_SETIMAGELIST, 0, (LPARAM)(UINT)(HIMAGELIST)(himl)) + (HIMAGELIST)SNDMSG((hwnd), TCM_SETIMAGELIST, 0, (LPARAM)(UINT)(HIMAGELIST)(himl)) #define TabCtrl_GetItemCount(hwnd) \ - (int)SNDMSGA((hwnd), TCM_GETITEMCOUNT, 0, 0L) + (int)SNDMSG((hwnd), TCM_GETITEMCOUNT, 0, 0L) #define TabCtrl_GetItemA(hwnd, iItem, pitem) \ (BOOL)SNDMSGA((hwnd), TCM_GETITEMA, (WPARAM)(int)iItem, (LPARAM)(TCITEMA *)(pitem)) #define TabCtrl_GetItemW(hwnd, iItem, pitem) \ @@ -4056,49 +4056,49 @@ static const WCHAR WC_TABCONTROLW[] = { 'S','y','s', (int)SNDMSGW((hwnd), TCM_INSERTITEMW, (WPARAM)(int)iItem, (LPARAM)(const TCITEMW *)(pitem)) #define TabCtrl_InsertItem WINELIB_NAME_AW(TabCtrl_InsertItem) #define TabCtrl_DeleteItem(hwnd, i) \ - (BOOL)SNDMSGA((hwnd), TCM_DELETEITEM, (WPARAM)(int)(i), 0L) + (BOOL)SNDMSG((hwnd), TCM_DELETEITEM, (WPARAM)(int)(i), 0L) #define TabCtrl_DeleteAllItems(hwnd) \ - (BOOL)SNDMSGA((hwnd), TCM_DELETEALLITEMS, 0, 0L) + (BOOL)SNDMSG((hwnd), TCM_DELETEALLITEMS, 0, 0L) #define TabCtrl_GetItemRect(hwnd, i, prc) \ - (BOOL)SNDMSGA((hwnd), TCM_GETITEMRECT, (WPARAM)(int)(i), (LPARAM)(RECT *)(prc)) + (BOOL)SNDMSG((hwnd), TCM_GETITEMRECT, (WPARAM)(int)(i), (LPARAM)(RECT *)(prc)) #define TabCtrl_GetCurSel(hwnd) \ - (int)SNDMSGA((hwnd), TCM_GETCURSEL, 0, 0) + (int)SNDMSG((hwnd), TCM_GETCURSEL, 0, 0) #define TabCtrl_SetCurSel(hwnd, i) \ - (int)SNDMSGA((hwnd), TCM_SETCURSEL, (WPARAM)i, 0) + (int)SNDMSG((hwnd), TCM_SETCURSEL, (WPARAM)i, 0) #define TabCtrl_HitTest(hwndTC, pinfo) \ - (int)SNDMSGA((hwndTC), TCM_HITTEST, 0, (LPARAM)(TC_HITTESTINFO *)(pinfo)) + (int)SNDMSG((hwndTC), TCM_HITTEST, 0, (LPARAM)(TC_HITTESTINFO *)(pinfo)) #define TabCtrl_SetItemExtra(hwndTC, cb) \ - (BOOL)SNDMSGA((hwndTC), TCM_SETITEMEXTRA, (WPARAM)(cb), 0L) + (BOOL)SNDMSG((hwndTC), TCM_SETITEMEXTRA, (WPARAM)(cb), 0L) #define TabCtrl_AdjustRect(hwnd, bLarger, prc) \ - (int)SNDMSGA(hwnd, TCM_ADJUSTRECT, (WPARAM)(BOOL)bLarger, (LPARAM)(RECT *)prc) + (int)SNDMSG(hwnd, TCM_ADJUSTRECT, (WPARAM)(BOOL)bLarger, (LPARAM)(RECT *)prc) #define TabCtrl_SetItemSize(hwnd, x, y) \ - (DWORD)SNDMSGA((hwnd), TCM_SETITEMSIZE, 0, MAKELPARAM(x,y)) + (DWORD)SNDMSG((hwnd), TCM_SETITEMSIZE, 0, MAKELPARAM(x,y)) #define TabCtrl_RemoveImage(hwnd, i) \ - (void)SNDMSGA((hwnd), TCM_REMOVEIMAGE, i, 0L) + (void)SNDMSG((hwnd), TCM_REMOVEIMAGE, i, 0L) #define TabCtrl_SetPadding(hwnd, cx, cy) \ - (void)SNDMSGA((hwnd), TCM_SETPADDING, 0, MAKELPARAM(cx, cy)) + (void)SNDMSG((hwnd), TCM_SETPADDING, 0, MAKELPARAM(cx, cy)) #define TabCtrl_GetRowCount(hwnd) \ - (int)SNDMSGA((hwnd), TCM_GETROWCOUNT, 0, 0L) + (int)SNDMSG((hwnd), TCM_GETROWCOUNT, 0, 0L) #define TabCtrl_GetToolTips(hwnd) \ - (HWND)SNDMSGA((hwnd), TCM_GETTOOLTIPS, 0, 0L) + (HWND)SNDMSG((hwnd), TCM_GETTOOLTIPS, 0, 0L) #define TabCtrl_SetToolTips(hwnd, hwndTT) \ - (void)SNDMSGA((hwnd), TCM_SETTOOLTIPS, (WPARAM)hwndTT, 0L) + (void)SNDMSG((hwnd), TCM_SETTOOLTIPS, (WPARAM)hwndTT, 0L) #define TabCtrl_GetCurFocus(hwnd) \ - (int)SNDMSGA((hwnd), TCM_GETCURFOCUS, 0, 0) + (int)SNDMSG((hwnd), TCM_GETCURFOCUS, 0, 0) #define TabCtrl_SetCurFocus(hwnd, i) \ - SNDMSGA((hwnd),TCM_SETCURFOCUS, i, 0) + SNDMSG((hwnd),TCM_SETCURFOCUS, i, 0) #define TabCtrl_SetMinTabWidth(hwnd, x) \ - (int)SNDMSGA((hwnd), TCM_SETMINTABWIDTH, 0, x) + (int)SNDMSG((hwnd), TCM_SETMINTABWIDTH, 0, x) #define TabCtrl_DeselectAll(hwnd, fExcludeFocus)\ - (void)SNDMSGA((hwnd), TCM_DESELECTALL, fExcludeFocus, 0) + (void)SNDMSG((hwnd), TCM_DESELECTALL, fExcludeFocus, 0) #define TabCtrl_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd), TCM_GETUNICODEFORMAT, 0, 0) + (BOOL)SNDMSG((hwnd), TCM_GETUNICODEFORMAT, 0, 0) #define TabCtrl_SetUnicodeFormat(hwnd, fUnicode) \ - (BOOL)SNDMSGA((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)fUnicode, 0) + (BOOL)SNDMSG((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)fUnicode, 0) #define TabCtrl_GetExtendedStyle(hwnd) \ - (BOOL)SNDMSGA((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0) + (BOOL)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0) #define TabCtrl_SetExtendedStyle(hwnd, dwExStyle) \ - (BOOL)SNDMSGA((hwnd), TCM_GETEXTENDEDSTYLE, 0, (LPARAM)dwExStyle) + (BOOL)SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, (LPARAM)dwExStyle) #define TabCtrl_HighlightItem(hwnd, i, fHighlight) \ (BOOL)SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG(fHighlight, 0))

1 0

Nikolay Sivov : comctl32/treeview: Fix TreeView_* macros.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 89da35b1d90eef259a097d5ef08f331e3492be95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89da35b1d90eef259a097d5ef… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 13 23:54:37 2009 +0400 comctl32/treeview: Fix TreeView_* macros. --- dlls/shell32/brsfolder.c | 14 +++++--- include/commctrl.h | 76 +++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index cc8a91d..925d439 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -723,9 +723,11 @@ static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, /* Initialize item to point to the first child of the root folder. */ memset(&item, 0, sizeof(item)); item.mask = TVIF_PARAM; - item.hItem = TreeView_GetRoot(info->hwndTreeView); - if (item.hItem) - item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_ROOT, 0); + + if (item.hItem) + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, + (LPARAM)item.hItem); /* Walk the tree along the nodes corresponding to the remaining ITEMIDLIST */ while (item.hItem && !_ILIsEmpty(pidlCurrent)) { @@ -740,10 +742,12 @@ static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, /* Only expand current node and move on to it's first child, * if we didn't already reach the last SHITEMID */ SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); - item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CHILD, + (LPARAM)item.hItem); } } else { - item.hItem = TreeView_GetNextSibling(info->hwndTreeView, item.hItem); + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_NEXT, + (LPARAM)item.hItem); } } diff --git a/include/commctrl.h b/include/commctrl.h index aacfc96..73df8c3 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2679,33 +2679,33 @@ typedef struct tagTVKEYDOWN #define TreeView_InsertItem WINELIB_NAME_AW(TreeView_InsertItem) #define TreeView_DeleteItem(hwnd, hItem) \ - (BOOL)SNDMSGA((hwnd), TVM_DELETEITEM, 0, (LPARAM)(HTREEITEM)(hItem)) + (BOOL)SNDMSG((hwnd), TVM_DELETEITEM, 0, (LPARAM)(HTREEITEM)(hItem)) #define TreeView_DeleteAllItems(hwnd) \ - (BOOL)SNDMSGA((hwnd), TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT) + (BOOL)SNDMSG((hwnd), TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT) #define TreeView_Expand(hwnd, hitem, code) \ - (BOOL)SNDMSGA((hwnd), TVM_EXPAND, (WPARAM)code, \ + (BOOL)SNDMSG((hwnd), TVM_EXPAND, (WPARAM)code, \ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_GetItemRect(hwnd, hitem, prc, code) \ - (*(HTREEITEM *)prc = (hitem), (BOOL)SNDMSGA((hwnd), \ + (*(HTREEITEM *)prc = (hitem), (BOOL)SNDMSG((hwnd), \ TVM_GETITEMRECT, (WPARAM)(code), (LPARAM)(RECT *)(prc))) #define TreeView_GetCount(hwnd) \ - (UINT)SNDMSGA((hwnd), TVM_GETCOUNT, 0, 0) + (UINT)SNDMSG((hwnd), TVM_GETCOUNT, 0, 0) #define TreeView_GetIndent(hwnd) \ - (UINT)SNDMSGA((hwnd), TVM_GETINDENT, 0, 0) + (UINT)SNDMSG((hwnd), TVM_GETINDENT, 0, 0) #define TreeView_SetIndent(hwnd, indent) \ - (BOOL)SNDMSGA((hwnd), TVM_SETINDENT, (WPARAM)indent, 0) + (BOOL)SNDMSG((hwnd), TVM_SETINDENT, (WPARAM)indent, 0) #define TreeView_GetImageList(hwnd, iImage) \ - (HIMAGELIST)SNDMSGA((hwnd), TVM_GETIMAGELIST, iImage, 0) + (HIMAGELIST)SNDMSG((hwnd), TVM_GETIMAGELIST, iImage, 0) #define TreeView_SetImageList(hwnd, himl, iImage) \ - (HIMAGELIST)SNDMSGA((hwnd), TVM_SETIMAGELIST, iImage, \ + (HIMAGELIST)SNDMSG((hwnd), TVM_SETIMAGELIST, iImage, \ (LPARAM)(HIMAGELIST)(himl)) #define TreeView_GetNextItem(hwnd, hitem, code) \ - (HTREEITEM)SNDMSGA((hwnd), TVM_GETNEXTITEM, (WPARAM)code,\ + (HTREEITEM)SNDMSG((hwnd), TVM_GETNEXTITEM, (WPARAM)code,\ (LPARAM)(HTREEITEM) (hitem)) #define TreeView_GetChild(hwnd, hitem) \ @@ -2735,7 +2735,7 @@ typedef struct tagTVKEYDOWN #define TreeView_Select(hwnd, hitem, code) \ - (BOOL)SNDMSGA((hwnd), TVM_SELECTITEM, (WPARAM)(code), \ + (BOOL)SNDMSG((hwnd), TVM_SELECTITEM, (WPARAM)(code), \ (LPARAM)(HTREEITEM)(hitem)) @@ -2760,79 +2760,79 @@ typedef struct tagTVKEYDOWN #define TreeView_SetItem WINELIB_NAME_AW(TreeView_SetItem) #define TreeView_EditLabel(hwnd, hitem) \ - (HWND)SNDMSGA((hwnd), TVM_EDITLABEL, 0, (LPARAM)(HTREEITEM)(hitem)) + (HWND)SNDMSG((hwnd), TVM_EDITLABEL, 0, (LPARAM)(HTREEITEM)(hitem)) #define TreeView_GetEditControl(hwnd) \ - (HWND)SNDMSGA((hwnd), TVM_GETEDITCONTROL, 0, 0) + (HWND)SNDMSG((hwnd), TVM_GETEDITCONTROL, 0, 0) #define TreeView_GetVisibleCount(hwnd) \ - (UINT)SNDMSGA((hwnd), TVM_GETVISIBLECOUNT, 0, 0) + (UINT)SNDMSG((hwnd), TVM_GETVISIBLECOUNT, 0, 0) #define TreeView_HitTest(hwnd, lpht) \ - (HTREEITEM)SNDMSGA((hwnd), TVM_HITTEST, 0,\ + (HTREEITEM)SNDMSG((hwnd), TVM_HITTEST, 0,\ (LPARAM)(LPTVHITTESTINFO)(lpht)) #define TreeView_CreateDragImage(hwnd, hitem) \ - (HIMAGELIST)SNDMSGA((hwnd), TVM_CREATEDRAGIMAGE, 0,\ + (HIMAGELIST)SNDMSG((hwnd), TVM_CREATEDRAGIMAGE, 0,\ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_SortChildren(hwnd, hitem, recurse) \ - (BOOL)SNDMSGA((hwnd), TVM_SORTCHILDREN, (WPARAM)recurse,\ + (BOOL)SNDMSG((hwnd), TVM_SORTCHILDREN, (WPARAM)recurse,\ (LPARAM)(HTREEITEM)(hitem)) #define TreeView_EnsureVisible(hwnd, hitem) \ - (BOOL)SNDMSGA((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) + (BOOL)SNDMSG((hwnd), TVM_ENSUREVISIBLE, 0, (LPARAM)(UINT)(hitem)) #define TreeView_SortChildrenCB(hwnd, psort, recurse) \ - (BOOL)SNDMSGA((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ + (BOOL)SNDMSG((hwnd), TVM_SORTCHILDRENCB, (WPARAM)recurse, \ (LPARAM)(LPTV_SORTCB)(psort)) #define TreeView_EndEditLabelNow(hwnd, fCancel) \ - (BOOL)SNDMSGA((hwnd), TVM_ENDEDITLABELNOW, (WPARAM)fCancel, 0) + (BOOL)SNDMSG((hwnd), TVM_ENDEDITLABELNOW, (WPARAM)fCancel, 0) #define TreeView_GetISearchString(hwnd, lpsz) \ - (BOOL)SNDMSGA((hwnd), TVM_GETISEARCHSTRING, 0, \ + (BOOL)SNDMSG((hwnd), TVM_GETISEARCHSTRING, 0, \ (LPARAM)(LPTSTR)lpsz) #define TreeView_SetToolTips(hwnd, hwndTT) \ - (HWND)SNDMSGA((hwnd), TVM_SETTOOLTIPS, (WPARAM)(hwndTT), 0) + (HWND)SNDMSG((hwnd), TVM_SETTOOLTIPS, (WPARAM)(hwndTT), 0) #define TreeView_GetToolTips(hwnd) \ - (HWND)SNDMSGA((hwnd), TVM_GETTOOLTIPS, 0, 0) + (HWND)SNDMSG((hwnd), TVM_GETTOOLTIPS, 0, 0) #define TreeView_SetItemHeight(hwnd, iHeight) \ - (INT)SNDMSGA((hwnd), TVM_SETITEMHEIGHT, (WPARAM)iHeight, 0) + (INT)SNDMSG((hwnd), TVM_SETITEMHEIGHT, (WPARAM)iHeight, 0) #define TreeView_GetItemHeight(hwnd) \ - (INT)SNDMSGA((hwnd), TVM_GETITEMHEIGHT, 0, 0) + (INT)SNDMSG((hwnd), TVM_GETITEMHEIGHT, 0, 0) #define TreeView_SetBkColor(hwnd, clr) \ - (COLORREF)SNDMSGA((hwnd), TVM_SETBKCOLOR, 0, (LPARAM)clr) + (COLORREF)SNDMSG((hwnd), TVM_SETBKCOLOR, 0, (LPARAM)clr) #define TreeView_SetTextColor(hwnd, clr) \ - (COLORREF)SNDMSGA((hwnd), TVM_SETTEXTCOLOR, 0, (LPARAM)clr) + (COLORREF)SNDMSG((hwnd), TVM_SETTEXTCOLOR, 0, (LPARAM)clr) #define TreeView_GetBkColor(hwnd) \ - (COLORREF)SNDMSGA((hwnd), TVM_GETBKCOLOR, 0, 0) + (COLORREF)SNDMSG((hwnd), TVM_GETBKCOLOR, 0, 0) #define TreeView_GetTextColor(hwnd) \ - (COLORREF)SNDMSGA((hwnd), TVM_GETTEXTCOLOR, 0, 0) + (COLORREF)SNDMSG((hwnd), TVM_GETTEXTCOLOR, 0, 0) #define TreeView_SetScrollTime(hwnd, uTime) \ - (UINT)SNDMSGA((hwnd), TVM_SETSCROLLTIME, uTime, 0) + (UINT)SNDMSG((hwnd), TVM_SETSCROLLTIME, uTime, 0) #define TreeView_GetScrollTime(hwnd) \ - (UINT)SNDMSGA((hwnd), TVM_GETSCROLLTIME, 0, 0) + (UINT)SNDMSG((hwnd), TVM_GETSCROLLTIME, 0, 0) #define TreeView_SetInsertMark(hwnd, hItem, fAfter) \ - (BOOL)SNDMSGA((hwnd), TVM_SETINSERTMARK, (WPARAM)(fAfter), \ + (BOOL)SNDMSG((hwnd), TVM_SETINSERTMARK, (WPARAM)(fAfter), \ (LPARAM) (hItem)) #define TreeView_SetInsertMarkColor(hwnd, clr) \ - (COLORREF)SNDMSGA((hwnd), TVM_SETINSERTMARKCOLOR, 0, (LPARAM)clr) + (COLORREF)SNDMSG((hwnd), TVM_SETINSERTMARKCOLOR, 0, (LPARAM)clr) #define TreeView_GetInsertMarkColor(hwnd) \ - (COLORREF)SNDMSGA((hwnd), TVM_GETINSERTMARKCOLOR, 0, 0) + (COLORREF)SNDMSG((hwnd), TVM_GETINSERTMARKCOLOR, 0, 0) #define TreeView_SetItemState(hwndTV, hti, data, _mask) \ { TVITEM _TVi; \ @@ -2844,16 +2844,16 @@ typedef struct tagTVKEYDOWN } #define TreeView_GetItemState(hwndTV, hti, mask) \ - (UINT)SNDMSGA((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), (LPARAM)(mask)) + (UINT)SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), (LPARAM)(mask)) #define TreeView_GetCheckState(hwndTV, hti) \ - ((((UINT)(SNDMSGA((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), \ + ((((UINT)(SNDMSG((hwndTV), TVM_GETITEMSTATE, (WPARAM)(hti), \ TVIS_STATEIMAGEMASK))) >> 12) -1) #define TreeView_SetLineColor(hwnd, clr) \ - (COLORREF)SNDMSGA((hwnd), TVM_SETLINECOLOR, 0, (LPARAM)(clr)) + (COLORREF)SNDMSG((hwnd), TVM_SETLINECOLOR, 0, (LPARAM)(clr)) #define TreeView_GetLineColor(hwnd) \ - (COLORREF)SNDMSGA((hwnd), TVM_GETLINECOLOR, 0, 0) + (COLORREF)SNDMSG((hwnd), TVM_GETLINECOLOR, 0, 0) #define TreeView_MapAccIDToHTREEITEM(hwnd, id) \ (HTREEITEM)SNDMSG((hwnd), TVM_MAPACCIDTOHTREEITEM, id, 0)

1 0

Nikolay Sivov : comctl32/animate: Fix Animate_* macros.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: c3b3fcaa10d81e02db915b62769191dd231f4cf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b3fcaa10d81e02db915b627… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu May 14 00:03:26 2009 +0400 comctl32/animate: Fix Animate_* macros. --- include/commctrl.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 73df8c3..9428d99 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4427,13 +4427,13 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', (BOOL)SNDMSGW(hwnd,ACM_OPENW,(WPARAM)hInst,(LPARAM)(LPWSTR)(szName)) #define Animate_OpenEx WINELIB_NAME_AW(Animate_OpenEx) #define Animate_Play(hwnd,from,to,rep) \ - (BOOL)SNDMSGA(hwnd,ACM_PLAY,(WPARAM)(UINT)(rep),(LPARAM)MAKELONG(from,to)) + (BOOL)SNDMSG(hwnd,ACM_PLAY,(WPARAM)(UINT)(rep),(LPARAM)MAKELONG(from,to)) #define Animate_Stop(hwnd) \ - (BOOL)SNDMSGA(hwnd,ACM_STOP,0,0) + (BOOL)SNDMSG(hwnd,ACM_STOP,0,0) #define Animate_Close(hwnd) \ - (BOOL)SNDMSGA(hwnd,ACM_OPENA,0,0) + (BOOL)SNDMSG(hwnd,ACM_OPENA,0,0) #define Animate_Seek(hwnd,frame) \ - (BOOL)SNDMSGA(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame)) + (BOOL)SNDMSG(hwnd,ACM_PLAY,1,(LPARAM)MAKELONG(frame,frame)) /**************************************************************************

1 0

Jacek Caban : urlmon: Use PI_MIMEVERIFICATION in Binding object.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 81a9f4a357e12631a9cfb3231724e1ea3239a7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a9f4a357e12631a9cfb3231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:33 2009 +0200 urlmon: Use PI_MIMEVERIFICATION in Binding object. --- dlls/urlmon/binding.c | 61 ++++++++----------------------------------------- 1 files changed, 10 insertions(+), 51 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 913f8fa..3ff4683 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -178,53 +178,17 @@ static void dump_BINDINFO(BINDINFO *bi) ); } -static void set_binding_mime(Binding *binding, LPCWSTR mime) +static void mime_available(Binding *This, LPCWSTR mime) { - EnterCriticalSection(&binding->section); + heap_free(This->mime); + This->mime = heap_strdupW(mime); - if(binding->report_mime) { - heap_free(binding->mime); - binding->mime = heap_strdupW(mime); - } - - LeaveCriticalSection(&binding->section); -} - -static void handle_mime_available(Binding *binding, BOOL verify) -{ - BOOL report_mime; - - EnterCriticalSection(&binding->section); - report_mime = binding->report_mime; - binding->report_mime = FALSE; - LeaveCriticalSection(&binding->section); - - if(!report_mime) + if(!This->mime || !This->report_mime) return; - if(verify) { - LPWSTR mime = NULL; - - fill_stgmed_buffer(binding->stgmed_buf); - FindMimeFromData(NULL, binding->url, binding->stgmed_buf->buf, - min(binding->stgmed_buf->size, 255), binding->mime, 0, &mime, 0); - - heap_free(binding->mime); - binding->mime = heap_strdupW(mime); - CoTaskMemFree(mime); - } - - IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, binding->mime); - - binding->clipboard_format = RegisterClipboardFormatW(binding->mime); -} - -static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) -{ - if(mime) - set_binding_mime(This, mime); + IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, This->mime); - handle_mime_available(This, verify); + This->clipboard_format = RegisterClipboardFormatW(This->mime); } static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) @@ -1007,22 +971,20 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_BEGINDOWNLOADDATA: fill_stgmed_buffer(This->stgmed_buf); break; - case BINDSTATUS_MIMETYPEAVAILABLE: - set_binding_mime(This, szStatusText); - break; case BINDSTATUS_SENDINGREQUEST: on_progress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, szStatusText); break; case BINDSTATUS_PROTOCOLCLASSID: break; + case BINDSTATUS_MIMETYPEAVAILABLE: case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: - mime_available(This, szStatusText, FALSE); + mime_available(This, szStatusText); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: heap_free(This->stgmed_buf->cache_file); This->stgmed_buf->cache_file = heap_strdupW(szStatusText); break; - case BINDSTATUS_DIRECTBIND: + case BINDSTATUS_DIRECTBIND: /* FIXME: Handle BINDSTATUS_DIRECTBIND in BindProtocol */ This->report_mime = FALSE; break; case BINDSTATUS_ACCEPTRANGES: @@ -1045,9 +1007,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED)) return; - if(This->report_mime) - mime_available(This, NULL, TRUE); - if(This->download_state == BEFORE_DOWNLOAD) { fill_stgmed_buffer(This->stgmed_buf); @@ -1502,7 +1461,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, 0, 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), - BINDINF(binding), PI_APARTMENTTHREADED, 0); + BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); TRACE("start ret %08x\n", hres);

1 0

Stefan Dösinger : wined3d: Tidy up pshader_hw_dp2add.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 05cc344e7da383e1b85de16ef3868412d3adfd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cc344e7da383e1b85de16ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:39:17 2009 +0200 wined3d: Tidy up pshader_hw_dp2add. --- dlls/wined3d/arb_program_shader.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2d73c31..6d0d187 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -878,15 +878,11 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; BOOL sat = dst->modifiers & WINED3DSPDM_SATURATE; - BOOL is_color; - - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); + shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name[0]); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); shader_arb_get_src_param(ins, &ins->src[2], 2, src_name[2]); @@ -895,7 +891,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MOV TMP, %s;\n", src_name[0]); shader_addline(buffer, "MOV TMP.z, 0.0;\n"); shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); - shader_addline(buffer, "ADD%s %s%s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[2]); + shader_addline(buffer, "ADD%s %s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, src_name[2]); } /* Map the opcode 1-to-1 to the GL code */

1 0

Stefan Dösinger : wined3d: Tidy up pshader_hw_texreg2rgb and friends.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: 2327e316a2462b59038d2a0516086c6d934cec80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2327e316a2462b59038d2a051… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:41:37 2009 +0200 wined3d: Tidy up pshader_hw_texreg2rgb and friends. --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6d0d187..5fa4193 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1128,11 +1128,11 @@ static void pshader_hw_texreg2ar(const struct wined3d_shader_instruction *ins) DWORD flags; DWORD reg1 = ins->dst[0].reg.idx; - char dst_str[8]; + char dst_str[50]; char src_str[50]; /* Note that texreg2ar treats Tx as a temporary register, not as a varying */ - sprintf(dst_str, "T%u", reg1); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); shader_addline(buffer, "MOV TMP.x, %s.w;\n", src_str); shader_addline(buffer, "MOV TMP.y, %s.x;\n", src_str); @@ -1145,11 +1145,11 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD reg1 = ins->dst[0].reg.idx; - char dst_str[8]; + char dst_str[50]; char src_str[50]; /* Note that texreg2gb treats Tx as a temporary register, not as a varying */ - sprintf(dst_str, "T%u", reg1); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); shader_addline(buffer, "MOV TMP.x, %s.y;\n", src_str); shader_addline(buffer, "MOV TMP.y, %s.z;\n", src_str); @@ -1159,11 +1159,11 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) { DWORD reg1 = ins->dst[0].reg.idx; - char dst_str[8]; + char dst_str[50]; char src_str[50]; /* Note that texreg2rg treats Tx as a temporary register, not as a varying */ - sprintf(dst_str, "T%u", reg1); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src_str); shader_hw_sample(ins, reg1, dst_str, src_str, FALSE, FALSE); }

1 0

Jacek Caban : urlmon: Added PI_MIMEVERIFICATION tests.
by Alexandre Julliard May 14, 2009

May 14, 2009

Module: wine Branch: master Commit: b23ccb1303485b3df3932b30e7665c5a0f9ed887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23ccb1303485b3df3932b30e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 00:49:21 2009 +0200 urlmon: Added PI_MIMEVERIFICATION tests. --- dlls/urlmon/tests/protocol.c | 100 ++++++++++++++++++++++++++++++----------- 1 files changed, 73 insertions(+), 27 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a973211..725c3cc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -115,7 +115,7 @@ static IInternetProtocol *async_protocol = NULL; static BOOL first_data_notif = FALSE, http_is_first = FALSE, http_post_test = FALSE; static int state = 0, prot_state; -static DWORD bindf = 0, ex_priority = 0; +static DWORD bindf, ex_priority , pi; static IInternetProtocol *binding_protocol; static IInternetBindInfo *prot_bind_info; static IInternetProtocolSink *binding_sink; @@ -125,6 +125,7 @@ static BOOL binding_test; static PROTOCOLDATA protocoldata, *pdata; static DWORD prot_read; static BOOL security_problem = FALSE; +static BOOL async_read_pending; static enum { FILE_TEST, @@ -1088,7 +1089,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { - DWORD bscf = 0; + DWORD bscf = 0, pr; HRESULT hres; CHECK_EXPECT(Continue); @@ -1121,10 +1122,12 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, IHttpNegotiate_Release(http_negotiate); ok(hres == S_OK, "OnResponse failed: %08x\n", hres); - SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + if(!(pi & PI_MIMEVERIFICATION)) + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_MIMETYPEAVAILABLE, text_htmlW); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(!(pi & PI_MIMEVERIFICATION)) + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); ok(hres == S_OK, "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); @@ -1137,11 +1140,32 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, break; } - SET_EXPECT(ReportData); + pr = prot_read; + if(pi & PI_MIMEVERIFICATION) { + if(pr < 200) + SET_EXPECT(Read); + if(pr == 200) { + SET_EXPECT(Read); + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + } + } + if(!(pi & PI_MIMEVERIFICATION) || pr >= 200) + SET_EXPECT(ReportData); + hres = IInternetProtocolSink_ReportData(binding_sink, bscf, 100, 400); - CHECK_CALLED(ReportData); ok(hres == S_OK, "ReportData failed: %08x\n", hres); + if(pi & PI_MIMEVERIFICATION) { + if(pr < 200) + CHECK_CALLED(Read); + if(pr == 200) { + CLEAR_CALLED(Read); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + } + } + if(!(pi & PI_MIMEVERIFICATION) || pr >= 200) + CHECK_CALLED(ReportData); + if(prot_state == 3) prot_state = 4; @@ -1177,14 +1201,26 @@ static HRESULT WINAPI Protocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { - static BOOL b = TRUE; + if(pi & PI_MIMEVERIFICATION) { + CHECK_EXPECT2(Read); - CHECK_EXPECT(Read); + if(prot_read < 300) { + ok(pv != expect_pv, "pv == expect_pv\n"); + if(prot_read < 300) + ok(cb == 2048-prot_read, "cb=%d\n", cb); + else + ok(cb == 700, "cb=%d\n", cb); + }else { + ok(expect_pv <= pv && (BYTE*)pv < (BYTE*)expect_pv + cb, "pv != expect_pv\n"); + } + }else { + CHECK_EXPECT(Read); - ok(pv == expect_pv, "pv != expect_pv\n"); - ok(cb == 1000, "cb=%d\n", cb); + ok(pv == expect_pv, "pv != expect_pv\n"); + ok(cb == 1000, "cb=%d\n", cb); + ok(!*pcbRead, "*pcbRead = %d\n", *pcbRead); + } ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead, "*pcbRead = %d\n", *pcbRead); if(prot_state == 3) { HRESULT hres; @@ -1196,8 +1232,10 @@ static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, return S_FALSE; } - if((b = !b)) + if((async_read_pending = !async_read_pending)) { + *pcbRead = 0; return tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST ? E_PENDING : S_FALSE; + } memset(pv, 'x', 100); prot_read += *pcbRead = 100; @@ -1287,6 +1325,16 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory ClassFactory = { &ClassFactoryVtbl }; +static void init_test(int prot, BOOL is_binding) +{ + tested_protocol = prot; + binding_test = is_binding; + first_data_notif = TRUE; + prot_read = 0; + prot_state = 0; + async_read_pending = TRUE; +} + static void test_priority(IInternetProtocol *protocol) { IInternetPriority *priority; @@ -1540,7 +1588,7 @@ static void test_file_protocol(void) { static const char html_doc[] = "<HTML></HTML>"; trace("Testing file protocol...\n"); - tested_protocol = FILE_TEST; + init_test(FILE_TEST, FALSE); SetLastError(0xdeadbeef); file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -1849,7 +1897,7 @@ static void test_https_protocol(void) '.','c','o','m','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing https protocol (from urlmon)...\n"); - tested_protocol = HTTPS_TEST; + init_test(HTTPS_TEST, FALSE); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA | BINDF_FROMURLMON | BINDF_NOWRITECACHE; test_http_protocol_url(codeweavers_url, TRUE, TRUE); } @@ -1986,7 +2034,7 @@ static void test_mk_protocol(void) static const WCHAR wrong_url2[] = {'m','k',':','/','t','e','s','t','.','h','t','m','l',0}; trace("Testing mk protocol...\n"); - tested_protocol = MK_TEST; + init_test(MK_TEST, FALSE); hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); @@ -2059,8 +2107,7 @@ static void test_CreateBinding(void) static const WCHAR wsz_test[] = {'t','e','s','t',0}; trace("Testing CreateBinding...\n"); - tested_protocol = BIND_TEST; - binding_test = TRUE; + init_test(BIND_TEST, TRUE); hres = CoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); @@ -2168,19 +2215,16 @@ static void test_CreateBinding(void) IInternetSession_Release(session); } -static void test_binding(int prot) +static void test_binding(int prot, DWORD grf_pi) { IInternetProtocol *protocol; IInternetSession *session; ULONG ref; HRESULT hres; - trace("Testing %s binding...\n", debugstr_w(protocol_names[prot])); - - tested_protocol = prot; - binding_test = TRUE; - first_data_notif = TRUE; - prot_read = 0; + trace("Testing %s binding (grfPI %x)...\n", debugstr_w(protocol_names[prot]), grf_pi); + init_test(prot, TRUE); + pi = grf_pi; hres = CoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); @@ -2208,7 +2252,7 @@ static void test_binding(int prot) SET_EXPECT(Start); expect_hrResult = S_OK; - hres = IInternetProtocol_Start(protocol, binding_urls[prot], &protocol_sink, &bind_info, 0, 0); + hres = IInternetProtocol_Start(protocol, binding_urls[prot], &protocol_sink, &bind_info, pi, 0); ok(hres == S_OK, "Start failed: %08x\n", hres); CHECK_CALLED(QueryService_InternetProtocol); @@ -2264,8 +2308,10 @@ START_TEST(protocol) test_gopher_protocol(); test_mk_protocol(); test_CreateBinding(); - test_binding(FILE_TEST); - test_binding(HTTP_TEST); + test_binding(FILE_TEST, 0); + test_binding(HTTP_TEST, 0); + test_binding(FILE_TEST, PI_MIMEVERIFICATION); + test_binding(HTTP_TEST, PI_MIMEVERIFICATION); CloseHandle(event_complete); CloseHandle(event_complete2);

1 0