January 2011 - Wine-commits

Alexander Law : programs/notepad: Correct sharing mode for opening file in notepad.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: a8308dd017541e9dd2ceca3d07a9ba8a566d8b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8308dd017541e9dd2ceca3d0… Author: Alexander Law <exclusion(a)gmail.com> Date: Fri Jan 28 08:34:23 2011 +0300 programs/notepad: Correct sharing mode for opening file in notepad. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e9a650d..4a99ec2 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -356,7 +356,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) if (!DoCloseFile()) return; - hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) {

1 0

Marcus Meissner : user32: Get MDI icon as close the "small icon" as possible.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 6e077e0bc0454ba6d024353e33f569f06be796e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e077e0bc0454ba6d024353e3… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jan 27 16:38:03 2011 +0100 user32: Get MDI icon as close the "small icon" as possible. --- dlls/user32/mdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index bcaef76..6385476 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -866,7 +866,7 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) if (!hIcon) hIcon = (HICON)SendMessageW(hChild, WM_GETICON, ICON_BIG, 0); if (!hIcon) - hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + hIcon = LoadImageW(0, MAKEINTRESOURCEW(IDI_WINLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); if (hIcon) { HDC hMemDC;

1 0

Alexandre Julliard : dbghelp: Add a helper function to determine the name of the wine loader.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 3bae7d03836bc57ccd602c40586e00609a6d9585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bae7d03836bc57ccd602c405… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 11:41:14 2011 +0100 dbghelp: Add a helper function to determine the name of the wine loader. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 18 +----------------- dlls/dbghelp/macho_module.c | 20 +------------------- dlls/dbghelp/module.c | 35 +++++++++++++++++++++++++++++++---- 4 files changed, 34 insertions(+), 41 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 388908a..b2b13c0 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -528,7 +528,6 @@ extern BOOL macho_synchronize_module_list(struct process* pcs); /* module.c */ extern const WCHAR S_ElfW[]; extern const WCHAR S_WineLoaderW[]; -extern const WCHAR S_WineW[]; extern const WCHAR S_SlashW[]; extern struct module* @@ -555,6 +554,7 @@ extern void module_reset_debug_info(struct module* module); extern BOOL module_remove(struct process* pcs, struct module* module); extern void module_set_module(struct module* module, const WCHAR* name); +extern const WCHAR *get_wine_loader_name(void); /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a64fe9f..e2391bd 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1458,23 +1458,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, */ static BOOL elf_search_loader(struct process* pcs, struct elf_info* elf_info) { - BOOL ret; - const char* ptr; - - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - WCHAR tmp[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, ptr, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - ret = elf_search_and_load_file(pcs, tmp, 0, 0, elf_info); - } - else - { - ret = elf_search_and_load_file(pcs, S_WineW, 0, 0, elf_info); - } - return ret; + return elf_search_and_load_file(pcs, get_wine_loader_name(), 0, 0, elf_info); } /****************************************************************** diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index ae67188..6b03fee 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1274,25 +1274,7 @@ BOOL macho_synchronize_module_list(struct process* pcs) */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { - BOOL ret; - const char* ptr; - - TRACE("(%p/%p, %p)\n", pcs, pcs->handle, macho_info); - - /* All binaries are loaded with WINELOADER (if run from tree) or by the - * main executable - */ - if ((ptr = getenv("WINELOADER"))) - { - WCHAR tmp[MAX_PATH]; - MultiByteToWideChar(CP_UNIXCP, 0, ptr, -1, tmp, sizeof(tmp) / sizeof(WCHAR)); - ret = macho_search_and_load_file(pcs, tmp, 0, macho_info); - } - else - { - ret = macho_search_and_load_file(pcs, S_WineW, 0, macho_info); - } - return ret; + return macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); } /****************************************************************** diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index debfd5d..50cf114 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -38,7 +38,6 @@ static const WCHAR S_DotSoW[] = {'.','s','o','\0'}; static const WCHAR S_DotDylibW[] = {'.','d','y','l','i','b','\0'}; static const WCHAR S_DotPdbW[] = {'.','p','d','b','\0'}; static const WCHAR S_DotDbgW[] = {'.','d','b','g','\0'}; -const WCHAR S_WineW[] = {'w','i','n','e',0}; const WCHAR S_SlashW[] = {'/','\0'}; static const WCHAR S_AcmW[] = {'.','a','c','m','\0'}; @@ -78,6 +77,7 @@ static const WCHAR* get_filename(const WCHAR* name, const WCHAR* endptr) static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) { + const WCHAR *loader = get_wine_loader_name(); const WCHAR *ptr, *endptr; size_t len, l; @@ -87,7 +87,7 @@ static void module_fill_module(const WCHAR* in, WCHAR* out, size_t size) out[len] = '\0'; if (len > 4 && (l = match_ext(out, len))) out[len - l] = '\0'; - else if (len > 4 && !strcmpiW(out + len - 4, S_WineW)) + else if (len > strlenW(loader) && !strcmpiW(out + len - strlenW(loader), loader)) lstrcpynW(out, S_WineLoaderW, size); else { @@ -106,6 +106,29 @@ void module_set_module(struct module* module, const WCHAR* name) NULL, NULL); } +const WCHAR *get_wine_loader_name(void) +{ + static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR *loader; + const char *ptr; + + if (!loader) + { + /* All binaries are loaded with WINELOADER (if run from tree) or by the + * main executable + */ + if ((ptr = getenv("WINELOADER"))) + { + DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); + loader = buffer; + } + else loader = wineW; + } + return loader; +} + static const char* get_module_type(enum module_type type, BOOL virtual) { switch (type) @@ -417,7 +440,8 @@ static BOOL module_is_container_loaded(const struct process* pcs, */ enum module_type module_get_type_by_name(const WCHAR* name) { - int len = strlenW(name); + int loader_len, len = strlenW(name); + const WCHAR *loader; /* Skip all version extensions (.[digits]) regex: "(\.\d+)*$" */ do @@ -452,7 +476,10 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_DBG; /* wine is also a native module (Mach-O on Mac OS X, ELF elsewhere) */ - if (((len > 4 && name[len - 5] == '/') || len == 4) && !strcmpiW(name + len - 4, S_WineW)) + loader = get_wine_loader_name(); + loader_len = strlenW( loader ); + if ((len == loader_len || (len > loader_len && name[len - loader_len - 1] == '/')) && + !strcmpiW(name + len - loader_len, loader)) { #ifdef __APPLE__ return DMT_MACHO;

1 0

Alexandre Julliard : dbghelp: Use wine64 as loader name on 64-bit.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 16a2ea5c8f008c583fe6309fe330e24469e6b9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a2ea5c8f008c583fe6309fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 11:54:56 2011 +0100 dbghelp: Use wine64 as loader name on 64-bit. --- dlls/dbghelp/module.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 50cf114..ce5e63e 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -108,23 +108,39 @@ void module_set_module(struct module* module, const WCHAR* name) const WCHAR *get_wine_loader_name(void) { + static const int is_win64 = sizeof(void *) > sizeof(int); /* FIXME: should depend on target process */ static const WCHAR wineW[] = {'w','i','n','e',0}; + static const WCHAR suffixW[] = {'6','4',0}; static const WCHAR *loader; - const char *ptr; if (!loader) { + WCHAR *p, *buffer; + const char *ptr; + /* All binaries are loaded with WINELOADER (if run from tree) or by the * main executable */ if ((ptr = getenv("WINELOADER"))) { - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); - WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + DWORD len = 2 + MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, NULL, 0 ); + buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_UNIXCP, 0, ptr, -1, buffer, len ); - loader = buffer; } - else loader = wineW; + else + { + buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(wineW) + 2 * sizeof(WCHAR) ); + strcpyW( buffer, wineW ); + } + p = buffer + strlenW( buffer ) - strlenW( suffixW ); + if (p > buffer && !strcmpW( p, suffixW )) + { + if (!is_win64) *p = 0; + } + else if (is_win64) strcatW( buffer, suffixW ); + + TRACE( "returning %s\n", debugstr_w(buffer) ); + loader = buffer; } return loader; }

1 0

Henri Verbeet : wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D().
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 1b726498ed97c2b424916200ae0c64c65e3b7cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b726498ed97c2b424916200a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:10 2011 +0100 wined3d: Set all render targets to NULL in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92bc151..676eafc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2218,6 +2218,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, } } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + TRACE("Releasing the render target at %p\n", This->render_targets[0]); IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]);

1 0

Henri Verbeet : d3d9: Check the correct swapchain in IDirect3DDevice9Impl_GetSwapChain() (LLVM/ Clang).
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 69ea0884abc52a36894013db4d5e60bf90c63010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ea0884abc52a36894013db4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:11 2011 +0100 d3d9: Check the correct swapchain in IDirect3DDevice9Impl_GetSwapChain() (LLVM/Clang). --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d453350..ed00d67 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -498,7 +498,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirec wined3d_mutex_lock(); hr = IWineD3DDevice_GetSwapChain(((IDirect3DDevice9Impl *)iface)->WineD3DDevice, swapchain_idx, &wined3d_swapchain); - if (SUCCEEDED(hr) && swapchain) + if (SUCCEEDED(hr) && wined3d_swapchain) { *swapchain = IWineD3DSwapChain_GetParent(wined3d_swapchain); IDirect3DSwapChain9_AddRef(*swapchain);

1 0

Henri Verbeet : ddraw: Link directly to wined3d.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 8872239088c5e1b096cfc9203e008add68336ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8872239088c5e1b096cfc9203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:12 2011 +0100 ddraw: Link directly to wined3d. --- dlls/ddraw/Makefile.in | 2 +- dlls/ddraw/clipper.c | 2 +- dlls/ddraw/ddraw.c | 14 +------------- dlls/ddraw/ddraw_private.h | 4 ---- dlls/ddraw/main.c | 28 ---------------------------- 5 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/Makefile.in b/dlls/ddraw/Makefile.in index 8ef4542..1d49e79 100644 --- a/dlls/ddraw/Makefile.in +++ b/dlls/ddraw/Makefile.in @@ -1,6 +1,6 @@ MODULE = ddraw.dll IMPORTLIB = ddraw -IMPORTS = dxguid uuid ole32 user32 gdi32 advapi32 +IMPORTS = dxguid uuid wined3d user32 gdi32 advapi32 C_SRCS = \ clipper.c \ diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index b4c493c..905f006 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -307,7 +307,7 @@ HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) { clipper->lpVtbl = &ddraw_clipper_vtbl; clipper->ref = 1; - clipper->wineD3DClipper = pWineDirect3DCreateClipper(); + clipper->wineD3DClipper = WineDirect3DCreateClipper(); if (!clipper->wineD3DClipper) { WARN("Failed to create wined3d clipper.\n"); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6aa3af6..f148e29 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3964,12 +3964,6 @@ DirectDrawCreateClipper(DWORD Flags, return CLASS_E_NOAGGREGATION; } - if (!LoadWineD3D()) - { - LeaveCriticalSection(&ddraw_cs); - return DDERR_NODIRECTDRAWSUPPORT; - } - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawClipperImpl)); if (object == NULL) @@ -6016,13 +6010,7 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - if (!LoadWineD3D()) - { - ERR("Failed to load wined3d - broken OpenGL setup?\n"); - return DDERR_NODIRECTDRAWSUPPORT; - } - - ddraw->wineD3D = pWineDirect3DCreate(7, &ddraw->IDirectDraw7_iface); + ddraw->wineD3D = WineDirect3DCreate(7, &ddraw->IDirectDraw7_iface); if (!ddraw->wineD3D) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 56df02d..1fea09f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -187,10 +187,6 @@ IWineD3DVertexDeclaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DEC /* The default surface type */ extern WINED3DSURFTYPE DefaultSurfaceType DECLSPEC_HIDDEN; -extern typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN; -extern typeof(WineDirect3DCreate) *pWineDirect3DCreate DECLSPEC_HIDDEN; - - /***************************************************************************** * IDirectDrawSurface implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 89a8680..757d9c4 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -39,9 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; -typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper DECLSPEC_HIDDEN; -typeof(WineDirect3DCreate) *pWineDirect3DCreate DECLSPEC_HIDDEN; - /* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); @@ -170,31 +167,6 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha return entry->object; } -/* - * Helper Function for DDRAW_Create and DirectDrawCreateClipper for - * lazy loading of the Wine D3D driver. - * - * Returns - * TRUE on success - * FALSE on failure. - */ - -BOOL LoadWineD3D(void) -{ - static HMODULE hWineD3D = (HMODULE) -1; - if (hWineD3D == (HMODULE) -1) - { - hWineD3D = LoadLibraryA("wined3d"); - if (hWineD3D) - { - pWineDirect3DCreate = (typeof(WineDirect3DCreate) *)GetProcAddress(hWineD3D, "WineDirect3DCreate"); - pWineDirect3DCreateClipper = (typeof(WineDirect3DCreateClipper) *) GetProcAddress(hWineD3D, "WineDirect3DCreateClipper"); - return TRUE; - } - } - return hWineD3D != NULL; -} - /*********************************************************************** * * Helper function for DirectDrawCreate and friends

1 0

Henri Verbeet : widl: Support forward type declarations.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 7421bb0b61b708108a6005be541e1b1b293ca2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7421bb0b61b708108a6005be5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 27 20:11:13 2011 +0100 widl: Support forward type declarations. --- tools/widl/parser.y | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 30ae5f4..3850e65 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -384,8 +384,11 @@ statement: typedecl: enumdef + | tENUM aIDENTIFIER { $$ = type_new_enum($2, FALSE, NULL); } | structdef + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } | uniondef + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); }

1 0

Vincent Povirk : mscoree: Implement GetFileVersion.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 8a8808984e3ef5de3da2c6dd10fe5111d9ef3882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8808984e3ef5de3da2c6dd1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 27 16:05:34 2011 -0600 mscoree: Implement GetFileVersion. --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ dlls/mscoree/mscoree_private.h | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 889e1fb..2cafcb8 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -963,7 +963,7 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, return CLR_E_SHIM_RUNTIME; } -static HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, +HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer) { ASSEMBLY *assembly; diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 1d4d7f7..8cf548d 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -43,7 +43,7 @@ @ stdcall GetCORSystemDirectory(ptr long ptr) @ stdcall GetCORVersion(ptr long ptr) @ stub GetCompileInfo -@ stub GetFileVersion +@ stdcall GetFileVersion(wstr ptr long ptr) @ stub GetHashFromAssemblyFile @ stub GetHashFromAssemblyFileW @ stub GetHashFromBlob diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 1f2cfb0..a3e1cec 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -250,6 +250,17 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST return ret; } +HRESULT WINAPI GetFileVersion(LPCWSTR szFilename, LPWSTR szBuffer, DWORD cchBuffer, DWORD *dwLength) +{ + TRACE("(%s, %p, %d, %p)\n", debugstr_w(szFilename), szBuffer, cchBuffer, dwLength); + + if (!szFilename || !dwLength) + return E_POINTER; + + *dwLength = cchBuffer; + return CLRMetaHost_GetVersionFromFile(0, szFilename, szBuffer, dwLength); +} + HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll) { HRESULT ret=S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 9ece9cc..222b3ca 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -28,6 +28,9 @@ extern char *WtoA(LPCWSTR wstr); extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); +extern HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, + LPCWSTR pwzFilePath, LPWSTR pwzBuffer, DWORD *pcchBuffer); + typedef struct tagASSEMBLY ASSEMBLY; HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file);

1 0

Michael Stefaniuc : d3d8: Use impl_from_IDirect3DDevice8() instead of the iface to object cast.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: dec337acac63dffc4b401d1c4eb2425bba8e21f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec337acac63dffc4b401d1c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 28 01:16:06 2011 +0100 d3d8: Use impl_from_IDirect3DDevice8() instead of the iface to object cast. --- dlls/d3d8/device.c | 489 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 309 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dec337acac63dffc4b401…

1 0