wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Alexandre Julliard : wininet: Centralize detection of chunked mode and add a flag for it in the http request structure .
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: e531ccd6b0fd93bafa96f0ae07d8bee9e77e38ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e531ccd6b0fd93bafa96f0ae0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 16:42:44 2009 +0200 wininet: Centralize detection of chunked mode and add a flag for it in the http request structure. --- dlls/wininet/http.c | 62 ++++++++++++++++++++++------------------------- dlls/wininet/internet.h | 1 + 2 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9c75862..a4a5f76 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -138,6 +138,29 @@ static LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) return &req->pCustHeaders[HeaderIndex]; } +/* set the request content length based on the headers */ +static DWORD set_content_length( LPWININETHTTPREQW lpwhr ) +{ + static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; + WCHAR encoding[20]; + DWORD size; + + size = sizeof(lpwhr->dwContentLength); + if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, + &lpwhr->dwContentLength, &size, NULL)) + lpwhr->dwContentLength = ~0u; + + size = sizeof(encoding); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &size, NULL) && + !strcmpiW(encoding, szChunked)) + { + lpwhr->dwContentLength = ~0u; + lpwhr->read_chunked = TRUE; + } + + return lpwhr->dwContentLength; +} + /*********************************************************************** * HTTP_Tokenize (internal) * @@ -753,13 +776,7 @@ static BOOL HTTP_HttpEndRequestW(LPWININETHTTPREQW lpwhr, DWORD dwFlags, DWORD_P /* process cookies here. Is this right? */ HTTP_ProcessCookies(lpwhr); - dwBufferSize = sizeof(lpwhr->dwContentLength); - if (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &lpwhr->dwContentLength, &dwBufferSize, NULL)) - lpwhr->dwContentLength = -1; - - if (lpwhr->dwContentLength == 0) - HTTP_FinishedReading(lpwhr); + if (!set_content_length( lpwhr )) HTTP_FinishedReading(lpwhr); if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT)) { @@ -1740,15 +1757,8 @@ static DWORD HTTP_ReadChunked(WININETHTTPREQW *req, void *buffer, DWORD size, DW static DWORD HTTPREQ_Read(WININETHTTPREQW *req, void *buffer, DWORD size, DWORD *read, BOOL sync) { - WCHAR encoding[20]; - DWORD buflen = sizeof(encoding); - static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; - - if (HTTP_HttpQueryInfoW(req, HTTP_QUERY_TRANSFER_ENCODING, encoding, &buflen, NULL) && - !strcmpiW(encoding, szChunked)) - { + if (req->read_chunked) return HTTP_ReadChunked(req, buffer, size, read, sync); - } else return HTTP_Read(req, buffer, size, read, sync); } @@ -3124,6 +3134,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) NETCON_close(&lpwhr->netConnection); if (!HTTP_ResolveName(lpwhr)) return FALSE; if (!NETCON_init(&lpwhr->netConnection, lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) return FALSE; + lpwhr->read_chunked = FALSE; } } else @@ -3402,8 +3413,6 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, { DWORD dwBufferSize; DWORD dwStatusCode; - WCHAR encoding[20]; - static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); @@ -3421,22 +3430,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_ProcessCookies(lpwhr); - dwBufferSize = sizeof(lpwhr->dwContentLength); - if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, - &lpwhr->dwContentLength,&dwBufferSize,NULL)) - lpwhr->dwContentLength = -1; - - if (lpwhr->dwContentLength == 0) - HTTP_FinishedReading(lpwhr); - - /* Correct the case where both a Content-Length and Transfer-encoding = chunked are set */ - - dwBufferSize = sizeof(encoding); - if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_TRANSFER_ENCODING, encoding, &dwBufferSize, NULL) && - !strcmpiW(encoding, szChunked)) - { - lpwhr->dwContentLength = -1; - } + if (!set_content_length( lpwhr )) HTTP_FinishedReading(lpwhr); dwBufferSize = sizeof(dwStatusCode); if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE, @@ -3826,6 +3820,8 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) bSuccess = TRUE; lend: + lpwhr->read_chunked = FALSE; + TRACE("%d <--\n", bSuccess); return bSuccess; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index f69c424..fcd95d9 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -206,6 +206,7 @@ typedef struct LPWSTR lpszCacheFile; struct HttpAuthInfo *pAuthInfo; struct HttpAuthInfo *pProxyAuthInfo; + BOOL read_chunked; /* are we reading in chunked mode? */ } WININETHTTPREQW, *LPWININETHTTPREQW;

1 0

Dmitry Timoshkov : system.sfd: Make lower case latin letters in 18 pixel Japanese bitmap font not bold.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: 073bd5a1b84a02c2c45a5e6bd219ebdeba276af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073bd5a1b84a02c2c45a5e6bd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 14 19:53:23 2009 +0900 system.sfd: Make lower case latin letters in 18 pixel Japanese bitmap font not bold. I just copied them from Wine's 16 pixel MS Sans Serif font. --- fonts/system.sfd | 94 ++++++++++++++++++++++++++--------------------------- fonts/system.ttf | Bin 24776 -> 24820 bytes 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index 44cdba2..c84ad8e 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -46,10 +46,10 @@ LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge 1.0 (http://fontf Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List -DisplaySize: 16 +DisplaySize: 18 AntiAlias: 0 FitToEm: 1 -WinInfo: 42 42 15 +WinInfo: 38 38 14 OnlyBitmaps: 1 BeginChars: 65536 484 @@ -4696,58 +4696,58 @@ BDFChar: 63 95 8 0 7 -2 -2 rr<$! BDFChar: 64 96 4 1 3 11 13 J3Y4W -BDFChar: 65 97 8 1 6 0 6 -Gg$SDbfkG7 +BDFChar: 65 97 8 1 7 0 6 +G_CHtKS4XO BDFChar: 66 98 8 1 6 0 9 -^qdb\bfn;TbkM/< +J:N0[`.Wes`4,dI BDFChar: 67 99 8 1 6 0 6 -Gg*t=^s%$' +G_CTtJ:r.I BDFChar: 68 100 8 1 6 0 9 -$k*Plbfn;Tb^9Bj +"9\jLN.ck;N-#%" BDFChar: 69 101 9 1 6 0 6 -Gg+D,^s%$' -BDFChar: 70 102 5 0 3 0 9 -0OS;X?smAM?sis7 +G_CbJJ:r.I +BDFChar: 70 102 5 0 2 0 9 ++@&3M5X7S"5X5;L BDFChar: 71 103 8 1 6 -3 6 -I*BgYbfkGCb]j*f -BDFChar: 72 104 8 1 6 0 9 -^qdb\bfn;Tbfg%e +FGtm+KT(!UKQmIs +BDFChar: 72 104 8 1 5 0 9 +J:N0SaG>Y.Lkl$2 BDFChar: 73 105 3 1 2 0 9 -^q]rc^qdb$^q]pM -BDFChar: 74 106 4 0 2 -3 9 -?sitB?smAM?smAM^]4?7 +J,fS"J:N0#J:IV" +BDFChar: 74 106 4 0 1 -3 9 +5QCdL5X7S"5X7S"J,fQL BDFChar: 75 107 7 1 6 0 9 -^qdb0f^RhgfZX<q +J:N0#Lle:VLkGa. BDFChar: 76 108 3 1 2 0 9 -^qdb$^qdb$^q]pM +J:N0#J:N0#J:IV" BDFChar: 77 109 11 1 10 0 6 -s+&>/beVH<beVH<beO2Y -BDFChar: 78 110 8 1 6 0 6 -prpt+bfn92 +ZN/4"Lk(;3Lk(;3Lk#I* +BDFChar: 78 110 8 1 5 0 6 +YfMWVLkpie BDFChar: 79 111 9 1 6 0 6 -Gg+CUbfk;3 +G_Ca'KS4RM BDFChar: 80 112 8 1 6 -3 6 -prpt+bfojt^q]pM +\AX&RKZ(BNJ:IV" BDFChar: 81 113 8 1 6 -3 6 -I*BgYbfkGC$k*+9 -BDFChar: 82 114 6 1 4 0 6 -nDM*t^qd_c +FGtm+KT(!U"9\]) +BDFChar: 82 114 6 1 3 0 6 +TYQ).J:N.M BDFChar: 83 115 7 1 6 0 6 -Gg'PL(sI4) +E/9$`#`*F" BDFChar: 84 116 5 0 3 0 8 -?srJ3?smAM0E;(Q +5X=6m5X7S"+92BA BDFChar: 85 117 8 1 6 0 6 -bfn;TbfkG7 -BDFChar: 86 118 7 1 6 0 6 -bfn:%GVCfO -BDFChar: 87 119 9 1 8 0 6 -_qWr#IV*0l +LkpkCLmViU +BDFChar: 86 118 7 0 6 0 6 +Jq?BY-n#W, +BDFChar: 87 119 9 0 8 0 6 +Lk(;3Lk&J*<<+3C+ohTC BDFChar: 88 120 7 0 6 0 6 -`b[UG3,HS7 +KLddN0M$is BDFChar: 89 121 7 0 6 -3 6 -`l;n44?+/p0OOk\ -BDFChar: 90 122 7 1 6 0 6 -r!XDr@)2[? +Jq?BY-n#W<+M[sW +BDFChar: 90 122 7 1 4 0 6 +n.6^-5_/>( BDFChar: 91 123 5 1 3 -2 12 +@&1W5X7Sb5X7S"5X6Fl BDFChar: 92 124 3 1 1 -2 13 @@ -4948,7 +4948,7 @@ BDFChar: 211 222 6 0 4 12 15 OH<"( BDFChar: 212 223 5 0 3 12 15 @$$IX -BDFChar: 213 224 8 1 6 0 10 +BDFChar: 213 224 9 1 6 0 10 E%i+/Gg$SDbfkG7 BDFChar: 214 225 8 1 6 0 10 3&"_?Gg$SDbfkG7 @@ -5002,23 +5002,21 @@ BDFChar: 353 158 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm BDFChar: 354 159 8 1 6 -1 13 r;?Kjr;?Kjr;?Kjr;?Hm -BDFChar: 475 302 5 1 3 -2 12 +BDFChar: 469 1108 5 1 3 -2 12 i'9Om5X7S"5X7S"i':ZM -BDFChar: 476 303 3 1 2 -2 9 +BDFChar: 470 1028 3 1 2 -2 9 ^q]rc^qdb$^qbK9 -BDFChar: 477 362 11 2 8 0 14 +BDFChar: 471 1118 11 2 8 0 14 HiSbMJqAT+JqAT+Jj_Qu -BDFChar: 478 363 8 1 6 0 9 +BDFChar: 472 1038 8 1 6 0 9 r;6Q=bfn;Tb^9Bj -BDFChar: 479 370 11 2 8 -2 12 +BDFChar: 473 1168 11 2 8 -2 12 JqAT+JqAT+JqASB3!]om -BDFChar: 480 371 8 1 6 -2 6 +BDFChar: 474 1169 8 1 6 -2 6 bfn;TbfkG?$ig8- -BDFChar: 481 278 7 1 5 0 14 +BDFChar: 475 302 7 1 5 0 14 +9;1eJ:N1>J:N0#J:RCp -BDFChar: 482 279 9 1 6 0 9 +BDFChar: 476 303 9 1 6 0 9 0JEKObfojtb]j*f -BDFChar: 483 27 18 0 0 0 0 -z EndBitmapFont EndSplineFont diff --git a/fonts/system.ttf b/fonts/system.ttf index 7d44945..7e79ed0 100644 Binary files a/fonts/system.ttf and b/fonts/system.ttf differ

1 0

Stefan Dösinger : wined3d: Centralize WINED3DSPDM_SATURATE handling.
by Alexandre Julliard 14 May '09

14 May '09

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

Stefan Dösinger : wined3d: Fix remaining incorrect dst register getters.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: aeddd2da635751050ce0355ddfd690fcb50daa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeddd2da635751050ce0355dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:46:14 2009 +0200 wined3d: Fix remaining incorrect dst register getters. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++---------------------------- 1 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1e1c702..bab6b27 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -792,10 +792,8 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[2][50]; - char dst_wmask[20]; DWORD sampler_code = dst->reg.idx; BOOL has_bumpmat = FALSE; - BOOL is_color; int i; for(i = 0; i < This->numbumpenvmatconsts; i++) { @@ -807,10 +805,6 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) } } - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); - shader_arb_get_write_mask(ins, dst, dst_wmask); - strcat(dst_name, dst_wmask); - 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]); @@ -1389,14 +1383,13 @@ static void pshader_hw_texdepth(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]; - BOOL is_color; /* texdepth has an implicit destination, the fragment depth value. It's only parameter, * which is essentially an input, is the destination register because it is the first * parameter. According to the msdn, this must be register r5, but let's keep it more flexible - * here + * here(writemasks/swizzles are not valid on texdepth) */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_name, &is_color); + shader_arb_get_dst_param(ins, dst, dst_name); /* According to the msdn, the source register(must be r5) is unusable after * the texdepth instruction, so we're free to modify it @@ -1438,18 +1431,12 @@ static void pshader_hw_texdp3(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; char src0[50]; char dst_str[50]; - char dst_mask[6]; SHADER_BUFFER *buffer = ins->ctx->buffer; - BOOL is_color; /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst, dst_mask); - + shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 %s%s, fragment.texcoord[%u], %s;\n", dst_str, dst_mask, dst->reg.idx, src0); - - /* TODO: Handle output modifiers */ + shader_addline(buffer, "DP3 %s, fragment.texcoord[%u], %s;\n", dst_str, dst->reg.idx, src0); } /** Process the WINED3DSIO_TEXM3X3 instruction in ARB @@ -1459,16 +1446,12 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_dst_param *dst = &ins->dst[0]; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[50]; - char dst_mask[6]; char src0[50]; - BOOL is_color; - - shader_arb_get_register_name(ins->ctx->shader, &dst->reg, dst_str, &is_color); - shader_arb_get_write_mask(ins, dst, dst_mask); + shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); - shader_addline(buffer, "MOV %s%s, TMP;\n", dst_str, dst_mask); + shader_addline(buffer, "MOV %s, TMP;\n", dst_str); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB: @@ -1590,18 +1573,14 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - char dst_wmask[20]; 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, &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, %s, TMP;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + shader_addline(buffer, "MUL%s %s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, src_name); } @@ -1615,15 +1594,11 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_name[50]; char src_name[50]; - char dst_wmask[20]; 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, &ins->dst[0], dst_name); shader_arb_get_src_param(ins, &ins->src[0], 0, src_name); - shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + shader_addline(buffer, "SCS%s %s, %s;\n", sat ? "_SAT" : "", dst_name, src_name); }

1 0

Stefan Dösinger : wined3d: Fix a few more hardcoded pixel shader registers.
by Alexandre Julliard 14 May '09

14 May '09

Module: wine Branch: master Commit: bcb20ae96c0b19918c5a13ebb851f92aecf8b014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb20ae96c0b19918c5a13ebb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:42:18 2009 +0200 wined3d: Fix a few more hardcoded pixel shader registers. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5fa4193..1e1c702 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1266,10 +1266,10 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) DWORD flags; DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, fragment.texcoord[%u], %s;\n", reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; @@ -1297,14 +1297,14 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1318,7 +1318,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins DWORD reg = ins->dst[0].reg.idx; SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); @@ -1340,7 +1340,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TMP2;\n"); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1354,7 +1354,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) DWORD reg = ins->dst[0].reg.idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; - char dst_str[8]; + char dst_str[50]; char src0_name[50]; char src1_name[50]; @@ -1378,7 +1378,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -%s;\n", src1_name); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; @@ -1421,13 +1421,13 @@ static void pshader_hw_texdp3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_idx = ins->dst[0].reg.idx; char src0[50]; - char dst_str[8]; + char dst_str[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "MOV TMP, 0.0;\n"); shader_addline(buffer, "DP3 TMP.x, fragment.texcoord[%u], %s;\n", sampler_idx, src0); - sprintf(dst_str, "T%u", sampler_idx); + shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_hw_sample(ins, sampler_idx, dst_str, "TMP", FALSE /* Only one coord, can't be projected */, FALSE); } @@ -1469,8 +1469,6 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0); shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); shader_addline(buffer, "MOV %s%s, TMP;\n", dst_str, dst_mask); - - /* TODO: Handle output modifiers */ } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB:

1 0

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

14 May '09

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

Stefan Dösinger : wined3d: Tidy up pshader_hw_dp2add.
by Alexandre Julliard 14 May '09

14 May '09

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

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

14 May '09

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

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

14 May '09

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/tab: Fix TabCtrl_* macros.
by Alexandre Julliard 14 May '09

14 May '09

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

← Newer
1
...
45
46
47
48
49
50
51
...
80
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 May 2009