January 2009 - Wine-commits

Juan Lang : crypt32: Implement CryptMsgEncodeAndSignCTL on top of CryptMsgSignCTL.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 80a24edb55acc6cb5372ee403b08ac41e32c5cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a24edb55acc6cb5372ee403… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 5 13:34:35 2009 -0800 crypt32: Implement CryptMsgEncodeAndSignCTL on top of CryptMsgSignCTL. --- dlls/crypt32/msg.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index cbbbffe..14140c2 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2901,9 +2901,26 @@ BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType, PCTL_INFO pCtlInfo, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, BYTE *pbEncoded, DWORD *pcbEncoded) { - FIXME("(%08x, %p, %p, %08x, %p, %p): stub\n", dwMsgEncodingType, pCtlInfo, + BOOL ret; + BYTE *pbCtlContent; + DWORD cbCtlContent; + + TRACE("(%08x, %p, %p, %08x, %p, %p)\n", dwMsgEncodingType, pCtlInfo, pSignInfo, dwFlags, pbEncoded, pcbEncoded); - return FALSE; + + if (dwFlags) + { + FIXME("unimplemented for flags %08x\n", dwFlags); + return FALSE; + } + if ((ret = CryptEncodeObjectEx(dwMsgEncodingType, PKCS_CTL, pCtlInfo, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &pbCtlContent, &cbCtlContent))) + { + ret = CryptMsgSignCTL(dwMsgEncodingType, pbCtlContent, cbCtlContent, + pSignInfo, dwFlags, pbEncoded, pcbEncoded); + LocalFree(pbCtlContent); + } + return ret; } BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent,

1 0

Francois Gouget : cmd: WCMD_strtrim_trailing_spaces() is unused so remove it.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 6b16d0229d3e12d7860a2f6b9b9d823e02e16607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b16d0229d3e12d7860a2f6b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:58:01 2009 +0100 cmd: WCMD_strtrim_trailing_spaces() is unused so remove it. --- programs/cmd/wcmd.h | 1 - programs/cmd/wcmdmain.c | 17 ----------------- 2 files changed, 0 insertions(+), 18 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index ebf513d..1396448 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -98,7 +98,6 @@ int WCMD_volume (int mode, WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where); WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); -void WCMD_strtrim_trailing_spaces (WCHAR *string); void WCMD_opt_s_strip_quotes(WCHAR *cmd); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index e4f29a1..06c97d4 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -438,23 +438,6 @@ WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string) { } /************************************************************************* - * WCMD_strtrim_trailing_spaces - * - * Remove trailing spaces from a string. This routine modifies the input - * string by placing a null after the last non-space WCHARacter - */ -void WCMD_strtrim_trailing_spaces (WCHAR *string) { - - WCHAR *ptr; - - ptr = string + strlenW (string) - 1; - while ((*ptr == ' ') && (ptr >= string)) { - *ptr = '\0'; - ptr--; - } -} - -/************************************************************************* * WCMD_opt_s_strip_quotes * * Remove first and last quote WCHARacters, preserving all other text

1 0

Francois Gouget : cmd: Make some functions static.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: e46d25a6611c63fb698056b1269c3659abe02d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46d25a6611c63fb698056b12… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:58:16 2009 +0100 cmd: Make some functions static. --- programs/cmd/directory.c | 8 ++++---- programs/cmd/wcmd.h | 3 --- programs/cmd/wcmdmain.c | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index cd17d31..647f4f1 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -74,7 +74,7 @@ static const WCHAR spaceW[] = {' ','\0'}; * * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). */ -WCHAR * WCMD_strrev (WCHAR *buff) { +static WCHAR * WCMD_strrev (WCHAR *buff) { int r, i; WCHAR b; @@ -95,7 +95,7 @@ WCHAR * WCMD_strrev (WCHAR *buff) { * Result is returned in a static string overwritten with each call. * FIXME: There must be a better algorithm! */ -WCHAR * WCMD_filesize64 (ULONGLONG n) { +static WCHAR * WCMD_filesize64 (ULONGLONG n) { ULONGLONG q; unsigned int r, i; @@ -121,7 +121,7 @@ WCHAR * WCMD_filesize64 (ULONGLONG n) { * * Sort based on the /O options supplied on the command line */ -int WCMD_dir_sort (const void *a, const void *b) +static int WCMD_dir_sort (const void *a, const void *b) { WIN32_FIND_DATA *filea = (WIN32_FIND_DATA *)a; WIN32_FIND_DATA *fileb = (WIN32_FIND_DATA *)b; @@ -200,7 +200,7 @@ int WCMD_dir_sort (const void *a, const void *b) * * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). */ -void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { +static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { ULONG sizeNeeded = 0; DWORD rc; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1396448..a31b011 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -70,7 +70,6 @@ void WCMD_more (WCHAR *); void WCMD_move (void); void WCMD_output (const WCHAR *format, ...); void WCMD_output_asis (const WCHAR *message); -void WCMD_parse (WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); @@ -88,7 +87,6 @@ void WCMD_setshow_path (WCHAR *command); void WCMD_setshow_prompt (void); void WCMD_setshow_time (void); void WCMD_shift (WCHAR *command); -void WCMD_show_prompt (void); void WCMD_title (WCHAR *); void WCMD_type (WCHAR *); void WCMD_verify (WCHAR *command); @@ -98,7 +96,6 @@ int WCMD_volume (int mode, WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where); WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); -void WCMD_opt_s_strip_quotes(WCHAR *cmd); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 06c97d4..4c513fb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -309,7 +309,7 @@ void WCMD_print_error (void) { * */ -void WCMD_show_prompt (void) { +static void WCMD_show_prompt (void) { int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; @@ -442,7 +442,7 @@ WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string) { * * Remove first and last quote WCHARacters, preserving all other text */ -void WCMD_opt_s_strip_quotes(WCHAR *cmd) { +static void WCMD_opt_s_strip_quotes(WCHAR *cmd) { WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; while((*dest=*src) != '\0') { if (*src=='\"') @@ -761,7 +761,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { * read in and not again, except for 'for' variable substitution. * eg. As evidence, "echo %1 && shift && echo %1" or "echo %%path%%" */ -void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR *forValue) { +static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR *forValue) { /* For commands in a context (batch program): */ /* Expand environment variables in a batch file %{0-9} first */ @@ -846,7 +846,7 @@ void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR *forVa * second in p2. Any subsequent non-qualifier strings are lost. * Parameters in quotes are handled. */ -void WCMD_parse (WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2) +static void WCMD_parse (WCHAR *s, WCHAR *q, WCHAR *p1, WCHAR *p2) { int p = 0; @@ -1612,7 +1612,7 @@ static void WCMD_DumpCommands(CMD_LIST *commands) { * * Adds a command to the current command list */ -void WCMD_addCommand(WCHAR *command, int *commandLen, +static void WCMD_addCommand(WCHAR *command, int *commandLen, WCHAR *redirs, int *redirLen, WCHAR **copyTo, int **copyToLen, CMD_DELIMITERS prevDelim, int curDepth,

1 0

Nikolay Sivov : oleaut32: Add PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture_get_Attributes.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 5b88f0d9161e1b262aec46dc53a5d9a4d5d6ee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b88f0d9161e1b262aec46dc5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 6 00:25:43 2009 +0300 oleaut32: Add PICTYPE_NONE and PICTYPE_UNINITIALIZED to IPicture_get_Attributes. --- dlls/oleaut32/olepicture.c | 2 ++ dlls/oleaut32/tests/olepicture.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index bdce729..e57effe 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -844,6 +844,8 @@ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, TRACE("(%p)->(%p).\n", This, pdwAttr); *pdwAttr = 0; switch (This->desc.picType) { + case PICTYPE_UNINITIALIZED: + case PICTYPE_NONE: break; case PICTYPE_BITMAP: if (This->hbmMask) *pdwAttr = PICTURE_TRANSPARENT; break; /* not 'truly' scalable, see MSDN. */ case PICTYPE_ICON: *pdwAttr = PICTURE_TRANSPARENT;break; case PICTYPE_ENHMETAFILE: /* fall through */ diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 2b5b8bb..ba59b50 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -324,6 +324,7 @@ static void test_empty_image(void) { ULARGE_INTEGER newpos1; LARGE_INTEGER seekto; short type; + DWORD attr; /* Empty image. Happens occasionally in VB programs. */ hglob = GlobalAlloc (0, 8); @@ -347,6 +348,11 @@ static void test_empty_image(void) { ok (hres == S_OK,"empty picture get type failed with hres 0x%08x\n", hres); ok (type == PICTYPE_NONE,"type is %d, but should be PICTYPE_NONE(0)\n", type); + attr = 0xdeadbeef; + hres = IPicture_get_Attributes (pic, &attr); + ok (hres == S_OK,"empty picture get attributes failed with hres 0x%08x\n", hres); + ok (attr == 0,"attr is %d, but should be 0\n", attr); + hres = IPicture_get_Handle (pic, &handle); ok (hres == S_OK,"empty picture get handle failed with hres 0x%08x\n", hres); ok (handle == 0, "empty picture get handle did not return 0, but 0x%08x\n", handle); @@ -645,6 +651,26 @@ static void test_Render(void) ReleaseDC(NULL, hdc); } +static void test_get_Attributes(void) +{ + IPicture *pic; + HRESULT hres; + short type; + DWORD attr; + + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (VOID**)&pic); + hres = IPicture_get_Type(pic, &type); + ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); + ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); + + attr = 0xdeadbeef; + hres = IPicture_get_Attributes(pic, &attr); + ole_expect(hres, S_OK); + ok(attr == 0, "IPicture_get_Attributes does not reset attr to zero, got %d\n", attr); + + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -672,6 +698,7 @@ START_TEST(olepicture) test_Invoke(); test_OleCreatePictureIndirect(); test_Render(); + test_get_Attributes(); }

1 0

Nikolay Sivov : oleaut32: Check pointer in IPicture_get_Attributes.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 76925b06c2b1e4a83314a84d0c951645d6a8b642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76925b06c2b1e4a83314a84d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 6 00:40:07 2009 +0300 oleaut32: Check pointer in IPicture_get_Attributes. --- dlls/oleaut32/olepicture.c | 4 ++++ dlls/oleaut32/tests/olepicture.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index e57effe..3d0af78 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -842,6 +842,10 @@ static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, { OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%p).\n", This, pdwAttr); + + if(!pdwAttr) + return E_POINTER; + *pdwAttr = 0; switch (This->desc.picType) { case PICTYPE_UNINITIALIZED: diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ba59b50..7bff9b0 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -663,6 +663,9 @@ static void test_get_Attributes(void) ok(hres == S_OK, "IPicture_get_Type does not return S_OK, but 0x%08x\n", hres); ok(type == PICTYPE_UNINITIALIZED, "Expected type = PICTYPE_UNINITIALIZED, got = %d\n", type); + hres = IPicture_get_Attributes(pic, NULL); + ole_expect(hres, E_POINTER); + attr = 0xdeadbeef; hres = IPicture_get_Attributes(pic, &attr); ole_expect(hres, S_OK);

1 0

Juan Lang : crypt32: Add stub for CryptMsgEncodeAndSignCTL.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 30de92df3a31bd6e76c14291b95572799d7c17a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30de92df3a31bd6e76c14291b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jan 5 13:33:13 2009 -0800 crypt32: Add stub for CryptMsgEncodeAndSignCTL. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/msg.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c06bca1..8d431b4 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -148,7 +148,7 @@ @ stub CryptMsgCountersign @ stub CryptMsgCountersignEncoded @ stdcall CryptMsgDuplicate(ptr) -@ stub CryptMsgEncodeAndSignCTL +@ stdcall CryptMsgEncodeAndSignCTL(long ptr ptr long ptr ptr) @ stdcall CryptMsgGetAndVerifySigner(ptr long ptr long ptr ptr) @ stdcall CryptMsgGetParam(ptr long long ptr ptr) @ stdcall CryptMsgOpenToDecode(long long long long ptr ptr) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7c90d75..949717f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2896,3 +2896,12 @@ BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV_LEGACY hCryptProv cbSignerInfoCountersignature, dwSignerType, pvSigner, dwFlags, pvReserved); return FALSE; } + +BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType, + PCTL_INFO pCtlInfo, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded) +{ + FIXME("(%08x, %p, %p, %08x, %p, %p): stub\n", dwMsgEncodingType, pCtlInfo, + pSignInfo, dwFlags, pbEncoded, pcbEncoded); + return FALSE; +}

1 0

Francois Gouget : winemine: Make some functions static.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: b82caec7184557a11f41695c5360401b23f70955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82caec7184557a11f41695c5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:58:22 2009 +0100 winemine: Make some functions static. --- programs/winemine/main.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 3d0998f..c757129 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -57,7 +57,7 @@ void CheckLevel( BOARD *p_board ) p_board->mines = p_board->cols * p_board->rows - 2; } -void LoadBoard( BOARD *p_board ) +static void LoadBoard( BOARD *p_board ) { DWORD size; DWORD type; @@ -126,7 +126,7 @@ void LoadBoard( BOARD *p_board ) RegCloseKey( hkey ); } -void InitBoard( BOARD *p_board ) +static void InitBoard( BOARD *p_board ) { HMENU hMenu; @@ -146,7 +146,7 @@ void InitBoard( BOARD *p_board ) CheckLevel( p_board ); } -void SaveBoard( BOARD *p_board ) +static void SaveBoard( BOARD *p_board ) { HKEY hkey; unsigned i; @@ -180,14 +180,14 @@ void SaveBoard( BOARD *p_board ) RegCloseKey( hkey ); } -void DestroyBoard( BOARD *p_board ) +static void DestroyBoard( BOARD *p_board ) { DeleteObject( p_board->hFacesBMP ); DeleteObject( p_board->hLedsBMP ); DeleteObject( p_board->hMinesBMP ); } -void SetDifficulty( BOARD *p_board, DIFFICULTY difficulty ) +static void SetDifficulty( BOARD *p_board, DIFFICULTY difficulty ) { HMENU hMenu; @@ -254,7 +254,7 @@ static void MoveOnScreen(RECT* rect) ShiftBetween(&rect->top, &rect->bottom, mi.rcWork.top, mi.rcWork.bottom); } -void CreateBoard( BOARD *p_board ) +static void CreateBoard( BOARD *p_board ) { int left, top, bottom, right; unsigned col, row; @@ -331,7 +331,7 @@ void CreateBoard( BOARD *p_board ) /* Randomly places mines everywhere except the selected box. */ -void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) +static void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) { int i, j; unsigned col, row; @@ -372,7 +372,7 @@ void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) } } -void DrawMine( HDC hdc, HDC hMemDC, BOARD *p_board, unsigned col, unsigned row, BOOL IsPressed ) +static void DrawMine( HDC hdc, HDC hMemDC, BOARD *p_board, unsigned col, unsigned row, BOOL IsPressed ) { MINEBMP_OFFSET offset = BOX_BMP; @@ -449,7 +449,7 @@ void DrawMine( HDC hdc, HDC hMemDC, BOARD *p_board, unsigned col, unsigned row, hMemDC, 0, offset * MINE_HEIGHT, SRCCOPY ); } -void DrawMines ( HDC hdc, HDC hMemDC, BOARD *p_board ) +static void DrawMines ( HDC hdc, HDC hMemDC, BOARD *p_board ) { HGDIOBJ hOldObj; unsigned col, row; @@ -463,7 +463,7 @@ void DrawMines ( HDC hdc, HDC hMemDC, BOARD *p_board ) SelectObject( hMemDC, hOldObj ); } -void DrawLeds( HDC hdc, HDC hMemDC, BOARD *p_board, int number, int x, int y ) +static void DrawLeds( HDC hdc, HDC hMemDC, BOARD *p_board, int number, int x, int y ) { HGDIOBJ hOldObj; unsigned led[3], i; @@ -506,7 +506,7 @@ void DrawLeds( HDC hdc, HDC hMemDC, BOARD *p_board, int number, int x, int y ) } -void DrawFace( HDC hdc, HDC hMemDC, BOARD *p_board ) +static void DrawFace( HDC hdc, HDC hMemDC, BOARD *p_board ) { HGDIOBJ hOldObj; @@ -523,7 +523,7 @@ void DrawFace( HDC hdc, HDC hMemDC, BOARD *p_board ) } -void DrawBoard( HDC hdc, HDC hMemDC, PAINTSTRUCT *ps, BOARD *p_board ) +static void DrawBoard( HDC hdc, HDC hMemDC, PAINTSTRUCT *ps, BOARD *p_board ) { RECT tmp_rect; @@ -545,7 +545,7 @@ void DrawBoard( HDC hdc, HDC hMemDC, PAINTSTRUCT *ps, BOARD *p_board ) } -void AddFlag( BOARD *p_board, unsigned col, unsigned row ) +static void AddFlag( BOARD *p_board, unsigned col, unsigned row ) { if( p_board->box[col][row].FlagType != COMPLETE ) { switch( p_board->box[col][row].FlagType ) { @@ -569,7 +569,7 @@ void AddFlag( BOARD *p_board, unsigned col, unsigned row ) } -void UnpressBox( BOARD *p_board, unsigned col, unsigned row ) +static void UnpressBox( BOARD *p_board, unsigned col, unsigned row ) { HDC hdc; HGDIOBJ hOldObj; @@ -587,7 +587,7 @@ void UnpressBox( BOARD *p_board, unsigned col, unsigned row ) } -void UnpressBoxes( BOARD *p_board, unsigned col, unsigned row ) +static void UnpressBoxes( BOARD *p_board, unsigned col, unsigned row ) { int i, j; @@ -598,7 +598,7 @@ void UnpressBoxes( BOARD *p_board, unsigned col, unsigned row ) } -void PressBox( BOARD *p_board, unsigned col, unsigned row ) +static void PressBox( BOARD *p_board, unsigned col, unsigned row ) { HDC hdc; HGDIOBJ hOldObj; @@ -616,7 +616,7 @@ void PressBox( BOARD *p_board, unsigned col, unsigned row ) } -void PressBoxes( BOARD *p_board, unsigned col, unsigned row ) +static void PressBoxes( BOARD *p_board, unsigned col, unsigned row ) { int i, j; @@ -643,7 +643,7 @@ void PressBoxes( BOARD *p_board, unsigned col, unsigned row ) } -void CompleteBox( BOARD *p_board, unsigned col, unsigned row ) +static void CompleteBox( BOARD *p_board, unsigned col, unsigned row ) { int i, j; @@ -670,7 +670,7 @@ void CompleteBox( BOARD *p_board, unsigned col, unsigned row ) } -void CompleteBoxes( BOARD *p_board, unsigned col, unsigned row ) +static void CompleteBoxes( BOARD *p_board, unsigned col, unsigned row ) { unsigned numFlags = 0; int i, j; @@ -693,7 +693,7 @@ void CompleteBoxes( BOARD *p_board, unsigned col, unsigned row ) } -void TestMines( BOARD *p_board, POINT pt, int msg ) +static void TestMines( BOARD *p_board, POINT pt, int msg ) { BOOL draw = TRUE; int col, row; @@ -758,7 +758,7 @@ void TestMines( BOARD *p_board, POINT pt, int msg ) } -void TestFace( BOARD *p_board, POINT pt, int msg ) +static void TestFace( BOARD *p_board, POINT pt, int msg ) { if( p_board->status == PLAYING || p_board->status == WAITING ) { if( msg == WM_LBUTTONDOWN || msg == WM_MBUTTONDOWN ) @@ -783,7 +783,7 @@ void TestFace( BOARD *p_board, POINT pt, int msg ) } -void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) +static void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) { POINT pt; unsigned col,row; @@ -834,7 +834,7 @@ void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) } -LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { HDC hdc; PAINTSTRUCT ps;

1 0

Francois Gouget : cmd: Make WCMD_ask_confirm() static.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: e7b125702ffd68533240b6a1eb530131db0b0d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b125702ffd68533240b6a1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:57:31 2009 +0100 cmd: Make WCMD_ask_confirm() static. --- programs/cmd/builtins.c | 107 ++++++++++++++++++++++++----------------------- programs/cmd/wcmd.h | 1 - 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ad186ff..db8b02f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -66,6 +66,60 @@ static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static const WCHAR nullW[] = {'\0'}; +/************************************************************************** + * WCMD_ask_confirm + * + * Issue a message and ask 'Are you sure (Y/N)', waiting on a valid + * answer. + * + * Returns True if Y (or A) answer is selected + * If optionAll contains a pointer, ALL is allowed, and if answered + * set to TRUE + * + */ +static BOOL WCMD_ask_confirm (WCHAR *message, BOOL showSureText, BOOL *optionAll) { + + WCHAR msgbuffer[MAXSTRING]; + WCHAR Ybuffer[MAXSTRING]; + WCHAR Nbuffer[MAXSTRING]; + WCHAR Abuffer[MAXSTRING]; + WCHAR answer[MAX_PATH] = {'\0'}; + DWORD count = 0; + + /* Load the translated 'Are you sure', plus valid answers */ + LoadString (hinst, WCMD_CONFIRM, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); + LoadString (hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)/sizeof(WCHAR)); + LoadString (hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR)); + LoadString (hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR)); + + /* Loop waiting on a Y or N */ + while (answer[0] != Ybuffer[0] && answer[0] != Nbuffer[0]) { + static const WCHAR startBkt[] = {' ','(','\0'}; + static const WCHAR endBkt[] = {')','?','\0'}; + + WCMD_output_asis (message); + if (showSureText) { + WCMD_output_asis (msgbuffer); + } + WCMD_output_asis (startBkt); + WCMD_output_asis (Ybuffer); + WCMD_output_asis (fslashW); + WCMD_output_asis (Nbuffer); + if (optionAll) { + WCMD_output_asis (fslashW); + WCMD_output_asis (Abuffer); + } + WCMD_output_asis (endBkt); + WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, + sizeof(answer)/sizeof(WCHAR), &count, NULL); + answer[0] = toupperW(answer[0]); + } + + /* Return the answer */ + return ((answer[0] == Ybuffer[0]) || + (optionAll && (answer[0] == Abuffer[0]))); +} + /**************************************************************************** * WCMD_clear_screen * @@ -2482,59 +2536,6 @@ void WCMD_exit (CMD_LIST **cmdList) { } } -/************************************************************************** - * WCMD_ask_confirm - * - * Issue a message and ask 'Are you sure (Y/N)', waiting on a valid - * answer. - * - * Returns True if Y (or A) answer is selected - * If optionAll contains a pointer, ALL is allowed, and if answered - * set to TRUE - * - */ -BOOL WCMD_ask_confirm (WCHAR *message, BOOL showSureText, BOOL *optionAll) { - - WCHAR msgbuffer[MAXSTRING]; - WCHAR Ybuffer[MAXSTRING]; - WCHAR Nbuffer[MAXSTRING]; - WCHAR Abuffer[MAXSTRING]; - WCHAR answer[MAX_PATH] = {'\0'}; - DWORD count = 0; - - /* Load the translated 'Are you sure', plus valid answers */ - LoadString (hinst, WCMD_CONFIRM, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); - LoadString (hinst, WCMD_YES, Ybuffer, sizeof(Ybuffer)/sizeof(WCHAR)); - LoadString (hinst, WCMD_NO, Nbuffer, sizeof(Nbuffer)/sizeof(WCHAR)); - LoadString (hinst, WCMD_ALL, Abuffer, sizeof(Abuffer)/sizeof(WCHAR)); - - /* Loop waiting on a Y or N */ - while (answer[0] != Ybuffer[0] && answer[0] != Nbuffer[0]) { - static const WCHAR startBkt[] = {' ','(','\0'}; - static const WCHAR endBkt[] = {')','?','\0'}; - - WCMD_output_asis (message); - if (showSureText) { - WCMD_output_asis (msgbuffer); - } - WCMD_output_asis (startBkt); - WCMD_output_asis (Ybuffer); - WCMD_output_asis (fslashW); - WCMD_output_asis (Nbuffer); - if (optionAll) { - WCMD_output_asis (fslashW); - WCMD_output_asis (Abuffer); - } - WCMD_output_asis (endBkt); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, - sizeof(answer)/sizeof(WCHAR), &count, NULL); - answer[0] = toupperW(answer[0]); - } - - /* Return the answer */ - return ((answer[0] == Ybuffer[0]) || - (optionAll && (answer[0] == Abuffer[0]))); -} /***************************************************************************** * WCMD_assoc diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9951585..ebf513d 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -101,7 +101,6 @@ WCHAR *WCMD_strtrim_leading_spaces (WCHAR *string); void WCMD_strtrim_trailing_spaces (WCHAR *string); void WCMD_opt_s_strip_quotes(WCHAR *cmd); void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValue, BOOL justFors); -BOOL WCMD_ask_confirm (WCHAR *message, BOOL showSureText, BOOL *optionAll); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); WCHAR *WCMD_LoadMessage(UINT id);

1 0

Vincent Povirk : explorer: Quiet a few fixmes.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 78dcb140c5e5559bb41e2a69ff0c90a8fa6d1bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78dcb140c5e5559bb41e2a69f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 5 10:39:06 2009 -0600 explorer: Quiet a few fixmes. --- programs/explorer/appbar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index f6e1eb1..2947ccd 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -203,7 +203,6 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) abd->uEdge = ABE_BOTTOM; return TRUE; case ABM_ACTIVATE: - WINE_FIXME("SHAppBarMessage(ABM_ACTIVATE, hwnd=%p, lparam=%lx): stub\n", abd->hWnd, abd->lParam); return TRUE; case ABM_GETAUTOHIDEBAR: WINE_FIXME("SHAppBarMessage(ABM_GETAUTOHIDEBAR, hwnd=%p, edge=%x): stub\n", abd->hWnd, abd->uEdge); @@ -212,7 +211,6 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) WINE_FIXME("SHAppBarMessage(ABM_SETAUTOHIDEBAR, hwnd=%p, edge=%x, lparam=%lx): stub\n", abd->hWnd, abd->uEdge, abd->lParam); return TRUE; case ABM_WINDOWPOSCHANGED: - WINE_FIXME("SHAppBarMessage(ABM_WINDOWPOSCHANGED, hwnd=%p): stub\n", abd->hWnd); return TRUE; default: WINE_FIXME("SHAppBarMessage(%x) unimplemented\n", msg);

1 0

Paul Vriens : advapi32/tests: Fix two test failures on Vista and W2K8.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: cd31fd393eae2f20e86374d18318ef5e3a2bf3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd31fd393eae2f20e86374d18… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 5 17:51:46 2009 +0100 advapi32/tests: Fix two test failures on Vista and W2K8. --- dlls/advapi32/tests/cred.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index e23f872..58103c6 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -180,16 +180,20 @@ static void test_CredReadDomainCredentialsA(void) SetLastError(0xdeadbeef); ret = pCredReadDomainCredentialsA(&info, 0, &count, &creds); - ok(!ret && GetLastError() == ERROR_NOT_FOUND, - "CredReadDomainCredentialsA should have failed with ERROR_NOT_FOUND instead of %d\n", + ok(!ret, "CredReadDomainCredentialsA should have failed\n"); + ok(GetLastError() == ERROR_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ + "Expected ERROR_NOT_FOUND or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); info.DnsServerName = NULL; SetLastError(0xdeadbeef); ret = pCredReadDomainCredentialsA(&info, 0, &count, &creds); - ok(!ret && GetLastError() == ERROR_NOT_FOUND, - "CredReadDomainCredentialsA should have failed with ERROR_NOT_FOUND instead of %d\n", + ok(!ret, "CredReadDomainCredentialsA should have failed\n"); + ok(GetLastError() == ERROR_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ + "Expected ERROR_NOT_FOUND or ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); }

1 0