April 2008 - wine-commits

Aric Stewart : imm32: Begin to add basic framework for loading IMEs as dlls .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 0a44a778f00c5283347646083f682333c11bccf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a44a778f00c5283347646083… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 31 09:15:29 2008 -0500 imm32: Begin to add basic framework for loading IMEs as dlls. --- dlls/imm32/imm.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 950fdc5..9173d1b 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -31,6 +31,7 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -44,6 +45,35 @@ typedef struct tagIMCCInternal DWORD dwSize; } IMCCInternal; +#define MAKE_FUNCPTR(f) typeof(f) * p##f +typedef struct _tagImmHkl{ + struct list entry; + HKL hkl; + HMODULE hIME; + IMEINFO imeInfo; + WCHAR imeClassName[17]; /* 16 character max */ + ULONG uSelected; + + /* Function Pointers */ + MAKE_FUNCPTR(ImeInquire); + MAKE_FUNCPTR(ImeConfigure); + MAKE_FUNCPTR(ImeDestroy); + MAKE_FUNCPTR(ImeEscape); + MAKE_FUNCPTR(ImeSelect); + MAKE_FUNCPTR(ImeSetActiveContext); + MAKE_FUNCPTR(ImeToAsciiEx); + MAKE_FUNCPTR(NotifyIME); + MAKE_FUNCPTR(ImeRegisterWord); + MAKE_FUNCPTR(ImeUnregisterWord); + MAKE_FUNCPTR(ImeEnumRegisterWord); + MAKE_FUNCPTR(ImeSetCompositionString); + MAKE_FUNCPTR(ImeConversionList); + MAKE_FUNCPTR(ImeProcessKey); + MAKE_FUNCPTR(ImeGetRegisterWordStyle); + MAKE_FUNCPTR(ImeGetImeMenuItems); +} ImmHkl; +#undef MAKE_FUNCPTR + typedef struct tagInputContextData { BOOL bInternalState; @@ -53,6 +83,8 @@ typedef struct tagInputContextData DWORD dwLock; INPUTCONTEXT IMC; + + ImmHkl *immKbd; } InputContextData; typedef struct _tagTRANSMSG { @@ -67,6 +99,8 @@ static HANDLE hImeInst; static const WCHAR WC_IMECLASSNAME[] = {'I','M','E',0}; static ATOM atIMEClass = 0; +static struct list ImmHklList = LIST_INIT(ImmHklList); + /* MSIME messages */ static UINT WM_MSIME_SERVICE; static UINT WM_MSIME_RECONVERTOPTIONS; @@ -86,6 +120,77 @@ static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); static void ImmInternalSetOpenStatus(BOOL fOpen); static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); +/* ImmHkl loading and freeing */ +#define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} +static ImmHkl *IMM_GetImmHkl(HKL hkl) +{ + ImmHkl *ptr; + WCHAR filename[MAX_PATH]; + + TRACE("Seeking ime for keyboard 0x%x\n",(unsigned)hkl); + + LIST_FOR_EACH_ENTRY(ptr, &ImmHklList, ImmHkl, entry) + { + if (ptr->hkl == hkl) + return ptr; + } + /* not found... create it */ + + ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ImmHkl)); + + ptr->hkl = hkl; + ImmGetIMEFileNameW(hkl, filename, MAX_PATH); + ptr->hIME = LoadLibraryW(filename); + if (ptr->hIME) + { + LOAD_FUNCPTR(ImeInquire); + LOAD_FUNCPTR(ImeDestroy); + LOAD_FUNCPTR(ImeSelect); + if (!ptr->pImeInquire || !ptr->pImeDestroy || !ptr->pImeSelect) + { + FreeLibrary(ptr->hIME); + ptr->hIME = NULL; + } + else + { + ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL); + LOAD_FUNCPTR(ImeConfigure); + LOAD_FUNCPTR(ImeEscape); + LOAD_FUNCPTR(ImeSetActiveContext); + LOAD_FUNCPTR(ImeToAsciiEx); + LOAD_FUNCPTR(NotifyIME); + LOAD_FUNCPTR(ImeRegisterWord); + LOAD_FUNCPTR(ImeUnregisterWord); + LOAD_FUNCPTR(ImeEnumRegisterWord); + LOAD_FUNCPTR(ImeSetCompositionString); + LOAD_FUNCPTR(ImeConversionList); + LOAD_FUNCPTR(ImeProcessKey); + LOAD_FUNCPTR(ImeGetRegisterWordStyle); + LOAD_FUNCPTR(ImeGetImeMenuItems); + } + } + list_add_head(&ImmHklList,&ptr->entry); + + return ptr; +} +#undef LOAD_FUNCPTR + +static void IMM_FreeAllImmHkl(void) +{ + ImmHkl *ptr,*cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry); + { + list_remove(&ptr->entry); + if (ptr->hIME) + { + ptr->pImeDestroy(1); + FreeLibrary(ptr->hIME); + } + HeapFree(GetProcessHeap(),0,ptr); + } +} + static VOID IMM_PostResult(InputContextData *data) { unsigned int i; @@ -167,6 +272,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) hwndDefault = 0; } IMM_Unregister(); + IMM_FreeAllImmHkl(); break; } return TRUE; @@ -610,10 +716,34 @@ HIMC WINAPI ImmCreateContext(void) new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); + /* Load the IME */ + new_context->immKbd = IMM_GetImmHkl(GetKeyboardLayout(0)); + + /* + * Once we depend on the IME for all the processing like we should + * these will become hard errors and result in creation failures + */ + if (!new_context->immKbd->hIME) + TRACE("IME dll could not be loaded\n"); + /* hCompStr is never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); new_context->IMC.hMsgBuf = ImmCreateIMCC(1); + /* Initialize the IME Private */ + new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); + + if (new_context->immKbd->hIME && + !new_context->immKbd->pImeSelect(new_context, TRUE)) + { + TRACE("Selection of IME failed\n"); + ImmDestroyContext(new_context); + return 0; + } + + new_context->immKbd->uSelected++; + TRACE("Created context 0x%x\n",(UINT)new_context); + return (HIMC)new_context; } @@ -628,6 +758,10 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) if (hIMC) { + data->immKbd->uSelected --; + if (data->immKbd->hIME) + data->immKbd->pImeSelect(hIMC, FALSE); + ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo); ImmDestroyIMCC(data->IMC.hGuideLine);

1 0

Aric Stewart : imm32: Correct a typo accidently using data instead of root_context.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8be2adf39841e3f65a4b1554a402611d8afb59bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be2adf39841e3f65a4b1554a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 31 13:08:34 2008 -0500 imm32: Correct a typo accidently using data instead of root_context. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2785922..950fdc5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1860,7 +1860,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) if (hIMC == (HIMC)FROM_IME) { ImmInternalSetOpenStatus(fOpen); - ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(root_context, IMN_SETOPENSTATUS, 0); return TRUE; }

1 0

Alexandre Julliard : winemine: Use a standard About box with the larger icon.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: f20651b1a4e6776d0988d95bfb22b049a2c78d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20651b1a4e6776d0988d95bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 13:19:06 2008 +0200 winemine: Use a standard About box with the larger icon. --- programs/winemine/Cs.rc | 13 +------------ programs/winemine/De.rc | 13 +------------ programs/winemine/En.rc | 13 +------------ programs/winemine/Es.rc | 13 +------------ programs/winemine/Fi.rc | 13 +------------ programs/winemine/Fr.rc | 13 +------------ programs/winemine/It.rc | 13 +------------ programs/winemine/Ko.rc | 14 +------------- programs/winemine/Makefile.in | 1 + programs/winemine/Nl.rc | 13 +------------ programs/winemine/No.rc | 14 +------------- programs/winemine/Pl.rc | 13 +------------ programs/winemine/Pt.rc | 41 ++++++++--------------------------------- programs/winemine/Ro.rc | 13 +------------ programs/winemine/Ru.rc | 13 +------------ programs/winemine/Si.rc | 13 +------------ programs/winemine/Tr.rc | 13 +------------ programs/winemine/main.c | 9 ++++++++- programs/winemine/resource.h | 1 + 19 files changed, 33 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f20651b1a4e6776d0988d…

1 0

Herve Chanal : winemine: A nicer icon.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 7f880d9b732813d88888b8491b862bdb89624d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f880d9b732813d88888b8491… Author: Herve Chanal <chanal_herve(a)yahoo.fr> Date: Tue Apr 1 12:17:13 2008 +0200 winemine: A nicer icon. --- programs/winemine/Makefile.in | 2 + programs/winemine/winemine.ico | Bin 766 -> 15086 bytes programs/winemine/winemine.svg | 874 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 876 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f880d9b732813d88888b…

1 0

Reece Dunn : shlwapi/tests: Loop over the STGM access modes when testing the SHCreateStreamOnFile methods .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 47abba0257cb9e0a391ddb8a4a40a08b136f304b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47abba0257cb9e0a391ddb8a4… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Mar 31 08:32:18 2008 +0100 shlwapi/tests: Loop over the STGM access modes when testing the SHCreateStreamOnFile methods. --- dlls/shlwapi/tests/istream.c | 42 ++++++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 5a50838..df83786 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -529,6 +529,12 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) START_TEST(istream) { + static const DWORD stgm_access[] = { + STGM_READ, + STGM_WRITE, + STGM_READWRITE + }; + static const DWORD stgm_flags[] = { 0, STGM_CONVERT, @@ -539,6 +545,8 @@ START_TEST(istream) STGM_TRANSACTED | STGM_CONVERT | STGM_DELETEONRELEASE }; + int i, j; + hShlwapi = GetModuleHandleA("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); @@ -546,30 +554,24 @@ START_TEST(istream) pSHCreateStreamOnFileEx = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileEx"); if (!pSHCreateStreamOnFileA) - printf("SHCreateStreamOnFileA not found... skipping tests.\n"); - else { - test_SHCreateStreamOnFileA(STGM_READ); - test_SHCreateStreamOnFileA(STGM_WRITE); - test_SHCreateStreamOnFileA(STGM_READWRITE); - } + printf("SHCreateStreamOnFileA not found... those tests will be skipped.\n"); if (!pSHCreateStreamOnFileW) - printf("SHCreateStreamOnFileW not found... skipping tests.\n"); - else { - test_SHCreateStreamOnFileW(STGM_READ); - test_SHCreateStreamOnFileW(STGM_WRITE); - test_SHCreateStreamOnFileW(STGM_READWRITE); - } + printf("SHCreateStreamOnFileW not found... those tests will be skipped.\n"); if (!pSHCreateStreamOnFileEx) - printf("SHCreateStreamOnFileEx not found... skipping tests.\n"); - else { - int i; - - for (i = 0; i != sizeof(stgm_flags)/sizeof(stgm_flags[0]); i++) { - test_SHCreateStreamOnFileEx(STGM_READ, stgm_flags[i]); - test_SHCreateStreamOnFileEx(STGM_WRITE, stgm_flags[i]); - test_SHCreateStreamOnFileEx(STGM_READWRITE, stgm_flags[i]); + printf("SHCreateStreamOnFileEx not found... those tests will be skipped.\n"); + + for (i = 0; i != sizeof(stgm_access)/sizeof(stgm_access[0]); i++) { + if (pSHCreateStreamOnFileA) + test_SHCreateStreamOnFileA(stgm_access[i]); + + if (pSHCreateStreamOnFileW) + test_SHCreateStreamOnFileW(stgm_access[i]); + + if (pSHCreateStreamOnFileEx) { + for (j = 0; j != sizeof(stgm_flags)/sizeof(stgm_flags[0]); j++) + test_SHCreateStreamOnFileEx(stgm_access[i], stgm_flags[j]); } } }

1 0

Paul Vriens : setupapi: Fix for SetupGetIntField, with tests.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: ebec0a969761f083259ffa7f7caa3b3a4efb889f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebec0a969761f083259ffa7f7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 31 19:51:21 2008 +0200 setupapi: Fix for SetupGetIntField, with tests. --- dlls/setupapi/parser.c | 21 +++++++++----- dlls/setupapi/tests/parser.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index f6de4ed..a00e068 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1711,21 +1711,26 @@ BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ) char *end, *buffer = localbuff; DWORD required; INT res; - BOOL ret = FALSE; + BOOL ret; - if (!SetupGetStringFieldA( context, index, localbuff, sizeof(localbuff), &required )) + if (!(ret = SetupGetStringFieldA( context, index, localbuff, sizeof(localbuff), &required ))) { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, required ))) return FALSE; - if (!SetupGetStringFieldA( context, index, buffer, required, NULL )) goto done; + if (!(ret = SetupGetStringFieldA( context, index, buffer, required, NULL ))) goto done; } - res = strtol( buffer, &end, 0 ); - if (end != buffer && !*end) + /* The call to SetupGetStringFieldA succeeded. If buffer is empty we have an optional field */ + if (!*buffer) *result = 0; + else { - *result = res; - ret = TRUE; + res = strtol( buffer, &end, 0 ); + if (end != buffer && !*end) *result = res; + else + { + SetLastError( ERROR_INVALID_DATA ); + ret = FALSE; + } } - else SetLastError( ERROR_INVALID_DATA ); done: if (buffer != localbuff) HeapFree( GetProcessHeap(), 0, buffer ); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index d49c37f..6341222 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -475,6 +475,67 @@ static void test_pSetupGetField(void) SetupCloseInfFile( hinf ); } +static void test_SetupGetIntField(void) +{ + static const struct + { + const char *key; + const char *fields; + DWORD index; + INT value; + DWORD err; + } keys[] = + { + /* key fields index expected int errorcode */ + { "Key=", "48", 1, 48, ERROR_SUCCESS }, + { "Key=", "48", 0, -1, ERROR_INVALID_DATA }, + { "123=", "48", 0, 123, ERROR_SUCCESS }, + { "Key=", "0x4", 1, 4, ERROR_SUCCESS }, + { "Key=", "Field1", 1, -1, ERROR_INVALID_DATA }, + { "Key=", "Field1,34", 2, 34, ERROR_SUCCESS }, + { "Key=", "Field1,,Field3", 2, 0, ERROR_SUCCESS }, + { "Key=", "Field1,", 2, 0, ERROR_SUCCESS } + }; + unsigned int i; + + for (i = 0; i < sizeof(keys)/sizeof(keys[0]); i++) + { + HINF hinf; + char buffer[MAX_INF_STRING_LENGTH]; + INFCONTEXT context; + UINT err; + BOOL retb; + INT intfield; + + strcpy( buffer, STD_HEADER "[TestSection]\n" ); + strcat( buffer, keys[i].key ); + strcat( buffer, keys[i].fields ); + hinf = test_file_contents( buffer, &err); + ok( hinf != NULL, "Expected valid INF file\n" ); + + SetupFindFirstLineA( hinf, "TestSection", "Key", &context ); + SetLastError( 0xdeadbeef ); + intfield = -1; + retb = SetupGetIntField( &context, keys[i].index, &intfield ); + if ( keys[i].err == ERROR_SUCCESS ) + { + ok( retb, "Expected success\n" ); + ok( GetLastError() == ERROR_SUCCESS || + GetLastError() == 0xdeadbeef /* win9x, NT4 */, + "Expected ERROR_SUCCESS or 0xdeadbeef, got %u\n", GetLastError() ); + } + else + { + ok( !retb, "Expected failure\n" ); + ok( GetLastError() == keys[i].err, + "Expected %d, got %u\n", keys[i].err, GetLastError() ); + } + ok( intfield == keys[i].value, "Expected %d, got %d\n", keys[i].value, intfield ); + + SetupCloseInfFile( hinf ); + } +} + static void test_GLE(void) { static const char *inf = @@ -597,6 +658,7 @@ START_TEST(parser) test_key_names(); test_close_inf_file(); test_pSetupGetField(); + test_SetupGetIntField(); test_GLE(); DeleteFileA( tmpfilename ); }

1 0

Reece Dunn : winecfg: Add support for updating all system colours.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 14f86f87787dd55448acbeb6cf8b95204b81fefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f86f87787dd55448acbeb6c… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Feb 10 21:24:45 2008 +0000 winecfg: Add support for updating all system colours. --- programs/winecfg/En.rc | 15 +++++++++++++++ programs/winecfg/resource.h | 15 +++++++++++++++ programs/winecfg/theme.c | 15 +++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 8fc30d6..46d6c78 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -308,4 +308,19 @@ BEGIN IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_APPWORKSPACE "Application Workspace" + IDC_SYSPARAMS_WINDOW_FRAME "Window Frame" + IDC_SYSPARAMS_ACTIVE_BORDER "Active Border" + IDC_SYSPARAMS_INACTIVE_BORDER "Inactive Border" + IDC_SYSPARAMS_BUTTON_SHADOW "Controls Shadow" + IDC_SYSPARAMS_GRAY_TEXT "Gray Text" + IDC_SYSPARAMS_BUTTON_HILIGHT "Controls Hilight" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Controls Dark Shadow" + IDC_SYSPARAMS_BUTTON_LIGHT "Controls Light" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Controls Alternate Background" + IDC_SYSPARAMS_HOT_TRACKING "Hot Tracked Item" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Active Title Bar Gradient" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Inactive Tile Bar Gradient" + IDC_SYSPARAMS_MENU_HILIGHT "Menu Hilight" + IDC_SYSPARAMS_MENUBAR "Menu Bar" END diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index a9d54d0..e92fe56 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -232,3 +232,18 @@ #define IDC_SYSPARAMS_INACTIVE_TITLE 8414 #define IDC_SYSPARAMS_INACTIVE_TITLE_TEXT 8415 #define IDC_SYSPARAMS_MSGBOX_TEXT 8416 +#define IDC_SYSPARAMS_APPWORKSPACE 8417 +#define IDC_SYSPARAMS_WINDOW_FRAME 8418 +#define IDC_SYSPARAMS_ACTIVE_BORDER 8419 +#define IDC_SYSPARAMS_INACTIVE_BORDER 8420 +#define IDC_SYSPARAMS_BUTTON_SHADOW 8421 +#define IDC_SYSPARAMS_GRAY_TEXT 8422 +#define IDC_SYSPARAMS_BUTTON_HILIGHT 8423 +#define IDC_SYSPARAMS_BUTTON_DARK_SHADOW 8424 +#define IDC_SYSPARAMS_BUTTON_LIGHT 8425 +#define IDC_SYSPARAMS_BUTTON_ALTERNATE 8426 +#define IDC_SYSPARAMS_HOT_TRACKING 8427 +#define IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT 8428 +#define IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT 8429 +#define IDC_SYSPARAMS_MENU_HILIGHT 8430 +#define IDC_SYSPARAMS_MENUBAR 8431 diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 7eb444e..abd016d 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -522,6 +522,21 @@ static struct {-1, COLOR_INACTIVECAPTION, "InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ {-1, COLOR_INACTIVECAPTIONTEXT,"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */ {-1, -1, "MsgBoxText" }, /* IDC_SYSPARAMS_MSGBOX_TEXT */ + {-1, COLOR_APPWORKSPACE, "AppWorkSpace" }, /* IDC_SYSPARAMS_APPWORKSPACE */ + {-1, COLOR_WINDOWFRAME, "WindowFrame" }, /* IDC_SYSPARAMS_WINDOW_FRAME */ + {-1, COLOR_ACTIVEBORDER, "ActiveBorder" }, /* IDC_SYSPARAMS_ACTIVE_BORDER */ + {-1, COLOR_INACTIVEBORDER, "InactiveBorder" }, /* IDC_SYSPARAMS_INACTIVE_BORDER */ + {-1, COLOR_BTNSHADOW, "ButtonShadow" }, /* IDC_SYSPARAMS_BUTTON_SHADOW */ + {-1, COLOR_GRAYTEXT, "GrayText" }, /* IDC_SYSPARAMS_GRAY_TEXT */ + {-1, COLOR_BTNHILIGHT, "ButtonHilight" }, /* IDC_SYSPARAMS_BUTTON_HILIGHT */ + {-1, COLOR_3DDKSHADOW, "ButtonDkShadow" }, /* IDC_SYSPARAMS_BUTTON_DARK_SHADOW */ + {-1, COLOR_3DLIGHT, "ButtonLight" }, /* IDC_SYSPARAMS_BUTTON_LIGHT */ + {-1, COLOR_ALTERNATEBTNFACE, "ButtonAlternateFace" }, /* IDC_SYSPARAMS_BUTTON_ALTERNATE */ + {-1, COLOR_HOTLIGHT, "HotTrackingColor" }, /* IDC_SYSPARAMS_HOT_TRACKING */ + {-1, COLOR_GRADIENTACTIVECAPTION, "GradientActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT */ + {-1, COLOR_GRADIENTINACTIVECAPTION, "GradientInactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT */ + {-1, COLOR_MENUHILIGHT, "MenuHilight" }, /* IDC_SYSPARAMS_MENU_HILIGHT */ + {-1, COLOR_MENUBAR, "MenuBar" }, /* IDC_SYSPARAMS_MENUBAR */ }; static void save_sys_color(int idx, COLORREF clr)

1 0

Alistair Leslie-Hughes : mscoree: Added ICorRuntimeHost support.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: c15cdad10d5b8b1febbcdf63be8a6c0b3c9b7e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15cdad10d5b8b1febbcdf63b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 28 21:10:55 2008 +1100 mscoree: Added ICorRuntimeHost support. --- dlls/mscoree/Makefile.in | 2 + dlls/mscoree/corruntimehost.c | 288 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 8 +- dlls/mscoree/mscoree_private.h | 26 ++++ 4 files changed, 323 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 77ae5d2..d98d02d 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -4,8 +4,10 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mscoree.dll IMPORTS = advapi32 kernel32 +EXTRALIBS = -luuid C_SRCS = \ + corruntimehost.c \ mscoree_main.c @MAKE_DLL_RULES@ diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c new file mode 100644 index 0000000..9de9bf5 --- /dev/null +++ b/dlls/mscoree/corruntimehost.c @@ -0,0 +1,288 @@ +/* + * + * Copyright 2008 Alistair Leslie-Hughes + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "ole2.h" + +#include "cor.h" +#include "mscoree.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); + +typedef struct _corruntimehost +{ + const struct ICorRuntimeHostVtbl *lpVtbl; + LONG ref; +} corruntimehost; + +static inline corruntimehost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) +{ + return (corruntimehost *)((char*)iface - FIELD_OFFSET(corruntimehost, lpVtbl)); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI corruntimehost_QueryInterface(ICorRuntimeHost* iface, + REFIID riid, + void **ppvObject) +{ + corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_ICorRuntimeHost ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ICorRuntimeHost_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI corruntimehost_AddRef(ICorRuntimeHost* iface) +{ + corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) +{ + corruntimehost *This = impl_from_ICorRuntimeHost( iface ); + ULONG ref; + + ref = InterlockedDecrement( &This->ref ); + if ( ref == 0 ) + { + HeapFree( GetProcessHeap(), 0, This ); + } + + return ref; +} + +/*** ICorRuntimeHost methods ***/ +static HRESULT WINAPI corruntimehost_CreateLogicalThreadState( + ICorRuntimeHost* iface) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_DeleteLogicalThreadState( + ICorRuntimeHost* iface) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_SwitchInLogicalThreadState( + ICorRuntimeHost* iface, + DWORD *fiberCookie) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_SwitchOutLogicalThreadState( + ICorRuntimeHost* iface, + DWORD **fiberCookie) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_LocksHeldByLogicalThread( + ICorRuntimeHost* iface, + DWORD *pCount) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_MapFile( + ICorRuntimeHost* iface, + HANDLE hFile, + HMODULE *mapAddress) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_GetConfiguration( + ICorRuntimeHost* iface, + ICorConfiguration **pConfiguration) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_Start( + ICorRuntimeHost* iface) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_Stop( + ICorRuntimeHost* iface) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CreateDomain( + ICorRuntimeHost* iface, + LPCWSTR friendlyName, + IUnknown *identityArray, + IUnknown **appDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_GetDefaultDomain( + ICorRuntimeHost* iface, + IUnknown **pAppDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_EnumDomains( + ICorRuntimeHost* iface, + HDOMAINENUM *hEnum) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_NextDomain( + ICorRuntimeHost* iface, + HDOMAINENUM hEnum, + IUnknown **appDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CloseEnum( + ICorRuntimeHost* iface, + HDOMAINENUM hEnum) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CreateDomainEx( + ICorRuntimeHost* iface, + LPCWSTR friendlyName, + IUnknown *setup, + IUnknown *evidence, + IUnknown **appDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CreateDomainSetup( + ICorRuntimeHost* iface, + IUnknown **appDomainSetup) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CreateEvidence( + ICorRuntimeHost* iface, + IUnknown **evidence) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_UnloadDomain( + ICorRuntimeHost* iface, + IUnknown *appDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI corruntimehost_CurrentDomain( + ICorRuntimeHost* iface, + IUnknown **appDomain) +{ + FIXME("stub %p\n", iface); + return E_NOTIMPL; +} + +static const struct ICorRuntimeHostVtbl corruntimehost_vtbl = +{ + corruntimehost_QueryInterface, + corruntimehost_AddRef, + corruntimehost_Release, + corruntimehost_CreateLogicalThreadState, + corruntimehost_DeleteLogicalThreadState, + corruntimehost_SwitchInLogicalThreadState, + corruntimehost_SwitchOutLogicalThreadState, + corruntimehost_LocksHeldByLogicalThread, + corruntimehost_MapFile, + corruntimehost_GetConfiguration, + corruntimehost_Start, + corruntimehost_Stop, + corruntimehost_CreateDomain, + corruntimehost_GetDefaultDomain, + corruntimehost_EnumDomains, + corruntimehost_NextDomain, + corruntimehost_CloseEnum, + corruntimehost_CreateDomainEx, + corruntimehost_CreateDomainSetup, + corruntimehost_CreateEvidence, + corruntimehost_UnloadDomain, + corruntimehost_CurrentDomain +}; + +IUnknown* create_corruntimehost(void) +{ + corruntimehost *This; + + This = HeapAlloc( GetProcessHeap(), 0, sizeof *This ); + if ( !This ) + return NULL; + + This->lpVtbl = &corruntimehost_vtbl; + This->ref = 1; + + FIXME("return iface %p\n", This); + + return (IUnknown*) &This->lpVtbl; +} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6f850f2..4995393 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -27,8 +27,10 @@ #include "winreg.h" #include "ole2.h" +#include "initguid.h" #include "cor.h" #include "mscoree.h" +#include "mscoree_private.h" #include "wine/debug.h" @@ -301,8 +303,12 @@ HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD FIXME("%s %s %d %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), debugstr_guid( riid ), ppv); + if(IsEqualGUID( riid, &IID_ICorRuntimeHost )) + { + *ppv = create_corruntimehost(); + return S_OK; + } *ppv = NULL; - return E_NOTIMPL; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h new file mode 100644 index 0000000..f329455 --- /dev/null +++ b/dlls/mscoree/mscoree_private.h @@ -0,0 +1,26 @@ +/* + * + * Copyright 2008 Alistair Leslie-Hughes + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __MSCOREE_PRIVATE__ +#define __MSCOREE_PRIVATE__ + +extern IUnknown* create_corruntimehost(void); + + +#endif /* __MSCOREE_PRIVATE__ */

1 0

Alistair Leslie-Hughes : mscoree: Add missing interfaces.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 67036190eec254677db75e5cc60c16a79a98364c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67036190eec254677db75e5cc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 27 21:59:01 2008 +1100 mscoree: Add missing interfaces. --- include/mscoree.idl | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/include/mscoree.idl b/include/mscoree.idl index 8dfaa1b..5877eb6 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 Francois Gouget + * Copyright (C) 2008 Alistair Leslie-Hughes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "unknwn.idl"; cpp_quote("/* FIXME: #include <gcghost.h> */") cpp_quote("/* FIXME: #include <ivalidator.h> */") @@ -25,3 +27,140 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") + +typedef void* HDOMAINENUM; + +[ + uuid(F31D1788-C397-4725-87A5-6AF3472C2791), + version(1.0), + object, + local +] +interface IGCThreadControl : IUnknown +{ + HRESULT ThreadIsBlockingForSuspension(); + + HRESULT SuspensionStarting(); + + HRESULT SuspensionEnding(DWORD generation); +} + +[ + uuid(5513D564-8374-4cb9-AED9-0083F4160A1D), + version(1.1), + local, + object +] +interface IGCHostControl : IUnknown +{ + HRESULT RequestVirtualMemLimit([in] SIZE_T nMaxVirtualMemMB, + [in, out] SIZE_T* nNewMaxVirtualMemMB); +} + +[ + uuid(23D86786-0BB5-4774-8FB5-E3522ADD6246), + version(1.0), + local, + object +] +interface IDebuggerThreadControl : IUnknown +{ + HRESULT ThreadIsBlockingForDebugger(); + + HRESULT ReleaseAllRuntimeThreads(); + + HRESULT StartBlockingForDebugger(DWORD dwUnused); +} + +[ + uuid(5C2B07A5-1E98-11d3-872F-00C04F79ED0D), + version(1.0), + local, + object +] +interface ICorConfiguration : IUnknown +{ + HRESULT SetGCThreadControl([in] IGCThreadControl* GCThreadControl); + + HRESULT SetGCHostControl([in] IGCHostControl* GCHostControl); + + HRESULT SetDebuggerThreadControl([in] IDebuggerThreadControl* debuggerThreadControl); + + HRESULT AddDebuggerSpecialThread([in] DWORD specialThreadId); +} + +[ + uuid(9065597E-D1A1-4fb2-B6BA-7E1FCE230F61), + version(1.0), + local +] +interface ICLRControl : IUnknown +{ + HRESULT GetCLRManager([in] REFIID riid, [out] void **ppObject); + + HRESULT SetAppDomainManagerType([in] LPCWSTR appDomainManagerAssembly, + [in] LPCWSTR appDomainManagerType); +} + +[ + uuid(02CA073C-7079-4860-880A-C2F7A449C991), + version(1.0), + local +] +interface IHostControl : IUnknown +{ + HRESULT GetHostManager( [in] REFIID riid, [out] void **ppObject); + + HRESULT SetAppDomainManager([in] DWORD appDomainID, + [in] IUnknown* appDomainManager); +} + +[ + uuid(CB2F6722-AB3A-11d2-9C40-00C04FA30A3E), + version(1.0), + local, + object +] +interface ICorRuntimeHost : IUnknown +{ + HRESULT CreateLogicalThreadState(); + HRESULT DeleteLogicalThreadState(); + HRESULT SwitchInLogicalThreadState([in] DWORD *fiberCookie); + + HRESULT SwitchOutLogicalThreadState([out] DWORD **fiberCookie); + + HRESULT LocksHeldByLogicalThread( [out] DWORD *pCount ); + + HRESULT MapFile([in] HANDLE hFile, [out] HMODULE* mapAddress); + + HRESULT GetConfiguration([out] ICorConfiguration** pConfiguration); + + HRESULT Start(); + + HRESULT Stop(); + + HRESULT CreateDomain([in] LPCWSTR friendlyName, + [in] IUnknown* identityArray, + [out] IUnknown** appDomain); + + HRESULT GetDefaultDomain([out] IUnknown** pAppDomain); + + HRESULT EnumDomains([out] HDOMAINENUM *hEnum); + + HRESULT NextDomain([in] HDOMAINENUM hEnum, [out] IUnknown** appDomain); + + HRESULT CloseEnum([in] HDOMAINENUM hEnum); + + HRESULT CreateDomainEx([in] LPCWSTR friendlyName, + [in] IUnknown* setup, + [in] IUnknown* evidence, + [out] IUnknown** appDomain); + + HRESULT CreateDomainSetup([out] IUnknown** appDomainSetup); + + HRESULT CreateEvidence([out] IUnknown** evidence); + + HRESULT UnloadDomain([in] IUnknown* appDomain); + + HRESULT CurrentDomain([out] IUnknown** appDomain); +};

1 0

Vitaliy Margolen : localspl: Add Russian translation.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 1a02268a05df1a68e9c993bb42bc85e59f94722b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a02268a05df1a68e9c993bb4… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Mar 31 22:38:33 2008 -0600 localspl: Add Russian translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Ru.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 3aeeb2c..752a0c0 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -44,4 +44,5 @@ #include "spl_No.rc" #include "spl_Pl.rc" #include "spl_Ro.rc" +#include "spl_Ru.rc" #include "spl_Sv.rc" diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc new file mode 100644 index 0000000..1ee1e2f --- /dev/null +++ b/dlls/localspl/spl_Ru.rc @@ -0,0 +1,27 @@ +/* + * Russian resources for localspl + * + * Copyright 2008 Vitaliy Margolen + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� " + IDS_LOCALMONITOR "�� " +}

1 0

Piotr Caban : msxml3: Added fixmes to stubs.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 4fb786a355ece5f058033c6b05b8b51960c86989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb786a355ece5f058033c6b0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Apr 1 01:45:13 2008 +0200 msxml3: Added fixmes to stubs. --- dlls/msxml3/saxreader.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0b36cac..497132a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -194,6 +194,9 @@ static HRESULT WINAPI saxxmlreader_getFeature( const WCHAR *pFeature, VARIANT_BOOL *pValue) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pFeature), pValue); return E_NOTIMPL; } @@ -202,6 +205,9 @@ static HRESULT WINAPI saxxmlreader_putFeature( const WCHAR *pFeature, VARIANT_BOOL vfValue) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(pFeature), vfValue); return E_NOTIMPL; } @@ -210,6 +216,9 @@ static HRESULT WINAPI saxxmlreader_getProperty( const WCHAR *pProp, VARIANT *pValue) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pProp), pValue); return E_NOTIMPL; } @@ -218,6 +227,9 @@ static HRESULT WINAPI saxxmlreader_putProperty( const WCHAR *pProp, VARIANT value) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(pProp)); return E_NOTIMPL; } @@ -225,6 +237,9 @@ static HRESULT WINAPI saxxmlreader_getEntityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver **pEntityResolver) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pEntityResolver); return E_NOTIMPL; } @@ -232,6 +247,9 @@ static HRESULT WINAPI saxxmlreader_putEntityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver *pEntityResolver) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pEntityResolver); return E_NOTIMPL; } @@ -239,6 +257,9 @@ static HRESULT WINAPI saxxmlreader_getContentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler **ppContentHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, ppContentHandler); return E_NOTIMPL; } @@ -246,6 +267,9 @@ static HRESULT WINAPI saxxmlreader_putContentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler *contentHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, contentHandler); return E_NOTIMPL; } @@ -253,6 +277,9 @@ static HRESULT WINAPI saxxmlreader_getDTDHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler **pDTDHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pDTDHandler); return E_NOTIMPL; } @@ -260,6 +287,9 @@ static HRESULT WINAPI saxxmlreader_putDTDHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler *pDTDHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pDTDHandler); return E_NOTIMPL; } @@ -267,6 +297,9 @@ static HRESULT WINAPI saxxmlreader_getErrorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler **pErrorHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pErrorHandler); return E_NOTIMPL; } @@ -274,6 +307,9 @@ static HRESULT WINAPI saxxmlreader_putErrorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler *errorHandler) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, errorHandler); return E_NOTIMPL; } @@ -281,6 +317,9 @@ static HRESULT WINAPI saxxmlreader_getBaseURL( IVBSAXXMLReader* iface, const WCHAR **pBaseUrl) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pBaseUrl); return E_NOTIMPL; } @@ -288,6 +327,9 @@ static HRESULT WINAPI saxxmlreader_putBaseURL( IVBSAXXMLReader* iface, const WCHAR *pBaseUrl) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(pBaseUrl)); return E_NOTIMPL; } @@ -295,6 +337,9 @@ static HRESULT WINAPI saxxmlreader_getSecureBaseURL( IVBSAXXMLReader* iface, const WCHAR **pSecureBaseUrl) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%p) stub\n", This, pSecureBaseUrl); return E_NOTIMPL; } @@ -303,6 +348,9 @@ static HRESULT WINAPI saxxmlreader_putSecureBaseURL( IVBSAXXMLReader* iface, const WCHAR *secureBaseUrl) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(secureBaseUrl)); return E_NOTIMPL; } @@ -310,6 +358,9 @@ static HRESULT WINAPI saxxmlreader_parse( IVBSAXXMLReader* iface, VARIANT varInput) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p) stub\n", This); return E_NOTIMPL; } @@ -317,6 +368,9 @@ static HRESULT WINAPI saxxmlreader_parseURL( IVBSAXXMLReader* iface, const WCHAR *url) { + saxreader *This = impl_from_IVBSAXXMLReader( iface ); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(url)); return E_NOTIMPL; }

1 0

Piotr Caban : msxml3: Added SAXXMLReader registration.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: c1f3339557b5291b6ca29a1695c0d8289c5651aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f3339557b5291b6ca29a169… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Apr 1 01:44:49 2008 +0200 msxml3: Added SAXXMLReader registration. --- dlls/msxml3/regsvr.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 1f08150..05bf74d 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -555,6 +555,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.XMLSchemaCache", "3.0" }, + { &CLSID_SAXXMLReader, + "SAX XML Reader", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXXMLReader", + "3.0" + }, { NULL } /* list terminator */ };

1 0

Rob Shearman : Remove superfluous semicolons from IDL files.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 80d67e33b957a68d882a7d5e2e4e2653c74facfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d67e33b957a68d882a7d5e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 31 22:00:09 2008 +0100 Remove superfluous semicolons from IDL files. --- dlls/atl/atliface.idl | 6 +++--- include/hlink.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atliface.idl b/dlls/atl/atliface.idl index bb5cb2e..ef3e5e5 100644 --- a/dlls/atl/atliface.idl +++ b/dlls/atl/atliface.idl @@ -74,6 +74,6 @@ cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**) cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") cpp_quote("BOOL WINAPI AtlAxWinInit(void);") -cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog"); +cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog") diff --git a/include/hlink.idl b/include/hlink.idl index 0eef883..c59cd32 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -35,7 +35,7 @@ cpp_quote("HRESULT WINAPI HlinkNavigate(IHlink*, IHlinkFrame*, DWORD, LPBC, IBin cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);") cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") -cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);"); +cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") typedef enum _HLSR_NOREDEF10 {

1 0

Hans Leidekker : wininet: Use INTERNET_MAX_URL_LENGTH to size buffers we intend to store a URL in.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 612f3c1414bfe13ac116d7eb720e3692f80e5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=612f3c1414bfe13ac116d7eb7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:26:16 2008 +0200 wininet: Use INTERNET_MAX_URL_LENGTH to size buffers we intend to store a URL in. --- dlls/wininet/http.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 912a07f..1bb3893 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -870,7 +870,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==302 || dwCode==301)) { - WCHAR szNewLocation[2048]; + WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { @@ -1233,7 +1233,7 @@ static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthIn static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) { - WCHAR new_location[2048], *url; + WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; DWORD size; size = sizeof(new_location); @@ -2865,12 +2865,12 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; - WCHAR path[2048]; + WCHAR path[INTERNET_MAX_URL_LENGTH]; if(lpszUrl[0]=='/') { /* if it's an absolute path, keep the same session info */ - lstrcpynW(path, lpszUrl, 2048); + lstrcpynW(path, lpszUrl, INTERNET_MAX_URL_LENGTH); } else { @@ -3272,7 +3272,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess) { - WCHAR szNewLocation[2048]; + WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL))

1 0

Roderick Colenbrander : wgl: Fix ChoosePixelFormat behavior.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 616ac380f9a1ed4e83f0159f4cc9768bad8b4a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616ac380f9a1ed4e83f0159f4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 31 22:18:14 2008 +0000 wgl: Fix ChoosePixelFormat behavior. --- dlls/opengl32/tests/opengl.c | 75 +++++++++++++++++++ dlls/winex11.drv/opengl.c | 165 +++++++++++++++++++++++------------------- 2 files changed, 164 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=616ac380f9a1ed4e83f01…

1 0

Roderick Colenbrander : wgl: Add missing WGL_STEREO_ARB to ConvertAttribWGLtoGLX.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8a5838274b5250c4c426b32ab02e44c3229c1a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5838274b5250c4c426b32ab… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 31 22:59:11 2008 +0000 wgl: Add missing WGL_STEREO_ARB to ConvertAttribWGLtoGLX. --- dlls/winex11.drv/opengl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a0469c..1a0a52f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -664,6 +664,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); doublebuf = pop; break; + case WGL_STEREO_ARB: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_STEREO, pop); + TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop); + break; case WGL_PIXEL_TYPE_ARB: pop = iWGLAttr[++cur];

1 0

Andrew Talbot : mshtml: Remove superfluous semicolon.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: c25e5d642a823e43b1f7e60b91eec112905435eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25e5d642a823e43b1f7e60b9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 20:42:14 2008 +0100 mshtml: Remove superfluous semicolon. --- dlls/mshtml/nsevents.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index eda1b54..7e428ce 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -195,7 +195,7 @@ static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent nsDOMEventListener_AddRef, \ nsDOMEventListener_Release, \ handler, \ - }; + } static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_blur); static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus);

1 0

Rob Shearman : widl: Parse typedefs of function pointers.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: a110cffd9541523372c45b428d0c418a55a37253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a110cffd9541523372c45b428… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 31 21:59:47 2008 +0100 widl: Parse typedefs of function pointers. --- tools/widl/parser.y | 40 ++++++++++++++++++---------------------- tools/widl/widltypes.h | 2 ++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a4f383f..7ddae74 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -100,7 +100,7 @@ static var_t *make_var(char *name); static pident_list_t *append_pident(pident_list_t *list, pident_t *p); static pident_t *make_pident(var_t *var); static func_list_t *append_func(func_list_t *list, func_t *func); -static func_t *make_func(var_t *def, var_list_t *args); +static func_t *make_func(var_t *def); static type_t *make_class(char *name); static type_t *make_safearray(type_t *type); static type_t *make_builtin(char *name); @@ -259,7 +259,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <var> arg field s_field case enum constdef externdef %type <var_list> m_args no_args args fields cases enums enum_list dispint_props %type <var> m_ident t_ident ident -%type <pident> p_ident pident +%type <pident> pident func_ident direct_ident %type <pident_list> pident_list %type <func> funcdef %type <func_list> int_statements dispint_meths @@ -394,17 +394,6 @@ arg: attributes type pident array { $$ = $3->var; set_type($$, $1, $2->ptr_level, $3, TRUE); free($2); } - | attributes type pident '(' m_args ')' { $$ = $3->var; - $$->attrs = $1; - set_type($$, $2, $3->ptr_level - 1, NULL, TRUE); - free($3); - $$->args = $5; - } - | type pident '(' m_args ')' { $$ = $2->var; - set_type($$, $1, $2->ptr_level - 1, NULL, TRUE); - free($2); - $$->args = $4; - } ; array: { $$ = NULL; } @@ -654,12 +643,11 @@ s_field: m_attributes type pident array { $$ = $3->var; ; funcdef: - m_attributes type callconv pident - '(' m_args ')' { var_t *v = $4->var; + m_attributes type callconv pident { var_t *v = $4->var; v->attrs = $1; set_type(v, $2, $4->ptr_level, NULL, FALSE); free($4); - $$ = make_func(v, $6); + $$ = make_func(v); if (is_attr(v->attrs, ATTR_IN)) { error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); } @@ -859,13 +847,19 @@ moduledef: modulehdr '{' int_statements '}' { $$ = $1; } ; -p_ident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } - | tCONST p_ident { $$ = $2; /* FIXME */ } +pident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } + | tCONST pident { $$ = $2; /* FIXME */ } + | direct_ident ; -pident: ident { $$ = make_pident($1); } - | p_ident +func_ident: direct_ident '(' m_args ')' { $$ = $1; $1->var->args = $3; } + +direct_ident: ident { $$ = make_pident($1); } | '(' pident ')' { $$ = $2; } + | func_ident { $$ = $1; + $$->func_ptr_level = $$->ptr_level; + $$->ptr_level = 0; + } ; pident_list: @@ -1521,6 +1515,7 @@ static pident_t *make_pident(var_t *var) pident_t *p = xmalloc(sizeof(*p)); p->var = var; p->ptr_level = 0; + p->func_ptr_level = 0; return p; } @@ -1536,11 +1531,12 @@ static func_list_t *append_func(func_list_t *list, func_t *func) return list; } -static func_t *make_func(var_t *def, var_list_t *args) +static func_t *make_func(var_t *def) { func_t *f = xmalloc(sizeof(func_t)); f->def = def; - f->args = args; + f->args = def->args; + def->args = NULL; f->ignore = parse_only; f->idx = -1; return f; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7eaacd1..7ddb449 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -244,6 +244,8 @@ struct _var_t { struct _pident_t { var_t *var; int ptr_level; + /* levels of indirection for function pointers */ + int func_ptr_level; /* parser-internal */ struct list entry;

1 0

Andrew Talbot : ntdll: Remove superfluous semicolon.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 08ae56545e677988f254dab5ad4283cb412a112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ae56545e677988f254dab5a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 21:41:19 2008 +0100 ntdll: Remove superfluous semicolon. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1115ca7..65283e0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -356,7 +356,7 @@ __ASM_GLOBAL_FUNC(call_thread_entry_point, "movl 8(%ebp),%eax\n\t" "call *%eax\n\t" "leave\n\t" - "ret" ); + "ret" ) #else static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) {

1 0

Andrew Talbot : msxml3: Remove superfluous semicolon.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 7142fc1634a9c4f8820d22e2b04fdb2abe8f3fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7142fc1634a9c4f8820d22e2b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 20:42:18 2008 +0100 msxml3: Remove superfluous semicolon. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4bece7f..0b36cac 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -54,7 +54,7 @@ typedef struct _saxreader static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) { return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); -}; +} /*** IUnknown methods ***/ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject)

1 0

Hans Leidekker : wininet: Parse the redirect URL in HTTP_HandleRedirect in case of a proxy connection .
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 8210e1b45426aa5b210344ef99ce935c68d71f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8210e1b45426aa5b210344ef9… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:25:57 2008 +0200 wininet: Parse the redirect URL in HTTP_HandleRedirect in case of a proxy connection. --- dlls/wininet/http.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6198651..912a07f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2864,6 +2864,7 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; + BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[2048]; if(lpszUrl[0]=='/') @@ -2871,11 +2872,6 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) /* if it's an absolute path, keep the same session info */ lstrcpynW(path, lpszUrl, 2048); } - else if (NULL != hIC->lpszProxy && hIC->lpszProxy[0] != 0) - { - TRACE("Redirect through proxy\n"); - lstrcpynW(path, lpszUrl, 2048); - } else { URL_COMPONENTSW urlComponents; @@ -2997,11 +2993,9 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HTTP_ADDHDR_FLAG_ADD_IF_NEW); #endif - HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); - lpwhs->lpszServerName = WININET_strdupW(hostName); HeapFree(GetProcessHeap(), 0, lpwhs->lpszHostName); if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT && - urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) + urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; static const WCHAR fmt[] = {'%','s',':','%','i',0}; @@ -3015,20 +3009,27 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); lpwhs->lpszUserName = NULL; if (userName[0]) lpwhs->lpszUserName = WININET_strdupW(userName); - lpwhs->nServerPort = urlComponents.nPort; - if (!HTTP_ResolveName(lpwhr)) - return FALSE; + if (!using_proxy) + { + HeapFree(GetProcessHeap(), 0, lpwhs->lpszServerName); + lpwhs->lpszServerName = WININET_strdupW(hostName); + lpwhs->nServerPort = urlComponents.nPort; - NETCON_close(&lpwhr->netConnection); + if (!HTTP_ResolveName(lpwhr)) + return FALSE; - if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) - return FALSE; + NETCON_close(&lpwhr->netConnection); + + if (!NETCON_init(&lpwhr->netConnection,lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE)) + return FALSE; + } + else + TRACE("Redirect through proxy\n"); } HeapFree(GetProcessHeap(), 0, lpwhr->lpszPath);

1 0

Hans Leidekker : wininet: Remove dead code from HTTP_DealWithProxy and improve its debug trace.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 729631d907820f8f717d0b6df2dddc0fc024b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729631d907820f8f717d0b6df… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:25:40 2008 +0200 wininet: Remove dead code from HTTP_DealWithProxy and improve its debug trace. --- dlls/wininet/http.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a197c43..6198651 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1269,12 +1269,10 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, { WCHAR buf[MAXHOSTNAME]; WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ - WCHAR* url; static WCHAR szNul[] = { 0 }; URL_COMPONENTSW UrlComponents; static const WCHAR szHttp[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',0 }; - int len; memset( &UrlComponents, 0, sizeof UrlComponents ); UrlComponents.dwStructSize = sizeof UrlComponents; @@ -1293,11 +1291,6 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, if( !lpwhr->lpszPath ) lpwhr->lpszPath = szNul; - TRACE("server=%s path=%s\n", - debugstr_w(lpwhs->lpszHostName), debugstr_w(lpwhr->lpszPath)); - /* for constant 15 see above */ - len = strlenW(lpwhs->lpszHostName) + strlenW(lpwhr->lpszPath) + 15; - url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; @@ -1306,6 +1299,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, lpwhs->lpszServerName = WININET_strdupW(UrlComponents.lpszHostName); lpwhs->nServerPort = UrlComponents.nPort; + TRACE("proxy server=%s port=%d\n", debugstr_w(lpwhs->lpszServerName), lpwhs->nServerPort); return TRUE; }

1 0

Paul Vriens : winecfg: Update the Dutch resources.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 2b82aa1dc76f2d667a39f8b98d9cccce4a577edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b82aa1dc76f2d667a39f8b98… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Mar 31 20:29:57 2008 +0200 winecfg: Update the Dutch resources. --- programs/winecfg/Nl.rc | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index cfa9153..c9c5cd3 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -62,30 +62,30 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Venster-instellingen ",IDC_STATIC,8,4,244,180 + GROUPBOX " Venster-instellingen ",IDC_STATIC,8,4,244,184 - CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 + CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Wanneer de vensters door de window manager worden beheerd hebben deze de standaard kaders, er wordt rekening gehouden met de virtuele desktop en ze staan in de lijst met vensters.\n\nAls de vensters niet worden beheerd, worden ze losgekoppeld van de window manager. Dit betekent dat vensters niet perfect met uw desktop integreren. De 'emulatie' is echter exacter en kan ervoor zorgen dat programma's beter werken.", - IDC_STATIC,15,37,228,80 - CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 + IDC_STATIC,19,51,225,80 + CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,128,230,10 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "U kunt kiezen voor een virtuele windows desktop waarop alle vensters geplaatst worden, of u kunt er voor kiezen dat de vensters op uw standaard desktop geplaatst worden.", - IDC_STATIC,15,125,228,28 - CONTROL "Emuleer een virtuele desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,168,69,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,89,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,133,168,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,142,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + IDC_STATIC,19,138,225,28 + LTEXT "Desktop afmetingen:",IDC_DESKTOP_SIZE,15,168,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,168,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,166,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,189,244,50 + GROUPBOX " Direct3D ",IDC_STATIC,8,190,244,48 - LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,199,100,30 - COMBOBOX IDC_D3D_VSHADER_MODE,120,197,130,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader ondersteuning: ",IDC_STATIC,15,203,100,32 + COMBOBOX IDC_D3D_VSHADER_MODE,120,201,125,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 + CONTROL "Pixel Shader toestaan (indien ondersteund door de hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,219,230,10 GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP @@ -167,8 +167,8 @@ BEGIN GROUPBOX " Stuurprogramma selectie ",IDC_STATIC,8,4,244,195 LTEXT "Selecteer een geluids-stuurprogramma door het aanvinken van het gewenste stuurprogramma. Zet het geluid uit door geen stuurprogramma te selecteren. Het selecteren van meerdere stuurprogramma's wordt niet aanbevolen. Configureer een stuurprogramma d.m.v. een rechter muisklik hierop.",IDC_STATIC,15,20,227,45 CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,65,140,125 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,65,79,14 - PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,170,85,79,14 + PUSHBUTTON "Geluidstest",IDC_AUDIO_TEST,165,65,79,14 + PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,165,85,79,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Chris Robinson : quartz: Break processing loop when shutting down.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 4a68b33029137f08c8535db581a86ae37044a799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a68b33029137f08c8535db58… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 31 10:01:54 2008 -0700 quartz: Break processing loop when shutting down. --- dlls/quartz/mpegsplit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index cb7528f..dca0042 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -363,8 +363,11 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) IMediaSample_SetSyncPoint(This->pCurrentSample, TRUE); } hr = FillBuffer(This, &pbSrcStream, &cbSrcStream); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { + if (hr == S_FALSE) + break; continue; + } fail: FIXME("Failed with hres: %08x!\n", hr);

1 0

Andrew Talbot : ws2_32: Make function declarations match definitions.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 15db05929ae1d1391e777275b6dbda057723bf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=15db05929ae1d1391e777275b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 17:55:20 2008 +0100 ws2_32: Make function declarations match definitions. --- dlls/ws2_32/async.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 963ed66..019f73f 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -126,8 +126,8 @@ CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; /* protoptypes of some functions in socket.c */ -UINT16 wsaErrno(void); -UINT16 wsaHerrno(int errnr); +UINT wsaErrno(void); +UINT wsaHerrno(int errnr); #define AQ_WIN16 0x00 #define AQ_WIN32 0x04

1 0

Alexandre Julliard : user32: Don't start explorer. exe on non-visible window stations.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: bd09340cf2d4dae6e9abd2dd11c532fee7711c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd09340cf2d4dae6e9abd2dd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:42 2008 +0200 user32: Don't start explorer.exe on non-visible window stations. --- dlls/user32/win.c | 49 +++++++++++++++++++++++++++---------------------- 1 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d5d0267..aa5bd87 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1620,30 +1620,35 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->desktop) { - static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; - - memset( &si, 0, sizeof(si) ); - si.cb = sizeof(si); - si.dwFlags = STARTF_USESTDHANDLES; - si.hStdInput = 0; - si.hStdOutput = 0; - si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - - GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, command_line ); - if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, - NULL, NULL, &si, &pi )) - { - TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); - WaitForInputIdle( pi.hProcess, 10000 ); - CloseHandle( pi.hThread ); - CloseHandle( pi.hProcess ); - - } - else WARN( "failed to start explorer, err %d\n", GetLastError() ); + USEROBJECTFLAGS flags; + if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_FLAGS, &flags, + sizeof(flags), NULL ) || (flags.dwFlags & WSF_VISIBLE)) + { + static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = 0; + si.hStdOutput = 0; + si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); + + GetSystemDirectoryW( cmdline, MAX_PATH ); + lstrcatW( cmdline, command_line ); + if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, + NULL, NULL, &si, &pi )) + { + TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); + WaitForInputIdle( pi.hProcess, 10000 ); + CloseHandle( pi.hThread ); + CloseHandle( pi.hProcess ); + } + else WARN( "failed to start explorer, err %d\n", GetLastError() ); + } + else TRACE( "not starting explorer since winstation is not visible\n" ); SERVER_START_REQ( get_desktop_window ) {

1 0

Alexandre Julliard : wineboot: No longer needs to keep running now that we have services.exe.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: bd2ee68d6d8bf8951f3227ae39b5fda4430522dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2ee68d6d8bf8951f3227ae3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:24 2008 +0200 wineboot: No longer needs to keep running now that we have services.exe. --- programs/wineboot/wineboot.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 024eef3..30c7752 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -762,9 +762,5 @@ int main( int argc, char *argv[] ) WINE_TRACE("Operation done\n"); SetEvent( event ); - - /* FIXME: the wait is needed to keep services running */ - /* it should be removed once we have a proper services.exe */ - if (!restart) WaitForSingleObject( __wine_make_process_system(), INFINITE ); return 0; }

1 0

Alexandre Julliard : advapi32: Silence the pipe read error in the normal case.
by Alexandre Julliard 01 Apr '08

01 Apr '08

Module: wine Branch: master Commit: 9bb129d17b2522197ffa6535282e09f3b3aecfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb129d17b2522197ffa65352… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 31 17:26:07 2008 +0200 advapi32: Silence the pipe read error in the normal case. --- dlls/advapi32/service.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index b89022d..0d13442 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -615,9 +615,15 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) DWORD count, req[2] = {0,0}; r = ReadFile( pipe, &req, sizeof req, &count, NULL ); - if (!r || count!=sizeof req) + if (!r) { - ERR("pipe read failed\n"); + if (GetLastError() != ERROR_BROKEN_PIPE) + ERR( "pipe read failed error %u\n", GetLastError() ); + break; + } + if (count != sizeof(req)) + { + ERR( "partial pipe read %u\n", count ); break; }

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 April 2008