February 2009 - Wine-commits

David Korth : winex11.drv: Map Super_L, Super_R, and Menu keys correctly.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 728d87d0f588fd12de852bab025512b1a7fc1fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728d87d0f588fd12de852bab0… Author: David Korth <gerbilsoft(a)verizon.net> Date: Wed Feb 25 22:26:53 2009 -0500 winex11.drv: Map Super_L, Super_R, and Menu keys correctly. --- dlls/winex11.drv/keyboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index c9e4d16..542e5a8 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1028,7 +1028,7 @@ static const WORD nonchar_key_vkey[256] = /* modifier keys */ 0, VK_LSHIFT, VK_RSHIFT, VK_LCONTROL, /* FFE0 */ VK_RCONTROL, VK_CAPITAL, 0, VK_MENU, - VK_MENU, VK_LMENU, VK_RMENU, 0, 0, 0, 0, 0, /* FFE8 */ + VK_MENU, VK_LMENU, VK_RMENU, VK_LWIN, VK_RWIN, 0, 0, 0, /* FFE8 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FFF0 */ 0, 0, 0, 0, 0, 0, 0, VK_DELETE /* FFF8 */ }; @@ -1052,7 +1052,7 @@ static const WORD nonchar_key_scan[256] = 0x147, 0x14B, 0x148, 0x14D, 0x150, 0x149, 0x151, 0x14F, /* FF50 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF58 */ /* misc keys */ - /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x00, 0x00, 0x00, /* FF60 */ + /*?*/ 0, 0x137, /*?*/ 0, 0x152, 0x00, 0x00, 0x00, 0x15D, /* FF60 */ /*?*/ 0, /*?*/ 0, 0x38, 0x146, 0x00, 0x00, 0x00, 0x00, /* FF68 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FF70 */ /* keypad keys */ @@ -1073,7 +1073,7 @@ static const WORD nonchar_key_scan[256] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFD8 */ /* modifier keys */ 0x00, 0x2A, 0x136, 0x1D, 0x11D, 0x3A, 0x00, 0x38, /* FFE0 */ - 0x138, 0x38, 0x138, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFE8 */ + 0x138, 0x38, 0x138, 0x15b, 0x15c, 0x00, 0x00, 0x00, /* FFE8 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* FFF0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ };

1 0

Alexandre Julliard : winebuild: Make the 16-bit DOS header a local symbol.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 445047a97efa0a6184be29500405bddf9b329174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445047a97efa0a6184be29500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 24 17:47:09 2009 +0100 winebuild: Make the 16-bit DOS header a local symbol. --- tools/winebuild/build.h | 2 +- tools/winebuild/res16.c | 6 +++--- tools/winebuild/spec16.c | 28 +++++++++++++--------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d9df1ce..1be0fc8 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -213,7 +213,7 @@ extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); -extern void output_res16_directory( DLLSPEC *spec, const char *header_name ); +extern void output_res16_directory( DLLSPEC *spec ); extern void BuildRelays16(void); extern void BuildRelays32(void); diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index 8648190..bacd138 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -267,7 +267,7 @@ void output_res16_data( DLLSPEC *spec ) } /* output the resource definitions */ -void output_res16_directory( DLLSPEC *spec, const char *header_name ) +void output_res16_directory( DLLSPEC *spec ) { unsigned int i, j; struct res_tree *tree; @@ -293,8 +293,8 @@ void output_res16_directory( DLLSPEC *spec, const char *header_name ) for (j = 0, res = type->res; j < type->nb_names; j++, res++) { - output( "\t%s .L__wine_spec_resource_%lu-%s\n", - get_asm_short_keyword(), (unsigned long)(res - spec->resources), header_name ); + output( "\t%s .L__wine_spec_resource_%lu-.L__wine_spec_dos_header\n", + get_asm_short_keyword(), (unsigned long)(res - spec->resources) ); output( "\t%s .L__wine_spec_resource_%lu_end-.L__wine_spec_resource_%lu\n", get_asm_short_keyword(), (unsigned long)(res - spec->resources), (unsigned long)(res - spec->resources) ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 8fda978..82b5065 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -451,7 +451,7 @@ static int sort_func_list( ORDDEF **list, int count, * * Output the dll initialization code. */ -static void output_init_code( const DLLSPEC *spec, const char *header_name ) +static void output_init_code( const DLLSPEC *spec ) { char name[80]; @@ -468,13 +468,13 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "1:\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); - output( "\tleal %s-1b(%%eax),%%ecx\n", header_name ); + output( "\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); } else { output( "\tpushl $.L__wine_spec_file_name\n" ); - output( "\tpushl $%s\n", header_name ); + output( "\tpushl $.L__wine_spec_dos_header\n" ); } output( "\tcall %s\n", asm_name("__wine_dll_register_16") ); output( "\taddl $12,%%esp\n" ); @@ -490,12 +490,12 @@ static void output_init_code( const DLLSPEC *spec, const char *header_name ) if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal %s-1b(%%eax),%%ecx\n", header_name ); + output( "1:\tleal .L__wine_spec_dos_header-1b(%%eax),%%ecx\n" ); output( "\tpushl %%ecx\n" ); } else { - output( "\tpushl $%s\n", header_name ); + output( "\tpushl $.L__wine_spec_dos_header\n" ); } output( "\tcall %s\n", asm_name("__wine_dll_unregister_16") ); output( "\taddl $12,%%esp\n" ); @@ -531,7 +531,6 @@ void BuildSpec16File( DLLSPEC *spec ) ORDDEF **typelist; ORDDEF *entry_point = NULL; int i, j, nb_funcs; - char header_name[256]; /* File header */ @@ -587,11 +586,10 @@ void BuildSpec16File( DLLSPEC *spec ) /* Output the module structure */ - sprintf( header_name, "__wine_spec_%s_dos_header", make_c_identifier(spec->dll_name) ); output( "\n/* module data */\n\n" ); output( "\t.data\n" ); output( "\t.align %d\n", get_alignment(4) ); - output( "%s:\n", header_name ); + output( ".L__wine_spec_dos_header:\n" ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* e_magic */ IMAGE_DOS_SIGNATURE ); output( "\t%s 0\n", get_asm_short_keyword() ); /* e_cblp */ @@ -611,7 +609,7 @@ void BuildSpec16File( DLLSPEC *spec ) output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oemid */ output( "\t%s 0\n", get_asm_short_keyword() ); /* e_oeminfo */ output( "\t%s 0,0,0,0,0,0,0,0,0,0\n", get_asm_short_keyword() ); /* e_res2 */ - output( "\t.long .L__wine_spec_ne_header-%s\n", header_name ); /* e_lfanew */ + output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ output( ".L__wine_spec_ne_header:\n" ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), /* ne_magic */ @@ -663,8 +661,8 @@ void BuildSpec16File( DLLSPEC *spec ) /* code segment entry */ - output( "\t%s .L__wine_spec_code_segment-%s\n", /* filepos */ - get_asm_short_keyword(), header_name ); + output( "\t%s .L__wine_spec_code_segment-.L__wine_spec_dos_header\n", /* filepos */ + get_asm_short_keyword() ); output( "\t%s .L__wine_spec_code_segment_end-.L__wine_spec_code_segment\n", /* size */ get_asm_short_keyword() ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_32BIT ); /* flags */ @@ -673,8 +671,8 @@ void BuildSpec16File( DLLSPEC *spec ) /* data segment entry */ - output( "\t%s .L__wine_spec_data_segment-%s\n", /* filepos */ - get_asm_short_keyword(), header_name ); + output( "\t%s .L__wine_spec_data_segment-.L__wine_spec_dos_header\n", /* filepos */ + get_asm_short_keyword() ); output( "\t%s .L__wine_spec_data_segment_end-.L__wine_spec_data_segment\n", /* size */ get_asm_short_keyword() ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), NE_SEGFLAGS_DATA ); /* flags */ @@ -683,7 +681,7 @@ void BuildSpec16File( DLLSPEC *spec ) /* resource directory */ - output_res16_directory( spec, header_name ); + output_res16_directory( spec ); /* resident names table */ @@ -835,7 +833,7 @@ void BuildSpec16File( DLLSPEC *spec ) output_stubs( spec ); output_get_pc_thunk(); - output_init_code( spec, header_name ); + output_init_code( spec ); output_gnu_stack_note(); free( typelist );

1 0

Paul Vriens : ddrawex/tests: Fix some test failures on W95.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 53bd36ebe3daff849cace16bf316818b9a1ddc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53bd36ebe3daff849cace16bf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Feb 26 09:45:00 2009 +0100 ddrawex/tests: Fix some test failures on W95. --- dlls/ddrawex/tests/ddrawex.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 608a19c..9a2fb16 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -58,6 +58,12 @@ static void RefCountTest(void) IDirectDraw_AddRef(dd1); ref = get_ref((IUnknown *) dd1); + if (ref == 1) + { + win_skip("Refcounting is broken\n"); + IDirectDraw_Release(dd1); + return; + } ok(ref == 2, "After AddRef the refcount is %u, expected 2\n", ref); IDirectDraw_Release(dd1); ref = get_ref((IUnknown *) dd1);

1 0

Francois Gouget : advpack/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 170d647bf84e21bfc0dbeaa61c12b836dea8064b URL: http://source.winehq.org/git/wine.git/?a=commit;h=170d647bf84e21bfc0dbeaa61… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 26 09:45:17 2009 +0100 advpack/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/advpack/tests/advpack.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index b17e65f..3ead0f2 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -83,7 +83,7 @@ static BOOL init_function_pointers(void) if (!pCloseINFEngine || !pDelNode || !pGetVersionFromFile || !pOpenINFEngine || !pSetPerUserSecValues || !pTranslateInfString) { - skip("Needed functions are not available\n"); + win_skip("Needed functions are not available\n"); FreeLibrary(hAdvPack); return FALSE; } @@ -333,7 +333,7 @@ static void translateinfstringex_test(void) hr = pOpenINFEngine(inf_file, NULL, 0, &hinf, NULL); if (hr == E_UNEXPECTED) { - skip("Skipping tests on win9x because of brokenness\n"); + win_skip("Skipping tests on win9x because of brokenness\n"); return; }

1 0

Francois Gouget : comctl32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: e7800f2a529aa51198431b2b75746fc4983d6c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7800f2a529aa51198431b2b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 26 09:45:25 2009 +0100 comctl32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/comctl32/tests/comboex.c | 4 ++-- dlls/comdlg32/tests/filedlg.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index f59d1d1..1e74192 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -187,7 +187,7 @@ static void test_WM_LBUTTONDOWN(void) pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); if (!pGetComboBoxInfo){ - skip("GetComboBoxInfo is not available\n"); + win_skip("GetComboBoxInfo is not available\n"); return; } @@ -314,7 +314,7 @@ static int init(void) pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (!pInitCommonControlsEx) { - skip("InitCommonControlsEx() is missing. Skipping the tests\n"); + win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); return 0; } iccex.dwSize = sizeof(iccex); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cff103e..9714dda 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -111,7 +111,7 @@ static void test_DialogCancel(void) SetLastError(0xdeadbeef); result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetOpenFileNameW is not implemented\n"); + win_skip("GetOpenFileNameW is not implemented\n"); else { ok(0 == result, "expected %d, got %d\n", 0, result); @@ -124,7 +124,7 @@ static void test_DialogCancel(void) SetLastError(0xdeadbeef); result = GetSaveFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - skip("GetSaveFileNameW is not implemented\n"); + win_skip("GetSaveFileNameW is not implemented\n"); else { ok(0 == result, "expected %d, got %d\n", 0, result); @@ -156,7 +156,7 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView_QueryInterface(shell_view, &IID_IShellView2, (void **)&shell_view2); if (hr == E_NOINTERFACE) { - skip("IShellView2 not supported\n"); + win_skip("IShellView2 not supported\n"); goto cleanup; } ok(SUCCEEDED(hr), "QueryInterface returned %#x\n", hr);

1 0

Francois Gouget : twain_32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 2ba5581924f5ddf0a6d6e9e2e3f2932592934be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba5581924f5ddf0a6d6e9e2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 26 09:45:33 2009 +0100 twain_32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/twain_32/tests/dsm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index fb438ab..37ebf3b 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -579,14 +579,14 @@ START_TEST(dsm) htwain = LoadLibraryA("twain_32.dll"); if (! htwain) { - skip("twain_32.dll not available, skipping tests\n"); + win_skip("twain_32.dll not available, skipping tests\n"); return; } pDSM_Entry = (void*)GetProcAddress(htwain, "DSM_Entry"); ok(pDSM_Entry != NULL, "Unable to GetProcAddress DSM_Entry\n"); if (! pDSM_Entry) { - skip("DSM_Entry not available, skipping tests\n"); + win_skip("DSM_Entry not available, skipping tests\n"); return; }

1 0

Henri Verbeet : d3d10: Add the ID3D10Effect interface.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: e737129b3413780189abc979fdb347f6941a7749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e737129b3413780189abc979f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 09:00:00 2009 +0100 d3d10: Add the ID3D10Effect interface. --- include/d3d10effect.h | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index acd5d83..1eb9cbf 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -89,6 +89,16 @@ typedef struct _D3D10_STATE_BLOCK_MASK BYTE Predication; } D3D10_STATE_BLOCK_MASK; +typedef struct _D3D10_EFFECT_DESC +{ + BOOL IsChildEffect; + UINT ConstantBuffers; + UINT SharedConstantBuffers; + UINT GlobalVariables; + UINT SharedGlobalVariables; + UINT Techniques; +} D3D10_EFFECT_DESC; + DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); #define INTERFACE ID3D10EffectType @@ -191,4 +201,30 @@ DECLARE_INTERFACE(ID3D10EffectTechnique) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1, 0xcb, 0x50, 0x17, 0xc7); + +#define INTERFACE ID3D10Effect +DECLARE_INTERFACE_(ID3D10Effect, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10Effect methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(BOOL, IsPool)(THIS) PURE; + STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetVariableBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectTechnique *, GetTechniqueByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(Optimize)(THIS) PURE; + STDMETHOD_(BOOL, IsOptimized)(THIS) PURE; +}; +#undef INTERFACE + #endif /* __WINE_D3D10EFFECT_H */

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectPool interface.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: deba63eb086bf5d5f05e7eb8c70d63eed2bf001a URL: http://source.winehq.org/git/wine.git/?a=commit;h=deba63eb086bf5d5f05e7eb8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 09:00:01 2009 +0100 d3d10: Add the ID3D10EffectPool interface. --- include/d3d10effect.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 1eb9cbf..916f65a 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -227,4 +227,18 @@ DECLARE_INTERFACE_(ID3D10Effect, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33); + +#define INTERFACE ID3D10EffectPool +DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10EffectPool methods */ + STDMETHOD_(struct ID3D10Effect *, AsEffect)(THIS) PURE; +}; +#undef INTERFACE + #endif /* __WINE_D3D10EFFECT_H */

1 0

Henri Verbeet : d3d10: Add a stub ID3D10Effect implementation.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: 737c64d2ce419fa43c111cf234c4d7e53a5f7aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=737c64d2ce419fa43c111cf23… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 09:00:01 2009 +0100 d3d10: Add a stub ID3D10Effect implementation. --- dlls/d3d10/Makefile.in | 1 + dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 25 ++++++ dlls/d3d10/d3d10_private.h | 8 ++ dlls/d3d10/effect.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ include/d3d10effect.h | 11 +++ 6 files changed, 236 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 3aef27d..f560b4e 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = dxguid uuid d3d10core dxgi kernel32 C_SRCS = \ d3d10_main.c \ + effect.c \ utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 2613e38..0ea1d8f 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -3,7 +3,7 @@ @ stub D3D10CreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) -@ stub D3D10CreateEffectFromMemory +@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) @ stub D3D10CreateEffectPoolFromMemory @ stub D3D10CreateStateBlock @ stub D3D10DisassembleEffect diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index ad9651e..b13bb9f 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -204,3 +204,28 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) +{ + struct d3d10_effect *object; + + FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + data, data_size, flags, device, effect_pool, effect); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 effect object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_effect_vtbl; + object->refcount = 1; + + *effect = (ID3D10Effect *)object; + + TRACE("Created ID3D10Effect %p\n", object); + + return S_OK; +} diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 46a4576..c73c840 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -31,6 +31,14 @@ /* TRACE helper functions */ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type); +/* ID3D10Effect */ +extern const struct ID3D10EffectVtbl d3d10_effect_vtbl; +struct d3d10_effect +{ + const struct ID3D10EffectVtbl *vtbl; + LONG refcount; +}; + /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, DWORD unknown0, ID3D10Device **device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c new file mode 100644 index 0000000..54ae6ea --- /dev/null +++ b/dlls/d3d10/effect.c @@ -0,0 +1,190 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10Effect) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) +{ + struct d3d10_effect *This = (struct d3d10_effect *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) +{ + struct d3d10_effect *This = (struct d3d10_effect *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10Effect methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_IsValid(ID3D10Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static BOOL STDMETHODCALLTYPE d3d10_effect_IsPool(ID3D10Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10_EFFECT_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByIndex(ID3D10Effect *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, + LPCSTR semantic) +{ + FIXME("iface %p, semantic \"%s\" stub!\n", iface, semantic); + + return NULL; +} + +static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d3d10_effect_IsOptimized(ID3D10Effect *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +const struct ID3D10EffectVtbl d3d10_effect_vtbl = +{ + /* IUnknown methods */ + d3d10_effect_QueryInterface, + d3d10_effect_AddRef, + d3d10_effect_Release, + /* ID3D10Effect methods */ + d3d10_effect_IsValid, + d3d10_effect_IsPool, + d3d10_effect_GetDevice, + d3d10_effect_GetDesc, + d3d10_effect_GetConstantBufferByIndex, + d3d10_effect_GetConstantBufferByName, + d3d10_effect_GetVariableByIndex, + d3d10_effect_GetVariableByName, + d3d10_effect_GetVariableBySemantic, + d3d10_effect_GetTechniqueByIndex, + d3d10_effect_GetTechniqueByName, + d3d10_effect_Optimize, + d3d10_effect_IsOptimized, +}; diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 916f65a..ce409ea 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -241,4 +241,15 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) }; #undef INTERFACE +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); + +#ifdef __cplusplus +} +#endif + #endif /* __WINE_D3D10EFFECT_H */

1 0

Francois Gouget : advapi32/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 26 Feb '09

26 Feb '09

Module: wine Branch: master Commit: e3b00de35ffe47c6681f644ed91a9e9f1a7b3db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b00de35ffe47c6681f644ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 26 09:45:07 2009 +0100 advapi32/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/advapi32/tests/cred.c | 2 +- dlls/advapi32/tests/crypt.c | 18 +++++++++--------- dlls/advapi32/tests/crypt_lmhash.c | 28 ++++++++++++++-------------- dlls/advapi32/tests/crypt_md4.c | 8 ++++---- dlls/advapi32/tests/crypt_md5.c | 2 +- dlls/advapi32/tests/crypt_sha.c | 2 +- dlls/advapi32/tests/lsa.c | 2 +- dlls/advapi32/tests/security.c | 34 +++++++++++++++++----------------- dlls/advapi32/tests/service.c | 8 ++++---- 9 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3b00de35ffe47c6681f6…

1 0