September 2011 - Wine-commits

Stefan Dösinger : wined3d: Make sure that lit doesn' t return NaN.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ec0ac720bfc0a981f841bf917d94cac8a2919577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0ac720bfc0a981f841bf917… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 19:50:30 2011 +0200 wined3d: Make sure that lit doesn't return NaN. --- dlls/wined3d/glsl_shader.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 837b7d4..7e736d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2713,6 +2713,7 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) * if(src.x > 0.0 && src.y > 0.0) dst.z = pow(src.y, power); * else dst.z = 0.0; * dst.w = 1.0; + * (where power = src.w clamped between -128 and 128) * * Obviously that has quite a few conditionals in it which we don't like. So the first step is this: * dst.x = 1.0 ... No further explanation needed @@ -2725,11 +2726,17 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) * * step(0.0, x) will return 1 if src.x > 0.0, and 0 otherwise. So if y is 0 we get pow(0.0 * 1.0, power), * which sets dst.z to 0. If y > 0, but x = 0.0, we get pow(y * 0.0, power), which results in 0 too. - * if both x and y are > 0, we get pow(y * 1.0, power), as it is supposed to + * if both x and y are > 0, we get pow(y * 1.0, power), as it is supposed to. + * + * Unfortunately pow(0.0 ^ 0.0) returns NaN on most GPUs, but lit with src.y = 0 and src.w = 0 returns + * a non-NaN value in dst.z. What we return doesn't matter, as long as it is not NaN. Return 0, which is + * what all Windows HW drivers and GL_ARB_vertex_program's LIT do. */ shader_addline(ins->ctx->buffer, - "vec4(1.0, max(%s, 0.0), pow(max(0.0, %s) * step(0.0, %s), clamp(%s, -128.0, 128.0)), 1.0)%s);\n", - src0_param.param_str, src1_param.param_str, src0_param.param_str, src3_param.param_str, dst_mask); + "vec4(1.0, max(%s, 0.0), %s == 0.0 ? 0.0 : " + "pow(max(0.0, %s) * step(0.0, %s), clamp(%s, -128.0, 128.0)), 1.0)%s);\n", + src0_param.param_str, src3_param.param_str, src1_param.param_str, + src0_param.param_str, src3_param.param_str, dst_mask); } /** Process the WINED3DSIO_DST instruction in GLSL:

1 0

Stefan Dösinger : d3d9: Add a LIT 0.0^0.0 test.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: c2cefe558434859d3d063b153f49a88b526ffe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cefe558434859d3d063b153… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:41:53 2011 +0200 d3d9: Add a LIT 0.0^0.0 test. --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 772aa2e..1857e2e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11779,6 +11779,8 @@ static void fp_special_test(IDirect3DDevice9 *device) static const DWORD vs_rcp2[] = {0x02000006, 0x80010000, 0x91000001}; /* rcp r0.x, -v1.x */ static const DWORD vs_rsq1[] = {0x02000007, 0x80010000, 0x90000001}; /* rsq r0.x, v1.x */ static const DWORD vs_rsq2[] = {0x02000007, 0x80010000, 0x91000001}; /* rsq r0.x, -v1.x */ + static const DWORD vs_lit[] = {0x02000010, 0x800f0000, 0x90000001, /* lit r0, v1.xxxx */ + 0x02000001, 0x80010000, 0x80aa0000}; /* mov r0.x, v0.z */ static const DWORD vs_footer[] = { @@ -11830,6 +11832,7 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000, 0x00ff0000, 0x00ff7f00}, {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, }; static const DWORD ps_code[] =

1 0

Stefan Dösinger : wined3d: Don't load/ unload unsupported texture coordinate attribs.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: efba48ccfb795efe3f2b4d095e2bf1d82bbc9a42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba48ccfb795efe3f2b4d095… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 1 18:20:19 2011 +0200 wined3d: Don't load/unload unsupported texture coordinate attribs. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/state.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ef66a47..b393c69 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2287,6 +2287,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.blends = 1; gl_info->limits.buffers = 1; gl_info->limits.textures = 1; + gl_info->limits.texture_coords = 1; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; @@ -2465,6 +2466,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); + glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); + TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c4e0513..31c62a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3222,7 +3222,7 @@ static void unload_tex_coords(const struct wined3d_gl_info *gl_info) { unsigned int texture_idx; - for (texture_idx = 0; texture_idx < gl_info->limits.texture_stages; ++texture_idx) + for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); @@ -3244,6 +3244,12 @@ static void load_tex_coords(const struct wined3d_context *context, const struct mapped_stage = device->texUnitMap[textureNo]; if (mapped_stage == WINED3D_UNMAPPED_STAGE) continue; + if (mapped_stage >= gl_info->limits.texture_coords) + { + FIXME("Attempted to load unsupported texture coordinate %u\n", mapped_stage); + continue; + } + if (coordIdx < MAX_TEXTURES && (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx)))) { const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1fac908..0325333 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1446,6 +1446,7 @@ struct wined3d_gl_limits UINT lights; UINT textures; UINT texture_stages; + UINT texture_coords; UINT fragment_samplers; UINT vertex_samplers; UINT combined_samplers;

1 0

Stefan Dösinger : ddraw: Correct D3DFMT_R5G6B5 in a test.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 0cea17037c48249b7bc4b6e09caf700fed825b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cea17037c48249b7bc4b6e09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 20:07:27 2011 +0200 ddraw: Correct D3DFMT_R5G6B5 in a test. --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 5cc80ed..a4b71fb 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -407,8 +407,8 @@ static void enumdisplaymodes(void) ddsd.dwFlags = DDSD_PIXELFORMAT; ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x7C00; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x03E0; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07e0; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit);

1 0

Stefan Dösinger : ddraw: Use a Z format suported by the driver in the visual test.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 081f39044fc62d6b63e072b2ee70db6b5fd3ee77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081f39044fc62d6b63e072b2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 20:30:00 2011 +0200 ddraw: Use a Z format suported by the driver in the visual test. --- dlls/ddraw/tests/visual.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 9026f97..7a39054 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -54,13 +54,24 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) +{ + DDPIXELFORMAT *zfmt = ctx; + + if(U1(fmt)->dwZBufferBitDepth > U1(zfmt)->dwZBufferBitDepth) + { + *zfmt = *fmt; + } + return DDENUMRET_OK; +} + static BOOL createObjects(void) { HRESULT hr; HMODULE hmod = GetModuleHandleA("ddraw.dll"); WNDCLASS wc = {0}; DDSURFACEDESC2 ddsd; - + DDPIXELFORMAT zfmt; if(!hmod) return FALSE; pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); @@ -106,14 +117,16 @@ static BOOL createObjects(void) hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); if(FAILED(hr)) goto err; + memset(&zfmt, 0, sizeof(zfmt)); + hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); + if (FAILED(hr)) goto err; + if (zfmt.dwSize == 0) goto err; + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(ddsd).ddpfPixelFormat).dwZBufferBitDepth = 32; - U3(U4(ddsd).ddpfPixelFormat).dwZBitMask = 0x00ffffff; + U4(ddsd).ddpfPixelFormat = zfmt; ddsd.dwWidth = 640; ddsd.dwHeight = 480; hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &depth_buffer, NULL);

1 0

Francois Gouget : urlmon/tests: Print the test URLs rather than their index .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 6ab1d31f04eecec32ac370e842885911b1d8c043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab1d31f04eecec32ac370e84… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:16:06 2011 +0200 urlmon/tests: Print the test URLs rather than their index. --- dlls/urlmon/tests/sec_mgr.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index afd0d97..f94e791 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1677,21 +1677,21 @@ static void test_SecurityManagerEx2(void) zone = URLZONE_INVALID; hres = pCreateUri(uriW, sec_mgr_ex2_tests[i].create_flags, 0, &uri); - ok(hres == S_OK, "CreateUri returned %08x on test %d\n", hres, i); + ok(hres == S_OK, "CreateUri returned %08x for '%s'\n", hres, sec_mgr_ex2_tests[i].uri); hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, uri, &zone, 0, NULL, NULL); if(sec_mgr_ex2_tests[i].map_todo) { todo_wine - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x on test %d\n", - hres, sec_mgr_ex2_tests[i].map_hres, i); + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlZoneToEx2 returned %08x, expected %08x for '%s'\n", + hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); todo_wine - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, - zone, i); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, + zone, sec_mgr_ex2_tests[i].uri); } else { - ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x on test %d\n", - hres, sec_mgr_ex2_tests[i].map_hres, i); - ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d on test %d\n", sec_mgr_ex2_tests[i].zone, - zone, i); + ok(hres == sec_mgr_ex2_tests[i].map_hres, "MapUrlToZoneEx2 returned %08x, expected %08x for '%s'\n", + hres, sec_mgr_ex2_tests[i].map_hres, sec_mgr_ex2_tests[i].uri); + ok(zone == sec_mgr_ex2_tests[i].zone, "Expected zone %d, but got %d for '%s'\n", sec_mgr_ex2_tests[i].zone, + zone, sec_mgr_ex2_tests[i].uri); } heap_free(uriW);

1 0

Francois Gouget : msctf/tests: Give time for the messages to arrive.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 8f8760a1a5af46315b69ed383f64df73d441128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8760a1a5af46315b69ed383… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:16:59 2011 +0200 msctf/tests: Give time for the messages to arrive. --- dlls/msctf/tests/inputprocessor.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 3262c6b..8f409c3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1993,9 +1993,20 @@ static void test_Compartments(void) static void processPendingMessages(void) { MSG msg; - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + diff = time - GetTickCount(); } }

1 0

Francois Gouget : krnl386.exe16: Add parentheses to clarify the precedence between '&' and '&&'.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: f01888da59bf850b573488a3ff190440344bc2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01888da59bf850b573488a3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:19:20 2011 +0200 krnl386.exe16: Add parentheses to clarify the precedence between '&' and '&&'. --- dlls/krnl386.exe16/ioports.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c index bda7dbf..457c64d 100644 --- a/dlls/krnl386.exe16/ioports.c +++ b/dlls/krnl386.exe16/ioports.c @@ -1013,17 +1013,17 @@ void DOSVM_outport( int port, int size, DWORD value ) { if ( !(value & 0x20) ) { - if (value & 0x02 && !(tmr_8253[0].flags & TMR_LATCHED)) + if ((value & 0x02) && !(tmr_8253[0].flags & TMR_LATCHED)) { tmr_8253[0].flags |= TMR_LATCHED; tmr_8253[0].latch = get_timer_val(0); } - if (value & 0x04 && !(tmr_8253[1].flags & TMR_LATCHED)) + if ((value & 0x04) && !(tmr_8253[1].flags & TMR_LATCHED)) { tmr_8253[1].flags |= TMR_LATCHED; tmr_8253[1].latch = get_timer_val(1); } - if (value & 0x08 && !(tmr_8253[2].flags & TMR_LATCHED)) + if ((value & 0x08) && !(tmr_8253[2].flags & TMR_LATCHED)) { tmr_8253[2].flags |= TMR_LATCHED; tmr_8253[2].latch = get_timer_val(2);

1 0

Francois Gouget : shell32: Add parentheses to clarify the precedence between '&' and '||'.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: f5dede7c197799d5beea5ee16f98bc1258d3919d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dede7c197799d5beea5ee16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:19:33 2011 +0200 shell32: Add parentheses to clarify the precedence between '&' and '||'. --- dlls/shell32/pidl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 71b8f93..c394e5b 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2243,7 +2243,7 @@ FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) { /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP * style with a FileStructW member. If we switch all our shellfolder-implementations to * the new format, this won't be a problem. For now, we do as many sanity checks as possible. */ - if (cbOffset & 0x1 || /* FileStructW member is word aligned in the pidl */ + if ((cbOffset & 0x1) || /* FileStructW member is word aligned in the pidl */ /* FileStructW is positioned after FileStruct */ cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) + sizeof(FileStruct) || /* There has to be enough space at cbOffset in the pidl to hold FileStructW and cbOffset */

1 0

Francois Gouget : winhlp32: Add parentheses to clarify the precedence between '&' and '&&'.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ddaaa54b151108f26921f5d13bddec70cf7d841d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddaaa54b151108f26921f5d13… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:19:40 2011 +0200 winhlp32: Add parentheses to clarify the precedence between '&' and '&&'. --- programs/winhlp32/hlpfile.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 2f97a02..fcdca60 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1367,14 +1367,14 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, BYTE brdr = *format++; short w; - if (brdr & 0x01 && !HLPFILE_RtfAddControl(rd, "\\box")) goto done; - if (brdr & 0x02 && !HLPFILE_RtfAddControl(rd, "\\brdrt")) goto done; - if (brdr & 0x04 && !HLPFILE_RtfAddControl(rd, "\\brdrl")) goto done; - if (brdr & 0x08 && !HLPFILE_RtfAddControl(rd, "\\brdrb")) goto done; - if (brdr & 0x10 && !HLPFILE_RtfAddControl(rd, "\\brdrr")) goto done; - if (brdr & 0x20 && !HLPFILE_RtfAddControl(rd, "\\brdrth")) goto done; + if ((brdr & 0x01) && !HLPFILE_RtfAddControl(rd, "\\box")) goto done; + if ((brdr & 0x02) && !HLPFILE_RtfAddControl(rd, "\\brdrt")) goto done; + if ((brdr & 0x04) && !HLPFILE_RtfAddControl(rd, "\\brdrl")) goto done; + if ((brdr & 0x08) && !HLPFILE_RtfAddControl(rd, "\\brdrb")) goto done; + if ((brdr & 0x10) && !HLPFILE_RtfAddControl(rd, "\\brdrr")) goto done; + if ((brdr & 0x20) && !HLPFILE_RtfAddControl(rd, "\\brdrth")) goto done; if (!(brdr & 0x20) && !HLPFILE_RtfAddControl(rd, "\\brdrs")) goto done; - if (brdr & 0x40 && !HLPFILE_RtfAddControl(rd, "\\brdrdb")) goto done; + if ((brdr & 0x40) && !HLPFILE_RtfAddControl(rd, "\\brdrdb")) goto done; /* 0x80: unknown */ w = GET_SHORT(format, 0); format += 2;

1 0