wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Aric Stewart : usp10: Add a few chars that Windows itemizes as punctuation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

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

1 0

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

08 Nov '11

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

1 0

Jacek Caban : mshtml: Always use IUri-based nsIRI:: GetAsciiHost implementation.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 78e4d3d25c13576259f701a707fe40867c1dda5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e4d3d25c13576259f701a70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 16:17:40 2011 +0100 mshtml: Always use IUri-based nsIRI::GetAsciiHost implementation. --- dlls/mshtml/nsio.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index aa34ddd..ff93773 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2289,12 +2289,8 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%p)\n", This, aAsciiHost); + WARN("(%p)->(%p) FIXME: Use Uri_PUNYCODE_IDN_HOST flag\n", This, aAsciiHost); - if(This->nsuri) - return nsIURI_GetAsciiHost(This->nsuri, aAsciiHost); - - WARN("Use Uri_PUNYCODE_IDN_HOST flag\n"); return get_uri_string(This, Uri_PROPERTY_HOST, aAsciiHost); }

1 0

Jacek Caban : mshtml: Make nsIURL::GetParam a stub.
by Alexandre Julliard 08 Nov '11

08 Nov '11

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

1 0

Stefan Dösinger : ddraw/tests: Add a partial block lock test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 6a7c82186a7173d2682cad7367b1716d92338663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7c82186a7173d2682cad736… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 13:23:59 2011 +0200 ddraw/tests: Add a partial block lock test. --- dlls/ddraw/tests/dsurface.c | 181 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 180 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 3060379..7901b6e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4,7 +4,7 @@ * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) * Copyright (C) 2005 Christian Costa * Copyright 2005 Ivan Leo Puoti - * Copyright (C) 2007 Stefan Dösinger + * Copyright (C) 2007-2009, 2011 Stefan Dösinger for CodeWeavers * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or @@ -4528,6 +4528,184 @@ static void set_surface_desc_test(void) IDirectDrawSurface_Release(surface3); } +static BOOL fourcc_supported(DWORD fourcc, DWORD caps) +{ + DDSURFACEDESC ddsd; + HRESULT hr; + IDirectDrawSurface *surface; + + reset_ddsd(&ddsd); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + ddsd.ddsCaps.dwCaps = caps; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = fourcc; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + if (FAILED(hr)) + { + return FALSE; + } + IDirectDrawSurface_Release(surface); + return TRUE; +} + +static void partial_block_lock_test(void) +{ + IDirectDrawSurface7 *surface; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDraw7 *dd7; + const struct + { + DWORD caps, caps2; + const char *name; + BOOL success; + } + pools[] = + { + { + DDSCAPS_VIDEOMEMORY, 0, + "D3DPOOL_DEFAULT", FALSE + }, + { + DDSCAPS_SYSTEMMEMORY, 0, + "D3DPOOL_SYSTEMMEM", TRUE + }, + { + 0, DDSCAPS2_TEXTUREMANAGE, + "D3DPOOL_MANAGED", TRUE + } + }; + const struct + { + DWORD fourcc; + DWORD caps; + const char *name; + unsigned int block_width; + unsigned int block_height; + } + formats[] = + { + {MAKEFOURCC('D','X','T','1'), DDSCAPS_TEXTURE, "D3DFMT_DXT1", 4, 4}, + {MAKEFOURCC('D','X','T','2'), DDSCAPS_TEXTURE, "D3DFMT_DXT2", 4, 4}, + {MAKEFOURCC('D','X','T','3'), DDSCAPS_TEXTURE, "D3DFMT_DXT3", 4, 4}, + {MAKEFOURCC('D','X','T','4'), DDSCAPS_TEXTURE, "D3DFMT_DXT4", 4, 4}, + {MAKEFOURCC('D','X','T','5'), DDSCAPS_TEXTURE, "D3DFMT_DXT5", 4, 4}, + /* ATI2N surfaces aren't available in ddraw */ + {MAKEFOURCC('U','Y','V','Y'), DDSCAPS_OVERLAY, "D3DFMT_UYVY", 2, 1}, + {MAKEFOURCC('Y','U','Y','2'), DDSCAPS_OVERLAY, "D3DFMT_YUY2", 2, 1}, + }; + unsigned int i, j; + RECT rect; + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "QueryInterface failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) + { + if (!fourcc_supported(formats[i].fourcc, formats[i].caps | DDSCAPS_VIDEOMEMORY)) + { + skip("%s surfaces not supported, skipping partial block lock test\n", formats[i].name); + continue; + } + + for (j = 0; j < (sizeof(pools) / sizeof(*pools)); j++) + { + if (formats[i].caps & DDSCAPS_OVERLAY && !(pools[j].caps & DDSCAPS_VIDEOMEMORY)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = pools[j].caps | formats[i].caps; + ddsd.ddsCaps.dwCaps2 = pools[j].caps2; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(ddsd).ddpfPixelFormat.dwFourCC = formats[i].fourcc; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x, format %s, pool %s\n", + hr, formats[i].name, pools[j].name); + + /* All Windows versions allow partial block locks with DDSCAPS_SYSTEMMEMORY and + * DDSCAPS2_TEXTUREMANAGE, just like in d3d8 and d3d9. Windows XP also allows those locks + * with DDSCAPS_VIDEOMEMORY. Windows Vista and Windows 7 disallow partial locks of vidmem + * surfaces, making the ddraw behavior consistent with d3d8 and 9. + * + * Mark the Windows XP behavior as broken until we find an application that needs it */ + if (formats[i].block_width > 1) + { + SetRect(&rect, formats[i].block_width >> 1, 0, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width >> 1, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + } + + if (formats[i].block_height > 1) + { + SetRect(&rect, 0, formats[i].block_height >> 1, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height >> 1); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(!SUCCEEDED(hr) == !pools[j].success || broken(SUCCEEDED(hr)), + "Partial block lock %s, expected %s, format %s, pool %s\n", + SUCCEEDED(hr) ? "succeeded" : "failed", pools[j].success ? "success" : "failure", + formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + } + + SetRect(&rect, 0, 0, formats[i].block_width, formats[i].block_height); + hr = IDirectDrawSurface7_Lock(surface, &rect, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Full block lock returned %08x, expected %08x, format %s, pool %s\n", + hr, DD_OK, formats[i].name, pools[j].name); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Unlock failed, hr %#x.\n", hr); + } + + IDirectDrawSurface7_Release(surface); + } + } + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -4588,5 +4766,6 @@ START_TEST(dsurface) zbufferbitdepth_test(); pixelformat_flag_test(); set_surface_desc_test(); + partial_block_lock_test(); ReleaseDirectDraw(); }

1 0

Alexandre Julliard : user32/tests: Flush events before the key flags test.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: f0d1bf5f4e0e42b4406305049867579c145fa70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d1bf5f4e0e42b4406305049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 18:16:55 2011 +0100 user32/tests: Flush events before the key flags test. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 90b518d..0376162 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13024,6 +13024,7 @@ static void test_keyflags(void) test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + flush_events(); flush_sequence(); /* keyup without a keydown */

1 0

Alexandre Julliard : progman: Convert dialogs to po files.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: dda92997607f751e8a801dcd11ff060622914221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda92997607f751e8a801dcd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 16:40:14 2011 +0100 progman: Convert dialogs to po files. --- po/ar.po | 122 ++++++++++++++++--- po/bg.po | 130 +++++++++++++++++--- po/ca.po | 138 +++++++++++++++++++--- po/cs.po | 121 ++++++++++++++++--- po/da.po | 121 ++++++++++++++++--- po/de.po | 121 ++++++++++++++++--- po/el.po | 122 ++++++++++++++++--- po/en.po | 121 ++++++++++++++++--- po/en_US.po | 121 ++++++++++++++++--- po/eo.po | 137 +++++++++++++++++++--- po/es.po | 121 ++++++++++++++++--- po/fa.po | 122 ++++++++++++++++--- po/fi.po | 133 ++++++++++++++++++--- po/fr.po | 121 ++++++++++++++++--- po/he.po | 121 ++++++++++++++++--- po/hi.po | 125 +++++++++++++++++--- po/hu.po | 122 ++++++++++++++++--- po/it.po | 121 ++++++++++++++++--- po/ja.po | 136 ++++++++++++++++++--- po/ko.po | 121 ++++++++++++++++--- po/lt.po | 121 ++++++++++++++++--- po/ml.po | 125 +++++++++++++++++--- po/nb_NO.po | 121 ++++++++++++++++--- po/nl.po | 121 ++++++++++++++++--- po/or.po | 125 +++++++++++++++++--- po/pa.po | 125 +++++++++++++++++--- po/pl.po | 121 ++++++++++++++++--- po/pt_BR.po | 121 ++++++++++++++++--- po/pt_PT.po | 121 ++++++++++++++++--- po/rm.po | 122 ++++++++++++++++--- po/ro.po | 121 ++++++++++++++++--- po/ru.po | 121 ++++++++++++++++--- po/sk.po | 143 +++++++++++++++++++--- po/sl.po | 121 ++++++++++++++++--- po/sr_RS(a)cyrillic.po | 144 +++++++++++++++++++---- po/sr_RS(a)latin.po | 144 +++++++++++++++++++---- po/sv.po | 121 ++++++++++++++++--- po/te.po | 125 +++++++++++++++++--- po/th.po | 126 +++++++++++++++++--- po/tr.po | 121 ++++++++++++++++--- po/uk.po | 121 ++++++++++++++++--- po/wa.po | 126 +++++++++++++++++--- po/wine.pot | 121 ++++++++++++++++--- po/zh_CN.po | 122 ++++++++++++++++--- po/zh_TW.po | 122 ++++++++++++++++--- programs/progman/Cs.rc | 149 ----------------------- programs/progman/Da.rc | 144 ---------------------- programs/progman/De.rc | 148 ----------------------- programs/progman/En.rc | 145 ---------------------- programs/progman/Es.rc | 144 ---------------------- programs/progman/Fr.rc | 149 ----------------------- programs/progman/He.rc | 155 ------------------------ programs/progman/Hu.rc | 146 ---------------------- programs/progman/It.rc | 149 ----------------------- programs/progman/Ko.rc | 155 ------------------------ programs/progman/Lt.rc | 149 ----------------------- programs/progman/Makefile.in | 26 +---- programs/progman/Nl.rc | 146 ---------------------- programs/progman/No.rc | 144 ---------------------- programs/progman/Pl.rc | 146 ---------------------- programs/progman/Pt.rc | 199 ------------------------------ programs/progman/Ro.rc | 149 ----------------------- programs/progman/Ru.rc | 148 ----------------------- programs/progman/Si.rc | 146 ---------------------- programs/progman/Sv.rc | 146 ---------------------- programs/progman/Tr.rc | 144 ---------------------- programs/progman/Uk.rc | 149 ----------------------- programs/progman/Zh.rc | 272 ------------------------------------------ programs/progman/progman.rc | 127 ++++++++++++++++++++ 69 files changed, 4967 insertions(+), 4227 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dda92997607f751e8a801…

1 0

Alexandre Julliard : regedit: Convert dialogs to po files.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: b9aed40111f765c002d0e1008171521b90bc78f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9aed40111f765c002d0e1008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 8 15:27:07 2011 +0100 regedit: Convert dialogs to po files. --- po/ar.po | 114 ++++++++++++++++-- po/bg.po | 109 +++++++++++++++-- po/ca.po | 120 +++++++++++++++++-- po/cs.po | 115 ++++++++++++++++-- po/da.po | 107 +++++++++++++++-- po/de.po | 107 +++++++++++++++-- po/el.po | 112 ++++++++++++++++-- po/en.po | 109 +++++++++++++++-- po/en_US.po | 107 +++++++++++++++-- po/eo.po | 120 +++++++++++++++++-- po/es.po | 107 +++++++++++++++-- po/fa.po | 114 ++++++++++++++++-- po/fi.po | 120 +++++++++++++++++-- po/fr.po | 107 +++++++++++++++-- po/he.po | 107 +++++++++++++++-- po/hi.po | 107 +++++++++++++++-- po/hu.po | 109 +++++++++++++++-- po/it.po | 107 +++++++++++++++-- po/ja.po | 107 +++++++++++++++-- po/ko.po | 107 +++++++++++++++-- po/lt.po | 107 +++++++++++++++-- po/ml.po | 107 +++++++++++++++-- po/nb_NO.po | 107 +++++++++++++++-- po/nl.po | 107 +++++++++++++++-- po/or.po | 107 +++++++++++++++-- po/pa.po | 107 +++++++++++++++-- po/pl.po | 107 +++++++++++++++-- po/pt_BR.po | 107 +++++++++++++++-- po/pt_PT.po | 107 +++++++++++++++-- po/rm.po | 113 ++++++++++++++++-- po/ro.po | 107 +++++++++++++++-- po/ru.po | 107 +++++++++++++++-- po/sk.po | 114 ++++++++++++++++-- po/sl.po | 107 +++++++++++++++-- po/sr_RS(a)cyrillic.po | 120 +++++++++++++++++-- po/sr_RS(a)latin.po | 128 ++++++++++++++++++-- po/sv.po | 107 +++++++++++++++-- po/te.po | 107 +++++++++++++++-- po/th.po | 116 +++++++++++++++++-- po/tr.po | 109 +++++++++++++++-- po/uk.po | 107 +++++++++++++++-- po/wa.po | 115 ++++++++++++++++-- po/wine.pot | 107 +++++++++++++++-- po/zh_CN.po | 107 +++++++++++++++-- po/zh_TW.po | 107 +++++++++++++++-- programs/regedit/Bg.rc | 120 ------------------ programs/regedit/Cs.rc | 73 ----------- programs/regedit/Da.rc | 147 ---------------------- programs/regedit/De.rc | 146 ---------------------- programs/regedit/En.rc | 137 --------------------- programs/regedit/Es.rc | 147 ---------------------- programs/regedit/Fr.rc | 149 ----------------------- programs/regedit/He.rc | 157 ------------------------ programs/regedit/Hu.rc | 122 ------------------- programs/regedit/It.rc | 150 ----------------------- programs/regedit/Ja.rc | 147 ---------------------- programs/regedit/Ko.rc | 152 ----------------------- programs/regedit/Lt.rc | 145 ---------------------- programs/regedit/Makefile.in | 23 ---- programs/regedit/Nl.rc | 144 ---------------------- programs/regedit/No.rc | 146 ---------------------- programs/regedit/Pl.rc | 143 ---------------------- programs/regedit/Pt.rc | 164 ------------------------- programs/regedit/Ro.rc | 148 ---------------------- programs/regedit/Ru.rc | 147 ---------------------- programs/regedit/Si.rc | 146 ---------------------- programs/regedit/Sv.rc | 144 ---------------------- programs/regedit/Tr.rc | 120 ------------------ programs/regedit/Uk.rc | 150 ----------------------- programs/regedit/Zh.rc | 275 ------------------------------------------ programs/regedit/regedit.rc | 107 ++++++++++++++++ 71 files changed, 4699 insertions(+), 3903 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9aed40111f765c002d0e…

1 0

Octavian Voicu : ddraw/tests: Fix a couple of copy-paste typos in test messages.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 0134df19730c068ee9dfc2c9f452a5e3547d7064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0134df19730c068ee9dfc2c9f… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Nov 8 00:27:04 2011 +0200 ddraw/tests: Fix a couple of copy-paste typos in test messages. --- dlls/ddraw/tests/visual.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 8593aef..1bac70c 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1493,13 +1493,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1614,13 +1614,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1736,13 +1736,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -1862,13 +1862,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -2000,13 +2000,13 @@ static void D3D1_TextureMapBlendTest(void) ok(hr == D3D_OK, "IDirect3DExecuteBuffer_SetExecuteData failed with %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { hr = IDirect3DDevice_Execute(Direct3DDevice1, ExecuteBuffer, Viewport, D3DEXECUTE_UNCLIPPED); ok(hr == D3D_OK, "IDirect3DDevice_Execute failed, hr = %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); @@ -2090,7 +2090,7 @@ static void D3D1_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DViewport_SetBackground failed: %08x\n", hr); hr = IDirect3DDevice_BeginScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_BeginScene failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_BeginScene failed with %08x\n", hr); if (SUCCEEDED(hr)) { D3DRECT rect; @@ -2112,7 +2112,7 @@ static void D3D1_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DViewport_Clear failed: %08x\n", hr); hr = IDirect3DDevice_EndScene(Direct3DDevice1); - ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice_EndScene failed, hr = %08x\n", hr); } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5);

1 0

Bernhard Loos : mountmgr: Also call IoCompleteRequest in case of an error.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 79b93fff0b7f55e574aee636a92d7bbd8c8037ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b93fff0b7f55e574aee636a… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Nov 1 13:03:22 2011 +0100 mountmgr: Also call IoCompleteRequest in case of an error. --- dlls/mountmgr.sys/mountmgr.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index afb9d92..5cf1017 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -374,7 +374,10 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { case IOCTL_MOUNTMGR_QUERY_POINTS: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_MOUNT_POINT)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.u.Status = query_mount_points( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength, @@ -382,14 +385,20 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) break; case IOCTL_MOUNTMGR_DEFINE_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.Information = 0; irp->IoStatus.u.Status = define_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength ); break; case IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE: if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_unix_drive)) - return STATUS_INVALID_PARAMETER; + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + break; + } irp->IoStatus.u.Status = query_unix_drive( irp->AssociatedIrp.SystemBuffer, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength,

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
86
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 November 2011