wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Jacek Caban : shdocvw: Fixed tests on IE <6.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 92c7e1ae44c3e08a4568c99e9738a8dd2d99f4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c7e1ae44c3e08a4568c99e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 8 20:54:52 2010 +0200 shdocvw: Fixed tests on IE <6. --- dlls/shdocvw/tests/webbrowser.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 15fc1ec..85f71b7 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -67,12 +67,6 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) -#define CHECK_CALLED_BROKEN(func) \ - do { \ - ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ - expect_ ## func = called_ ## func = FALSE; \ - }while(0) - #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -1828,13 +1822,13 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_TRUE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_FALSE)); - ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); - CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); + CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_get_Resizable(wb, &b); ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); @@ -2213,12 +2207,12 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CHECK_CALLED(Invoke_AMBIENT_PALETTE); CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED_BROKEN(GetOverridesKeyPath); + CHECK_CALLED(GetOverridesKeyPath); todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED_BROKEN(Invoke_SETSECURELOCKICON); - todo_wine CHECK_CALLED_BROKEN(Invoke_FILEDOWNLOAD); + todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); + todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(EnableModeless_TRUE); @@ -2482,9 +2476,10 @@ static void test_WebBrowser(BOOL do_download) hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoCreateInterface failed: %08x\n", hres); - if(FAILED(hres)) + if(FAILED(hres)) { + win_skip("Could not create WebBrowser, probably too old IE\n"); return; + } is_downloading = FALSE; is_first_load = TRUE; @@ -2492,6 +2487,14 @@ static void test_WebBrowser(BOOL do_download) hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); + hres = IWebBrowser2_put_Resizable(wb, VARIANT_TRUE); + if(hres == E_NOTIMPL) { + win_skip("put_Resizable returned E_NOTIMPL, assuming IE <6\n"); + IWebBrowser_Release(wb); + IUnknown_Release(unk); + return; + } + test_QueryInterface(unk); test_ready_state(READYSTATE_UNINITIALIZED); test_ClassInfo(unk);

1 0

Owen Rudge : d3dx9/tests: Add D3DXCreateTextureFromResource tests.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 0d6f4d2406f6fdd852f531de0e063bf070f2cb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6f4d2406f6fdd852f531de0… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 8 13:40:14 2010 -0500 d3dx9/tests: Add D3DXCreateTextureFromResource tests. --- dlls/d3dx9_36/tests/texture.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 9a3b3bc..3764089 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "wine/test.h" #include "d3dx9tex.h" +#include "resources.h" static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) { @@ -313,6 +314,49 @@ static void test_D3DXCreateTexture(IDirect3DDevice9 *device) IDirect3DTexture9_Release(texture); } + + /* D3DXCreateTextureFromResource */ + todo_wine { + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDB_BITMAP_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceA(NULL, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateTextureFromResourceA(device, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + + /* D3DXCreateTextureFromResourceEx */ + todo_wine { + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3D_OK, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) IDirect3DTexture9_Release(texture); + } + + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDS_STRING), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceExA(NULL, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateTextureFromResourceExA(device, NULL, NULL, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &texture); + ok(hr == D3DXERR_INVALIDDATA, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXCreateTextureFromResourceExA(device, NULL, MAKEINTRESOURCEA(IDD_BITMAPDATA_1x1), D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateTextureFromResourceEx returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); } static void test_D3DXFilterTexture(IDirect3DDevice9 *device)

1 0

Owen Rudge : d3dx9: Implement D3DXCreateTextureFromResource*.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: 78bd619c7cd6c819d19b33be456193b21d7630c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd619c7cd6c819d19b33be4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 8 13:40:11 2010 -0500 d3dx9: Implement D3DXCreateTextureFromResource*. --- dlls/d3dx9_36/d3dx9_36.spec | 8 +- dlls/d3dx9_36/texture.c | 131 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9c84dbf..e75011a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -99,10 +99,10 @@ @ stdcall D3DXCreateTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateTextureFromFileW(ptr wstr ptr) -@ stub D3DXCreateTextureFromResourceA -@ stub D3DXCreateTextureFromResourceExA -@ stub D3DXCreateTextureFromResourceExW -@ stub D3DXCreateTextureFromResourceW +@ stdcall D3DXCreateTextureFromResourceA(ptr ptr str ptr) +@ stdcall D3DXCreateTextureFromResourceExA(ptr ptr str long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromResourceExW(ptr ptr wstr long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateTextureFromResourceW(ptr ptr wstr ptr) @ stub D3DXCreateTextureGutterHelper @ stub D3DXCreateTextureShader @ stub D3DXCreateTorus diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 36843e4..2ebc85a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -533,3 +533,134 @@ HRESULT WINAPI D3DXCreateTextureFromFileW(LPDIRECT3DDEVICE9 device, return D3DXCreateTextureFromFileExW(device, srcfile, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); } + + +HRESULT WINAPI D3DXCreateTextureFromResourceA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR resource, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource)); + + return D3DXCreateTextureFromResourceExA(device, srcmodule, resource, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateTextureFromResourceW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR resource, + LPDIRECT3DTEXTURE9 *texture) +{ + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource)); + + return D3DXCreateTextureFromResourceExW(device, srcmodule, resource, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateTextureFromResourceExA(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCSTR resource, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(resource)); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceA(srcmodule, resource, (LPCSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, + height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, + srcinfo, palette, texture); + } + + /* Try loading the resource as bitmap data */ + resinfo = FindResourceA(srcmodule, resource, (LPCSTR) RT_BITMAP); + + if (resinfo) + { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXCreateTextureFromResourceExW(LPDIRECT3DDEVICE9 device, + HMODULE srcmodule, + LPCWSTR resource, + UINT width, + UINT height, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *srcinfo, + PALETTEENTRY *palette, + LPDIRECT3DTEXTURE9 *texture) +{ + HRSRC resinfo; + + TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(resource)); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + resinfo = FindResourceW(srcmodule, resource, (LPCWSTR) RT_RCDATA); + + if (resinfo) + { + LPVOID buffer; + HRESULT hr; + DWORD size; + + hr = load_resource_into_memory(srcmodule, resinfo, &buffer, &size); + + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + return D3DXCreateTextureFromFileInMemoryEx(device, buffer, size, width, + height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, + srcinfo, palette, texture); + } + + /* Try loading the resource as bitmap data */ + resinfo = FindResourceW(srcmodule, resource, (LPCWSTR) RT_BITMAP); + + if (resinfo) + { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + + return D3DXERR_INVALIDDATA; +}

1 0

Aric Stewart : usp10: Attempt to shape with non TMPF_TRUETYPE fonts.
by Alexandre Julliard 09 Sep '10

09 Sep '10

Module: wine Branch: master Commit: e8816357416a8d3c6bc3d539b869e2e5c29656b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8816357416a8d3c6bc3d539b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 8 13:30:46 2010 -0500 usp10: Attempt to shape with non TMPF_TRUETYPE fonts. Just do not do the parts that are known to require ttf tables. --- dlls/usp10/usp10.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 29ec1e8..ad3d728 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1254,7 +1254,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, pwLogClust[i] = idx; } - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + if (!psa->fNoGlyphIndex) { WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); if (!rChars) return E_OUTOFMEMORY; @@ -1276,8 +1276,12 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, } rChars[i] = chInput; } - SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); - SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) + { + SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); + SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust); + } heap_free(rChars); } else

1 0

Matteo Bruni : d3dx9: Fix D3DXAssembleShader tests.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d82255575b8be0fc8068a5572f9077a965103f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82255575b8be0fc8068a5572… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri Sep 3 15:25:23 2010 +0200 d3dx9: Fix D3DXAssembleShader tests. --- dlls/d3dx9_36/tests/asm.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 19907aa..4d319ed 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -115,6 +115,7 @@ static void assembleshader_test(void) { "#include \"incl4.vsh\"\n" }; const char testincl4_ok[] = { + "#define REGISTER r0\n" "vs.1.1\n" }; const char testincl4_wrong[] = { @@ -208,9 +209,9 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader)); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { - create_file("incl.vsh", testincl, sizeof(testincl)); + create_file("incl.vsh", testincl, sizeof(testincl) - 1); /* D3DXAssembleShaderFromFile + #include test */ shader = NULL; @@ -238,11 +239,11 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - create_file("shader3.vsh", testshader3, sizeof(testshader3)); - create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong)); + create_file("shader3.vsh", testshader3, sizeof(testshader3) - 1); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong) - 1); if(CreateDirectoryA("include", NULL)) { - create_file("include/incl3.vsh", testincl3, sizeof(testincl3)); - create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok)); + create_file("include/incl3.vsh", testincl3, sizeof(testincl3) - 1); + create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok) - 1); /* path search #include test */ shader = NULL;

1 0

Matteo Bruni : d3dx9: Fix D3DXCompileShaderFromFileW.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d6ead897e23322c10e0f4497fe83c53bdf1a5e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ead897e23322c10e0f4497f… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Sep 8 16:07:07 2010 +0200 d3dx9: Fix D3DXCompileShaderFromFileW. --- dlls/d3dx9_36/shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 1ddcde7..a3648c2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -423,7 +423,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, LPD3DXCONSTANTTABLE* constant_table) { void *buffer; - DWORD len; + DWORD len, filename_len; HRESULT hr; struct D3DXIncludeImpl includefromfile; char *filename_a; @@ -437,13 +437,14 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, include = (LPD3DXINCLUDE)&includefromfile; } - filename_a = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); + filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); + filename_a = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(char)); if (!filename_a) { UnmapViewOfFile(buffer); return E_OUTOFMEMORY; } - WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); hr = D3DCompile(buffer, len, filename_a, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0,

1 0

Hans Leidekker : msi/tests: Fix some test failures on 64-bit.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 4a5b2abcf40591954bdd94088931f5b639540bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5b2abcf40591954bdd94088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:26 2010 +0200 msi/tests: Fix some test failures on 64-bit. --- dlls/msi/tests/package.c | 149 +++++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a5b2abcf40591954bdd9…

1 0

Hans Leidekker : msi: Open relocated package database in transacted mode.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: f6e26351d51b97ca0ba7d3da0195a471879e2885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e26351d51b97ca0ba7d3da0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:13 2010 +0200 msi: Open relocated package database in transacted mode. --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index aa0d1b5..c386f89 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1354,7 +1354,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) * read/write, which is safe because we always create a copy that is thrown * away when we're done. */ - r = MSI_OpenDatabaseW( file, MSIDBOPEN_DIRECT, &db ); + r = MSI_OpenDatabaseW( file, MSIDBOPEN_TRANSACT, &db ); if( r != ERROR_SUCCESS ) { if (file != szPackage)

1 0

Hans Leidekker : msi: Fix comparison of table ids in TABLE_Exists.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: d8b58797982ff2b648106e96e74bb50e09763572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b58797982ff2b648106e96e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 12:17:01 2010 +0200 msi: Fix comparison of table ids in TABLE_Exists. --- dlls/msi/table.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6755496..464eced 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -988,8 +988,8 @@ done: /* try to find the table name in the _Tables table */ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) { - UINT r, table_id = 0, i, count; - MSITABLE *table = NULL; + UINT r, table_id, i; + MSITABLE *table; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; @@ -1012,10 +1012,11 @@ BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ) return FALSE; } - count = table->row_count; - for( i=0; i<count; i++ ) - if( table->data[ i ][ 0 ] == table_id ) + for( i = 0; i < table->row_count; i++ ) + { + if( read_table_int( table->data, i, 0, db->bytes_per_strref ) == table_id ) return TRUE; + } return FALSE; }

1 0

Hans Leidekker : dnsapi: Remove the critical section around res_query.
by Alexandre Julliard 08 Sep '10

08 Sep '10

Module: wine Branch: master Commit: 18cd143086ef040f9322b0b9b017cb47a0a6946f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cd143086ef040f9322b0b9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 8 19:26:43 2010 +0200 dnsapi: Remove the critical section around res_query. --- dlls/dnsapi/query.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 6014465..8de33e6 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -52,19 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); #ifdef HAVE_RESOLV -static CRITICAL_SECTION resolver_cs; -static CRITICAL_SECTION_DEBUG resolver_cs_debug = -{ - 0, 0, &resolver_cs, - { &resolver_cs_debug.ProcessLocksList, - &resolver_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": resolver_cs") } -}; -static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 }; - -#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0) -#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0) - /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* call once per thread on systems that have per-thread _res */ static void initialise_resolver( void ) @@ -552,8 +539,7 @@ exit: return status; } -/* The resolver lock must be held and res_init() must have been - * called before calling these three functions. +/* res_init() must have been called before calling these three functions. */ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { @@ -704,16 +690,11 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser if (!name || !result) return ERROR_INVALID_PARAMETER; - LOCK_RESOLVER(); - initialise_resolver(); _res.options |= dns_map_options( options ); if (servers && (ret = dns_set_serverlist( servers ))) - { - UNLOCK_RESOLVER(); return ret; - } ret = dns_do_query( name, type, options, result ); @@ -724,8 +705,6 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser ret = dns_do_query_netbios( name, result ); } - UNLOCK_RESOLVER(); - #endif return ret; } @@ -822,12 +801,8 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR ada case DnsConfigDnsServerList: { #ifdef HAVE_RESOLV - LOCK_RESOLVER(); - initialise_resolver(); ret = dns_get_serverlist( buffer, len ); - - UNLOCK_RESOLVER(); break; #else WARN( "compiled without resolver support\n" );

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 September 2010