wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Juan Lang : wincrypt: Add missing message flags and parameters.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: c56177a8e945f76d15a67d7b55b23eb2275d1a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56177a8e945f76d15a67d7b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 10:07:57 2007 -0700 wincrypt: Add missing message flags and parameters. --- include/wincrypt.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index f4a15da..4dfbf27 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3127,6 +3127,8 @@ typedef struct _CMSG_ENCRYPTED_ENCODE_INFO #define CMSG_AUTHENTICATED_ATTRIBUTES_FLAG 0x00000008 #define CMSG_CONTENTS_OCTETS_FLAG 0x00000010 #define CMSG_MAX_LENGTH_FLAG 0x00000020 +#define CMSG_CMS_ENCAPSULATED_CONTENT_FLAG 0x00000040 +#define CMSG_CRYPT_RELEASE_CONTEXT_FLAG 0x00008000 #define CMSG_CTRL_VERIFY_SIGNATURE 1 #define CMSG_CTRL_DECRYPT 2 @@ -3189,6 +3191,16 @@ typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA #define CMSG_ENCRYPTED_DIGEST 27 #define CMSG_ENCODED_SIGNER 28 #define CMSG_ENCODED_MESSAGE 29 +#define CMSG_VERSION_PARAM 30 +#define CMSG_ATTR_CERT_COUNT_PARAM 31 +#define CMSG_ATTR_CERT_PARAM 32 +#define CMSG_CMS_RECIPIENT_COUNT_PARAM 33 +#define CMSG_CMS_RECIPIENT_INDEX_PARAM 34 +#define CMSG_CMS_RECIPIENT_ENCRYPTED_KEY_INDEX_PARAM 35 +#define CMSG_CMS_RECIPIENT_INFO_PARAM 36 +#define CMSG_UNPROTECTED_ATTR_PARAM 37 +#define CMSG_SIGNER_CERT_ID_PARAM 38 +#define CMSG_CMS_SIGNER_INFO_PARAM 39 /* function declarations */ /* advapi32.dll */

1 0

Rob Shearman : wine.inf: Add the SystemDrive environment variable.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: d35da93f218cfeae7061538b35a17d9303f09d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35da93f218cfeae7061538b3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jun 29 09:11:32 2007 +0100 wine.inf: Add the SystemDrive environment variable. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 78ced6d..30e7ee0 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -254,6 +254,7 @@ HKLM,Software\Microsoft\DirectPlay\Service Providers\Serial Connection For Direc HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ComSpec",,"%11%\cmd.exe" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"PATH",2,"%11%;%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"ProgramFiles",,"%16422%" +HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"SYSTEMROOT",,"%10%" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TEMP",,"%10%\temp" HKLM,System\CurrentControlSet\Control\Session Manager\Environment,"TMP",,"%10%\temp"

1 0

Misha Koshelev : winemenubuilder: Do not WINE_ERR in InvokeShellLinker if we are going to try again.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: a5a049da5aa61cbd6f196d6c46e9c7791163103b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a049da5aa61cbd6f196d6c4… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Jun 28 19:47:59 2007 -0500 winemenubuilder: Do not WINE_ERR in InvokeShellLinker if we are going to try again. --- programs/winemenubuilder/winemenubuilder.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index a8ee4b1..c253a85 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -993,13 +993,10 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_path ); HeapFree( GetProcessHeap(), 0, escaped_description ); - if (r) - { + if (r && !bWait) WINE_ERR("failed to fork and exec wineshelllink\n" ); - return FALSE; - } - return TRUE; + return ( r == 0 ); } static BOOL WaitForParentProcess( void )

1 0

James Hawkins : msi: Ignore invalid conditional expressions when checking the launch conditions .
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: bafc4dc3854f59ec0e07aaa202a260c3cf56c5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafc4dc3854f59ec0e07aaa20… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 28 15:38:58 2007 -0700 msi: Ignore invalid conditional expressions when checking the launch conditions. --- dlls/msi/action.c | 21 +++++++++---- dlls/msi/tests/package.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b550e54..cc2583d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2512,19 +2512,26 @@ static UINT ITERATE_LaunchConditions(MSIRECORD *row, LPVOID param) MSIPACKAGE* package = (MSIPACKAGE*)param; LPCWSTR cond = NULL; LPCWSTR message = NULL; + UINT r; + static const WCHAR title[]= {'I','n','s','t','a','l','l',' ','F','a', 'i','l','e','d',0}; cond = MSI_RecordGetString(row,1); - if (MSI_EvaluateConditionW(package,cond) != MSICONDITION_TRUE) + r = MSI_EvaluateConditionW(package,cond); + if (r == MSICONDITION_FALSE) { - LPWSTR deformated; - message = MSI_RecordGetString(row,2); - deformat_string(package,message,&deformated); - MessageBoxW(NULL,deformated,title,MB_OK); - msi_free(deformated); - return ERROR_FUNCTION_FAILED; + if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + { + LPWSTR deformated; + message = MSI_RecordGetString(row,2); + deformat_string(package,message,&deformated); + MessageBoxW(NULL,deformated,title,MB_OK); + msi_free(deformated); + } + + return ERROR_INSTALL_FAILURE; } return ERROR_SUCCESS; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1a83724..2844a26 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -147,6 +147,15 @@ static UINT create_signature_table( MSIHANDLE hdb ) "PRIMARY KEY `Signature`)" ); } +static UINT create_launchcondition_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `LaunchCondition` (" + "`Condition` CHAR(255) NOT NULL, " + "`Description` CHAR(255) NOT NULL " + "PRIMARY KEY `Condition`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -259,6 +268,22 @@ static UINT add_signature_entry( MSIHANDLE hdb, const char *values ) return r; } +static UINT add_launchcondition_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `LaunchCondition` " + "(`Condition`, `Description`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT set_summary_info(MSIHANDLE hdb) { UINT res; @@ -3229,6 +3254,50 @@ static void test_prop_path(void) DeleteFile(msifile); } +static void test_launchconditions(void) +{ + MSIHANDLE hpkg; + MSIHANDLE hdb; + UINT r; + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + hdb = create_package_db(); + ok( hdb, "failed to create package database\n" ); + + r = create_launchcondition_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create LaunchCondition table: %d\n", r ); + + r = add_launchcondition_entry( hdb, "'X = \"1\"', 'one'" ); + ok( r == ERROR_SUCCESS, "cannot add launch condition: %d\n", r ); + + /* invalid condition */ + r = add_launchcondition_entry( hdb, "'X != \"1\"', 'one'" ); + ok( r == ERROR_SUCCESS, "cannot add launch condition: %d\n", r ); + + hpkg = package_from_db( hdb ); + ok( hpkg, "failed to create package\n"); + + MsiCloseHandle( hdb ); + + r = MsiSetProperty( hpkg, "X", "1" ); + ok( r == ERROR_SUCCESS, "failed to set property\n" ); + + /* invalid conditions are ignored */ + r = MsiDoAction( hpkg, "LaunchConditions" ); + ok( r == ERROR_SUCCESS, "cost init failed\n" ); + + /* verify LaunchConditions still does some verification */ + r = MsiSetProperty( hpkg, "X", "2" ); + ok( r == ERROR_SUCCESS, "failed to set property\n" ); + + r = MsiDoAction( hpkg, "LaunchConditions" ); + ok( r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %d\n", r ); + + MsiCloseHandle( hpkg ); + DeleteFile( msifile ); +} + START_TEST(package) { test_createpackage(); @@ -3250,4 +3319,5 @@ START_TEST(package) test_installprops(); test_sourcedirprop(); test_prop_path(); + test_launchconditions(); }

1 0

James Hawkins : msi: Add tests that show '!=' is not a valid conditional expression operator.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 219857f831616811aa36275d1c6c0098b4ce6a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=219857f831616811aa36275d1… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 28 15:11:26 2007 -0700 msi: Add tests that show '!=' is not a valid conditional expression operator. --- dlls/msi/tests/package.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index be1ff7e..1a83724 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1329,6 +1329,29 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "one < \"1\""); ok( r == MSICONDITION_FALSE, "wrong return val\n"); + MsiSetProperty(hpkg, "X", "5.0"); + + r = MsiEvaluateCondition(hpkg, "X != \"\""); + ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "X =\"5.0\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "X =\"5.1\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "X =\"6.0\""); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "X =\"5.0\" or X =\"5.1\" or X =\"6.0\""); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "(X =\"5.0\" or X =\"5.1\" or X =\"6.0\")"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "X !=\"\" and (X =\"5.0\" or X =\"5.1\" or X =\"6.0\")"); + ok( r == MSICONDITION_ERROR, "wrong return val (%d)\n", r); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Michael Stefaniuc : comctl32: Replace malloc() with HeapAlloc().
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: ff01912a484f0907b9562d5bf93569144ba4a72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff01912a484f0907b9562d5bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 28 23:00:54 2007 +0200 comctl32: Replace malloc() with HeapAlloc(). --- dlls/comctl32/tests/comboex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 8943d82..f4d8fc8 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -82,7 +82,7 @@ static void test_comboboxex(void) { out_of_range_item[] = {'O','u','t',' ','o','f',' ','R','a','n','g','e',' ','I','t','e','m',0}; /* Allocate space for result */ - textBuffer = malloc(MAX_CHARS); + textBuffer = HeapAlloc(GetProcessHeap(), 0, MAX_CHARS); /* Basic comboboxex test */ myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); @@ -168,7 +168,7 @@ static void test_comboboxex(void) { /* Cleanup */ - free(textBuffer); + HeapFree(GetProcessHeap(), 0, textBuffer); }

1 0

Alex Villacís Lasso : winemp3: Announce capability to decode at 48 KHz.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 0fe33f21e897b38c7906be3dff84830b81996543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe33f21e897b38c7906be3df… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Jun 28 10:48:59 2007 -0500 winemp3: Announce capability to decode at 48 KHz. --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 6d95a0b..e960dbe 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -77,12 +77,14 @@ static const Format PCM_Formats[] = {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, {1, 8, 22050}, {2, 8, 22050}, {1, 16, 22050}, {2, 16, 22050}, {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, + {1, 8, 48000}, {2, 8, 48000}, {1, 16, 48000}, {2, 16, 48000}, }; static const Format MPEG3_Formats[] = { {1, 0, 8000}, {2, 0, 8000}, {1, 0, 11025}, {2, 0, 11025}, {1, 0, 22050}, {2, 0, 22050}, {1, 0, 44100}, {2, 0, 44100}, + {1, 0, 48000}, {2, 0, 48000}, }; #define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))

1 0

Pedro Maia : shell32: Update paths in Portuguese resource.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 0ae624b8df89e20b2073c9adfad0e7781d4166b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae624b8df89e20b2073c9adf… Author: Pedro Maia <pedrom.maia(a)tvtel.pt> Date: Fri Jun 22 17:06:20 2007 +0100 shell32: Update paths in Portuguese resource. --- dlls/shell32/shell32_Pt.rc | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index 0a6a274..0ae61a8 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -317,7 +317,7 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN11 "Grupo" /* special folders */ - IDS_DESKTOP "�rea de trabalho" + IDS_DESKTOP "Ambiente de trabalho" IDS_MYCOMPUTER "O Meu Computador" /* context menus */ @@ -330,45 +330,45 @@ STRINGTABLE DISCARDABLE IDS_CREATEFOLDER_DENIED "N�o pode criar nova pasta: Permiss�o negada." IDS_CREATEFOLDER_CAPTION "Erro durante a cria��o da nova pasta" - IDS_DELETEITEM_CAPTION "Confirmar exclus�o de ficheiro" - IDS_DELETEFOLDER_CAPTION "Confirmar exclus�o de pasta" - IDS_DELETEITEM_TEXT "VTem certeza que deseja excluir '%1'?" + IDS_DELETEITEM_CAPTION "Confirmar exclus�o do ficheiro" + IDS_DELETEFOLDER_CAPTION "Confirmar exclus�o da pasta" + IDS_DELETEITEM_TEXT "Tem a certeza que deseja excluir '%1'?" IDS_DELETEMULTIPLE_TEXT "Tem certeza que deseja excluir estes %1 itens?" IDS_OVERWRITEFILE_TEXT "Sobreescrever ficheiro %1?" - IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever ficheiro" + IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescri��o do ficheiro" /* message box strings */ IDS_RESTART_TITLE "Reiniciar" IDS_RESTART_PROMPT "Deseja simular a reinicializa��o do Windows?" IDS_SHUTDOWN_TITLE "Desligar" - IDS_SHUTDOWN_PROMPT "Deseja finalizar a sess�o no Wine?" + IDS_SHUTDOWN_PROMPT "Deseja finalizar esta sess�o do Wine?" /* shell folder path default values */ IDS_PROGRAMS "Menu Iniciar\\Programas" IDS_PERSONAL "OS Meus Documentos" IDS_FAVORITES "Favoritos" IDS_STARTUP "Menu Iniciar\\Programas\\Iniciar" - IDS_RECENT "Recente" + IDS_RECENT "Recentes" IDS_SENDTO "Enviar Para" IDS_STARTMENU "Menu Iniciar" IDS_MYMUSIC "As Minhas M�sicas" IDS_MYVIDEO "Os Meus V�deos" - IDS_DESKTOPDIRECTORY "Ecr�" + IDS_DESKTOPDIRECTORY "Ambiente de Trabalho" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Modelos" - IDS_APPDATA "Dados de aplica��o" + IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Configura��es locais\\Dados de aplicativos" - IDS_INTERNET_CACHE "Configura��es locais\\Temporary Internet Files" + IDS_LOCAL_APPDATA "Defini��es locais\\Application Data" + IDS_INTERNET_CACHE "Defini��es locais\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Configura��es locais\\Hist�rico" - IDS_PROGRAM_FILES "Ficheiros de programas" + IDS_HISTORY "Defini��es locais\\Hist�rico" + IDS_PROGRAM_FILES "Programas" IDS_MYPICTURES "As Minhas Imagens" - IDS_PROGRAM_FILES_COMMON "Ficheiros de programas\\Ficheiros comuns" - IDS_COMMON_DOCUMENTS "Documentos" + IDS_PROGRAM_FILES_COMMON "Programas\\Ficheiros comuns" + IDS_COMMON_DOCUMENTS "Os Meus Documentos" IDS_ADMINTOOLS "Menu Iniciar\\Programas\\Ferramentas Administrativas" - IDS_COMMON_MUSIC "Documentos\\As Minhas M�sicas" - IDS_COMMON_PICTURES "Documentos\\As Minhas Imagens" - IDS_COMMON_VIDEO "Documentos\\Os Meus V�deos" - IDS_CDBURN_AREA "Configura��es locais\\Dados de aplicativos\\Microsoft\\Grava��o de CD" + IDS_COMMON_MUSIC "Os Meus Documentos\\As Minhas M�sicas" + IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" + IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus V�deos" + IDS_CDBURN_AREA "Defini��es locais\\Application Data\\Microsoft\\CD Burning" }

1 0

Maarten Lankhorst : winealsa: Silence buffer on allocation.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 2b194ac81b0ba1122f3a897743466ab6597c1fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b194ac81b0ba1122f3a89774… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 28 17:34:01 2007 +0200 winealsa: Silence buffer on allocation. --- dlls/winealsa.drv/dsoutput.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 2879d2e..e6958d3 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -224,6 +224,7 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) ERR("Can't map sound device for direct access: %s\n", snd_strerror(err)); return DSERR_GENERIC; } + snd_pcm_format_set_silence(format, areas->addr, pdbi->mmap_buflen_frames); err = snd_pcm_mmap_commit(pcm, ofs, avail); pdbi->mmap_buffer = areas->addr;

1 0

Vitaliy Margolen : dinput: Move key state array into object.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: b9e8284a7dc2a1ddf0aaae54066e53f0d83ed37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e8284a7dc2a1ddf0aaae540… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jun 28 06:34:04 2007 -0600 dinput: Move key state array into object. --- dlls/dinput/keyboard.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index c1eb5fb..ad44023 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -47,6 +47,7 @@ typedef struct SysKeyboardImpl SysKeyboardImpl; struct SysKeyboardImpl { struct IDirectInputDevice2AImpl base; + BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; }; static SysKeyboardImpl* current_lock = NULL; @@ -57,8 +58,6 @@ static SysKeyboardImpl* current_lock = NULL; * but 'DI_LOSTFOCUS' and 'DI_UNACQUIRED' exist for a reason. */ -static BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; /* array for 'GetDeviceState' */ - static LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = (SysKeyboardImpl *)current_lock; @@ -77,11 +76,11 @@ static LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; /* returns now if key event already known */ - if (new_diks == DInputKeyState[dik_code]) + if (new_diks == This->DInputKeyState[dik_code]) return CallNextHookEx(0, code, wparam, lparam); - DInputKeyState[dik_code] = new_diks; - TRACE(" setting %02X to %02X\n", dik_code, DInputKeyState[dik_code]); + This->DInputKeyState[dik_code] = new_diks; + TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); dik_code = id_to_offset(&This->base.data_format, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON); EnterCriticalSection(&This->base.crit); @@ -288,13 +287,12 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( if (TRACE_ON(dinput)) { int i; for (i = 0; i < WINE_DINPUT_KEYBOARD_MAX_KEYS; i++) { - if (DInputKeyState[i] != 0x00) { - TRACE(" - %02X: %02x\n", i, DInputKeyState[i]); - } + if (This->DInputKeyState[i] != 0x00) + TRACE(" - %02X: %02x\n", i, This->DInputKeyState[i]); } } - memcpy(ptr, DInputKeyState, WINE_DINPUT_KEYBOARD_MAX_KEYS); + memcpy(ptr, This->DInputKeyState, WINE_DINPUT_KEYBOARD_MAX_KEYS); LeaveCriticalSection(&This->base.crit); return DI_OK;

1 0

← Newer
1
2
3
4
5
6
7
8
...
86
Older →

Jump to page:

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 June 2007