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

Henri Verbeet : wined3d: Pass a proper format desc to resource_init() in IWineD3DDeviceImpl_CreateBuffer().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1d7845dd334ff403124d75ab6bc2d5e311afe7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7845dd334ff403124d75ab6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:11 2009 +0200 wined3d: Pass a proper format desc to resource_init() in IWineD3DDeviceImpl_CreateBuffer(). --- dlls/wined3d/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83af654..a7cb788 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -440,6 +440,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(WINED3DFMT_UNKNOWN, &This->adapter->gl_info); struct wined3d_buffer *object; HRESULT hr; @@ -458,7 +459,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, FIXME("Ignoring access flags (pool)\n"); hr = resource_init(&object->resource, WINED3DRTYPE_BUFFER, This, desc->byte_width, - desc->usage, WINED3DFMT_UNKNOWN, WINED3DPOOL_MANAGED, parent); + desc->usage, format_desc, WINED3DPOOL_MANAGED, parent); if (FAILED(hr)) { WARN("Failed to initialize resource, returning %#x\n", hr);

1 0

Henri Verbeet : wined3d: Split the info log into separate lines.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 2153b4d9989be64c0d42a0ff0ae3464e15325265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2153b4d9989be64c0d42a0ff0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Split the info log into separate lines. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c978e5b..020cf61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,24 @@ typedef struct { struct vs_compile_args vs_args; } glsl_program_key_t; +/* Extract a line from the info log. + * Note that this modifies the source string. */ +static char *get_info_log_line(char **ptr) +{ + char *p, *q; + + p = *ptr; + if (!(q = strstr(p, "\n"))) + { + if (!*p) return NULL; + *ptr += strlen(p); + return p; + } + *q = '\0'; + *ptr = q + 1; + + return p; +} /** Prints the GLSL info log which will contain error messages if they exist */ /* GL locking is done by the caller */ @@ -157,6 +175,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) * that if there are errors. */ if (infologLength > 1) { + char *ptr, *line; + /* Fglrx doesn't terminate the string properly, but it tells us the proper length. * So use HEAP_ZERO_MEMORY to avoid uninitialized bytes */ @@ -170,10 +190,17 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj) break; } } - if(is_spam) { - TRACE("Spam received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); - } else { - FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + + ptr = infoLog; + if (is_spam) + { + TRACE("Spam received from GLSL shader #%u:\n", obj); + while ((line = get_info_log_line(&ptr))) TRACE(" %s\n", line); + } + else + { + FIXME("Error received from GLSL shader #%u:\n", obj); + while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); } HeapFree(GetProcessHeap(), 0, infoLog); }

1 0

Henri Verbeet : wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: f0e303b0f2361eba176864b4906a262b16a42f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e303b0f2361eba176864b49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/vertexshader.c | 3 ++- dlls/wined3d/device.c | 8 ++++++-- include/wine/wined3d.idl | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 206697d..4b24ac8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1789,7 +1789,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 { /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, - pFunction, &object->wineD3DVertexShader, (IUnknown *)object); + pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index fd2837d..c138690 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -126,7 +126,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; EnterCriticalSection(&d3d9_cs); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, &object->wineD3DVertexShader, (IUnknown *)object); + hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, + NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); if (FAILED(hrc)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a7cb788..91a0266 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2328,7 +2328,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, IWineD3DVertexDeclaration *vertex_declaration, CONST DWORD *pFunction, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { +static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, + IWineD3DVertexDeclaration *vertex_declaration, const DWORD *pFunction, + const struct wined3d_shader_signature *output_signature, + IWineD3DVertexShader **ppVertexShader, IUnknown *parent) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexShaderImpl *object; /* NOTE: impl usage is ok, this is a create */ HRESULT hr = WINED3D_OK; @@ -2355,7 +2359,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); } - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, NULL); + hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); if (FAILED(hr)) { WARN("(%p) : Failed to set function, returning %#x\n", iface, hr); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7a476e8..7c875e4 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3013,6 +3013,7 @@ interface IWineD3DDevice : IWineD3DBase HRESULT CreateVertexShader( [in] IWineD3DVertexDeclaration *declaration, [in] const DWORD *function, + [in] const struct wined3d_shader_signature *output_signature, [out] IWineD3DVertexShader **shader, [in] IUnknown *parent );

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::CreateVertexShader().
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: fcee1b709cd24184cc0c01973b8ee772236f7278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcee1b709cd24184cc0c01973… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 26 09:15:12 2009 +0200 d3d10core: Implement ID3D10Device::CreateVertexShader(). --- dlls/d3d10core/d3d10core_private.h | 3 +++ dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- dlls/d3d10core/shader.c | 2 ++ 3 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 7600e23..4828ab6 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -141,6 +141,9 @@ struct d3d10_vertex_shader { const struct ID3D10VertexShaderVtbl *vtbl; LONG refcount; + + IWineD3DVertexShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; /* ID3D10GeometryShader */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bbc527b..ce18eb7 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -970,9 +970,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_vertex_shader *object; + struct d3d10_shader_info shader_info; + HRESULT hr; - FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", + TRACE("iface %p, byte_code %p, byte_code_length %lu, shader %p\n", iface, byte_code, byte_code_length, shader); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); @@ -985,6 +988,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i object->vtbl = &d3d10_vertex_shader_vtbl; object->refcount = 1; + shader_info.output_signature = &object->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + shader_info.shader_code, &object->output_signature, + &object->wined3d_shader, (IUnknown *)object); + if (FAILED(hr)) + { + ERR("CreateVertexShader failed, hr %#x\n", hr); + shader_free_signature(&object->output_signature); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + *shader = (ID3D10VertexShader *)object; return S_OK; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 41b5a1a..582d2a8 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -176,6 +176,8 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *i if (!refcount) { + IWineD3DVertexShader_Release(This->wined3d_shader); + shader_free_signature(&This->output_signature); HeapFree(GetProcessHeap(), 0, This); }

1 0

Piotr Caban : jscript: Added implementation of Math_asin.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 33cde5805331157fbe3e44b1d248d153cd932ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cde5805331157fbe3e44b1d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 22:05:00 2009 +0200 jscript: Added implementation of Math_asin. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 8f3cb03..f027441 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -181,8 +181,22 @@ static HRESULT Math_acos(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, asin(num_val(&v))); + return S_OK; } static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9976bb2..09d85d1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -659,6 +659,39 @@ ok(isNaN(tmp), "Math.acos(Infinity) is not NaN"); tmp = Math.acos(-Infinity); ok(isNaN(tmp), "Math.acos(-Infinity) is not NaN"); +tmp = Math.asin(0); +ok(Math.floor(tmp*100) === 0, "Math.asin(0) = " + tmp); + +tmp = Math.asin(1); +ok(Math.floor(tmp*100) === 157, "Math.asin(1) = " + tmp); + +tmp = Math.asin(-1); +ok(Math.floor(tmp*100) === -158, "Math.asin(-1) = " + tmp); + +tmp = Math.asin(Math.PI/4, 2); +ok(Math.floor(tmp*100) === 90, "Math.asin(Math.PI/4, 2) = " + tmp); + +tmp = Math.asin(true); +ok(Math.floor(tmp*100) === 157, "Math.asin(true) = " + tmp); + +tmp = Math.asin(false); +ok(Math.floor(tmp*100) === 0, "Math.asin(false) = " + tmp); + +tmp = Math.asin(1.1); +ok(isNaN(tmp), "Math.asin(1.1) is not NaN"); + +tmp = Math.asin(); +ok(isNaN(tmp), "Math.asin() is not NaN"); + +tmp = Math.asin(NaN); +ok(isNaN(tmp), "Math.asin(NaN) is not NaN"); + +tmp = Math.asin(Infinity); +ok(isNaN(tmp), "Math.asin(Infinity) is not NaN"); + +tmp = Math.asin(-Infinity); +ok(isNaN(tmp), "Math.asin(-Infinity) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Joerg-Cyril.Hoehle@t-systems.com : configure: Find libpng in /usr/ X11 on MacOS.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 85b6189c3fbfcd2d66e57fa2f5dda236a30fc26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b6189c3fbfcd2d66e57fa2f… Author: Joerg-Cyril.Hoehle(a)t-systems.com <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Sat May 23 12:39:50 2009 +0200 configure: Find libpng in /usr/X11 on MacOS. --- configure | 245 ++++++++++++++++++++++++++++++++++ configure.ac | 13 ++ dlls/oleaut32/Makefile.in | 1 + programs/winemenubuilder/Makefile.in | 1 + 4 files changed, 260 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85b6189c3fbfcd2d66e57…

1 0

Nikolay Sivov : comctl32/mru: Check for NULL handles in MRU calls.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 5d631361c910e5d4bda51b8abe7aa5ee623f0442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d631361c910e5d4bda51b8ab… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 14:47:03 2009 +0400 comctl32/mru: Check for NULL handles in MRU calls. --- dlls/comctl32/comctl32undoc.c | 4 +- dlls/comctl32/tests/mru.c | 110 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 108 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 7899068..194efe5 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -385,7 +385,7 @@ INT WINAPI FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, UINT i; LPSTR dataA = NULL; - if (!mp->extview.lpfnCompare) + if (!mp || !mp->extview.lpfnCompare) return -1; if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) { @@ -834,6 +834,7 @@ INT WINAPI EnumMRUListW (HANDLE hList, INT nItemPos, LPVOID lpBuffer, const WINEMRUITEM *witem; INT desired, datasize; + if (!mp) return -1; if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; desired = mp->realMRU[nItemPos]; @@ -860,6 +861,7 @@ INT WINAPI EnumMRUListA (HANDLE hList, INT nItemPos, LPVOID lpBuffer, INT desired, datasize; DWORD lenA; + if (!mp) return -1; if ((nItemPos < 0) || !lpBuffer) return mp->cursize; if (nItemPos >= mp->cursize) return -1; desired = mp->realMRU[nItemPos]; diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 8ebec86..ea05e02 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -69,11 +69,27 @@ static HANDLE (WINAPI *pCreateMRUListA)(LPCREATEMRULISTA); static void (WINAPI *pFreeMRUList)(HANDLE); static INT (WINAPI *pAddMRUStringA)(HANDLE,LPCSTR); static INT (WINAPI *pEnumMRUList)(HANDLE,INT,LPVOID,DWORD); +static INT (WINAPI *pEnumMRUListW)(HANDLE,INT,LPVOID,DWORD); +static HANDLE (WINAPI *pCreateMRUListLazyA)(LPCREATEMRULISTA, DWORD, DWORD, DWORD); +static INT (WINAPI *pFindMRUData)(HANDLE, LPCVOID, DWORD, LPINT); +static INT (WINAPI *pAddMRUData)(HANDLE, LPCVOID, DWORD); /* static INT (WINAPI *pFindMRUStringA)(HANDLE,LPCSTR,LPINT); */ +static void InitPointers(void) +{ + pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); + pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); + pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); + pEnumMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)154); + pCreateMRUListLazyA = (void*)GetProcAddress(hComctl32,(LPCSTR)157); + pAddMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)167); + pFindMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)169); + pEnumMRUListW = (void*)GetProcAddress(hComctl32,(LPCSTR)403); +} + /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LSTATUS mru_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) { @@ -227,11 +243,6 @@ static void test_MRUListA(void) HKEY hKey; INT iRet; - pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); - pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); - pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); - pEnumMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)154); - if (!pCreateMRUListA || !pFreeMRUList || !pAddMRUStringA || !pEnumMRUList) { skip("MRU entry points not found\n"); @@ -413,6 +424,89 @@ static void test_MRUListA(void) /* FreeMRUList(NULL) crashes on Win98 OSR0 */ } +static void test_CreateMRUListLazyA(void) +{ + HANDLE hMRU; + HKEY hKey; + CREATEMRULISTA listA = { 0 }; + + if (!pCreateMRUListLazyA) + { + win_skip("CreateMRUListLazyA entry point 157 not found\n"); + return; + } + + /* wrong size */ + listA.cbSize = sizeof(listA) + 1; + hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); + ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); + listA.cbSize = 4; + hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); + ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); + /* NULL hKey */ + listA.cbSize = sizeof(listA); + listA.hKey = NULL; + hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); + ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); + /* NULL subkey */ + ok(!RegCreateKeyA(HKEY_CURRENT_USER, REG_TEST_KEYA, &hKey), + "Couldn't create test key \"%s\"\n", REG_TEST_KEYA); + listA.cbSize = sizeof(listA); + listA.hKey = hKey; + listA.lpszSubKey = NULL; + hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); + ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); +} + +static void test_EnumMRUList(void) +{ + if (!pEnumMRUList || !pEnumMRUListW) + { + win_skip("EnumMRUListA/EnumMRUListW entry point not found\n"); + return; + } + + /* NULL handle */ + if (0) + { + INT iRet; + + /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ + iRet = pEnumMRUList(NULL, 0, NULL, 0); + iRet = pEnumMRUListW(NULL, 0, NULL, 0); + } +} + +static void test_FindMRUData(void) +{ + INT iRet; + + if (!pFindMRUData) + { + win_skip("FindMRUData entry point not found\n"); + return; + } + + /* NULL handle */ + iRet = pFindMRUData(NULL, NULL, 0, NULL); + ok(iRet == -1, "FindMRUData expected -1, got %d\n", iRet); +} + +static void test_AddMRUData(void) +{ + INT iRet; + + if (!pAddMRUData) + { + win_skip("AddMRUData entry point not found\n"); + return; + } + + /* NULL handle */ + iRet = pFindMRUData(NULL, NULL, 0, NULL); + ok(iRet == -1, "AddMRUData expected -1, got %d\n", iRet); +} + START_TEST(mru) { hComctl32 = GetModuleHandleA("comctl32.dll"); @@ -421,7 +515,13 @@ START_TEST(mru) if (!create_reg_entries()) return; + InitPointers(); + test_MRUListA(); + test_CreateMRUListLazyA(); + test_EnumMRUList(); + test_FindMRUData(); + test_AddMRUData(); delete_reg_entries(); }

1 0

Hwang YunSong : reg: Updated Korean resource.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 533128bd1afa223f4cd5d11d3fd8a6369a125f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533128bd1afa223f4cd5d11d3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 25 09:21:55 2009 +0900 reg: Updated Korean resource. --- programs/reg/Ko.rc | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc index 0871ec3..e9ebbee 100644 --- a/programs/reg/Ko.rc +++ b/programs/reg/Ko.rc @@ -3,6 +3,7 @@ * Korean language support * * Copyright 2008 Andrew Riedi + * Copyright 2008 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,11 @@ STRINGTABLE { STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG ��ɾ� /?\n" STRING_ADD_USAGE, "REG ADD �� [/v �� | /ve] [/t ��] [/s �и��ȣ] [/d ��Ÿ] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE �� [/v �� | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY �� [/v ��| /ve] [/s]\n" + STRING_DELETE_USAGE, "REG DELETE Ű �̸� [/v �� | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY Ű �̸� [/v ��| /ve] [/s]\n" + STRING_SUCCESS, "�۾�� ϴ�\n" + STRING_INVALID_KEY, "��: �ùٸ�� Ű �̸�\n" + STRING_INVALID_CMDLINE, "��:�ùٸ�� ɶ�� Ű��\n" + STRING_NO_REMOTE, "��: �� ӽſ� Ű�� ϴ� �� ʽ��ϴ�\n" + STRING_CANNOT_FIND, "��: �� ý��ۿ�� Ʈ�� Ű�� ã�� ϴ�\n" }

1 0

Gerald Pfeifer : winmm/tests: Fix test in wave_out_test_deviceOut().
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: d840311f24895de98cff1188862128391cf1f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d840311f24895de98cff11888… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 24 20:16:05 2009 +0200 winmm/tests: Fix test in wave_out_test_deviceOut(). --- dlls/winmm/tests/wave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 3a656ac..6430667 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -799,7 +799,7 @@ static void wave_out_test_deviceOut(int device, double duration, "The sound played for %u ms instead of %g ms\n", actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { - ok(frags[i].dwFlags=(WHDR_DONE|WHDR_PREPARED), + ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n", wave_header_flags(frags[i].dwFlags)); }

1 0

Hwang YunSong : regedit: Updated Korean resource.
by Alexandre Julliard 25 May '09

25 May '09

Module: wine Branch: master Commit: 84edc89a64e0be4508933f4c4f18666abf62419d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84edc89a64e0be4508933f4c4… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 25 09:22:19 2009 +0900 regedit: Updated Korean resource. --- programs/regedit/Ko.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 7955aa2..17905d7 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -285,6 +285,7 @@ BEGIN ID_EDIT_COPYKEYNAME "��õ� Ű�� ̸�� Ŭ��忡 ��" ID_EDIT_FIND "Ű,��̳� ��Ÿ�� ؽ�Ʈ ��ڿ� ã��" ID_EDIT_FINDNEXT "�� ã�⿡�� ڿ�� ٽ� ã��" + ID_EDIT_EXPORT "��Ʈ�� õ� �κ�� ؽ�Ʈ ��Ϸ� ��" END STRINGTABLE DISCARDABLE @@ -296,7 +297,7 @@ BEGIN IDS_TOO_BIG_VALUE "�� ʹ� Ů�ϴ� (%u)" IDS_DELETE_BOX_TITLE "�� Ȯ��" IDS_DELETE_BOX_TEXT "�� '%s'�� ڽ��ϱ�?" - IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" + IDS_DELETE_BOX_TEXT_MULTIPLE "�� ڽ��ϱ�?" IDS_NEWKEY "�� Ű #%d" IDS_NEWVALUE "�� #%d" IDS_NOTFOUND "'%s'�� ã�� ϴ�"

1 0