February 2011 - Wine-commits

Alexandre Julliard : cabinet: Call FDI function pointers explicitly instead of hiding them inside macros .
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 05702c146e4c390b408645b9da85ffa5a3578cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05702c146e4c390b408645b9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:27:51 2011 +0100 cabinet: Call FDI function pointers explicitly instead of hiding them inside macros. --- dlls/cabinet/cabinet.h | 27 +++------ dlls/cabinet/fdi.c | 148 ++++++++++++++++++++++++------------------------ 2 files changed, 83 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05702c146e4c390b40864…

1 0

Alexandre Julliard : cabinet: Move internal FDI definitions to fdi.c.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 7a9b3894652c5b7520512899847b34b0c35c5db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b3894652c5b75205128998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:31:29 2011 +0100 cabinet: Move internal FDI definitions to fdi.c. --- dlls/cabinet/cabinet.h | 37 ------------------------------------- dlls/cabinet/fdi.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index edb94ea..b84c3a7 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -306,48 +306,11 @@ typedef struct cds_forward { } methods; } cab_decomp_state; -/* _Int as in "Internal" fyi */ - -typedef struct { - unsigned int magic; - PFNALLOC alloc; - PFNFREE free; - PFNOPEN open; - PFNREAD read; - PFNWRITE write; - PFNCLOSE close; - PFNSEEK seek; - PERF perf; -} FDI_Int; - -#define FDI_INT_MAGIC 0xfdfdfd05 - /* * the rest of these are somewhat kludgy macros which are shared between fdi.c * and cabextract.c. */ -#define ZIPNEEDBITS(n) {while(k<(n)){cab_LONG c=*(ZIP(inpos)++);\ - b|=((cab_ULONG)c)<<k;k+=8;}} -#define ZIPDUMPBITS(n) {b>>=(n);k-=(n);} - -/* endian-neutral reading of little-endian data */ -#define EndGetI32(a) ((((a)[3])<<24)|(((a)[2])<<16)|(((a)[1])<<8)|((a)[0])) -#define EndGetI16(a) ((((a)[1])<<8)|((a)[0])) - -#define CAB(x) (decomp_state->x) -#define ZIP(x) (decomp_state->methods.zip.x) -#define QTM(x) (decomp_state->methods.qtm.x) -#define LZX(x) (decomp_state->methods.lzx.x) -#define DECR_OK (0) -#define DECR_DATAFORMAT (1) -#define DECR_ILLEGALDATA (2) -#define DECR_NOMEMORY (3) -#define DECR_CHECKSUM (4) -#define DECR_INPUT (5) -#define DECR_OUTPUT (6) -#define DECR_USERABORT (7) - /* Bitstream reading macros (Quantum / normal byte order) * * Q_INIT_BITSTREAM should be used first to set up the system diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 661a6ec..b5dc29d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -110,6 +110,21 @@ typedef struct { cab_UBYTE block_resv; } MORE_ISCAB_INFO, *PMORE_ISCAB_INFO; +typedef struct +{ + unsigned int magic; + PFNALLOC alloc; + PFNFREE free; + PFNOPEN open; + PFNREAD read; + PFNWRITE write; + PFNCLOSE close; + PFNSEEK seek; + PERF perf; +} FDI_Int; + +#define FDI_INT_MAGIC 0xfdfdfd05 + /* * ugh, well, this ended up being pretty damn silly... * now that I've conceded to build equivalent structures to struct cab.*, @@ -148,6 +163,26 @@ typedef struct fdi_cds_fwd { struct fdi_cds_fwd *next; } fdi_decomp_state; +#define ZIPNEEDBITS(n) {while(k<(n)){cab_LONG c=*(ZIP(inpos)++);\ + b|=((cab_ULONG)c)<<k;k+=8;}} +#define ZIPDUMPBITS(n) {b>>=(n);k-=(n);} + +/* endian-neutral reading of little-endian data */ +#define EndGetI32(a) ((((a)[3])<<24)|(((a)[2])<<16)|(((a)[1])<<8)|((a)[0])) +#define EndGetI16(a) ((((a)[1])<<8)|((a)[0])) + +#define CAB(x) (decomp_state->x) +#define ZIP(x) (decomp_state->methods.zip.x) +#define QTM(x) (decomp_state->methods.qtm.x) +#define LZX(x) (decomp_state->methods.lzx.x) +#define DECR_OK (0) +#define DECR_DATAFORMAT (1) +#define DECR_ILLEGALDATA (2) +#define DECR_NOMEMORY (3) +#define DECR_CHECKSUM (4) +#define DECR_INPUT (5) +#define DECR_OUTPUT (6) +#define DECR_USERABORT (7) static void set_error( FDI_Int *fdi, int oper, int err ) {

1 0

max@mtew.isa-geek.net : ntdll: Correct 'b' parameter descriptions for _alldiv and _aulldiv.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 708c43a2ef71d28e33a07e6d368e12f4cf0c91a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708c43a2ef71d28e33a07e6d3… Author: max(a)mtew.isa-geek.net <max(a)mtew.isa-geek.net> Date: Thu Feb 3 13:43:21 2011 -0500 ntdll: Correct 'b' parameter descriptions for _alldiv and _aulldiv. --- dlls/ntdll/large_int.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index e2b0734..cb98bae 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -531,7 +531,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( * * PARAMS * a [I] Initial number. - * b [I] Number to multiply a by. + * b [I] Number to divide a by. * * RETURNS * The dividend of a and b. @@ -585,7 +585,7 @@ LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) * * PARAMS * a [I] Initial number. - * b [I] Number to multiply a by. + * b [I] Number to divide a by. * * RETURNS * The dividend of a and b.

1 0

Henri Verbeet : wined3d: Remove COM from the clipper implementation.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 304d713860534ef8fec7707a41761e58818cd3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304d713860534ef8fec7707a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 20:14:03 2011 +0100 wined3d: Remove COM from the clipper implementation. --- dlls/ddraw/clipper.c | 20 ++----- dlls/ddraw/ddraw.c | 9 +-- dlls/ddraw/ddraw_private.h | 2 +- dlls/wined3d/clipper.c | 124 +++++++++++++++------------------------ dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/wined3d.spec | 10 +++- dlls/wined3d/wined3d_private.h | 12 ++-- include/wine/wined3d.idl | 44 ++++---------- 8 files changed, 87 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=304d713860534ef8fec77…

1 0

Nikolay Sivov : msvcrt: Use pointer exchange to set demangled name instead of section lock.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 8a7f817dea66ccb10d22380117c20b9bf224ba42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7f817dea66ccb10d2238011… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 3 15:42:46 2011 +0300 msvcrt: Use pointer exchange to set demangled name instead of section lock. --- dlls/msvcrt/cpp.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 4d0f5d5..1e7a20a 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -611,7 +611,6 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this) */ char* name = __unDName(0, _this->mangled + 1, 0, MSVCRT_malloc, MSVCRT_free, 0x2800); - if (name) { unsigned int len = strlen(name); @@ -620,17 +619,11 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this) while (len && name[--len] == ' ') name[len] = '\0'; - _mlock(_EXIT_LOCK2); - - if (_this->name) + if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL)) { /* Another thread set this member since we checked above - use it */ MSVCRT_free(name); } - else - _this->name = name; - - _munlock(_EXIT_LOCK2); } } TRACE("(%p) returning %s\n", _this, _this->name);

1 0

Nikolay Sivov : msvcrt: Partially implement type_info::name_internal_method ().
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 872314903752612d19be5d79dd300a7cb4b1f212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872314903752612d19be5d79d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 3 15:56:33 2011 +0300 msvcrt: Partially implement type_info::name_internal_method(). --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.c | 78 ++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcr90/tests/msvcr90.c | 108 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 192 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=872314903752612d19be5…

1 0

Alexander Morozov : shell32: Release iTypeInfo on error.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 04f2e7612404ad988136a3fe55e018150e5c5e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f2e7612404ad988136a3fe5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Feb 2 20:14:40 2011 +0300 shell32: Release iTypeInfo on error. --- dlls/shell32/shelldispatch.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 67501ae..4458252 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -391,6 +391,7 @@ static HRESULT Folder_Constructor(VARIANT *dir, Folder **ppsdf) ret = VariantCopy(&This->dir, dir); if (FAILED(ret)) { + ITypeInfo_Release(This->iTypeInfo); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; }

1 0

Alexander Morozov : shell32/tests: Add tests for FolderItem::get_Path.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 863059ab175ea0e27913a765d60dcfcbea378b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=863059ab175ea0e27913a765d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Feb 3 17:20:51 2011 +0300 shell32/tests: Add tests for FolderItem::get_Path. --- dlls/shell32/tests/shelldispatch.c | 138 +++++++++++++++++++++++++++++++++--- 1 files changed, 128 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index f253627..2652afe 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -30,29 +30,39 @@ static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); +static DWORD (WINAPI *pGetLongPathNameW)(LPCWSTR, LPWSTR, DWORD); static void init_function_pointers(void) { - HMODULE hmod; + HMODULE hshell32, hkernel32; - hmod = GetModuleHandleA("shell32.dll"); - pSHGetFolderPathW = (void*)GetProcAddress(hmod, "SHGetFolderPathW"); - pSHGetNameFromIDList = (void*)GetProcAddress(hmod, "SHGetNameFromIDList"); - pSHGetSpecialFolderLocation = (void*)GetProcAddress(hmod, + hshell32 = GetModuleHandleA("shell32.dll"); + hkernel32 = GetModuleHandleA("kernel32.dll"); + pSHGetFolderPathW = (void*)GetProcAddress(hshell32, "SHGetFolderPathW"); + pSHGetNameFromIDList = (void*)GetProcAddress(hshell32, "SHGetNameFromIDList"); + pSHGetSpecialFolderLocation = (void*)GetProcAddress(hshell32, "SHGetSpecialFolderLocation"); + pGetLongPathNameW = (void*)GetProcAddress(hkernel32, "GetLongPathNameW"); } static void test_namespace(void) { static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; static const WCHAR backslashW[] = {'\\',0}; + static const WCHAR clsidW[] = { + ':',':','{','6','4','5','F','F','0','4','0','-','5','0','8','1','-', + '1','0','1','B','-','9','F','0','8','-', + '0','0','A','A','0','0','2','F','9','5','4','E','}',0}; static WCHAR tempW[MAX_PATH], curW[MAX_PATH]; + WCHAR *long_pathW = NULL; HRESULT r; IShellDispatch *sd; Folder *folder; + Folder2 *folder2; + FolderItem *item; VARIANT var; - BSTR title; + BSTR title, item_path; int len; r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, @@ -86,6 +96,14 @@ static void test_namespace(void) "IShellDispatch::NameSpace failed: %08x\n", r); if (r == S_OK) { + static WCHAR path[MAX_PATH]; + + if (pSHGetFolderPathW) + { + r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, + SHGFP_TYPE_CURRENT, path); + ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r); + } r = Folder_get_Title(folder, &title); todo_wine ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); @@ -112,12 +130,8 @@ static void test_namespace(void) } else if (pSHGetFolderPathW) { - static WCHAR path[MAX_PATH]; WCHAR *p; - r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, - SHGFP_TYPE_CURRENT, path); - ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r); p = path + lstrlenW(path); while (path < p && *(p - 1) != '\\') p--; @@ -127,6 +141,58 @@ static void test_namespace(void) else skip("skipping Folder::get_Title test\n"); SysFreeString(title); } + r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); + ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + if (r == S_OK) + { + r = Folder2_get_Self(folder2, &item); + todo_wine + ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); + if (r == S_OK) + { + r = FolderItem_get_Path(item, &item_path); + todo_wine + ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); + if (pSHGetFolderPathW) + todo_wine + ok(!lstrcmpW(item_path, path), "expected %s, got %s\n", + wine_dbgstr_w(path), wine_dbgstr_w(item_path)); + SysFreeString(item_path); + FolderItem_Release(item); + } + Folder2_Release(folder2); + } + Folder_Release(folder); + } + + V_VT(&var) = VT_I4; + V_I4(&var) = ssfBITBUCKET; + r = IShellDispatch_NameSpace(sd, var, &folder); + ok(r == S_OK || + broken(r == S_FALSE), /* NT4 */ + "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); + ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + if (r == S_OK) + { + r = Folder2_get_Self(folder2, &item); + todo_wine + ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); + if (r == S_OK) + { + r = FolderItem_get_Path(item, &item_path); + todo_wine + ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); + todo_wine + ok(!lstrcmpW(item_path, clsidW), "expected %s, got %s\n", + wine_dbgstr_w(clsidW), wine_dbgstr_w(item_path)); + SysFreeString(item_path); + FolderItem_Release(item); + } + Folder2_Release(folder2); + } Folder_Release(folder); } @@ -141,6 +207,13 @@ static void test_namespace(void) SysFreeString(V_BSTR(&var)); GetFullPathNameW(winetestW, MAX_PATH, tempW, NULL); + if (pGetLongPathNameW) + { + len = pGetLongPathNameW(tempW, NULL, 0); + long_pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (long_pathW) + pGetLongPathNameW(tempW, long_pathW, len); + } V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(tempW); r = IShellDispatch_NameSpace(sd, var, &folder); @@ -155,6 +228,28 @@ static void test_namespace(void) wine_dbgstr_w(title)); SysFreeString(title); } + r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); + ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + if (r == S_OK) + { + r = Folder2_get_Self(folder2, &item); + todo_wine + ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); + if (r == S_OK) + { + r = FolderItem_get_Path(item, &item_path); + todo_wine + ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); + if (long_pathW) + todo_wine + ok(!lstrcmpW(item_path, long_pathW), + "expected %s, got %s\n", wine_dbgstr_w(long_pathW), + wine_dbgstr_w(item_path)); + SysFreeString(item_path); + FolderItem_Release(item); + } + Folder2_Release(folder2); + } Folder_Release(folder); } SysFreeString(V_BSTR(&var)); @@ -177,11 +272,34 @@ static void test_namespace(void) wine_dbgstr_w(title)); SysFreeString(title); } + r = Folder_QueryInterface(folder, &IID_Folder2, (LPVOID*)&folder2); + ok(r == S_OK, "Folder::QueryInterface failed: %08x\n", r); + if (r == S_OK) + { + r = Folder2_get_Self(folder2, &item); + todo_wine + ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); + if (r == S_OK) + { + r = FolderItem_get_Path(item, &item_path); + todo_wine + ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); + if (long_pathW) + todo_wine + ok(!lstrcmpW(item_path, long_pathW), + "expected %s, got %s\n", wine_dbgstr_w(long_pathW), + wine_dbgstr_w(item_path)); + SysFreeString(item_path); + FolderItem_Release(item); + } + Folder2_Release(folder2); + } Folder_Release(folder); } SysFreeString(V_BSTR(&var)); } + HeapFree(GetProcessHeap(), 0, long_pathW); RemoveDirectoryW(winetestW); SetCurrentDirectoryW(curW); IShellDispatch_Release(sd);

1 0

Alexander Morozov : ntoskrnl.exe: Add stub for IoGetDeviceInterfaces.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 745a50c9dbb03d37db58ff53136e93f00943bc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=745a50c9dbb03d37db58ff531… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Feb 3 17:49:10 2011 +0300 ntoskrnl.exe: Add stub for IoGetDeviceInterfaces. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a5c1659..4f70b98 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -622,6 +622,19 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoGetDeviceInterfaces( CONST GUID *InterfaceClassGuid, + PDEVICE_OBJECT PhysicalDeviceObject, + ULONG Flags, PWSTR *SymbolicLinkList ) +{ + FIXME( "stub: %s %p %x %p\n", debugstr_guid(InterfaceClassGuid), + PhysicalDeviceObject, Flags, SymbolicLinkList ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoGetDeviceObjectPointer (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ef0d50f..6d645ad 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -381,7 +381,7 @@ @ stub IoGetCurrentProcess @ stub IoGetDeviceAttachmentBaseRef @ stub IoGetDeviceInterfaceAlias -@ stub IoGetDeviceInterfaces +@ stdcall IoGetDeviceInterfaces(ptr ptr long ptr) @ stdcall IoGetDeviceObjectPointer(ptr long ptr ptr) @ stdcall IoGetDeviceProperty(ptr long long ptr ptr) @ stub IoGetDeviceToVerify diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6df5290..2f3fccb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1106,6 +1106,7 @@ void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); +NTSTATUS WINAPI IoGetDeviceInterfaces(CONST GUID*,PDEVICE_OBJECT,ULONG,PWSTR*); NTSTATUS WINAPI IoGetDeviceObjectPointer(UNICODE_STRING*,ACCESS_MASK,PFILE_OBJECT*,PDEVICE_OBJECT*); NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULONG,PVOID,PULONG); PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID);

1 0

Henri Verbeet : wined3d: Remove COM from the palette.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 5963483fc23c359e3ad9811ed1010bc80e68ea1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5963483fc23c359e3ad9811ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 2 20:22:52 2011 +0100 wined3d: Remove COM from the palette. --- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/palette.c | 12 ++-- dlls/ddraw/surface.c | 18 +++-- dlls/wined3d/palette.c | 157 ++++++++++++++-------------------------- dlls/wined3d/wined3d.spec | 7 ++ dlls/wined3d/wined3d_private.h | 15 ++--- include/wine/wined3d.idl | 40 ++++------- 7 files changed, 98 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5963483fc23c359e3ad98…

1 0