May 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : secur32: Fix some wrong assumptions in the NTLM test case, make it pass in XP SP2 and Wine.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: d89a038287e24a70f99459b8e86d26888a17dabf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d89a038287e24a70f99459b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:52:58 2006 +0900 secur32: Fix some wrong assumptions in the NTLM test case, make it pass in XP SP2 and Wine. --- dlls/secur32/ntlm.c | 38 +++++++----- dlls/secur32/secur32.c | 14 +--- dlls/secur32/secur32_priv.h | 11 +-- dlls/secur32/tests/main.c | 141 ++++++++++++++++++++++++++++++------------- 4 files changed, 124 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d89a038287e24a70f99…

1 0

Dmitry Timoshkov : Add a stub implementation of mprapi.dll.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: d30975d57619a7cca712bea4ea4d53cf6bad80a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d30975d57619a7cca712bea… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 27 20:52:12 2006 +0900 Add a stub implementation of mprapi.dll. --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 5 ++ dlls/mprapi/.gitignore | 2 + dlls/mprapi/Makefile.in | 14 +++++ dlls/mprapi/mprapi.c | 52 +++++++++++++++++++ dlls/mprapi/mprapi.spec | 132 +++++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 include/mprapi.h | 35 ++++++++++++ 9 files changed, 244 insertions(+), 1 deletions(-) create mode 100644 dlls/mprapi/.gitignore create mode 100644 dlls/mprapi/Makefile.in create mode 100644 dlls/mprapi/mprapi.c create mode 100644 dlls/mprapi/mprapi.spec create mode 100644 include/mprapi.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d30975d57619a7cca71…

1 0

Bill Medland : wpp: Support long long constants if configure says long long is available
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 427e488ba100bb8d4cbe5ddcd8c91cc856480a6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=427e488ba100bb8d4cbe5dd… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Thu Apr 27 07:52:37 2006 -0700 wpp: Support long long constants if configure says long long is available --- libs/wpp/ppl.l | 3 ++- libs/wpp/wpp_private.h | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 990fbb1..409706e 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -156,6 +156,7 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -823,7 +824,7 @@ static int make_number(int radix, YYSTYP if(is_ll) { /* Assume as in the declaration of wrc_ull_t and wrc_sll_t */ -#if defined(SIZEOF_LONGLONG) && SIZEOF_LONGLONG >= 8 +#ifdef HAVE_LONG_LONG if (is_u) { val->ull = strtoull(str, NULL, radix); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index fe60f65..d8a752a 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -20,6 +20,10 @@ #ifndef __WINE_WPP_PRIVATE_H #define __WINE_WPP_PRIVATE_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + #include <stdio.h> #include <string.h> @@ -133,14 +137,16 @@ typedef struct /* - * I assume that 'long long' exists in the compiler when it has a size - * of 8 or bigger. If not, then we revert to a simple 'long' for now. + * If the configure says we have long long then we can use it. Presumably + * if we have long long then we have strtoull and strtoll too. If that is + * not the case we will need to add to the configure tests. + * If we do not have long long , then we revert to a simple 'long' for now. * This should prevent most unexpected things with other compilers than * gcc and egcs for now. * In the future it should be possible to use another way, like a * structure, so that we can emulate the MS compiler. */ -#if defined(SIZEOF_LONGLONG) && SIZEOF_LONGLONG >= 8 +#ifdef HAVE_LONG_LONG typedef long long wrc_sll_t; typedef unsigned long long wrc_ull_t; #else

1 0

Vitaly Lipatov : user: tests: Change INPUT to TEST_INPUT, fix union usage.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 959a84208aef65d8c5ded10c0d0d92287e30d50c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=959a84208aef65d8c5ded10… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Apr 27 12:23:18 2006 +0400 user: tests: Change INPUT to TEST_INPUT, fix union usage. --- dlls/user/tests/input.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user/tests/input.c b/dlls/user/tests/input.c index 7f41525..a6e0389 100644 --- a/dlls/user/tests/input.c +++ b/dlls/user/tests/input.c @@ -475,7 +475,7 @@ static LRESULT CALLBACK WndProc2(HWND hW static void test_Input_blackbox(void) { - INPUT i; + TEST_INPUT i; int ii; BYTE ks1[256], ks2[256]; LONG_PTR prevWndProc; @@ -495,16 +495,16 @@ static void test_Input_blackbox(void) "error: %d\n", (int) GetLastError()); i.type = INPUT_KEYBOARD; - i.ki.wScan = 0; - i.ki.time = 0; - i.ki.dwExtraInfo = 0; + i.u.ki.wScan = 0; + i.u.ki.time = 0; + i.u.ki.dwExtraInfo = 0; for (ii = 0; ii < sizeof(sendinput_test)/sizeof(struct sendinput_test_s)-1; ii++) { GetKeyboardState(ks1); - i.ki.dwFlags = sendinput_test[ii].dwFlags; - i.ki.wVk = sendinput_test[ii].wVk; - SendInput(1, &i, sizeof(INPUT)); + i.u.ki.dwFlags = sendinput_test[ii].dwFlags; + i.u.ki.wVk = sendinput_test[ii].wVk; + SendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); compare_and_check(ii, ks1, ks2,

1 0

Roderick Colenbrander : wined3d: Vertex Shader regtype cleanups.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: c4eff1eb4459207149520e26898b919d02530440 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4eff1eb4459207149520e2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 23 17:14:13 2006 +0200 wined3d: Vertex Shader regtype cleanups. --- dlls/wined3d/vertexshader.c | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 7cd05e3..f4056a8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -707,12 +707,17 @@ inline static const SHADER_OPCODE* vshad return NULL; } +inline static int vshader_program_get_regtype(const DWORD param) { + return (((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | + ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2)); +} + inline static void vshader_program_dump_param(const DWORD param, int input) { static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char swizzle_reg_chars[] = "xyzw"; DWORD reg = param & D3DSP_REGNUM_MASK; - DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); + DWORD regtype = vshader_program_get_regtype(param); if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) TRACE("-"); @@ -781,18 +786,9 @@ inline static void vshader_program_dump_ inline static void vshader_program_dump_vs_param(const DWORD param, int input) { static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char swizzle_reg_chars[] = "xyzw"; - /* the unknown mask is for bits not yet accounted for by any other mask... */ -#define UNKNOWN_MASK 0xC000 - - /* for registeres about 7 we have to add on bits 11 and 12 to get the correct register */ -#define EXTENDED_REG 0x1800 DWORD reg = param & D3DSP_REGNUM_MASK; - DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | ((param & EXTENDED_REG) >> 8); - - if(param & UNKNOWN_MASK) { /* if this register has any of the unknown bits set then report them*/ - FIXME("Unknown bits set regtype %lx , %lx, UK(%lx)\n", regtype, (param & EXTENDED_REG), param & UNKNOWN_MASK); - } + DWORD regtype = vshader_program_get_regtype(param); if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) TRACE("-"); @@ -875,9 +871,7 @@ #define EXTENDED_REG 0x1800 inline static void vshader_program_dump_decl_usage( IWineD3DVertexShaderImpl *This, DWORD decl, DWORD param) { - - DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | - ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2); + DWORD regtype = vshader_program_get_regtype(param); TRACE("dcl_"); @@ -1023,7 +1017,7 @@ inline static void vshader_program_add_p static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", "result.pointsize" }; DWORD reg = param & D3DSP_REGNUM_MASK; - DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); + DWORD regtype = vshader_program_get_regtype(param); char tmpReg[255]; BOOL is_color = FALSE; @@ -1362,7 +1356,7 @@ #define PNSTRCAT(_pgmStr, _tmpLine) { \ } else { /* Check to see if and tmp or addressing redisters are used */ if (curOpcode->num_params > 0) { - regtype = ((((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT)); + regtype = vshader_program_get_regtype(*pToken); reg = ((*pToken) & D3DSP_REGNUM_MASK); if (D3DSPR_ADDR == regtype && nUseAddressRegister <= reg) nUseAddressRegister = reg + 1; if (D3DSPR_TEMP == regtype){ @@ -1371,7 +1365,7 @@ #define PNSTRCAT(_pgmStr, _tmpLine) { \ } ++pToken; for (i = 1; i < curOpcode->num_params; ++i) { - regtype = ((((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT)); + regtype = vshader_program_get_regtype(*pToken); reg = ((*pToken) & D3DSP_REGNUM_MASK); if (D3DSPR_ADDR == regtype && nUseAddressRegister <= reg) nUseAddressRegister = reg + 1; if (D3DSPR_TEMP == regtype){ @@ -1645,7 +1639,7 @@ #endif continue; case D3DSIO_MOV: /* Address registers must be loaded with the ARL instruction */ - if ((((*pToken) & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) == D3DSPR_ADDR) { + if (vshader_program_get_regtype(*pToken) == D3DSPR_ADDR) { if (((*pToken) & D3DSP_REGNUM_MASK) < nUseAddressRegister) { strcpy(tmpLine, "ARL"); break; @@ -1840,9 +1834,9 @@ #endif /* TRACE(">> execting opcode: pos=%d opcode_name=%s token=%08lX\n", pToken - vshader->function, curOpcode->name, *pToken); */ for (i = 0; i < curOpcode->num_params; ++i) { DWORD reg = pToken[i] & D3DSP_REGNUM_MASK; - DWORD regtype = ((pToken[i] & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); + DWORD regtype = vshader_program_get_regtype(pToken[i]); - switch (regtype << D3DSP_REGTYPE_SHIFT) { + switch (regtype /*<< D3DSP_REGTYPE_SHIFT*/) { case D3DSPR_TEMP: /* TRACE("p[%d]=R[%d]\n", i, reg); */ p[i] = &R[reg];

1 0

Dan Kegel : msi: Fix missing case in MsiSourceListAddSourceEx.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 35f9a4797f52ae5e697c096015a9bafdd6a2c52e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35f9a4797f52ae5e697c096… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Apr 22 11:31:12 2006 -0700 msi: Fix missing case in MsiSourceListAddSourceEx. --- dlls/msi/source.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 779bbc4..cb73ec8 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -499,6 +499,8 @@ UINT WINAPI MsiSourceListAddSourceExW( L rc = OpenNetworkSubkey(sourcekey, &typekey, TRUE); else if (dwOptions & MSISOURCETYPE_URL) rc = OpenURLSubkey(sourcekey, &typekey, TRUE); + else if (dwOptions & MSISOURCETYPE_MEDIA) + rc = OpenMediaSubkey(sourcekey, &typekey, TRUE); else { ERR("unknown media type: %08lx\n", dwOptions);

1 0

James Hawkins : ole32: StorageImpl_GetROBigBlock can return NULL so check for NULL before doing a memcpy .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 2b5963f8e2959e8c4a6735cb70e1489503539ac1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b5963f8e2959e8c4a6735c… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:16:41 2006 -0500 ole32: StorageImpl_GetROBigBlock can return NULL so check for NULL before doing a memcpy. --- dlls/ole32/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5e6696c..a3f21d5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4493,6 +4493,8 @@ BOOL BlockChainStream_ReadAt(BlockChainS */ bigBlockBuffer = StorageImpl_GetROBigBlock(This->parentStorage, blockIndex); + if (!bigBlockBuffer) + return FALSE; memcpy(bufferWalker, bigBlockBuffer + offsetInBlock, bytesToReadInBuffer);

1 0

James Hawkins : advpack: Implement the DelDirs command.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 72e279bd364e5e4044a64ace8a1405af7d58e88a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=72e279bd364e5e4044a64ac… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:09:08 2006 -0500 advpack: Implement the DelDirs command. --- dlls/advpack/install.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 2901093..c65a7e2 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -60,6 +60,7 @@ typedef HRESULT (*iterate_fields_func)(H static const WCHAR CheckAdminRights[] = { 'C','h','e','c','k','A','d','m','i','n','R','i','g','h','t','s',0 }; +static const WCHAR DelDirs[] = {'D','e','l','D','i','r','s',0}; static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; static const WCHAR RunPreSetupCommands[] = { @@ -70,6 +71,29 @@ static const WCHAR RunPostSetupCommands[ }; /* Advanced INF callbacks */ +static HRESULT del_dirs_callback(HINF hinf, PCWSTR field, void *arg) +{ + INFCONTEXT context; + HRESULT hr = S_OK; + DWORD size; + + BOOL ok = SetupFindFirstLineW(hinf, field, NULL, &context); + + for (; ok; ok = SetupFindNextLine(&context, &context)) + { + WCHAR directory[MAX_INF_STRING_LENGTH]; + + if (!SetupGetLineTextW(&context, NULL, NULL, NULL, directory, + MAX_INF_STRING_LENGTH, &size)) + continue; + + if (DelNodeW(directory, 0)) + hr = E_FAIL; + } + + return hr; +} + static HRESULT per_user_install_callback(HINF hinf, PCWSTR field, void *arg) { PERUSERSECTIONW per_user; @@ -340,6 +364,11 @@ static HRESULT adv_install(ADVInfo *info if (hr != S_OK) return hr; + hr = iterate_section_fields(info->hinf, info->install_sec, + DelDirs, del_dirs_callback, info); + if (hr != S_OK) + return hr; + return hr; }

1 0

James Hawkins : advpack: Implement the CheckAdminRights option.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 4df237312aee12f645795130b253f1dc38f6787e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4df237312aee12f64579513… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:08:35 2006 -0500 advpack: Implement the CheckAdminRights option. --- dlls/advpack/install.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 25f6205..2901093 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -57,6 +57,9 @@ typedef struct _ADVInfo typedef HRESULT (*iterate_fields_func)(HINF hinf, PCWSTR field, void *arg); /* Advanced INF commands */ +static const WCHAR CheckAdminRights[] = { + 'C','h','e','c','k','A','d','m','i','n','R','i','g','h','t','s',0 +}; static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; static const WCHAR RunPreSetupCommands[] = { @@ -254,6 +257,25 @@ static HRESULT iterate_section_fields(HI return hr; } +static HRESULT check_admin_rights(ADVInfo *info) +{ + INT check; + INFCONTEXT context; + HRESULT hr = S_OK; + + if (!SetupFindFirstLineW(info->hinf, info->install_sec, + CheckAdminRights, &context)) + return S_OK; + + if (!SetupGetIntField(&context, 1, &check)) + return S_OK; + + if (check == 1) + hr = IsNTAdmin(0, NULL) ? S_OK : E_FAIL; + + return hr; +} + /* performs a setupapi-level install of the INF file */ static HRESULT spapi_install(ADVInfo *info) { @@ -294,6 +316,10 @@ static HRESULT adv_install(ADVInfo *info { HRESULT hr; + hr = check_admin_rights(info); + if (hr != S_OK) + return hr; + hr = iterate_section_fields(info->hinf, info->install_sec, RunPreSetupCommands, run_setup_commands_callback, info); if (hr != S_OK)

1 0

James Hawkins : advpack: Implement the RunPreSetupCommands command.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: c9cff908cec08cce28481a80cb04474ba59a3222 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9cff908cec08cce28481a8… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 28 20:08:10 2006 -0500 advpack: Implement the RunPreSetupCommands command. --- dlls/advpack/install.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 8c44f94..25f6205 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -59,6 +59,9 @@ typedef HRESULT (*iterate_fields_func)(H /* Advanced INF commands */ static const WCHAR PerUserInstall[] = {'P','e','r','U','s','e','r','I','n','s','t','a','l','l',0}; static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; +static const WCHAR RunPreSetupCommands[] = { + 'R','u','n','P','r','e','S','e','t','u','p','C','o','m','m','a','n','d','s',0 +}; static const WCHAR RunPostSetupCommands[] = { 'R','u','n','P','o','s','t','S','e','t','u','p','C','o','m','m','a','n','d','s',0 }; @@ -140,7 +143,7 @@ static HRESULT register_ocxs_callback(HI return hr; } -static HRESULT run_post_setup_commands_callback(HINF hinf, PCWSTR field, void *arg) +static HRESULT run_setup_commands_callback(HINF hinf, PCWSTR field, void *arg) { ADVInfo *info = (ADVInfo *)arg; INFCONTEXT context; @@ -291,6 +294,11 @@ static HRESULT adv_install(ADVInfo *info { HRESULT hr; + hr = iterate_section_fields(info->hinf, info->install_sec, RunPreSetupCommands, + run_setup_commands_callback, info); + if (hr != S_OK) + return hr; + hr = iterate_section_fields(info->hinf, info->install_sec, RegisterOCXs, register_ocxs_callback, NULL); if (hr != S_OK) @@ -302,7 +310,7 @@ static HRESULT adv_install(ADVInfo *info return hr; hr = iterate_section_fields(info->hinf, info->install_sec, RunPostSetupCommands, - run_post_setup_commands_callback, info); + run_setup_commands_callback, info); if (hr != S_OK) return hr;

1 0