June 2006 - Wine-commits - list.winehq.org

Andrew Ziem : include: Add SETWALLPAPER_DEFAULT to winuser.h.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 60d5f8083717881f8c93f5f31ec9663d1291196f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60d5f8083717881f8c93f5f… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Tue Jun 6 17:29:00 2006 -0600 include: Add SETWALLPAPER_DEFAULT to winuser.h. --- include/winuser.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 654d9e5..dcaef92 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2877,6 +2877,8 @@ #define FE_FONTSMOOTHINGDOCKING 0 #define FE_FONTSMOOTHINGORIENTATIONBGR 0x0000 #define FE_FONTSMOOTHINGORIENTATIONRGB 0x0001 +#define SETWALLPAPER_DEFAULT ((LPWSTR)-1) + /* SystemParametersInfo flags */ #define SPIF_UPDATEINIFILE 1

1 0

H. Verbeet : wined3d: Return the result of QueryInterface in GetContainer.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 26978a4d2db3a8f318d10e13ba49563cfed4781c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26978a4d2db3a8f318d10e1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 6 23:42:33 2006 +0200 wined3d: Return the result of QueryInterface in GetContainer. --- dlls/wined3d/surface.c | 5 +---- dlls/wined3d/volume.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e270701..4651010 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -236,10 +236,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetCo } TRACE("Relaying to QueryInterface\n"); - if (IUnknown_QueryInterface(container, riid, ppContainer) != S_OK) - return WINED3DERR_INVALIDCALL; - - return WINED3D_OK; + return IUnknown_QueryInterface(container, riid, ppContainer); } HRESULT WINAPI IWineD3DSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a8a9c1e..3c7c66b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -142,10 +142,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_GetCon } TRACE("Relaying to QueryInterface\n"); - if (IUnknown_QueryInterface(This->container, riid, ppContainer) != S_OK) - return WINED3DERR_INVALIDCALL; - - return WINED3D_OK; + return IUnknown_QueryInterface(This->container, riid, ppContainer); } HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) {

1 0

H. Verbeet : wined3d: Remove a redundant break.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 7b8bf46f3f0efd6f54a541e7f5a0d53bb7ffde65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b8bf46f3f0efd6f54a541e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 6 23:42:30 2006 +0200 wined3d: Remove a redundant break. --- dlls/wined3d/utils.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 77b6b33..6c1acde 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1020,7 +1020,6 @@ #define GLINFO_LOCATION ((IWineD3DImpl * */ LEAVE_GL(); return; - break; } }

1 0

H. Verbeet : wined3d: Don't hardcode type sizes for shader constants.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 85ec834f7a9c573b83a0c99ecba2a152758eb4e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85ec834f7a9c573b83a0c99… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 6 23:17:35 2006 +0200 wined3d: Don't hardcode type sizes for shader constants. --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ed3f6bc..27c9dc9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4372,7 +4372,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->vertexShaderConstantB[start], srcData, cnt); + memcpy(&This->updateStateBlock->vertexShaderConstantB[start], srcData, cnt * sizeof(BOOL)); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsB[i] = TRUE; @@ -4397,7 +4397,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantB[start], cnt); + memcpy(dstData, &This->updateStateBlock->vertexShaderConstantB[start], cnt * sizeof(BOOL)); return WINED3D_OK; } @@ -4416,7 +4416,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->vertexShaderConstantI[start * 4], srcData, cnt * 16); + memcpy(&This->updateStateBlock->vertexShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsI[i] = TRUE; @@ -4441,7 +4441,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantI[start * 4], cnt * 16); + memcpy(dstData, &This->updateStateBlock->vertexShaderConstantI[start * 4], cnt * sizeof(int) * 4); return WINED3D_OK; } @@ -4460,7 +4460,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, cnt * 16); + memcpy(&This->updateStateBlock->vertexShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.vertexShaderConstantsF[i] = TRUE; @@ -4485,7 +4485,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->vertexShaderConstantF[start * 4], cnt * 16); + memcpy(dstData, &This->updateStateBlock->vertexShaderConstantF[start * 4], cnt * sizeof(float) * 4); return WINED3D_OK; } @@ -4546,7 +4546,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetPix if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->pixelShaderConstantB[start], srcData, cnt); + memcpy(&This->updateStateBlock->pixelShaderConstantB[start], srcData, cnt * sizeof(BOOL)); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsB[i] = TRUE; @@ -4571,7 +4571,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantB[start], cnt); + memcpy(dstData, &This->updateStateBlock->pixelShaderConstantB[start], cnt * sizeof(BOOL)); return WINED3D_OK; } @@ -4590,7 +4590,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetPix if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->pixelShaderConstantI[start * 4], srcData, cnt * 16); + memcpy(&This->updateStateBlock->pixelShaderConstantI[start * 4], srcData, cnt * sizeof(int) * 4); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsI[i] = TRUE; @@ -4615,7 +4615,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantI[start * 4], cnt * 16); + memcpy(dstData, &This->updateStateBlock->pixelShaderConstantI[start * 4], cnt * sizeof(int) * 4); return WINED3D_OK; } @@ -4634,7 +4634,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetPix if (srcData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, cnt * 16); + memcpy(&This->updateStateBlock->pixelShaderConstantF[start * 4], srcData, cnt * sizeof(float) * 4); for (i = start; i < cnt + start; ++i) { This->updateStateBlock->changed.pixelShaderConstantsF[i] = TRUE; @@ -4659,7 +4659,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix if (dstData == NULL || cnt < 0) return WINED3DERR_INVALIDCALL; - memcpy(dstData, &This->updateStateBlock->pixelShaderConstantF[start * 4], cnt * 16); + memcpy(dstData, &This->updateStateBlock->pixelShaderConstantF[start * 4], cnt * sizeof(float) * 4); return WINED3D_OK; }

1 0

H. Verbeet : d3d9: Add a test for setting / getting vertex shader constants .
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 88528a7839ee2955bfb7e8b05ad1d3ef64149778 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88528a7839ee2955bfb7e8b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jun 6 23:17:50 2006 +0200 d3d9: Add a test for setting / getting vertex shader constants. --- dlls/d3d9/tests/shader.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 522c8d9..e6a10b4 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -104,6 +104,43 @@ static void test_get_set_vertex_shader(I "Expected hret 0x%lx, current_shader_ptr %p, refcount %d.\n", hret, current_shader_ptr, shader_refcount, D3D_OK, shader_ptr, i); } +static void test_get_set_vertex_shader_constants(IDirect3DDevice9 *device_ptr) +{ + HRESULT hret; + int int_in[4] = {0xdead0000, 0xdead0001, 0xdead0002, 0xdead0003}; + int int_out[4] = {0}; + float float_in[4] = {0.14f, 0.15f, 0.92f, 0.65f}; + float float_out[4] = {0}; + BOOL bool_in[4] = {TRUE, FALSE, FALSE, TRUE}; + BOOL bool_out[4] = {0}; + + hret = IDirect3DDevice9_SetVertexShaderConstantI(device_ptr, 0, int_in, 1); + ok(hret == D3D_OK, "SetVertexShaderConstantI returned %#lx.\n", hret); + hret = IDirect3DDevice9_SetVertexShaderConstantF(device_ptr, 0, float_in, 1); + ok(hret == D3D_OK, "SetVertexShaderConstantF returned %#lx.\n", hret); + hret = IDirect3DDevice9_SetVertexShaderConstantB(device_ptr, 0, bool_in, 4); + ok(hret == D3D_OK, "SetVertexShaderConstantB returned %#lx.\n", hret); + + hret = IDirect3DDevice9_GetVertexShaderConstantI(device_ptr, 0, int_out, 1); + ok(hret == D3D_OK, "GetVertexShaderConstantI returned %#lx.\n", hret); + hret = IDirect3DDevice9_GetVertexShaderConstantF(device_ptr, 0, float_out, 1); + ok(hret == D3D_OK, "GetVertexShaderConstantF returned %#lx.\n", hret); + hret = IDirect3DDevice9_GetVertexShaderConstantB(device_ptr, 0, bool_out, 4); + ok(hret == D3D_OK, "GetVertexShaderConstantB returned %#lx.\n", hret); + + /* The constant arrays aren't shared between I/F/B, so they shouldn't + * overwrite eachother's values */ + ok(!memcmp(int_in, int_out, sizeof(int_in)), + "Int constant data doesn't match (%#x, %#x, %#x, %#x).\n", + int_out[0], int_out[1], int_out[2], int_out[3]); + ok(!memcmp(float_in, float_out, sizeof(float_in)), + "Float constant data doesn't match (%f, %f, %f, %f).\n", + float_out[0], float_out[1], float_out[2], float_out[3]); + ok(!memcmp(bool_in, bool_out, sizeof(bool_in)), + "Bool constant data doesn't match (%#x, %#x, %#x, %#x).\n", + bool_out[0], bool_out[1], bool_out[2], bool_out[3]); +} + static void test_get_set_pixel_shader(IDirect3DDevice9 *device_ptr) { static DWORD simple_ps[] = {0xFFFF0101, /* ps_1_1 */ @@ -161,6 +198,7 @@ START_TEST(shader) if (caps.VertexShaderVersion & 0xffff) { test_get_set_vertex_shader(device_ptr); + test_get_set_vertex_shader_constants(device_ptr); } else trace("No vertex shader support, skipping test\n");

1 0

Robert Shearman : shdocvw: Register some more documented classes that native also registers.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 1027313e9fb5798f734f9dcf5127fa54553c7448 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1027313e9fb5798f734f9dc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 6 20:04:58 2006 +0100 shdocvw: Register some more documented classes that native also registers. --- dlls/shdocvw/regsvr.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index e7fb595..6fd2f22 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -530,6 +530,54 @@ static struct regsvr_coclass const cocla "InternetExplorer.Application.1", "InternetExplorer.Application" }, + { &CLSID_ShellSearchAssistantOC, + "SearchAssistantOC", + NULL, + "shdocvw.dll", + "Apartment", + "SearchAssistantOC.SearchAssistantOC.1", + "SearchAssistantOC.SearchAssistantOC" + }, + { &CLSID_ShellShellNameSpace, + "Shell Name Space", + NULL, + "shdocvw.dll", + "Apartment", + "ShellNameSpace.ShellNameSpace.1", + "ShellNameSpace.ShellNameSpace" + }, + { &CLSID_ShellNameSpace, + "Shell Name Space", + NULL, + "shdocvw.dll", + "Apartment", + "ShellNameSpace.ShellNameSpace.1", + "ShellNameSpace.ShellNameSpace" + }, + { &CLSID_ShellUIHelper, + "Microsoft Shell UI Helper", + NULL, + "shdocvw.dll", + "Apartment", + "Shell.UIHelper.1", + NULL + }, + { &CLSID_ShellWindows, + "ShellWindows", + NULL, + "shdocvw.dll", + "Apartment", + NULL, + NULL + }, + { &CLSID_SearchAssistantOC, + "SearchAssistantOC", + NULL, + "shdocvw.dll", + "Apartment", + "SearchAssistantOC.SearchAssistantOC.1", + "SearchAssistantOC.SearchAssistantOC" + }, { NULL } /* list terminator */ };

1 0

Robert Shearman : widl: Support coclass forward declarations.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 996c4f1f938eb47e47b69d04b34ca9cefbb78ee7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=996c4f1f938eb47e47b69d0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 6 20:05:39 2006 +0100 widl: Support coclass forward declarations. --- tools/widl/header.c | 8 ++++++++ tools/widl/header.h | 1 + tools/widl/parser.y | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index c34f9a9..82637e5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1004,3 +1004,11 @@ void write_coclass(class_t *cocl) write_coclass_guid(cocl); fprintf(header, "\n"); } + +void write_coclass_forward(class_t *cocl) +{ + fprintf(header, "#ifndef __%s_FWD_DEFINED__\n", cocl->name); + fprintf(header, "#define __%s_FWD_DEFINED__\n", cocl->name); + fprintf(header, "typedef struct %s %s;\n", cocl->name, cocl->name); + fprintf(header, "#endif /* defined __%s_FWD_DEFINED__\n\n", cocl->name ); +} diff --git a/tools/widl/header.h b/tools/widl/header.h index 6423033..b0aa82e 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -37,6 +37,7 @@ extern void write_forward(type_t *iface) extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); extern void write_coclass(class_t *iface); +extern void write_coclass_forward(class_t *iface); extern void write_typedef(type_t *type, const var_t *names); extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_constdef(const var_t *v); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 026b716..284d802 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -239,6 +239,7 @@ input: gbl_statements gbl_statements: { $$ = NULL; } | gbl_statements interfacedec { $$ = $1; } | gbl_statements interfacedef { $$ = make_ifref($2); LINK($$, $1); } + | gbl_statements coclass ';' { $$ = $1; if (!parse_only && do_header) write_coclass_forward($2); } | gbl_statements coclassdef { $$ = $1; add_coclass($2); } | gbl_statements moduledef { $$ = $1; add_module($2); } | gbl_statements librarydef { $$ = $1; } @@ -248,6 +249,7 @@ gbl_statements: { $$ = NULL; } imp_statements: {} | imp_statements interfacedec { if (!parse_only) add_interface($2); } | imp_statements interfacedef { if (!parse_only) add_interface($2); } + | imp_statements coclass ';' {} | imp_statements coclassdef { if (!parse_only) add_coclass($2); } | imp_statements moduledef { if (!parse_only) add_module($2); } | imp_statements statement {}

1 0

Robert Shearman : include: Add two more coclasses to exdisp.idl.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 63c8dd4faf76031eea294022fc54497f89df327a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63c8dd4faf76031eea29402… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jun 6 20:04:47 2006 +0100 include: Add two more coclasses to exdisp.idl. --- include/exdisp.idl | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index b7a65ed..4e07400 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -717,6 +717,14 @@ coclass ShellNameSpace { } [ + uuid(2f2f1f96-2bc1-4b1c-be28-ea3774f4676a) +] +coclass ShellShellNameSpace { + [default] interface IShellNameSpace; + [default, source] dispinterface DShellNameSpaceEvents; +} + +[ odl, uuid(f3470f24-15fd-11d2-bb2e-00805ff7efca), hidden, @@ -887,4 +895,13 @@ coclass SearchAssistantOC { [default, source] dispinterface _SearchAssistantEvents; } +[ + uuid(2e71fd0f-aab1-42c0-9146-6d2c4edcf07d), + hidden +] +coclass ShellSearchAssistantOC { + [default] interface ISearchAssistantOC3; + [default, source] dispinterface _SearchAssistantEvents; +} + } /* library */

1 0

Hans Leidekker : dnsapi: Add stub implementations for the remaining documented functions.
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: 5cfe6e9213719c344aae607c17b5cef4b7a6ecbb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cfe6e9213719c344aae607… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Jun 6 17:48:43 2006 +0200 dnsapi: Add stub implementations for the remaining documented functions. --- dlls/dnsapi/dnsapi.spec | 24 +++--- dlls/dnsapi/main.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 12 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 002dba0..2d00d38 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -1,6 +1,6 @@ -@ stub DnsAcquireContextHandle_A -@ stub DnsAcquireContextHandle_UTF8 -@ stub DnsAcquireContextHandle_W +@ stdcall DnsAcquireContextHandle_A(long ptr ptr) +@ stdcall DnsAcquireContextHandle_UTF8(long ptr ptr) +@ stdcall DnsAcquireContextHandle_W(long ptr ptr) @ stub DnsAddRecordSet_A @ stub DnsAddRecordSet_UTF8 @ stub DnsAddRecordSet_W @@ -28,8 +28,8 @@ @ stub DnsEnableAdapterDomainNameRegistration @ stub DnsEnableBNodeResolverThread @ stub DnsEnableDynamicRegistration -@ stub DnsExtractRecordsFromMessage_UTF8 -@ stub DnsExtractRecordsFromMessage_W +@ stdcall DnsExtractRecordsFromMessage_UTF8(ptr long ptr) +@ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) @ stub DnsFindAuthoritativeZone @ stub DnsFlushResolverCache @ stub DnsFlushResolverCacheEntry_A @@ -65,9 +65,9 @@ @ stub DnsModifyRecordSet_A @ stub DnsModifyRecordSet_UTF8 @ stub DnsModifyRecordSet_W -@ stub DnsModifyRecordsInSet_A -@ stub DnsModifyRecordsInSet_UTF8 -@ stub DnsModifyRecordsInSet_W +@ stdcall DnsModifyRecordsInSet_A(ptr ptr long ptr ptr ptr) +@ stdcall DnsModifyRecordsInSet_UTF8(ptr ptr long ptr ptr ptr) +@ stdcall DnsModifyRecordsInSet_W(ptr ptr long ptr ptr ptr) @ stdcall DnsNameCompare_A(str str) @ stub DnsNameCompareEx_A @ stub DnsNameCompareEx_UTF8 @@ -94,13 +94,13 @@ @ stub DnsRecordTypeForName @ stub DnsRelationalCompare_UTF8 @ stub DnsRelationalCompare_W -@ stub DnsReleaseContextHandle +@ stdcall DnsReleaseContextHandle(ptr) @ stub DnsRemoveRegistrations -@ stub DnsReplaceRecordSetA +@ stdcall DnsReplaceRecordSetA(ptr long ptr ptr ptr) @ stub DnsReplaceRecordSet_A -@ stub DnsReplaceRecordSetUTF8 +@ stdcall DnsReplaceRecordSetUTF8(ptr long ptr ptr ptr) @ stub DnsReplaceRecordSet_UTF8 -@ stub DnsReplaceRecordSetW +@ stdcall DnsReplaceRecordSetW(ptr long ptr ptr ptr) @ stub DnsReplaceRecordSet_W @ stub DnsServiceNotificationDeregister_A @ stub DnsServiceNotificationDeregister_UTF8 diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 54984b0..cb134d5 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -23,6 +23,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winerror.h" +#include "windns.h" #include "wine/debug.h" @@ -47,3 +49,181 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DW } return TRUE; } + +/****************************************************************************** + * DnsAcquireContextHandle_A [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsAcquireContextHandle_A( DWORD flags, PVOID cred, + HANDLE *context ) +{ + FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + + *context = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsAcquireContextHandle_UTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsAcquireContextHandle_UTF8( DWORD flags, PVOID cred, + HANDLE *context ) +{ + FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + + *context = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsAcquireContextHandle_W [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsAcquireContextHandle_W( DWORD flags, PVOID cred, + HANDLE *context ) +{ + FIXME( "(0x%08lx,%p,%p) stub\n", flags, cred, context ); + + *context = (HANDLE)0xdeadbeef; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsReleaseContextHandle [DNSAPI.@] + * + */ +void WINAPI DnsReleaseContextHandle( HANDLE context ) +{ + FIXME( "(%p) stub\n", context ); +} + +/****************************************************************************** + * DnsExtractRecordsFromMessage_A [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsExtractRecordsFromMessage_A( PDNS_MESSAGE_BUFFER buffer, + WORD len, PDNS_RECORDA *record ) +{ + FIXME( "(%p,%d,%p) stub\n", buffer, len, record ); + + *record = NULL; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsExtractRecordsFromMessage_UTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8( PDNS_MESSAGE_BUFFER buffer, + WORD len, PDNS_RECORDA *record ) +{ + FIXME( "(%p,%d,%p) stub\n", buffer, len, record ); + + *record = NULL; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsExtractRecordsFromMessage_W [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W( PDNS_MESSAGE_BUFFER buffer, + WORD len, PDNS_RECORDW *record ) +{ + FIXME( "(%p,%d,%p) stub\n", buffer, len, record ); + + *record = NULL; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsModifyRecordsInSet_A [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsModifyRecordsInSet_A( PDNS_RECORDA add, PDNS_RECORDA delete, + DWORD options, HANDLE context, + PIP4_ARRAY servers, PVOID reserved ) +{ + FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + context, servers, reserved ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsModifyRecordsInSet_UTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8( PDNS_RECORDA add, PDNS_RECORDA delete, + DWORD options, HANDLE context, + PIP4_ARRAY servers, PVOID reserved ) +{ + FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + context, servers, reserved ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsModifyRecordsInSet_W [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsModifyRecordsInSet_W( PDNS_RECORDW add, PDNS_RECORDW delete, + DWORD options, HANDLE context, + PIP4_ARRAY servers, PVOID reserved ) +{ + FIXME( "(%p,%p,0x%08lx,%p,%p,%p) stub\n", add, delete, options, + context, servers, reserved ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsWriteQuestionToBuffer [DNSAPI.@] + * + */ +BOOL WINAPI DnsWriteQuestionToBuffer( PDNS_MESSAGE_BUFFER buffer, LPDWORD size, + LPWSTR name, WORD type, WORD xid, + BOOL recurse ) +{ + FIXME( "(%p,%p,%s,%d,%d,%d) stub\n", buffer, size, debugstr_w(name), + type, xid, recurse ); + return FALSE; +} + +/****************************************************************************** + * DnsReplaceRecordSetA [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsReplaceRecordSetA( PDNS_RECORDA set, DWORD options, + HANDLE context, PIP4_ARRAY servers, + PVOID reserved ) +{ + FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + servers, reserved ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsReplaceRecordSetUTF8 [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsReplaceRecordSetUTF8( PDNS_RECORDA set, DWORD options, + HANDLE context, PIP4_ARRAY servers, + PVOID reserved ) +{ + FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + servers, reserved ); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * DnsReplaceRecordSetW [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsReplaceRecordSetW( PDNS_RECORDW set, DWORD options, + HANDLE context, PIP4_ARRAY servers, + PVOID reserved ) +{ + FIXME( "(%p,0x%08lx,%p,%p,%p) stub\n", set, options, context, + servers, reserved ); + return ERROR_SUCCESS; +}

1 0

Alexandre Julliard : Revert "winedbg: Remove useless NOCMD state."
by Alexandre Julliard 07 Jun '06

07 Jun '06

Module: wine Branch: refs/heads/master Commit: dbd566d54506d9fd677ca32423034df6bdf14c3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbd566d54506d9fd677ca32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 17:15:31 2006 +0200 Revert "winedbg: Remove useless NOCMD state." This reverts 92deacbe425bfd986a2cc3bf1e776aca02cf08c8 commit. --- programs/winedbg/debug.l | 51 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 458c006..cb2a564 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -89,6 +89,7 @@ STRING \"[^\n"]+\" %s SHOW_CMD %s MODE_CMD %s MAINT_CMD +%s NOCMD %x ASTRING_EXPECTED %x NOPROCESS @@ -134,52 +135,52 @@ STRING \"[^\n"]+\" yylval.string = lexeme_alloc(p); return tSTRING; } <INITIAL,NOPROCESS>info|inf|in { BEGIN(INFO_CMD); return tINFO; } -<INITIAL>up { return tUP; } -<INITIAL>down|dow|do { return tDOWN; } -<INITIAL>frame|fram|fra|fr { return tFRAME; } +<INITIAL>up { BEGIN(NOCMD); return tUP; } +<INITIAL>down|dow|do { BEGIN(NOCMD); return tDOWN; } +<INITIAL>frame|fram|fra|fr { BEGIN(NOCMD); return tFRAME; } <INITIAL>list|lis|li|l { BEGIN(PATH_EXPECTED); return tLIST; } <INITIAL>enable|enabl|enab|ena { BEGIN(BD_CMD); return tENABLE;} <INITIAL>disable|disabl|disab|disa|dis { BEGIN(BD_CMD); return tDISABLE; } -<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { return tDISASSEMBLE; } +<INITIAL>disassemble|disassembl|disassemb|disassem|disasse|disass|disas { BEGIN(NOCMD); return tDISASSEMBLE; } <INITIAL>locally|local { BEGIN(LOCAL_CMD); return tLOCAL; } <INITIAL,LOCAL_CMD>display|displa|displ|disp { BEGIN(FORMAT_EXPECTED); return tDISPLAY; } -<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { return tDISPLAY; } -<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { return tUNDISPLAY; } +<INFO_CMD,BD_CMD>display|displa|displ|disp|dis|di|d { BEGIN(NOCMD); return tDISPLAY; } +<INITIAL>undisplay|undispla|undispl|undisp|undis|undi|und { BEGIN(NOCMD); return tUNDISPLAY; } <INITIAL>delete|delet|dele|del { BEGIN(BD_CMD); return tDELETE; } -<INITIAL,NOPROCESS>quit|qui|qu|q { return tQUIT; } -<INITIAL>set|se { return tSET; } +<INITIAL,NOPROCESS>quit|qui|qu|q { BEGIN(NOCMD); return tQUIT; } +<INITIAL>set|se { BEGIN(NOCMD); return tSET; } <INITIAL>x { BEGIN(FORMAT_EXPECTED); return tEXAM; } <INITIAL,NOPROCESS>help|hel|he|"?" { BEGIN(HELP_CMD); return tHELP; } -<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { return tBACKTRACE; } -<INITIAL,NOPROCESS>where|wher|whe { return tBACKTRACE; } +<INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; } +<INITIAL,NOPROCESS>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; } -<INITIAL>cont|con|co|c { return tCONT; } -<INITIAL>pass|pas|pa { return tPASS; } -<INITIAL>condition|conditio|conditi|condit|condi|cond { return tCOND; } -<INITIAL>step|ste|st|s { return tSTEP; } -<INITIAL>next|nex|ne|n { return tNEXT; } -<INITIAL>stepi|si { return tSTEPI; } -<INITIAL>nexti|ni { return tNEXTI; } -<INITIAL>finish|finis|fini|fin|fi { return tFINISH; } +<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; } +<INITIAL>pass|pas|pa { BEGIN(NOCMD); return tPASS; } +<INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; } +<INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; } +<INITIAL>next|nex|ne|n { BEGIN(NOCMD); return tNEXT; } +<INITIAL>stepi|si { BEGIN(NOCMD); return tSTEPI; } +<INITIAL>nexti|ni { BEGIN(NOCMD); return tNEXTI; } +<INITIAL>finish|finis|fini|fin|fi { BEGIN(NOCMD); return tFINISH; } -<INITIAL>abort|abor|abo { return tABORT; } +<INITIAL>abort|abor|abo { BEGIN(NOCMD); return tABORT; } <INITIAL>print|prin|pri|pr|p { BEGIN(FORMAT_EXPECTED); return tPRINT; } <INITIAL>show|sho|sh { BEGIN(SHOW_CMD); return tSHOW; } <INITIAL,NOPROCESS>source|sourc|sour|src { BEGIN(PATH_EXPECTED); return tSOURCE; } <INITIAL>symbolfile|symbols|symbol|sf { BEGIN(PATH_EXPECTED); return tSYMBOLFILE; } -<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { return tBREAK; } -<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { return tHBREAK; } -<INITIAL>watch|watc|wat { return tWATCH; } -<INITIAL>whatis|whati|what { return tWHATIS; } +<INITIAL,INFO_CMD,BD_CMD>break|brea|bre|br|b { BEGIN(NOCMD); return tBREAK; } +<INITIAL,INFO_CMD,BD_CMD>hbreak|hbrea|hbre|hbr|hb { BEGIN(NOCMD); return tHBREAK; } +<INITIAL>watch|watc|wat { BEGIN(NOCMD); return tWATCH; } +<INITIAL>whatis|whati|what { BEGIN(NOCMD); return tWHATIS; } <INITIAL,NOPROCESS>run|ru|r { BEGIN(ASTRING_EXPECTED); return tRUN;} -<INITIAL>detach|detac|deta|det { return tDETACH; } +<INITIAL>detach|detac|deta|det { BEGIN(NOCMD); return tDETACH; } <INITIAL>maintenance|maint { BEGIN(MAINT_CMD); return tMAINTENANCE; } <INITIAL>minidump|mdmp { BEGIN(PATH_EXPECTED); return tMINIDUMP; } <INITIAL>echo { BEGIN(ASTRING_EXPECTED); return tECHO; } -<NOPROCESS>attach|attac|atta|att { return tATTACH; } +<NOPROCESS>attach|attac|atta|att { BEGIN(NOCMD); return tATTACH; } <INFO_CMD>share|shar|sha { return tSHARE; } <INFO_CMD>locals|local|loca|loc { return tLOCAL; } <INFO_CMD>class|clas|cla { return tCLASS; }

1 0