March 2006 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Move the D3DSIO_DCL dumping code into its own function.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 518de008db1169f42f66a12b6610480a2ac3641a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=518de008db1169f42f66a12… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Mar 23 19:04:16 2006 +0000 wined3d: Move the D3DSIO_DCL dumping code into its own function. --- dlls/wined3d/pixelshader.c | 106 ++++++++++++++++++++++--------------------- dlls/wined3d/vertexshader.c | 106 ++++++++++++++++++++++--------------------- 2 files changed, 110 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 15815e2..e5311c7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1661,6 +1661,60 @@ inline static void pshader_program_dump_ } } +inline static void pshader_program_dump_decl_usage(IWineD3DPixelShaderImpl *This, DWORD token) { + TRACE("dcl_"); + switch(token & 0xFFFF) { + case D3DDECLUSAGE_POSITION: + TRACE("%s%ld ", "position",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_BLENDINDICES: + TRACE("%s ", "blend"); + break; + case D3DDECLUSAGE_BLENDWEIGHT: + TRACE("%s ", "weight"); + break; + case D3DDECLUSAGE_NORMAL: + TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_PSIZE: + TRACE("%s ", "psize"); + break; + case D3DDECLUSAGE_COLOR: + if((token & 0xF0000) >> 16 == 0) { + TRACE("%s ", "color"); + } else { + TRACE("%s%ld ", "specular", ((token & 0xF0000) >> 16) - 1); + } + break; + case D3DDECLUSAGE_TEXCOORD: + TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_TANGENT: + TRACE("%s ", "tangent"); + break; + case D3DDECLUSAGE_BINORMAL: + TRACE("%s ", "binormal"); + break; + case D3DDECLUSAGE_TESSFACTOR: + TRACE("%s ", "tessfactor"); + break; + case D3DDECLUSAGE_POSITIONT: + TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_FOG: + TRACE("%s ", "fog"); + break; + case D3DDECLUSAGE_DEPTH: + TRACE("%s ", "depth"); + break; + case D3DDECLUSAGE_SAMPLE: + TRACE("%s ", "sample"); + break; + default: + FIXME("Unrecognised dcl %08lx", token & 0xFFFF); + } +} + HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *iface, CONST DWORD *pFunction) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; const DWORD* pToken = pFunction; @@ -1706,57 +1760,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S } else { if (curOpcode->opcode == D3DSIO_DCL) { - TRACE("dcl_"); - switch(*pToken & 0xFFFF) { - case D3DDECLUSAGE_POSITION: - TRACE("%s%ld ", "position",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_BLENDINDICES: - TRACE("%s ", "blend"); - break; - case D3DDECLUSAGE_BLENDWEIGHT: - TRACE("%s ", "weight"); - break; - case D3DDECLUSAGE_NORMAL: - TRACE("%s%ld ", "normal",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_PSIZE: - TRACE("%s ", "psize"); - break; - case D3DDECLUSAGE_COLOR: - if((*pToken & 0xF0000) >> 16 == 0) { - TRACE("%s ", "color"); - } else { - TRACE("%s%ld ", "specular", ((*pToken & 0xF0000) >> 16) - 1); - } - break; - case D3DDECLUSAGE_TEXCOORD: - TRACE("%s%ld ", "texture", (*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_TANGENT: - TRACE("%s ", "tangent"); - break; - case D3DDECLUSAGE_BINORMAL: - TRACE("%s ", "binormal"); - break; - case D3DDECLUSAGE_TESSFACTOR: - TRACE("%s ", "tessfactor"); - break; - case D3DDECLUSAGE_POSITIONT: - TRACE("%s%ld ", "positionT",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_FOG: - TRACE("%s ", "fog"); - break; - case D3DDECLUSAGE_DEPTH: - TRACE("%s ", "depth"); - break; - case D3DDECLUSAGE_SAMPLE: - TRACE("%s ", "sample"); - break; - default: - FIXME("Unrecognised dcl %08lx", *pToken & 0xFFFF); - } + pshader_program_dump_decl_usage(This, *pToken); ++pToken; ++len; pshader_program_dump_ps_param(*pToken, 0); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index c4732bc..13da61c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -879,6 +879,60 @@ inline static void vshader_program_dump_ } } +inline static void vshader_program_dump_decl_usage(IWineD3DVertexShaderImpl *This, DWORD token) { + TRACE("dcl_"); + switch(token & 0xFFFF) { + case D3DDECLUSAGE_POSITION: + TRACE("%s%ld ", "position",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_BLENDINDICES: + TRACE("%s ", "blend"); + break; + case D3DDECLUSAGE_BLENDWEIGHT: + TRACE("%s ", "weight"); + break; + case D3DDECLUSAGE_NORMAL: + TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_PSIZE: + TRACE("%s ", "psize"); + break; + case D3DDECLUSAGE_COLOR: + if((token & 0xF0000) >> 16 == 0) { + TRACE("%s ", "color"); + } else { + TRACE("%s ", "specular"); + } + break; + case D3DDECLUSAGE_TEXCOORD: + TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_TANGENT: + TRACE("%s ", "tangent"); + break; + case D3DDECLUSAGE_BINORMAL: + TRACE("%s ", "binormal"); + break; + case D3DDECLUSAGE_TESSFACTOR: + TRACE("%s ", "tessfactor"); + break; + case D3DDECLUSAGE_POSITIONT: + TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16); + break; + case D3DDECLUSAGE_FOG: + TRACE("%s ", "fog"); + break; + case D3DDECLUSAGE_DEPTH: + TRACE("%s ", "depth"); + break; + case D3DDECLUSAGE_SAMPLE: + TRACE("%s ", "sample"); + break; + default: + FIXME("Unrecognised dcl %08lx", token & 0xFFFF); + } +} + inline static BOOL vshader_is_version_token(DWORD token) { return 0xFFFE0000 == (token & 0xFFFE0000); } @@ -2102,57 +2156,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ } else { if (curOpcode->opcode == D3DSIO_DCL) { - TRACE("dcl_"); - switch(*pToken & 0xFFFF) { - case D3DDECLUSAGE_POSITION: - TRACE("%s%ld ", "position",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_BLENDINDICES: - TRACE("%s ", "blend"); - break; - case D3DDECLUSAGE_BLENDWEIGHT: - TRACE("%s ", "weight"); - break; - case D3DDECLUSAGE_NORMAL: - TRACE("%s%ld ", "normal",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_PSIZE: - TRACE("%s ", "psize"); - break; - case D3DDECLUSAGE_COLOR: - if((*pToken & 0xF0000) >> 16 == 0) { - TRACE("%s ", "color"); - } else { - TRACE("%s ", "specular"); - } - break; - case D3DDECLUSAGE_TEXCOORD: - TRACE("%s%ld ", "texture", (*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_TANGENT: - TRACE("%s ", "tangent"); - break; - case D3DDECLUSAGE_BINORMAL: - TRACE("%s ", "binormal"); - break; - case D3DDECLUSAGE_TESSFACTOR: - TRACE("%s ", "tessfactor"); - break; - case D3DDECLUSAGE_POSITIONT: - TRACE("%s%ld ", "positionT",(*pToken & 0xF0000) >> 16); - break; - case D3DDECLUSAGE_FOG: - TRACE("%s ", "fog"); - break; - case D3DDECLUSAGE_DEPTH: - TRACE("%s ", "depth"); - break; - case D3DDECLUSAGE_SAMPLE: - TRACE("%s ", "sample"); - break; - default: - FIXME("Unrecognised dcl %08lx", *pToken & 0xFFFF); - } + vshader_program_dump_decl_usage(This, *pToken); ++pToken; ++len; vshader_program_dump_vs_param(*pToken, 0);

1 0

James Hawkins : advpack: Add initial tests for RunSetupCommand.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: df9a465b5088d9ba85672a88d2cf41977cb2eab9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df9a465b5088d9ba85672a8… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:12:20 2006 -0600 advpack: Add initial tests for RunSetupCommand. --- dlls/advpack/tests/.gitignore | 1 dlls/advpack/tests/Makefile.in | 3 + dlls/advpack/tests/install.c | 106 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletions(-) create mode 100644 dlls/advpack/tests/install.c diff --git a/dlls/advpack/tests/.gitignore b/dlls/advpack/tests/.gitignore index f658ddc..62d275e 100644 --- a/dlls/advpack/tests/.gitignore +++ b/dlls/advpack/tests/.gitignore @@ -1,4 +1,5 @@ Makefile advpack.ok files.ok +install.ok testlist.c diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index 00c0e26..edb4ed1 100644 --- a/dlls/advpack/tests/Makefile.in +++ b/dlls/advpack/tests/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = cabinet user32 advapi32 kern CTESTS = \ advpack.c \ - files.c + files.c \ + install.c @MAKE_TEST_RULES@ diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c new file mode 100644 index 0000000..b8a14eb --- /dev/null +++ b/dlls/advpack/tests/install.c @@ -0,0 +1,106 @@ +/* + * Unit tests for advpack.dll install functions + * + * Copyright (C) 2006 James Hawkins + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <windows.h> +#include <advpub.h> +#include <urlmon.h> +#include "wine/test.h" + +/* function pointers */ +static HRESULT (WINAPI *pRunSetupCommand)(HWND, LPCSTR, LPCSTR, LPCSTR, LPCSTR, HANDLE*, DWORD, LPVOID); + +static BOOL init_function_pointers() +{ + HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + if (!hAdvPack) + return FALSE; + + pRunSetupCommand = (void *)GetProcAddress(hAdvPack, "RunSetupCommand"); + + if (!pRunSetupCommand) + return FALSE; + + return TRUE; +} + +static void test_RunSetupCommand() +{ + HRESULT hr; + HANDLE hexe; + + /* try an invalid cmd name */ + hr = pRunSetupCommand(NULL, NULL, "Install", "Dir", "Title", NULL, 0, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try an invalid directory */ + hr = pRunSetupCommand(NULL, "winver.exe", "Install", NULL, "Title", NULL, 0, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try to run a non-existent exe */ + hexe = NULL; + hr = pRunSetupCommand(NULL, "idontexist.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); + todo_wine + { + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); + } + ok(hexe == NULL, "Expcted hexe to be NULL\n"); + ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); + + /* try a bad directory */ + hexe = NULL; + hr = pRunSetupCommand(NULL, "winver.exe", "Install", "windows\\system32", "Title", &hexe, 0, NULL); + todo_wine + { + ok(hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY), + "Expected HRESULT_FROM_WIN32(ERROR_DIRECTORY), got %ld\n", hr); + } + ok(hexe == NULL, "Expcted hexe to be NULL\n"); + ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); + + /* try to run an exe with the RSC_FLAG_INF flag */ + hexe = NULL; + hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, RSC_FLAG_INF, NULL); + todo_wine + { + ok(hr == SPAPI_E_WRONG_INF_STYLE, "Expected SPAPI_E_WRONG_INF_STYLE, got %ld\n", hr); + } + ok(hexe == NULL, "Expected hexe to be NULL\n"); + ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n"); + + /* run winver.exe */ + hexe = NULL; + hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, 0, NULL); + todo_wine + { + ok(hr == S_ASYNCHRONOUS, "Expected S_ASYNCHRONOUS, got %ld\n", hr); + ok(hexe != NULL, "Expected hexe to be non-NULL\n"); + ok(TerminateProcess(hexe, 0), "Expected TerminateProcess to succeed\n"); + } +} + +START_TEST(install) +{ + if (!init_function_pointers()) + return; + + test_RunSetupCommand(); +}

1 0

James Hawkins : advpack: Forward DelNodeA to its Unicode counterpart.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: e28d5417577d09fecef68a979d0997da3d57949c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e28d5417577d09fecef68a9… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:11:00 2006 -0600 advpack: Forward DelNodeA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 + dlls/advpack/files.c | 68 +++++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 4c84cb3..252b779 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -6,7 +6,7 @@ @ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall CloseINFEngine(long) @ stdcall DelNodeA(str long) -# stdcall DelNodeW(wstr long) +@ stdcall DelNodeW(wstr long) @ stdcall DelNode(str long) DelNodeA @ stdcall DelNodeRunDLL32A(ptr ptr str long) # stdcall DelNodeRunDLL32W(ptr ptr wstr long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 8900193..072434f 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -323,36 +323,41 @@ done: return HRESULT_FROM_WIN32(dwLastError); } -static HRESULT DELNODE_recurse_dirtree(LPSTR fname, DWORD flags) +static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) { - DWORD fattrs = GetFileAttributesA(fname); + DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR asterisk[] = {'*',0}; + static const WCHAR dot[] = {'.',0}; + static const WCHAR dotdot[] = {'.','.',0}; + if (fattrs & FILE_ATTRIBUTE_DIRECTORY) { HANDLE hFindFile; - WIN32_FIND_DATAA w32fd; + WIN32_FIND_DATAW w32fd; BOOL done = TRUE; - int fname_len = lstrlenA(fname); + int fname_len = lstrlenW(fname); /* Generate a path with wildcard suitable for iterating */ - if (CharPrevA(fname, fname + fname_len) != "\\") + if (lstrcmpW(CharPrevW(fname, fname + fname_len), backslash)) { - lstrcpyA(fname + fname_len, "\\"); + lstrcpyW(fname + fname_len, backslash); ++fname_len; } - lstrcpyA(fname + fname_len, "*"); + lstrcpyW(fname + fname_len, asterisk); - if ((hFindFile = FindFirstFileA(fname, &w32fd)) != INVALID_HANDLE_VALUE) + if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE) { /* Iterate through the files in the directory */ - for (done = FALSE; !done; done = !FindNextFileA(hFindFile, &w32fd)) + for (done = FALSE; !done; done = !FindNextFileW(hFindFile, &w32fd)) { - TRACE("%s\n", w32fd.cFileName); - if (lstrcmpA(".", w32fd.cFileName) != 0 && - lstrcmpA("..", w32fd.cFileName) != 0) + TRACE("%s\n", debugstr_w(w32fd.cFileName)); + if (lstrcmpW(dot, w32fd.cFileName) != 0 && + lstrcmpW(dotdot, w32fd.cFileName) != 0) { - lstrcpyA(fname + fname_len, w32fd.cFileName); + lstrcpyW(fname + fname_len, w32fd.cFileName); if (DELNODE_recurse_dirtree(fname, flags) != S_OK) { break; /* Failure */ @@ -367,8 +372,8 @@ static HRESULT DELNODE_recurse_dirtree(L if (done) { - TRACE("%s: directory\n", fname); - if (SetFileAttributesA(fname, FILE_ATTRIBUTE_NORMAL) && RemoveDirectoryA(fname)) + TRACE("%s: directory\n", debugstr_w(fname)); + if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && RemoveDirectoryW(fname)) { ret = S_OK; } @@ -376,8 +381,8 @@ static HRESULT DELNODE_recurse_dirtree(L } else { - TRACE("%s: file\n", fname); - if (SetFileAttributesA(fname, FILE_ATTRIBUTE_NORMAL) && DeleteFileA(fname)) + TRACE("%s: file\n", debugstr_w(fname)); + if (SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL) && DeleteFileW(fname)) { ret = S_OK; } @@ -389,6 +394,27 @@ static HRESULT DELNODE_recurse_dirtree(L /*********************************************************************** * DelNodeA (ADVPACK.@) * + * See DelNodeW. + */ +HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags ) +{ + UNICODE_STRING fileordirname; + HRESULT res; + + TRACE("(%s, 0x%08lx)\n", debugstr_a(pszFileOrDirName), dwFlags); + + RtlCreateUnicodeStringFromAsciiz(&fileordirname, pszFileOrDirName); + + res = DelNodeW(fileordirname.Buffer, dwFlags); + + RtlFreeUnicodeString(&fileordirname); + + return res; +} + +/*********************************************************************** + * DelNodeW (ADVPACK.@) + * * Deletes a file or directory * * PARAMS @@ -404,19 +430,19 @@ static HRESULT DELNODE_recurse_dirtree(L * - Native version apparently does a lot of checking to make sure * we're not trying to delete a system directory etc. */ -HRESULT WINAPI DelNodeA( LPCSTR pszFileOrDirName, DWORD dwFlags ) +HRESULT WINAPI DelNodeW( LPCWSTR pszFileOrDirName, DWORD dwFlags ) { - CHAR fname[MAX_PATH]; + WCHAR fname[MAX_PATH]; HRESULT ret = E_FAIL; - TRACE("(%s, 0x%08lx)\n", debugstr_a(pszFileOrDirName), dwFlags); + TRACE("(%s, 0x%08lx)\n", debugstr_w(pszFileOrDirName), dwFlags); if (dwFlags) FIXME("Flags ignored!\n"); if (pszFileOrDirName && *pszFileOrDirName) { - lstrcpyA(fname, pszFileOrDirName); + lstrcpyW(fname, pszFileOrDirName); /* TODO: Should check for system directory deletion etc. here */

1 0

James Hawkins : advpack: Forward RunSetupCommandA to its Unicode counterpart.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 478712a27d4c8da764b8cd06fee5512049f44d10 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=478712a27d4c8da764b8cd0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:11:15 2006 -0600 advpack: Forward RunSetupCommandA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/install.c | 49 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7a71d77..4c84cb3 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -63,7 +63,7 @@ @ stdcall RegSaveRestoreOnINF(ptr str str str long long long) RegSaveRestoreOnINFA @ stdcall RegisterOCX(ptr ptr str long) @ stdcall RunSetupCommandA(long str str str str ptr long ptr) -# stdcall RunSetupCommandW(long wstr wstr wstr wstr wptr long ptr) +@ stdcall RunSetupCommandW(long wstr wstr wstr wstr ptr long ptr) @ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA @ stdcall SetPerUserSecValuesA(ptr) @ stdcall SetPerUserSecValuesW(ptr) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index f67c63c..55c7703 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "winreg.h" #include "winver.h" +#include "winternl.h" #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" @@ -158,6 +159,44 @@ HRESULT WINAPI LaunchINFSectionExA( HWND /*********************************************************************** * RunSetupCommandA (ADVPACK.@) * + * See RunSetupCommandW. + */ +HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, + LPCSTR szInfSection, LPCSTR szDir, + LPCSTR lpszTitle, HANDLE *phEXE, + DWORD dwFlags, LPVOID pvReserved ) +{ + UNICODE_STRING cmdname, infsec; + UNICODE_STRING dir, title; + HRESULT hr; + + TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", + hWnd, debugstr_a(szCmdName), debugstr_a(szInfSection), + debugstr_a(szDir), debugstr_a(lpszTitle), + phEXE, dwFlags, pvReserved); + + if (!szCmdName || !szDir) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&cmdname, szCmdName); + RtlCreateUnicodeStringFromAsciiz(&infsec, szInfSection); + RtlCreateUnicodeStringFromAsciiz(&dir, szDir); + RtlCreateUnicodeStringFromAsciiz(&title, lpszTitle); + + hr = RunSetupCommandW(hWnd, cmdname.Buffer, infsec.Buffer, dir.Buffer, + title.Buffer, phEXE, dwFlags, pvReserved); + + RtlFreeUnicodeString(&cmdname); + RtlFreeUnicodeString(&infsec); + RtlFreeUnicodeString(&dir); + RtlFreeUnicodeString(&title); + + return hr; +} + +/*********************************************************************** + * RunSetupCommandW (ADVPACK.@) + * * Executes an install section in an INF file or a program. * * PARAMS @@ -183,14 +222,14 @@ HRESULT WINAPI LaunchINFSectionExA( HWND * BUGS * Unimplemented */ -HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, - LPCSTR szInfSection, LPCSTR szDir, - LPCSTR lpszTitle, HANDLE *phEXE, +HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, + LPCWSTR szInfSection, LPCWSTR szDir, + LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved ) { FIXME("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p): stub\n", - hWnd, debugstr_a(szCmdName), debugstr_a(szInfSection), - debugstr_a(szDir), debugstr_a(lpszTitle), + hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), + debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); return E_UNEXPECTED; }

1 0

James Hawkins : advpack: Forward the FileSaveRestore API to their Unicode counterparts.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 9ec33414453683080177fe460fc8494f0a8d69e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ec33414453683080177fe4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:10:43 2006 -0600 advpack: Forward the FileSaveRestore API to their Unicode counterparts. --- dlls/advpack/advpack.spec | 4 +- dlls/advpack/files.c | 81 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 74 insertions(+), 11 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 3b54041..7a71d77 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -23,10 +23,10 @@ @ stdcall FileSaveMarkNotExistW(wstr wstr wstr) @ stdcall FileSaveMarkNotExist(str str str) FileSaveMarkNotExistA @ stdcall FileSaveRestoreA(ptr str str str long) -# stdcall FileSaveRestoreW(ptr wstr wstr wstr long) +@ stdcall FileSaveRestoreW(ptr wstr wstr wstr long) @ stdcall FileSaveRestore(ptr str str str long) FileSaveRestoreA @ stdcall FileSaveRestoreOnINFA(ptr str str str str str long) -# stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long) +@ stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long) @ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA @ stdcall GetVersionFromFileA(str ptr ptr long) @ stdcall GetVersionFromFileW(wstr ptr ptr long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index fa994e3..8900193 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -758,6 +758,34 @@ HRESULT WINAPI FileSaveMarkNotExistW(LPW /*********************************************************************** * FileSaveRestoreA (ADVPACK.@) * + * See FileSaveRestoreW. + */ +HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, + LPSTR pszBaseName, DWORD dwFlags) +{ + UNICODE_STRING filelist, dir, basename; + HRESULT hr; + + TRACE("(%p, %s, %s, %s, %ld)\n", hDlg, pszFileList, pszDir, + pszBaseName, dwFlags); + + RtlCreateUnicodeStringFromAsciiz(&filelist, pszFileList); + RtlCreateUnicodeStringFromAsciiz(&dir, pszDir); + RtlCreateUnicodeStringFromAsciiz(&basename, pszBaseName); + + hr = FileSaveRestoreW(hDlg, filelist.Buffer, dir.Buffer, + basename.Buffer, dwFlags); + + RtlFreeUnicodeString(&filelist); + RtlFreeUnicodeString(&dir); + RtlFreeUnicodeString(&basename); + + return hr; +} + +/*********************************************************************** + * FileSaveRestoreW (ADVPACK.@) + * * Saves or restores the files in the specified file list. * * PARAMS @@ -777,11 +805,11 @@ HRESULT WINAPI FileSaveMarkNotExistW(LPW * BUGS * Unimplemented. */ -HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, - LPSTR pszBaseName, DWORD dwFlags) +HRESULT WINAPI FileSaveRestoreW(HWND hDlg, LPWSTR pszFileList, LPWSTR pszDir, + LPWSTR pszBaseName, DWORD dwFlags) { - FIXME("(%p, %p, %p, %p, %ld) stub\n", hDlg, pszFileList, pszDir, - pszBaseName, dwFlags); + FIXME("(%p, %s, %s, %s, %ld) stub\n", hDlg, debugstr_w(pszFileList), + debugstr_w(pszDir), debugstr_w(pszBaseName), dwFlags); return E_FAIL; } @@ -789,6 +817,40 @@ HRESULT WINAPI FileSaveRestoreA(HWND hDl /*********************************************************************** * FileSaveRestoreOnINFA (ADVPACK.@) * + * See FileSaveRestoreOnINFW. + */ +HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, + LPCSTR pszSection, LPCSTR pszBackupDir, + LPCSTR pszBaseBackupFile, DWORD dwFlags) +{ + UNICODE_STRING title, inf, section; + UNICODE_STRING backupdir, backupfile; + HRESULT hr; + + TRACE("(%p, %s, %s, %s, %s, %s, %ld) stub\n", hWnd, pszTitle, pszINF, + pszSection, pszBackupDir, pszBaseBackupFile, dwFlags); + + RtlCreateUnicodeStringFromAsciiz(&title, pszTitle); + RtlCreateUnicodeStringFromAsciiz(&inf, pszINF); + RtlCreateUnicodeStringFromAsciiz(&section, pszSection); + RtlCreateUnicodeStringFromAsciiz(&backupdir, pszBackupDir); + RtlCreateUnicodeStringFromAsciiz(&backupfile, pszBaseBackupFile); + + hr = FileSaveRestoreOnINFW(hWnd, title.Buffer, inf.Buffer, section.Buffer, + backupdir.Buffer, backupfile.Buffer, dwFlags); + + RtlFreeUnicodeString(&title); + RtlFreeUnicodeString(&inf); + RtlFreeUnicodeString(&section); + RtlFreeUnicodeString(&backupdir); + RtlFreeUnicodeString(&backupfile); + + return hr; +} + +/*********************************************************************** + * FileSaveRestoreOnINFW (ADVPACK.@) + * * * PARAMS * hWnd [I] Handle to the window used for the display. @@ -809,12 +871,13 @@ HRESULT WINAPI FileSaveRestoreA(HWND hDl * BUGS * Unimplemented. */ -HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, - LPCSTR pszSection, LPCSTR pszBackupDir, - LPCSTR pszBaseBackupFile, DWORD dwFlags) +HRESULT WINAPI FileSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF, + LPCWSTR pszSection, LPCWSTR pszBackupDir, + LPCWSTR pszBaseBackupFile, DWORD dwFlags) { - FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF, - pszSection, pszBackupDir, pszBaseBackupFile, dwFlags); + FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, debugstr_w(pszTitle), + debugstr_w(pszINF), debugstr_w(pszSection), debugstr_w(pszBackupDir), + debugstr_w(pszBaseBackupFile), dwFlags); return E_FAIL; }

1 0

James Hawkins : advpack: Forward GetVersionFromFileA/ ExA to their Unicode counterparts.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 7eaaa93a577d2cb35c01c2a8e801060e6e8b8acd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7eaaa93a577d2cb35c01c2a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:10:21 2006 -0600 advpack: Forward GetVersionFromFileA/ExA to their Unicode counterparts. --- dlls/advpack/advpack.spec | 4 +- dlls/advpack/files.c | 73 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 6d4b1d1..3b54041 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -29,10 +29,10 @@ # stdcall FileSaveRestoreOnINFW(ptr wstr wstr wstr wstr wstr long) @ stdcall FileSaveRestoreOnINF(ptr str str str str str long) FileSaveRestoreOnINFA @ stdcall GetVersionFromFileA(str ptr ptr long) -# stdcall GetVersionFromFileW(wstr ptr ptr long) +@ stdcall GetVersionFromFileW(wstr ptr ptr long) @ stdcall GetVersionFromFile(str ptr ptr long) GetVersionFromFileA @ stdcall GetVersionFromFileExA(str ptr ptr long) -# stdcall GetVersionFromFileExW(wstr ptr ptr long) +@ stdcall GetVersionFromFileExW(wstr ptr ptr long) @ stdcall GetVersionFromFileEx(str ptr ptr long) GetVersionFromFileExA @ stdcall IsNTAdmin(long ptr) @ stdcall LaunchINFSectionA(ptr ptr str long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 287888c..fa994e3 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -822,7 +822,7 @@ HRESULT WINAPI FileSaveRestoreOnINFA(HWN /*********************************************************************** * GetVersionFromFileA (ADVPACK.@) * - * See GetVersionFromFileEx. + * See GetVersionFromFileExW. */ HRESULT WINAPI GetVersionFromFileA(LPCSTR Filename, LPDWORD MajorVer, LPDWORD MinorVer, BOOL Version ) @@ -831,6 +831,18 @@ HRESULT WINAPI GetVersionFromFileA(LPCST return GetVersionFromFileExA(Filename, MajorVer, MinorVer, Version); } +/*********************************************************************** + * GetVersionFromFileW (ADVPACK.@) + * + * See GetVersionFromFileExW. + */ +HRESULT WINAPI GetVersionFromFileW(LPCWSTR Filename, LPDWORD MajorVer, + LPDWORD MinorVer, BOOL Version ) +{ + TRACE("(%s, %p, %p, %d)\n", debugstr_w(Filename), MajorVer, MinorVer, Version); + return GetVersionFromFileExW(Filename, MajorVer, MinorVer, Version); +} + /* data for GetVersionFromFileEx */ typedef struct tagLANGANDCODEPAGE { @@ -841,6 +853,28 @@ typedef struct tagLANGANDCODEPAGE /*********************************************************************** * GetVersionFromFileExA (ADVPACK.@) * + * See GetVersionFromFileExW. + */ +HRESULT WINAPI GetVersionFromFileExA(LPCSTR lpszFilename, LPDWORD pdwMSVer, + LPDWORD pdwLSVer, BOOL bVersion ) +{ + UNICODE_STRING filename; + HRESULT res; + + TRACE("(%s, %p, %p, %d)\n", lpszFilename, pdwMSVer, pdwLSVer, bVersion); + + RtlCreateUnicodeStringFromAsciiz(&filename, lpszFilename); + + res = GetVersionFromFileExW(filename.Buffer, pdwMSVer, pdwLSVer, bVersion); + + RtlFreeUnicodeString(&filename); + + return res; +} + +/*********************************************************************** + * GetVersionFromFileExW (ADVPACK.@) + * * Gets the files version or language information. * * PARAMS @@ -856,41 +890,48 @@ typedef struct tagLANGANDCODEPAGE * If bVersion is TRUE, version information is retrieved, else * pdwMSVer gets the language ID and pdwLSVer gets the codepage ID. */ -HRESULT WINAPI GetVersionFromFileExA(LPCSTR lpszFilename, LPDWORD pdwMSVer, +HRESULT WINAPI GetVersionFromFileExW(LPCWSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion ) { VS_FIXEDFILEINFO *pFixedVersionInfo; LANGANDCODEPAGE *pLangAndCodePage; DWORD dwHandle, dwInfoSize; - CHAR szWinDir[MAX_PATH]; - CHAR szFile[MAX_PATH]; + WCHAR szWinDir[MAX_PATH]; + WCHAR szFile[MAX_PATH]; LPVOID pVersionInfo = NULL; BOOL bFileCopied = FALSE; UINT uValueLen; - TRACE("(%s, %p, %p, %d)\n", lpszFilename, pdwMSVer, pdwLSVer, bVersion); + static WCHAR backslash[] = {'\\',0}; + static WCHAR translation[] = { + '\\','V','a','r','F','i','l','e','I','n','f','o', + '\\','T','r','a','n','s','l','a','t','i','o','n',0 + }; + + TRACE("(%s, %p, %p, %d)\n", debugstr_w(lpszFilename), + pdwMSVer, pdwLSVer, bVersion); *pdwLSVer = 0; *pdwMSVer = 0; - lstrcpynA(szFile, lpszFilename, MAX_PATH); + lstrcpynW(szFile, lpszFilename, MAX_PATH); - dwInfoSize = GetFileVersionInfoSizeA(szFile, &dwHandle); + dwInfoSize = GetFileVersionInfoSizeW(szFile, &dwHandle); if (!dwInfoSize) { /* check that the file exists */ - if (GetFileAttributesA(szFile) == INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesW(szFile) == INVALID_FILE_ATTRIBUTES) return S_OK; /* file exists, but won't be found by GetFileVersionInfoSize, * so copy it to the temp dir where it will be found. */ - GetWindowsDirectoryA(szWinDir, MAX_PATH); - GetTempFileNameA(szWinDir, NULL, 0, szFile); - CopyFileA(lpszFilename, szFile, FALSE); + GetWindowsDirectoryW(szWinDir, MAX_PATH); + GetTempFileNameW(szWinDir, NULL, 0, szFile); + CopyFileW(lpszFilename, szFile, FALSE); bFileCopied = TRUE; - dwInfoSize = GetFileVersionInfoSizeA(szFile, &dwHandle); + dwInfoSize = GetFileVersionInfoSizeW(szFile, &dwHandle); if (!dwInfoSize) goto done; } @@ -899,12 +940,12 @@ HRESULT WINAPI GetVersionFromFileExA(LPC if (!pVersionInfo) goto done; - if (!GetFileVersionInfoA(szFile, dwHandle, dwInfoSize, pVersionInfo)) + if (!GetFileVersionInfoW(szFile, dwHandle, dwInfoSize, pVersionInfo)) goto done; if (bVersion) { - if (!VerQueryValueA(pVersionInfo, "\\", + if (!VerQueryValueW(pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uValueLen)) goto done; @@ -916,7 +957,7 @@ HRESULT WINAPI GetVersionFromFileExA(LPC } else { - if (!VerQueryValueA(pVersionInfo, "\\VarFileInfo\\Translation", + if (!VerQueryValueW(pVersionInfo, translation, (LPVOID *)&pLangAndCodePage, &uValueLen)) goto done; @@ -931,7 +972,7 @@ done: HeapFree(GetProcessHeap(), 0, pVersionInfo); if (bFileCopied) - DeleteFileA(szFile); + DeleteFileW(szFile); return S_OK; }

1 0

James Hawkins : advpack: Forward SetPerUserSecValuesA to its Unicode counterpart.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 5018d3202a0930d4dabf7ca86e9fc21fee8dd20b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5018d3202a0930d4dabf7ca… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 23:10:04 2006 -0600 advpack: Forward SetPerUserSecValuesA to its Unicode counterpart. --- dlls/advpack/advpack.c | 34 +++++++++++++++++++++++++++++++++- dlls/advpack/advpack.spec | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 18f33e4..da86f75 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -428,6 +428,38 @@ void WINAPI RegisterOCX( HWND hWnd, HINS /*********************************************************************** * SetPerUserSecValuesA (ADVPACK.@) * + * See SetPerUserSecValuesW. + */ +HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser) +{ + PERUSERSECTIONW perUserW; + + TRACE("(%p)\n", pPerUser); + + if (!pPerUser) + return E_INVALIDARG; + + MultiByteToWideChar(CP_ACP, 0, pPerUser->szGUID, -1, perUserW.szGUID, + sizeof(perUserW.szGUID) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szDispName, -1, perUserW.szDispName, + sizeof(perUserW.szDispName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szLocale, -1, perUserW.szLocale, + sizeof(perUserW.szLocale) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szStub, -1, perUserW.szStub, + sizeof(perUserW.szStub) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szVersion, -1, perUserW.szVersion, + sizeof(perUserW.szVersion) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pPerUser->szCompID, -1, perUserW.szCompID, + sizeof(perUserW.szCompID) / sizeof(WCHAR)); + perUserW.dwIsInstalled = pPerUser->dwIsInstalled; + perUserW.bRollback = pPerUser->bRollback; + + return SetPerUserSecValuesW(&perUserW); +} + +/*********************************************************************** + * SetPerUserSecValuesW (ADVPACK.@) + * * Prepares the per-user stub values under IsInstalled\{GUID} that * control the per-user installation. * @@ -441,7 +473,7 @@ void WINAPI RegisterOCX( HWND hWnd, HINS * BUGS * Unimplemented. */ -HRESULT WINAPI SetPerUserSecValuesA(PERUSERSECTIONA* pPerUser) +HRESULT WINAPI SetPerUserSecValuesW(PERUSERSECTIONW* pPerUser) { FIXME("(%p) stub\n", pPerUser); diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 3ebe357..6d4b1d1 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -66,7 +66,7 @@ # stdcall RunSetupCommandW(long wstr wstr wstr wstr wptr long ptr) @ stdcall RunSetupCommand(long str str str str ptr long ptr) RunSetupCommandA @ stdcall SetPerUserSecValuesA(ptr) -# stdcall SetPerUserSecValuesW(ptr) +@ stdcall SetPerUserSecValuesW(ptr) @ stdcall SetPerUserSecValues(ptr) SetPerUserSecValuesA @ stdcall TranslateInfStringA(str str str str ptr long ptr ptr) @ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr)

1 0

Ken Thomases : server: Fix memory leak in read_process_memory handler.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 1c788eada2ad2c3b0caa658fa8923e29ffc8a436 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c788eada2ad2c3b0caa658… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Mar 24 01:26:51 2006 -0600 server: Fix memory leak in read_process_memory handler. --- server/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 824f9b3..393a65a 100644 --- a/server/process.c +++ b/server/process.c @@ -1068,7 +1068,7 @@ DECL_HANDLER(read_process_memory) if (start_offset) memmove( buffer, (char *)buffer + start_offset, len ); set_reply_data_ptr( buffer, len ); } - else len = 0; + else free( buffer ); } } release_object( process );

1 0

Mike McCormack : ntdll: Recursive notify is implemented.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 23b74754fed40211550e5a6e224880a737107ad8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23b74754fed40211550e5a6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 24 13:51:14 2006 +0900 ntdll: Recursive notify is implemented. --- dlls/ntdll/directory.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 43c51ad..7c4ada4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1884,9 +1884,8 @@ NtNotifyChangeDirectoryFile( HANDLE File if (CompletionFilter == 0 || (CompletionFilter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - if (WatchTree || ApcRoutine) - FIXME("parameters ignored %p %p %d\n", - ApcRoutine, ApcContext, WatchTree ); + if (ApcRoutine) + FIXME("parameters ignored %p %p\n", ApcRoutine, ApcContext ); info = RtlAllocateHeap( GetProcessHeap(), 0, sizeof *info ); if (!info)

1 0

Phil Krylov : server: Fix compilation under Darwin 7.
by Alexandre Julliard March 24, 2006

March 24, 2006

Module: wine Branch: refs/heads/master Commit: 8e772c83ef3ec48aaed65ffefcd09ad63c38e7b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e772c83ef3ec48aaed65ff… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Fri Mar 24 03:49:50 2006 +0300 server: Fix compilation under Darwin 7. --- server/signal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/signal.c b/server/signal.c index c873344..04bd50b 100644 --- a/server/signal.c +++ b/server/signal.c @@ -22,6 +22,7 @@ #include <signal.h> #include <stdio.h> +#include <sys/time.h> #ifdef HAVE_POLL_H #include <poll.h> #endif

1 0