February 2009 - Wine-Commits

Michael Stefaniuc : wined3d: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 118c75a8c776289cafc6cad369ef71de8edb441b URL: http://source.winehq.org/git/wine.git/?a=commit;h=118c75a8c776289cafc6cad36… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 3 09:36:07 2009 +0100 wined3d: Remove superfluous pointer casts. --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- dlls/wined3d/ati_fragment_shader.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 22 +++++++++++----------- dlls/wined3d/query.c | 18 +++++++++--------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/utils.c | 2 +- 9 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=118c75a8c776289cafc6c…

1 0

Dmitry Timoshkov : winex11.drv: The MAT2 parameter of GetGlyphOutline is mandatory.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: f6230530223210f4332d9510cfd3ae3f4aa9d949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6230530223210f4332d9510c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 3 17:54:48 2009 +0800 winex11.drv: The MAT2 parameter of GetGlyphOutline is mandatory. --- dlls/winex11.drv/opengl.c | 6 ++++-- dlls/winex11.drv/xrender.c | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2aa5afa..d43f03e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1902,7 +1902,8 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD wine_tsx11_unlock(); for (glyph = first; glyph < first + count; glyph++) { - unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL); + static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; + unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, &identity); unsigned int height, width_int; TRACE("Glyph : %3d / List : %d\n", glyph, listBase); @@ -1920,7 +1921,8 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); gl_bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } - if (GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, NULL) == GDI_ERROR) goto error; + if (GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, size, bitmap, &identity) == GDI_ERROR) + goto error; if (TRACE_ON(wgl)) { unsigned int height, width, bitmask; unsigned char *bitmap_ = bitmap; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index fd405be..a7414a6 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -666,6 +666,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) XRenderPictFormat pf; unsigned long pf_mask; static const char zero[4]; + static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; switch(format) { case AA_Grey: @@ -691,15 +692,13 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) break; } - buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, - NULL); + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); if(buflen == GDI_ERROR) { if(format != AA_None) { format = AA_None; entry->aa_default = AA_None; ggo_format = GGO_GLYPH_INDEX | GGO_BITMAP; - buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, - NULL); + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } if(buflen == GDI_ERROR) { WARN("GetGlyphOutlineW failed\n"); @@ -800,7 +799,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buflen); - GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, buflen, buf, NULL); + GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, buflen, buf, &identity); formatEntry->realized[glyph] = TRUE; TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d\n",

1 0

Michael Stefaniuc : wined3d: Remove some unused defines.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: cc6b283d3ab6b9f232a3ef0cd557f2ffcbb6a974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6b283d3ab6b9f232a3ef0cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 3 09:35:24 2009 +0100 wined3d: Remove some unused defines. --- dlls/wined3d/baseshader.c | 2 -- dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/resource.c | 1 - dlls/wined3d/utils.c | 4 ---- dlls/wined3d/vertexshader.c | 2 -- 5 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a270b0c..8ecc455 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -31,8 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#define GLNAME_REQUIRE_GLSL ((const char *)1) - static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); static inline BOOL shader_is_version_token(DWORD token) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index daea9df..0be352c 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -34,8 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info -#define GLNAME_REQUIRE_GLSL ((const char *)1) - static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { TRACE("iface %p, riid %s, ppobj %p\n", iface, debugstr_guid(riid), ppobj); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 1231b34..b4e49b1 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -25,7 +25,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info HRESULT resource_init(struct IWineD3DResourceClass *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1d79ef8..189c51c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1365,8 +1365,6 @@ void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, B } #undef GLINFO_LOCATION -#define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info - /* This small helper function is used to convert a bitmask into the number of masked bits */ unsigned int count_bits(unsigned int mask) { @@ -1457,8 +1455,6 @@ BOOL getDepthStencilBits(WINED3DFORMAT fmt, short *depthSize, short *stencilSize return TRUE; } -#undef GLINFO_LOCATION - /* DirectDraw stuff */ WINED3DFORMAT pixelformat_for_depth(DWORD depth) { switch(depth) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 339d955..d51ab9f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -37,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* TODO: Vertex and Pixel shaders are almost identical, the only exception being the way that some of the data is looked up or the availability of some of the data i.e. some instructions are only valid for pshaders and some for vshaders because of this the bulk of the software pipeline can be shared between pixel and vertex shaders... and it wouldn't surprise me if the program can be cross compiled using a large body of shared code */ -#define GLNAME_REQUIRE_GLSL ((const char *)1) - CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { /* This table is not order or position dependent. */

1 0

Vincent Pelletier : dinput: Fix effect direction conversion from DIEFF_CARTESIAN coordinates.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 7e7970830fe5e8902a84a580ca66a853926b10f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7970830fe5e8902a84a580c… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Mon Feb 2 23:36:07 2009 +0100 dinput: Fix effect direction conversion from DIEFF_CARTESIAN coordinates. --- dlls/dinput/effect_linuxinput.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index b309af9..3c86a34 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -55,6 +55,7 @@ struct LinuxInputEffectImpl struct ff_effect effect; /* Effect data */ int gain; /* Effect gain */ + int first_axis_is_x; int* fd; /* Parent device */ struct list *entry; /* Entry into the parent's list of effects */ }; @@ -548,6 +549,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( return DIERR_INVALIDPARAM; else if (peff->cAxes < 1) return DIERR_INCOMPLETEEFFECT; + This->first_axis_is_x = peff->rgdwAxes[0] == DIJOFS_X; } /* some of this may look funky, but it's 'cause the linux driver and directx have @@ -572,15 +574,15 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( } } else { /* two axes */ if (peff->dwFlags & DIEFF_CARTESIAN) { - /* avoid divide-by-zero */ - if (peff->rglDirection[1] == 0) { - if (peff->rglDirection[0] >= 0) - This->effect.direction = 0x4000; - else if (peff->rglDirection[0] < 0) - This->effect.direction = 0xC000; + LONG x, y; + if (This->first_axis_is_x) { + x = peff->rglDirection[0]; + y = peff->rglDirection[1]; } else { - This->effect.direction = (int)(atan(peff->rglDirection[0] / peff->rglDirection[1]) * 0x7FFF / (3 * M_PI)); + x = peff->rglDirection[1]; + y = peff->rglDirection[0]; } + This->effect.direction = (int)((3 * M_PI / 2 - atan2(y, x)) * -0x7FFF / M_PI); } else { /* Polar and spherical are the same for 2 axes */ /* Precision is important here, so we do double math with exact constants */

1 0

Ulrich Czekalla : user32: Don' t scale draw text margin params by character width units.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 209820c42864579a128e54913cd6cbd3c046625d URL: http://source.winehq.org/git/wine.git/?a=commit;h=209820c42864579a128e54913… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Mon Feb 2 13:47:00 2009 -0500 user32: Don't scale draw text margin params by character width units. Values passed in DRAWTEXTPARAMS are already in average character width units. --- dlls/user32/tests/text.c | 17 +++++++++++++++++ dlls/user32/text.c | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index fc554ae..47f5274 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -316,6 +316,23 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextExA\n"); ok(dtp.uiLengthDrawn==1337, "invalid dtp.uiLengthDrawn = %i\n",dtp.uiLengthDrawn); + /* Margin calculations */ + dtp.cbSize = sizeof(dtp); + dtp.iLeftMargin = 0; + dtp.iRightMargin = 0; + SetRect( &rect, 0, 0, 0, 0); + DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); + textlen = rect.right; /* Width without margin */ + dtp.iLeftMargin = 8; + SetRect( &rect, 0, 0, 0, 0); + DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); + ok(rect.right==dtp.iLeftMargin+textlen ,"Incorrect left margin calculated rc(%d,%d)\n", rect.left, rect.right); + dtp.iLeftMargin = 0; + dtp.iRightMargin = 8; + SetRect( &rect, 0, 0, 0, 0); + DrawTextExA(hdc, text, -1, &rect, DT_CALCRECT, &dtp); + ok(rect.right==dtp.iRightMargin+textlen ,"Incorrect right margin calculated rc(%d,%d)\n", rect.left, rect.right); + /* Wide char versions */ SetRect( &rect, 10,10, 100, 100); SetLastError( 0); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 2b864a2..b8aad0b 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -900,8 +900,8 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (dtp) { - lmargin = dtp->iLeftMargin * tm.tmAveCharWidth; - rmargin = dtp->iRightMargin * tm.tmAveCharWidth; + lmargin = dtp->iLeftMargin; + rmargin = dtp->iRightMargin; if (!(flags & (DT_CENTER | DT_RIGHT))) x += lmargin; dtp->uiLengthDrawn = 0; /* This param RECEIVES number of chars processed */

1 0

Hwang YunSong(황윤성) : crypt32: Updated Korean resource.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: a1f05593f3c8ce62596628dbf787123884b7549b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1f05593f3c8ce62596628dbf… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Feb 2 09:59:34 2009 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 2968e52..51e3fc3 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -172,6 +172,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "��" IDS_LOCALIZEDNAME_CA "�߰� �� " IDS_LOCALIZEDNAME_ADDRESSBOOK "�ٸ� ��" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "�ŷ�� ִ� ��" } STRINGTABLE DISCARDABLE

1 0

Hwang YunSong(황윤성) : cryptui: Updated Korean resource.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: b86f626528ddbbca42a3e48954069f2d6dc15e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86f626528ddbbca42a3e4895… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Feb 2 09:59:07 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index b08671b..195a3f1 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -143,6 +143,26 @@ STRINGTABLE DISCARDABLE IDS_PURPOSE_CA_EXCHANGE "�� Ű ��" IDS_PURPOSE_KEY_RECOVERY_AGENT "Ű �� Ʈ" IDS_PURPOSE_DS_EMAIL_REPLICATION "��丮 �� ڿ�� " + IDS_EXPORT_WIZARD "�� " + IDS_EXPORT_FORMAT_TITLE "�� " + IDS_EXPORT_FORMAT_SUBTITLE "�� ." + IDS_EXPORT_FILE_TITLE "�� ̸�" + IDS_EXPORT_FILE_SUBTITLE "�� ̸� ��." + IDS_EXPORT_FILE_EXISTS "�� ̹� ��մϴ�.�� ðڽ��ϱ�?" + IDS_EXPORT_FILTER_CERT "DER-��ȣȭ�� ̳ʸ� X.509 (*.cer)" + IDS_EXPORT_FILTER_BASE64_CERT "Base64-��ȣȭ�� X.509 (*.cer)" + IDS_EXPORT_FILTER_CRL "�� (*.crl)" + IDS_EXPORT_FILTER_CTL "�� ŷ� �� (*.stl)" + IDS_EXPORT_FILTER_CMS "CMS/PKCS #7 �޼�� (*.p7b)" + IDS_EXPORT_FILTER_PFX "�� ȯ (*.pfx)" + IDS_EXPORT_FILTER_SERIALIZED_CERT_STORE "�� (*.sst)" + IDS_EXPORT_FORMAT "�� " + IDS_EXPORT_INCLUDE_CHAIN "�� ο� �ִ� �� " + IDS_EXPORT_KEYS "�� Ű" + IDS_YES "��" + IDS_NO "�ƴϿ�" + IDS_EXPORT_SUCCEEDED "�� ." + IDS_EXPORT_FAILED "�� ." } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -330,3 +350,67 @@ BEGIN PUSHBUTTON "Ȯ��", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON PUSHBUTTON "��", IDCANCEL, 190,155,51,14 END + + +IDD_EXPORT_WELCOME DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� 翡 �� ȯ��մϴ�", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "�� ,�� ,�� ŷ� �� ҷκ�� Ϸ� �� ̴ٰϴ�.", + -1, 115,33,195,16 + LTEXT " �� ̳� �� ſ� ��ϴ� ��ǻ�͸� �ſ��ϴ� �� ˴ϴ�. �� ޼�� ϰ� ��ϴ� �� ˴ϴ�. �� Ҵ� ��, �� ı� ��, �� ŷ� �� Դϴ�..", + -1, 115,56,195,40 + LTEXT "�� ϽǷ��, <��>�� Ŭ��Ͻʽÿ�.", + -1, 115,103,195,8 +END + +IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� :", -1, 21,1,195,10 + AUTORADIOBUTTON "&DER-��ȣȭ�� X.509 (.cer)", + IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "Ba&se64-��ȣȭ�� X.509 (.cer):", + IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "��ȣ �޽�� ǥ��/PKCS #7 �޽��(&C) (.p7b)", + IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + CHECKBOX "�� ο� �ִ� �� (&I)", + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + AUTORADIOBUTTON "�� ȯ(&P)/PKCS #12 (.pfx)", + IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + CHECKBOX "�� ο� �ִ� �� (&U)", + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "�� ȣȭ ��(&E)", + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + CHECKBOX "��Ⱑ ��ϸ� �� Ű ��(&K)", + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED +END + +IDD_EXPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� ̸�(&F):", -1, 21,1,195,10 + EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP + PUSHBUTTON "ã��(&R)...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 +END + +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� Ϸ��ϴ� ��", IDC_EXPORT_TITLE, + 115,1,195,40 + LTEXT "�� Ϸ��ϴ� �� Ͽ��ϴ�.", + -1, 115,33,195,24 + LTEXT "�� ߽��ϴ�:", + -1, 115,57,195,12 + CONTROL "", IDC_EXPORT_SETTINGS, "SysListView32", + LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, + 115,67,174,100 +END

1 0

Juan Lang : mapi32: Fix some test failures on Win9x.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 70c572feefeb7edd62c5f101ef7de3cf3c442baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c572feefeb7edd62c5f101e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 2 10:20:19 2009 -0800 mapi32: Fix some test failures on Win9x. --- dlls/mapi32/tests/util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 2ae42f1..9645a82 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -151,7 +151,8 @@ static void test_CbOfEncoded(void) memset(buff, '\0', sizeof(buff)); memset(buff, '?', i); ulRet = pCbOfEncoded(buff); - ok(ulRet == ulExpected, "CbOfEncoded(length %d): expected %d, got %d\n", + ok(ulRet == ulExpected || broken(ulExpected == 0) /* Win9x */, + "CbOfEncoded(length %d): expected %d, got %d\n", i, ulExpected, ulRet); } }

1 0

Juan Lang : mapi32: Fix a couple more test failures on Win9x.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 98dec479f2d875d2771d6619cd77df35b5a7d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dec479f2d875d2771d6619c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 2 10:20:58 2009 -0800 mapi32: Fix a couple more test failures on Win9x. --- dlls/mapi32/tests/util.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 9645a82..d57fe50 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -51,7 +51,8 @@ static void test_SwapPword(void) shorts[1] = 0x10ff; shorts[2] = 0x2001; pSwapPword(shorts, 2); - ok(shorts[0] == 0x01ff && shorts[1] == 0xff10 && shorts[2] == 0x2001, + ok((shorts[0] == 0x01ff && shorts[1] == 0xff10 && shorts[2] == 0x2001) || + broken(shorts[0] == 0xff01 && shorts[1] == 0x10ff && shorts[2] == 0x2001) /* Win9x */, "Expected {0x01ff,0xff10,0x2001}, got {0x%04x,0x%04x,0x%04x}\n", shorts[0], shorts[1], shorts[2]); } @@ -68,7 +69,8 @@ static void test_SwapPlong(void) longs[1] = 0x1000ffff; longs[2] = 0x20000001; pSwapPlong(longs, 2); - ok(longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001, + ok((longs[0] == 0x0100ffff && longs[1] == 0xffff0010 && longs[2] == 0x20000001) || + broken(longs[0] == 0xffff0001 && longs[1] == 0x1000ffff && longs[2] == 0x20000001) /* Win9x */, "Expected {0x0100ffff,0xffff0010,0x20000001}, got {0x%08x,0x%08x,0x%08x}\n", longs[0], longs[1], longs[2]); }

1 0

Andrew Talbot : ole32: Remove superfluous shadow variables.
by Alexandre Julliard Feb. 3, 2009

Feb. 3, 2009

Module: wine Branch: master Commit: 772a9b3540d5e02929303a867049e02665657a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772a9b3540d5e02929303a867… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 2 17:50:12 2009 +0000 ole32: Remove superfluous shadow variables. --- dlls/ole32/comcat.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index f757cf9..ace4789 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -226,12 +226,6 @@ static HRESULT COMCAT_IsClassOfCategories( HKEY key, struct class_categories const* categories) { - static const WCHAR impl_keyname[] = { 'I', 'm', 'p', 'l', 'e', 'm', 'e', 'n', - 't', 'e', 'd', ' ', 'C', 'a', 't', 'e', - 'g', 'o', 'r', 'i', 'e', 's', 0 }; - static const WCHAR req_keyname[] = { 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'd', - ' ', 'C', 'a', 't', 'e', 'g', 'o', 'r', - 'i', 'e', 's', 0 }; HKEY subkey; HRESULT res; DWORD index;

1 0