March 2006 - wine-commits

H. Verbeet : wined3d: Move the D3DSIO_DCL dumping code into its own function.
by Alexandre Julliard 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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 24 Mar '06

24 Mar '06

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

Jacek Caban : mshtml: Added IHTMLElement2 implementation.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: ed10e5046c107971bd689b3c1564106d9ee6afce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed10e5046c107971bd689b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 21:38:38 2006 +0100 mshtml: Added IHTMLElement2 implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlelem.c | 5 dlls/mshtml/htmlelem2.c | 906 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 4 files changed, 916 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmlelem2.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ed10e5046c107971bd6…

1 0

Jacek Caban : exdisp.idl: Added missing IE6 methods to DWebBrowserEvents2.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: 9c2254468879430bb52aac5255c58ecf62a170b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c2254468879430bb52aac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 23 21:37:17 2006 +0100 exdisp.idl: Added missing IE6 methods to DWebBrowserEvents2. --- include/exdisp.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 2c489f8..32ce9df 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -322,6 +322,60 @@ dispinterface DWebBrowserEvents2 [id(DISPID_ONTHEATERMODE)] void OnTheaterMode([in] VARIANT_BOOL TheaterMode); + + [id(DISPID_WINDOWSETRESIZABLE)] + void WindowSetResizable([in] VARIANT_BOOL Resizable); + + [id(DISPID_WINDOWSETLEFT)] + void WindowSetLeft([in] long Left); + + [id(DISPID_WINDOWSETTOP)] + void WindowSetTop([in] long Top); + + [id(DISPID_WINDOWSETWIDTH)] + void WindowSetWidth([in] long Width); + + [id(DISPID_WINDOWSETHEIGHT)] + void WindowSetHeight([in] long Height); + + [id(DISPID_WINDOWCLOSING)] + void WindowClosing( + [in] VARIANT_BOOL IsChildWindow, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_CLIENTTOHOSTWINDOW)] + void ClientToHostWindow( + [in, out] long *CX, + [in, out] long *CY); + + [id(DISPID_SETSECURELOCKICON)] + void SetSecureLockIcon([in] long SecureLockIcon); + + [id(DISPID_FILEDOWNLOAD)] + void FileDownload([in, out] VARIANT_BOOL* Cancel); + + [id(DISPID_NAVIGATEERROR)] + void NavigateError( + [in] IDispatch *pDisp, + [in] VARIANT *URL, + [in] VARIANT *Frame, + [in] VARIANT *StatusCode, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_PRINTTEMPLATEINSTANTIATION)] + void PrintTemplateInstantiation([in] IDispatch *pDisp); + + [id(DISPID_PRINTTEMPLATETEARDOWN)] + void PrintTemplateTeardown([in] IDispatch *pDisp); + + [id(DISPID_UPDATEPAGESTATUS)] + void UpdatePageStatus( + [in] IDispatch *pDisp, + [in] VARIANT *nPage, + [in] VARIANT *fDone); + + [id(DISPID_PRIVACYIMPACTEDSTATECHANGE)] + void PrivacyImpactedStateChange([in] VARIANT_BOOL bImpacted); } [

1 0

Stefan Dösinger : wined3d: Rectpatch code fix.
by Alexandre Julliard 24 Mar '06

24 Mar '06

Module: wine Branch: refs/heads/master Commit: 6af24c816d2d5ff786d769b01332a23a12a41975 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6af24c816d2d5ff786d769b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 23 19:31:34 2006 +0100 wined3d: Rectpatch code fix. Update the wined3d code to use WINED3DRECTPATCH_INFO, which was added with an older patch. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3b7b40b..525ded9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1318,7 +1318,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Draw IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); } HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d7baa9..c61bf15 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -796,7 +796,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); } /*http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp*/ HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea74a20..1a55b8e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5810,7 +5810,7 @@ OpenGL evaluators or tessellate surface */ /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… */ -HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { +HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) Handle(%d) noSegs(%p) rectpatch(%p)\n", This, Handle, pNumSegs, pRectPatchInfo); FIXME("(%p) : Stub\n", This); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index f1ff945..255ecea 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -415,7 +415,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE PrimitiveType,INT baseVIdx, UINT minIndex,UINT NumVertices,UINT startIndex,UINT primCount) PURE; STDMETHOD(DrawPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ D3DPRIMITIVETYPE PrimitiveType,UINT MinVertexIndex,UINT NumVertexIndices,UINT PrimitiveCount,CONST void * pIndexData,WINED3DFORMAT IndexDataFormat,CONST void * pVertexStreamZeroData,UINT VertexStreamZeroStride) PURE; - STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) PURE; + STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST D3DRECT* pRect, D3DCOLOR color) PURE;

1 0

lostwages/wwn wn20060324_309.xml
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23749 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/24 01:05:25 Modified files: wwn : wn20060324_309.xml Log message: minor edits Patch: http://cvs.winehq.org/patch.py?id=23749 Old revision New revision Changes Path 1.1 1.2 +4 -5 lostwages/wwn/wn20060324_309.xml Index: lostwages/wwn/wn20060324_309.xml diff -u -p lostwages/wwn/wn20060324_309.xml:1.1 lostwages/wwn/wn20060324_309.xml:1.2 --- lostwages/wwn/wn20060324_309.xml:1.1 24 Mar 2006 7: 5:25 -0000 +++ lostwages/wwn/wn20060324_309.xml 24 Mar 2006 7: 5:25 -0000 @@ -37,13 +37,12 @@ Its main goal is to become long overdue <person posts="2" size="5" who="a_villacis at palosanto.com (=?ISO-8859-1?Q?Alex_Villac=ED=ADs_Lasso?=)" /> <person posts="2" size="5" who="scott at open-vote.org (Scott Ritchie)" /> <person posts="2" size="4" who="nunoplopes at gmail.com (Nuno Lopes)" /> -<person posts="2" size="3" who="meissner at suse.de (Marcus Meissner)" /> +<person posts="4" size="5" who="meissner at suse.de (Marcus Meissner)" /> <person posts="2" size="2" who="jim at pagesmiths.com (Jim White)" /> <person posts="2" size="2" who="wes.parish at paradise.net.nz (Wesley Parish)" /> <person posts="2" size="2" who="Paul.Vriens at xs4all.nl (Paul Vriens)" /> <person posts="2" size="2" who="eric.pouech at wanadoo.fr (Eric Pouech)" /> <person posts="2" size="2" who="fgouget at free.fr (Francois Gouget)" /> -<person posts="2" size="2" who="marcus at jet.franken.de (Marcus Meissner)" /> <person posts="2" size="2" who="jacek at codeweavers.com (Jacek Caban)" /> <person posts="2" size="2" who="andi at rhlx01.fht-esslingen.de (Andreas Mohr)" /> <person posts="2" size="1" who="jeffl at yless4u.com.au (Jeff Latimer)" /> @@ -93,7 +92,7 @@ Its main goal is to become long overdue posts="1" > <topic>News</topic> -On Wednesday, Alexandre released Wine 0.9.10. It followed less than +Last Wednesday, Alexandre released Wine 0.9.10. It followed less than 2 weeks on the heels of 0.9.9. He noted the following changes: <quote who="Alexandre Julliard"> <ul> @@ -156,7 +155,7 @@ And even a "yum install wine" should do Well, that's pretty simple. Andreas Bierfert noted that Wine made it into the x86_64 tree of Fedora Extras as well and a -<tt>yum install wine</tt> should work there as well. +<tt>yum install wine</tt> should work. Eddy Nigg of <a href="http://www.startcom.org">StartCom Linux</a> mentioned they had Wine in RPM packages that should be compatible: @@ -359,7 +358,7 @@ typesafe, it just looks like it is.< within applications: <quote who="Rauschi"> -I think it would be very usefull to disallow an application started with wine i +I think it would be very useful to disallow an application started with wine i to connect to the network/internet by an options flag.</quote> That's a valid question - a lot of apps like to "phone home" and that's

1 0

lostwages/ news/2006032401.xml wwn/wn20060324_ ...
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23748 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/24 00:30:09 Added files: news : 2006032401.xml wwn : wn20060324_309.xml Log message: WWN #309 Patch: http://cvs.winehq.org/patch.py?id=23748 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006032401.xml Added 1.1 +0 -0 lostwages/wwn/wn20060324_309.xml

1 0

appdb/include comment.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23747 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 23:01:48 Modified files: include : comment.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Add tag to comment id and link it to the notification email Patch: http://cvs.winehq.org/patch.py?id=23747 Old revision New revision Changes Path 1.13 1.14 +5 -2 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.13 appdb/include/comment.php:1.14 --- appdb/include/comment.php:1.13 24 Mar 2006 5: 1:48 -0000 +++ appdb/include/comment.php 24 Mar 2006 5: 1:48 -0000 @@ -88,7 +88,7 @@ class Comment { } $sSubject = "Comment for '".lookup_app_name($this->iAppId)." ".lookup_version_name($this->iVersionId)."' added by ".$_SESSION['current']->sRealname; - $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."\n"; + $sMsg = APPDB_ROOT."appview.php?versionId=".$this->iVersionId."&mode=nested#Comment-".$this->iCommentId."\n"; $sMsg .= "\n"; $sMsg .= "Subject: ".$this->sSubject."\r\n"; $sMsg .= "\n"; @@ -214,7 +214,7 @@ function view_app_comment($ob) $ob->body = stripslashes($ob->body); // message header - echo "<tr bgcolor=\"#E0E0E0\"><td>\n"; + echo "<tr bgcolor=\"#E0E0E0\"><td><a name=Comment-".$ob->commentId."></a>\n"; echo " ".$ob->subject." \n"; echo " by ".forum_lookup_user($ob->userId)." on ".$ob->time." \n"; echo "</td></tr><tr><td>\n"; @@ -417,6 +417,9 @@ function view_app_comments($versionId, $ else $mode = "threaded"; /* default non-logged in users to threaded comment display mode */ + if ($_REQUEST['mode']=="nested") + $mode = "nested"; + switch ($mode) { case "flat":

1 0

appdb/include mail.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23746 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:21:26 Modified files: include : mail.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Change link in email footer to link to the AppDB site instead of WineHQ Patch: http://cvs.winehq.org/patch.py?id=23746 Old revision New revision Changes Path 1.4 1.5 +1 -1 appdb/include/mail.php Index: appdb/include/mail.php diff -u -p appdb/include/mail.php:1.4 appdb/include/mail.php:1.5 --- appdb/include/mail.php:1.4 24 Mar 2006 3:21:26 -0000 +++ appdb/include/mail.php 24 Mar 2006 3:21:26 -0000 @@ -10,7 +10,7 @@ function mail_appdb($sEmailList,$sSubjec $sMsg = $sSubject."\n-------------------------------------------------------\n".$sMsg."\n\n"; $sMsg .= "Best regards.\n"; $sMsg .= "The AppDB team\n"; - $sMsg .= APPDB_OWNER_URL."\n"; + $sMsg .= APPDB_ROOT."\n"; $sMsg .= "\n\nIf you don't want to receive any other e-mail, please change your preferences:\n"; $sMsg .= APPDB_ROOT."preferences.php\n";

1 0

appdb/ cron/cleanup.php include/user.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23745 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:20:34 Modified files: cron : cleanup.php include : user.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix up inactivity warnings and include login link on inactivity email Patch: http://cvs.winehq.org/patch.py?id=23745 Old revision New revision Changes Path 1.24 1.25 +2 -2 appdb/cron/cleanup.php 1.64 1.65 +3 -2 appdb/include/user.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.24 appdb/cron/cleanup.php:1.25 --- appdb/cron/cleanup.php:1.24 24 Mar 2006 3:20:34 -0000 +++ appdb/cron/cleanup.php 24 Mar 2006 3:20:34 -0000 @@ -103,7 +103,7 @@ function deleteUser($iUserId) function warnUserDeleted($sEmail) { $sSubject = "Warning: account removed"; - $sMsg = "You didn't log in in the past seven month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past seven months to the AppDB.\r\n"; $sMsg .= "As you don't have any data associated to your account we have removed it.\r\n"; $sMsg .= "Please feel free to recreate an account anytime.\r\n"; @@ -166,4 +166,4 @@ function orphanVersionCheck() $sEmail = get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); -} \ No newline at end of file +} Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.64 appdb/include/user.php:1.65 --- appdb/include/user.php:1.64 24 Mar 2006 3:20:34 -0000 +++ appdb/include/user.php 24 Mar 2006 3:20:34 -0000 @@ -656,15 +656,16 @@ class User { if($this->isMaintainer()) { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg .= "As a maintainer we would be pleased to see you once in a while.\r\n"; $sMsg .= "Please log in or you will lose your maintainer's abilities in one month.\r\n"; } else { $sSubject = "Warning: inactivity detected"; - $sMsg = "You didn't log in in the past six month to the AppDB.\r\n"; + $sMsg = "You didn't log in in the past six months to the AppDB.\r\n"; $sMsg .= "Please log in or your account will automatically be deleted in one month.\r\n"; } + $sMsg .= APPDB_ROOT."account.php?cmd=login\r\n"; mail_appdb($this->sEmail, $sSubject, $sMsg);

1 0

appdb/. vendorview.php
by WineHQ 24 Mar '06

24 Mar '06

ChangeSet ID: 23744 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/03/23 21:15:04 Modified files: . : vendorview.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix up vendor view code to be more useful with a link for administrators to edit the vendor. Fix the link to the vendors website Patch: http://cvs.winehq.org/patch.py?id=23744 Old revision New revision Changes Path 1.12 1.13 +7 -2 appdb/vendorview.php Index: appdb/vendorview.php diff -u -p appdb/vendorview.php:1.12 appdb/vendorview.php:1.13 --- appdb/vendorview.php:1.12 24 Mar 2006 3:15: 4 -0000 +++ appdb/vendorview.php 24 Mar 2006 3:15: 4 -0000 @@ -36,10 +36,15 @@ if($oVendor->iVendorId) apidb_header("View Vendor"); echo html_frame_start("Vendor Information",500); - echo 'Vendor Name: '.$oVendor->sName.' ',"\n"; + echo 'Vendor Name: '.$oVendor->sName,"\n"; + if($_SESSION['current']->hasPriv("admin")) + { + echo ' [<a href="'.apidb_fullurl("admin/editVendor.php").'?iVendorId='.$oVendor->iVendorId.'">edit</a>]',"\n"; + } + echo ' ',"\n"; if ($oVendor->sWebpage) - echo 'Vendor URL: <a href="'.$oVendor->sWebpage.'">'.$oVendor->vendorURL.'</a> ',"\n"; + echo 'Vendor URL: <a href="'.$oVendor->sWebpage.'">'.$oVendor->sWebpage.'</a> ',"\n"; if($oVendor->aApplicationsIds)

1 0

Alexandre Julliard : msvcrt: Implementation of wcsftime ( based on a patch by Mike McCormack).
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 7fe881c7f2712e2e0d39342450470a94855782d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fe881c7f2712e2e0d39342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 20:35:52 2006 +0100 msvcrt: Implementation of wcsftime (based on a patch by Mike McCormack). --- dlls/msvcrt/time.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 819f905..ba1be48 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -445,10 +445,28 @@ MSVCRT_size_t MSVCRT_strftime( char *str MSVCRT_size_t MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) { - FIXME( "%p, %d, %s, %p - stub\n", str, max, debugstr_w(format), mstm ); + char *s, *fmt; + MSVCRT_size_t len; - *str = '\0'; - return 0; + TRACE("%p %d %s %p\n", str, max, debugstr_w(format), mstm ); + + len = WideCharToMultiByte( CP_UNIXCP, 0, format, -1, NULL, 0, NULL, NULL ); + if (!(fmt = MSVCRT_malloc( len ))) return 0; + WideCharToMultiByte( CP_UNIXCP, 0, format, -1, fmt, len, NULL, NULL ); + + if ((s = MSVCRT_malloc( max*4 ))) + { + struct tm tm; + msvcrt_tm_to_unix( &tm, mstm ); + if (!strftime( s, max*4, fmt, &tm )) s[0] = 0; + len = MultiByteToWideChar( CP_UNIXCP, 0, s, -1, str, max ); + if (len) len--; + MSVCRT_free( s ); + } + else len = 0; + + MSVCRT_free( fmt ); + return len; } /*********************************************************************

1 0

Paul Vriens : kernel: Add processor specific environment variables.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 418b839980cffb8fa2bceef3f1c7f8dd59a1058a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=418b839980cffb8fa2bceef… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Wed Mar 22 11:43:19 2006 +0100 kernel: Add processor specific environment variables. --- dlls/kernel/cpu.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index 6e0ef78..8dca1f5 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -102,7 +102,7 @@ static inline int have_cpuid(void) static BYTE PF[64] = {0,}; static ULONGLONG cpuHz = 1000000000; /* default to a 1GHz */ -static void create_registry_keys( const SYSTEM_INFO *info ) +static void create_system_registry_keys( const SYSTEM_INFO *info ) { static const WCHAR SystemW[] = {'M','a','c','h','i','n','e','\\', 'H','a','r','d','w','a','r','e','\\', @@ -177,6 +177,73 @@ static void create_registry_keys( const NtClose( system_key ); } +static void create_env_registry_keys( const SYSTEM_INFO *info ) +{ + static const WCHAR EnvironW[] = {'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r','\\', + 'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0}; + static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; + static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; + static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0}; + + HANDLE env_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, valueW; + + char nProc[10],id[60],procLevel[10],rev[10]; + WCHAR nProcW[10],idW[60],procLevelW[10],revW[10]; + + /* Create some keys under HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment. + * All these environment variables are processor related and will be read during process initialization and hence + * show up in the environment of that process. + */ + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + RtlInitUnicodeString( &nameW, EnvironW ); + if (NtCreateKey( &env_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) return; + + sprintf( nProc, "%ld", info->dwNumberOfProcessors ); + RtlMultiByteToUnicodeN( nProcW, sizeof(nProcW), NULL, nProc, strlen(nProc)+1 ); + RtlInitUnicodeString( &valueW, NumProcW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, nProcW, (strlenW(nProcW)+1)*sizeof(WCHAR) ); + + /* TODO: currently hardcoded x86, add different processors */ + RtlInitUnicodeString( &valueW, ProcArchW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, x86W, (strlenW(x86W)+1) * sizeof(WCHAR) ); + + /* TODO: currently hardcoded Intel, add different processors */ + sprintf( id, "x86 Family %d Model %d Stepping %d, GenuineIntel", + info->wProcessorLevel, HIBYTE(info->wProcessorRevision), LOBYTE(info->wProcessorRevision) ); + RtlMultiByteToUnicodeN( idW, sizeof(idW), NULL, id, strlen(id)+1 ); + RtlInitUnicodeString( &valueW, ProcIdW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, idW, (strlenW(idW)+1)*sizeof(WCHAR) ); + + sprintf( procLevel, "%d", info->wProcessorLevel ); + RtlMultiByteToUnicodeN( procLevelW, sizeof(procLevelW), NULL, procLevel, strlen(procLevel)+1 ); + RtlInitUnicodeString( &valueW, ProcLvlW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, procLevelW, (strlenW(procLevelW)+1)*sizeof(WCHAR) ); + + /* Properly report model/stepping */ + sprintf( rev, "%04x", info->wProcessorRevision); + RtlMultiByteToUnicodeN( revW, sizeof(revW), NULL, rev, strlen(rev)+1 ); + RtlInitUnicodeString( &valueW, ProcRevW ); + NtSetValueKey( env_key, &valueW, 0, REG_SZ, revW, (strlenW(revW)+1)*sizeof(WCHAR) ); + + NtClose( env_key ); +} + /**************************************************************************** * QueryPerformanceCounter (KERNEL32.@) * @@ -239,6 +306,10 @@ BOOL WINAPI QueryPerformanceFrequency(PL * Note that there is a hierarchy for every processor installed, so this * supports multiprocessor systems. This is done like Win95 does it, I think. * + * It creates some registry entries in the environment part: + * "\HKLM\System\CurrentControlSet\Control\Session Manager\Environment". These are + * always present. When deleted, Windows will add them again. + * * It also creates a cached flag array for IsProcessorFeaturePresent(). */ VOID WINAPI GetSystemInfo( @@ -702,7 +773,8 @@ VOID WINAPI GetSystemInfo( si->dwActiveProcessorMask, si->dwNumberOfProcessors, si->dwProcessorType, si->dwAllocationGranularity, si->wProcessorLevel, si->wProcessorRevision); - create_registry_keys( &cachedsi ); + create_system_registry_keys( &cachedsi ); + create_env_registry_keys( &cachedsi ); }

1 0

James Hawkins : comctl32: A couple fixes for tab icon offsets.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: aa57ad373d50caf3d48c22a814ead474098cba32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa57ad373d50caf3d48c22a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 23 00:07:10 2006 -0600 comctl32: A couple fixes for tab icon offsets. - Shift selected icons up and non-selected icons down. - Add the top or left draw rect to the vertical offset, because it may not be zero. --- dlls/comctl32/tab.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 5c9443c..fa02477 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1747,14 +1747,20 @@ TAB_DrawItemInterior if(lStyle & TCS_VERTICAL) { center_offset_h = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = ((drawRect->right - drawRect->left) - (cx + infoPtr->uVItemPadding)) / 2; + center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) - cx) / 2; } else { center_offset_h = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2; - center_offset_v = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uVItemPadding)) / 2; + center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) - cy) / 2; } + /* if an item is selected, the icon is shifted up instead of down */ + if (iItem == infoPtr->iSelected) + center_offset_v -= infoPtr->uVItemPadding / 2; + else + center_offset_v += infoPtr->uVItemPadding / 2; + if (lStyle & TCS_FIXEDWIDTH && lStyle & (TCS_FORCELABELLEFT | TCS_FORCEICONLEFT)) center_offset_h = infoPtr->uHItemPadding;

1 0

James Hawkins : advpack: Implement FileSaveMarkNotExistW.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: bed3d4d3eb5e6662c2804ba7b556cd507e0dae52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bed3d4d3eb5e6662c2804ba… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:40:55 2006 -0600 advpack: Implement FileSaveMarkNotExistW. --- dlls/advpack/advpack.spec | 2 +- dlls/advpack/files.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7481127..3ebe357 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -20,7 +20,7 @@ # stdcall ExtractFilesW(wstr wstr long ptr ptr long) @ stdcall ExtractFiles(str str long ptr ptr long) ExtractFilesA @ stdcall FileSaveMarkNotExistA(str str str) -# stdcall FileSaveMarkNotExistW(wstr wstr wstr) +@ 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) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index d5eccd9..287888c 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -724,6 +724,18 @@ done: /*********************************************************************** * FileSaveMarkNotExistA (ADVPACK.@) * + * See FileSaveMarkNotExistW. + */ +HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) +{ + TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); + + return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); +} + +/*********************************************************************** + * FileSaveMarkNotExistW (ADVPACK.@) + * * Marks the files in the file list as not existing so they won't be * backed up during a save. * @@ -736,11 +748,11 @@ done: * Success: S_OK. * Failure: E_FAIL. */ -HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) +HRESULT WINAPI FileSaveMarkNotExistW(LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName) { TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); - return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); + return AddDelBackupEntryW(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); } /***********************************************************************

1 0

James Hawkins : advpack: Forward AdvInstallFileA to its Unicode counterpart .
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: cfbc26f3e679a409868363697d8ed39fb74b106f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfbc26f3e679a4098683636… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:34:41 2006 -0600 advpack: Forward AdvInstallFileA to its Unicode counterpart. --- dlls/advpack/advpack.spec | 2 + dlls/advpack/files.c | 78 +++++++++++++++++++++++++++++++++------------ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7ab49b1..7481127 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -2,7 +2,7 @@ @ stdcall AddDelBackupEntryW(wstr wstr wstr long) @ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AdvInstallFileA(long str str str str long long) -# stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) +@ stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) @ stdcall AdvInstallFile(long str str str str long long) AdvInstallFileA @ stdcall CloseINFEngine(long) @ stdcall DelNodeA(str long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index dbf6b66..d5eccd9 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -178,7 +178,7 @@ UINT CALLBACK pQueueCallback(PVOID Conte Notification == SPFILENOTIFY_DELETEERROR || Notification == SPFILENOTIFY_COPYERROR) { - return SetupDefaultQueueCallbackA(Context, Notification, + return SetupDefaultQueueCallbackW(Context, Notification, Param1, Param2); } @@ -188,6 +188,42 @@ UINT CALLBACK pQueueCallback(PVOID Conte /*********************************************************************** * AdvInstallFileA (ADVPACK.@) * + * See AdvInstallFileW. + */ +HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, + LPCSTR lpszDestDir, LPCSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + UNICODE_STRING sourcedir, sourcefile; + UNICODE_STRING destdir, destfile; + HRESULT res; + + TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_a(lpszSourceDir), + debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), + debugstr_a(lpszDestFile), dwFlags, dwReserved); + + if (!lpszSourceDir || !lpszSourceFile || !lpszDestDir) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&sourcedir, lpszSourceDir); + RtlCreateUnicodeStringFromAsciiz(&sourcefile, lpszSourceFile); + RtlCreateUnicodeStringFromAsciiz(&destdir, lpszDestDir); + RtlCreateUnicodeStringFromAsciiz(&destfile, lpszDestFile); + + res = AdvInstallFileW(hwnd, sourcedir.Buffer, sourcefile.Buffer, + destdir.Buffer, destfile.Buffer, dwFlags, dwReserved); + + RtlFreeUnicodeString(&sourcedir); + RtlFreeUnicodeString(&sourcefile); + RtlFreeUnicodeString(&destdir); + RtlFreeUnicodeString(&destfile); + + return res; +} + +/*********************************************************************** + * AdvInstallFileW (ADVPACK.@) + * * Copies a file from the source to a destination. * * PARAMS @@ -207,20 +243,20 @@ UINT CALLBACK pQueueCallback(PVOID Conte * If lpszDestFile is NULL, the destination filename is the same as * lpszSourceFIle. */ -HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile, - LPCSTR lpszDestDir, LPCSTR lpszDestFile, - DWORD dwFlags, DWORD dwReserved) -{ - PSP_FILE_CALLBACK_A pFileCallback; - LPSTR szPath, szDestFilename; - char szRootPath[ROOT_LENGTH]; +HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSourceFile, + LPCWSTR lpszDestDir, LPCWSTR lpszDestFile, + DWORD dwFlags, DWORD dwReserved) +{ + PSP_FILE_CALLBACK_W pFileCallback; + LPWSTR szPath, szDestFilename; + WCHAR szRootPath[ROOT_LENGTH]; DWORD dwLen, dwLastError; HSPFILEQ fileQueue; PVOID pContext; - TRACE("(%p,%p,%p,%p,%p,%ld,%ld)\n", hwnd, debugstr_a(lpszSourceDir), - debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), - debugstr_a(lpszDestFile), dwFlags, dwReserved); + TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_w(lpszSourceDir), + debugstr_w(lpszSourceFile), debugstr_w(lpszDestDir), + debugstr_w(lpszDestFile), dwFlags, dwReserved); if (!lpszSourceDir || !lpszSourceFile || !lpszDestDir) return E_INVALIDARG; @@ -232,25 +268,25 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd pContext = NULL; dwLastError = ERROR_SUCCESS; - lstrcpynA(szRootPath, lpszSourceDir, ROOT_LENGTH); - szPath = (LPSTR)lpszSourceDir + ROOT_LENGTH; + lstrcpynW(szRootPath, lpszSourceDir, ROOT_LENGTH); + szPath = (LPWSTR)lpszSourceDir + ROOT_LENGTH; /* use lpszSourceFile as destination filename if lpszDestFile is NULL */ if (lpszDestFile) { - dwLen = lstrlenA(lpszDestFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen); - lstrcpyA(szDestFilename, lpszDestFile); + dwLen = lstrlenW(lpszDestFile); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + lstrcpyW(szDestFilename, lpszDestFile); } else { - dwLen = lstrlenA(lpszSourceFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen); - lstrcpyA(szDestFilename, lpszSourceFile); + dwLen = lstrlenW(lpszSourceFile); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + lstrcpyW(szDestFilename, lpszSourceFile); } /* add the file copy operation to the setup queue */ - if (!SetupQueueCopyA(fileQueue, szRootPath, szPath, lpszSourceFile, NULL, + if (!SetupQueueCopyW(fileQueue, szRootPath, szPath, lpszSourceFile, NULL, NULL, lpszDestDir, szDestFilename, dwFlags)) { dwLastError = GetLastError(); @@ -272,7 +308,7 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd pFileCallback = pQueueCallback; /* perform the file copy */ - if (!SetupCommitFileQueueA(hwnd, fileQueue, pFileCallback, pContext)) + if (!SetupCommitFileQueueW(hwnd, fileQueue, pFileCallback, pContext)) { dwLastError = GetLastError(); goto done;

1 0

James Hawkins : advpack: Forward the ansi user stub APIs to their Unicode counterparts.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 72581bd2d73e357c2ca594a90b025f144b236553 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72581bd2d73e357c2ca594a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:15:51 2006 -0600 advpack: Forward the ansi user stub APIs to their Unicode counterparts. --- dlls/advpack/advpack.c | 52 ++++++++++++++++++++++++++++++++++++++++++++- dlls/advpack/advpack.spec | 4 ++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b4f3caf..18f33e4 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -683,10 +683,35 @@ HRESULT WINAPI TranslateInfStringExW(HIN /*********************************************************************** * UserInstStubWrapperA (ADVPACK.@) + * + * See UserInstStubWrapperW. */ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, LPSTR pszParms, INT nShow) { + UNICODE_STRING parmsW; + HRESULT res; + + TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + + if (!pszParms) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms); + + res = UserInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow); + + RtlFreeUnicodeString(&parmsW); + + return res; +} + +/*********************************************************************** + * UserInstStubWrapperW (ADVPACK.@) + */ +HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, + LPWSTR pszParms, INT nShow) +{ FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); return E_FAIL; @@ -694,9 +719,34 @@ HRESULT WINAPI UserInstStubWrapperA(HWND /*********************************************************************** * UserUnInstStubWrapperA (ADVPACK.@) + * + * See UserUnInstStubWrapperW. */ HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, - LPSTR pszParms, INT nShow) + LPSTR pszParms, INT nShow) +{ + UNICODE_STRING parmsW; + HRESULT res; + + TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + + if (!pszParms) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms); + + res = UserUnInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow); + + RtlFreeUnicodeString(&parmsW); + + return res; +} + +/*********************************************************************** + * UserUnInstStubWrapperW (ADVPACK.@) + */ +HRESULT WINAPI UserUnInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, + LPWSTR pszParms, INT nShow) { FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index aa90acf..7ab49b1 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -75,8 +75,8 @@ @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall UserInstStubWrapperA(long long str long) -# stdcall UserInstStubWrapperW(long long wstr long) +@ stdcall UserInstStubWrapperW(long long wstr long) @ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA @ stdcall UserUnInstStubWrapperA(long long str long) -# stdcall UserUnInstStubWrapperW(long long wstr long) +@ stdcall UserUnInstStubWrapperW(long long wstr long) @ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA

1 0

James Hawkins : advpack: Forward AddDelBackupEntryA to its unicode counterpart.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: ca3ad7d6dccf515bb245da41b7708d462ef30247 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca3ad7d6dccf515bb245da4… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 13:51:44 2006 -0600 advpack: Forward AddDelBackupEntryA to its unicode counterpart. --- dlls/advpack/advpack.spec | 2 - dlls/advpack/files.c | 91 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 16 deletions(-) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index ae1d5b2..aa90acf 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -1,5 +1,5 @@ @ stdcall AddDelBackupEntryA(str str str long) -# stdcall AddDelBackupEntryW(wstr wstr wstr long) +@ stdcall AddDelBackupEntryW(wstr wstr wstr long) @ stdcall AddDelBackupEntry(str str str long) AddDelBackupEntryA @ stdcall AdvInstallFileA(long str str str str long long) # stdcall AdvInstallFileW(long wstr wstr wstr wstr long long) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 482b9ed..dbf6b66 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -26,15 +26,70 @@ #include "winuser.h" #include "winreg.h" #include "winver.h" +#include "winternl.h" #include "setupapi.h" #include "advpub.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); +/* converts an ansi double null-terminated list to a unicode list */ +static LPWSTR ansi_to_unicode_list(LPCSTR ansi_list) +{ + DWORD len, wlen = 0; + LPWSTR list; + LPCSTR ptr = ansi_list; + + while (*ptr) ptr += lstrlenA(ptr) + 1; + len = ptr + 1 - ansi_list; + wlen = MultiByteToWideChar(CP_ACP, 0, ansi_list, len, NULL, 0); + list = HeapAlloc(GetProcessHeap(), 0, wlen * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ansi_list, len, list, wlen); + return list; +} + /*********************************************************************** * AddDelBackupEntryA (ADVPACK.@) * + * See AddDelBackupEntryW. + */ +HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, + LPCSTR lpcszBaseName, DWORD dwFlags) +{ + UNICODE_STRING backupdir, basename; + LPWSTR filelist, backup; + HRESULT res; + + TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, + lpcszBaseName, dwFlags); + + if (lpcszFileList) + filelist = ansi_to_unicode_list(lpcszFileList); + else + filelist = NULL; + + RtlCreateUnicodeStringFromAsciiz(&backupdir, lpcszBackupDir); + RtlCreateUnicodeStringFromAsciiz(&basename, lpcszBaseName); + + if (lpcszBackupDir) + backup = backupdir.Buffer; + else + backup = NULL; + + res = AddDelBackupEntryW(filelist, backup, basename.Buffer, dwFlags); + + HeapFree(GetProcessHeap(), 0, filelist); + + RtlFreeUnicodeString(&backupdir); + RtlFreeUnicodeString(&basename); + + return res; +} + +/*********************************************************************** + * AddDelBackupEntryW (ADVPACK.@) + * * Either appends the files in the file list to the backup section of * the specified INI, or deletes the entries from the INI file. * @@ -56,13 +111,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); * If lpcszBackupDir is NULL, the INI file is assumed to exist in * c:\windows or created there if it does not exist. */ -HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, - LPCSTR lpcszBaseName, DWORD dwFlags) +HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, + LPCWSTR lpcszBaseName, DWORD dwFlags) { - CHAR szIniPath[MAX_PATH]; - LPSTR szString = NULL; + WCHAR szIniPath[MAX_PATH]; + LPWSTR szString = NULL; - const char szBackupEntry[] = "-1,0,0,0,0,0,-1"; + static const WCHAR szBackupEntry[] = { + '-','1',',','0',',','0',',','0',',','0',',','0',',','-','1',0 + }; + + static const WCHAR backslash[] = {'\\',0}; + static const WCHAR ini[] = {'.','i','n','i',0}; + static const WCHAR backup[] = {'b','a','c','k','u','p',0}; TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, lpcszBaseName, dwFlags); @@ -71,30 +132,30 @@ HRESULT WINAPI AddDelBackupEntryA(LPCSTR return S_OK; if (lpcszBackupDir) - lstrcpyA(szIniPath, lpcszBackupDir); + lstrcpyW(szIniPath, lpcszBackupDir); else - GetWindowsDirectoryA(szIniPath, MAX_PATH); + GetWindowsDirectoryW(szIniPath, MAX_PATH); - lstrcatA(szIniPath, "\\"); - lstrcatA(szIniPath, lpcszBaseName); - lstrcatA(szIniPath, ".ini"); + lstrcatW(szIniPath, backslash); + lstrcatW(szIniPath, lpcszBaseName); + lstrcatW(szIniPath, ini); - SetFileAttributesA(szIniPath, FILE_ATTRIBUTE_NORMAL); + SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_NORMAL); if (dwFlags & AADBE_ADD_ENTRY) - szString = (LPSTR)szBackupEntry; + szString = (LPWSTR)szBackupEntry; else if (dwFlags & AADBE_DEL_ENTRY) szString = NULL; /* add or delete the INI entries */ while (*lpcszFileList) { - WritePrivateProfileStringA("backup", lpcszFileList, szString, szIniPath); - lpcszFileList += lstrlenA(lpcszFileList) + 1; + WritePrivateProfileStringW(backup, lpcszFileList, szString, szIniPath); + lpcszFileList += lstrlenW(lpcszFileList) + 1; } /* hide the INI file */ - SetFileAttributesA(szIniPath, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN); + SetFileAttributesW(szIniPath, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN); return S_OK; }

1 0

Alexandre Julliard : kernel: Remove a couple of incorrect asserts.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: dc8e564f9e72c657bc3f97706eafc50d5dacad8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8e564f9e72c657bc3f977… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 17:07:27 2006 +0100 kernel: Remove a couple of incorrect asserts. --- dlls/kernel/environ.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/environ.c b/dlls/kernel/environ.c index ecae8fe..424e02a 100644 --- a/dlls/kernel/environ.c +++ b/dlls/kernel/environ.c @@ -399,7 +399,6 @@ BOOL WINAPI SetStdHandle( DWORD std_hand */ VOID WINAPI GetStartupInfoA( LPSTARTUPINFOA info ) { - assert(startup_infoA.cb); memcpy(info, &startup_infoA, sizeof(startup_infoA)); } @@ -409,7 +408,6 @@ VOID WINAPI GetStartupInfoA( LPSTARTUPIN */ VOID WINAPI GetStartupInfoW( LPSTARTUPINFOW info ) { - assert(startup_infoW.cb); memcpy(info, &startup_infoW, sizeof(startup_infoW)); }

1 0

Rein Klazes : comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 8b55e4a6621bef1fbd75909e2cfafd2270282aa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b55e4a6621bef1fbd75909… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Thu Mar 23 11:29:44 2006 +0100 comctl32: Do not free LPSTR_TEXTCALLBACK tooltip texts. --- dlls/comctl32/tooltips.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index c16fd7e..d730595 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2025,7 +2025,8 @@ TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2082,7 +2083,8 @@ TOOLTIPS_SetToolInfoW (HWND hwnd, WPARAM else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2208,7 +2210,8 @@ TOOLTIPS_UpdateTipTextA (HWND hwnd, WPAR else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) { @@ -2265,7 +2268,8 @@ TOOLTIPS_UpdateTipTextW (HWND hwnd, WPAR else { if ( (toolPtr->lpszText) && !IS_INTRESOURCE(toolPtr->lpszText) ) { - Free (toolPtr->lpszText); + if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW) + Free (toolPtr->lpszText); toolPtr->lpszText = NULL; } if (lpToolInfo->lpszText) {

1 0

Detlef Riekenberg : kernel: Load QueueUserWorkItem function dynamically.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 213cee62b598331143eb2c7f134bba9a30d7a552 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=213cee62b598331143eb2c7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 22 23:34:52 2006 +0100 kernel: Load QueueUserWorkItem function dynamically. --- dlls/kernel/tests/thread.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c index 9788447..3a68175 100644 --- a/dlls/kernel/tests/thread.c +++ b/dlls/kernel/tests/thread.c @@ -58,6 +58,9 @@ static GetThreadPriorityBoost_t pGetThre typedef HANDLE (WINAPI *OpenThread_t)(DWORD,BOOL,DWORD); static OpenThread_t pOpenThread=NULL; +typedef BOOL (WINAPI *QueueUserWorkItem_t)(LPTHREAD_START_ROUTINE,PVOID,ULONG); +static QueueUserWorkItem_t pQueueUserWorkItem=NULL; + typedef DWORD (WINAPI *SetThreadIdealProcessor_t)(HANDLE,DWORD); static SetThreadIdealProcessor_t pSetThreadIdealProcessor=NULL; @@ -695,13 +698,16 @@ static void test_QueueUserWorkItem(void) DWORD wait_result; DWORD before, after; + /* QueueUserWorkItem not present on win9x */ + if (!pQueueUserWorkItem) return; + finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); before = GetTickCount(); for (i = 0; i < 100; i++) { - BOOL ret = QueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); + BOOL ret = pQueueUserWorkItem(work_function, (void *)i, WT_EXECUTEDEFAULT); ok(ret, "QueueUserWorkItem failed with error %ld\n", GetLastError()); } @@ -724,6 +730,7 @@ START_TEST(thread) ok(lib!=NULL,"Couldn't get a handle for kernel32.dll\n"); pGetThreadPriorityBoost=(GetThreadPriorityBoost_t)GetProcAddress(lib,"GetThreadPriorityBoost"); pOpenThread=(OpenThread_t)GetProcAddress(lib,"OpenThread"); + pQueueUserWorkItem=(QueueUserWorkItem_t)GetProcAddress(lib,"QueueUserWorkItem"); pSetThreadIdealProcessor=(SetThreadIdealProcessor_t)GetProcAddress(lib,"SetThreadIdealProcessor"); pSetThreadPriorityBoost=(SetThreadPriorityBoost_t)GetProcAddress(lib,"SetThreadPriorityBoost"); test_CreateThread_basic();

1 0

Eric Kohl : widl: Fix base type alignments.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 6ad46cc96175ecfa8640cba294e5a72037a7bc68 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ad46cc96175ecfa8640cba… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Mar 23 10:39:07 2006 +0100 widl: Fix base type alignments. Generate aligned marshal and unmarshal code for base type arguments and return values. --- tools/widl/server.c | 4 ++++ tools/widl/typegen.c | 29 +++++++++-------------------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 1b134f3..42aedff 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -306,6 +306,10 @@ static void write_function_stubs(type_t /* marshall the return value */ if (!is_void(def->type, NULL)) { + unsigned int alignment; + unsigned int size = get_required_buffer_size(def, &alignment); + print_server("_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + size - 1, size - 1); print_server("*("); write_type(server, def->type, def, def->tname); fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fd2d040..8127b6a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1285,12 +1285,13 @@ static unsigned int get_required_buffer_ case RPC_FC_CHAR: case RPC_FC_USMALL: case RPC_FC_SMALL: + *alignment = 4; return 1; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: - *alignment = 2; + *alignment = 4; return 2; case RPC_FC_ULONG: @@ -1358,7 +1359,6 @@ void write_remoting_arguments(FILE *file unsigned int *type_offset, enum pass pass, enum remoting_phase phase) { - unsigned int last_size = 0; var_t *var; if (!func->args) @@ -1398,7 +1398,6 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "NdrConformantString%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else if (is_array_type(var->attrs, var->ptr_level, var->array)) { @@ -1455,7 +1454,6 @@ void write_remoting_arguments(FILE *file "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", array_type, function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else if (var->ptr_level == 0 && is_base_type(var->type->type)) { @@ -1468,15 +1466,14 @@ void write_remoting_arguments(FILE *file case RPC_FC_SMALL: case RPC_FC_USMALL: size = 1; - alignment = 0; + alignment = 1; break; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); + alignment = 2; break; case RPC_FC_ULONG: @@ -1484,15 +1481,13 @@ void write_remoting_arguments(FILE *file case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); + alignment = 4; break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); + alignment = 8; break; case RPC_FC_IGNORE: @@ -1505,8 +1500,8 @@ void write_remoting_arguments(FILE *file size = 0; } - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); + print_file(file, indent, "_StubMsg.Buffer += (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n", + alignment - 1, alignment - 1); if (phase == PHASE_MARSHAL) { @@ -1523,17 +1518,13 @@ void write_remoting_arguments(FILE *file fprintf(file, " = *("); write_type(file, var->type, var, var->tname); fprintf(file, " *)_StubMsg.Buffer;\n"); - print_file(file, indent, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); } else error("write_remoting_arguments: Unimplemented for base types for phase %d\n", phase); + print_file(file, indent, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - - last_size = size; } else if (var->ptr_level == 0) { @@ -1563,14 +1554,12 @@ void write_remoting_arguments(FILE *file print_file(file, indent, "Ndr%s%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", ndrtype, function_from_phase(phase), var->name, *type_offset); - last_size = 1; } else { print_file(file, indent, "NdrPointer%s(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", function_from_phase(phase), var->name, *type_offset); - last_size = 1; } fprintf(file, "\n"); }

1 0

Eric Kohl : widl: Fix format string size calculation.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 1550938a5042f9847eab45d13e2077aa40b8a08f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1550938a5042f9847eab45d… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Mar 23 10:33:08 2006 +0100 widl: Fix format string size calculation. - Move proc format string size calculation from client.c and server.c to typegen.c. - Implement type format string size calculation. --- tools/widl/client.c | 34 ++++----------------------- tools/widl/server.c | 34 ++++----------------------- tools/widl/typegen.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.h | 4 ++- 4 files changed, 76 insertions(+), 60 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 3197b73..db8ce7f 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -1,7 +1,7 @@ /* * IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -384,35 +384,11 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - int byte_count = 1; + print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", + get_size_typeformatstring(iface)); - print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ - - /* determine the proc format string size */ - if (iface->funcs) - { - func_t *func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) - { - /* argument list size */ - if (func->args) - { - var_t *var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) - { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); - } - } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); - } - } - print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + print_client("#define PROC_FORMAT_STRING_SIZE %d\n", + get_size_procformatstring(iface)); fprintf(client, "\n"); write_formatdesc("TYPE"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 3f7b976..1b134f3 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -1,7 +1,7 @@ /* * IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -472,35 +472,11 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - int byte_count = 1; + print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", + get_size_typeformatstring(iface)); - print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ - - /* determine the proc format string size */ - if (iface->funcs) - { - func_t *func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) - { - /* argument list size */ - if (func->args) - { - var_t *var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) - { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); - } - } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); - } - } - print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + print_server("#define PROC_FORMAT_STRING_SIZE %d\n", + get_size_procformatstring(iface)); fprintf(server, "\n"); write_formatdesc("TYPE"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d9b722c..fd2d040 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1,7 +1,7 @@ /* * Format String Generator for IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * Copyright 2005-2006 Robert Shearman * * This library is free software; you can redistribute it and/or @@ -1591,6 +1591,68 @@ size_t get_size_typeformatstring_var(con return type_offset; } +size_t get_size_procformatstring(const type_t *iface) +{ + size_t size = 1; + func_t *func; + var_t *var; + + if (iface->funcs) + { + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + size += get_size_procformatstring_var(var); + var = PREV_LINK(var); + } + } + + /* return value size */ + size += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); + } + } + return size; +} + +size_t get_size_typeformatstring(const type_t *iface) +{ + size_t size = 3; + func_t *func; + var_t *var; + + if (iface->funcs) + { + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + size += get_size_typeformatstring_var(var); + var = PREV_LINK(var); + } + } + + func = PREV_LINK(func); + } + } + return size; +} + static void write_struct_expr(FILE *h, const expr_t *e, int brackets, const var_t *fields, const char *structvar) { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 0150429..080bdaf 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -1,7 +1,7 @@ /* * Format String Generator for IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * Copyright 2005 Robert Shearman * * This library is free software; you can redistribute it and/or @@ -41,5 +41,7 @@ unsigned int get_required_buffer_size(co void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var); +size_t get_size_procformatstring(const type_t *iface); +size_t get_size_typeformatstring(const type_t *iface); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface);

1 0

Alexandre Julliard : server: Class and global atoms should not be local to a window station.
by Alexandre Julliard 23 Mar '06

23 Mar '06

Module: wine Branch: refs/heads/master Commit: 9873494ced8405113381266b4d99c2a9f3002cb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9873494ced8405113381266… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 22:13:40 2006 +0100 server: Class and global atoms should not be local to a window station. --- dlls/user/tests/winstation.c | 43 +++++++++++++++++++++++++++++++++++++++++- server/atom.c | 27 ++++++++++++++++---------- server/class.c | 24 ++++------------------- 3 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/user/tests/winstation.c b/dlls/user/tests/winstation.c index 4bc1941..a595718 100644 --- a/dlls/user/tests/winstation.c +++ b/dlls/user/tests/winstation.c @@ -42,12 +42,29 @@ static void print_object( HANDLE obj ) trace( "obj %p type '%s'\n", obj, buffer ); } +static void register_class(void) +{ + WNDCLASSA cls; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "WinStationClass"; + RegisterClassA(&cls); +} + static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"BUTTON","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -89,6 +106,8 @@ static void test_handles(void) HDESK d1, d2, d3; HANDLE hthread; DWORD id, flags; + ATOM atom; + char buffer[20]; /* win stations */ @@ -144,6 +163,28 @@ static void test_handles(void) w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); ok( !w3, "open foobar station succeeded\n" ); + w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create foobar station failed\n" ); + w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w3 != 0, "create foobar station failed\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w2 ); + register_class(); + atom = GlobalAddAtomA("foo"); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + + ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w3 ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); initial_desktop = d1; diff --git a/server/atom.c b/server/atom.c index 18a59db..f48078b 100644 --- a/server/atom.c +++ b/server/atom.c @@ -88,6 +88,7 @@ static const struct object_ops atom_tabl atom_table_destroy /* destroy */ }; +static struct atom_table *global_table; /* create an atom table */ static struct atom_table *create_table(int entries_count) @@ -292,12 +293,22 @@ static atom_t find_atom( struct atom_tab static struct atom_table *get_global_table( struct winstation *winstation, int create ) { - if (!winstation->atom_table) + struct atom_table *table = winstation ? winstation->atom_table : global_table; + if (!table) { - if (create) winstation->atom_table = create_table( HASH_SIZE ); + if (create) + { + table = create_table( HASH_SIZE ); + if (winstation) winstation->atom_table = table; + else + { + global_table = table; + make_object_static( &global_table->obj ); + } + } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); } - return winstation->atom_table; + return table; } static struct atom_table *get_table( obj_handle_t h, int create ) @@ -310,14 +321,8 @@ static struct atom_table *get_table( obj } else { - struct winstation *winstation = get_process_winstation( current->process, - WINSTA_ACCESSGLOBALATOMS ); - if (winstation) - { - table = get_global_table( winstation, 1 ); - if (table) grab_object( table ); - release_object( winstation ); - } + table = get_global_table( NULL, 1 ); + if (table) grab_object( table ); } return table; } diff --git a/server/class.c b/server/class.c index 0019e25..5fcd267 100644 --- a/server/class.c +++ b/server/class.c @@ -142,7 +142,6 @@ void *get_class_client_ptr( struct windo DECL_HANDLER(create_class) { struct window_class *class; - struct winstation *winstation; class = find_class( current->process, req->atom, req->instance ); if (class && !class->local == !req->local) @@ -157,18 +156,11 @@ DECL_HANDLER(create_class) return; } - if (!(winstation = get_process_winstation( current->process, WINSTA_ACCESSGLOBALATOMS ))) - return; + if (!grab_global_atom( NULL, req->atom )) return; - if (!grab_global_atom( winstation, req->atom )) - { - release_object( winstation ); - return; - } if (!(class = create_class( current->process, req->extra, req->local ))) { - release_global_atom( winstation, req->atom ); - release_object( winstation ); + release_global_atom( NULL, req->atom ); return; } class->atom = req->atom; @@ -176,7 +168,6 @@ DECL_HANDLER(create_class) class->style = req->style; class->win_extra = req->win_extra; class->client_ptr = req->client_ptr; - release_object( winstation ); } /* destroy a window class */ @@ -239,16 +230,9 @@ DECL_HANDLER(set_class_info) if (req->flags & SET_CLASS_ATOM) { - struct winstation *winstation = get_process_winstation( current->process, - WINSTA_ACCESSGLOBALATOMS ); - if (!grab_global_atom( winstation, req->atom )) - { - release_object( winstation ); - return; - } - release_global_atom( winstation, class->atom ); + if (!grab_global_atom( NULL, req->atom )) return; + release_global_atom( NULL, class->atom ); class->atom = req->atom; - release_object( winstation ); } if (req->flags & SET_CLASS_STYLE) class->style = req->style; if (req->flags & SET_CLASS_WINEXTRA) class->win_extra = req->win_extra;

1 0

docs/en winedev-debugger.sgml
by Dimi Paun 23 Mar '06

23 Mar '06

ChangeSet ID: 1143088232144993383511068 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/03/22 20:30:32 Modified files: en : winedev-debugger.sgml Log message: Jeff L <lats(a)yless4u.com.au> Document the "info all_regs" command. Old revision New revision Changes Path 1.4 1.5 +6 -0 docs/en/winedev-debugger.sgml Index: docs/en/winedev-debugger.sgml diff -u -p docs/en/winedev-debugger.sgml:1.4 docs/en/winedev-debugger.sgml:1.5 --- docs/en/winedev-debugger.sgml 23 Mar 2006 4:30:32 -0000 +++ /dev/null 23 Mar 2006 4:30:32 -0000 @@ -2004,6 +2004,12 @@ set $BreakAllThreadsStartup = 1 </entry> </row> <row> + <entry><command>info all-regs</command></entry> + <entry> + prints the value of the CPU and Floating Point registers + </entry> + </row> + <row> <entry> <command>info segment <N></command> </entry>

1 0

docs/en wine-faq.sgml
by Dimi Paun 23 Mar '06

23 Mar '06

ChangeSet ID: 1143087469807514907167391 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/03/22 20:17:49 Modified files: en : wine-faq.sgml Log message: Brian Vincent Explicitly address Intel Mac OS X. Old revision New revision Changes Path 1.15 1.16 +31 -3 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.15 docs/en/wine-faq.sgml:1.16 --- docs/en/wine-faq.sgml 23 Mar 2006 4:17:49 -0000 +++ /dev/null 23 Mar 2006 4:17:49 -0000 @@ -591,9 +591,12 @@ cvs -z3 -d:pserver:anonymous@cvs.sourcef <para> Mac OS X / Darwin: The <ulink url="http://darwine.opendarwin.org/">Darwine</ulink> project is - currently working on porting Wine to the Darwin/x86 platform. Their - goal is to eventually make it possible to run x86 Windows + currently working on porting Wine to the Darwin/x86 platform. + Their goal is to eventually make it possible to run x86 Windows applications on Darwin/PPC and then Mac OS X by using Bochs. + In addition, CodeWeavers has focused some of their resources on + Intel Mac OS X as well. With a little luck, Wine will be running on + it by the third quarter of 2006. </para> <para> FreeBSD: This port is well maintained and should work with @@ -606,7 +609,32 @@ cvs -z3 -d:pserver:anonymous@cvs.sourcef </para> </answer> </qandaentry> - + <qandaentry> + <question id="Will-wine-run-on-macintel"> + <para> + I want to run Wine on an Intel Mac OS X (MacIntel) system, will it + work? + </para> + </question> + <answer> + <para> + (Also see the previous question.) As of March, 2006, simple + applications are just beginning to to run on Intel Mac OS X. + It's possible in about 6 months we'll see applications running + similarly to how they do on Linux or FreeBSD. + </para> + <para> + There are some complicated issues surrounding Wine on Mac OS X. + Working with low-level features, such as signal handling and system + registers, are quite different on Mac OS X. Further hampering + the issue are some bugs within the operating system. Beyond + that, integration on Mac OS X becomes difficult because it is + vastly different than a traditional *nix desktop. Menuing + and graphics drivers are just two areas that require a complete + reimplementation in order to be functional. + </para> + </answer> + </qanaentry> <qandaentry> <question id="What-minimum-CPU-must-I-have"> <para>

1 0

Marcus Meissner : programs: Move icinfo out of avitools.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 40af0c8a30e190c7ada7f2c5386fd2743fc8475e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40af0c8a30e190c7ada7f2c… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Mar 22 13:31:54 2006 +0100 programs: Move icinfo out of avitools. --- configure | 4 - configure.ac | 2 programs/Makefile.in | 4 - programs/avitools/.gitignore | 4 - programs/avitools/Makefile.in | 71 ------------ programs/avitools/aviinfo.c | 129 ---------------------- programs/avitools/aviplay.c | 245 ----------------------------------------- programs/avitools/icinfo.c | 78 ------------- programs/icinfo/.gitignore | 2 programs/icinfo/Makefile.in | 13 ++ programs/icinfo/icinfo.c | 78 +++++++++++++ 11 files changed, 98 insertions(+), 532 deletions(-) delete mode 100644 programs/avitools/.gitignore delete mode 100644 programs/avitools/Makefile.in delete mode 100644 programs/avitools/aviinfo.c delete mode 100644 programs/avitools/aviplay.c delete mode 100644 programs/avitools/icinfo.c create mode 100644 programs/icinfo/.gitignore create mode 100644 programs/icinfo/Makefile.in create mode 100644 programs/icinfo/icinfo.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=40af0c8a30e190c7ada…

1 0

H. Verbeet : wined3d: Set vertex attribute pointers defined in vertex declarations properly.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 1aca53860a4c7549fda3d798a50f0512ac36b4c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1aca53860a4c7549fda3d79… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:54 2006 +0000 wined3d: Set vertex attribute pointers defined in vertex declarations properly. --- dlls/wined3d/drawprim.c | 14 ++++++++++++++ dlls/wined3d/vertexshader.c | 10 ---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6f14dff..34241bd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -325,6 +325,7 @@ void primitiveDeclarationConvertToStride int i; WINED3DVERTEXELEMENT *element; DWORD stride; + int reg; /* Locate the vertex declaration */ if (useVertexShaderFunction && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration) { @@ -350,8 +351,21 @@ void primitiveDeclarationConvertToStride stride = This->stateBlock->streamStride[element->Stream]; data += (BaseVertexIndex * stride); data += element->Offset; + reg = element->Reg; TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); + + if (useVertexShaderFunction && reg != -1 && data) { + WINED3DGLTYPE glType = glTypeLookup[element->Type]; + + TRACE("(%p) : Set vertex attrib pointer: reg 0x%08x, d3d type 0x%08x, stride 0x%08lx, data %p)\n", This, reg, element->Type, stride, data); + + GL_EXTCALL(glVertexAttribPointerARB(reg, glType.size, glType.glType, glType.normalized, stride, data)); + checkGLcall("glVertexAttribPointerARB"); + GL_EXTCALL(glEnableVertexAttribArrayARB(reg)); + checkGLcall("glEnableVertexAttribArrayARB"); + } + switch (element->Usage) { case D3DDECLUSAGE_POSITION: switch (element->UsageIndex) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d3e3801..c4732bc 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1245,16 +1245,6 @@ inline static VOID IWineD3DVertexShaderI /* TODO: renumbering of attributes if the values are higher than the highest supported attribute but the total number of attributes is less than the highest supported attribute */ This->highestConstant = -1; - /* Parse the vertex declaration and store the used elements in arrayUsageMap. */ - if(This->vertexDeclaration) { - for (i = 0 ; i < ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->declarationWNumElements - 1; ++i) { - WINED3DVERTEXELEMENT *element = ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->pDeclarationWine + i; - INT usage = element->Usage | (element->UsageIndex << 16); - BYTE arrayNo = element->Reg; - parse_decl_usage(This, usage, arrayNo); - } - } - /** * First pass to determine what we need to declare: * - Temporary variables

1 0

H. Verbeet : wined3d: Fix slightly misleading ParseVertexDeclarationUsage naming.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: e7b33b0f376080798a90913e829b20f96aa33270 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7b33b0f376080798a90913… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:32 2006 +0000 wined3d: Fix slightly misleading ParseVertexDeclarationUsage naming. --- dlls/wined3d/vertexshader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index fd31214..d3e3801 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1064,7 +1064,7 @@ int ExpandMxMacro(DWORD macro_opcode, co return nComponents; } -static void ParseVertexDeclarationUsage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) +static void parse_decl_usage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) { switch(usage & 0xFFFF) { case D3DDECLUSAGE_POSITION: @@ -1251,7 +1251,7 @@ inline static VOID IWineD3DVertexShaderI WINED3DVERTEXELEMENT *element = ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->pDeclarationWine + i; INT usage = element->Usage | (element->UsageIndex << 16); BYTE arrayNo = element->Reg; - ParseVertexDeclarationUsage(This, usage, arrayNo); + parse_decl_usage(This, usage, arrayNo); } } @@ -1288,7 +1288,7 @@ inline static VOID IWineD3DVertexShaderI if (curOpcode->opcode == D3DSIO_DCL){ INT usage = *pToken++; INT arrayNo = (*pToken++ & 0x00001FFF); - ParseVertexDeclarationUsage(This, usage, arrayNo); + parse_decl_usage(This, usage, arrayNo); } else if(curOpcode->opcode == D3DSIO_DEF) { This->constantsUsedBitmap[*pToken & 0xFF] = VS_CONSTANT_CONSTANT; FIXME("Constant %ld\n", *pToken & 0xFF);

1 0

H. Verbeet : wined3d: Initialise WINED3DVERTEXELEMENT's Reg field in
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: f716eea3dfd7713f701b44d29dfd19a1c74e71fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f716eea3dfd7713f701b44d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:16 2006 +0000 wined3d: Initialise WINED3DVERTEXELEMENT's Reg field in IWineD3DVertexDeclarationImpl_ParseDeclaration9. --- dlls/wined3d/vertexdeclaration.c | 1 + include/wine/wined3d_types.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 653f2b7..e45f440 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -383,6 +383,7 @@ static HRESULT IWineD3DVertexDeclaration This->pDeclarationWine = HeapAlloc(GetProcessHeap(), 0, This->declaration9NumElements * sizeof(WINED3DVERTEXELEMENT)); for(i = 0; i < This->declaration9NumElements; ++i) { memcpy(This->pDeclarationWine + i, This->pDeclaration9 + i, sizeof(D3DVERTEXELEMENT9)); + This->pDeclarationWine[i].Reg = -1; } This->declarationWNumElements = This->declaration9NumElements; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index b265c90..3c76715 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -507,7 +507,7 @@ typedef struct _WINED3DVERTEXELEMENT { BYTE Method; BYTE Usage; BYTE UsageIndex; - BYTE Reg; /* DirectX 8 */ + int Reg; /* DirectX 8 */ } WINED3DVERTEXELEMENT, *LPWINED3DVERTEXELEMENT;

1 0

H. Verbeet : wined3d: glTypeLookup cleanup.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 46b13aaa585ebdd1c418a9df03bf3851190eebfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46b13aaa585ebdd1c418a9d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:46:59 2006 +0000 wined3d: glTypeLookup cleanup. Use a struct instead of an UINT array as entries in the glTypeLookup table. --- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 5d216af..653f2b7 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -297,7 +297,7 @@ IWineD3DVertexDeclarationImpl *This = (I convToW[nTokens].Type = type; convToW[nTokens].Offset = offset; convToW[nTokens].Reg = reg; - offset += glTypeLookup[type][1] * glTypeLookup[type][4]; + offset += glTypeLookup[type].size * glTypeLookup[type].typesize; ++nTokens; } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) { TRACE(" 0x%08lx SKIP(%lu)\n", tokentype, ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d6e851a..9afa988 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -81,8 +81,16 @@ extern DWORD *stateLookup[MAX_LOOKUPS]; extern DWORD minMipLookup[D3DTEXF_ANISOTROPIC + 1][D3DTEXF_LINEAR + 1]; +typedef struct _WINED3DGLTYPE { + int d3dType; + GLint size; + GLenum glType; + GLboolean normalized; + int typesize; +} WINED3DGLTYPE; + /* NOTE: Make sure these are in the correct numerical order. (see /include/d3d9types.h typedef enum _D3DDECLTYPE) */ -UINT static const glTypeLookup[D3DDECLTYPE_UNUSED][5] = { +WINED3DGLTYPE static const glTypeLookup[D3DDECLTYPE_UNUSED] = { {D3DDECLTYPE_FLOAT1, 1, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT2, 2, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT3, 3, GL_FLOAT , GL_FALSE ,sizeof(float)}, @@ -101,11 +109,11 @@ UINT static const glTypeLookup[D3DDECLTY {D3DDECLTYPE_FLOAT16_2, 2, GL_FLOAT , GL_FALSE ,sizeof(short int)}, {D3DDECLTYPE_FLOAT16_4, 4, GL_FLOAT , GL_FALSE ,sizeof(short int)}}; -#define WINED3D_ATR_TYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][0] -#define WINED3D_ATR_SIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][1] -#define WINED3D_ATR_GLTYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][2] -#define WINED3D_ATR_NORMALIZED(_attribute) glTypeLookup[sd->u.s._attribute.dwType][3] -#define WINED3D_ATR_TYPESIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][4] +#define WINED3D_ATR_TYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].d3dType +#define WINED3D_ATR_SIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].size +#define WINED3D_ATR_GLTYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].glType +#define WINED3D_ATR_NORMALIZED(_attribute) glTypeLookup[sd->u.s._attribute.dwType].normalized +#define WINED3D_ATR_TYPESIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].typesize /** * Settings

1 0

H. Verbeet : wined3d: Store the pixelshader version in the pixelshader object.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: bce3da3af7ba7a070306ceb359f0f67fde51f6a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bce3da3af7ba7a070306ceb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:46:50 2006 +0000 wined3d: Store the pixelshader version in the pixelshader object. --- dlls/wined3d/pixelshader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 1b24f3d..15815e2 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -752,8 +752,9 @@ static CONST SHADER_OPCODE pshader_ins [ }; -inline static const SHADER_OPCODE* pshader_program_get_opcode(const DWORD code, const int version) { +inline static const SHADER_OPCODE* pshader_program_get_opcode(IWineD3DPixelShaderImpl *This, const DWORD code) { DWORD i = 0; + DWORD version = This->version; DWORD hex_version = D3DPS_VERSION(version/10, version%10); /** TODO: use dichotomic search */ while (NULL != pshader_ins[i].name) { @@ -764,7 +765,7 @@ inline static const SHADER_OPCODE* pshad } ++i; } - FIXME("Unsupported opcode %lx(%ld) masked %lx version %d\n", code, code, code & D3DSI_OPCODE_MASK, version); + FIXME("Unsupported opcode %lx(%ld) masked %lx version %ld\n", code, code, code & D3DSI_OPCODE_MASK, version); return NULL; } @@ -1096,7 +1097,7 @@ inline static VOID IWineD3DPixelShaderIm code = *pToken; #endif pInstr = pToken; - curOpcode = pshader_program_get_opcode(*pToken, version); + curOpcode = pshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1666,13 +1667,12 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S const SHADER_OPCODE *curOpcode = NULL; DWORD len = 0; DWORD i; - int version = 0; TRACE("(%p) : Parsing programme\n", This); if (NULL != pToken) { while (D3DPS_END() != *pToken) { if (pshader_is_version_token(*pToken)) { /** version */ - version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); + This->version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); TRACE("ps_%lu_%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F)); ++pToken; ++len; @@ -1686,10 +1686,10 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S len += comment_len + 1; continue; } - if (!version) { + if (!This->version) { WARN("(%p) : pixel shader doesn't have a valid version identifier\n", This); } - curOpcode = pshader_program_get_opcode(*pToken, version); + curOpcode = pshader_program_get_opcode(This, *pToken); ++pToken; ++len; if (NULL == curOpcode) {

1 0

Huw Davies : user32: Only adjust the margins if the edit control is above a certain size.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: c4b44245fbb188218fedba2ad3e33ee2f4086338 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4b44245fbb188218fedba2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 22 12:16:44 2006 +0000 user32: Only adjust the margins if the edit control is above a certain size. --- dlls/user/edit.c | 35 ++++++++++++++-- dlls/user/tests/edit.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 130 insertions(+), 8 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 98cf736..ed013af 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -246,7 +246,7 @@ static void EDIT_EM_ScrollCaret(EDITSTAT static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc); static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); -static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, INT left, INT right, BOOL repaint); +static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); static BOOL EDIT_EM_SetTabStops(EDITSTATE *es, INT count, LPINT tabs); @@ -747,7 +747,7 @@ static LRESULT WINAPI EditWndProc_common /* The following EM_xxx are new to win95 and don't exist for 16 bit */ case EM_SETMARGINS: - EDIT_EM_SetMargins(es, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam), TRUE); + EDIT_EM_SetMargins(es, (INT)wParam, LOWORD(lParam), HIWORD(lParam), TRUE); break; case EM_GETMARGINS: @@ -2326,7 +2326,7 @@ static void EDIT_SetCaretPos(EDITSTATE * static void EDIT_AdjustFormatRect(EDITSTATE *es) { RECT ClientRect; - + es->format_rect.right = max(es->format_rect.right, es->format_rect.left + es->char_width); if (es->style & ES_MULTILINE) { @@ -3660,9 +3660,24 @@ static void EDIT_EM_SetLimitText(EDITSTA * of the char's width as the margin, but this is not how Windows handles this. * For all other fonts Windows sets the margins to zero. * + * FIXME - When EC_USEFONTINFO is used the margins only change if the + * edit control is equal to or larger than a certain size. + * Interestingly if one subtracts both the left and right margins from + * this size one always seems to get an even number. The extents of + * the (four character) string "'**'" match this quite closely, so + * we'll use this until we come up with a better idea. */ +static int calc_min_set_margin_size(HDC dc, INT left, INT right) +{ + WCHAR magic_string[] = {'\'','*','*','\'', 0}; + SIZE sz; + + GetTextExtentPointW(dc, magic_string, sizeof(magic_string)/sizeof(WCHAR) - 1, &sz); + return sz.cx + left + right; +} + static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, - INT left, INT right, BOOL repaint) + WORD left, WORD right, BOOL repaint) { TEXTMETRICW tm; INT default_left_margin = 0; /* in pixels */ @@ -3675,9 +3690,17 @@ static void EDIT_EM_SetMargins(EDITSTATE GetTextMetricsW(dc, &tm); /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { + int min_size; + RECT rc; /* This must be calculated more exactly! But how? */ - default_left_margin = tm.tmAveCharWidth / 3; - default_right_margin = tm.tmAveCharWidth / 3; + default_left_margin = tm.tmAveCharWidth / 2; + default_right_margin = tm.tmAveCharWidth / 2; + min_size = calc_min_set_margin_size(dc, default_left_margin, default_right_margin); + GetClientRect(es->hwndSelf, &rc); + if(rc.right - rc.left < min_size) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; + } } SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 1a830c2..e880ea2 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -760,10 +760,108 @@ static void test_margins(void) ok(new_rect.right == old_rect.right, "The right border of the rectangle has changed\n"); ok(new_rect.top == old_rect.top, "The top border of the rectangle has changed\n"); ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); - + DestroyWindow (hwEdit); } +static INT CALLBACK find_font_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static void test_margins_font_change(void) +{ + HWND hwEdit; + DWORD margins, font_margins; + LOGFONT lf; + HFONT hfont, hfont2; + HDC hdc = GetDC(0); + + if(EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0)) + { + trace("Arial not found - skipping font change margin tests\n"); + ReleaseDC(0, hdc); + return; + } + ReleaseDC(0, hdc); + + hwEdit = create_child_editcontrol(0, 0); + + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Arial"); + lf.lfHeight = 16; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + lf.lfHeight = 30; + hfont2 = CreateFontIndirectA(&lf); + + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + font_margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(font_margins) != 0, "got %d\n", LOWORD(font_margins)); + ok(HIWORD(font_margins) != 0, "got %d\n", HIWORD(font_margins)); + + /* With 'small' edit controls, test that the margin doesn't get set */ + SetWindowPos(hwEdit, NULL, 10, 10, 16, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 0, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 0, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == 1, "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == 1, "got %d\n", HIWORD(margins)); + + /* Above a certain size threshold then the margin is updated */ + SetWindowPos(hwEdit, NULL, 10, 10, 1000, 100, SWP_NOZORDER | SWP_NOACTIVATE); + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,0)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(1,1)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO,EC_USEFONTINFO)); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) == LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) == HIWORD(font_margins), "got %d\n", HIWORD(margins)); + SendMessageA(hwEdit, WM_SETFONT, (WPARAM)hfont2, 0); + margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); + ok(LOWORD(margins) != LOWORD(font_margins), "got %d\n", LOWORD(margins)); + ok(HIWORD(margins) != HIWORD(font_margins), "got %d\n", HIWORD(margins)); + + SendMessageA(hwEdit, WM_SETFONT, 0, 0); + + DeleteObject(hfont2); + DeleteObject(hfont); + destroy_child_editcontrol(hwEdit); + +} + #define edit_pos_ok(exp, got, txt) \ ok(exp == got, "wrong " #txt " expected %d got %ld\n", exp, got); @@ -968,7 +1066,8 @@ START_TEST(edit) test_edit_control_4(); test_edit_control_5(); test_margins(); + test_margins_font_change(); test_text_position(); - + UnregisterWindowClasses(); }

1 0

James Hawkins : advpack: Forward RebootCheckOnInstallA to its Unicode counterpart.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 15a2169ec0f0bbac515a2ff47db4bbf6681a96b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15a2169ec0f0bbac515a2ff… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 22 14:08:37 2006 -0600 advpack: Forward RebootCheckOnInstallA to its Unicode counterpart. --- dlls/advpack/advpack.c | 35 ++++++++++++++++++++++++++++++++--- dlls/advpack/advpack.spec | 2 +- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 460f72d..b4f3caf 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -324,6 +324,34 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps /*********************************************************************** * RebootCheckOnInstallA (ADVPACK.@) * + * See RebootCheckOnInstallW. + */ +HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, + LPSTR pszSec, DWORD dwReserved) +{ + UNICODE_STRING infW, secW; + HRESULT res; + + TRACE("(%p, %s, %s, %ld)\n", hWnd, debugstr_a(pszINF), + debugstr_a(pszSec), dwReserved); + + if (!pszINF || !pszSec) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&infW, pszINF); + RtlCreateUnicodeStringFromAsciiz(&secW, pszSec); + + res = RebootCheckOnInstallW(hWnd, infW.Buffer, secW.Buffer, dwReserved); + + RtlFreeUnicodeString(&infW); + RtlFreeUnicodeString(&secW); + + return res; +} + +/*********************************************************************** + * RebootCheckOnInstallW (ADVPACK.@) + * * Checks if a reboot is required for an installed INF section. * * PARAMS @@ -344,10 +372,11 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps * BUGS * Unimplemented. */ -HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, - LPSTR pszSec, DWORD dwReserved) +HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, + LPWSTR pszSec, DWORD dwReserved) { - FIXME("(%p, %p, %p, %ld) stub\n", hWnd, pszINF, pszSec, dwReserved); + FIXME("(%p, %s, %s, %ld) stub\n", hWnd, debugstr_w(pszINF), + debugstr_w(pszSec), dwReserved); return E_FAIL; } diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index 7ddd412..ae1d5b2 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -47,7 +47,7 @@ @ stdcall OpenINFEngineW(wstr wstr long ptr ptr) @ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA @ stdcall RebootCheckOnInstallA(long str str long) -# stdcall RebootCheckOnInstallW(long wstr wstr long) +@ stdcall RebootCheckOnInstallW(long wstr wstr long) @ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA @ stdcall RegInstallA(ptr str ptr) # stdcall RegInstallW(ptr wstr ptr)

1 0

Jacek Caban : mshtml: Clean up get_all and tags (also fixes a typo).
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b88b981dcbb0b220ef1686a3acde2658c995c7fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b88b981dcbb0b220ef1686a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 22 17:14:42 2006 +0100 mshtml: Clean up get_all and tags (also fixes a typo). --- dlls/mshtml/htmlelem.c | 80 +++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 41dec13..40d1d36 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -38,6 +38,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT HTMLElementCollection_Create(IUnknown*,HTMLElement**,DWORD,IDispatch**); +typedef struct { + HTMLElement **buf; + DWORD len; + DWORD size; +} elem_vector; + +static void elem_vector_add(elem_vector *buf, HTMLElement *elem) +{ + if(buf->len == buf->size) { + buf->size <<= 1; + buf->buf = HeapReAlloc(GetProcessHeap(), 0, buf->buf, buf->size*sizeof(HTMLElement**)); + } + + buf->buf[buf->len++] = elem; +} + #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, @@ -747,8 +763,7 @@ static HRESULT WINAPI HTMLElement_get_ch return E_NOTIMPL; } -static void create_all_list(HTMLDocument *doc, HTMLElement *elem, HTMLElement ***list, DWORD *size, - DWORD *len) +static void create_all_list(HTMLDocument *doc, HTMLElement *elem, elem_vector *buf) { nsIDOMNodeList *nsnode_list; nsIDOMNode *iter; @@ -777,37 +792,30 @@ static void create_all_list(HTMLDocument if(node->node_type != NT_HTMLELEM) continue; - if(*len == *size) { - *size <<= 1; - *list = HeapReAlloc(GetProcessHeap(), 0, *list, *size * sizeof(HTMLElement**)); - } - - (*list)[(*len)++] = (HTMLElement*)node->impl.elem; - - create_all_list(doc, (HTMLElement*)node->impl.elem, list, size, len); + elem_vector_add(buf, (HTMLElement*)node->impl.elem); + create_all_list(doc, (HTMLElement*)node->impl.elem, buf); } } static HRESULT WINAPI HTMLElement_get_all(IHTMLElement *iface, IDispatch **p) { HTMLElement *This = HTMLELEM_THIS(iface); - HTMLElement **elem_list; - DWORD list_size = 8, len = 0; + elem_vector buf = {NULL, 0, 8}; TRACE("(%p)->(%p)\n", This, p); - elem_list = HeapAlloc(GetProcessHeap(), 0, list_size*sizeof(HTMLElement**)); + buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement**)); - create_all_list(This->node->doc, This, &elem_list, &list_size, &len); + create_all_list(This->node->doc, This, &buf); - if(!len) { - HeapFree(GetProcessHeap(), 0, elem_list); - elem_list = NULL; - }else if(list_size > len) { - elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, len*sizeof(HTMLElement**)); + if(!buf.len) { + HeapFree(GetProcessHeap(), 0, buf.buf); + buf.buf = NULL; + }else if(buf.size > buf.len) { + buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len*sizeof(HTMLElement**)); } - return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), elem_list, len, p); + return HTMLElementCollection_Create((IUnknown*)HTMLELEM(This), buf.buf, buf.len, p); } static void HTMLElement_destructor(IUnknown *iface) @@ -1152,19 +1160,19 @@ static HRESULT WINAPI HTMLElementCollect VARIANT tagName, IDispatch **pdisp) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - DWORD size = 8, len = 0, i; - HTMLElement **elem_list; + DWORD i; nsAString tag_str; const PRUnichar *tag; + elem_vector buf = {NULL, 0, 8}; if(V_VT(&tagName) != VT_BSTR) { WARN("Invalid arg\n"); - return E_INVALIDARG; + return DISP_E_MEMBERNOTFOUND; } TRACE("(%p)->(%s %p)\n", This, debugstr_w(V_BSTR(&tagName)), pdisp); - elem_list = HeapAlloc(GetProcessHeap(), 0, size*sizeof(HTMLElement*)); + buf.buf = HeapAlloc(GetProcessHeap(), 0, buf.size*sizeof(HTMLElement*)); nsAString_Init(&tag_str, NULL); @@ -1176,28 +1184,22 @@ static HRESULT WINAPI HTMLElementCollect nsAString_GetData(&tag_str, &tag, NULL); if(CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, tag, -1, - V_BSTR(&tagName), -1) == CSTR_EQUAL) { - if(len == size) { - size <<= 2; - elem_list = HeapReAlloc(GetProcessHeap(), 0, elem_list, size); - } - - elem_list[len++] = This->elems[i]; - } + V_BSTR(&tagName), -1) == CSTR_EQUAL) + elem_vector_add(&buf, This->elems[i]); } nsAString_Finish(&tag_str); - TRACE("fount %ld tags\n", len); + TRACE("fount %ld tags\n", buf.len); - if(!len) { - HeapFree(GetProcessHeap(), 0, elem_list); - elem_list = NULL; - }else if(size > len) { - HeapReAlloc(GetProcessHeap(), 0, elem_list, len); + if(!buf.len) { + HeapFree(GetProcessHeap(), 0, buf.buf); + buf.buf = NULL; + }else if(buf.size > buf.len) { + buf.buf = HeapReAlloc(GetProcessHeap(), 0, buf.buf, buf.len); } - return HTMLElementCollection_Create(This->ref_unk, elem_list, len, pdisp); + return HTMLElementCollection_Create(This->ref_unk, buf.buf, buf.len, pdisp); } #undef ELEMCOL_THIS

1 0

Mike McCormack : wine.inf: Add a shdocvw. dll stub dll to the system directory.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: c3c112de231fae2f28d3f685c341a204ddef26a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3c112de231fae2f28d3f68… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 23:46:31 2006 +0900 wine.inf: Add a shdocvw.dll stub dll to the system directory. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 747eb83..17d9144 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2114,6 +2114,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,help.exe,winhelp.exe 11,,msiexec.exe 11,,notepad.exe +11,,shdocvw.dll 11,,progman.exe 11,,regsvr32.exe 11,,wcmd.exe

1 0

Mike McCormack : msi: Add stub for the RegisterComPlus and UnregisterComPlus actions.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 886036696afbed3167e2dda32f6ca98b63fb1c23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=886036696afbed3167e2dda… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 23:01:56 2006 +0900 msi: Add stub for the RegisterComPlus and UnregisterComPlus actions. --- dlls/msi/action.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6501031..66d75f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4276,6 +4276,18 @@ static UINT ACTION_RMCCPSearch( MSIPACKA return msi_unimplemented_action_stub( package, "RMCCPSearch", table ); } +static UINT ACTION_RegisterComPlus( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','o','m','p','l','u','s',0 }; + return msi_unimplemented_action_stub( package, "RegisterComPlus", table ); +} + +static UINT ACTION_UnregisterComPlus( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','o','m','p','l','u','s',0 }; + return msi_unimplemented_action_stub( package, "UnregisterComPlus", table ); +} + static struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, @@ -4314,7 +4326,7 @@ static struct _actions StandardActions[] { szPublishFeatures, ACTION_PublishFeatures }, { szPublishProduct, ACTION_PublishProduct }, { szRegisterClassInfo, ACTION_RegisterClassInfo }, - { szRegisterComPlus, NULL}, + { szRegisterComPlus, ACTION_RegisterComPlus}, { szRegisterExtensionInfo, ACTION_RegisterExtensionInfo }, { szRegisterFonts, ACTION_RegisterFonts }, { szRegisterMIMEInfo, ACTION_RegisterMIMEInfo }, @@ -4342,7 +4354,7 @@ static struct _actions StandardActions[] { szUnpublishComponents, NULL}, { szUnpublishFeatures, NULL}, { szUnregisterClassInfo, NULL}, - { szUnregisterComPlus, NULL}, + { szUnregisterComPlus, ACTION_UnregisterComPlus}, { szUnregisterExtensionInfo, NULL}, { szUnregisterFonts, ACTION_UnregisterFonts }, { szUnregisterMIMEInfo, NULL},

1 0

Mike McCormack : msi: Don't crash when logging a record with only one field .
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: e1fdf3e24c977f71b83a43650bcc57d6c7be089d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1fdf3e24c977f71b83a436… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 21:39:36 2006 +0900 msi: Don't crash when logging a record with only one field. --- dlls/msi/package.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index eb486ac..24a23d6 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -615,26 +615,27 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART) { static const WCHAR template_s[]= - {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ', '%','s', - '.',0}; + {'A','c','t','i','o','n',' ','%','s',':',' ','%','s','.',' ',0}; static const WCHAR format[] = {'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0}; WCHAR timet[0x100]; - LPCWSTR action_text; - LPCWSTR action; - LPWSTR deformated; + LPCWSTR action_text, action; + LPWSTR deformatted = NULL; GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, format, timet, 0x100); action = MSI_RecordGetString(record, 1); action_text = MSI_RecordGetString(record, 2); - deformat_string(package, action_text, &deformated); + deformat_string(package, action_text, &deformatted); - len = strlenW(timet) + strlenW(action) + strlenW(deformated) + - strlenW(template_s) - 6 /* 6 characters of format specifier */; - message = msi_alloc((len + 1)*sizeof(WCHAR)); - sprintfW(message,template_s,timet,action,deformated); - msi_free(deformated); + len = strlenW(timet) + strlenW(action) + strlenW(template_s); + if (deformatted) + len += strlenW(deformatted); + message = msi_alloc(len*sizeof(WCHAR)); + sprintfW(message, template_s, timet, action); + if (deformatted) + strcatW(message, deformatted); + msi_free(deformatted); } else {

1 0

Alexandre Julliard : server: New scheme for cleaning up objects on server exit.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b00fb174f6b8ae8940f37c1229040a3cca84de74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b00fb174f6b8ae8940f37c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 20:32:04 2006 +0100 server: New scheme for cleaning up objects on server exit. Objects stored in static variables can now be marked when they are created and are automatically cleaned up on exit. This avoids having to export a bunch of close_* functions. --- server/directory.c | 35 +++++++++++------------------------ server/handle.c | 11 +---------- server/handle.h | 2 -- server/mailslot.c | 4 ++-- server/named_pipe.c | 5 ++--- server/object.c | 36 +++++++++++++++++++++++++++++++++++- server/object.h | 11 ++++------- server/registry.c | 19 ++++--------------- server/request.c | 15 +++------------ server/signal.c | 14 ++------------ 10 files changed, 64 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b00fb174f6b8ae8940f…

1 0

James Hawkins : advpack: Forward TranslateInfStringExA to its unicode counterpart.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: b877d84af0dd2e0b444294f0f1fd2403660a6961 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b877d84af0dd2e0b444294f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Mar 21 13:32:37 2006 -0600 advpack: Forward TranslateInfStringExA to its unicode counterpart. --- dlls/advpack/advpack.c | 77 ++++++++++++++++++++++++++++++++++++++++----- dlls/advpack/advpack.spec | 2 + 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b863bce..460f72d 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -541,6 +541,67 @@ HRESULT WINAPI TranslateInfStringW(LPCWS /*********************************************************************** * TranslateInfStringExA (ADVPACK.@) * + * See TranslateInfStringExW. + */ +HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, + LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, + LPSTR pszBuffer, DWORD dwBufferSize, + PDWORD pdwRequiredSize, PVOID pvReserved) +{ + UNICODE_STRING filenameW, sectionW, keyW; + LPWSTR bufferW; + HRESULT res; + DWORD len = 0; + + TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), + debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + + if (!pszInfFilename || !pszTranslateSection || + !pszTranslateKey || !pdwRequiredSize) + return E_INVALIDARG; + + RtlCreateUnicodeStringFromAsciiz(&filenameW, pszInfFilename); + RtlCreateUnicodeStringFromAsciiz(&sectionW, pszTranslateSection); + RtlCreateUnicodeStringFromAsciiz(&keyW, pszTranslateKey); + + res = TranslateInfStringExW(hInf, filenameW.Buffer, sectionW.Buffer, + keyW.Buffer, NULL, 0, &len, NULL); + + if (res == S_OK) + { + bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + + res = TranslateInfStringExW(hInf, filenameW.Buffer, sectionW.Buffer, + keyW.Buffer, bufferW, len, &len, NULL); + + if (res == S_OK) + { + *pdwRequiredSize = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, + NULL, 0, NULL, NULL); + + if (dwBufferSize >= *pdwRequiredSize) + { + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, pszBuffer, + dwBufferSize, NULL, NULL); + } + else + res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + + HeapFree(GetProcessHeap(), 0, bufferW); + } + + RtlFreeUnicodeString(&filenameW); + RtlFreeUnicodeString(&sectionW); + RtlFreeUnicodeString(&keyW); + + return res; +} + +/*********************************************************************** + * TranslateInfStringExW (ADVPACK.@) + * * Using a handle to an INF file opened with OpenINFEngine, translates * the value of a specified key in an inf file into the current locale * by expanding string macros. @@ -567,19 +628,19 @@ HRESULT WINAPI TranslateInfStringW(LPCWS * than calling TranslateInfString, because the INF file is only * opened once. */ -HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, - LPCSTR pszTranslateSection, LPCSTR pszTranslateKey, - LPSTR pszBuffer, DWORD dwBufferSize, - PDWORD pdwRequiredSize, PVOID pvReserved) +HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, + LPCWSTR pszTranslateSection, LPCWSTR pszTranslateKey, + LPWSTR pszBuffer, DWORD dwBufferSize, + PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, pszInfFilename, - pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, - pdwRequiredSize, pvReserved); + TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), + debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG; - if (!SetupGetLineTextA(NULL, hInf, pszTranslateSection, pszTranslateKey, + if (!SetupGetLineTextW(NULL, hInf, pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index ae939b5..7ddd412 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -72,7 +72,7 @@ @ stdcall TranslateInfStringW(wstr wstr wstr wstr ptr long ptr ptr) @ stdcall TranslateInfString(str str str str ptr long ptr ptr) TranslateInfStringA @ stdcall TranslateInfStringExA(long str str str str long ptr ptr) -# stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) +@ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall UserInstStubWrapperA(long long str long) # stdcall UserInstStubWrapperW(long long wstr long)

1 0

James Hawkins : advpack: Add second null for double null terminated lists.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 396242faa75358be27e372251a0ed6e1a596dc6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=396242faa75358be27e3722… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Mar 21 14:05:41 2006 -0600 advpack: Add second null for double null terminated lists. --- dlls/advpack/tests/files.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 8a62b4c..f492911 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -146,7 +146,7 @@ static void test_AddDelBackupEntry() lstrcatA(path, "\\backup\\.INI"); /* try an empty base name */ - res = pAddDelBackupEntry("one\0two\0three", "backup", "", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!DeleteFileA(path), "Expected path to not exist\n"); @@ -154,14 +154,14 @@ static void test_AddDelBackupEntry() lstrcatA(path, "\\basename.INI"); /* try an invalid flag */ - res = pAddDelBackupEntry("one\0two\0three", NULL, "basename", 0); + res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", 0); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!DeleteFileA(path), "Expected path to not exist\n"); lstrcpyA(path, "c:\\basename.INI"); /* create the INF file */ - res = pAddDelBackupEntry("one\0two\0three", "c:\\", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); @@ -172,7 +172,7 @@ static void test_AddDelBackupEntry() /* try to create the INI file in a nonexistent directory */ RemoveDirectoryA("backup"); - res = pAddDelBackupEntry("one\0two\0three", "backup", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(!check_ini_file_attr(path), "Expected ini file to not be hidden\n"); ok(!check_ini_contents(path, TRUE), "Expected ini contents to not match\n"); @@ -180,7 +180,7 @@ static void test_AddDelBackupEntry() /* try an existent, relative backup directory */ CreateDirectoryA("backup", NULL); - res = pAddDelBackupEntry("one\0two\0three", "backup", "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_file_attr(path), "Expected ini file to be hidden\n"); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); @@ -190,13 +190,13 @@ static void test_AddDelBackupEntry() lstrcpyA(path, "c:\\windows\\basename.INI"); /* try a NULL backup dir, INI is created in c:\windows */ - res = pAddDelBackupEntry("one\0two\0three", NULL, "basename", AADBE_ADD_ENTRY); + res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n"); /* remove the entries with AADBE_DEL_ENTRY */ SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); - res = pAddDelBackupEntry("one\0three", NULL, "basename", AADBE_DEL_ENTRY); + res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %ld\n", res); ok(check_ini_contents(path, FALSE), "Expected ini contents to match\n");

1 0

Mike McCormack : msi: Show "hidden dialogs" but hide them initially.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 06c84c4a42092a009dbab444e19ec94aa67d5536 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06c84c4a42092a009dbab44… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 14:06:30 2006 +0900 msi: Show "hidden dialogs" but hide them initially. --- dlls/msi/dialog.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 69909a7..ffbd6b8 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1931,7 +1931,6 @@ static LRESULT msi_dialog_oncreate( HWND SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW ); - msi_dialog_build_font_list( dialog ); msi_dialog_fill_controls( dialog ); msi_dialog_evaluate_control_conditions( dialog ); @@ -2351,16 +2350,18 @@ void msi_dialog_check_messages( HANDLE h UINT msi_dialog_run_message_loop( msi_dialog *dialog ) { + DWORD style; HWND hwnd; - if( !(dialog->attributes & msidbDialogAttributesVisible) ) - return ERROR_SUCCESS; - if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - hwnd = CreateWindowW( szMsiDialogClass, dialog->name, WS_OVERLAPPEDWINDOW, + style = WS_OVERLAPPED; + if( dialog->attributes & msidbDialogAttributesVisible ) + style |= WS_VISIBLE; + + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog ); if( !hwnd )

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006